PR feedback

This commit is contained in:
Michael Li 2024-11-09 12:20:15 -05:00
parent 54f4a2a347
commit f16845522b

View File

@ -1234,16 +1234,31 @@ export default class BattleScene extends SceneBase {
} }
if (!isNullOrUndefined(Overrides.BATTLE_TYPE_OVERRIDE)) { if (!isNullOrUndefined(Overrides.BATTLE_TYPE_OVERRIDE)) {
if (Overrides.BATTLE_TYPE_OVERRIDE === "double" let doubleOverrideForWave: "single" | "double" | null = null;
|| (Overrides.BATTLE_TYPE_OVERRIDE === "odd-doubles" && (newWaveIndex % 2))
|| (Overrides.BATTLE_TYPE_OVERRIDE === "even-doubles" && !(newWaveIndex % 2)) 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; newDouble = true;
} else if (newBattleType !== BattleType.TRAINER) { }
/** /**
* Override battles into single only if not fighting with trainers. * Override battles into single only if not fighting with trainers.
* @see {@link https://github.com/pagefaultgames/pokerogue/issues/1948 | GitHub Issue #1948} * @see {@link https://github.com/pagefaultgames/pokerogue/issues/1948 | GitHub Issue #1948}
*/ */
if (newBattleType !== BattleType.TRAINER && doubleOverrideForWave === "single") {
newDouble = false; newDouble = false;
} }
} }