@pkmn/sim 0.7.16 → 0.7.18

package/build/cjs/data/abilities.js

@@ -140,23 +140,23 @@ exports.Abilities = {
             if (effect.effectType === "Move" &&
                 !effect.multihit &&
                 (!effect.negateSecondary && !(effect.hasSheerForce && source.hasAbility('sheerforce')))) {
-                target.abilityState.checkedAngerShell = false;
+                this.effectState.checkedAngerShell = false;
             }
             else {
-                target.abilityState.checkedAngerShell = true;
+                this.effectState.checkedAngerShell = true;
             }
         },
-        onTryEatItem(item, pokemon) {
+        onTryEatItem(item) {
             const healingItems = [
                 'aguavberry', 'enigmaberry', 'figyberry', 'iapapaberry', 'magoberry', 'sitrusberry', 'wikiberry', 'oranberry', 'berryjuice',
             ];
             if (healingItems.includes(item.id)) {
-                return pokemon.abilityState.checkedAngerShell;
+                return this.effectState.checkedAngerShell;
             }
             return true;
         },
         onAfterMoveSecondary(target, source, move) {
-            target.abilityState.checkedAngerShell = true;
+            this.effectState.checkedAngerShell = true;
             if (!source || source === target || !target.hp || !move.totalDamage)
                 return;
             const lastAttackedBy = target.getLastAttackedBy();
@@ -164,7 +164,7 @@ exports.Abilities = {
                 return;
             const damage = move.multihit ? move.totalDamage : lastAttackedBy.damage;
             if (target.hp <= target.maxhp / 2 && target.hp + damage > target.maxhp / 2) {
-                this.boost({ atk: 1, spa: 1, spe: 1, def: -1, spd: -1 });
+                this.boost({ atk: 1, spa: 1, spe: 1, def: -1, spd: -1 }, target, target);
             }
         },
         name: "Anger Shell",
@@ -370,11 +370,11 @@ exports.Abilities = {
         },
         onAnyModifySpD(spd, target, source, move) {
             const abilityHolder = this.effectState.target;
-            if (abilityHolder === target)
+            if (target.hasAbility('Beads of Ruin'))
                 return;
             if (!move.ruinedSpD?.hasAbility('Beads of Ruin'))
                 move.ruinedSpD = abilityHolder;
-            if (move.ruinedSpD !== abilityHolder && move.ruinedSpD !== target)
+            if (move.ruinedSpD !== abilityHolder)
                 return;
             this.debug('Beads of Ruin SpD drop');
             return this.chainModify(0.75);
@@ -399,23 +399,23 @@ exports.Abilities = {
             if (effect.effectType === "Move" &&
                 !effect.multihit &&
                 (!effect.negateSecondary && !(effect.hasSheerForce && source.hasAbility('sheerforce')))) {
-                target.abilityState.checkedBerserk = false;
+                this.effectState.checkedBerserk = false;
             }
             else {
-                target.abilityState.checkedBerserk = true;
+                this.effectState.checkedBerserk = true;
             }
         },
-        onTryEatItem(item, pokemon) {
+        onTryEatItem(item) {
             const healingItems = [
                 'aguavberry', 'enigmaberry', 'figyberry', 'iapapaberry', 'magoberry', 'sitrusberry', 'wikiberry', 'oranberry', 'berryjuice',
             ];
             if (healingItems.includes(item.id)) {
-                return pokemon.abilityState.checkedBerserk;
+                return this.effectState.checkedBerserk;
             }
             return true;
         },
         onAfterMoveSecondary(target, source, move) {
-            target.abilityState.checkedBerserk = true;
+            this.effectState.checkedBerserk = true;
             if (!source || source === target || !target.hp || !move.totalDamage)
                 return;
             const lastAttackedBy = target.getLastAttackedBy();
@@ -423,7 +423,7 @@ exports.Abilities = {
                 return;
             const damage = move.multihit ? move.totalDamage : lastAttackedBy.damage;
             if (target.hp <= target.maxhp / 2 && target.hp + damage > target.maxhp / 2) {
-                this.boost({ spa: 1 });
+                this.boost({ spa: 1 }, target, target);
             }
         },
         name: "Berserk",
@@ -431,7 +431,7 @@ exports.Abilities = {
         num: 201,
     },
     bigpecks: {
-        onBoost(boost, target, source, effect) {
+        onTryBoost(boost, target, source, effect) {
             if (source && target === source)
                 return;
             if (boost.def && boost.def < 0) {
@@ -506,7 +506,7 @@ exports.Abilities = {
         num: 34,
     },
     clearbody: {
-        onBoost(boost, target, source, effect) {
+        onTryBoost(boost, target, source, effect) {
             if (source && target === source)
                 return;
             let showMsg = false;
@@ -652,7 +652,7 @@ exports.Abilities = {
         num: 14,
     },
     contrary: {
-        onBoost(boost, target, source, effect) {
+        onChangeBoost(boost, target, source, effect) {
             if (effect && effect.id === 'zpower')
                 return;
             let i;
@@ -1096,6 +1096,12 @@ exports.Abilities = {
         rating: 3,
         num: 87,
     },
+    earlybird: {
+        name: "Early Bird",
+        // Implemented in statuses.js
+        rating: 1.5,
+        num: 48,
+    },
     eartheater: {
         onTryHit(target, source, move) {
             if (target !== source && move.type === 'Ground') {
@@ -1110,12 +1116,6 @@ exports.Abilities = {
         rating: 3.5,
         num: 297,
     },
-    earlybird: {
-        name: "Early Bird",
-        // Implemented in statuses.js
-        rating: 1.5,
-        num: 48,
-    },
     effectspore: {
         onDamagingHit(damage, target, source, move) {
             if (this.checkMoveMakesContact(move, source, target) && !source.status && source.runStatusImmunity('powder')) {
@@ -1306,7 +1306,7 @@ exports.Abilities = {
         num: 122,
     },
     flowerveil: {
-        onAllyBoost(boost, target, source, effect) {
+        onAllyTryBoost(boost, target, source, effect) {
             if ((source && target === source) || !target.hasType('Grass'))
                 return;
             let showMsg = false;
@@ -1325,7 +1325,7 @@ exports.Abilities = {
         onAllySetStatus(status, target, source, effect) {
             if (target.hasType('Grass') && source && target !== source && effect && effect.id !== 'yawn') {
                 this.debug('interrupting setStatus with Flower Veil');
-                if (effect.id === 'synchronize' || (effect.effectType === 'Move' && !effect.secondaries)) {
+                if (effect.name === 'Synchronize' || (effect.effectType === 'Move' && !effect.secondaries)) {
                     const effectHolder = this.effectState.target;
                     this.add('-block', target, 'ability: Flower Veil', '[of] ' + effectHolder);
                 }
@@ -1455,7 +1455,7 @@ exports.Abilities = {
         num: 119,
     },
     fullmetalbody: {
-        onBoost(boost, target, source, effect) {
+        onTryBoost(boost, target, source, effect) {
             if (source && target === source)
                 return;
             let showMsg = false;
@@ -1630,8 +1630,8 @@ exports.Abilities = {
             this.add('-activate', pokemon, 'ability: Guard Dog');
             return null;
         },
-        onBoost(boost, target, source, effect) {
-            if (effect.name === 'Intimidate') {
+        onTryBoost(boost, target, source, effect) {
+            if (effect.name === 'Intimidate' && boost.atk) {
                 delete boost.atk;
                 this.boost({ atk: 1 }, target, target, null, false, true);
             }
@@ -1819,7 +1819,7 @@ exports.Abilities = {
         num: 93,
     },
     hypercutter: {
-        onBoost(boost, target, source, effect) {
+        onTryBoost(boost, target, source, effect) {
             if (source && target === source)
                 return;
             if (boost.atk && boost.atk < 0) {
@@ -2028,8 +2028,8 @@ exports.Abilities = {
             if (status.id === 'flinch')
                 return null;
         },
-        onBoost(boost, target, source, effect) {
-            if (effect.name === 'Intimidate') {
+        onTryBoost(boost, target, source, effect) {
+            if (effect.name === 'Intimidate' && boost.atk) {
                 delete boost.atk;
                 this.add('-fail', target, 'unboost', 'Attack', '[from] ability: Inner Focus', '[of] ' + target);
             }
@@ -2125,7 +2125,7 @@ exports.Abilities = {
         num: 154,
     },
     keeneye: {
-        onBoost(boost, target, source, effect) {
+        onTryBoost(boost, target, source, effect) {
             if (source && target === source)
                 return;
             if (boost.accuracy && boost.accuracy < 0) {
@@ -2236,23 +2236,6 @@ exports.Abilities = {
         rating: 3,
         num: 31,
     },
-    lingeringaroma: {
-        onDamagingHit(damage, target, source, move) {
-            const sourceAbility = source.getAbility();
-            if (sourceAbility.isPermanent || sourceAbility.id === 'lingeringaroma') {
-                return;
-            }
-            if (this.checkMoveMakesContact(move, source, target, !source.isAlly(target))) {
-                const oldAbility = source.setAbility('lingeringaroma', target);
-                if (oldAbility) {
-                    this.add('-activate', target, 'ability: Lingering Aroma', this.dex.abilities.get(oldAbility).name, '[of] ' + source);
-                }
-            }
-        },
-        name: "Lingering Aroma",
-        rating: 2,
-        num: 268,
-    },
     limber: {
         onUpdate(pokemon) {
             if (pokemon.status === 'par') {
@@ -2273,6 +2256,23 @@ exports.Abilities = {
         rating: 2,
         num: 7,
     },
+    lingeringaroma: {
+        onDamagingHit(damage, target, source, move) {
+            const sourceAbility = source.getAbility();
+            if (sourceAbility.isPermanent || sourceAbility.id === 'lingeringaroma') {
+                return;
+            }
+            if (this.checkMoveMakesContact(move, source, target, !source.isAlly(target))) {
+                const oldAbility = source.setAbility('lingeringaroma', target);
+                if (oldAbility) {
+                    this.add('-activate', target, 'ability: Lingering Aroma', this.dex.abilities.get(oldAbility).name, '[of] ' + source);
+                }
+            }
+        },
+        name: "Lingering Aroma",
+        rating: 2,
+        num: 268,
+    },
     liquidooze: {
         onSourceTryHeal(damage, target, source, effect) {
             this.debug("Heal is occurring: " + target + " <- " + source + " :: " + effect.id);
@@ -2488,7 +2488,7 @@ exports.Abilities = {
         num: 58,
     },
     mirrorarmor: {
-        onBoost(boost, target, source, effect) {
+        onTryBoost(boost, target, source, effect) {
             // Don't bounce self stat changes, or boosts that have already bounced
             if (target === source || !boost || effect.name === 'Mirror Armor')
                 return;
@@ -2853,8 +2853,8 @@ exports.Abilities = {
                 return null;
             }
         },
-        onBoost(boost, target, source, effect) {
-            if (effect.name === 'Intimidate') {
+        onTryBoost(boost, target, source, effect) {
+            if (effect.name === 'Intimidate' && boost.atk) {
                 delete boost.atk;
                 this.add('-fail', target, 'unboost', 'Attack', '[from] ability: Oblivious', '[of] ' + target);
             }
@@ -2866,7 +2866,7 @@ exports.Abilities = {
     },
     opportunist: {
         onFoeAfterBoost(boost, target, source, effect) {
-            if (effect?.fullname?.endsWith('Opportunist') || effect?.fullname?.endsWith('Mirror Herb'))
+            if (effect?.name === 'Opportunist' || effect?.name === 'Mirror Herb')
                 return;
             const pokemon = this.effectState.target;
             const positiveBoosts = {};
@@ -2961,8 +2961,8 @@ exports.Abilities = {
                 this.add('-immune', target, 'confusion', '[from] ability: Own Tempo');
             }
         },
-        onBoost(boost, target, source, effect) {
-            if (effect.name === 'Intimidate') {
+        onTryBoost(boost, target, source, effect) {
+            if (effect.name === 'Intimidate' && boost.atk) {
                 delete boost.atk;
                 this.add('-fail', target, 'unboost', 'Attack', '[from] ability: Own Tempo', '[of] ' + target);
             }
@@ -3591,7 +3591,7 @@ exports.Abilities = {
             }
         },
         onAfterBoost(boost, target, source, effect) {
-            if (effect && effect.id === 'intimidate') {
+            if (effect?.name === 'Intimidate') {
                 this.boost({ spe: 1 });
             }
         },
@@ -3668,7 +3668,7 @@ exports.Abilities = {
             if (effect.isBerry)
                 return this.chainModify(2);
         },
-        onBoost(boost, target, source, effect) {
+        onChangeBoost(boost, target, source, effect) {
             if (effect && effect.isBerry) {
                 let b;
                 for (b in boost) {
@@ -3906,8 +3906,8 @@ exports.Abilities = {
                 move.ignoreImmunity['Normal'] = true;
             }
         },
-        onBoost(boost, target, source, effect) {
-            if (effect.name === 'Intimidate') {
+        onTryBoost(boost, target, source, effect) {
+            if (effect.name === 'Intimidate' && boost.atk) {
                 delete boost.atk;
                 this.add('-fail', target, 'unboost', 'Attack', '[from] ability: Scrappy', '[of] ' + target);
             }
@@ -4106,7 +4106,7 @@ exports.Abilities = {
         num: 197,
     },
     simple: {
-        onBoost(boost, target, source, effect) {
+        onChangeBoost(boost, target, source, effect) {
             if (effect && effect.id === 'zpower')
                 return;
             let i;
@@ -4640,14 +4640,13 @@ exports.Abilities = {
         },
         onAnyModifyDef(def, target, source, move) {
             const abilityHolder = this.effectState.target;
-            if (abilityHolder === target)
+            if (target.hasAbility('Sword of Ruin'))
                 return;
             if (!move.ruinedDef?.hasAbility('Sword of Ruin'))
                 move.ruinedDef = abilityHolder;
-            if (move.ruinedDef !== abilityHolder && move.ruinedDef !== target)
+            if (move.ruinedDef !== abilityHolder)
                 return;
             this.debug('Sword of Ruin Def drop');
-            // TODO Placeholder
             return this.chainModify(0.75);
         },
         name: "Sword of Ruin",
@@ -4662,14 +4661,13 @@ exports.Abilities = {
         },
         onAnyModifyAtk(atk, source, target, move) {
             const abilityHolder = this.effectState.target;
-            if (abilityHolder === source)
+            if (source.hasAbility('Tablets of Ruin'))
                 return;
             if (!move.ruinedAtk)
                 move.ruinedAtk = abilityHolder;
             if (move.ruinedAtk !== abilityHolder)
                 return;
             this.debug('Tablets of Ruin Atk drop');
-            // TODO Placeholder
             return this.chainModify(0.75);
         },
         name: "Tablets of Ruin",
@@ -5017,14 +5015,13 @@ exports.Abilities = {
         },
         onAnyModifySpA(spa, source, target, move) {
             const abilityHolder = this.effectState.target;
-            if (abilityHolder === source)
+            if (source.hasAbility('Vessel of Ruin'))
                 return;
             if (!move.ruinedSpA)
                 move.ruinedSpA = abilityHolder;
             if (move.ruinedSpA !== abilityHolder)
                 return;
             this.debug('Vessel of Ruin SpA drop');
-            // TODO Placeholder
             return this.chainModify(0.75);
         },
         name: "Vessel of Ruin",
@@ -5214,7 +5211,7 @@ exports.Abilities = {
         num: 273,
     },
     whitesmoke: {
-        onBoost(boost, target, source, effect) {
+        onTryBoost(boost, target, source, effect) {
             if (source && target === source)
                 return;
             let showMsg = false;
@@ -5374,20 +5371,20 @@ exports.Abilities = {
     },
     zerotohero: {
         onSwitchOut(pokemon) {
-            if (pokemon.baseSpecies.baseSpecies !== 'Palafin')
+            if (pokemon.baseSpecies.baseSpecies !== 'Palafin' || pokemon.transformed)
                 return;
             if (pokemon.species.forme !== 'Hero') {
-                pokemon.formeChange('Palafin-Hero', this.effect, true, '[silent]');
+                pokemon.formeChange('Palafin-Hero', this.effect, true);
+                this.effectState.sendHeroMessage = true;
             }
         },
-        onSwitchIn(pokemon) {
-            if (pokemon.baseSpecies.baseSpecies !== 'Palafin' || pokemon.species.forme !== 'Hero')
-                return;
-            if (!this.effectState.heroMessageDisplayed) {
+        onStart(pokemon) {
+            if (this.effectState.sendHeroMessage) {
                 this.add('-activate', pokemon, 'ability: Zero to Hero');
-                this.effectState.heroMessageDisplayed = true;
+                this.effectState.sendHeroMessage = false;
             }
         },
+        isPermanent: true,
         name: "Zero to Hero",
         rating: 5,
         num: 278,