@pkmn/sim 0.7.8 → 0.7.10

package/build/cjs/data/abilities.js

@@ -58,12 +58,12 @@ exports.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",
@@ -368,8 +368,13 @@ exports.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);
@@ -527,7 +532,7 @@ exports.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;
             }
@@ -710,14 +715,19 @@ exports.Abilities = {
     },
     cudchew: {
         onEatItem(item, pokemon) {
-            if (item.isBerry) {
-                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) {
@@ -808,7 +818,7 @@ exports.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;
@@ -1167,7 +1177,7 @@ exports.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;
@@ -1491,12 +1501,12 @@ exports.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",
@@ -2807,12 +2817,12 @@ exports.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",
@@ -3095,12 +3105,12 @@ exports.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",
@@ -3619,12 +3629,12 @@ exports.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",
@@ -4619,8 +4629,13 @@ exports.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
@@ -4637,7 +4652,12 @@ exports.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
@@ -4987,9 +5007,14 @@ exports.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);
         },