From f16845522b34506af4bfce3cce41913a0f45de6c Mon Sep 17 00:00:00 2001 From: Michael Li Date: Sat, 9 Nov 2024 12:20:15 -0500 Subject: [PATCH] PR feedback --- src/battle-scene.ts | 33 ++++++++++++++++++++++++--------- 1 file changed, 24 insertions(+), 9 deletions(-) diff --git a/src/battle-scene.ts b/src/battle-scene.ts index 03d3025cd4d..152a9963423 100644 --- a/src/battle-scene.ts +++ b/src/battle-scene.ts @@ -1234,16 +1234,31 @@ export default class BattleScene extends SceneBase { } if (!isNullOrUndefined(Overrides.BATTLE_TYPE_OVERRIDE)) { - if (Overrides.BATTLE_TYPE_OVERRIDE === "double" - || (Overrides.BATTLE_TYPE_OVERRIDE === "odd-doubles" && (newWaveIndex % 2)) - || (Overrides.BATTLE_TYPE_OVERRIDE === "even-doubles" && !(newWaveIndex % 2)) - ) { + let doubleOverrideForWave: "single" | "double" | null = null; + + switch (Overrides.BATTLE_TYPE_OVERRIDE) { + case "double": + doubleOverrideForWave = "double"; + break; + case "single": + doubleOverrideForWave = "single"; + break; + case "even-doubles": + doubleOverrideForWave = (newWaveIndex % 2) ? "single" : "double"; + break; + case "odd-doubles": + doubleOverrideForWave = (newWaveIndex % 2) ? "double" : "single"; + break; + } + + if (doubleOverrideForWave === "double") { newDouble = true; - } else if (newBattleType !== BattleType.TRAINER) { - /** - * Override battles into single only if not fighting with trainers. - * @see {@link https://github.com/pagefaultgames/pokerogue/issues/1948 | GitHub Issue #1948} - */ + } + /** + * Override battles into single only if not fighting with trainers. + * @see {@link https://github.com/pagefaultgames/pokerogue/issues/1948 | GitHub Issue #1948} + */ + if (newBattleType !== BattleType.TRAINER && doubleOverrideForWave === "single") { newDouble = false; } }