From 230c2bf98399baa253ce6c2a8fe44e99513a3c64 Mon Sep 17 00:00:00 2001 From: Tempoanon <163687446+TempsRay@users.noreply.github.com> Date: Thu, 25 Apr 2024 01:23:45 -0400 Subject: [PATCH] Fix Moody and Quark Drive (#284) * Fix Quark Drive and Moody * Telepathy still unimplemented * more merge conflict stuff --- src/data/ability.ts | 22 +++++++++++++++++++--- 1 file changed, 19 insertions(+), 3 deletions(-) diff --git a/src/data/ability.ts b/src/data/ability.ts index b7acb552920..e129bf8ec2e 100644 --- a/src/data/ability.ts +++ b/src/data/ability.ts @@ -1795,7 +1795,7 @@ export class PostTerrainChangeAddBattlerTagAttr extends PostTerrainChangeAbAttr } applyPostTerrainChange(pokemon: Pokemon, passive: boolean, terrain: TerrainType, args: any[]): boolean { - if (!this.terrainTypes.find(t => terrain === terrain)) + if (!this.terrainTypes.find(t => t === terrain)) return false; return pokemon.addTag(this.tagType, this.turnCount); @@ -1829,6 +1829,23 @@ export class PostTurnResetStatusAbAttr extends PostTurnAbAttr { } } +export class MoodyAbAttr extends PostTurnAbAttr { + constructor() { + super(true); + } + + applyPostTurn(pokemon: Pokemon, passive: boolean, args: any[]): boolean { + // TODO: Edge case of not choosing to buff or debuff a stat that's already maxed + let selectableStats = [BattleStat.ATK, BattleStat.DEF, BattleStat.SPATK, BattleStat.SPDEF, BattleStat.SPD]; + let increaseStat = selectableStats[Utils.randInt(selectableStats.length)]; + selectableStats = selectableStats.filter(s => s !== increaseStat); + let decreaseStat = selectableStats[Utils.randInt(selectableStats.length)]; + pokemon.scene.unshiftPhase(new StatChangePhase(pokemon.scene, pokemon.getBattlerIndex(), true, [increaseStat], 2)); + pokemon.scene.unshiftPhase(new StatChangePhase(pokemon.scene, pokemon.getBattlerIndex(), true, [decreaseStat], -1)); + return true; + } +} + export class PostTurnStatChangeAbAttr extends PostTurnAbAttr { private stats: BattleStat[]; private levels: integer; @@ -2821,8 +2838,7 @@ export function initAbilities() { .ignorable() .unimplemented(), new Ability(Abilities.MOODY, 5) - .attr(PostTurnStatChangeAbAttr, BattleStat.RAND, 2) - .attr(PostTurnStatChangeAbAttr, BattleStat.RAND, -1), + .attr(MoodyAbAttr), new Ability(Abilities.OVERCOAT, 5) .attr(BlockWeatherDamageAttr) .attr(MoveImmunityAbAttr, (pokemon, attacker, move) => pokemon !== attacker && move.getMove().hasFlag(MoveFlags.POWDER_MOVE))