@pkmn/sim 0.7.11 → 0.7.12

package/build/esm/data/moves.mjs

@@ -2651,7 +2651,7 @@ export const Moves = {
             if (target.runEffectiveness(move) > 0) {
                 // Placeholder
                 this.debug(`collision course super effective buff`);
-                return this.chainModify(1.5);
+                return this.chainModify([5461, 4096]);
             }
         },
         secondary: null,
@@ -4715,7 +4715,7 @@ export const Moves = {
             if (target.runEffectiveness(move) > 0) {
                 // Placeholder
                 this.debug(`electro drift super effective buff`);
-                return this.chainModify(1.5);
+                return this.chainModify([5461, 4096]);
             }
         },
         secondary: null,
@@ -6757,6 +6757,11 @@ export const Moves = {
             if (pokemon.lastMove?.id === 'gigatonhammer')
                 pokemon.disableMove('gigatonhammer');
         },
+        onUseMoveMessage(source) {
+            if (source.lastMove?.id === 'gigatonhammer') {
+                this.add('-hint', "Some effects can force a Pokemon to use Gigaton Hammer again in a row.");
+            }
+        },
         secondary: null,
         target: "normal",
         type: "Steel",
@@ -6828,17 +6833,11 @@ export const Moves = {
             onRestart() {
                 this.effectState.duration = 2;
             },
-            onBeforeTurn() {
-                this.effectState.turnPassed = true;
-            },
             onAccuracy() {
-                if (this.effectState.turnPassed)
-                    return true;
+                return true;
             },
             onSourceModifyDamage() {
-                if (this.effectState.turnPassed) {
-                    return this.chainModify(2);
-                }
+                return this.chainModify(2);
             },
         },
         secondary: null,
@@ -8000,13 +7999,18 @@ export const Moves = {
             duration: 5,
             durationCallback(source, effect) {
                 if (source?.hasAbility('persistent')) {
-                    this.add('-activate', source, 'ability: Persistent', effect);
+                    this.add('-activate', source, 'ability: Persistent', '[move] Gravity');
                     return 7;
                 }
                 return 5;
             },
-            onFieldStart() {
-                this.add('-fieldstart', 'move: Gravity');
+            onFieldStart(target, source) {
+                if (source?.hasAbility('persistent')) {
+                    this.add('-fieldstart', 'move: Gravity', '[persistent]');
+                }
+                else {
+                    this.add('-fieldstart', 'move: Gravity');
+                }
                 for (const pokemon of this.getAllActive()) {
                     let applies = false;
                     if (pokemon.removeVolatile('bounce') || pokemon.removeVolatile('fly')) {
@@ -8507,7 +8511,7 @@ export const Moves = {
             duration: 5,
             durationCallback(target, source, effect) {
                 if (source?.hasAbility('persistent')) {
-                    this.add('-activate', source, 'ability: Persistent', effect);
+                    this.add('-activate', source, 'ability: Persistent', '[move] Heal Block');
                     return 7;
                 }
                 return 5;
@@ -11052,13 +11056,18 @@ export const Moves = {
             duration: 5,
             durationCallback(source, effect) {
                 if (source?.hasAbility('persistent')) {
-                    this.add('-activate', source, 'ability: Persistent', effect);
+                    this.add('-activate', source, 'ability: Persistent', '[move] Magic Room');
                     return 7;
                 }
                 return 5;
             },
             onFieldStart(target, source) {
-                this.add('-fieldstart', 'move: Magic Room', '[of] ' + source);
+                if (source?.hasAbility('persistent')) {
+                    this.add('-fieldstart', 'move: Magic Room', '[of] ' + source, '[persistent]');
+                }
+                else {
+                    this.add('-fieldstart', 'move: Magic Room', '[of] ' + source);
+                }
                 for (const mon of this.getAllActive()) {
                     this.singleEvent('End', mon.getItem(), mon.itemState, mon);
                 }
@@ -15078,7 +15087,7 @@ export const Moves = {
             pokemon.side.removeSideCondition('auroraveil');
         },
         onModifyType(move, pokemon) {
-            switch (pokemon.baseSpecies.name) {
+            switch (pokemon.species.name) {
                 case 'Tauros-Paldea':
                     move.type = 'Fighting';
                     break;
@@ -16080,7 +16089,7 @@ export const Moves = {
             duration: 5,
             durationCallback(target, source, effect) {
                 if (source?.hasAbility('persistent')) {
-                    this.add('-activate', source, 'ability: Persistent', effect);
+                    this.add('-activate', source, 'ability: Persistent', '[move] Safeguard');
                     return 7;
                 }
                 return 5;
@@ -16111,8 +16120,13 @@ export const Moves = {
                     return null;
                 }
             },
-            onSideStart(side) {
-                this.add('-sidestart', side, 'Safeguard');
+            onSideStart(side, source) {
+                if (source?.hasAbility('persistent')) {
+                    this.add('-sidestart', side, 'Safeguard', '[persistent]');
+                }
+                else {
+                    this.add('-sidestart', side, 'Safeguard');
+                }
             },
             onSideResidualOrder: 26,
             onSideResidualSubOrder: 3,
@@ -19539,13 +19553,18 @@ export const Moves = {
             duration: 4,
             durationCallback(target, source, effect) {
                 if (source?.hasAbility('persistent')) {
-                    this.add('-activate', source, 'ability: Persistent', effect);
+                    this.add('-activate', source, 'ability: Persistent', '[move] Tailwind');
                     return 6;
                 }
                 return 4;
             },
-            onSideStart(side) {
-                this.add('-sidestart', side, 'move: Tailwind');
+            onSideStart(side, source) {
+                if (source?.hasAbility('persistent')) {
+                    this.add('-sidestart', side, 'move: Tailwind', '[persistent]');
+                }
+                else {
+                    this.add('-sidestart', side, 'move: Tailwind');
+                }
             },
             onModifySpe(spe, pokemon) {
                 return this.chainModify(2);
@@ -20239,29 +20258,25 @@ export const Moves = {
         pp: 10,
         priority: 0,
         flags: {},
-        boosts: {
-            atk: 1,
-            spe: 1,
-        },
-        onHit(source) {
+        onHit(pokemon) {
             let success = false;
-            const removeAll = ['spikes', 'toxicspikes', 'stealthrock', 'stickyweb', 'gmaxsteelsurge'];
-            for (const sideCondition of removeAll) {
-                if (source.side.removeSideCondition(sideCondition)) {
-                    this.add('-sideend', source.side, this.dex.conditions.get(sideCondition).name, '[from] move: Tidy Up', '[of] ' + source);
-                    success = true;
-                }
-                if (source.side.foe.removeSideCondition(sideCondition)) {
-                    this.add('-sideend', source.side.foe, this.dex.conditions.get(sideCondition).name, '[from] move: Tidy Up', '[of] ' + source);
+            for (const active of this.getAllActive()) {
+                if (active.removeVolatile('substitute'))
                     success = true;
-                }
             }
-            for (const pokemon of this.getAllActive()) {
-                if (pokemon.removeVolatile('substitute'))
-                    success = true;
+            const removeAll = ['spikes', 'toxicspikes', 'stealthrock', 'stickyweb', 'gmaxsteelsurge'];
+            const sides = [pokemon.side, ...pokemon.side.foeSidesWithConditions()];
+            for (const side of sides) {
+                for (const sideCondition of removeAll) {
+                    if (side.removeSideCondition(sideCondition)) {
+                        this.add('-sideend', side, this.dex.conditions.get(sideCondition).name);
+                        success = true;
+                    }
+                }
             }
             if (success)
-                this.add('-activate', source, 'move: Tidy Up');
+                this.add('-activate', pokemon, 'move: Tidy Up');
+            return !!this.boost({ atk: 1, spe: 1 }, pokemon, pokemon, null, false, true) || success;
         },
         secondary: null,
         target: "self",
@@ -20600,13 +20615,18 @@ export const Moves = {
             duration: 5,
             durationCallback(source, effect) {
                 if (source?.hasAbility('persistent')) {
-                    this.add('-activate', source, 'ability: Persistent', effect);
+                    this.add('-activate', source, 'ability: Persistent', '[move] Trick Room');
                     return 7;
                 }
                 return 5;
             },
             onFieldStart(target, source) {
-                this.add('-fieldstart', 'move: Trick Room', '[of] ' + source);
+                if (source?.hasAbility('persistent')) {
+                    this.add('-fieldstart', 'move: Trick Room', '[of] ' + source, '[persistent]');
+                }
+                else {
+                    this.add('-fieldstart', 'move: Trick Room', '[of] ' + source);
+                }
             },
             onFieldRestart(target, source) {
                 this.field.removePseudoWeather('trickroom');
@@ -21638,7 +21658,7 @@ export const Moves = {
             duration: 5,
             durationCallback(source, effect) {
                 if (source?.hasAbility('persistent')) {
-                    this.add('-activate', source, 'ability: Persistent', effect);
+                    this.add('-activate', source, 'ability: Persistent', '[move] Wonder Room');
                     return 7;
                 }
                 return 5;
@@ -21654,7 +21674,12 @@ export const Moves = {
                 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);
+                if (source?.hasAbility('persistent')) {
+                    this.add('-fieldstart', 'move: Wonder Room', '[of] ' + source, '[persistent]');
+                }
+                else {
+                    this.add('-fieldstart', 'move: Wonder Room', '[of] ' + source);
+                }
             },
             onFieldRestart(target, source) {
                 this.field.removePseudoWeather('wonderroom');