@pkmn/sim 0.7.7 → 0.7.9

package/build/esm/data/abilities.mjs

@@ -55,12 +55,12 @@ export const Abilities = {
             if (move.type === 'Normal' && !noModifyType.includes(move.id) &&
                 !(move.isZ && move.category !== 'Status') && !(move.name === 'Tera Blast' && pokemon.terastallized)) {
                 move.type = 'Flying';
-                move.aerilateBoosted = true;
+                move.typeChangerBoosted = this.effect;
             }
         },
         onBasePowerPriority: 23,
         onBasePower(basePower, pokemon, target, move) {
-            if (move.aerilateBoosted)
+            if (move.typeChangerBoosted === this.effect)
                 return this.chainModify([4915, 4096]);
         },
         name: "Aerilate",
@@ -365,8 +365,13 @@ export const Abilities = {
                 return;
             this.add('-ability', pokemon, 'Beads of Ruin');
         },
-        onAnyModifySpD(spd, source, target, move) {
-            if (this.effectState.target === source)
+        onAnyModifySpD(spd, target, source, move) {
+            const abilityHolder = this.effectState.target;
+            if (abilityHolder === target)
+                return;
+            if (!move.ruinedSpD?.hasAbility('Beads of Ruin'))
+                move.ruinedSpD = abilityHolder;
+            if (move.ruinedSpD !== abilityHolder && move.ruinedSpD !== target)
                 return;
             this.debug('Beads of Ruin SpD drop');
             return this.chainModify(0.75);
@@ -524,7 +529,7 @@ export const Abilities = {
         },
         onStart(pokemon) {
             // Cloud Nine does not activate when Skill Swapped or when Neutralizing Gas leaves the field
-            if (!this.effectState.switchingIn) {
+            if (this.effectState.switchingIn) {
                 this.add('-ability', pokemon, 'Cloud Nine');
                 this.effectState.switchingIn = false;
             }
@@ -707,25 +712,31 @@ export const Abilities = {
     },
     cudchew: {
         onEatItem(item, pokemon) {
-            if (!item.isBerry)
-                return;
-            pokemon.abilityState.berry = item;
-            pokemon.addVolatile('cudchew');
+            if (item.isBerry && pokemon.addVolatile('cudchew')) {
+                pokemon.volatiles['cudchew'].berry = item;
+            }
+        },
+        onEnd(pokemon) {
+            delete pokemon.volatiles['cudchew'];
         },
         condition: {
             noCopy: true,
             duration: 2,
+            onRestart() {
+                this.effectState.duration = 2;
+            },
+            onResidualOrder: 28,
+            onResidualSubOrder: 2,
             onEnd(pokemon) {
-                if (pokemon.hp && pokemon.abilityState.berry) {
-                    const item = pokemon.abilityState.berry;
+                if (pokemon.hp) {
+                    const item = this.effectState.berry;
                     this.add('-activate', pokemon, 'ability: Cud Chew');
-                    this.add('-enditem', pokemon, item.name);
+                    this.add('-enditem', pokemon, item.name, '[eat]');
                     if (this.singleEvent('Eat', item, null, pokemon, null, null)) {
                         this.runEvent('EatItem', pokemon, null, null, item);
                     }
                     if (item.onEat)
                         pokemon.ateBerry = true;
-                    delete pokemon.abilityState.berry;
                 }
             },
         },
@@ -804,7 +815,7 @@ export const Abilities = {
         onAnyBasePower(basePower, source, target, move) {
             if (target === source || move.category === 'Status' || move.type !== 'Dark')
                 return;
-            if (!move.auraBooster)
+            if (!move.auraBooster?.hasAbility('Dark Aura'))
                 move.auraBooster = this.effectState.target;
             if (move.auraBooster !== this.effectState.target)
                 return;
@@ -1163,7 +1174,7 @@ export const Abilities = {
         onAnyBasePower(basePower, source, target, move) {
             if (target === source || move.category === 'Status' || move.type !== 'Fairy')
                 return;
-            if (!move.auraBooster)
+            if (!move.auraBooster?.hasAbility('Fairy Aura'))
                 move.auraBooster = this.effectState.target;
             if (move.auraBooster !== this.effectState.target)
                 return;
@@ -1487,12 +1498,12 @@ export const Abilities = {
             if (move.type === 'Normal' && !noModifyType.includes(move.id) &&
                 !(move.isZ && move.category !== 'Status') && !(move.name === 'Tera Blast' && pokemon.terastallized)) {
                 move.type = 'Electric';
-                move.galvanizeBoosted = true;
+                move.typeChangerBoosted = this.effect;
             }
         },
         onBasePowerPriority: 23,
         onBasePower(basePower, pokemon, target, move) {
-            if (move.galvanizeBoosted)
+            if (move.typeChangerBoosted === this.effect)
                 return this.chainModify([4915, 4096]);
         },
         name: "Galvanize",
@@ -2803,12 +2814,12 @@ export const Abilities = {
                 // TODO: Figure out actual interaction
                 !(move.name === 'Tera Blast' && pokemon.terastallized)) {
                 move.type = 'Normal';
-                move.normalizeBoosted = true;
+                move.typeChangerBoosted = this.effect;
             }
         },
         onBasePowerPriority: 23,
         onBasePower(basePower, pokemon, target, move) {
-            if (move.normalizeBoosted)
+            if (move.typeChangerBoosted === this.effect)
                 return this.chainModify([4915, 4096]);
         },
         name: "Normalize",
@@ -3091,12 +3102,12 @@ export const Abilities = {
             if (move.type === 'Normal' && !noModifyType.includes(move.id) &&
                 !(move.isZ && move.category !== 'Status') && !(move.name === 'Tera Blast' && pokemon.terastallized)) {
                 move.type = 'Fairy';
-                move.pixilateBoosted = true;
+                move.typeChangerBoosted = this.effect;
             }
         },
         onBasePowerPriority: 23,
         onBasePower(basePower, pokemon, target, move) {
-            if (move.pixilateBoosted)
+            if (move.typeChangerBoosted === this.effect)
                 return this.chainModify([4915, 4096]);
         },
         name: "Pixilate",
@@ -3615,12 +3626,12 @@ export const Abilities = {
             if (move.type === 'Normal' && !noModifyType.includes(move.id) &&
                 !(move.isZ && move.category !== 'Status') && !(move.name === 'Tera Blast' && pokemon.terastallized)) {
                 move.type = 'Ice';
-                move.refrigerateBoosted = true;
+                move.typeChangerBoosted = this.effect;
             }
         },
         onBasePowerPriority: 23,
         onBasePower(basePower, pokemon, target, move) {
-            if (move.refrigerateBoosted)
+            if (move.typeChangerBoosted === this.effect)
                 return this.chainModify([4915, 4096]);
         },
         name: "Refrigerate",
@@ -4615,8 +4626,13 @@ export const Abilities = {
                 return;
             this.add('-ability', pokemon, 'Sword of Ruin');
         },
-        onAnyModifyDef(def, source, target, move) {
-            if (this.effectState.target === source)
+        onAnyModifyDef(def, target, source, move) {
+            const abilityHolder = this.effectState.target;
+            if (abilityHolder === target)
+                return;
+            if (!move.ruinedDef?.hasAbility('Sword of Ruin'))
+                move.ruinedDef = abilityHolder;
+            if (move.ruinedDef !== abilityHolder && move.ruinedDef !== target)
                 return;
             this.debug('Sword of Ruin Def drop');
             // TODO Placeholder
@@ -4633,7 +4649,12 @@ export const Abilities = {
             this.add('-ability', pokemon, 'Tablets of Ruin');
         },
         onAnyModifyAtk(atk, source, target, move) {
-            if (this.effectState.target === source)
+            const abilityHolder = this.effectState.target;
+            if (abilityHolder === source)
+                return;
+            if (!move.ruinedAtk)
+                move.ruinedAtk = abilityHolder;
+            if (move.ruinedAtk !== abilityHolder)
                 return;
             this.debug('Tablets of Ruin Atk drop');
             // TODO Placeholder
@@ -4983,9 +5004,14 @@ export const Abilities = {
             this.add('-ability', pokemon, 'Vessel of Ruin');
         },
         onAnyModifySpA(spa, source, target, move) {
-            if (this.effectState.target === source)
+            const abilityHolder = this.effectState.target;
+            if (abilityHolder === source)
+                return;
+            if (!move.ruinedSpA)
+                move.ruinedSpA = abilityHolder;
+            if (move.ruinedSpA !== abilityHolder)
                 return;
-            this.debug('Vessel of Ruin Spa drop');
+            this.debug('Vessel of Ruin SpA drop');
             // TODO Placeholder
             return this.chainModify(0.75);
         },