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

Merge 67faa4d3bb into b1c50dd69f

Browse Source
This commit is contained in:
fabske0 2025-06-08 22:24:11 -04:00 committed by GitHub
commit 22b5206730
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
2 changed files with 8 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/field/pokemon.ts
View File

@ -649,7 +649,13 @@ export default abstract class Pokemon extends Phaser.GameObjects.Container {
getDexAttr(): bigint { getDexAttr(): bigint {
let ret = 0n; let ret = 0n;
ret |= this.gender !== Gender.FEMALE ? DexAttr.MALE : DexAttr.FEMALE; ret |=
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);

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

@ -235,6 +235,7 @@ export interface RunEntry {
} }
export const DexAttr = { export const DexAttr = {
GENDERLESS: 0n,
NON_SHINY: 1n, NON_SHINY: 1n,
SHINY: 2n, SHINY: 2n,
MALE: 4n, MALE: 4n,