OoS: Item pool adjustments

Dinopony · Mar 14, 2024 · fb5b539 · fb5b539
1 parent c862bfb
commit fb5b539
Show file tree

Hide file tree

Showing 2 changed files with 17 additions and 2 deletions.
diff --git a/worlds/tloz_oos/__init__.py b/worlds/tloz_oos/__init__.py
@@ -323,6 +323,15 @@ def create_item(self, name: str) -> Item:
         return Item(name, classification, ap_code, self.player)
 
     def create_items(self):
+        item_pool_adjustements = [
+            ["Gasha Seed", "Seed Satchel"],  # Add a third satchel that is usually obtained in linked games (99 seeds)
+            ["Gasha Seed", "Bombs (10)"],    # Add one more bomb compared to vanilla to reach 99 max bombs
+            ["Gasha Seed", "Rupees (50)"],   # Too many Gasha Seeds in vanilla pool, add more rupees instead
+            ["Gasha Seed", "Rupees (50)"],   # ^
+            ["Gasha Seed", "Rupees (50)"],   # ^
+            ["Gasha Seed", "Rupees (50)"],   # ^
+        ]
+
         ring_count = 0
         for loc_name, loc_data in LOCATIONS_DATA.items():
             if "randomized" in loc_data and loc_data["randomized"] is False:
@@ -343,6 +352,12 @@ def create_items(self):
             elif item_name == "Flute":
                 item_name = COMPANIONS[self.options.animal_companion.value] + "'s Flute"
 
+            for i, pair in enumerate(item_pool_adjustements):
+                if item_name == pair[0]:
+                    item_name = pair[1]
+                    del item_pool_adjustements[i]
+                    break
+
             if "Ring" in item_name:
                 ring_count += 1
             elif any([(string in item_name) for string in DUNGEON_ITEMS]):

diff --git a/worlds/tloz_oos/data/Locations.py b/worlds/tloz_oos/data/Locations.py
@@ -54,7 +54,7 @@
     "Spool Swamp: Digging Spot Near Vasu's Sign": {
         "patcher_name": "spool swamp digging spot",
         "region_id": "spool swamp digging spot",
-        "vanilla_item": "Rupees (50)",  # Random ring in vanilla, but this doesn't exist in rando
+        "vanilla_item": "Armor Ring L-1",  # Random ring in vanilla, but rings are randomized anyway
         "flag_byte": 0xC782
     },
     "Spool Swamp: Item in Floodgate Keeper's House": {
@@ -393,7 +393,7 @@
     "Subrosia: Wilds Digging Spot": {
         "patcher_name": "subrosian wilds digging spot",
         "region_id": "subrosian wilds digging spot",
-        "vanilla_item": "Rupees (50)",  # Random ring in vanilla, but this doesn't exist in rando
+        "vanilla_item": "Power Ring L-2",  # Random ring in vanilla, but this doesn't exist in rando
         "flag_byte": 0xC840
     },
     "Subrosia: Chest Above Magnet Cave": {