- updated can_earn_money rule with a list of AP Regions that are in a display region with combat (Sara Sara Beach e.g.) but the player can't actually fight things in them or reach other regions in that display region where they could fight things (all Sara Sara Beach East AP Regions have no fighting and you can't get to the west beach in regionsanity)

- also added a unit test to double check this change

Author: dragonsbutalsorabbits

worlds/crystal_project/locations.py

@@ -1756,7 +1756,7 @@ def get_shop_locations(player: int, options: CrystalProjectOptions | None) -> Li
         LocationData(POSEIDON_SHRINE_PROPER_AP_REGION, POSEIDON_SHRINE_PROPER_AP_REGION + " Shop - Attendant 3", 30631 + shop_index_offset),
 
         #Sara Sara Bazaar
-        LocationData(SARA_SARA_BAZAAR_AP_REGION, SARA_SARA_BAZAAR_DISPLAY_NAME + " Shop - Old Nans Stew Subsidiary", 10957 + shop_index_offset),
+        LocationData(SARA_SARA_BAZAAR_AP_REGION, SARA_SARA_BAZAAR_DISPLAY_NAME + " Shop - Old Nan's Stew Subsidiary", 10957 + shop_index_offset),
 
         LocationData(SARA_SARA_BAZAAR_AP_REGION, SARA_SARA_BAZAAR_DISPLAY_NAME + " Shop - Accessory Merchant 1", 11386 + shop_index_offset),
         LocationData(SARA_SARA_BAZAAR_AP_REGION, SARA_SARA_BAZAAR_DISPLAY_NAME + " Shop - Accessory Merchant 2", 21386 + shop_index_offset),

worlds/crystal_project/rules.py

@@ -160,6 +160,9 @@ def has_jidamba_keys(self, state: CollectionState) -> bool:
         else:
             return False
 
+    apRegionsThatCantEarnMoney: list[str] = [MENU_AP_REGION, SARA_SARA_BEACH_EAST_AP_REGION, IBEK_CAVE_MOUTH_AP_REGION, BELOW_IBEK_CAVE_MOUTH_AP_REGION, BELOW_IBEK_CAVE_EAST_AP_REGION,
+                                             BELOW_IBEK_CAVE_WEST_AP_REGION, MODDED_ZONE_AP_REGION]
+
     def can_earn_money(self, state: CollectionState, shop_ap_region: str) -> bool:
         #Note: this rule is also used for the Sara Sara Bazaar innkeeper bc he charges money
         if shop_ap_region == MERCURY_SHRINE_AP_REGION:
@@ -175,10 +178,12 @@ def can_earn_money(self, state: CollectionState, shop_ap_region: str) -> bool:
 
         for ap_region in state.multiworld.worlds[self.player].get_regions():
             region_checked += 1
-            #checking if the player has access to money-earning zones that are higher than 6 regions below the shop's region, to make sure they're not expected to grind Spawning Meadows enemies to buy something in Neptune Shrine
-            if region_checked > (shop_region_index - 6) and ap_region.can_reach(state) and ap_region.name != MENU_AP_REGION and ap_region.name != MODDED_ZONE_AP_REGION:
+            #checking if the player has access to money-earning zones that are higher than 6 regions below the shop's region, to make sure they're not expected to grind Spawning Meadows enemies
+            #to buy something in Neptune Shrine
+            if region_checked > (shop_region_index - 6) and ap_region.can_reach(state) and ap_region.name not in self.apRegionsThatCantEarnMoney:
                 enemy_level = display_region_levels_dictionary[ap_region_to_display_region_dictionary[ap_region.name]][0]
-                if enemy_level > 0 or (ap_region.name == CAPITAL_SEQUOIA_AP_REGION and self.is_area_in_level_range(state, CAPITAL_SEQUOIA_ENEMY_LEVEL)) or (ap_region.name == QUINTAR_RESERVE_AP_REGION and self.is_area_in_level_range(state, QUINTAR_RESERVE_ENEMY_LEVEL)):
+                if (enemy_level > 0 or (ap_region.name == CAPITAL_SEQUOIA_AP_REGION and self.is_area_in_level_range(state, CAPITAL_SEQUOIA_ENEMY_LEVEL)) or
+                        (ap_region.name == QUINTAR_RESERVE_AP_REGION and self.is_area_in_level_range(state, QUINTAR_RESERVE_ENEMY_LEVEL))):
                     has_combat = True
                     break
 

worlds/crystal_project/test/test_shops.py

@@ -1,7 +1,9 @@
 from .bases import CrystalProjectTestBase
 from ..constants.region_passes import *
+from ..constants.display_regions import *
+from ..constants.mounts import *
 
-class TestCanEarnMoney(CrystalProjectTestBase):
+class TestCanEarnMoneyBasic(CrystalProjectTestBase):
     run_default_tests = False
 
     options = {
@@ -15,4 +17,24 @@ def test_can_earn_money(self):
         self.assertTrue(self.can_reach_location("Proving Meadows Chest - Tarzan"))
         self.assertFalse(self.can_reach_location("Proving Meadows Shop - Item Merchant 1"))
         self.collect_by_name(THE_PALE_GROTTO_PASS)
-        self.assertTrue(self.can_reach_location("Proving Meadows Shop - Item Merchant 1"))
+        self.assertTrue(self.can_reach_location("Proving Meadows Shop - Item Merchant 1"))
+
+class TestCanEarnMoneySaraSara(CrystalProjectTestBase):
+    run_default_tests = False
+
+    options = {
+        "shopsanity" : 1,
+        "regionsanity" : 1,
+        "start_inventory_from_pool": {SARA_SARA_BEACH_PASS : 1}
+    }
+
+    def test_can_earn_money(self):
+        self.collect_all_progressive_levels()
+        #the default unit test setup does not process start inventory so i need to have the pass here too (and i have to add it bc it's not in the pool since it's in the starting inventory)
+        self.multiworld.state.add_item(SARA_SARA_BEACH_PASS, self.player)
+        self.collect(self.get_item_by_name(SARA_SARA_BAZAAR_PASS))
+        self.assertFalse(self.can_reach_location(SARA_SARA_BEACH_DISPLAY_NAME + " Chest - Silver-crossed palm chest"))
+        self.assertFalse(self.can_reach_location(SARA_SARA_BAZAAR_DISPLAY_NAME + " Shop - Old Nan's Stew Subsidiary"))
+        self.collect(self.get_item_by_name(PROGRESSIVE_MOUNT))
+        self.assertTrue(self.can_reach_location(SARA_SARA_BEACH_DISPLAY_NAME + " Chest - Silver-crossed palm chest"))
+        self.assertTrue(self.can_reach_location(SARA_SARA_BAZAAR_DISPLAY_NAME + " Shop - Old Nan's Stew Subsidiary"))