Merge branch 'Dev' into dev-fenhl

# Conflicts:
#	CI.py
#	Messages.py

Author: fenhl

CHANGELOG.md

@@ -21,6 +21,7 @@
 * Big poe souls can now be collected while riding Epona.
 * Ice traps have a new item model that's displayed instead of nothing after being picked up.
 * The professor in the lakeside lab now only takes 1 second instead of 6 to prepare the eyeball frog.
+* The text box that appears when collecting a gold skulltula token is no longer shuffled when `Text Shuffle` is set to `Shuffled except Important Text`.
 
 # 8.3
 

CI.py

@@ -13,7 +13,7 @@
 from typing import NoReturn
 
 from Main import resolve_settings
-from Messages import ITEM_MESSAGES, KEYSANITY_MESSAGES, MISC_MESSAGES
+from Messages import ITEM_MESSAGES, IMPORTANT_ITEM_MESSAGES, MISC_MESSAGES
 from Patches import get_override_table, get_override_table_bytes
 from Rom import Rom
 from SettingsList import SettingInfos, logic_tricks, validate_settings
@@ -159,7 +159,7 @@ def check_for_duplicates(new_item_messages: list[tuple[int, str]]) -> None:
                     if message_id1 == message_id2:
                         error(f'Duplicate MessageID found: {hex(message_id1)}, {message1}, {message2}', False)
 
-    messages = ITEM_MESSAGES + KEYSANITY_MESSAGES + MISC_MESSAGES
+    messages = ITEM_MESSAGES + IMPORTANT_ITEM_MESSAGES + MISC_MESSAGES
     check_for_duplicates(messages)
 
 

Messages.py

@@ -217,8 +217,6 @@
     (0x00AD, "\x08\x13\x05You got \x05\x41Din's Fire\x05\x40!\x01Its fireball engulfs everything!"),
     (0x00AE, "\x08\x13\x0DYou got \x05\x42Farore's Wind\x05\x40!\x01This is warp magic you can use!"),
     (0x00AF, "\x08\x13\x13You got \x05\x43Nayru's Love\x05\x40!\x01Cast this to create a powerful\x01protective barrier."),
-    (0x00B4, "\x08You got a \x05\x41Gold Skulltula Token\x05\x40!\x01You've collected \x05\x41\x19\x05\x40 tokens in total."), # fast text (worlds without shuffled tokens)
-    (0x00B5, "\x08You got a \x05\x41Gold Skulltula Token\x05\x40!\x01You've collected \x05\x41\x19\x05\x40 tokens in total."), # normal text (worlds with shuffled tokens)
     (0x9047, "\x08You got a \x05\x41Gold Skulltula Token\x05\x40!"), # tokens for other players
     (0x00C2, "\x08\x13\x73You got a \x05\x41Piece of Heart\x05\x40!\x01Collect four pieces total to get\x01another Heart Container."),
     (0x90C2, "\x08\x13\x73You got a \x05\x41Piece of Heart\x05\x40!\x01You are already at\x01maximum health."),
@@ -297,7 +295,7 @@
     (0x90B5, "\x08You found \x05\x43literally nothing\x05\x40!"),
 ]
 
-KEYSANITY_MESSAGES: list[tuple[int, str]] = [
+IMPORTANT_ITEM_MESSAGES: list[tuple[int, str]] = [
     (0x001C, "\x13\x74\x08You got the \x05\x41Boss Key\x05\x40\x01for the \x05\x41Fire Temple\x05\x40!\x09"),
     (0x0006, "\x13\x74\x08You got the \x05\x41Boss Key\x05\x40\x01for the \x05\x42Forest Temple\x05\x40!\x09"),
     (0x001D, "\x13\x74\x08You got the \x05\x41Boss Key\x05\x40\x01for the \x05\x43Water Temple\x05\x40!\x09"),
@@ -334,6 +332,8 @@
     (0x00A5, "\x13\x76\x08You found the \x05\x41Dungeon Map\x05\x40\x01for the \x05\x45Bottom of the Well\x05\x40!\x09"),
     (0x00A6, "\x13\x77\x08You found a \x05\x41Small Key\x05\x40\x01for the \x05\x46Spirit Temple\x05\x40!\x09"),
     (0x00A9, "\x13\x77\x08You found a \x05\x41Small Key\x05\x40\x01for the \x05\x45Shadow Temple\x05\x40!\x09"),
+    (0x00B4, "\x08You got a \x05\x41Gold Skulltula Token\x05\x40!\x01You've collected \x05\x41\x19\x05\x40 tokens in total."), # fast text (worlds without shuffled tokens)
+    (0x00B5, "\x08You got a \x05\x41Gold Skulltula Token\x05\x40!\x01You've collected \x05\x41\x19\x05\x40 tokens in total."), # normal text (worlds with shuffled tokens)
     (0x00F3, "\x13\x77\x08You found a \x05\x41Small Key\x05\x40\x01for the \x05\x44Treasure Box Shop\x05\x40!\x09"),
     # 0x9019 and 0x901A used above
     # Silver Rupee Messages with count.
@@ -481,24 +481,24 @@
 
 for dungeon_name in dungeon_names:
     if dungeon_name is not None:
-        KEYSANITY_MESSAGES.append((i, f"\x13\x77\x08You found a \x05\x41Small Key\x05\x40\x01for {dungeon_name}!\x01It's your \x05\x41first\x05\x40 one!\x09"))
+        IMPORTANT_ITEM_MESSAGES.append((i, f"\x13\x77\x08You found a \x05\x41Small Key\x05\x40\x01for {dungeon_name}!\x01It's your \x05\x41first\x05\x40 one!\x09"))
     i += 1
 c = 0
 for dungeon_name in dungeon_names:
     if dungeon_name is not None:
-        KEYSANITY_MESSAGES.append((i, f"\x13\x77\x08You found a \x05\x41Small Key\x05\x40\x01for {dungeon_name}!\x01You've collected \x05\x41" + "\xF1" + c.to_bytes(1, 'big').decode() + "\x05\x40 of them.\x09"))
+        IMPORTANT_ITEM_MESSAGES.append((i, f"\x13\x77\x08You found a \x05\x41Small Key\x05\x40\x01for {dungeon_name}!\x01You've collected \x05\x41" + "\xF1" + c.to_bytes(1, 'big').decode() + "\x05\x40 of them.\x09"))
     i += 1
     c += 1
 for dungeon_name in dungeon_names:
     if dungeon_name is not None:
-        KEYSANITY_MESSAGES.append((i, f"\x13\x77\x08You found a \x05\x41Small Key\x05\x40\x01for {dungeon_name}!\x01You already have enough keys.\x09"))
+        IMPORTANT_ITEM_MESSAGES.append((i, f"\x13\x77\x08You found a \x05\x41Small Key\x05\x40\x01for {dungeon_name}!\x01You already have enough keys.\x09"))
     i += 1
 
 # Add key ring messages starting at 0x9200
 i = 0x9200
 for dungeon_name in dungeon_names:
     if dungeon_name is not None:
-        KEYSANITY_MESSAGES.append((i, f"\x13\x77\x08You found a \x05\x41Small Key Ring\x05\x40\x01for {dungeon_name}!\x09"))
+        IMPORTANT_ITEM_MESSAGES.append((i, f"\x13\x77\x08You found a \x05\x41Small Key Ring\x05\x40\x01for {dungeon_name}!\x09"))
     i += 1
 
 key_rings_with_bk_dungeon_names = [
@@ -509,7 +509,7 @@
     "the \x05\x45Shadow Temple\x05\x40"
 ]
 for dungeon_name in key_rings_with_bk_dungeon_names:
-    KEYSANITY_MESSAGES.append((i, f"\x13\x77\x08You found a \x05\x41Key Ring\x05\x40\x01for {dungeon_name}!\x09\x01It includes the \x05\x41Boss Key\x05\x40!"))
+    IMPORTANT_ITEM_MESSAGES.append((i, f"\x13\x77\x08You found a \x05\x41Key Ring\x05\x40\x01for {dungeon_name}!\x09\x01It includes the \x05\x41Boss Key\x05\x40!"))
     i += 1
 
 COLOR_MAP: dict[str, str] = {
@@ -1166,7 +1166,7 @@ def make_player_message(text: str) -> str:
 # reduce item message sizes and add new item messages
 # make sure to call this AFTER move_shop_item_messages()
 def update_item_messages(messages: list[Message], world: World) -> None:
-    new_item_messages = ITEM_MESSAGES + KEYSANITY_MESSAGES
+    new_item_messages = ITEM_MESSAGES + IMPORTANT_ITEM_MESSAGES
     for id, text in new_item_messages:
         if world.settings.world_count > 1:
             update_message_by_id(messages, id, make_player_message(text), 0x23)
@@ -1337,7 +1337,7 @@ def shuffle_messages(messages: list[Message], except_hints: bool = True) -> list
         GOSSIP_STONE_MESSAGES + TEMPLE_HINTS_MESSAGES +
         [data['id'] for data in misc_item_hint_table.values()] +
         [data['id'] for data in misc_location_hint_table.values()] +
-        [message_id for (message_id, message) in KEYSANITY_MESSAGES] + shuffle_messages.shop_item_messages +
+        [message_id for (message_id, message) in IMPORTANT_ITEM_MESSAGES] + shuffle_messages.shop_item_messages +
         shuffle_messages.scrubs_message_ids +
         [0x5036, 0x70F5] # Chicken count and poe count respectively
     )
@@ -1349,7 +1349,7 @@ def is_exempt(m: Message) -> bool:
             GOSSIP_STONE_MESSAGES + TEMPLE_HINTS_MESSAGES +
             [data['id'] for data in misc_item_hint_table.values()] +
             [data['id'] for data in misc_location_hint_table.values()] +
-            [message_id for (message_id, message) in KEYSANITY_MESSAGES] +
+            [message_id for (message_id, message) in IMPORTANT_ITEM_MESSAGES] +
             shuffle_messages.shop_item_messages +
             shuffle_messages.scrubs_message_ids +
             [0x5036, 0x70F5] # Chicken count and poe count respectively

data/Glitched World/Water Temple MQ.json

@@ -368,7 +368,7 @@
             "Water Temple Bottom Gates Switch": "can_use(Iron_Boots) and Hookshot",
             "Water Temple Boss Key Spout": "can_weirdshot or can_gdv or has_fire_source",
             "Water Temple Dragon Head Room": "can_weirdshot or
-                ((can_gdv or has_fire_source) and (can_use(Hover_Boots) or has_projectile_adult)
+                ((can_gdv or has_fire_source) and (can_use(Hover_Boots) or has_projectile(adult))
                 )"
         }
     },

version.py

@@ -1,4 +1,4 @@
-__version__ = '8.3.31'
+__version__ = '8.3.33'
 
 # This is a supplemental version number for branches based off of main dev.
 supplementary_version = 1