227 refactor duplicate logic

melvio · Apr 13, 2022 · ccc1182 · ccc1182
1 parent a328ce6
commit ccc1182
Show file tree

Hide file tree

Showing 4 changed files with 35 additions and 247 deletions.
diff --git a/src/hopla/hoplalib/hatchery/egg_data.py b/src/hopla/hoplalib/hatchery/egg_data.py
@@ -8,15 +8,15 @@
 class EggData:
     """Class with data about eggs."""
 
-    drop_egg_names = [
+    drop_egg_names: List[str] = [
         "BearCub", "Cactus", "Dragon", "FlyingPig", "Fox", "LionCub",
         "PandaCub", "TigerCub", "Wolf"
     ]
     """
     Drop eggs. This is list was retrieved using: `hopla api content | jq .dropEggs | jq. keys`
     """
 
-    quest_egg_names = [
+    quest_egg_names: List[str] = [
         "Alligator", "Armadillo", "Axolotl", "Badger", "Beetle", "Bunny",
         "Butterfly", "Cheetah", "Cow", "Cuttlefish", "Deer", "Dolphin", "Egg",
         "Falcon", "Ferret", "Frog", "Gryphon", "GuineaPig", "Hedgehog",
@@ -28,7 +28,8 @@ class EggData:
         "Whale", "Yarn"
     ]
     """
-    Quest Eggs. This is list was retrieved using: `hopla api content | jq .questEggs | jq keys`
+    Quest Eggs. This is list was retrieved using:
+    hopla api content | jq .questEggs | jq keys
     """
 
     egg_names: List[str] = drop_egg_names + quest_egg_names

diff --git a/src/hopla/hoplalib/hatchery/hatchpotion_data.py b/src/hopla/hoplalib/hatchery/hatchpotion_data.py
@@ -12,7 +12,8 @@ class HatchPotionData:
         "Red", "Shade", "Skeleton", "White", "Zombie"
     ]
     """
-    Drop hatching potions. This list was retrieved by using:
+    Drop hatching potions. Also known as 1st gen potions.
+    This list was retrieved by using:
     hopla api content | jq.dropHatchingPotions | jq keys
     """
 
@@ -32,9 +33,11 @@ class HatchPotionData:
     """
 
     wacky_hatch_potion_names = ["Dessert", "Veggie", "VirtualPet"]
-    """Wacky hatching potions. This list was retrieved by using:
+    """
+    Wacky hatching potions. This list was retrieved by using:
            hopla api content | jq '.wackyHatchingPotions|keys'
     """
+
     non_drop_hatch_potion_names: List[str] = (
             magic_hatch_potion_names
             + wacky_hatch_potion_names

diff --git a/src/hopla/hoplalib/hoplaversion.py b/src/hopla/hoplalib/hoplaversion.py
@@ -7,7 +7,7 @@
 
 MAJOR_VERSION: Final[int] = 0
 MINOR_VERSION: Final[int] = 0
-PATCH_VERSION: Final[int] = 29
+PATCH_VERSION: Final[int] = 30
 PRE_RELEASE: Final[Optional[str]] = "alpha"