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

sprite display fix

Browse Source
This commit is contained in:
James Diefenbach 2024-08-30 21:16:02 +10:00
parent 1de58d9890
commit 5b51e77830
3 changed files with 44 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/phases/egg-hatch-phase.ts
View File

@ -314,7 +314,6 @@ export class EggHatchPhase extends Phase {
*/
doReveal(): void {
// set the previous dex data so info container can show new unlocks in egg summary
this.eggHatchData.setDex();
const isShiny = this.pokemon.isShiny();
if (this.pokemon.species.subLegendary) {
this.scene.validateAchv(achvs.HATCH_SUB_LEGENDARY);
@ -449,7 +448,6 @@ export class EggHatchPhase extends Phase {
*/
generatePokemon(): PlayerPokemon {
this.eggHatchData = this.hatchScene.generatePokemon(this.egg);
this.eggHatchData.setDex();
return this.eggHatchData.pokemon;
}
}

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

@ -139,6 +139,8 @@ export default class EggSummaryUiHandler extends MessageUiHandler {
this.pokemonIconsContainer.setVisible(true);
this.eggHatchBg.setVisible(true);
this.infoContainer.hideDisplayPokemon();
this.eggHatchData.forEach( (value: EggHatchData, i: number) => {
const x = (i % 11) * 18;
const y = Math.floor(i / 11) * 18;
@ -210,8 +212,10 @@ export default class EggSummaryUiHandler extends MessageUiHandler {
em.setScale(0.5);
em.setVisible(value.eggMoveUnlocked);
this.pokemonIconsContainer.add(em);
if (i === 0) {
this.infoContainer.displayPokemon(displayPokemon);
}
});
this.setCursor(0);
return true;

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

@ -13,6 +13,7 @@ import { getEggTierForSpecies } from "#app/data/egg.js";
import { starterColors } from "../battle-scene";
import { argbFromRgba } from "@material/material-color-utilities";
import { EggHatchData } from "#app/data/egg-hatch-data.js";
import { PlayerPokemon } from "#app/field/pokemon.js";
/**
* Class for the hatch info summary of each pokemon
@ -114,30 +115,22 @@ export default class PokemonHatchInfoContainer extends PokemonInfoContainer {
}
/**
* Updates the info container with the appropriate dex data and starter entry from the hatchInfo
* Also updates the displayed name, number, egg moves and main animated sprite for the pokemon
* @param hatchInfo The EggHatchData of the pokemon / new hatch to show
* Disable the sprite (and replace with substitute)
*/
showHatchInfo(hatchInfo: EggHatchData) {
console.log("showing hatch info", hatchInfo.pokemon.name);
this.pokemonEggMovesContainer.setVisible(true);
hideDisplayPokemon() {
this.currentPokemonSprite.setVisible(false);
}
const displayPokemon = hatchInfo.pokemon;
const species = displayPokemon.species;
const female = displayPokemon.gender === Gender.FEMALE;
const formIndex = displayPokemon.formIndex;
const shiny = displayPokemon.shiny;
const variant = displayPokemon.variant;
super.show(displayPokemon, false, 1, hatchInfo.getDex(), hatchInfo.getStarterEntry(), true);
const colorScheme = starterColors[species.speciesId];
this.pokemonCandyIcon.setTint(argbFromRgba(Utils.rgbHexToRgba(colorScheme[0])));
this.pokemonCandyIcon.setVisible(true);
this.pokemonCandyOverlayIcon.setTint(argbFromRgba(Utils.rgbHexToRgba(colorScheme[1])));
this.pokemonCandyOverlayIcon.setVisible(true);
this.pokemonCandyCountText.setText(`x${this.scene.gameData.starterData[species.speciesId].candyCount}`);
this.pokemonCandyCountText.setVisible(true);
/**
* Display a given pokemon sprite with animations
*/
displayPokemon(pokemon: PlayerPokemon) {
console.log("displaying pokemon", pokemon.name);
const species = pokemon.species;
const female = pokemon.gender === Gender.FEMALE;
const formIndex = pokemon.formIndex;
const shiny = pokemon.shiny;
const variant = pokemon.variant;
species.loadAssets(this.scene, female, formIndex, shiny, variant, true).then(() => {
// if (assetLoadCancelled.value) {
// return;
@ -152,6 +145,30 @@ export default class PokemonHatchInfoContainer extends PokemonInfoContainer {
this.currentPokemonSprite.setPipelineData("spriteKey", species.getSpriteKey(female, formIndex, shiny, variant));
// this.pokemonSprite.setVisible(!this.statsMode);
});
}
/**
* Updates the info container with the appropriate dex data and starter entry from the hatchInfo
* Also updates the displayed name, number, egg moves and main animated sprite for the pokemon
* @param hatchInfo The EggHatchData of the pokemon / new hatch to show
*/
showHatchInfo(hatchInfo: EggHatchData) {
console.log("showing hatch info", hatchInfo.pokemon.name);
this.pokemonEggMovesContainer.setVisible(true);
const pokemon = hatchInfo.pokemon;
const species = pokemon.species;
this.displayPokemon(pokemon);
super.show(pokemon, false, 1, hatchInfo.getDex(), hatchInfo.getStarterEntry(), true);
const colorScheme = starterColors[species.speciesId];
this.pokemonCandyIcon.setTint(argbFromRgba(Utils.rgbHexToRgba(colorScheme[0])));
this.pokemonCandyIcon.setVisible(true);
this.pokemonCandyOverlayIcon.setTint(argbFromRgba(Utils.rgbHexToRgba(colorScheme[1])));
this.pokemonCandyOverlayIcon.setVisible(true);
this.pokemonCandyCountText.setText(`x${this.scene.gameData.starterData[species.speciesId].candyCount}`);
this.pokemonCandyCountText.setVisible(true);
this.pokemonNumberText.setText(Utils.padInt(species.speciesId, 4));
this.pokemonNameText.setText(species.name);