mika/pokerogue
1
0
Fork 0
mirror of https://github.com/pagefaultgames/pokerogue.git synced 2025-12-21 09:09:19 +01:00
Code Issues Packages Projects Releases Wiki Activity

grey caught indicator for genderless pokemon

Browse Source
This commit is contained in:
Fabi 2025-06-05 11:12:08 +02:00
parent dd2f475ded
commit e04d22bc68
2 changed files with 7 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/field/pokemon.ts
View File

@ -657,7 +657,12 @@ 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 |= ret |=
this.gender === Gender.GENDERLESS
? DexAttr.GENDERLESS
: this.gender !== Gender.FEMALE
? DexAttr.MALE
: DexAttr.FEMALE;
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);
@ -6702,7 +6707,6 @@ export class EnemyPokemon extends Pokemon {
return ret; return ret;
} }
/** /**
* Show or hide the type effectiveness multiplier window * Show or hide the type effectiveness multiplier window
* Passing undefined will hide the window * Passing undefined will hide the window

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

@ -248,6 +248,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,