Separate map and hud loot icons

OverworldGlitchRules.py

@@ -509,7 +509,7 @@ boots_clips = [
 
 mirror_clips_local = [
     ('Desert East Mirror Clip', 'Mire Area', 'Desert Mouth'),
-    ('EDDM Mirror Clip', 'East Dark Death Mountain (Bottom Left)', 'East Dark Death Mountain (Bottom)'),
+    ('EDDM Bridge Mirror Clip', 'East Dark Death Mountain (Bottom Left)', 'East Dark Death Mountain (Bottom)'),
     ('EDDM Mirror Clip', 'East Dark Death Mountain (Top)', 'Dark Death Mountain Ledge')
 ]
 
@@ -520,4 +520,4 @@ mirror_clips = [
 mirror_offsets = [
     (['DM Offset Mirror', 'DDM Offset Mirror'], ['West Death Mountain (Bottom)', 'West Dark Death Mountain (Bottom)'], ['Hyrule Castle Courtyard Northeast', 'Pyramid Crack'], ['Pyramid Area', 'Hyrule Castle Courtyard']),
     (['DM To HC Ledge Offset Mirror', 'DDM To Pyramid Offset Mirror'], ['West Death Mountain (Bottom)', 'West Dark Death Mountain (Bottom)'], ['Hyrule Castle Ledge', 'Pyramid Area'], ['Pyramid Area', 'Hyrule Castle Area'])
-]
+]

Rom.py

@@ -85,7 +85,7 @@ from Utils import int16_as_bytes, int32_as_bytes, local_path, snes_to_pc
 from Versions import DRVersion, GKVersion, ORVersion
 
 JAP10HASH = '03a63945398191337e896e5771f77173'
-RANDOMIZERBASEHASH = '100c3e1da68680a0f3d8e1fc94568de6'
+RANDOMIZERBASEHASH = 'cd81a8bfc1d67c6a13fe806c7f35a15f'
 
 
 class JsonRom(object):
@@ -1007,6 +1007,10 @@ def patch_rom(world, rom, player, team, is_mystery=False, rom_header=None):
         rom.write_bytes(0x6D31B, [0x00, 0x00, 0xe4, 0xff, 0x08, 0x0E])
         rom.write_bytes(0x6D323, [0x00, 0x00, 0xe4, 0xff, 0x08, 0x0E])
 
+    bridge_item = world.get_location("Hobo", player).item
+    if bridge_item is None or not bridge_item.name.startswith("Bottle"):
+        rom.write_bytes(0x1E9C0, [0xFB, 0xFF, 0x03, 0x00, 0xAB, 0x00, 0x00, 0x00])
+
     # set light cones
     if world.dark_rooms[player] == 'no_dark_rooms':
         light_cone = 0x20
@@ -1497,37 +1501,40 @@ def patch_rom(world, rom, player, team, is_mystery=False, rom_header=None):
     loot_source = 0x09
     if world.prizeshuffle[player] != 'none':
         loot_source |= 0x10
-    if world.pottery[player] not in ['none', 'cave']:
+    if world.pottery[player] != 'none':
         loot_source |= 0x02
     if world.dropshuffle[player] != 'none':
         loot_source |= 0x04
-    rom.write_byte(0x1CFF10, loot_source)
+    rom.write_byte(0x1CFF20, loot_source)
 
     if world.loothud[player] == 'never':
-        rom.write_byte(0x1CFF12, 0x00)
+        rom.write_bytes(0x1CFF10, [0x00, 0x00, 0x00, 0x00])
+        rom.write_byte(0x1CFF17, 0x00)
     elif world.loothud[player] == 'presence':
-        rom.write_byte(0x1CFF12, 0x01)
-        rom.write_bytes(0x1CFF0E, [0x01, 0x01])
+        rom.write_bytes(0x1CFF10, [0x01, 0x01, 0x00, 0x00])
+        rom.write_byte(0x1CFF17, 0x01)
     elif world.loothud[player] == 'value':
-        rom.write_byte(0x1CFF12, 0x01)
-        rom.write_bytes(0x1CFF0E, [0xFF, 0xFF])
+        rom.write_bytes(0x1CFF10, [0x03, 0x03, 0x00, 0x00])
+        rom.write_byte(0x1CFF17, 0x01)
     elif world.loothud[player] == 'dungeon_value':
-        rom.write_byte(0x1CFF12, 0x01)
-        rom.write_bytes(0x1CFF0E, [0xFF, 0x01])
+        rom.write_bytes(0x1CFF10, [0x01, 0x03, 0x00, 0x00])
+        rom.write_byte(0x1CFF17, 0x01)
+    elif world.loothud[player] == 'cave_value':
+        rom.write_bytes(0x1CFF10, [0x03, 0x01, 0x00, 0x00])
+        rom.write_byte(0x1CFF17, 0x01)
 
     if world.showloot[player] == 'never':
         rom.write_bytes(0x1CFF08, [0x00, 0x00, 0x00, 0x00])
-        rom.write_byte(0x1CFF11, 0x00)
-        rom.write_byte(0x1CFF12, 0x00)  # turn off hud icon too just to be safe
+        rom.write_byte(0x1CFF0F, 0x00)
     elif world.showloot[player] == 'presence':
         rom.write_bytes(0x1CFF08, [0x01, 0x00, 0x00, 0x00])
-        rom.write_byte(0x1CFF11, 0x00)
+        rom.write_byte(0x1CFF0F, 0x01)
     elif world.showloot[player] == 'compass':
-        rom.write_bytes(0x1CFF08, [0x01, 0x00, 0x02, 0x00])
-        rom.write_byte(0x1CFF11, 0x01)
+        rom.write_bytes(0x1CFF08, [0x02, 0x00, 0x03, 0x00])
+        rom.write_byte(0x1CFF0F, 0x01)
     elif world.showloot[player] == 'always':
-        rom.write_bytes(0x1CFF08, [0x02, 0x00, 0x00, 0x00])
-        rom.write_byte(0x1CFF11, 0x00)
+        rom.write_bytes(0x1CFF08, [0x03, 0x00, 0x00, 0x00])
+        rom.write_byte(0x1CFF0F, 0x01)
 
     if world.showmap[player] == 'visited':
         rom.write_bytes(0x1CFF00, [0x01, 0x00, 0x00, 0x05])
@@ -1541,7 +1548,7 @@ def patch_rom(world, rom, player, team, is_mystery=False, rom_header=None):
         rom.write_byte(loot_icons + 0x52, 0x0B) # bomb bag is major
 
     triforce_piece_ids = [0x6B, 0x6C]
-    if world.treasure_hunt_count[player] > 20:
+    if world.treasure_hunt_count[player] > 100:
         for triforce_piece_id in triforce_piece_ids:
             rom.write_byte(loot_icons + triforce_piece_id, 0x04)
 
@@ -1779,7 +1786,7 @@ def patch_rom(world, rom, player, team, is_mystery=False, rom_header=None):
     rom.write_byte(0x180358, 0x01 if glitches_enabled else 0x00)
     rom.write_byte(0x18008B, 0x01 if glitches_enabled else 0x00)
 
-    if uncle_location.item is None or uncle_location.item.name not in ['Sword and Shield']:
+    if uncle_location.item is None or uncle_location.item.name not in ['Blue Shield', 'Red Shield', 'Mirror Shield', 'Progressive Shield', 'Sword and Shield']:
         # remove shield from uncle
         rom.write_bytes(0x6D253, [0x00, 0x00, 0xf6, 0xff, 0x00, 0x0E])
         rom.write_bytes(0x6D25B, [0x00, 0x00, 0xf6, 0xff, 0x00, 0x0E])
@@ -2485,6 +2492,15 @@ def write_strings(rom, world, player, team, is_mystery=False):
 
     # For hints, first we write hints about entrances, some from the inconvenient list others from all reasonable entrances.
     if world.hints[player]:
+        zoraitem = world.get_location('King Zora', player).item.hint_text
+        if len(zoraitem) <= 15:
+            tt['zora_meeting'] = f"Whaddaya want?\n  ≥ {zoraitem.title()}\n    Nothin'{{CHOICE}}"
+        else:
+            tt['zora_meeting'] = f"Do you want {zoraitem}?\n  ≥ I'll pay\n    No thanks{{CHOICE}}"
+
+        bottleitem = world.get_location('Bottle Merchant', player).item.hint_text
+        tt['bottle_vendor_choice'] = f"Do you want {bottleitem}?\n  ≥ I'll take it\n    No thanks!\n{{CHOICE}}"
+
         tt['sign_north_of_links_house'] = '> Randomizer The telepathic tiles can have hints!'
         hint_locations = HintLocations.copy()
         random.shuffle(hint_locations)
@@ -2962,7 +2978,7 @@ def write_strings(rom, world, player, team, is_mystery=False):
             + "{PAUSE3} {CHANGEPIC}\nGanon has moved around all the items in Hyrule."
             + "{PAUSE7}\nYou will have to find all the items necessary to achieve your goal."
             + "{PAUSE7}\nThis is your chance to be a hero."
-            + "{PAUSE3} {CHANGEPIC}\nYou must determine and achieve your goal."
+            + "{PAUSE3} {CHANGEPIC}\nGood luck out there, and try not to die."
             + "{PAUSE9} {CHANGEPIC}", False)
     elif world.mode[player] == 'inverted':
         tt['intro_main'] = CompressedTextMapper.convert(

resources/app/cli/args.json

@@ -491,7 +491,8 @@
       "never",
       "presence",
       "value",
-      "dungeon_value"
+      "dungeon_value",
+      "cave_value"
     ]
   },
   "showmap": {