random-mirrors
/
pokerogue
mirror of https://github.com/pagefaultgames/pokerogue.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

[Bug] Ability changing on evolution fix (#2995) 

* Prevent Pokemon with their second ability from evolving into their HA

* Add check for fusions too
This commit is contained in:
NightKev 2024-07-22 16:57:30 -07:00 committed by GitHub
parent 32d1b6b914
commit 86ebd0c5e5
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
1 changed files with 18 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
src/field/pokemon.ts
View File

@ -3295,14 +3295,26 @@ export class PlayerPokemon extends Pokemon {
}
this.generateName();
if (!isFusion) {
const abilityCount = this.getSpeciesForm().getAbilityCount();
if (this.abilityIndex >= abilityCount) { // Shouldn't happen
this.abilityIndex = abilityCount - 1;
// If a pokemon has its second ability and it evolves into a pokemon that doesn't have a second ability, switch to its first ability instead of its hidden ability
if (this.getSpeciesForm().ability2 === Abilities.NONE && this.abilityIndex === 1) {
this.abilityIndex = 0;
}
// Prevent pokemon with an illegal ability value from breaking things too badly
const abilityCount = this.getSpeciesForm().getAbilityCount();
if (this.abilityIndex >= abilityCount) {
console.warn("this.abilityIndex is somehow an illegal value, please report this");
console.warn(this.abilityIndex);
this.abilityIndex = 0;
}
} else { // Do the same as above, but for fusions
if (this.getFusionSpeciesForm().ability2 === Abilities.NONE && this.fusionAbilityIndex === 1) {
this.fusionAbilityIndex = 0;
}
} else {
const abilityCount = this.getFusionSpeciesForm().getAbilityCount();
if (this.fusionAbilityIndex >= abilityCount) {// Shouldn't happen
this.fusionAbilityIndex = abilityCount - 1;
if (this.fusionAbilityIndex >= abilityCount) {
console.warn("this.fusionAbilityIndex is somehow an illegal value, please report this");
console.warn(this.fusionAbilityIndex);
this.fusionAbilityIndex = 0;
}
}
this.compatibleTms.splice(0, this.compatibleTms.length);