mika/pokerogue
1
0
Fork 0
mirror of https://github.com/pagefaultgames/pokerogue.git synced 2025-09-24 07:23:24 +02:00
Code Issues Packages Projects Releases Wiki Activity

Claened up title scene daily run init to be less questionable

Browse Source
This commit is contained in:
Bertie690 2025-09-14 19:22:39 -04:00
parent 17c13115dd
commit 28575fd316
1 changed files with 79 additions and 88 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

57
src/phases/title-phase.ts
View File

@ -193,7 +193,7 @@ export class TitlePhase extends Phase {
initDailyRun(): void { initDailyRun(): void {
globalScene.ui.clearText(); globalScene.ui.clearText();
globalScene.ui.setMode(UiMode.SAVE_SLOT, SaveSlotUiMode.SAVE, (slotId: number) => { globalScene.ui.setMode(UiMode.SAVE_SLOT, SaveSlotUiMode.SAVE, async (slotId: number) => {
if (slotId === -1) { if (slotId === -1) {
globalScene.phaseManager.toTitleScreen(); globalScene.phaseManager.toTitleScreen();
super.end(); super.end();
@ -202,7 +202,27 @@ export class TitlePhase extends Phase {
globalScene.phaseManager.clearPhaseQueue(); globalScene.phaseManager.clearPhaseQueue();
globalScene.sessionSlotId = slotId; globalScene.sessionSlotId = slotId;
const generateDaily = (seed: string) => { let seed = "";
// If Online, calls seed fetch from db to generate daily run. If Offline, generates a daily run based on current date.
if (!isLocal || isLocalServerConnected) {
try {
seed = (await fetchDailyRunSeed()) ?? "";
if (!seed) {
throw new Error("Daily run seed is null!");
}
} catch (err) {
// TODO: Find a better fallback for bad daily run loads
console.error("Failed to load daily run:\n", err);
}
} else {
// Grab first 10 chars of ISO date format (YYYY-MM-DD) and convert to base64
seed = Overrides.DAILY_RUN_SEED_OVERRIDE ?? btoa(new Date().toISOString().substring(0, 10));
}
await this.generateDaily(seed);
});
}
private async generateDaily(seed: string) {
globalScene.gameMode = getGameMode(GameModes.DAILY); globalScene.gameMode = getGameMode(GameModes.DAILY);
// Daily runs don't support all challenges yet (starter select restrictions aren't considered) // Daily runs don't support all challenges yet (starter select restrictions aren't considered)
globalScene.eventManager.startEventChallenges(); globalScene.eventManager.startEventChallenges();
@ -221,11 +241,7 @@ export class TitlePhase extends Phase {
const starterProps = globalScene.gameData.getSpeciesDexAttrProps(starter.species, starter.dexAttr); const starterProps = globalScene.gameData.getSpeciesDexAttrProps(starter.species, starter.dexAttr);
const starterFormIndex = Math.min(starterProps.formIndex, Math.max(starter.species.forms.length - 1, 0)); const starterFormIndex = Math.min(starterProps.formIndex, Math.max(starter.species.forms.length - 1, 0));
const starterGender = const starterGender =
starter.species.malePercent !== null starter.species.malePercent !== null ? (!starterProps.female ? Gender.MALE : Gender.FEMALE) : Gender.GENDERLESS;
? !starterProps.female
? Gender.MALE
: Gender.FEMALE
: Gender.GENDERLESS;
const starterPokemon = globalScene.addPlayerPokemon( const starterPokemon = globalScene.addPlayerPokemon(
starter.species, starter.species,
startingLevel, startingLevel,
@ -261,7 +277,7 @@ export class TitlePhase extends Phase {
} }
globalScene.updateModifiers(true, true); globalScene.updateModifiers(true, true);
Promise.all(loadPokemonAssets).then(() => { await Promise.all(loadPokemonAssets);
globalScene.time.delayedCall(500, () => globalScene.playBgm()); globalScene.time.delayedCall(500, () => globalScene.playBgm());
globalScene.gameData.gameStats.dailyRunSessionsPlayed++; globalScene.gameData.gameStats.dailyRunSessionsPlayed++;
globalScene.newArena(globalScene.gameMode.getStartingBiome()); globalScene.newArena(globalScene.gameMode.getStartingBiome());
@ -270,31 +286,6 @@ export class TitlePhase extends Phase {
globalScene.sessionPlayTime = 0; globalScene.sessionPlayTime = 0;
globalScene.lastSavePlayTime = 0; globalScene.lastSavePlayTime = 0;
this.end(); this.end();
});
};
// If Online, calls seed fetch from db to generate daily run. If Offline, generates a daily run based on current date.
if (!isLocal || isLocalServerConnected) {
fetchDailyRunSeed()
.then(seed => {
if (seed) {
generateDaily(seed);
} else {
throw new Error("Daily run seed is null!");
}
})
.catch(err => {
console.error("Failed to load daily run:\n", err);
});
} else {
// Grab first 10 chars of ISO date format (YYYY-MM-DD) and convert to base64
let seed: string = btoa(new Date().toISOString().substring(0, 10));
if (Overrides.DAILY_RUN_SEED_OVERRIDE != null) {
seed = Overrides.DAILY_RUN_SEED_OVERRIDE;
}
generateDaily(seed);
}
});
} }
end(): void { end(): void {