From 571b4ab42bd6ee66470af91e1c8d802ea4b06e35 Mon Sep 17 00:00:00 2001 From: Luc Date: Fri, 3 May 2024 00:36:24 -0400 Subject: [PATCH] only reverts during trainer battles --- src/data/ability.ts | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/src/data/ability.ts b/src/data/ability.ts index 3a85484cf25..c6fb876e9bd 100644 --- a/src/data/ability.ts +++ b/src/data/ability.ts @@ -21,6 +21,7 @@ import { Abilities } from "./enums/abilities"; import i18next, { Localizable } from "#app/plugins/i18n.js"; import { Command } from "../ui/command-ui-handler"; import PokemonSpecies from "./pokemon-species"; +import { BattleType } from "#app/battle.js"; export class Ability implements Localizable { public id: Abilities; @@ -3356,8 +3357,8 @@ export function initAbilities() { .attr(NoTransformAbilityAbAttr) .attr(NoFusionAbilityAbAttr) .attr(PreSwitchOutFormChangeAbAttr, p => p.getFormKey() ? 1 : 0) - .attr(PostBattleInitFormChangeAbAttr, p => p.battleData.switchesMade === 0 ? 0 : 1) - .attr(PostSummonFormChangeAbAttr,p => p.battleData.switchesMade === 0 ? 0 : 1), + .attr(PostBattleInitFormChangeAbAttr, p => p.battleData.switchesMade === 0 && p.scene.currentBattle.battleType === BattleType.TRAINER ? 0 : 1) + .attr(PostSummonFormChangeAbAttr,p => p.battleData.switchesMade === 0 && p.scene.currentBattle.battleType === BattleType.TRAINER? 0 : 1), new Ability(Abilities.COMMANDER, 9) .attr(UncopiableAbilityAbAttr) .attr(UnswappableAbilityAbAttr)