Leahnaya/pokemon-showdown
1
0
Fork 0
mirror of https://github.com/smogon/pokemon-showdown.git synced 2026-09-11 02:35:33 -05:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

Gen I: Fix |-mustrecharge| messages

Browse Source
This commit is contained in:
Annika
2023-03-11 18:10:40 -08:00
parent 866613cbad
commit b03a2b47d2
1 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
data/mods/gen1/scripts.ts
View File

@@ -207,10 +207,10 @@ export const Scripts: ModdedBattleScriptsData = {
// We remove recharge
if (pokemon.volatiles['mustrecharge']) pokemon.removeVolatile('mustrecharge');
delete pokemon.volatiles['partialtrappinglock'];
} else if (pokemon.hp) {
this.battle.runEvent('AfterMoveSelf', pokemon, target, move);
} else {
if (pokemon.volatiles['mustrecharge']) this.battle.add('-mustrecharge', pokemon);
if (pokemon.hp) this.battle.runEvent('AfterMoveSelf', pokemon, target, move);
}
if (pokemon.volatiles['mustrecharge']) this.battle.add('-mustrecharge', pokemon);
// For partial trapping moves, we are saving the target
if (move.volatileStatus === 'partiallytrapped' && target && target.hp > 0) {