From d64f25d7cff4908d426388b7f1a28c342faf8c40 Mon Sep 17 00:00:00 2001 From: Sbug98 Date: Wed, 8 May 2024 13:54:12 +0200 Subject: [PATCH] fixed beahviour if 2+ opponents are on field, also added message --- src/data/ability.ts | 8 ++++++-- src/overrides.ts | 4 ++-- 2 files changed, 8 insertions(+), 4 deletions(-) diff --git a/src/data/ability.ts b/src/data/ability.ts index a6551789e..e6461582f 100644 --- a/src/data/ability.ts +++ b/src/data/ability.ts @@ -2107,15 +2107,19 @@ export class PostTurnFormChangeAbAttr extends PostTurnAbAttr { } export class PostTurnHurtIfSleepingAbAttr extends PostTurnAbAttr { + applyPostTurn(pokemon: Pokemon, passive: boolean, args: any[]): boolean | Promise { + let hadEffect: boolean = false; for(let oppo of pokemon.getOpponents()) { if(oppo.status.effect == StatusEffect.SLEEP) { oppo.damageAndUpdate(Math.ceil(oppo.getMaxHp() * (1 / 8)), HitResult.OTHER); - return true; + pokemon.scene.queueMessage(getPokemonMessage(oppo, ' is tormeted!')); + hadEffect = true; } } - return false; + return hadEffect; } + } export class PostBiomeChangeAbAttr extends AbAttr { } diff --git a/src/overrides.ts b/src/overrides.ts index ef8fce815..edfcb996b 100644 --- a/src/overrides.ts +++ b/src/overrides.ts @@ -16,8 +16,8 @@ export const DOUBLE_BATTLE_OVERRIDE = false; export const ABILITY_OVERRIDE = Abilities.BAD_DREAMS; export const PASSIVE_ABILITY_OVERRIDE = Abilities.NONE; -export const MOVE_OVERRIDE = Moves.SLEEP_POWDER; -export const MOVE_OVERRIDE_2 = Moves.HYDRO_CANNON; +export const MOVE_OVERRIDE = Moves.DARK_VOID; +export const MOVE_OVERRIDE_2 = Moves.HYPER_BEAM; export const OPP_SPECIES_OVERRIDE = 0; export const OPP_ABILITY_OVERRIDE = Abilities.NONE; export const OPP_PASSIVE_ABILITY_OVERRIDE = Abilities.NONE;