Update getAbility() and getAbilityCount() for the ability changes

DayKev · Jul 26, 2024 · f3557ac · f3557ac
1 parent f0335af
commit f3557ac
Showing 1 changed file with 2 additions and 9 deletions.
diff --git a/src/data/pokemon-species.ts b/src/data/pokemon-species.ts
@@ -182,14 +182,7 @@ export abstract class PokemonSpeciesForm {
    * @returns Number of abilities
    */
   getAbilityCount(): integer {
-    let count = 1;
-    if (this.ability2 !== Abilities.NONE) {
-      count += 1;
-    }
-    if (this.abilityHidden !== Abilities.NONE) {
-      count += 1;
-    }
-    return count;
+    return this.abilityHidden !== Abilities.NONE ? 3 : 2;
   }
 
   /**
@@ -202,7 +195,7 @@ export abstract class PokemonSpeciesForm {
     if (abilityIndex === 0) {
       ret = this.ability1;
     } else if (abilityIndex === 1) {
-      if (this.ability2 !== Abilities.NONE) {
+      if (this.ability2 !== this.ability1) {
         ret = this.ability2;
       } else {
         ret = this.abilityHidden;