@pkmn/sim 0.7.46 → 0.7.47

package/build/esm/data/moves.mjs

@@ -1098,7 +1098,7 @@ export const Moves = {
         pp: 40,
         priority: 0,
         flags: {},
-        onTryHit(target) {
+        onHit(target) {
             if (!this.canSwitch(target.side) || target.volatiles['commanded']) {
                 this.attrLastMove('[still]');
                 this.add('-fail', target);
@@ -2423,16 +2423,7 @@ export const Moves = {
         pp: 5,
         priority: 0,
         flags: { protect: 1, mirror: 1 },
-        mindBlownRecoil: true,
-        onAfterMove(pokemon, target, move) {
-            if (move.mindBlownRecoil && !move.multihit) {
-                const hpBeforeRecoil = pokemon.hp;
-                this.damage(Math.round(pokemon.maxhp / 2), pokemon, pokemon, this.dex.conditions.get('Chloroblast'), true);
-                if (pokemon.hp <= pokemon.maxhp / 2 && hpBeforeRecoil > pokemon.maxhp / 2) {
-                    this.runEvent('EmergencyExit', pokemon, pokemon);
-                }
-            }
-        },
+        // Recoil implemented in battle-actions.ts
         secondary: null,
         target: "normal",
         type: "Grass",
@@ -9680,11 +9671,15 @@ export const Moves = {
         pp: 15,
         priority: 0,
         flags: { contact: 1, protect: 1, mirror: 1 },
-        onHit() {
-            this.field.clearTerrain();
+        onAfterHit(target, source) {
+            if (source.hp) {
+                this.field.clearTerrain();
+            }
         },
-        onAfterSubDamage() {
-            this.field.clearTerrain();
+        onAfterSubDamage(damage, target, source) {
+            if (source.hp) {
+                this.field.clearTerrain();
+            }
         },
         secondary: null,
         target: "normal",
@@ -16746,7 +16741,7 @@ export const Moves = {
         flags: {},
         volatileStatus: 'substitute',
         onTryHit(source) {
-            if (!this.canSwitch(source.side)) {
+            if (!this.canSwitch(source.side) || source.volatiles['commanded']) {
                 this.add('-fail', source);
                 return this.NOT_FAIL;
             }
@@ -19097,8 +19092,8 @@ export const Moves = {
                 else {
                     this.add('-activate', target, 'move: Substitute', '[damage]');
                 }
-                if (move.recoil) {
-                    this.damage(this.actions.calcRecoilDamage(damage, move), source, target, 'recoil');
+                if (move.recoil || move.id === 'chloroblast') {
+                    this.damage(this.actions.calcRecoilDamage(damage, move, source), source, target, 'recoil');
                 }
                 if (move.drain) {
                     this.heal(Math.ceil(damage * move.drain[0] / move.drain[1]), source, target, 'drain');