mika/pokerogue
1
0
Fork 0
mirror of https://github.com/pagefaultgames/pokerogue.git synced 2025-07-19 23:02:19 +02:00
Code Issues Packages Projects Releases Wiki Activity

Update move history entry to FAIL when prevented by Damp

Browse Source
This commit is contained in:
Zach Day 2024-06-16 17:49:21 -04:00
parent f70ddd21c9
commit 9a90742627
2 changed files with 6 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/overrides.ts
View File

@ -1,4 +1,3 @@
import { WeatherType } from "./data/weather";
import { Variant } from "./data/variant"; import { Variant } from "./data/variant";
import { TempBattleStat } from "./data/temp-battle-stat"; import { TempBattleStat } from "./data/temp-battle-stat";
import { Nature } from "./data/nature"; import { Nature } from "./data/nature";
@ -16,6 +15,7 @@ import { Biome } from "#enums/biome";
import { Moves } from "#enums/moves"; import { Moves } from "#enums/moves";
import { Species } from "#enums/species"; import { Species } from "#enums/species";
import { TimeOfDay } from "#enums/time-of-day"; import { TimeOfDay } from "#enums/time-of-day";
import { WeatherType } from "./data/weather";
/** /**
* Overrides for testing different in game situations * Overrides for testing different in game situations
@ -75,7 +75,7 @@ export const STARTING_LEVEL_OVERRIDE: integer = 0;
* @example SPECIES_OVERRIDE = Species.Bulbasaur; * @example SPECIES_OVERRIDE = Species.Bulbasaur;
*/ */
export const STARTER_SPECIES_OVERRIDE: Species | integer = 0; export const STARTER_SPECIES_OVERRIDE: Species | integer = 0;
export const ABILITY_OVERRIDE: Abilities = Abilities.NONE; export const ABILITY_OVERRIDE: Abilities = Abilities.DAMP;
export const PASSIVE_ABILITY_OVERRIDE: Abilities = Abilities.NONE; export const PASSIVE_ABILITY_OVERRIDE: Abilities = Abilities.NONE;
export const STATUS_OVERRIDE: StatusEffect = StatusEffect.NONE; export const STATUS_OVERRIDE: StatusEffect = StatusEffect.NONE;
export const GENDER_OVERRIDE: Gender = null; export const GENDER_OVERRIDE: Gender = null;
@ -87,13 +87,13 @@ export const VARIANT_OVERRIDE: Variant = 0;
* OPPONENT / ENEMY OVERRIDES * OPPONENT / ENEMY OVERRIDES
*/ */
export const OPP_SPECIES_OVERRIDE: Species | integer = 0; export const OPP_SPECIES_OVERRIDE: Species | integer = Species.RATTATA;
export const OPP_LEVEL_OVERRIDE: number = 0; export const OPP_LEVEL_OVERRIDE: number = 0;
export const OPP_ABILITY_OVERRIDE: Abilities = Abilities.NONE; export const OPP_ABILITY_OVERRIDE: Abilities = Abilities.NONE;
export const OPP_PASSIVE_ABILITY_OVERRIDE: Abilities = Abilities.NONE; export const OPP_PASSIVE_ABILITY_OVERRIDE: Abilities = Abilities.NONE;
export const OPP_STATUS_OVERRIDE: StatusEffect = StatusEffect.NONE; export const OPP_STATUS_OVERRIDE: StatusEffect = StatusEffect.NONE;
export const OPP_GENDER_OVERRIDE: Gender = null; export const OPP_GENDER_OVERRIDE: Gender = null;
export const OPP_MOVESET_OVERRIDE: Array<Moves> = []; export const OPP_MOVESET_OVERRIDE: Array<Moves> = [Moves.EXPLOSION, Moves.SELF_DESTRUCT, Moves.MISTY_EXPLOSION, Moves.MIND_BLOWN];
export const OPP_SHINY_OVERRIDE: boolean = false; export const OPP_SHINY_OVERRIDE: boolean = false;
export const OPP_VARIANT_OVERRIDE: Variant = 0; export const OPP_VARIANT_OVERRIDE: Variant = 0;
export const OPP_IVS_OVERRIDE: integer | integer[] = []; export const OPP_IVS_OVERRIDE: integer | integer[] = [];

2
src/phases.ts
View File

@ -2879,6 +2879,8 @@ export class MoveEffectPhase extends PokemonPhase {
applyAbAttrs(FieldPreventMovesAbAttr, other, prevented, move, user as Pokemon); applyAbAttrs(FieldPreventMovesAbAttr, other, prevented, move, user as Pokemon);
} }
if (prevented.value) { if (prevented.value) {
// Just bail out of the move if it got prevented. No need to manually show message; the Attr handles that.
moveHistoryEntry.result = MoveResult.FAIL;
return this.end(); return this.end();
} }