@pkmn/sim 0.9.26 → 0.9.28

package/build/cjs/data/abilities.js

@@ -92,15 +92,12 @@ exports.Abilities = {
     },
     airlock: {
         onSwitchIn(pokemon) {
-            this.effectState.switchingIn = true;
+            // Air Lock does not activate when Skill Swapped or when Neutralizing Gas leaves the field
+            this.add('-ability', pokemon, 'Air Lock');
+            this.effect.onStart.call(this, pokemon);
         },
         onStart(pokemon) {
-            // Air Lock does not activate when Skill Swapped or when Neutralizing Gas leaves the field
             pokemon.abilityState.ending = false; // Clear the ending flag
-            if (this.effectState.switchingIn) {
-                this.add('-ability', pokemon, 'Air Lock');
-                this.effectState.switchingIn = false;
-            }
             this.eachEvent('WeatherChange', this.effect);
         },
         onEnd(pokemon) {
@@ -262,11 +259,7 @@ exports.Abilities = {
         num: 165,
     },
     asoneglastrier: {
-        onPreStart(pokemon) {
-            this.add('-ability', pokemon, 'As One');
-            this.add('-ability', pokemon, 'Unnerve');
-            this.effectState.unnerved = true;
-        },
+        onSwitchInPriority: 1,
         onStart(pokemon) {
             if (this.effectState.unnerved)
                 return;
@@ -291,11 +284,7 @@ exports.Abilities = {
         num: 266,
     },
     asonespectrier: {
-        onPreStart(pokemon) {
-            this.add('-ability', pokemon, 'As One');
-            this.add('-ability', pokemon, 'Unnerve');
-            this.effectState.unnerved = true;
-        },
+        onSwitchInPriority: 1,
         onStart(pokemon) {
             if (this.effectState.unnerved)
                 return;
@@ -568,15 +557,12 @@ exports.Abilities = {
     },
     cloudnine: {
         onSwitchIn(pokemon) {
-            this.effectState.switchingIn = true;
+            // Cloud Nine does not activate when Skill Swapped or when Neutralizing Gas leaves the field
+            this.add('-ability', pokemon, 'Cloud Nine');
+            this.effect.onStart.call(this, pokemon);
         },
         onStart(pokemon) {
-            // Cloud Nine does not activate when Skill Swapped or when Neutralizing Gas leaves the field
             pokemon.abilityState.ending = false; // Clear the ending flag
-            if (this.effectState.switchingIn) {
-                this.add('-ability', pokemon, 'Cloud Nine');
-                this.effectState.switchingIn = false;
-            }
             this.eachEvent('WeatherChange', this.effect);
         },
         onEnd(pokemon) {
@@ -630,10 +616,22 @@ exports.Abilities = {
         num: 213,
     },
     commander: {
+        onAnySwitchInPriority: -2,
+        onAnySwitchIn() {
+            this.effect.onUpdate.call(this, this.effectState.target);
+        },
+        onStart(pokemon) {
+            this.effect.onUpdate.call(this, pokemon);
+        },
         onUpdate(pokemon) {
             if (this.gameType !== 'doubles')
                 return;
+            // don't run between when a Pokemon switches in and the resulting onSwitchIn event
+            if (this.queue.peek()?.choice === 'runSwitch')
+                return;
             const ally = pokemon.allies()[0];
+            if (pokemon.switchFlag || ally?.switchFlag)
+                return;
             if (!ally || pokemon.baseSpecies.baseSpecies !== 'Tatsugiri' || ally.baseSpecies.baseSpecies !== 'Dondozo') {
                 // Handle any edge cases
                 if (pokemon.getVolatile('commanding'))
@@ -719,6 +717,7 @@ exports.Abilities = {
         num: 212,
     },
     costar: {
+        onSwitchInPriority: -2,
         onStart(pokemon) {
             const ally = pokemon.allies()[0];
             if (!ally)
@@ -1101,12 +1100,8 @@ exports.Abilities = {
     },
     drizzle: {
         onStart(source) {
-            for (const action of this.queue) {
-                if (action.choice === 'runPrimal' && action.pokemon === source && source.species.id === 'kyogre')
-                    return;
-                if (action.choice !== 'runSwitch' && action.choice !== 'runPrimal')
-                    break;
-            }
+            if (source.species.id === 'kyogre' && source.item === 'blueorb')
+                return;
             this.field.setWeather('raindance');
         },
         flags: {},
@@ -1116,12 +1111,8 @@ exports.Abilities = {
     },
     drought: {
         onStart(source) {
-            for (const action of this.queue) {
-                if (action.choice === 'runPrimal' && action.pokemon === source && source.species.id === 'groudon')
-                    return;
-                if (action.choice !== 'runSwitch' && action.choice !== 'runPrimal')
-                    break;
-            }
+            if (source.species.id === 'groudon' && source.item === 'redorb')
+                return;
             this.field.setWeather('sunnyday');
         },
         flags: {},
@@ -1221,14 +1212,12 @@ exports.Abilities = {
     },
     embodyaspectcornerstone: {
         onStart(pokemon) {
-            if (pokemon.baseSpecies.name === 'Ogerpon-Cornerstone-Tera' && !this.effectState.embodied) {
-                this.effectState.embodied = true;
+            if (pokemon.baseSpecies.name === 'Ogerpon-Cornerstone-Tera' &&
+                this.effectState.embodied !== pokemon.previouslySwitchedIn) {
+                this.effectState.embodied = pokemon.previouslySwitchedIn;
                 this.boost({ def: 1 }, pokemon);
             }
         },
-        onSwitchIn() {
-            delete this.effectState.embodied;
-        },
         flags: { failroleplay: 1, noreceiver: 1, noentrain: 1, notrace: 1, failskillswap: 1, notransform: 1 },
         name: "Embody Aspect (Cornerstone)",
         rating: 3.5,
@@ -1236,14 +1225,12 @@ exports.Abilities = {
     },
     embodyaspecthearthflame: {
         onStart(pokemon) {
-            if (pokemon.baseSpecies.name === 'Ogerpon-Hearthflame-Tera' && !this.effectState.embodied) {
-                this.effectState.embodied = true;
+            if (pokemon.baseSpecies.name === 'Ogerpon-Hearthflame-Tera' &&
+                this.effectState.embodied !== pokemon.previouslySwitchedIn) {
+                this.effectState.embodied = pokemon.previouslySwitchedIn;
                 this.boost({ atk: 1 }, pokemon);
             }
         },
-        onSwitchIn() {
-            delete this.effectState.embodied;
-        },
         flags: { failroleplay: 1, noreceiver: 1, noentrain: 1, notrace: 1, failskillswap: 1, notransform: 1 },
         name: "Embody Aspect (Hearthflame)",
         rating: 3.5,
@@ -1251,14 +1238,12 @@ exports.Abilities = {
     },
     embodyaspectteal: {
         onStart(pokemon) {
-            if (pokemon.baseSpecies.name === 'Ogerpon-Teal-Tera' && !this.effectState.embodied) {
-                this.effectState.embodied = true;
+            if (pokemon.baseSpecies.name === 'Ogerpon-Teal-Tera' &&
+                this.effectState.embodied !== pokemon.previouslySwitchedIn) {
+                this.effectState.embodied = pokemon.previouslySwitchedIn;
                 this.boost({ spe: 1 }, pokemon);
             }
         },
-        onSwitchIn() {
-            delete this.effectState.embodied;
-        },
         flags: { failroleplay: 1, noreceiver: 1, noentrain: 1, notrace: 1, failskillswap: 1, notransform: 1 },
         name: "Embody Aspect (Teal)",
         rating: 3.5,
@@ -1266,14 +1251,12 @@ exports.Abilities = {
     },
     embodyaspectwellspring: {
         onStart(pokemon) {
-            if (pokemon.baseSpecies.name === 'Ogerpon-Wellspring-Tera' && !this.effectState.embodied) {
-                this.effectState.embodied = true;
+            if (pokemon.baseSpecies.name === 'Ogerpon-Wellspring-Tera' &&
+                this.effectState.embodied !== pokemon.previouslySwitchedIn) {
+                this.effectState.embodied = pokemon.previouslySwitchedIn;
                 this.boost({ spd: 1 }, pokemon);
             }
         },
-        onSwitchIn() {
-            delete this.effectState.embodied;
-        },
         flags: { failroleplay: 1, noreceiver: 1, noentrain: 1, notrace: 1, failskillswap: 1, notransform: 1 },
         name: "Embody Aspect (Wellspring)",
         rating: 3.5,
@@ -1396,6 +1379,7 @@ exports.Abilities = {
         num: 18,
     },
     flowergift: {
+        onSwitchInPriority: -2,
         onStart(pokemon) {
             this.singleEvent('WeatherChange', this.effect, this.effectState, pokemon);
         },
@@ -1491,6 +1475,7 @@ exports.Abilities = {
         num: 218,
     },
     forecast: {
+        onSwitchInPriority: -2,
         onStart(pokemon) {
             this.singleEvent('WeatherChange', this.effect, this.effectState, pokemon);
         },
@@ -1916,6 +1901,7 @@ exports.Abilities = {
         num: 118,
     },
     hospitality: {
+        onSwitchInPriority: -2,
         onStart(pokemon) {
             for (const ally of pokemon.adjacentAllies()) {
                 this.heal(ally.baseMaxhp / 4, ally, pokemon);
@@ -2013,6 +1999,7 @@ exports.Abilities = {
         num: 115,
     },
     iceface: {
+        onSwitchInPriority: -2,
         onStart(pokemon) {
             if (this.field.isWeather(['hail', 'snow']) && pokemon.species.id === 'eiscuenoice') {
                 this.add('-activate', pokemon, 'ability: Ice Face');
@@ -2131,8 +2118,7 @@ exports.Abilities = {
             if (pokemon.illusion) {
                 this.debug('illusion cleared');
                 pokemon.illusion = null;
-                const details = pokemon.species.name + (pokemon.level === 100 ? '' : ', L' + pokemon.level) +
-                    (pokemon.gender === '' ? '' : ', ' + pokemon.gender) + (pokemon.set.shiny ? ', shiny' : '');
+                const details = pokemon.getUpdatedDetails();
                 this.add('replace', pokemon, details);
                 this.add('-end', pokemon, 'Illusion');
                 if (this.ruleTable.has('illusionlevelmod')) {
@@ -2170,20 +2156,14 @@ exports.Abilities = {
     },
     imposter: {
         onSwitchIn(pokemon) {
-            this.effectState.switchingIn = true;
-        },
-        onStart(pokemon) {
             // Imposter does not activate when Skill Swapped or when Neutralizing Gas leaves the field
-            if (!this.effectState.switchingIn)
-                return;
-            // copies across in doubles/triples
+            // Imposter copies across in doubles/triples
             // (also copies across in multibattle and diagonally in free-for-all,
             // but side.foe already takes care of those)
             const target = pokemon.side.foe.active[pokemon.side.foe.active.length - 1 - pokemon.position];
             if (target) {
                 pokemon.transformInto(target, this.dex.abilities.get('imposter'));
             }
-            this.effectState.switchingIn = false;
         },
         flags: { failroleplay: 1, noreceiver: 1, noentrain: 1, notrace: 1 },
         name: "Imposter",
@@ -2342,6 +2322,9 @@ exports.Abilities = {
         num: 51,
     },
     klutz: {
+        // Klutz isn't technically active immediately in-game, but it activates early enough to beat all items
+        // we should keep an eye out in future gens for items that activate on switch-in before Unnerve
+        onSwitchInPriority: 1,
         // Item suppression implemented in Pokemon.ignoringItem() within sim/pokemon.js
         onStart(pokemon) {
             this.singleEvent('End', pokemon.getItem(), pokemon.itemState, pokemon);
@@ -2380,7 +2363,7 @@ exports.Abilities = {
     },
     libero: {
         onPrepareHit(source, target, move) {
-            if (this.effectState.libero)
+            if (this.effectState.libero === source.previouslySwitchedIn)
                 return;
             if (move.hasBounced || move.flags['futuremove'] || move.sourceEffect === 'snatch' || move.callsMove)
                 return;
@@ -2388,13 +2371,10 @@ exports.Abilities = {
             if (type && type !== '???' && source.getTypes().join() !== type) {
                 if (!source.setType(type))
                     return;
-                this.effectState.libero = true;
+                this.effectState.libero = source.previouslySwitchedIn;
                 this.add('-start', source, 'typechange', type, '[from] ability: Libero');
             }
         },
-        onSwitchIn() {
-            delete this.effectState.libero;
-        },
         flags: {},
         name: "Libero",
         rating: 4,
@@ -2645,6 +2625,7 @@ exports.Abilities = {
         num: 196,
     },
     mimicry: {
+        onSwitchInPriority: -1,
         onStart(pokemon) {
             this.singleEvent('TerrainChange', this.effect, this.effectState, pokemon);
         },
@@ -2981,7 +2962,8 @@ exports.Abilities = {
     },
     neutralizinggas: {
         // Ability suppression implemented in sim/pokemon.ts:Pokemon#ignoringAbility
-        onPreStart(pokemon) {
+        onSwitchInPriority: 2,
+        onSwitchIn(pokemon) {
             this.add('-ability', pokemon, 'Neutralizing Gas');
             pokemon.abilityState.ending = false;
             const strongWeathers = ['desolateland', 'primordialsea', 'deltastream'];
@@ -3122,17 +3104,38 @@ exports.Abilities = {
         onFoeAfterBoost(boost, target, source, effect) {
             if (effect?.name === 'Opportunist' || effect?.name === 'Mirror Herb')
                 return;
-            const pokemon = this.effectState.target;
-            const positiveBoosts = {};
+            if (!this.effectState.boosts)
+                this.effectState.boosts = {};
+            const boostPlus = this.effectState.boosts;
             let i;
             for (i in boost) {
                 if (boost[i] > 0) {
-                    positiveBoosts[i] = boost[i];
+                    boostPlus[i] = (boostPlus[i] || 0) + boost[i];
                 }
             }
-            if (Object.keys(positiveBoosts).length < 1)
+        },
+        onAnySwitchInPriority: -3,
+        onAnySwitchIn() {
+            if (!this.effectState.boosts)
                 return;
-            this.boost(positiveBoosts, pokemon);
+            this.boost(this.effectState.boosts, this.effectState.target);
+            delete this.effectState.boosts;
+        },
+        onAnyAfterMove() {
+            if (!this.effectState.boosts)
+                return;
+            this.boost(this.effectState.boosts, this.effectState.target);
+            delete this.effectState.boosts;
+        },
+        onResidualOrder: 29,
+        onResidual(pokemon) {
+            if (!this.effectState.boosts)
+                return;
+            this.boost(this.effectState.boosts, this.effectState.target);
+            delete this.effectState.boosts;
+        },
+        onEnd() {
+            delete this.effectState.boosts;
         },
         flags: {},
         name: "Opportunist",
@@ -3259,11 +3262,8 @@ exports.Abilities = {
                 pokemon.cureStatus();
             }
         },
-        onAllySwitchIn(pokemon) {
-            if (['psn', 'tox'].includes(pokemon.status)) {
-                this.add('-activate', this.effectState.target, 'ability: Pastel Veil');
-                pokemon.cureStatus();
-            }
+        onAnySwitchIn() {
+            this.effect.onStart.call(this, this.effectState.target);
         },
         onSetStatus(status, target, source, effect) {
             if (!['psn', 'tox'].includes(status.id))
@@ -3570,7 +3570,7 @@ exports.Abilities = {
     },
     protean: {
         onPrepareHit(source, target, move) {
-            if (this.effectState.protean)
+            if (this.effectState.protean === source.previouslySwitchedIn)
                 return;
             if (move.hasBounced || move.flags['futuremove'] || move.sourceEffect === 'snatch' || move.callsMove)
                 return;
@@ -3578,19 +3578,17 @@ exports.Abilities = {
             if (type && type !== '???' && source.getTypes().join() !== type) {
                 if (!source.setType(type))
                     return;
-                this.effectState.protean = true;
+                this.effectState.protean = source.previouslySwitchedIn;
                 this.add('-start', source, 'typechange', type, '[from] ability: Protean');
             }
         },
-        onSwitchIn(pokemon) {
-            delete this.effectState.protean;
-        },
         flags: {},
         name: "Protean",
         rating: 4,
         num: 168,
     },
     protosynthesis: {
+        onSwitchInPriority: -2,
         onStart(pokemon) {
             this.singleEvent('WeatherChange', this.effect, this.effectState, pokemon);
         },
@@ -3599,8 +3597,7 @@ exports.Abilities = {
             if (this.field.isWeather('sunnyday')) {
                 pokemon.addVolatile('protosynthesis');
             }
-            else if (!pokemon.volatiles['protosynthesis']?.fromBooster && this.field.weather !== 'sunnyday') {
-                // Protosynthesis will not deactivite if Sun is suppressed, hence the direct ID check (isWeather respects supression)
+            else if (!pokemon.volatiles['protosynthesis']?.fromBooster && !this.field.isWeather('sunnyday')) {
                 pokemon.removeVolatile('protosynthesis');
             }
         },
@@ -3735,6 +3732,7 @@ exports.Abilities = {
         num: 272,
     },
     quarkdrive: {
+        onSwitchInPriority: -2,
         onStart(pokemon) {
             this.singleEvent('TerrainChange', this.effect, this.effectState, pokemon);
         },
@@ -4150,6 +4148,7 @@ exports.Abilities = {
         num: 157,
     },
     schooling: {
+        onSwitchInPriority: -1,
         onStart(pokemon) {
             if (pokemon.baseSpecies.baseSpecies !== 'Wishiwashi' || pokemon.level < 20 || pokemon.transformed)
                 return;
@@ -4353,6 +4352,7 @@ exports.Abilities = {
         num: 19,
     },
     shieldsdown: {
+        onSwitchInPriority: -1,
         onStart(pokemon) {
             if (pokemon.baseSpecies.baseSpecies !== 'Minior' || pokemon.transformed)
                 return;
@@ -5095,21 +5095,7 @@ exports.Abilities = {
         num: 309,
     },
     terashell: {
-        onEffectiveness(typeMod, target, type, move) {
-            if (!target || target.species.name !== 'Terapagos-Terastal')
-                return;
-            if (this.effectState.resisted)
-                return -1; // all hits of multi-hit move should be not very effective
-            if (move.category === 'Status' || move.id === 'struggle')
-                return;
-            if (!target.runImmunity(move.type))
-                return; // immunity has priority
-            if (target.hp < target.maxhp)
-                return;
-            this.add('-activate', target, 'ability: Tera Shell');
-            this.effectState.resisted = true;
-            return -1;
-        },
+        // effectiveness implemented in sim/pokemon.ts:Pokemon#runEffectiveness
         onAnyAfterMove() {
             this.effectState.resisted = false;
         },
@@ -5119,12 +5105,14 @@ exports.Abilities = {
         num: 308,
     },
     terashift: {
-        onPreStart(pokemon) {
+        onSwitchInPriority: 2,
+        onSwitchIn(pokemon) {
             if (pokemon.baseSpecies.baseSpecies !== 'Terapagos')
                 return;
             if (pokemon.species.forme !== 'Terastal') {
                 this.add('-activate', pokemon, 'ability: Tera Shift');
                 pokemon.formeChange('Terapagos-Terastal', this.effect, true);
+                pokemon.regressionForme = false;
                 pokemon.baseMaxhp = Math.floor(Math.floor(2 * pokemon.species.baseStats['hp'] + pokemon.set.ivs['hp'] + Math.floor(pokemon.set.evs['hp'] / 4) + 100) * pokemon.level / 100 + 10);
                 const newMaxHP = pokemon.baseMaxhp;
                 pokemon.hp = newMaxHP - (pokemon.maxhp - pokemon.hp);
@@ -5280,19 +5268,23 @@ exports.Abilities = {
     },
     trace: {
         onStart(pokemon) {
+            this.effectState.seek = true;
             // n.b. only affects Hackmons
             // interaction with No Ability is complicated: https://www.smogon.com/forums/threads/pokemon-sun-moon-battle-mechanics-research.3586701/page-76#post-7790209
             if (pokemon.adjacentFoes().some(foeActive => foeActive.ability === 'noability')) {
-                this.effectState.gaveUp = true;
+                this.effectState.seek = false;
             }
             // interaction with Ability Shield is similar to No Ability
             if (pokemon.hasItem('Ability Shield')) {
                 this.add('-block', pokemon, 'item: Ability Shield');
-                this.effectState.gaveUp = true;
+                this.effectState.seek = false;
+            }
+            if (this.effectState.seek) {
+                this.singleEvent('Update', this.effect, this.effectState, pokemon);
             }
         },
         onUpdate(pokemon) {
-            if (!pokemon.isStarted || this.effectState.gaveUp)
+            if (!this.effectState.seek)
                 return;
             const possibleTargets = pokemon.adjacentFoes().filter(target => !target.getAbility().flags['notrace'] && target.ability !== 'noability');
             if (!possibleTargets.length)
@@ -5418,10 +5410,7 @@ exports.Abilities = {
         num: 84,
     },
     unnerve: {
-        onPreStart(pokemon) {
-            this.add('-ability', pokemon, 'Unnerve');
-            this.effectState.unnerved = true;
-        },
+        onSwitchInPriority: 1,
         onStart(pokemon) {
             if (this.effectState.unnerved)
                 return;
@@ -5828,15 +5817,10 @@ exports.Abilities = {
                 return;
             if (pokemon.species.forme !== 'Hero') {
                 pokemon.formeChange('Palafin-Hero', this.effect, true);
+                pokemon.regressionForme = false;
             }
         },
-        onSwitchIn() {
-            this.effectState.switchingIn = true;
-        },
-        onStart(pokemon) {
-            if (!this.effectState.switchingIn)
-                return;
-            this.effectState.switchingIn = false;
+        onSwitchIn(pokemon) {
             if (pokemon.baseSpecies.baseSpecies !== 'Palafin')
                 return;
             if (!this.effectState.heroMessageDisplayed && pokemon.species.forme === 'Hero') {