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

load interrupts, simple sfx and no summary for small egg amounts

Browse Source
This commit is contained in:
James Diefenbach 2024-08-30 22:10:23 +10:00
parent 5b51e77830
commit 5718886a2a
3 changed files with 23 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/phases/egg-lapse-phase.ts
View File

@ -54,13 +54,12 @@ export class EggLapsePhase extends Phase {
); );
}, 100, true); }, 100, true);
} else { } else {
// regular hatches, no summary
this.scene.queueMessage(i18next.t("battle:eggHatching")); this.scene.queueMessage(i18next.t("battle:eggHatching"));
for (const egg of eggsToHatch) { for (const egg of eggsToHatch) {
this.scene.unshiftPhase(new EggHatchPhase(this.scene, this, egg, eggsToHatchCount)); this.scene.unshiftPhase(new EggHatchPhase(this.scene, this, egg, eggsToHatchCount));
eggsToHatchCount--; eggsToHatchCount--;
} }
this.scene.unshiftPhase(new EggSummaryPhase(this.scene, this.eggHatchData));
this.end(); this.end();
} }

7
src/ui/egg-summary-ui-handler.ts
View File

@ -212,12 +212,12 @@ export default class EggSummaryUiHandler extends MessageUiHandler {
em.setScale(0.5); em.setScale(0.5);
em.setVisible(value.eggMoveUnlocked); em.setVisible(value.eggMoveUnlocked);
this.pokemonIconsContainer.add(em); this.pokemonIconsContainer.add(em);
if (i === 0) {
this.infoContainer.displayPokemon(displayPokemon);
}
}); });
this.setCursor(0); this.setCursor(0);
// TODO nice animation reveal for all eggs hatching at once
this.scene.playSoundWithoutBgm("evolution_fanfare");
return true; return true;
} }
@ -278,6 +278,7 @@ export default class EggSummaryUiHandler extends MessageUiHandler {
const lastCursor = this.cursor; const lastCursor = this.cursor;
changed = super.setCursor(cursor); changed = super.setCursor(cursor);
this.infoContainer.interruptDisplay();
if (changed) { if (changed) {
this.cursorObj.setPosition(114 + 18 * (cursor % 11), 10 + 18 * Math.floor(cursor / 11)); this.cursorObj.setPosition(114 + 18 * (cursor % 11), 10 + 18 * Math.floor(cursor / 11));

22
src/ui/pokemon-hatch-info-container.ts
View File

@ -14,6 +14,7 @@ import { starterColors } from "../battle-scene";
import { argbFromRgba } from "@material/material-color-utilities"; import { argbFromRgba } from "@material/material-color-utilities";
import { EggHatchData } from "#app/data/egg-hatch-data.js"; import { EggHatchData } from "#app/data/egg-hatch-data.js";
import { PlayerPokemon } from "#app/field/pokemon.js"; import { PlayerPokemon } from "#app/field/pokemon.js";
import { getPokemonSpeciesForm } from "#app/data/pokemon-species.js";
/** /**
* Class for the hatch info summary of each pokemon * Class for the hatch info summary of each pokemon
@ -32,6 +33,7 @@ export default class PokemonHatchInfoContainer extends PokemonInfoContainer {
private pokemonCandyIcon: Phaser.GameObjects.Sprite; private pokemonCandyIcon: Phaser.GameObjects.Sprite;
private pokemonCandyOverlayIcon: Phaser.GameObjects.Sprite; private pokemonCandyOverlayIcon: Phaser.GameObjects.Sprite;
private pokemonCandyCountText: Phaser.GameObjects.Text; private pokemonCandyCountText: Phaser.GameObjects.Text;
private assetLoadCancelled: Utils.BooleanHolder | null;
constructor(scene: BattleScene, listContainer : Phaser.GameObjects.Container, x: number = 115, y: number = 9,) { constructor(scene: BattleScene, listContainer : Phaser.GameObjects.Container, x: number = 115, y: number = 9,) {
super(scene, x, y); super(scene, x, y);
@ -121,6 +123,13 @@ export default class PokemonHatchInfoContainer extends PokemonInfoContainer {
this.currentPokemonSprite.setVisible(false); this.currentPokemonSprite.setVisible(false);
} }
interruptDisplay() {
if (this.assetLoadCancelled) {
this.assetLoadCancelled.value = true;
this.assetLoadCancelled = null;
}
}
/** /**
* Display a given pokemon sprite with animations * Display a given pokemon sprite with animations
*/ */
@ -131,14 +140,19 @@ export default class PokemonHatchInfoContainer extends PokemonInfoContainer {
const formIndex = pokemon.formIndex; const formIndex = pokemon.formIndex;
const shiny = pokemon.shiny; const shiny = pokemon.shiny;
const variant = pokemon.variant; const variant = pokemon.variant;
const assetLoadCancelled = new Utils.BooleanHolder(false);
this.assetLoadCancelled = assetLoadCancelled;
species.loadAssets(this.scene, female, formIndex, shiny, variant, true).then(() => { species.loadAssets(this.scene, female, formIndex, shiny, variant, true).then(() => {
// if (assetLoadCancelled.value) { if (assetLoadCancelled.value) {
// return; console.log("interrupted");
// } return;
// this.assetLoadCancelled = null; }
this.assetLoadCancelled = null;
// this.speciesLoaded.set(species.speciesId, true); // this.speciesLoaded.set(species.speciesId, true);
// redundant setVisible(true) but makes sure sprite is only visible after being rendered (no substitute visible) // redundant setVisible(true) but makes sure sprite is only visible after being rendered (no substitute visible)
this.currentPokemonSprite.setVisible(true); this.currentPokemonSprite.setVisible(true);
getPokemonSpeciesForm(species.speciesId, pokemon.formIndex).cry(this.scene);
this.currentPokemonSprite.play(species.getSpriteKey(female, formIndex, shiny, variant)); this.currentPokemonSprite.play(species.getSpriteKey(female, formIndex, shiny, variant));
this.currentPokemonSprite.setPipelineData("shiny", shiny); this.currentPokemonSprite.setPipelineData("shiny", shiny);
this.currentPokemonSprite.setPipelineData("variant", variant); this.currentPokemonSprite.setPipelineData("variant", variant);