@pkmn/sim 0.8.3 → 0.8.4

package/build/cjs/data/moves.js

@@ -2975,14 +2975,14 @@ exports.Moves = {
         priority: 0,
         flags: { protect: 1, mirror: 1 },
         onHit(target) {
-            if (target.getAbility().isPermanent)
+            if (target.getAbility().flags['cantsuppress'])
                 return;
             if (target.newlySwitched || this.queue.willMove(target))
                 return;
             target.addVolatile('gastroacid');
         },
         onAfterSubDamage(damage, target) {
-            if (target.getAbility().isPermanent)
+            if (target.getAbility().flags['cantsuppress'])
                 return;
             if (target.newlySwitched || this.queue.willMove(target))
                 return;
@@ -3978,16 +3978,18 @@ exports.Moves = {
         flags: {},
         onHit(target, source, move) {
             let success = false;
-            for (const pokemon of source.alliesAndSelf()) {
-                if (pokemon.ability === target.ability)
-                    continue;
-                const oldAbility = pokemon.setAbility(target.ability);
-                if (oldAbility) {
-                    this.add('-ability', pokemon, target.getAbility().name, '[from] move: Doodle');
-                    success = true;
-                }
-                else if (!success && oldAbility === null) {
-                    success = null;
+            if (!target.getAbility().flags['failroleplay']) {
+                for (const pokemon of source.alliesAndSelf()) {
+                    if (pokemon.ability === target.ability || pokemon.getAbility().flags['cantsuppress'])
+                        continue;
+                    const oldAbility = pokemon.setAbility(target.ability);
+                    if (oldAbility) {
+                        this.add('-ability', pokemon, target.getAbility().name, '[from] move: Doodle');
+                        success = true;
+                    }
+                    else if (!success && oldAbility === null) {
+                        success = null;
+                    }
                 }
             }
             if (!success) {
@@ -5075,13 +5077,9 @@ exports.Moves = {
         onTryHit(target, source) {
             if (target === source || target.volatiles['dynamax'])
                 return false;
-            const additionalBannedSourceAbilities = [
-                // Zen Mode included here for compatability with Gen 5-6
-                'commander', 'flowergift', 'forecast', 'hungerswitch', 'illusion', 'imposter', 'neutralizinggas', 'powerofalchemy', 'receiver', 'trace', 'zenmode',
-            ];
             if (target.ability === source.ability ||
-                target.getAbility().isPermanent || target.ability === 'truant' ||
-                source.getAbility().isPermanent || additionalBannedSourceAbilities.includes(source.ability)) {
+                target.getAbility().flags['cantsuppress'] || target.ability === 'truant' ||
+                source.getAbility().flags['noentrain']) {
                 return false;
             }
         },
@@ -5460,6 +5458,7 @@ exports.Moves = {
         flags: { protect: 1, mirror: 1 },
         onBasePower(basePower, pokemon) {
             if (this.randomChance(3, 10)) {
+                this.attrLastMove('[anim] Fickle Beam All Out');
                 this.add('-activate', pokemon, 'move: Fickle Beam');
                 return this.chainModify(2);
             }
@@ -5623,7 +5622,7 @@ exports.Moves = {
                 this.add('-combine');
                 return 150;
             }
-            return 80;
+            return move.basePower;
         },
         category: "Special",
         name: "Fire Pledge",
@@ -6724,7 +6723,7 @@ exports.Moves = {
         flags: { protect: 1, reflectable: 1, mirror: 1, allyanim: 1 },
         volatileStatus: 'gastroacid',
         onTryHit(target) {
-            if (target.getAbility().isPermanent) {
+            if (target.getAbility().flags['cantsuppress']) {
                 return false;
             }
             if (target.hasItem('Ability Shield')) {
@@ -6741,7 +6740,7 @@ exports.Moves = {
                 this.singleEvent('End', pokemon.getAbility(), pokemon.abilityState, pokemon, pokemon, 'gastroacid');
             },
             onCopy(pokemon) {
-                if (pokemon.getAbility().isPermanent)
+                if (pokemon.getAbility().flags['cantsuppress'])
                     pokemon.removeVolatile('gastroacid');
             },
         },
@@ -7948,7 +7947,7 @@ exports.Moves = {
                 this.add('-combine');
                 return 150;
             }
-            return 80;
+            return move.basePower;
         },
         category: "Special",
         name: "Grass Pledge",
@@ -16115,14 +16114,8 @@ exports.Moves = {
         onTryHit(target, source) {
             if (target.ability === source.ability)
                 return false;
-            const additionalBannedTargetAbilities = [
-                // Zen Mode included here for compatability with Gen 5-6
-                'commander', 'flowergift', 'forecast', 'hungerswitch', 'illusion', 'imposter', 'neutralizinggas', 'powerofalchemy', 'receiver', 'trace', 'wonderguard', 'zenmode',
-            ];
-            if (target.getAbility().isPermanent || additionalBannedTargetAbilities.includes(target.ability) ||
-                source.getAbility().isPermanent) {
+            if (target.getAbility().flags['failroleplay'] || source.getAbility().flags['cantsuppress'])
                 return false;
-            }
         },
         onHit(target, source) {
             const oldAbility = source.setAbility(target.ability);
@@ -17365,7 +17358,7 @@ exports.Moves = {
         priority: 0,
         flags: { protect: 1, reflectable: 1, mirror: 1, allyanim: 1 },
         onTryHit(target) {
-            if (target.getAbility().isPermanent || target.ability === 'simple' || target.ability === 'truant') {
+            if (target.getAbility().flags['cantsuppress'] || target.ability === 'simple' || target.ability === 'truant') {
                 return false;
             }
         },
@@ -17484,13 +17477,9 @@ exports.Moves = {
         priority: 0,
         flags: { protect: 1, mirror: 1, bypasssub: 1, allyanim: 1 },
         onTryHit(target, source) {
-            const additionalBannedAbilities = ['hungerswitch', 'illusion', 'neutralizinggas', 'wonderguard', 'terashell'];
             const targetAbility = target.getAbility();
             const sourceAbility = source.getAbility();
-            // TODO: research in what order these should be checked
-            if (target.volatiles['dynamax'] ||
-                targetAbility.isPermanent || sourceAbility.isPermanent ||
-                additionalBannedAbilities.includes(target.ability) || additionalBannedAbilities.includes(source.ability)) {
+            if (sourceAbility.flags['failskillswap'] || targetAbility.flags['failskillswap'] || target.volatiles['dynamax']) {
                 return false;
             }
             const sourceCanBeSet = this.runEvent('SetAbility', source, source, this.effect, targetAbility);
@@ -20273,7 +20262,7 @@ exports.Moves = {
             if (pokemon.terastallized === 'Stellar') {
                 return 100;
             }
-            return 80;
+            return move.basePower;
         },
         category: "Special",
         name: "Tera Blast",
@@ -21669,7 +21658,7 @@ exports.Moves = {
                 this.add('-combine');
                 return 150;
             }
-            return 80;
+            return move.basePower;
         },
         category: "Special",
         name: "Water Pledge",
@@ -22230,7 +22219,7 @@ exports.Moves = {
             }
         },
         onTryHit(target) {
-            if (target.getAbility().isPermanent) {
+            if (target.getAbility().flags['cantsuppress']) {
                 return false;
             }
         },