From 85fe7d1d04f5d9bd674b999e955b66a66d60892c Mon Sep 17 00:00:00 2001 From: codemann8 Date: Wed, 3 Aug 2022 17:52:22 -0500 Subject: [PATCH] Fixed bomb/rupee farming to not include caves if cave pots are shuffled --- BaseClasses.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/BaseClasses.py b/BaseClasses.py index 7efa1903..dc943c2b 100644 --- a/BaseClasses.py +++ b/BaseClasses.py @@ -1106,7 +1106,7 @@ class CollectionState(object): region = self.world.get_region(regionname, player) return region.can_reach(self) and ((self.world.mode[player] != 'inverted' and region.is_light_world) or (self.world.mode[player] == 'inverted' and region.is_dark_world) or self.has('Pearl', player)) - for region in rupee_farms: + for region in rupee_farms if self.world.pottery[player] in ['none', 'keys', 'dungeon'] else ['Archery Game']: if can_reach_non_bunny(region): return True @@ -1188,7 +1188,7 @@ class CollectionState(object): return region.can_reach(self) and ((self.world.mode[player] != 'inverted' and region.is_light_world) or (self.world.mode[player] == 'inverted' and region.is_dark_world) or self.has('Pearl', player)) # bomb pickups - for region in bush_bombs + bomb_caves: + for region in bush_bombs + (bomb_caves if self.world.pottery[player] in ['none', 'keys', 'dungeon'] else []): if can_reach_non_bunny(region): return True