@pkmn/sim 0.5.11 → 0.5.14

package/build/data/moves.js

@@ -676,10 +676,10 @@ exports.Moves = {
                     this.debug('Attract event failed');
                     return false;
                 }
-                if (effect.id === 'cutecharm') {
+                if (effect.name === 'Cute Charm') {
                     this.add('-start', pokemon, 'Attract', '[from] ability: Cute Charm', '[of] ' + source);
                 }
-                else if (effect.id === 'destinyknot') {
+                else if (effect.name === 'Destiny Knot') {
                     this.add('-start', pokemon, 'Attract', '[from] item: Destiny Knot', '[of] ' + source);
                 }
                 else {
@@ -1023,6 +1023,13 @@ exports.Moves = {
         pp: 40,
         priority: 0,
         flags: {},
+        onHit(target) {
+            if (!this.canSwitch(target.side)) {
+                this.attrLastMove('[still]');
+                this.add('-fail', target);
+                return this.NOT_FAIL;
+            }
+        },
         self: {
             onHit(source) {
                 source.skipBeforeSwitchOutEventFlag = true;
@@ -4163,7 +4170,7 @@ exports.Moves = {
             },
             onFieldStart(field, source, effect) {
                 if (effect?.effectType === 'Ability') {
-                    this.add('-fieldstart', 'move: Electric Terrain', '[from] ability: ' + effect, '[of] ' + source);
+                    this.add('-fieldstart', 'move: Electric Terrain', '[from] ability: ' + effect.name, '[of] ' + source);
                 }
                 else {
                     this.add('-fieldstart', 'move: Electric Terrain');
@@ -7295,7 +7302,7 @@ exports.Moves = {
             },
             onFieldStart(field, source, effect) {
                 if (effect?.effectType === 'Ability') {
-                    this.add('-fieldstart', 'move: Grassy Terrain', '[from] ability: ' + effect, '[of] ' + source);
+                    this.add('-fieldstart', 'move: Grassy Terrain', '[from] ability: ' + effect.name, '[of] ' + source);
                 }
                 else {
                     this.add('-fieldstart', 'move: Grassy Terrain');
@@ -7904,10 +7911,12 @@ exports.Moves = {
         pp: 10,
         priority: 0,
         flags: { snatch: 1, heal: 1 },
-        onTryHit(pokemon, target, move) {
-            if (!this.canSwitch(pokemon.side)) {
+        onHit(target, source, move) {
+            if (!this.canSwitch(target.side)) {
                 delete move.selfdestruct;
-                return false;
+                this.attrLastMove('[still]');
+                this.add('-fail', target);
+                return this.NOT_FAIL;
             }
         },
         selfdestruct: "ifHit",
@@ -10013,10 +10022,12 @@ exports.Moves = {
         pp: 10,
         priority: 0,
         flags: { snatch: 1, heal: 1, dance: 1 },
-        onTryHit(pokemon, target, move) {
-            if (!this.canSwitch(pokemon.side)) {
+        onHit(target, source, move) {
+            if (!this.canSwitch(target.side)) {
                 delete move.selfdestruct;
-                return false;
+                this.attrLastMove('[still]');
+                this.add('-fail', target);
+                return this.NOT_FAIL;
             }
         },
         selfdestruct: "ifHit",
@@ -11613,7 +11624,7 @@ exports.Moves = {
             },
             onFieldStart(field, source, effect) {
                 if (effect?.effectType === 'Ability') {
-                    this.add('-fieldstart', 'move: Misty Terrain', '[from] ability: ' + effect, '[of] ' + source);
+                    this.add('-fieldstart', 'move: Misty Terrain', '[from] ability: ' + effect.name, '[of] ' + source);
                 }
                 else {
                     this.add('-fieldstart', 'move: Misty Terrain');
@@ -13436,7 +13447,7 @@ exports.Moves = {
             },
             onFieldStart(field, source, effect) {
                 if (effect?.effectType === 'Ability') {
-                    this.add('-fieldstart', 'move: Psychic Terrain', '[from] ability: ' + effect, '[of] ' + source);
+                    this.add('-fieldstart', 'move: Psychic Terrain', '[from] ability: ' + effect.name, '[of] ' + source);
                 }
                 else {
                     this.add('-fieldstart', 'move: Psychic Terrain');
@@ -14331,17 +14342,19 @@ exports.Moves = {
         num: 804,
         accuracy: 100,
         basePower: 70,
+        basePowerCallback(source, target, move) {
+            if (this.field.isTerrain('electricterrain') && target.isGrounded()) {
+                if (!source.isAlly(target))
+                    this.hint(`${move.name}'s BP doubled on grounded target.`);
+                return move.basePower * 2;
+            }
+            return move.basePower;
+        },
         category: "Special",
         name: "Rising Voltage",
         pp: 20,
         priority: 0,
         flags: { protect: 1, mirror: 1 },
-        onBasePower(basePower, pokemon, target) {
-            if (this.field.isTerrain('electricterrain') && target.isGrounded()) {
-                this.debug('terrain buff');
-                return this.chainModify(2);
-            }
-        },
         secondary: null,
         target: "normal",
         type: "Electric",
@@ -18224,8 +18237,10 @@ exports.Moves = {
         pp: 20,
         priority: -6,
         flags: {},
+        onTry(source) {
+            return !!this.canSwitch(source.side);
+        },
         selfSwitch: true,
-        onTryHit: true,
         secondary: null,
         target: "self",
         type: "Psychic",