@pkmn/sim 0.9.30 → 0.9.31

package/build/cjs/sim/battle.js

@@ -352,7 +352,7 @@ class Battle {
                 if (!(handler.state?.isSlotCondition))
                     continue;
             }
-            if (eventid === 'Residual' && handler.end && handler.state && handler.state.duration) {
+            if (eventid === 'Residual' && handler.end && handler.state?.duration) {
                 handler.state.duration--;
                 if (!handler.state.duration) {
                     const endCallArgs = handler.endCallArgs || [handler.effectHolder, effect.id];
@@ -568,7 +568,6 @@ class Battle {
         if (onEffect) {
             if (!sourceEffect)
                 throw new Error("onEffect passed without an effect");
-            // @ts-ignore - dynamic lookup
             const callback = sourceEffect[`on${eventid}`];
             if (callback !== undefined) {
                 if (Array.isArray(target))
@@ -737,11 +736,8 @@ class Battle {
     }
     resolvePriority(h, callbackName) {
         const handler = h;
-        // @ts-ignore
         handler.order = handler.effect[`${callbackName}Order`] || false;
-        // @ts-ignore
         handler.priority = handler.effect[`${callbackName}Priority`] || 0;
-        // @ts-ignore
         handler.subOrder = handler.effect[`${callbackName}SubOrder`] || 0;
         if (!handler.subOrder) {
             // https://www.smogon.com/forums/threads/sword-shield-battle-mechanics-research.3655528/page-59#post-8685465
@@ -810,7 +806,7 @@ class Battle {
         let handlers = [];
         if (Array.isArray(target)) {
             for (const [i, pokemon] of target.entries()) {
-                // console.log(`Event: ${eventName}, Target: ${'' + pokemon}, ${i}`);
+                // console.log(`Event: ${eventName}, Target: ${pokemon}, ${i}`);
                 const curHandlers = this.findEventHandlers(pokemon, eventName, source);
                 for (const handler of curHandlers) {
                     handler.target = pokemon; // Original "effectHolder"
@@ -860,7 +856,7 @@ class Battle {
     findPokemonEventHandlers(pokemon, callbackName, getKey) {
         const handlers = [];
         const status = pokemon.getStatus();
-        // @ts-ignore - dynamic lookup
+        // @ts-expect-error dynamic lookup
         let callback = status[callbackName];
         if (callback !== undefined || (getKey && pokemon.statusState[getKey])) {
             handlers.push(this.resolvePriority({
@@ -870,7 +866,7 @@ class Battle {
         for (const id in pokemon.volatiles) {
             const volatileState = pokemon.volatiles[id];
             const volatile = this.dex.conditions.getByID(id);
-            // @ts-ignore - dynamic lookup
+            // @ts-expect-error dynamic lookup
             callback = volatile[callbackName];
             if (callback !== undefined || (getKey && volatileState[getKey])) {
                 handlers.push(this.resolvePriority({
@@ -879,7 +875,7 @@ class Battle {
             }
             else if (['ability', 'item'].includes(volatile.id.split(':')[0])) {
                 // Innate abilities/items; see comment below
-                // @ts-ignore - dynamic lookup
+                // @ts-expect-error dynamic lookup
                 if (this.gen >= 5 && callbackName === 'onSwitchIn' && !volatile.onAnySwitchIn) {
                     callback = volatile.onStart;
                     if (callback !== undefined || (getKey && volatileState[getKey])) {
@@ -894,16 +890,16 @@ class Battle {
         // during the SwitchIn event instead of running the Start event during switch-ins
         // gens 4 and before still use the old system, though
         const ability = pokemon.getAbility();
-        // @ts-ignore - dynamic lookup
+        // @ts-expect-error dynamic lookup
         callback = ability[callbackName];
         if (callback !== undefined || (getKey && pokemon.abilityState[getKey])) {
             handlers.push(this.resolvePriority({
                 effect: ability, callback, state: pokemon.abilityState, end: pokemon.clearAbility, effectHolder: pokemon,
             }, callbackName));
-            // @ts-ignore - dynamic lookup
+            // @ts-expect-error dynamic lookup
         }
         else if (this.gen >= 5 && callbackName === 'onSwitchIn' && !ability.onAnySwitchIn) {
-            // @ts-ignore - dynamic lookup
+            // @ts-expect-error dynamic lookup
             callback = ability.onStart;
             if (callback !== undefined || (getKey && pokemon.abilityState[getKey])) {
                 handlers.push(this.resolvePriority({
@@ -912,16 +908,15 @@ class Battle {
             }
         }
         const item = pokemon.getItem();
-        // @ts-ignore - dynamic lookup
+        // @ts-expect-error dynamic lookup
         callback = item[callbackName];
         if (callback !== undefined || (getKey && pokemon.itemState[getKey])) {
             handlers.push(this.resolvePriority({
                 effect: item, callback, state: pokemon.itemState, end: pokemon.clearItem, effectHolder: pokemon,
             }, callbackName));
-            // @ts-ignore - dynamic lookup
+            // @ts-expect-error dynamic lookup
         }
         else if (this.gen >= 5 && callbackName === 'onSwitchIn' && !item.onAnySwitchIn) {
-            // @ts-ignore - dynamic lookup
             callback = item.onStart;
             if (callback !== undefined || (getKey && pokemon.itemState[getKey])) {
                 handlers.push(this.resolvePriority({
@@ -930,7 +925,7 @@ class Battle {
             }
         }
         const species = pokemon.baseSpecies;
-        // @ts-ignore - dynamic lookup
+        // @ts-expect-error dynamic lookup
         callback = species[callbackName];
         if (callback !== undefined) {
             handlers.push(this.resolvePriority({
@@ -941,7 +936,7 @@ class Battle {
         for (const conditionid in side.slotConditions[pokemon.position]) {
             const slotConditionState = side.slotConditions[pokemon.position][conditionid];
             const slotCondition = this.dex.conditions.getByID(conditionid);
-            // @ts-ignore - dynamic lookup
+            // @ts-expect-error dynamic lookup
             callback = slotCondition[callbackName];
             if (callback !== undefined || (getKey && slotConditionState[getKey])) {
                 handlers.push(this.resolvePriority({
@@ -960,7 +955,7 @@ class Battle {
         const handlers = [];
         let callback;
         const format = this.format;
-        // @ts-ignore - dynamic lookup
+        // @ts-expect-error dynamic lookup
         callback = format[callbackName];
         if (callback !== undefined || (getKey && this.formatData[getKey])) {
             handlers.push(this.resolvePriority({
@@ -984,7 +979,7 @@ class Battle {
         for (const id in field.pseudoWeather) {
             const pseudoWeatherState = field.pseudoWeather[id];
             const pseudoWeather = this.dex.conditions.getByID(id);
-            // @ts-ignore - dynamic lookup
+            // @ts-expect-error dynamic lookup
             callback = pseudoWeather[callbackName];
             if (callback !== undefined || (getKey && pseudoWeatherState[getKey])) {
                 handlers.push(this.resolvePriority({
@@ -994,7 +989,7 @@ class Battle {
             }
         }
         const weather = field.getWeather();
-        // @ts-ignore - dynamic lookup
+        // @ts-expect-error dynamic lookup
         callback = weather[callbackName];
         if (callback !== undefined || (getKey && this.field.weatherState[getKey])) {
             handlers.push(this.resolvePriority({
@@ -1003,7 +998,7 @@ class Battle {
             }, callbackName));
         }
         const terrain = field.getTerrain();
-        // @ts-ignore - dynamic lookup
+        // @ts-expect-error dynamic lookup
         callback = terrain[callbackName];
         if (callback !== undefined || (getKey && field.terrainState[getKey])) {
             handlers.push(this.resolvePriority({
@@ -1018,7 +1013,7 @@ class Battle {
         for (const id in side.sideConditions) {
             const sideConditionData = side.sideConditions[id];
             const sideCondition = this.dex.conditions.getByID(id);
-            // @ts-ignore - dynamic lookup
+            // @ts-expect-error dynamic lookup
             const callback = sideCondition[callbackName];
             if (callback !== undefined || (getKey && sideConditionData[getKey])) {
                 handlers.push(this.resolvePriority({
@@ -1144,7 +1139,7 @@ class Battle {
             // the entire team order, unlike `pickedTeamSize = undefined` which
             // will only ask the user to select their lead(s).
             const pickedTeamSize = this.ruleTable.pickedTeamSize;
-            this.add('teampreview' + (pickedTeamSize ? '|' + pickedTeamSize : ''));
+            this.add(`teampreview${pickedTeamSize ? `|${pickedTeamSize}` : ''}`);
         }
         const requests = this.getRequests(type);
         for (let i = 0; i < this.sides.length; i++) {
@@ -1837,10 +1832,10 @@ class Battle {
                         this.add('-damage', target, target.getHealth);
                     }
                     else if (source && (source !== target || effect.effectType === 'Ability')) {
-                        this.add('-damage', target, target.getHealth, '[from] ' + name, '[of] ' + source);
+                        this.add('-damage', target, target.getHealth, `[from] ${name}`, `[of] ${source}`);
                     }
                     else {
-                        this.add('-damage', target, target.getHealth, '[from] ' + name);
+                        this.add('-damage', target, target.getHealth, `[from] ${name}`);
                     }
                     break;
             }
@@ -1869,7 +1864,7 @@ class Battle {
                 if (!retVals[i] || !target)
                     continue;
                 if (target.hp <= 0) {
-                    this.debug('instafaint: ' + this.faintQueue.map(entry => entry.target.name));
+                    this.debug(`instafaint: ${this.faintQueue.map(entry => entry.target.name)}`);
                     this.faintMessages(true);
                     if (this.gen <= 2) {
                         target.faint();
@@ -1877,7 +1872,7 @@ class Battle {
                             this.queue.clear();
                             // Fainting clears accumulated Bide damage
                             for (const pokemon of this.getAllActive()) {
-                                if (pokemon.volatiles['bide'] && pokemon.volatiles['bide'].damage) {
+                                if (pokemon.volatiles['bide']?.damage) {
                                     pokemon.volatiles['bide'].damage = 0;
                                     this.hint("Desync Clause Mod activated!");
                                     this.hint("In Gen 1, Bide's accumulated damage is reset to 0 when a Pokemon faints.");
@@ -1982,7 +1977,7 @@ class Battle {
                 this.add('-heal', target, target.getHealth, '[silent]');
                 break;
             case 'drain':
-                this.add('-heal', target, target.getHealth, '[from] drain', '[of] ' + source);
+                this.add('-heal', target, target.getHealth, '[from] drain', `[of] ${source}`);
                 break;
             case 'wish':
                 break;
@@ -1996,10 +1991,10 @@ class Battle {
                     this.add('-heal', target, target.getHealth);
                 }
                 else if (source && source !== target) {
-                    this.add('-heal', target, target.getHealth, '[from] ' + effect.fullname, '[of] ' + source);
+                    this.add('-heal', target, target.getHealth, `[from] ${effect.fullname}`, `[of] ${source}`);
                 }
                 else {
-                    this.add('-heal', target, target.getHealth, '[from] ' + effect.fullname);
+                    this.add('-heal', target, target.getHealth, `[from] ${effect.fullname}`);
                 }
                 break;
         }
@@ -2134,7 +2129,7 @@ class Battle {
         // we need to manually check for Stalwart here
         if (pokemon.hasAbility(['stalwart', 'propellertail']))
             tracksTarget = true;
-        if (tracksTarget && originalTarget && originalTarget.isActive) {
+        if (tracksTarget && originalTarget?.isActive) {
             // smart-tracking move's original target is on the field: target it
             return originalTarget;
         }
@@ -2235,8 +2230,7 @@ class Battle {
             faintQueueLeft = this.faintQueue.length;
             faintData = this.faintQueue.shift();
             const pokemon = faintData.target;
-            if (!pokemon.fainted &&
-                this.runEvent('BeforeFaint', pokemon, faintData.source, faintData.effect)) {
+            if (!pokemon.fainted && this.runEvent('BeforeFaint', pokemon, faintData.source, faintData.effect)) {
                 this.add('faint', pokemon);
                 if (pokemon.side.pokemonLeft)
                     pokemon.side.pokemonLeft--;
@@ -2272,7 +2266,7 @@ class Battle {
             this.queue.clear();
             // Fainting clears accumulated Bide damage
             for (const pokemon of this.getAllActive()) {
-                if (pokemon.volatiles['bide'] && pokemon.volatiles['bide'].damage) {
+                if (pokemon.volatiles['bide']?.damage) {
                     pokemon.volatiles['bide'].damage = 0;
                     this.hint("Desync Clause Mod activated!");
                     this.hint("In Gen 1, Bide's accumulated damage is reset to 0 when a Pokemon faints.");
@@ -2392,8 +2386,8 @@ class Battle {
                         pokemon.baseMoveSlots[ironHead] = {
                             move: move.name,
                             id: move.id,
-                            pp: (move.noPPBoosts || move.isZ) ? move.pp : move.pp * 8 / 5,
-                            maxpp: (move.noPPBoosts || move.isZ) ? move.pp : move.pp * 8 / 5,
+                            pp: move.noPPBoosts ? move.pp : move.pp * 8 / 5,
+                            maxpp: move.noPPBoosts ? move.pp : move.pp * 8 / 5,
                             target: move.target,
                             disabled: false,
                             disabledSource: '',
@@ -2552,7 +2546,8 @@ class Battle {
                 this.updateSpeed();
                 residualPokemon = this.getAllActive().map(pokemon => [pokemon, pokemon.getUndynamaxedHP()]);
                 this.fieldEvent('Residual');
-                this.add('upkeep');
+                if (!this.ended)
+                    this.add('upkeep');
                 break;
         }
         // phazing (Roar, etc)
@@ -2822,6 +2817,7 @@ class Battle {
     }
     addMove(...args) {
         this.lastMoveLine = this.log.length;
+        // eslint-disable-next-line @typescript-eslint/no-base-to-string
         this.log.push(`|${args.join('|')}`);
     }
     attrLastMove(...args) {
@@ -2840,6 +2836,7 @@ class Battle {
             parts[4] = '';
             this.log[this.lastMoveLine] = parts.join('|');
         }
+        // eslint-disable-next-line @typescript-eslint/no-base-to-string
         this.log[this.lastMoveLine] += `|${args.join('|')}`;
     }
     retargetLastMove(newTarget) {
@@ -2933,7 +2930,7 @@ class Battle {
             const team = this.getTeam(options);
             side = new side_1.Side(options.name || `Player ${slotNum + 1}`, this, slotNum, team);
             if (options.avatar)
-                side.avatar = '' + options.avatar;
+                side.avatar = `${options.avatar}`;
             this.sides[slotNum] = side;
         }
         else {
@@ -2944,8 +2941,8 @@ class Battle {
                 side.name = options.name;
                 didSomething = true;
             }
-            if (options.avatar && side.avatar !== '' + options.avatar) {
-                side.avatar = '' + options.avatar;
+            if (options.avatar && side.avatar !== `${options.avatar}`) {
+                side.avatar = `${options.avatar}`;
                 didSomething = true;
             }
             if (options.team)
@@ -2979,12 +2976,12 @@ class Battle {
                 turns: this.turn,
                 p1: this.sides[0].name,
                 p2: this.sides[1].name,
-                p3: this.sides[2] && this.sides[2].name,
-                p4: this.sides[3] && this.sides[3].name,
+                p3: this.sides[2]?.name,
+                p4: this.sides[3]?.name,
                 p1team: this.sides[0].team,
                 p2team: this.sides[1].team,
-                p3team: this.sides[2] && this.sides[2].team,
-                p4team: this.sides[3] && this.sides[3].team,
+                p3team: this.sides[2]?.team,
+                p4team: this.sides[3]?.team,
                 score: [this.sides[0].pokemonLeft, this.sides[1].pokemonLeft],
                 inputLog: this.inputLog,
             };