Ocarina of Time: long-awaited bugfixes (ArchipelagoMW#2344)

- Added location name groups, so you can make your entire Water Temple priority to annoy everyone else
- Significant improvement to ER generation success rate (~80% to >99%)
- Changed `adult_trade_start` option to a choice option instead of a list (this shouldn't actually break any YAMLs though, due to the lesser-known property of lists parsing as a uniformly-weighted choice)
- Major improvements to the option tooltips where needed. (Possibly too much text now)
- Changed default hint distribution to `async` to help people's generation times. The tooltip explains that it removes WOTH hints so people hopefully don't get tripped up.
- Makes stick and nut capacity upgrades useful items
- Added shop prices and required trials to spoiler log
- Added Cojiro to adult trade item group, because it had been forgotten previously
- Fixed size-modified chests not being moved properly due to trap appearance changing the size
- Fixed Thieves Hideout keyring not being allowed in start inventory
- Fixed hint generation not accurately flagging barren locations on certain dungeon item shuffle settings
- Fixed bug where you could plando arbitrarily-named items into the world, breaking everything

Author: espeon65536

worlds/oot/ItemPool.py

@@ -350,7 +350,7 @@ def generate_itempool(ootworld):
     ootworld.itempool = [ootworld.create_item(item) for item in pool]
     for (location_name, item) in placed_items.items():
         location = world.get_location(location_name, player)
-        location.place_locked_item(ootworld.create_item(item))
+        location.place_locked_item(ootworld.create_item(item, allow_arbitrary_name=True))
 
 
 def get_pool_core(world):
@@ -675,7 +675,7 @@ def get_pool_core(world):
         world.remove_from_start_inventory.append('Scarecrow Song')
 
     if world.no_epona_race:
-        world.multiworld.push_precollected(world.create_item('Epona'))
+        world.multiworld.push_precollected(world.create_item('Epona', allow_arbitrary_name=True))
         world.remove_from_start_inventory.append('Epona')
 
     if world.shuffle_smallkeys == 'vanilla':

worlds/oot/Location.py

@@ -2,6 +2,8 @@
 from .LocationList import location_table
 from BaseClasses import Location
 
+non_indexed_location_types = {'Boss', 'Event', 'Drop', 'HintStone', 'Hint'}
+
 location_id_offset = 67000
 locnames_pre_70 = {
     "Gift from Sages",
@@ -18,7 +20,7 @@
                 else 0)
 
 location_name_to_id = {name: (location_id_offset + index) for (index, name) in enumerate(new_name_order) 
-    if location_table[name][0] not in {'Boss', 'Event', 'Drop', 'HintStone', 'Hint'}}
+    if location_table[name][0] not in non_indexed_location_types}
 
 class DisableType(Enum):
     ENABLED  = 0
@@ -83,3 +85,57 @@ def LocationFactory(locations, player: int):
     return ret
 
 
+def build_location_name_groups() -> dict:
+
+    def fix_sing(t) -> tuple:
+        if isinstance(t, str):
+            return (t,)
+        return t
+
+    def rename(d, k1, k2) -> None:
+        d[k2] = d[k1]
+        del d[k1]
+
+    # whoever wrote the location table didn't realize they need to add a comma to mark a singleton as a tuple
+    # so we have to check types unfortunately
+    tags = set()
+    for v in location_table.values():
+        if v[5] is not None:
+            tags.update(fix_sing(v[5]))
+
+    sorted_tags = sorted(list(tags))
+
+    ret = {
+        tag: {k for k, v in location_table.items()
+        if v[5] is not None
+            and tag in fix_sing(v[5])
+            and v[0] not in non_indexed_location_types}
+        for tag in sorted_tags
+    }
+
+    # Delete tags which are a combination of other tags
+    del ret['Death Mountain']
+    del ret['Forest']
+    del ret['Gerudo']
+    del ret['Kakariko']
+    del ret['Market']
+
+    # Delete Vanilla and MQ tags because they are just way too broad
+    del ret['Vanilla']
+    del ret['Master Quest']
+
+    rename(ret, 'Beehive', 'Beehives')
+    rename(ret, 'Cow', 'Cows')
+    rename(ret, 'Crate', 'Crates')
+    rename(ret, 'Deku Scrub', 'Deku Scrubs')
+    rename(ret, 'FlyingPot', 'Flying Pots')
+    rename(ret, 'Freestanding', 'Freestanding Items')
+    rename(ret, 'Pot', 'Pots')
+    rename(ret, 'RupeeTower', 'Rupee Groups')
+    rename(ret, 'SmallCrate', 'Small Crates')
+    rename(ret, 'the Market', 'Market')
+    rename(ret, 'the Graveyard', 'Graveyard')
+    rename(ret, 'the Lost Woods', 'Lost Woods')
+
+    return ret
+

worlds/oot/LocationList.py

@@ -238,7 +238,7 @@ def shop_address(shop_id, shelf_id):
     ("Market Night Green Rupee Crate 1",                             ("Crate",        0x21,  (0,0,24), None,                        'Rupee (1)',                             ("the Market", "Market", "Crate"))),
     ("Market Night Green Rupee Crate 2",                             ("Crate",        0x21,  (0,0,25), None,                        'Rupee (1)',                             ("the Market", "Market", "Crate"))),
     ("Market Night Green Rupee Crate 3",                             ("Crate",        0x21,  (0,0,26), None,                        'Rupee (1)',                             ("the Market", "Market", "Crate"))),
-    ("Market Dog Lady House Crate",                                  ("Crate",        0x35,  (0,0,3), None,                         'Rupees (5)',                            ("Market", "Market", "Crate"))),
+    ("Market Dog Lady House Crate",                                  ("Crate",        0x35,  (0,0,3), None,                         'Rupees (5)',                            ("the Market", "Market", "Crate"))),
     ("Market Guard House Child Crate",                               ("Crate",        0x4D,  (0,0,6), None,                         'Rupee (1)',                             ("the Market", "Market", "Crate"))),
     ("Market Guard House Child Pot 1",                               ("Pot",          0x4D,  (0,0,9), None,                         'Rupee (1)',                             ("the Market", "Market", "Pot"))),
     ("Market Guard House Child Pot 2",                               ("Pot",          0x4D,  (0,0,10), None,                        'Rupee (1)',                             ("the Market", "Market", "Pot"))),