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

Merge branch 'beta' into hotfix-1.10.4

Browse Source
This commit is contained in:
NightKev 2025-08-25 23:59:42 -07:00 committed by GitHub
commit f2d46b666d
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
2 changed files with 1 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
src/field/pokemon.ts
View File

@ -1652,19 +1652,6 @@ export abstract class Pokemon extends Phaser.GameObjects.Container {
return precise ? this.hp / this.getMaxHp() : Math.round((this.hp / this.getMaxHp()) * 100) / 100; return precise ? this.hp / this.getMaxHp() : Math.round((this.hp / this.getMaxHp()) * 100) / 100;
} }
generateGender(): void {
if (this.species.malePercent === null) {
this.gender = Gender.GENDERLESS;
} else {
const genderChance = (this.id % 256) * 0.390625;
if (genderChance < this.species.malePercent) {
this.gender = Gender.MALE;
} else {
this.gender = Gender.FEMALE;
}
}
}
/** /**
* Return this Pokemon's {@linkcode Gender}. * Return this Pokemon's {@linkcode Gender}.
* @param ignoreOverride - Whether to ignore any overrides caused by {@linkcode MoveId.TRANSFORM | Transform}; default `false` * @param ignoreOverride - Whether to ignore any overrides caused by {@linkcode MoveId.TRANSFORM | Transform}; default `false`

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

@ -1515,6 +1515,7 @@ export class GameData {
switch (dataType) { switch (dataType) {
case GameDataType.SYSTEM: { case GameDataType.SYSTEM: {
dataStr = this.convertSystemDataStr(dataStr); dataStr = this.convertSystemDataStr(dataStr);
dataStr = dataStr.replace(/"playTime":\d+/, `"playTime":${this.gameStats.playTime + 60}`);
const systemData = this.parseSystemData(dataStr); const systemData = this.parseSystemData(dataStr);
valid = !!systemData.dexData && !!systemData.timestamp; valid = !!systemData.dexData && !!systemData.timestamp;
break; break;