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

Merge branch 'beta' into damo-MysteryEncounterCollection

Browse Source
This commit is contained in:
damocleas 2025-08-04 18:02:18 -04:00 committed by GitHub
commit 9cc4ad3bbf
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/data/pokemon/pokemon-data.ts
View File

@ -162,6 +162,7 @@ export class PokemonSummonData {
if (key === "speciesForm" || key === "fusionSpeciesForm") {
this[key] = deserializePokemonSpeciesForm(value);
continue;
}
if (key === "illusion" && typeof value === "object") {
@ -182,6 +183,7 @@ export class PokemonSummonData {
}
}
this[key] = illusionData as IllusionData;
continue;
}
if (key === "moveset") {

4
src/field/pokemon.ts
View File

@ -1821,8 +1821,6 @@ export abstract class Pokemon extends Phaser.GameObjects.Container {
* @returns An array of {@linkcode PokemonMove}, as described above.
*/
getMoveset(ignoreOverride = false): PokemonMove[] {
const ret = !ignoreOverride && this.summonData.moveset ? this.summonData.moveset : this.moveset;
// Overrides moveset based on arrays specified in overrides.ts
let overrideArray: MoveId | Array<MoveId> = this.isPlayer()
? Overrides.MOVESET_OVERRIDE
@ -1838,7 +1836,7 @@ export abstract class Pokemon extends Phaser.GameObjects.Container {
});
}
return ret;
return !ignoreOverride && this.summonData.moveset ? this.summonData.moveset : this.moveset;
}
/**