Revert weird reversion of OoTRandomizer#1976 from OoTRandomizer#1885

fenhl · Jun 20, 2023 · b38ed8e · b38ed8e
1 parent d2a5177
commit b38ed8e
Show file tree

Hide file tree

Showing 2 changed files with 16 additions and 6 deletions.
diff --git a/data/World/Overworld.json b/data/World/Overworld.json
@@ -1026,7 +1026,9 @@
         "hint": "HAUNTED_WASTELAND",
         "locations": {
             "Wasteland Chest": "has_fire_source",
-            "Wasteland Bombchu Salesman": "Progressive_Wallet and can_jumpslash",
+            "Wasteland Bombchu Salesman": "
+                Progressive_Wallet and can_jumpslash and
+                (shuffle_expensive_merchants or not free_bombchu_drops or has_bombchus)",
             "Wasteland Near GS Pot 1": "True",
             "Wasteland Near GS Pot 2": "True",
             "Wasteland Near GS Pot 3": "True",
@@ -1133,10 +1135,18 @@
         "scene": "Market",
         "hint": "MARKET",
         "locations": {
-            "Market Night Red Rupee Crate": "is_child and at_night and (deadly_bonks != 'ohko' or Fairy or (can_use(Nayrus_Love) and shuffle_overworld_entrances == 'off'))",
-            "Market Night Green Rupee Crate 1": "is_child and at_night and (deadly_bonks != 'ohko' or Fairy or (can_use(Nayrus_Love) and shuffle_overworld_entrances == 'off'))",
-            "Market Night Green Rupee Crate 2": "is_child and at_night and (deadly_bonks != 'ohko' or Fairy or (can_use(Nayrus_Love) and shuffle_overworld_entrances == 'off'))",
-            "Market Night Green Rupee Crate 3": "is_child and at_night (deadly_bonks != 'ohko' or Fairy or (can_use(Nayrus_Love) and shuffle_overworld_entrances == 'off'))"
+            "Market Night Red Rupee Crate": "
+                is_child and at_night and
+                (deadly_bonks != 'ohko' or Fairy or (can_use(Nayrus_Love) and shuffle_overworld_entrances == 'off'))",
+            "Market Night Green Rupee Crate 1": "
+                is_child and at_night and
+                (deadly_bonks != 'ohko' or Fairy or (can_use(Nayrus_Love) and shuffle_overworld_entrances == 'off'))",
+            "Market Night Green Rupee Crate 2": "
+                is_child and at_night and
+                (deadly_bonks != 'ohko' or Fairy or (can_use(Nayrus_Love) and shuffle_overworld_entrances == 'off'))",
+            "Market Night Green Rupee Crate 3": "
+                is_child and at_night and
+                (deadly_bonks != 'ohko' or Fairy or (can_use(Nayrus_Love) and shuffle_overworld_entrances == 'off'))"
         },
         "exits": {
             "Market Entrance": "True",

diff --git a/version.py b/version.py
@@ -1,4 +1,4 @@
-__version__ = '7.1.138'
+__version__ = '7.1.139'
 
 # This is a supplemental version number for branches based off of main dev.
 supplementary_version = 0