move fix from sharedpower to base

smogon · Oct 2, 2024 · 425fd94 · 425fd94
1 parent c812f97
commit 425fd94
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 21 deletions.
diff --git a/data/mods/sharedpower/moves.ts b/data/mods/sharedpower/moves.ts
@@ -15,23 +15,4 @@ export const Moves: import('../../../sim/dex-moves').ModdedMoveDataTable = {
  },
  },
  },
- rest: {
- inherit: true,
- onTry(source) {
- if (source.status === 'slp' || source.hasAbility('comatose')) return false;
-
- if (source.hp === source.maxhp) {
- this.add('-fail', source, 'heal');
- return null;
- }
- if (source.hasAbility('insomnia')) {
- this.add('-fail', source, '[from] ability: Insomnia', '[of] ' + source);
- return null;
- }
- if (source.hasAbility('vitalspirit')) {
- this.add('-fail', source, '[from] ability: Vital Spirit', '[of] ' + source);
- return null;
- }
- },
- },
 };
diff --git a/data/moves.ts b/data/moves.ts
@@ -15498,8 +15498,12 @@ export const Moves: import('../sim/dex-moves').MoveDataTable = {
  this.add('-fail', source, 'heal');
  return null;
  }
- if (source.hasAbility(['insomnia', 'vitalspirit'])) {
- this.add('-fail', source, '[from] ability: ' + source.getAbility().name, '[of] ' + source);
+ if (source.hasAbility('insomnia')) {
+ this.add('-fail', source, '[from] ability: Insomnia', '[of] ' + source);
+ return null;
+ }
+ if (source.hasAbility('vitalspirit')) {
+ this.add('-fail', source, '[from] ability: Vital Spirit', '[of] ' + source);
  return null;
  }
  },