Skip to content

Commit

Permalink
Add Logic for the Hints
Browse files Browse the repository at this point in the history
  • Loading branch information
Jaybone25 committed Dec 30, 2024
1 parent ca80546 commit bb16ddd
Show file tree
Hide file tree
Showing 4 changed files with 15 additions and 9 deletions.
14 changes: 7 additions & 7 deletions HintList.py
Original file line number Diff line number Diff line change
Expand Up @@ -1919,17 +1919,17 @@ def rainbow_bridge_hint_kind(world: World) -> str:
},
'skull_mask': {
'id': 0x0344,
'hint_location': 'Deku Theater Skull Mask',
'hint_location': 'Deku Theater Skull Mask Hint',
'item_location': 'Deku Theater Skull Mask',
'location_text': 'Wearing the \x05\x41Skull Mask\x05\x40 will reward you with \x05\x42{item}\x05\x40',
'location_text': 'Wearing the \x05\x41Skull Mask\x05\x40 will reward you with \x05\x42{item}\x05\x40.',
'location_fallback': '\x05\x42\x06\x3dForest Stage\x04\x01\x05\x40\x06\x14We are waiting to see your\x01\x06\x32beautiful face!\x01\x06\x28Win fabulous prizes!',
'text_style': 0x13,
},
'mask_of_truth': {
'id': 0x0344,
'hint_location': 'Deku Theater Mask of Truth',
'hint_location': 'Deku Theater Mask of Truth Hint',
'item_location': 'Deku Theater Mask of Truth',
'location_text': 'Wearing the \x05\x41Mask of Truth\x05\x40 will reward you with \x05\x42{item}\x05\x40',
'location_text': 'Wearing the \x05\x41Mask of Truth\x05\x40 will reward you with \x05\x42{item}\x05\x40.',
'location_fallback': '\x05\x42\x06\x3dForest Stage\x04\x01\x05\x40\x06\x14We are waiting to see your\x01\x06\x32beautiful face!\x01\x06\x28Win fabulous prizes!',
'text_style': 0x13,
},
Expand All @@ -1949,11 +1949,11 @@ def rainbow_bridge_hint_kind(world: World) -> str:
misc_dual_hint_table: dict[str, dict[str, Any]] = {
'mask_shop_dual': {
'id': 0x0344,
'hint_location_0': 'Deku Theater Skull Mask',
'hint_location_0': 'Deku Theater Skull Mask Hint',
'item_location_0': 'Deku Theater Skull Mask',
'hint_location_1': 'Deku Theater Mask of Truth',
'hint_location_1': 'Deku Theater Mask of Truth Hint',
'item_location_1': 'Deku Theater Mask of Truth',
'location_text': '\x01Wearing the \x05\x41Skull Mask\x05\x40 will reward you with \x05\x42{item_1}\x05\x40\x04Wearing the \x05\x41Mask of Truth\x05\x40 will reward you with \x05\x42{item_2}\x05\x40',
'location_text': '\x01Wearing the \x05\x41Skull Mask\x05\x40 will reward you with \x05\x42{item_1}\x05\x40.\x04Wearing the \x05\x41Mask of Truth\x05\x40 will reward you with \x05\x42{item_2}\x05\x40.',
'location_fallback': '\x05\x42\x06\x3dForest Stage\x04\x01\x05\x40\x06\x14We are waiting to see your\x01\x06\x32beautiful face!\x01\x06\x28Win fabulous prizes!',
'text_style': 0x13
},
Expand Down
2 changes: 2 additions & 0 deletions LocationList.py
Original file line number Diff line number Diff line change
Expand Up @@ -2606,6 +2606,8 @@ def shop_address(shop_id: int, shelf_id: int) -> int:
("50 Skulltulas Reward Hint", ("Hint", None, None, None, None, None)),
("ZR Frogs Ocarina Minigame Hint", ("Hint", None, None, None, None, None)),
("Market 10 Big Poes Hint", ("Hint", None, None, None, None, None)),
("Deku Theater Skull Mask Hint", ("Hint", None, None, None, None, None)),
("Deku Theater Mask of Truth Hint", ("Hint", None, None, None, None, None)),
("Ganondorf Hint", ("Hint", None, None, None, None, None)),
])

Expand Down
4 changes: 3 additions & 1 deletion data/Glitched World/Overworld.json
Original file line number Diff line number Diff line change
Expand Up @@ -1258,7 +1258,9 @@
"region_name": "Deku Theater",
"locations": {
"Deku Theater Skull Mask": "is_child and Skull_Mask",
"Deku Theater Mask of Truth": "is_child and Mask_of_Truth"
"Deku Theater Mask of Truth": "is_child and Mask_of_Truth",
"Deku Theater Skull Mask Hint": "True",
"Deku Theater Mask of Truth Hint": "True"
}
},
{
Expand Down
4 changes: 3 additions & 1 deletion data/World/Overworld.json
Original file line number Diff line number Diff line change
Expand Up @@ -2885,7 +2885,9 @@
"scene": "Deku Theater",
"locations": {
"Deku Theater Skull Mask": "is_child and Skull_Mask",
"Deku Theater Mask of Truth": "is_child and Mask_of_Truth"
"Deku Theater Mask of Truth": "is_child and Mask_of_Truth",
"Deku Theater Skull Mask Hint": "True",
"Deku Theater Mask of Truth Hint": "True"
},
"exits": {
"LW Beyond Mido": "True"
Expand Down

0 comments on commit bb16ddd

Please sign in to comment.