OoT: update logic files, naming, and logic tricks to version 6.2

Gerudo Training Grounds -> Ground
Composers Grave -> Royal Familys Tomb
Gerudo Fortress -> Thieves Hideout for the indoor sections
This commit is contained in:
espeon65536
2022-05-01 13:05:52 -05:00
parent f476747ade
commit c801cdbb3b
25 changed files with 632 additions and 637 deletions

View File

@@ -32,7 +32,7 @@
(can_use(Hookshot) or can_use(Boomerang)) and
here(has_bombchus or
(Bombs and (can_play(Song_of_Time) or is_adult)) or
(can_use(Hammer) and (can_play(Song_of_Time) or logic_deku_mq_compass_gs)))"
(can_use(Megaton_Hammer) and (can_play(Song_of_Time) or logic_deku_mq_compass_gs)))"
},
"exits": {
"Deku Tree Lobby": "True"

View File

@@ -41,7 +41,7 @@
(logic_dc_mq_eyes and Progressive_Strength_Upgrade and
(is_adult or logic_dc_mq_child_back) and
(here(can_use(Sticks)) or can_use(Dins_Fire) or
(is_adult and (logic_dc_jump or Hammer or Hover_Boots or Hookshot))))"
(is_adult and (logic_dc_jump or Megaton_Hammer or Hover_Boots or Hookshot))))"
}
},
{

View File

@@ -33,8 +33,7 @@
is_adult and (Progressive_Strength_Upgrade or
(logic_forest_mq_block_puzzle and has_bombchus and can_use(Hookshot)))",
"Forest Temple Outdoor Ledge": "
(logic_forest_mq_hallway_switch_jumpslash and can_use(Hover_Boots)) or
(logic_forest_mq_hallway_switch_hookshot and can_use(Hookshot))",
(logic_forest_mq_hallway_switch_jumpslash and can_use(Hover_Boots))",
"Forest Temple Boss Region": "
Forest_Temple_Jo_and_Beth and Forest_Temple_Amy_and_Meg"
}

View File

@@ -0,0 +1,98 @@
[
{
"region_name": "Gerudo Training Ground Lobby",
"dungeon": "Gerudo Training Ground",
"locations": {
"Gerudo Training Ground MQ Lobby Left Chest": "True",
"Gerudo Training Ground MQ Lobby Right Chest": "True",
"Gerudo Training Ground MQ Hidden Ceiling Chest": "logic_lens_gtg_mq or can_use(Lens_of_Truth)",
"Gerudo Training Ground MQ Maze Path First Chest": "True",
"Gerudo Training Ground MQ Maze Path Second Chest": "True",
"Gerudo Training Ground MQ Maze Path Third Chest": "(Small_Key_Gerudo_Training_Ground, 1)"
},
"exits": {
"Gerudo Fortress": "True",
"Gerudo Training Ground Left Side": "here(has_fire_source)",
"Gerudo Training Ground Right Side": "here(can_use(Bow) or can_use(Slingshot))"
}
},
{
"region_name": "Gerudo Training Ground Right Side",
"dungeon": "Gerudo Training Ground",
"locations": {
"Gerudo Training Ground MQ Dinolfos Chest": "is_adult",
"Wall Fairy": "has_bottle and can_use(Bow)" #in the Dinalfos room shoot the Gerudo symbol above the door to the lava room.
},
"exits": {
# Still requires has_fire_source in the room
"Gerudo Training Ground Underwater": "
(Bow or can_use(Longshot)) and can_use(Hover_Boots)"
}
},
{
"region_name": "Gerudo Training Ground Underwater",
"dungeon": "Gerudo Training Ground",
"locations": {
"Gerudo Training Ground MQ Underwater Silver Rupee Chest": "
has_fire_source and can_use(Iron_Boots) and
(logic_fewer_tunic_requirements or can_use(Zora_Tunic)) and can_take_damage"
}
},
{
"region_name": "Gerudo Training Ground Left Side",
"dungeon": "Gerudo Training Ground",
"locations": {
"Gerudo Training Ground MQ First Iron Knuckle Chest": "is_adult or Kokiri_Sword or has_explosives"
},
"exits": {
"Gerudo Training Ground Stalfos Room": "
can_use(Longshot) or logic_gtg_mq_without_hookshot or
(logic_gtg_mq_with_hookshot and can_use(Hookshot))"
}
},
{
"region_name": "Gerudo Training Ground Stalfos Room",
"dungeon": "Gerudo Training Ground",
"locations": {
# Very difficult to fight the Stalfos and Stulltulas under the time limit as child.
"Gerudo Training Ground MQ Before Heavy Block Chest": "is_adult",
"Gerudo Training Ground MQ Heavy Block Chest": "can_use(Silver_Gauntlets)",
"Blue Fire": "has_bottle"
},
"exits": {
"Gerudo Training Ground Back Areas": "
is_adult and (logic_lens_gtg_mq or can_use(Lens_of_Truth)) and Blue_Fire and
(can_play(Song_of_Time) or (logic_gtg_fake_wall and can_use(Hover_Boots)))"
}
},
{
"region_name": "Gerudo Training Ground Back Areas",
"dungeon": "Gerudo Training Ground",
"locations": {
"Gerudo Training Ground MQ Eye Statue Chest": "Bow",
"Gerudo Training Ground MQ Second Iron Knuckle Chest": "True",
"Gerudo Training Ground MQ Flame Circle Chest": "can_use(Hookshot) or Bow or has_explosives"
},
"exits": {
"Gerudo Training Ground Central Maze Right": "Megaton_Hammer",
"Gerudo Training Ground Right Side": "can_use(Longshot)"
}
},
{
"region_name": "Gerudo Training Ground Central Maze Right",
"dungeon": "Gerudo Training Ground",
"locations": {
"Gerudo Training Ground MQ Maze Right Central Chest": "True",
"Gerudo Training Ground MQ Maze Right Side Chest": "True",
# The switch that opens the door to the Ice Arrows chest can be hit with a precise jumpslash.
"Gerudo Training Ground MQ Ice Arrows Chest": "
(Small_Key_Gerudo_Training_Ground, 3)"
},
"exits": {
# guarantees fire with torch
"Gerudo Training Ground Underwater": "
can_use(Longshot) or (can_use(Hookshot) and Bow)",
"Gerudo Training Ground Right Side": "can_use(Hookshot)"
}
}
]

View File

@@ -0,0 +1,120 @@
[
{
"region_name": "Gerudo Training Ground Lobby",
"dungeon": "Gerudo Training Ground",
"locations": {
"Gerudo Training Ground Lobby Left Chest": "can_use(Bow) or can_use(Slingshot)",
"Gerudo Training Ground Lobby Right Chest": "can_use(Bow) or can_use(Slingshot)",
"Gerudo Training Ground Stalfos Chest": "is_adult or Kokiri_Sword",
"Gerudo Training Ground Beamos Chest": "has_explosives and (is_adult or Kokiri_Sword)",
"Wall Fairy": "has_bottle and can_use(Bow)" #in the Beamos room shoot the Gerudo symbol above the door to the lava room.
},
"exits": {
"Gerudo Fortress": "True",
"Gerudo Training Ground Heavy Block Room": "
(is_adult or Kokiri_Sword) and
(can_use(Hookshot) or logic_gtg_without_hookshot)",
"Gerudo Training Ground Lava Room": "
here(has_explosives and (is_adult or Kokiri_Sword))",
"Gerudo Training Ground Central Maze": "True"
}
},
{
"region_name": "Gerudo Training Ground Central Maze",
"dungeon": "Gerudo Training Ground",
"locations": {
"Gerudo Training Ground Hidden Ceiling Chest": "(Small_Key_Gerudo_Training_Ground, 3) and (logic_lens_gtg or can_use(Lens_of_Truth))",
"Gerudo Training Ground Maze Path First Chest": "(Small_Key_Gerudo_Training_Ground, 4)",
"Gerudo Training Ground Maze Path Second Chest": "(Small_Key_Gerudo_Training_Ground, 6)",
"Gerudo Training Ground Maze Path Third Chest": "(Small_Key_Gerudo_Training_Ground, 7)",
"Gerudo Training Ground Maze Path Final Chest": "(Small_Key_Gerudo_Training_Ground, 9)"
},
"exits": {
"Gerudo Training Ground Central Maze Right": "(Small_Key_Gerudo_Training_Ground, 9)"
}
},
{
"region_name": "Gerudo Training Ground Central Maze Right",
"dungeon": "Gerudo Training Ground",
"locations": {
"Gerudo Training Ground Maze Right Central Chest": "True",
"Gerudo Training Ground Maze Right Side Chest": "True",
"Gerudo Training Ground Freestanding Key": "True"
},
"exits": {
"Gerudo Training Ground Hammer Room": "can_use(Hookshot)",
"Gerudo Training Ground Lava Room": "True"
}
},
{
"region_name": "Gerudo Training Ground Lava Room",
"dungeon": "Gerudo Training Ground",
"locations": {
"Gerudo Training Ground Underwater Silver Rupee Chest": "
can_use(Hookshot) and can_play(Song_of_Time) and Iron_Boots and
(logic_fewer_tunic_requirements or can_use(Zora_Tunic))"
},
"exits": {
"Gerudo Training Ground Central Maze Right": "can_play(Song_of_Time) or is_child",
"Gerudo Training Ground Hammer Room": "
can_use(Longshot) or (can_use(Hookshot) and can_use(Hover_Boots))"
}
},
{
"region_name": "Gerudo Training Ground Hammer Room",
"dungeon": "Gerudo Training Ground",
"locations": {
"Gerudo Training Ground Hammer Room Clear Chest": "True",
"Gerudo Training Ground Hammer Room Switch Chest": "can_use(Megaton_Hammer)"
},
"exits": {
"Gerudo Training Ground Eye Statue Lower": "can_use(Megaton_Hammer) and Bow",
"Gerudo Training Ground Lava Room": "True"
}
},
{
"region_name": "Gerudo Training Ground Eye Statue Lower",
"dungeon": "Gerudo Training Ground",
"locations": {
"Gerudo Training Ground Eye Statue Chest": "can_use(Bow)"
},
"exits": {
"Gerudo Training Ground Hammer Room": "True"
}
},
{
"region_name": "Gerudo Training Ground Eye Statue Upper",
"dungeon": "Gerudo Training Ground",
"locations": {
"Gerudo Training Ground Near Scarecrow Chest": "can_use(Bow)"
},
"exits": {
"Gerudo Training Ground Eye Statue Lower": "True"
}
},
{
"region_name": "Gerudo Training Ground Heavy Block Room",
"dungeon": "Gerudo Training Ground",
"locations": {
"Gerudo Training Ground Before Heavy Block Chest": "True"
},
"exits": {
"Gerudo Training Ground Eye Statue Upper": "
(logic_lens_gtg or can_use(Lens_of_Truth)) and
(can_use(Hookshot) or (logic_gtg_fake_wall and can_use(Hover_Boots)))",
"Gerudo Training Ground Like Like Room": "
can_use(Silver_Gauntlets) and (logic_lens_gtg or can_use(Lens_of_Truth)) and
(can_use(Hookshot) or (logic_gtg_fake_wall and can_use(Hover_Boots)))"
}
},
{
"region_name": "Gerudo Training Ground Like Like Room",
"dungeon": "Gerudo Training Ground",
"locations": {
"Gerudo Training Ground Heavy Block First Chest": "True",
"Gerudo Training Ground Heavy Block Second Chest": "True",
"Gerudo Training Ground Heavy Block Third Chest": "True",
"Gerudo Training Ground Heavy Block Fourth Chest": "True"
}
}
]

View File

@@ -1,98 +0,0 @@
[
{
"region_name": "Gerudo Training Grounds Lobby",
"dungeon": "Gerudo Training Grounds",
"locations": {
"Gerudo Training Grounds MQ Lobby Left Chest": "True",
"Gerudo Training Grounds MQ Lobby Right Chest": "True",
"Gerudo Training Grounds MQ Hidden Ceiling Chest": "logic_lens_gtg_mq or can_use(Lens_of_Truth)",
"Gerudo Training Grounds MQ Maze Path First Chest": "True",
"Gerudo Training Grounds MQ Maze Path Second Chest": "True",
"Gerudo Training Grounds MQ Maze Path Third Chest": "(Small_Key_Gerudo_Training_Grounds, 1)"
},
"exits": {
"Gerudo Fortress": "True",
"Gerudo Training Grounds Left Side": "here(has_fire_source)",
"Gerudo Training Grounds Right Side": "here(can_use(Bow) or can_use(Slingshot))"
}
},
{
"region_name": "Gerudo Training Grounds Right Side",
"dungeon": "Gerudo Training Grounds",
"locations": {
"Gerudo Training Grounds MQ Dinolfos Chest": "is_adult",
"Wall Fairy": "has_bottle and can_use(Bow)" #in the Dinalfos room shoot the Gerudo symbol above the door to the lava room.
},
"exits": {
# Still requires has_fire_source in the room
"Gerudo Training Grounds Underwater": "
(Bow or can_use(Longshot)) and can_use(Hover_Boots)"
}
},
{
"region_name": "Gerudo Training Grounds Underwater",
"dungeon": "Gerudo Training Grounds",
"locations": {
"Gerudo Training Grounds MQ Underwater Silver Rupee Chest": "
has_fire_source and can_use(Iron_Boots) and
(logic_fewer_tunic_requirements or can_use(Zora_Tunic)) and can_take_damage"
}
},
{
"region_name": "Gerudo Training Grounds Left Side",
"dungeon": "Gerudo Training Grounds",
"locations": {
"Gerudo Training Grounds MQ First Iron Knuckle Chest": "is_adult or Kokiri_Sword or has_explosives"
},
"exits": {
"Gerudo Training Grounds Stalfos Room": "
can_use(Longshot) or logic_gtg_mq_without_hookshot or
(logic_gtg_mq_with_hookshot and can_use(Hookshot))"
}
},
{
"region_name": "Gerudo Training Grounds Stalfos Room",
"dungeon": "Gerudo Training Grounds",
"locations": {
# Very difficult to fight the Stalfos and Stulltulas under the time limit as child.
"Gerudo Training Grounds MQ Before Heavy Block Chest": "is_adult",
"Gerudo Training Grounds MQ Heavy Block Chest": "can_use(Silver_Gauntlets)",
"Blue Fire": "has_bottle"
},
"exits": {
"Gerudo Training Grounds Back Areas": "
is_adult and (logic_lens_gtg_mq or can_use(Lens_of_Truth)) and Blue_Fire and
(can_play(Song_of_Time) or (logic_gtg_fake_wall and can_use(Hover_Boots)))"
}
},
{
"region_name": "Gerudo Training Grounds Back Areas",
"dungeon": "Gerudo Training Grounds",
"locations": {
"Gerudo Training Grounds MQ Eye Statue Chest": "Bow",
"Gerudo Training Grounds MQ Second Iron Knuckle Chest": "True",
"Gerudo Training Grounds MQ Flame Circle Chest": "can_use(Hookshot) or Bow or has_explosives"
},
"exits": {
"Gerudo Training Grounds Central Maze Right": "Megaton_Hammer",
"Gerudo Training Grounds Right Side": "can_use(Longshot)"
}
},
{
"region_name": "Gerudo Training Grounds Central Maze Right",
"dungeon": "Gerudo Training Grounds",
"locations": {
"Gerudo Training Grounds MQ Maze Right Central Chest": "True",
"Gerudo Training Grounds MQ Maze Right Side Chest": "True",
# The switch that opens the door to the Ice Arrows chest can be hit with a precise jumpslash.
"Gerudo Training Grounds MQ Ice Arrows Chest": "
(Small_Key_Gerudo_Training_Grounds, 3)"
},
"exits": {
# guarantees fire with torch
"Gerudo Training Grounds Underwater": "
can_use(Longshot) or (can_use(Hookshot) and Bow)",
"Gerudo Training Grounds Right Side": "can_use(Hookshot)"
}
}
]

View File

@@ -1,120 +0,0 @@
[
{
"region_name": "Gerudo Training Grounds Lobby",
"dungeon": "Gerudo Training Grounds",
"locations": {
"Gerudo Training Grounds Lobby Left Chest": "can_use(Bow) or can_use(Slingshot)",
"Gerudo Training Grounds Lobby Right Chest": "can_use(Bow) or can_use(Slingshot)",
"Gerudo Training Grounds Stalfos Chest": "is_adult or Kokiri_Sword",
"Gerudo Training Grounds Beamos Chest": "has_explosives and (is_adult or Kokiri_Sword)",
"Wall Fairy": "has_bottle and can_use(Bow)" #in the Beamos room shoot the Gerudo symbol above the door to the lava room.
},
"exits": {
"Gerudo Fortress": "True",
"Gerudo Training Grounds Heavy Block Room": "
(is_adult or Kokiri_Sword) and
(can_use(Hookshot) or logic_gtg_without_hookshot)",
"Gerudo Training Grounds Lava Room": "
here(has_explosives and (is_adult or Kokiri_Sword))",
"Gerudo Training Grounds Central Maze": "True"
}
},
{
"region_name": "Gerudo Training Grounds Central Maze",
"dungeon": "Gerudo Training Grounds",
"locations": {
"Gerudo Training Grounds Hidden Ceiling Chest": "(Small_Key_Gerudo_Training_Grounds, 3) and (logic_lens_gtg or can_use(Lens_of_Truth))",
"Gerudo Training Grounds Maze Path First Chest": "(Small_Key_Gerudo_Training_Grounds, 4)",
"Gerudo Training Grounds Maze Path Second Chest": "(Small_Key_Gerudo_Training_Grounds, 6)",
"Gerudo Training Grounds Maze Path Third Chest": "(Small_Key_Gerudo_Training_Grounds, 7)",
"Gerudo Training Grounds Maze Path Final Chest": "(Small_Key_Gerudo_Training_Grounds, 9)"
},
"exits": {
"Gerudo Training Grounds Central Maze Right": "(Small_Key_Gerudo_Training_Grounds, 9)"
}
},
{
"region_name": "Gerudo Training Grounds Central Maze Right",
"dungeon": "Gerudo Training Grounds",
"locations": {
"Gerudo Training Grounds Maze Right Central Chest": "True",
"Gerudo Training Grounds Maze Right Side Chest": "True",
"Gerudo Training Grounds Freestanding Key": "True"
},
"exits": {
"Gerudo Training Grounds Hammer Room": "can_use(Hookshot)",
"Gerudo Training Grounds Lava Room": "True"
}
},
{
"region_name": "Gerudo Training Grounds Lava Room",
"dungeon": "Gerudo Training Grounds",
"locations": {
"Gerudo Training Grounds Underwater Silver Rupee Chest": "
can_use(Hookshot) and can_play(Song_of_Time) and Iron_Boots and
(logic_fewer_tunic_requirements or can_use(Zora_Tunic))"
},
"exits": {
"Gerudo Training Grounds Central Maze Right": "can_play(Song_of_Time) or is_child",
"Gerudo Training Grounds Hammer Room": "
can_use(Longshot) or (can_use(Hookshot) and can_use(Hover_Boots))"
}
},
{
"region_name": "Gerudo Training Grounds Hammer Room",
"dungeon": "Gerudo Training Grounds",
"locations": {
"Gerudo Training Grounds Hammer Room Clear Chest": "True",
"Gerudo Training Grounds Hammer Room Switch Chest": "can_use(Megaton_Hammer)"
},
"exits": {
"Gerudo Training Grounds Eye Statue Lower": "can_use(Megaton_Hammer) and Bow",
"Gerudo Training Grounds Lava Room": "True"
}
},
{
"region_name": "Gerudo Training Grounds Eye Statue Lower",
"dungeon": "Gerudo Training Grounds",
"locations": {
"Gerudo Training Grounds Eye Statue Chest": "can_use(Bow)"
},
"exits": {
"Gerudo Training Grounds Hammer Room": "True"
}
},
{
"region_name": "Gerudo Training Grounds Eye Statue Upper",
"dungeon": "Gerudo Training Grounds",
"locations": {
"Gerudo Training Grounds Near Scarecrow Chest": "can_use(Bow)"
},
"exits": {
"Gerudo Training Grounds Eye Statue Lower": "True"
}
},
{
"region_name": "Gerudo Training Grounds Heavy Block Room",
"dungeon": "Gerudo Training Grounds",
"locations": {
"Gerudo Training Grounds Before Heavy Block Chest": "True"
},
"exits": {
"Gerudo Training Grounds Eye Statue Upper": "
(logic_lens_gtg or can_use(Lens_of_Truth)) and
(can_use(Hookshot) or (logic_gtg_fake_wall and can_use(Hover_Boots)))",
"Gerudo Training Grounds Like Like Room": "
can_use(Silver_Gauntlets) and (logic_lens_gtg or can_use(Lens_of_Truth)) and
(can_use(Hookshot) or (logic_gtg_fake_wall and can_use(Hover_Boots)))"
}
},
{
"region_name": "Gerudo Training Grounds Like Like Room",
"dungeon": "Gerudo Training Grounds",
"locations": {
"Gerudo Training Grounds Heavy Block First Chest": "True",
"Gerudo Training Grounds Heavy Block Second Chest": "True",
"Gerudo Training Grounds Heavy Block Third Chest": "True",
"Gerudo Training Grounds Heavy Block Fourth Chest": "True"
}
}
]

View File

@@ -589,14 +589,14 @@
Gerudo_Membership_Card and can_ride_epona and Bow and at_day",
"GF HBA 1500 Points": "
Gerudo_Membership_Card and can_ride_epona and Bow and at_day",
"GF North F1 Carpenter": "is_adult or Kokiri_Sword",
"GF North F2 Carpenter": "
"Hideout Jail Guard (1 Torch)": "is_adult or Kokiri_Sword",
"Hideout Jail Guard (2 Torches)": "is_adult or Kokiri_Sword",
"Hideout Jail Guard (3 Torches)": "
(is_adult or Kokiri_Sword) and
(Gerudo_Membership_Card or can_use(Bow) or can_use(Hookshot)
or can_use(Hover_Boots) or logic_gerudo_kitchen)",
"GF South F1 Carpenter": "is_adult or Kokiri_Sword",
"GF South F2 Carpenter": "is_adult or Kokiri_Sword",
"GF Gerudo Membership Card": "can_finish_GerudoFortress",
"Hideout Jail Guard (4 Torches)": "is_adult or Kokiri_Sword",
"Hideout Gerudo Membership Card": "can_finish_GerudoFortress",
"GF GS Archery Range": "
can_use(Hookshot) and Gerudo_Membership_Card and at_night",
"GF GS Top Floor": "
@@ -607,7 +607,7 @@
"exits": {
"GV Fortress Side": "True",
"GF Outside Gate": "'GF Gate Open'",
"Gerudo Training Grounds Lobby": "Gerudo_Membership_Card and is_adult",
"Gerudo Training Ground Lobby": "Gerudo_Membership_Card and is_adult",
"GF Storms Grotto": "is_adult and can_open_storm_grotto" # Not there as child
}
},
@@ -1290,7 +1290,7 @@
},
"exits": {
"Graveyard Shield Grave": "is_adult or at_night",
"Graveyard Composers Grave": "can_play(Zeldas_Lullaby)",
"Graveyard Royal Familys Tomb": "can_play(Zeldas_Lullaby)",
"Graveyard Heart Piece Grave": "is_adult or at_night",
"Graveyard Dampes Grave": "is_adult",
"Graveyard Dampes House": "is_adult or at_dampe_time",
@@ -1321,12 +1321,12 @@
}
},
{
"region_name": "Graveyard Composers Grave",
"pretty_name": "the Composers' Grave",
"scene": "Graveyard Composers Grave",
"region_name": "Graveyard Royal Familys Tomb",
"pretty_name": "the Royal Family's Tomb",
"scene": "Graveyard Royal Familys Tomb",
"locations": {
"Graveyard Composers Grave Chest": "has_fire_source",
"Song from Composers Grave": "
"Graveyard Royal Familys Tomb Chest": "has_fire_source",
"Song from Royal Familys Tomb": "
is_adult or
(Slingshot or Boomerang or Sticks or
has_explosives or Kokiri_Sword)"