azeroth-shell 0.2.0 → 0.3.0

package/src/engine/combat/sessionChase.ts

@@ -248,7 +248,18 @@ export function createChaseArm(deps: ChaseDeps): {
     if (isEnemySide(f.side)) {
       // The GRADE is the full contact ring while the PARK is half of it, which is the split the C++
       // makes — and it retires the knife edge where one ULP of step error triggered a full-HP evade.
-      const reach = Math.max(pairContact, longestOffenseRangeYd(f) + EVADE_REACH_EPS_YD);
+      let reach = Math.max(pairContact, longestOffenseRangeYd(f) + EVADE_REACH_EPS_YD);
+      // With no ranged kit the park below stops at the short offense, so grade against it too. A
+      // Razormane Scout's Shoot 6660 infers instant_nuke: it parked at 24 yd, shot, and reset every 5 s.
+      // Scheduled spells only, so a kit row the mob never casts still lets it evade.
+      if (dist > reach) {
+        const castable = castableKitIds(f, ctx.spellOf);
+        for (const s of shortOffenseList(f)) {
+          if (castable && !castable.has(s.id | 0)) continue;
+          if (!spellTargetTypeAllowed(s, tgt.creatureType ?? 0) || focusImmunityBlocksSpell(s, tgt, 1)) continue;
+          reach = Math.max(reach, (s.rangeMax ?? 0) + EVADE_REACH_EPS_YD);
+        }
+      }
       const prev = unreachableFrom.get(f.side);
       const victimMoved = !!prev && (
         to.z != null && prev.victimZ != null

package/src/engine/game/loadReconcile.ts

@@ -48,7 +48,7 @@ import { emptyInventory } from '../../domain/items/inventory.ts';
 import { trimSoulShards } from '../../domain/bots/soulShardCap.ts';
 import { companionLevel } from '../../domain/bots/squad.ts';
 import { syncCompanionProfessionTools } from './companionTraining.ts';
-import { petHasHappiness, reconcilePetPartyAuras } from '../../domain/pet/pet.ts';
+import { petHasHappiness, reconcilePetPartyAuras, tpSpentOnKnown } from '../../domain/pet/pet.ts';
 import { playerbotJunkItem } from '../../domain/bots/playerbotItemEligibility.ts';
 import type { EquippedMap } from '../../domain/character/character.ts';
 import { createAliveDeathFlow, isPlayerAlive } from '../../domain/run/death.ts';
@@ -324,6 +324,26 @@ export function applyLoadReconcile(ds: DataStore, state: GameState, opts?: impor
     }
   }
 
+  // A pet tamed before the bake dropped its rank-1 filler was charged training points for rank 1 of
+  // every family chain on top of its real kit, and may still queue those ranks to teach. Refund the
+  // difference once and keep the queue to the real kit. Cite: Pet.cpp:1955-1998 InitPetCreateSpells.
+  {
+    for (const p of [state.char.pet, state.char.storedPet, ...(state.char.stablePets ?? [])]) {
+      if (!p || p.innateKit) continue;
+      const cdef = ds.creature(p.creature);
+      if (!cdef || !petHasHappiness(cdef)) continue;
+      const kit = cdef.petDefaultSpells ?? [];
+      const filler = (cdef.petSpells ?? []).filter((id) => {
+        const s = ds.spell(id);
+        return !!s && !s.passive && (s.rank | 0) <= 1;
+      });
+      const refund = tpSpentOnKnown([...kit, ...filler], ds) - tpSpentOnKnown(kit, ds);
+      if (refund > 0 && p.trainingPoints != null) p.trainingPoints += refund;
+      if (p.teachSpells) p.teachSpells = p.teachSpells.filter((id) => kit.includes(id));
+      p.innateKit = [...kit];
+    }
+  }
+
   // Action bars: normalize any loaded/legacy shape, and for a save that predates them
   // (empty) seed bar 1 with the player's usable abilities so combat isn't blank.
   state.actionBars = normalizeBars(state.actionBars);

package/src/engine/game/pets.ts

@@ -3,7 +3,7 @@
 
 import {
   newPet, petHasHappiness, petTaughtIds, petRepertoireHas,
-  feedPetHappinessGain, petDiet, isPetFood, tpForSpell, hasTpForSpell,
+  feedPetHappinessGain, petDiet, isPetFood, tpForSpell, hasTpForSpell, petUntrainCost, untrainPetState,
   LOYALTY_REBELLIOUS, FEED_PET_DURATION_S,
   autoFeedThreshold, AUTO_FEED_TARGET, HAPPINESS_MAX,
   applyPetPartyAuras, stripPetPartyAuras, petPartyAuraSpellIds, reconcilePetPartyAuras,
@@ -156,6 +156,8 @@ export function createPetsModule(ctx: GameCtx, extras: PetsExtras): Pick<
   | 'setPetAutoFeed'
   | 'buyPetSpell'
   | 'teachPetSpell'
+  | 'untrainPet'
+  | 'untrainPetCost'
   | 'togglePetAutocast'
   | 'setPetCommand'
   | 'setPetReact'
@@ -319,6 +321,36 @@ export function createPetsModule(ctx: GameCtx, extras: PetsExtras): Pick<
       return { ok: true };
     },
 
+    untrainPetCost(nowMs) {
+      const pet = state.char.pet;
+      const cdef = pet ? ds.creature(pet.creature) : undefined;
+      if (!pet || !cdef || !petHasHappiness(cdef)) return null;
+      return petUntrainCost(pet, nowMs ?? Date.now());
+    },
+
+    untrainPet(trainerEntry, nowMs) {
+      const trainer = ds.trainer(trainerEntry);
+      if (!trainer || !(trainer.subname ?? '').toLowerCase().includes('pet trainer')) {
+        return { ok: false, reason: 'That is not a pet trainer' };
+      }
+      if (!canInteractWithCreature(ds, state.char.race, trainerEntry)) {
+        return { ok: false, reason: 'They refuse to deal with you.' };
+      }
+      const pet = state.char.pet;
+      if (!pet) return { ok: false, reason: 'You have no pet' };
+      if (pet.health <= 0) return { ok: false, reason: 'Your pet is dead' };
+      const cdef = ds.creature(pet.creature);
+      if (!cdef || !petHasHappiness(cdef)) return { ok: false, reason: 'Only a hunter pet can be untrained' };
+      if (!petTaughtIds(state.char, cdef).length) return { ok: false, reason: `${pet.name} has nothing to forget` };
+      const now = nowMs ?? Date.now();
+      const cost = petUntrainCost(pet, now);
+      if (state.char.gold < cost) return { ok: false, reason: 'Not enough money' };
+      state.char.gold -= cost;
+      state.char.pet = { ...untrainPetState(pet, cdef, state.char.level, ds), resetTalentsCost: cost, resetTalentsTime: now };
+      log(`${pet.name} forgets its training for ${moneyMarked(cost)} - ${state.char.pet.trainingPoints} training points to spend again.`);
+      return { ok: true, spent: cost };
+    },
+
     togglePetAutocast(spellId) {
       const pet = state.char.pet;
       if (!pet) return { ok: false, reason: 'You have no pet' };

package/src/engine/game/types.ts

@@ -768,6 +768,10 @@ export interface Game {
   // Beast Training (spell 5149): teach the CURRENT pet a rank from the repertoire, spending ITS training
   // points (chain-aware). Cite: Pet.cpp GetTPForSpell/learnSpell.
   teachPetSpell(spellId: number): ActionResult;
+  // Untrain the current hunter pet at a pet trainer: forget every taught ability, training points back
+  // to level × (loyalty − 1), for the escalating fee petUntrainCost reads. Cite: HandlePetUnlearnOpcode.
+  untrainPet(trainerEntry: number, nowMs?: number): ActionResult<{ spent: number }>;
+  untrainPetCost(nowMs?: number): number | null;
   // Toggle autocast for a pet ability (right-click on the pet bar). Rank-agnostic by name chain; disabled
   // abilities stay learned but leave the combat kit (buildPet).
   togglePetAutocast(spellId: number): ActionResult<{ enabled: boolean }>;