@pkmn/sim 0.4.21 → 0.4.25

package/build/data/moves.js

@@ -1420,7 +1420,7 @@ exports.Moves = {
         pp: 10,
         priority: 0,
         flags: { contact: 1, protect: 1, mirror: 1 },
-        useSourceDefensiveAsOffensive: true,
+        overrideOffensiveStat: 'def',
         secondary: null,
         target: "normal",
         type: "Fighting",
@@ -5703,7 +5703,7 @@ exports.Moves = {
         pp: 15,
         priority: 0,
         flags: { contact: 1, protect: 1, mirror: 1 },
-        useTargetOffensive: true,
+        overrideOffensivePokemon: 'target',
         secondary: null,
         target: "normal",
         type: "Dark",
@@ -6598,10 +6598,10 @@ exports.Moves = {
         flags: {},
         isMax: "Melmetal",
         self: {
-            onHit(source) {
+            onHit(source, target, effect) {
                 for (const pokemon of source.foes()) {
                     if (!pokemon.volatiles['dynamax'])
-                        pokemon.addVolatile('torment');
+                        pokemon.addVolatile('torment', source, effect);
                 }
             },
         },
@@ -13503,7 +13503,7 @@ exports.Moves = {
         accuracy: 100,
         basePower: 80,
         category: "Special",
-        defensiveCategory: "Physical",
+        overrideDefensiveStat: 'def',
         name: "Psyshock",
         pp: 10,
         priority: 0,
@@ -13518,7 +13518,7 @@ exports.Moves = {
         accuracy: 100,
         basePower: 100,
         category: "Special",
-        defensiveCategory: "Physical",
+        overrideDefensiveStat: 'def',
         name: "Psystrike",
         pp: 10,
         priority: 0,
@@ -15074,7 +15074,7 @@ exports.Moves = {
         accuracy: 100,
         basePower: 85,
         category: "Special",
-        defensiveCategory: "Physical",
+        overrideDefensiveStat: 'def',
         name: "Secret Sword",
         pp: 10,
         priority: 0,
@@ -16095,6 +16095,7 @@ exports.Moves = {
             onRestart(pokemon) {
                 if (pokemon.removeVolatile('fly') || pokemon.removeVolatile('bounce')) {
                     this.queue.cancelMove(pokemon);
+                    pokemon.removeVolatile('twoturnmove');
                     this.add('-start', pokemon, 'Smack Down');
                 }
             },
@@ -18598,11 +18599,13 @@ exports.Moves = {
         volatileStatus: 'torment',
         condition: {
             noCopy: true,
-            onStart(pokemon) {
+            onStart(pokemon, source, effect) {
                 if (pokemon.volatiles['dynamax']) {
                     delete pokemon.volatiles['torment'];
                     return false;
                 }
+                if (effect?.id === 'gmaxmeltdown')
+                    this.effectState.duration = 3;
                 this.add('-start', pokemon, 'Torment');
             },
             onEnd(pokemon) {
@@ -19744,13 +19747,23 @@ exports.Moves = {
                 }
                 return 5;
             },
+            onModifyMove(move, source, target) {
+                // This code is for moves that use defensive stats as the attacking stat; see below for most of the implementation
+                if (!move.overrideOffensiveStat)
+                    return;
+                const statAndBoosts = move.overrideOffensiveStat;
+                if (!['def', 'spd'].includes(statAndBoosts))
+                    return;
+                move.overrideOffensiveStat = statAndBoosts === 'def' ? 'spd' : 'def';
+                this.hint(`${move.name} uses ${statAndBoosts === 'def' ? '' : 'Sp. '}Def boosts when Wonder Room is active.`);
+            },
             onFieldStart(field, source) {
                 this.add('-fieldstart', 'move: Wonder Room', '[of] ' + source);
             },
             onFieldRestart(target, source) {
                 this.field.removePseudoWeather('wonderroom');
             },
-            // Swapping defenses implemented in sim/pokemon.js:Pokemon#calculateStat and Pokemon#getStat
+            // Swapping defenses partially implemented in sim/pokemon.js:Pokemon#calculateStat and Pokemon#getStat
             onFieldResidualOrder: 27,
             onFieldResidualSubOrder: 5,
             onFieldEnd() {