Skip to content

Commit b402e34

Browse files
GSKiroxGSKirox
committed
Logic update (og author: shirosoluna)
1 parent 098f598 commit b402e34

10 files changed

Lines changed: 41 additions & 34 deletions

‎data/Glitched World/Bottom of the Well.json‎

Lines changed: 11 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -19,15 +19,17 @@
1919
or (can_use(Iron_Boots) and glitch_underwater_chests)",
2020
"Bottom of the Well Underwater Front Chest": "can_play(Zeldas_Lullaby) or glitch_botw_blank_a
2121
or (can_use(Iron_Boots) and glitch_underwater_chests)",
22-
"Bottom of the Well Freestanding Key": "can_swim and
23-
(Sticks or can_use(Dins_Fire)) or
24-
(can_use(Iron_Boots) and can_use(Fire_Arrows)) or
25-
(logic_boomerang_boulders and can_use(Boomerang)) or can_gdv",
26-
# The hitbox of the heart extends beyond the top of the coffin. You can grab this by just walking on the coffin
27-
"Bottom of the Well Coffin Recovery Heart 1": "(can_swim or can_play(Zeldas_Lullaby)) and (Sticks or can_use(Dins_Fire)) or
28-
(can_use(Iron_Boots) and (can_use(Fire_Arrows) or can_use(Dins_Fire))) or can_gdv",
29-
"Bottom of the Well Coffin Recovery Heart 2": "(can_swim or can_play(Zeldas_Lullaby)) and (Sticks or can_use(Dins_Fire)) or
30-
(can_use(Iron_Boots) and (can_use(Fire_Arrows) or can_use(Dins_Fire))) or can_gdv",
22+
"Bottom of the Well Freestanding Key": "
23+
(can_swim or can_use(Iron_Boots)) and (
24+
(Sticks or can_use(Dins_Fire))) or
25+
can_use(Fire_Arrows)) or
26+
(logic_boomerang_boulders and can_use(Boomerang)) or can_gdv
27+
)",
28+
# There is a precise way to hookshot the very top of the vines with iron boots to grab and climb to the coffin room.
29+
# Only relevant for bronze_scale. Void in water or savewarp to go back to main room.
30+
# You can touch these recovery hearts without opening the coffin by just walking on top of the coffin
31+
"Bottom of the Well Coffin Recovery Heart 1": "(can_swim or can_play(Zeldas_Lullaby))",
32+
"Bottom of the Well Coffin Recovery Heart 2": "(can_swim or can_play(Zeldas_Lullaby))",
3133
"Bottom of the Well Near Entrance Pot 1": "True",
3234
"Bottom of the Well Near Entrance Pot 2": "True",
3335
"Bottom of the Well Underwater Pot": "can_botw_blank_a or

‎data/Glitched World/Deku Tree MQ.json‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -54,8 +54,7 @@
5454
(can_use(Hookshot) or can_use(Boomerang) or can_hover) and
5555
(
5656
has_bombchus or (Bombs and (can_play(Song_of_Time) or is_adult)) or
57-
(can_use(Megaton_Hammer) and (can_play(Song_of_Time) or logic_deku_mq_compass_gs))
58-
)"
57+
(can_use(Megaton_Hammer) and (can_play(Song_of_Time) or logic_deku_mq_compass_gs)))"
5958
}
6059
},
6160
{
@@ -134,8 +133,9 @@
134133
},
135134
"exits": {
136135
"Deku Tree Basement Back Room": "is_child",
137-
"Deku Tree Before Boss": "can_jumpslash and (deku_tree_shortcuts or here(has_fire_source_with_torch or can_gdv))
138-
or (can_weirdshot and can_swim)"
136+
"Deku Tree Before Boss": "(can_swim or can_use(Iron_Boots)) and (
137+
deku_tree_shortcuts or here(has_fire_source_with_torch or can_gdv)
138+
or can_weirdshot)"
139139
}
140140
},
141141
{

‎data/Glitched World/Deku Tree.json‎

Lines changed: 8 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@
1717
"exits": {
1818
"KF Outside Deku Tree": "True",
1919
"Deku Tree Slingshot Room": "here(has_shield or can_use(Megaton_Hammer)) and has_soul(Deku_Scrub)",
20-
"Deku Tree Basement": "deku_tree_shortcuts or here(is_adult or (can_child_attack or Nuts and can_jumpslash))",
20+
"Deku Tree Basement": "deku_tree_shortcuts or here(is_adult or (can_child_attack or Nuts))",
2121
"Farores Wind Warp": "can_use(Farores_Wind)"
2222
}
2323
},
@@ -36,8 +36,8 @@
3636
"Deku Tree Basement Chest": "True",
3737
"Deku Tree GS Basement Gate": "is_adult or can_child_attack",
3838
"Deku Tree GS Basement Vines": "
39-
can_use_projectile or can_use(Dins_Fire) or
40-
(logic_deku_basement_gs and (Kokiri_Sword or Sticks or is_adult))"
39+
can_swim and (can_use_projectile or can_use(Dins_Fire) or
40+
(logic_deku_basement_gs and (Kokiri_Sword or Sticks or is_adult)))"
4141
},
4242
"exits": {
4343
"Deku Tree Basement Eye Switch Room": "here(has_fire_source_with_torch or can_use(Bow) or (can_gdv and can_isg))",
@@ -59,7 +59,7 @@
5959
"dungeon": "Deku Tree",
6060
"exits":
6161
{
62-
"Deku Tree Basement Torch Room": "can_swim or can_use(Iron_boots)"
62+
"Deku Tree Basement Torch Room": "can_swim or can_use(Iron_Boots)"
6363
}
6464
},
6565
{
@@ -96,8 +96,10 @@
9696
"Deku Tree Basement": "True",
9797
"Deku Tree Basement Back Room": "is_child",
9898
"Deku Tree Before Boss": "
99-
can_jumpslash and (deku_tree_shortcuts or
100-
here(has_fire_source_with_torch or (logic_deku_b1_webs_with_bow and can_use(Bow)) or can_gdv))"
99+
(can_swim or can_use(Iron_Boots)) and (
100+
deku_tree_shortcuts or
101+
here(has_fire_source_with_torch or (logic_deku_b1_webs_with_bow and can_use(Bow)) or can_gdv)
102+
)"
101103
}
102104
},
103105
{

‎data/Glitched World/Forest Temple MQ.json‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -103,8 +103,8 @@
103103
},
104104
"exits": {
105105
"Forest Temple NE Outdoors": "
106-
can_swim and (can_use(Iron_Boots) or can_use(Longshot) or (Progressive_Scale, 3
107-
)) or
106+
(can_use(Iron_Boots) and can_swim) or
107+
(Progressive_Scale, 3) or
108108
(logic_forest_well_swim and can_swim and can_use(Hookshot))",
109109
"Forest Temple Outdoors High Balconies": "can_use(Fire_Arrows) or (can_gdv and can_isg)",
110110
"Forest Temple Outside Upper Ledge": "can_hover or can_megajump",

‎data/Glitched World/Forest Temple.json‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -57,8 +57,7 @@
5757
(is_adult or Slingshot or Sticks or has_explosives or Kokiri_Sword or can_use(Dins_Fire) or can_use(Megaton_Hammer))"
5858
},
5959
"exits": {
60-
"Forest Temple NE Outdoors": "
61-
(can_use(Iron_Boots) and can_use(Hookshot)) or (Progressive_Scale, 3)",
60+
"Forest Temple NE Outdoors": "(Progressive_Scale, 3) or (can_use(Iron_Boots) and can_swim)",
6261
"Forest Temple Outdoors High Balconies": "can_kill_blue_bubble",
6362
"Forest Temple NW Outdoors Freestandings": "logic_forest_courtyard_hearts and can_use(Boomerang)",
6463
# Low grav ?
@@ -103,7 +102,8 @@
103102
"Forest Temple Outdoors High Balconies": "
104103
can_use(Longshot) or (logic_forest_vines and can_use(Hookshot))",
105104
# Longshot can grab some very high up vines to drain the well.
106-
"Forest Temple NW Outdoors": "can_use(Iron_Boots) or (Progressive_Scale, 3)"
105+
"Forest Temple NW Outdoors": "(can_use(Iron_Boots) and can_use(Longshot)) or (Progressive_Scale, 3)"
106+
#Longshot needed to grab the vines at the top to climb out without swimming. Relevant for bronze scale
107107
}
108108
},
109109
{

‎data/World/Bottom of the Well.json‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@
3131
"Bottom of the Well Near Entrance Pot 1": "True",
3232
"Bottom of the Well Near Entrance Pot 2": "True",
3333
"Bottom of the Well Underwater Pot": "
34-
can_swim or can_play(Zeldas_Lullaby) or can_use(Slingshot) or can_use(Boomerang) or has_bombchus",
34+
(can_swim or can_play(Zeldas_Lullaby)) and (can_use(Slingshot) or can_use(Boomerang) or has_bombchus)",
3535
"Bottom of the Well Basement Pot 1": "True",
3636
"Bottom of the Well Basement Pot 2": "True",
3737
"Bottom of the Well Basement Pot 3": "True",

‎data/World/Deku Tree MQ.json‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -108,7 +108,7 @@
108108
},
109109
"exits": {
110110
"Deku Tree Basement Back Room": "is_child",
111-
"Deku Tree Before Boss": "can_jumpslash and (deku_tree_shortcuts or here(has_fire_source_with_torch))"
111+
"Deku Tree Before Boss": "can_swim and (deku_tree_shortcuts or here(has_fire_source_with_torch))"
112112
}
113113
},
114114
{

‎data/World/Deku Tree.json‎

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -36,8 +36,9 @@
3636
"Deku Tree Basement Chest": "True",
3737
"Deku Tree GS Basement Gate": "is_adult or can_child_attack",
3838
"Deku Tree GS Basement Vines": "
39+
can_swim and (
3940
can_use_projectile or can_use(Dins_Fire) or
40-
(logic_deku_basement_gs and (is_adult or Sticks or Kokiri_Sword))"
41+
(logic_deku_basement_gs and (Kokiri_Sword or Sticks or is_adult)))"
4142
},
4243
"exits": {
4344
"Deku Tree Basement Eye Switch Room": "
@@ -96,7 +97,8 @@
9697
"Deku Tree Basement": "True",
9798
"Deku Tree Basement Back Room": "is_child",
9899
"Deku Tree Before Boss": "
99-
can_jumpslash and (deku_tree_shortcuts or
100+
(can_swim or can_use(Iron_Boots)) and (
101+
deku_tree_shortcuts or
100102
here(has_fire_source_with_torch or (logic_deku_b1_webs_with_bow and can_use(Bow))))"
101103
}
102104
},
@@ -111,7 +113,7 @@
111113
},
112114
"exits": {
113115
"Deku Tree Basement Ledge": "(deku_tree_shortcuts or logic_visible_collisions) and (can_swim or can_use(Iron_Boots))",
114-
"Queen Gohma Boss Room": "deku_tree_shortcuts or (here(has_shield) and has_soul(Deku_Scrub))"
116+
"Queen Gohma Boss Room": "deku_tree_shortcuts or here(has_shield)"
115117
}
116118
}
117119
]

‎data/World/Forest Temple MQ.json‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -106,8 +106,9 @@
106106
},
107107
"exits": {
108108
"Forest Temple NE Outdoors": "
109-
can_swim and (can_use(Iron_Boots) or can_use(Longshot) or
110-
(Progressive_Scale, 3) or (logic_forest_well_swim and can_use(Hookshot)))",
109+
(can_use(Iron_Boots) and can_swim) or
110+
(Progressive_Scale, 3) or
111+
(logic_forest_well_swim and can_swim and can_use(Hookshot))",
111112
"Forest Temple Outdoors High Balconies": "can_use(Fire_Arrows)",
112113
"Forest Temple NW Outdoors Freestandings": "logic_forest_courtyard_hearts and can_use(Boomerang)"
113114
}

‎data/World/Forest Temple.json‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -51,8 +51,7 @@
5151
has_explosives or Kokiri_Sword or can_use(Dins_Fire)"
5252
},
5353
"exits": {
54-
"Forest Temple NE Outdoors": "(Progressive_Scale, 3)",
55-
# Other methods of crossing through the well are not currently relevant.
54+
"Forest Temple NE Outdoors": "(Progressive_Scale, 3) or (can_use(Iron_Boots) and can_swim)",
5655
"Forest Temple Outdoors High Balconies": "
5756
here(is_adult or has_explosives or
5857
((Boomerang or Nuts or Deku_Shield) and (Sticks or Kokiri_Sword or Slingshot)))",
@@ -95,7 +94,8 @@
9594
"Forest Temple Outdoors High Balconies": "
9695
can_use(Longshot) or (logic_forest_vines and can_use(Hookshot))",
9796
# Longshot can grab some very high up vines to drain the well.
98-
"Forest Temple NW Outdoors": "(can_use(Iron_Boots) and can_use(Hookshot)) or (Progressive_Scale, 3)"
97+
"Forest Temple NW Outdoors": "(can_use(Iron_Boots) and can_use(Longshot)) or (Progressive_Scale, 3)"
98+
#Longshot needed to grab the vines at the top to climb out without swimming. Relevant for bronze scale
9999
}
100100
},
101101
{

0 commit comments

Comments
 (0)