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

Merge branch 'beta' into fix-cycle-shiny

Browse Source
This commit is contained in:
Wlowscha 2025-03-01 20:36:30 +01:00 committed by GitHub
commit abbf93945b
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
1 changed files with 13 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/system/game-data.ts
View File

@ -1645,13 +1645,21 @@ export class GameData {
} else if (formIndex === 3) { } else if (formIndex === 3) {
dexEntry.caughtAttr |= globalScene.gameData.getFormAttr(1); dexEntry.caughtAttr |= globalScene.gameData.getFormAttr(1);
} }
} else if (pokemon.species.speciesId === Species.ZYGARDE) {
if (formIndex === 4) {
dexEntry.caughtAttr |= globalScene.gameData.getFormAttr(2);
} else if (formIndex === 5) {
dexEntry.caughtAttr |= globalScene.gameData.getFormAttr(3);
} }
} else {
const allFormChanges = pokemonFormChanges.hasOwnProperty(species.speciesId) ? pokemonFormChanges[species.speciesId] : []; const allFormChanges = pokemonFormChanges.hasOwnProperty(species.speciesId) ? pokemonFormChanges[species.speciesId] : [];
const toCurrentFormChanges = allFormChanges.filter(f => (f.formKey === formKey)); const toCurrentFormChanges = allFormChanges.filter(f => (f.formKey === formKey));
if (toCurrentFormChanges.length > 0) { if (toCurrentFormChanges.length > 0) {
// Needs to do this or Castform can unlock the wrong form, etc.
dexEntry.caughtAttr |= globalScene.gameData.getFormAttr(0); dexEntry.caughtAttr |= globalScene.gameData.getFormAttr(0);
} }
} }
}
// Unlock ability // Unlock ability
if (speciesStarterCosts.hasOwnProperty(species.speciesId)) { if (speciesStarterCosts.hasOwnProperty(species.speciesId)) {