random-mirrors/pokerogue
1
0
Fork 0
mirror of https://github.com/pagefaultgames/pokerogue.git synced 2025-02-16 17:27:41 +00:00
Code Issues Packages Projects Releases Wiki Activity

Hotfix: Override varaint tier if species was given. Fixed that some common egg where displayed as manaphy egg and wrong manaphy egg counter (#2505)

Browse Source 
* Hotfix: Override varaint tier if species was given. Fixed that some common egg where displayed as manaphy egg.

* Fixes wrong manaphy egg pulled stat count
This commit is contained in:
sirzento 2024-06-22 12:40:10 +02:00 committed by GitHub
parent 5ba14a346a
commit 3e9fbeb4d6
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
1 changed files with 13 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
src/data/egg.ts
View File

@ -141,12 +141,17 @@ export class Egg {
//if (eggOptions.tier && eggOptions.species) throw Error("Error egg can't have species and tier as option. only choose one of them.") //if (eggOptions.tier && eggOptions.species) throw Error("Error egg can't have species and tier as option. only choose one of them.")
this._tier = eggOptions.tier ?? (Overrides.EGG_TIER_OVERRIDE ?? this.rollEggTier()); this._tier = eggOptions.tier ?? (Overrides.EGG_TIER_OVERRIDE ?? this.rollEggTier());
// If egg was pulled, check if egg pity needs to override the egg tier
if (eggOptions.pulled) { if (eggOptions.pulled) {
this.checkForPityTierOverrides(eggOptions.scene); this.checkForPityTierOverrides(eggOptions.scene);
this.increasePullStatistic(eggOptions.scene);
} }
this._id = eggOptions.id ?? Utils.randInt(EGG_SEED, EGG_SEED * this._tier); this._id = eggOptions.id ?? Utils.randInt(EGG_SEED, EGG_SEED * this._tier);
// Increase pull statistics AFTER the ID was generated beacuse it will be used to check for mahnaphy egg
if (eggOptions.pulled) {
this.increasePullStatistic(eggOptions.scene);
}
this._sourceType = eggOptions.sourceType ?? undefined; this._sourceType = eggOptions.sourceType ?? undefined;
this._hatchWaves = eggOptions.hatchWaves ?? this.getEggTierDefaultHatchWaves(); this._hatchWaves = eggOptions.hatchWaves ?? this.getEggTierDefaultHatchWaves();
this._timestamp = eggOptions.timestamp ?? new Date().getTime(); this._timestamp = eggOptions.timestamp ?? new Date().getTime();
@ -163,6 +168,12 @@ export class Egg {
if (eggOptions.species) { if (eggOptions.species) {
this._tier = this.getEggTierFromSpeciesStarterValue(); this._tier = this.getEggTierFromSpeciesStarterValue();
this._hatchWaves = eggOptions.hatchWaves ?? this.getEggTierDefaultHatchWaves(); this._hatchWaves = eggOptions.hatchWaves ?? this.getEggTierDefaultHatchWaves();
// If species has no variant, set variantTier to common. This needs to
// be done because species with no variants get filtered at rollSpecies but since the
// species is set the check never happens
if (!getPokemonSpecies(this.species).hasVariants()) {
this._variantTier = VariantTier.COMMON;
}
} }
if (eggOptions.pulled) { if (eggOptions.pulled) {
this.addEggToGameData(eggOptions.scene); this.addEggToGameData(eggOptions.scene);
@ -175,7 +186,7 @@ export class Egg {
public isManaphyEgg(): boolean { public isManaphyEgg(): boolean {
return (this._species === Species.PHIONE || this._species === Species.MANAPHY) || return (this._species === Species.PHIONE || this._species === Species.MANAPHY) ||
this._tier === EggTier.COMMON && !(this._id % 204); this._tier === EggTier.COMMON && !(this._id % 204) && !this._species;
} }
public getKey(): string { public getKey(): string {