Skip to content

Commit

Permalink
[Bug] Remove ability swap code in PlayerPokemon.evolve() (#3113)
Browse files Browse the repository at this point in the history
  • Loading branch information
DayKev authored Jul 23, 2024
1 parent 0e5fd80 commit 5edaec9
Showing 1 changed file with 0 additions and 7 deletions.
7 changes: 0 additions & 7 deletions src/field/pokemon.ts
Original file line number Diff line number Diff line change
Expand Up @@ -3315,10 +3315,6 @@ export class PlayerPokemon extends Pokemon {
}
this.generateName();
if (!isFusion) {
// 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) {
Expand All @@ -3327,9 +3323,6 @@ export class PlayerPokemon extends Pokemon {
this.abilityIndex = 0;
}
} else { // Do the same as above, but for fusions
if (this.getFusionSpeciesForm().ability2 === Abilities.NONE && this.fusionAbilityIndex === 1) {
this.fusionAbilityIndex = 0;
}
const abilityCount = this.getFusionSpeciesForm().getAbilityCount();
if (this.fusionAbilityIndex >= abilityCount) {
console.warn("this.fusionAbilityIndex is somehow an illegal value, please report this");
Expand Down

0 comments on commit 5edaec9

Please sign in to comment.