Don't clear starters before starting run

This commit is contained in:
Wlowscha 2025-09-03 22:58:42 +02:00
parent cb7dc4898e
commit f2a06649fc
No known key found for this signature in database
GPG Key ID: 3C8F1AD330565D04

View File

@ -4453,10 +4453,11 @@ export class StarterSelectUiHandler extends MessageUiHandler {
() => { () => {
const startRun = () => { const startRun = () => {
globalScene.money = globalScene.gameMode.getStartingMoney(); globalScene.money = globalScene.gameMode.getStartingMoney();
const starters = this.starters.slice(0);
ui.setMode(UiMode.STARTER_SELECT); ui.setMode(UiMode.STARTER_SELECT);
const originalStarterSelectCallback = this.starterSelectCallback; const originalStarterSelectCallback = this.starterSelectCallback;
this.starterSelectCallback = null; this.starterSelectCallback = null;
originalStarterSelectCallback?.(this.starters); originalStarterSelectCallback?.(starters);
}; };
startRun(); startRun();
}, },
@ -4486,9 +4487,15 @@ export class StarterSelectUiHandler extends MessageUiHandler {
let canStart = false; let canStart = false;
for (let s = 0; s < this.starterSpecies.length; s++) { for (let s = 0; s < this.starterSpecies.length; s++) {
const species = this.starterSpecies[s]; const species = this.starterSpecies[s];
const starter = this.starters[s];
const isValidForChallenge = checkStarterValidForChallenge( const isValidForChallenge = checkStarterValidForChallenge(
species, species,
globalScene.gameData.getSpeciesDexAttrProps(species, this.getCurrentDexProps(species.speciesId)), {
formIndex: starter.formIndex,
shiny: starter.shiny,
variant: starter.variant,
female: starter.female ?? false,
},
false, false,
); );
canStart ||= isValidForChallenge; canStart ||= isValidForChallenge;