random-mirrors/pokerogue
1
0
Fork 0
mirror of https://github.com/pagefaultgames/pokerogue.git synced 2025-05-14 12:25:41 +01:00
Code Issues Packages Projects Releases Wiki Activity

[Bug][Sprite] Fix variants not using recolors for back sprite (#5691)

Browse Source 
Fix variants not showing back recolors with exp
This commit is contained in:
Sirz Benjie 2025-04-21 14:52:08 -05:00 committed by GitHub
parent 0da56cda9f
commit be6a117b1e
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
1 changed files with 16 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
src/data/pokemon-species.ts
View File

@ -404,7 +404,7 @@ export abstract class PokemonSpeciesForm {
} }
/** Compute the sprite ID of the pokemon form. */ /** Compute the sprite ID of the pokemon form. */
getSpriteId(female: boolean, formIndex?: number, shiny?: boolean, variant = 0, back?: boolean): string { getSpriteId(female: boolean, formIndex?: number, shiny?: boolean, variant = 0, back = false): string {
const baseSpriteKey = this.getBaseSpriteKey(female, formIndex); const baseSpriteKey = this.getBaseSpriteKey(female, formIndex);
let config = variantData; let config = variantData;
@ -598,11 +598,21 @@ export abstract class PokemonSpeciesForm {
* Load the variant colors for the species into the variant color cache * Load the variant colors for the species into the variant color cache
* *
* @param spriteKey - The sprite key to use * @param spriteKey - The sprite key to use
* @param female - Whether to get * @param female - Whether to load female instead of male
* @param back - Whether the back sprite is being loaded
* *
*/ */
async loadVariantColors(spriteKey: string, female: boolean, variant: Variant, formIndex?: number): Promise<void> { async loadVariantColors(
const baseSpriteKey = this.getBaseSpriteKey(female, formIndex); spriteKey: string,
female: boolean,
variant: Variant,
back = false,
formIndex?: number,
): Promise<void> {
let baseSpriteKey = this.getBaseSpriteKey(female, formIndex);
if (back) {
baseSpriteKey = "back__" + baseSpriteKey;
}
if (variantColorCache.hasOwnProperty(baseSpriteKey)) { if (variantColorCache.hasOwnProperty(baseSpriteKey)) {
// Variant colors have already been loaded // Variant colors have already been loaded
@ -618,7 +628,7 @@ export abstract class PokemonSpeciesForm {
await populateVariantColorCache( await populateVariantColorCache(
"pkmn__" + baseSpriteKey, "pkmn__" + baseSpriteKey,
globalScene.experimentalSprites && hasExpSprite(spriteKey), globalScene.experimentalSprites && hasExpSprite(spriteKey),
baseSpriteKey, baseSpriteKey.replace("__", "/"),
); );
} }
@ -635,7 +645,7 @@ export abstract class PokemonSpeciesForm {
globalScene.loadPokemonAtlas(spriteKey, this.getSpriteAtlasPath(female, formIndex, shiny, variant, back)); globalScene.loadPokemonAtlas(spriteKey, this.getSpriteAtlasPath(female, formIndex, shiny, variant, back));
globalScene.load.audio(this.getCryKey(formIndex), `audio/${this.getCryKey(formIndex)}.m4a`); globalScene.load.audio(this.getCryKey(formIndex), `audio/${this.getCryKey(formIndex)}.m4a`);
if (!isNullOrUndefined(variant)) { if (!isNullOrUndefined(variant)) {
await this.loadVariantColors(spriteKey, female, variant, formIndex); await this.loadVariantColors(spriteKey, female, variant, back, formIndex);
} }
return new Promise<void>(resolve => { return new Promise<void>(resolve => {
globalScene.load.once(Phaser.Loader.Events.COMPLETE, () => { globalScene.load.once(Phaser.Loader.Events.COMPLETE, () => {