cdnutter
/
pokerogue
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix game over and subsequent clear reward

pull/16/head
Flashfyre 2024-02-22 16:21:34 -05:00
parent cd6fe56796
commit 8cb7433f55
1 changed files with 43 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

47
src/phases.ts
View File

@ -2851,7 +2851,7 @@ export class MoneyRewardPhase extends BattlePhase {
} }
export class ModifierRewardPhase extends BattlePhase { export class ModifierRewardPhase extends BattlePhase {
private modifierType: ModifierType; protected modifierType: ModifierType;
constructor(scene: BattleScene, modifierTypeFunc: ModifierTypeFunc) { constructor(scene: BattleScene, modifierTypeFunc: ModifierTypeFunc) {
super(scene); super(scene);
@ -2862,12 +2862,45 @@ export class ModifierRewardPhase extends BattlePhase {
start() { start() {
super.start(); super.start();
const newModifier = this.modifierType.newModifier(); this.doReward().then(() => this.end());
}
doReward(): Promise<void> {
return new Promise<void>(resolve => {
const newModifier = this.modifierType.newModifier();
this.scene.addModifier(newModifier).then(() => { this.scene.addModifier(newModifier).then(() => {
this.scene.playSoundWithoutBgm('item_fanfare'); this.scene.playSoundWithoutBgm('item_fanfare');
this.scene.ui.showText(`You received\n${newModifier.type.name}!`, null, () => this.end(), null, true); this.scene.ui.showText(`You received\n${newModifier.type.name}!`, null, () => resolve(), null, true);
}); });
})
}
}
export class GameOverModifierRewardPhase extends ModifierRewardPhase {
constructor(scene: BattleScene, modifierTypeFunc: ModifierTypeFunc) {
super(scene, modifierTypeFunc);
}
doReward(): Promise<void> {
return new Promise<void>(resolve => {
const newModifier = this.modifierType.newModifier();
this.scene.addModifier(newModifier).then(() => {
this.scene.gameData.saveSystem().then(success => {
if (success) {
this.scene.playSoundWithoutBgm('level_up_fanfare');
this.scene.ui.setMode(Mode.MESSAGE);
this.scene.arenaBg.setVisible(false);
this.scene.ui.fadeIn(250).then(() => {
this.scene.ui.showText(`You received\n${newModifier.type.name}!`, null, () => {
this.scene.time.delayedCall(1500, () => this.scene.arenaBg.setVisible(true));
resolve();
}, null, true, 1500);
});
} else
this.scene.reset(true);
});
});
})
} }
} }
@ -2896,9 +2929,9 @@ export class GameOverPhase extends BattlePhase {
this.scene.ui.fadeOut(fadeDuration).then(() => { this.scene.ui.fadeOut(fadeDuration).then(() => {
this.scene.clearPhaseQueue(); this.scene.clearPhaseQueue();
this.scene.ui.clearText(); this.scene.ui.clearText();
this.handleUnlocks(this.scene.getParty()); this.handleUnlocks();
if (!firstClear) if (this.victory && !firstClear)
this.scene.unshiftPhase(new ModifierRewardPhase(this.scene, modifierTypes.VOUCHER_PREMIUM)); this.scene.unshiftPhase(new GameOverModifierRewardPhase(this.scene, modifierTypes.VOUCHER_PREMIUM));
this.scene.reset(); this.scene.reset();
this.scene.unshiftPhase(new CheckLoadPhase(this.scene)); this.scene.unshiftPhase(new CheckLoadPhase(this.scene));
this.end(); this.end();
@ -2907,7 +2940,7 @@ export class GameOverPhase extends BattlePhase {
}); });
} }
handleUnlocks(party: PlayerPokemon[]): void { handleUnlocks(): void {
if (this.victory) { if (this.victory) {
if (!this.scene.gameData.unlocks[Unlockables.ENDLESS_MODE]) if (!this.scene.gameData.unlocks[Unlockables.ENDLESS_MODE])
this.scene.unshiftPhase(new UnlockPhase(this.scene, Unlockables.ENDLESS_MODE)); this.scene.unshiftPhase(new UnlockPhase(this.scene, Unlockables.ENDLESS_MODE));