Merge pull request #2 from ScipioWright/animal-well-fix-pr

Some more fixes

Author: Rooby-Roo

worlds/animal_well/options.py

@@ -198,6 +198,7 @@ class WheelHopping(Choice):
     default = 0
     visibility = Visibility.none
 
+
 class WeirdTricks(Toggle):
     """
     Included temporarily for backward compatibility.
@@ -207,6 +208,7 @@ class WeirdTricks(Toggle):
     display_name = "Weird Tricks"
     visibility = Visibility.none
 
+
 @dataclass
 class AnimalWellOptions(PerGameCommonOptions):
     goal: Goal

worlds/animal_well/region_data.py

@@ -186,7 +186,8 @@ class AWData(NamedTuple):
         lname.egg_normal:  # hidden wall in lower left of first bubble room
             AWData(AWType.location),
         lname.egg_dazzle:  # little obstacle course, feels like the bubble jump tutorial?
-            AWData(AWType.location, [[iname.bubble], [iname.disc, iname.wheel], [iname.disc_hop_hard], [iname.wheel_hard]]),
+            AWData(AWType.location, [[iname.bubble], [iname.disc, iname.wheel], [iname.disc_hop_hard],
+                                     [iname.wheel_hard]]),
         rname.fish_tube_room:  # enter at the save room fish pipe, the rooms with all the fish pipes
             AWData(AWType.region, [[iname.bubble]]),
         lname.egg_sunset:  # break the spikes in the room to the right of the fish warp
@@ -418,7 +419,8 @@ class AWData(NamedTuple):
             AWData(AWType.region, [[iname.ball_trick_medium], [iname.bubble, iname.tanking_damage],
                                    [iname.disc, iname.tanking_damage, iname.precise_tricks]]),
         rname.bear_chameleon_room_2:
-            AWData(AWType.region, [[iname.bubble_long, iname.tanking_damage], [iname.disc_hop_hard, iname.tanking_damage]]),
+            AWData(AWType.region, [[iname.bubble_long, iname.tanking_damage],
+                                   [iname.disc_hop_hard, iname.tanking_damage]]),
     },
     rname.bear_crow_rooms: {
         rname.bear_shadow_egg_spot:  # get across the room with the lifters and the miasma
@@ -470,7 +472,8 @@ class AWData(NamedTuple):
     },
     rname.bear_upper_phone_room: {
         rname.bear_above_chameleon:
-            AWData(AWType.region, [[iname.yoyo], [iname.ball, iname.ball_trick_medium, iname.obscure_tricks], [iname.slink, iname.bubble, iname.obscure_tricks]]),
+            AWData(AWType.region, [[iname.yoyo], [iname.ball, iname.ball_trick_medium, iname.obscure_tricks],
+                                   [iname.slink, iname.bubble, iname.obscure_tricks]]),
     },
     rname.bear_above_chameleon: {  # includes the screens to the right of it
         lname.egg_swan:  # wake one chinchilla, lure upper one right, run left

worlds/animal_well/region_scripts.py

@@ -84,14 +84,9 @@ def convert_tech_reqs(reqs: List[List[str]], options: AnimalWellOptions) -> List
     # these convert [[wheel_hop], [disc]] to either [[wheel], [disc]] or [[disc]]
     # and convert [[disc_hop_hard]] to either [[disc]] or []
     reqs = [
-        [iname.wheel if item == iname.wheel_hop else item for item in sublist]
+        [iname.wheel if item in [iname.wheel_hop, iname.wheel_climb] else item for item in sublist]
         for sublist in reqs
-        if not (iname.wheel_hop in sublist and not options.wheel_tricks)  
-    ]
-    reqs = [
-        [iname.wheel if item == iname.wheel_climb else item for item in sublist]
-        for sublist in reqs
-        if not (iname.wheel_climb in sublist and not options.wheel_tricks)
+        if not (iname.wheel_hop in sublist and not options.wheel_tricks)
     ]
     reqs = [
         [iname.wheel if item == iname.wheel_hard else item for item in sublist]
@@ -116,7 +111,7 @@ def convert_tech_reqs(reqs: List[List[str]], options: AnimalWellOptions) -> List
     reqs = [
         [iname.ball if item == iname.ball_trick_medium else item for item in sublist]
         for sublist in reqs
-        if not (iname.ball_trick_medium in sublist and options.ball_throwing not in (BallThrowing.option_advanced, BallThrowing.option_expert))
+        if not (iname.ball_trick_medium in sublist and options.ball_throwing < BallThrowing.option_advanced)
     ]
     reqs = [
         [iname.ball if item == iname.ball_trick_hard else item for item in sublist]
@@ -143,11 +138,6 @@ def convert_tech_reqs(reqs: List[List[str]], options: AnimalWellOptions) -> List
         for sublist in reqs
         if not (iname.water_bounce in sublist and not options.obscure_tricks)
     ]
-    reqs = [
-        [None if item == iname.tanking_damage else item for item in sublist]
-        for sublist in reqs
-        if not (iname.tanking_damage in sublist and not options.tanking_damage)
-    ]
     return reqs