Cleaned up parameters of getFixedBattle to not suck

This commit is contained in:
Bertie690 2025-09-14 19:18:46 -04:00
parent 24a0ca95f4
commit a49cc74916
3 changed files with 3 additions and 7 deletions

View File

@ -331,7 +331,7 @@ export class GameMode implements GameModeConfig {
* @param waveIndex The wave to check. * @param waveIndex The wave to check.
* @returns The fixed battle for this wave. * @returns The fixed battle for this wave.
*/ */
getFixedBattle(waveIndex: number): FixedBattleConfig { getFixedBattle(waveIndex: number): FixedBattleConfig | undefined {
const challengeConfig = new FixedBattleConfig(); const challengeConfig = new FixedBattleConfig();
if (applyChallenges(ChallengeType.FIXED_BATTLES, waveIndex, challengeConfig)) { if (applyChallenges(ChallengeType.FIXED_BATTLES, waveIndex, challengeConfig)) {
return challengeConfig; return challengeConfig;

View File

@ -33,9 +33,7 @@ export class SelectBiomePhase extends BattlePhase {
"SelectModifierPhase", "SelectModifierPhase",
undefined, undefined,
undefined, undefined,
gameMode.isFixedBattle(currentWaveIndex) gameMode.getFixedBattle(currentWaveIndex)?.customModifierRewardSettings,
? gameMode.getFixedBattle(currentWaveIndex).customModifierRewardSettings
: undefined,
); );
} }
} }

View File

@ -71,9 +71,7 @@ export class VictoryPhase extends PokemonPhase {
"SelectModifierPhase", "SelectModifierPhase",
undefined, undefined,
undefined, undefined,
gameMode.isFixedBattle(currentWaveIndex) gameMode.getFixedBattle(currentWaveIndex)?.customModifierRewardSettings,
? gameMode.getFixedBattle(currentWaveIndex).customModifierRewardSettings
: undefined,
); );
} else if (gameMode.isDaily) { } else if (gameMode.isDaily) {
globalScene.phaseManager.pushNew("ModifierRewardPhase", modifierTypes.EXP_CHARM); globalScene.phaseManager.pushNew("ModifierRewardPhase", modifierTypes.EXP_CHARM);