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

Hppefully fixed -1 sprite scale glitch

Browse Source
This commit is contained in:
Bertie690 2025-05-01 12:00:17 -04:00
parent 448109d10f
commit 04d1cbfa24
3 changed files with 17 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
src/data/custom-pokemon-data.ts
View File

@ -7,8 +7,11 @@ import type { Nature } from "#enums/nature";
* Includes abilities, nature, changed types, etc. * Includes abilities, nature, changed types, etc.
*/ */
export class CustomPokemonData { export class CustomPokemonData {
/** The scale at which to render this Pokemon's sprite. */ // TODO: Change the default value for all these from -1 to something a bit more sensible
public spriteScale = 1; /**
* The scale at which to render this Pokemon's sprite.
*/
public spriteScale = -1;
public ability: Abilities | -1; public ability: Abilities | -1;
public passive: Abilities | -1; public passive: Abilities | -1;
public nature: Nature | -1; public nature: Nature | -1;

4
src/field/pokemon.ts
View File

@ -1215,6 +1215,10 @@ export default abstract class Pokemon extends Phaser.GameObjects.Container {
// G-Max and starmobiles have flat 1.5x scale // G-Max and starmobiles have flat 1.5x scale
return 1.5; return 1.5;
} }
if (this.customPokemonData.spriteScale <= 0) {
return 1;
}
return this.customPokemonData.spriteScale; return this.customPokemonData.spriteScale;
} }

19
src/system/version_migration/versions/v1_9_0.ts
View File

@ -27,17 +27,14 @@ const migratePartyData: SessionSaveMigrator = {
// only edit summondata moveset if exists // only edit summondata moveset if exists
pkmnData.summonData.moveset &&= pkmnData.summonData.moveset.filter(m => !!m).map(m => PokemonMove.loadMove(m)); pkmnData.summonData.moveset &&= pkmnData.summonData.moveset.filter(m => !!m).map(m => PokemonMove.loadMove(m));
if (pkmnData.customPokemonData) { if (
// revert all "-1" sprite scales to a minimum value of 1 pkmnData.customPokemonData &&
pkmnData.customPokemonData.spriteScale = Math.max(1, pkmnData.customPokemonData.spriteScale); "hitsRecCount" in pkmnData.customPokemonData &&
if ( typeof pkmnData.customPokemonData["hitsRecCount"] === "number"
"hitsRecCount" in pkmnData.customPokemonData && ) {
typeof pkmnData.customPokemonData["hitsRecCount"] === "number" // transfer old hit count stat to battleData.
) { pkmnData.battleData.hitCount = pkmnData.customPokemonData["hitsRecCount"];
// transfer old hit count stat to battleData. pkmnData.customPokemonData["hitsRecCount"] = null;
pkmnData.battleData.hitCount = pkmnData.customPokemonData["hitsRecCount"];
pkmnData.customPokemonData["hitsRecCount"] = null;
}
} }
return pkmnData; return pkmnData;
}; };