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

Revert "[Bug] Genderless Pokemon no longer grey out the caught icon" (#6094)

Browse Source 
Revert "[Bug] grey caught indicator for genderless pokemon (#5935)"

This reverts commit 5104f5712f.
This commit is contained in:
Sirz Benjie 2025-07-14 14:35:15 -06:00 committed by GitHub
parent 5104f5712f
commit 374fb9613a
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
2 changed files with 1 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
src/enums/dex-attr.ts
View File

@ -1,5 +1,4 @@
export const DexAttr = Object.freeze({ export const DexAttr = Object.freeze({
GENDERLESS: 0n,
NON_SHINY: 1n, NON_SHINY: 1n,
SHINY: 2n, SHINY: 2n,
MALE: 4n, MALE: 4n,

8
src/field/pokemon.ts
View File

@ -558,13 +558,7 @@ export abstract class Pokemon extends Phaser.GameObjects.Container {
getDexAttr(): bigint { getDexAttr(): bigint {
let ret = 0n; let ret = 0n;
ret |= ret |= this.gender !== Gender.FEMALE ? DexAttr.MALE : DexAttr.FEMALE;
this.gender === Gender.GENDERLESS
? DexAttr.GENDERLESS
: this.gender === Gender.FEMALE
? DexAttr.FEMALE
: DexAttr.MALE;
ret |= !this.shiny ? DexAttr.NON_SHINY : DexAttr.SHINY; ret |= !this.shiny ? DexAttr.NON_SHINY : DexAttr.SHINY;
ret |= this.variant >= 2 ? DexAttr.VARIANT_3 : this.variant === 1 ? DexAttr.VARIANT_2 : DexAttr.DEFAULT_VARIANT; ret |= this.variant >= 2 ? DexAttr.VARIANT_3 : this.variant === 1 ? DexAttr.VARIANT_2 : DexAttr.DEFAULT_VARIANT;
ret |= globalScene.gameData.getFormAttr(this.formIndex); ret |= globalScene.gameData.getFormAttr(this.formIndex);