@pkmn/sim 0.7.16 → 0.7.18

package/build/cjs/data/mods/gen8/moves.js

@@ -176,6 +176,30 @@ exports.Moves = {
         inherit: true,
         isNonstandard: null,
     },
+    fly: {
+        inherit: true,
+        onTryMove(attacker, defender, move) {
+            if (attacker.removeVolatile(move.id)) {
+                return;
+            }
+            this.add('-prepare', attacker, move.name);
+            if (!this.runEvent('ChargeMove', attacker, defender, move)) {
+                return;
+            }
+            // In SwSh, Fly's animation leaks the initial target through a camera focus
+            // The animation leak target itself isn't "accurate"; the target it reveals is as if Fly weren't a charge movee
+            // (Fly, like all other charge moves, will actually target slots on its charging turn, relevant for things like Follow Me)
+            // We use a generic single-target move to represent this
+            if (this.gameType === 'doubles' || this.gameType === 'multi') {
+                const animatedTarget = attacker.getMoveTargets(this.dex.getActiveMove('aerialace'), defender).targets[0];
+                if (animatedTarget) {
+                    this.hint(`${move.name}'s animation targeted ${animatedTarget.name}`);
+                }
+            }
+            attacker.addVolatile('twoturnmove', defender);
+            return null;
+        },
+    },
     forestscurse: {
         inherit: true,
         isNonstandard: null,

package/build/cjs/data/mods/gen8/moves.js.map

@@ -1 +1 @@
-{"version":3,"file":"moves.js","sourceRoot":"","sources":["../../../../../data/mods/gen8/moves.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"moves.js","sourceRoot":"","sources":["../../../../../data/mods/gen8/moves.ts"],"names":[],"mappings":"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"}

package/build/cjs/data/moves.js

@@ -769,6 +769,9 @@ exports.Moves = {
                 this.add('-end', pokemon, 'Attract', '[silent]');
             },
         },
+        onTryImmunity(target, source) {
+            return (target.gender === 'M' && source.gender === 'F') || (target.gender === 'F' && source.gender === 'M');
+        },
         secondary: null,
         target: "normal",
         type: "Normal",
@@ -6034,16 +6037,6 @@ exports.Moves = {
             if (!this.runEvent('ChargeMove', attacker, defender, move)) {
                 return;
             }
-            // In SwSh, Fly's animation leaks the initial target through a camera focus
-            // The animation leak target itself isn't "accurate"; the target it reveals is as if Fly weren't a charge movee
-            // (Fly, like all other charge moves, will actually target slots on its charging turn, relevant for things like Follow Me)
-            // We use a generic single-target move to represent this
-            if (this.gameType === 'doubles' || this.gameType === 'multi') {
-                const animatedTarget = attacker.getMoveTargets(this.dex.getActiveMove('aerialace'), defender).targets[0];
-                if (animatedTarget) {
-                    this.hint(`${move.name}'s animation targeted ${animatedTarget.name}`);
-                }
-            }
             attacker.addVolatile('twoturnmove', defender);
             return null;
         },
@@ -12438,7 +12431,7 @@ exports.Moves = {
         sideCondition: 'mist',
         condition: {
             duration: 5,
-            onBoost(boost, target, source, effect) {
+            onTryBoost(boost, target, source, effect) {
                 if (effect.effectType === 'Move' && effect.infiltrates && !target.isAlly(source))
                     return;
                 if (source && target !== source) {
@@ -15111,13 +15104,13 @@ exports.Moves = {
         },
         onModifyType(move, pokemon) {
             switch (pokemon.species.name) {
-                case 'Tauros-Paldea':
+                case 'Tauros-Paldea-Combat':
                     move.type = 'Fighting';
                     break;
-                case 'Tauros-Paldea-Fire':
+                case 'Tauros-Paldea-Blaze':
                     move.type = 'Fire';
                     break;
-                case 'Tauros-Paldea-Water':
+                case 'Tauros-Paldea-Aqua':
                     move.type = 'Water';
                     break;
             }
@@ -16126,7 +16119,7 @@ exports.Moves = {
                     return;
                 if (target !== source) {
                     this.debug('interrupting setStatus');
-                    if (effect.id === 'synchronize' || (effect.effectType === 'Move' && !effect.secondaries)) {
+                    if (effect.name === 'Synchronize' || (effect.effectType === 'Move' && !effect.secondaries)) {
                         this.add('-activate', target, 'move: Safeguard');
                     }
                     return null;
@@ -16173,15 +16166,16 @@ exports.Moves = {
         priority: 0,
         flags: { protect: 1, mirror: 1 },
         condition: {
-            onStart(pokemon, source) {
-                this.add('-start', pokemon, 'move: Salt Cure', '[of] ' + source);
+            noCopy: true,
+            onStart(pokemon) {
+                this.add('-start', pokemon, 'Salt Cure');
             },
             onResidualOrder: 13,
             onResidual(pokemon) {
                 this.damage(pokemon.baseMaxhp / (pokemon.hasType(['Water', 'Steel']) ? 4 : 8));
             },
             onEnd(pokemon) {
-                this.add('-end', pokemon, 'move: Salt Cure');
+                this.add('-end', pokemon, 'Salt Cure');
             },
         },
         secondary: {