hidden power cannot be fairy/normal/???/typeless

Author: pmariglia

fp/battle.py

@@ -7,12 +7,10 @@
 from data import all_move_json
 from data import pokedex
 
-from fp.helpers import get_pokemon_info_from_condition
+from fp.helpers import get_pokemon_info_from_condition, possible_hidden_power_types
 from fp.helpers import normalize_name
 from fp.helpers import calculate_stats
 
-from fp.helpers import POKEMON_TYPE_INDICES
-
 
 logger = logging.getLogger(__name__)
 
@@ -553,7 +551,7 @@ def __init__(self, name: str, level: int, nature="serious", evs=(85,) * 6):
         self.nature = nature
         self.evs = evs
         self.speed_range = StatRange(min=0, max=float("inf"))
-        self.hidden_power_possibilities = set(POKEMON_TYPE_INDICES.keys())
+        self.hidden_power_possibilities = possible_hidden_power_types()
 
         try:
             self.base_stats = pokedex[self.name][constants.BASESTATS]

fp/helpers.py

@@ -184,6 +184,16 @@ def calculate_stats(base_stats, level, ivs=(31,) * 6, evs=(85,) * 6, nature="ser
     "???": 18,
 }
 
+
+def possible_hidden_power_types():
+    hidden_power_types = set(POKEMON_TYPE_INDICES)
+    hidden_power_types.remove("typeless")
+    hidden_power_types.remove("???")
+    hidden_power_types.remove("fairy")
+    hidden_power_types.remove("normal")
+    return hidden_power_types
+
+
 # fmt: off
 DAMAGE_MULTIPICATION_ARRAY = [
     [1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 0.5, 0, 1, 1, 0.5, 1, 1],