@pkmn/sim 0.10.1 → 0.10.3

package/build/cjs/data/moves.js

@@ -3813,6 +3813,33 @@ exports.Moves = {
         type: "Ground",
         contestType: "Tough",
     },
+    direclaw: {
+        num: 827,
+        accuracy: 100,
+        basePower: 80,
+        category: "Physical",
+        name: "Dire Claw",
+        pp: 15,
+        priority: 0,
+        flags: { contact: 1, protect: 1, mirror: 1, metronome: 1 },
+        secondary: {
+            chance: 50,
+            onHit(target, source) {
+                const result = this.random(3);
+                if (result === 0) {
+                    target.trySetStatus('psn', source);
+                }
+                else if (result === 1) {
+                    target.trySetStatus('par', source);
+                }
+                else {
+                    target.trySetStatus('slp', source);
+                }
+            },
+        },
+        target: "normal",
+        type: "Poison",
+    },
     disable: {
         num: 50,
         accuracy: 100,
@@ -3824,7 +3851,7 @@ exports.Moves = {
         flags: { protect: 1, reflectable: 1, mirror: 1, bypasssub: 1, metronome: 1 },
         volatileStatus: 'disable',
         onTryHit(target) {
-            if (!target.lastMove || target.lastMove.isZ || target.lastMove.isMax || target.lastMove.id === 'struggle') {
+            if (!target.lastMove || target.lastMove.isZOrMaxPowered || target.lastMove.isMax || target.lastMove.id === 'struggle') {
                 return false;
             }
         },
@@ -3863,7 +3890,7 @@ exports.Moves = {
             },
             onBeforeMovePriority: 7,
             onBeforeMove(attacker, defender, move) {
-                if (!move.isZ && move.id === this.effectState.move) {
+                if (!(move.isZ && move.isZOrMaxPowered) && move.id === this.effectState.move) {
                     this.add('cant', attacker, 'Disable', move);
                     return false;
                 }
@@ -3913,33 +3940,6 @@ exports.Moves = {
         type: "Electric",
         contestType: "Beautiful",
     },
-    direclaw: {
-        num: 827,
-        accuracy: 100,
-        basePower: 80,
-        category: "Physical",
-        name: "Dire Claw",
-        pp: 15,
-        priority: 0,
-        flags: { contact: 1, protect: 1, mirror: 1, metronome: 1 },
-        secondary: {
-            chance: 50,
-            onHit(target, source) {
-                const result = this.random(3);
-                if (result === 0) {
-                    target.trySetStatus('psn', source);
-                }
-                else if (result === 1) {
-                    target.trySetStatus('par', source);
-                }
-                else {
-                    target.trySetStatus('slp', source);
-                }
-            },
-        },
-        target: "normal",
-        type: "Poison",
-    },
     dive: {
         num: 291,
         accuracy: 100,
@@ -4984,10 +4984,11 @@ exports.Moves = {
                 let move = target.lastMove;
                 if (!move || target.volatiles['dynamax'])
                     return false;
+                // Encore only works on Max Moves if the base move is not itself a Max Move
                 if (move.isMax && move.baseMove)
                     move = this.dex.moves.get(move.baseMove);
                 const moveSlot = target.getMoveData(move.id);
-                if (move.isZ || move.flags['failencore'] || !moveSlot || moveSlot.pp <= 0) {
+                if (move.isZ || move.isMax || move.flags['failencore'] || !moveSlot || moveSlot.pp <= 0) {
                     // it failed
                     return false;
                 }
@@ -5891,15 +5892,15 @@ exports.Moves = {
         type: "Fire",
         contestType: "Cool",
     },
-    flamewheel: {
-        num: 172,
+    flamethrower: {
+        num: 53,
         accuracy: 100,
-        basePower: 60,
-        category: "Physical",
-        name: "Flame Wheel",
-        pp: 25,
+        basePower: 90,
+        category: "Special",
+        name: "Flamethrower",
+        pp: 15,
         priority: 0,
-        flags: { contact: 1, protect: 1, mirror: 1, defrost: 1, metronome: 1 },
+        flags: { protect: 1, mirror: 1, metronome: 1 },
         secondary: {
             chance: 10,
             status: 'brn',
@@ -5908,15 +5909,15 @@ exports.Moves = {
         type: "Fire",
         contestType: "Beautiful",
     },
-    flamethrower: {
-        num: 53,
+    flamewheel: {
+        num: 172,
         accuracy: 100,
-        basePower: 90,
-        category: "Special",
-        name: "Flamethrower",
-        pp: 15,
+        basePower: 60,
+        category: "Physical",
+        name: "Flame Wheel",
+        pp: 25,
         priority: 0,
-        flags: { protect: 1, mirror: 1, metronome: 1 },
+        flags: { contact: 1, protect: 1, mirror: 1, defrost: 1, metronome: 1 },
         secondary: {
             chance: 10,
             status: 'brn',
@@ -9999,7 +10000,7 @@ exports.Moves = {
             },
             onFoeBeforeMovePriority: 4,
             onFoeBeforeMove(attacker, defender, move) {
-                if (move.id !== 'struggle' && this.effectState.source.hasMove(move.id) && !move.isZ && !move.isMax) {
+                if (move.id !== 'struggle' && this.effectState.source.hasMove(move.id) && !move.isZOrMaxPowered) {
                     this.add('cant', attacker, 'move: Imprison', move);
                     return false;
                 }
@@ -13052,6 +13053,25 @@ exports.Moves = {
         type: "Ground",
         contestType: "Cute",
     },
+    muddywater: {
+        num: 330,
+        accuracy: 85,
+        basePower: 90,
+        category: "Special",
+        name: "Muddy Water",
+        pp: 10,
+        priority: 0,
+        flags: { protect: 1, mirror: 1, nonsky: 1, metronome: 1 },
+        secondary: {
+            chance: 30,
+            boosts: {
+                accuracy: -1,
+            },
+        },
+        target: "allAdjacentFoes",
+        type: "Water",
+        contestType: "Tough",
+    },
     mudshot: {
         num: 341,
         accuracy: 95,
@@ -13125,25 +13145,6 @@ exports.Moves = {
         zMove: { boost: { spd: 1 } },
         contestType: "Cute",
     },
-    muddywater: {
-        num: 330,
-        accuracy: 85,
-        basePower: 90,
-        category: "Special",
-        name: "Muddy Water",
-        pp: 10,
-        priority: 0,
-        flags: { protect: 1, mirror: 1, nonsky: 1, metronome: 1 },
-        secondary: {
-            chance: 30,
-            boosts: {
-                accuracy: -1,
-            },
-        },
-        target: "allAdjacentFoes",
-        type: "Water",
-        contestType: "Tough",
-    },
     multiattack: {
         num: 718,
         accuracy: 100,
@@ -14785,42 +14786,6 @@ exports.Moves = {
         target: "normal",
         type: "Psychic",
     },
-    psychup: {
-        num: 244,
-        accuracy: true,
-        basePower: 0,
-        category: "Status",
-        name: "Psych Up",
-        pp: 10,
-        priority: 0,
-        flags: { bypasssub: 1, allyanim: 1, metronome: 1 },
-        onHit(target, source) {
-            let i;
-            for (i in target.boosts) {
-                source.boosts[i] = target.boosts[i];
-            }
-            const volatilesToCopy = ['dragoncheer', 'focusenergy', 'gmaxchistrike', 'laserfocus'];
-            // we need to remove all crit stage volatiles first; otherwise copying e.g. dragoncheer onto a mon with focusenergy
-            // will crash the server (since addVolatile fails due to overlap, leaving the source mon with no hasDragonType to set)
-            for (const volatile of volatilesToCopy)
-                source.removeVolatile(volatile);
-            for (const volatile of volatilesToCopy) {
-                if (target.volatiles[volatile]) {
-                    source.addVolatile(volatile);
-                    if (volatile === 'gmaxchistrike')
-                        source.volatiles[volatile].layers = target.volatiles[volatile].layers;
-                    if (volatile === 'dragoncheer')
-                        source.volatiles[volatile].hasDragonType = target.volatiles[volatile].hasDragonType;
-                }
-            }
-            this.add('-copyboost', source, target, '[from] move: Psych Up');
-        },
-        secondary: null,
-        target: "normal",
-        type: "Normal",
-        zMove: { effect: 'heal' },
-        contestType: "Clever",
-    },
     psychic: {
         num: 94,
         accuracy: 100,
@@ -14999,6 +14964,42 @@ exports.Moves = {
         zMove: { boost: { spa: 2 } },
         contestType: "Clever",
     },
+    psychup: {
+        num: 244,
+        accuracy: true,
+        basePower: 0,
+        category: "Status",
+        name: "Psych Up",
+        pp: 10,
+        priority: 0,
+        flags: { bypasssub: 1, allyanim: 1, metronome: 1 },
+        onHit(target, source) {
+            let i;
+            for (i in target.boosts) {
+                source.boosts[i] = target.boosts[i];
+            }
+            const volatilesToCopy = ['dragoncheer', 'focusenergy', 'gmaxchistrike', 'laserfocus'];
+            // we need to remove all crit stage volatiles first; otherwise copying e.g. dragoncheer onto a mon with focusenergy
+            // will crash the server (since addVolatile fails due to overlap, leaving the source mon with no hasDragonType to set)
+            for (const volatile of volatilesToCopy)
+                source.removeVolatile(volatile);
+            for (const volatile of volatilesToCopy) {
+                if (target.volatiles[volatile]) {
+                    source.addVolatile(volatile);
+                    if (volatile === 'gmaxchistrike')
+                        source.volatiles[volatile].layers = target.volatiles[volatile].layers;
+                    if (volatile === 'dragoncheer')
+                        source.volatiles[volatile].hasDragonType = target.volatiles[volatile].hasDragonType;
+                }
+            }
+            this.add('-copyboost', source, target, '[from] move: Psych Up');
+        },
+        secondary: null,
+        target: "normal",
+        type: "Normal",
+        zMove: { effect: 'heal' },
+        contestType: "Clever",
+    },
     psyshieldbash: {
         num: 828,
         accuracy: 90,
@@ -18626,31 +18627,6 @@ exports.Moves = {
         type: "Ghost",
         contestType: "Tough",
     },
-    spitup: {
-        num: 255,
-        accuracy: 100,
-        basePower: 0,
-        basePowerCallback(pokemon) {
-            if (!pokemon.volatiles['stockpile']?.layers)
-                return false;
-            return pokemon.volatiles['stockpile'].layers * 100;
-        },
-        category: "Special",
-        name: "Spit Up",
-        pp: 10,
-        priority: 0,
-        flags: { protect: 1, metronome: 1 },
-        onTry(source) {
-            return !!source.volatiles['stockpile'];
-        },
-        onAfterMove(pokemon) {
-            pokemon.removeVolatile('stockpile');
-        },
-        secondary: null,
-        target: "normal",
-        type: "Normal",
-        contestType: "Tough",
-    },
     spite: {
         num: 180,
         accuracy: 100,
@@ -18677,6 +18653,31 @@ exports.Moves = {
         zMove: { effect: 'heal' },
         contestType: "Tough",
     },
+    spitup: {
+        num: 255,
+        accuracy: 100,
+        basePower: 0,
+        basePowerCallback(pokemon) {
+            if (!pokemon.volatiles['stockpile']?.layers)
+                return false;
+            return pokemon.volatiles['stockpile'].layers * 100;
+        },
+        category: "Special",
+        name: "Spit Up",
+        pp: 10,
+        priority: 0,
+        flags: { protect: 1, metronome: 1 },
+        onTry(source) {
+            return !!source.volatiles['stockpile'];
+        },
+        onAfterMove(pokemon) {
+            pokemon.removeVolatile('stockpile');
+        },
+        secondary: null,
+        target: "normal",
+        type: "Normal",
+        contestType: "Tough",
+    },
     splash: {
         num: 150,
         accuracy: true,
@@ -20081,7 +20082,7 @@ exports.Moves = {
             },
             onBeforeMovePriority: 5,
             onBeforeMove(attacker, defender, move) {
-                if (!move.isZ && !move.isMax && move.category === 'Status' && move.id !== 'mefirst') {
+                if (!(move.isZ && move.isZOrMaxPowered) && move.category === 'Status' && move.id !== 'mefirst') {
                     this.add('cant', attacker, 'move: Taunt', move);
                     return false;
                 }
@@ -20513,13 +20514,13 @@ exports.Moves = {
             },
             onBeforeMovePriority: 6,
             onBeforeMove(pokemon, target, move) {
-                if (!move.isZ && !move.isMax && move.flags['sound']) {
+                if (!move.isZOrMaxPowered && move.flags['sound']) {
                     this.add('cant', pokemon, 'move: Throat Chop');
                     return false;
                 }
             },
             onModifyMove(move, pokemon, target) {
-                if (!move.isZ && !move.isMax && move.flags['sound']) {
+                if (!move.isZOrMaxPowered && move.flags['sound']) {
                     this.add('cant', pokemon, 'move: Throat Chop');
                     return false;
                 }
@@ -21336,21 +21337,6 @@ exports.Moves = {
         type: "Dragon",
         contestType: "Cool",
     },
-    uturn: {
-        num: 369,
-        accuracy: 100,
-        basePower: 70,
-        category: "Physical",
-        name: "U-turn",
-        pp: 20,
-        priority: 0,
-        flags: { contact: 1, protect: 1, mirror: 1, metronome: 1 },
-        selfSwitch: true,
-        secondary: null,
-        target: "normal",
-        type: "Bug",
-        contestType: "Cute",
-    },
     upperhand: {
         num: 918,
         accuracy: 100,
@@ -21436,6 +21422,21 @@ exports.Moves = {
         type: "Normal",
         contestType: "Cute",
     },
+    uturn: {
+        num: 369,
+        accuracy: 100,
+        basePower: 70,
+        category: "Physical",
+        name: "U-turn",
+        pp: 20,
+        priority: 0,
+        flags: { contact: 1, protect: 1, mirror: 1, metronome: 1 },
+        selfSwitch: true,
+        secondary: null,
+        target: "normal",
+        type: "Bug",
+        contestType: "Cute",
+    },
     vacuumwave: {
         num: 410,
         accuracy: 100,