diff --git a/items/common_pop.json b/items/common_pop.json index 2a2aff1..36decf9 100644 --- a/items/common_pop.json +++ b/items/common_pop.json @@ -5,7 +5,7 @@ "type": "toggle", "loop": true, "img": "images/shield.png", - "codes": "shield" + "codes": "shield,ls_item" }, { "name": "Lantern", @@ -34,7 +34,7 @@ "type": "toggle", "loop": true, "img": "images/sword1.png", - "codes": "stick,ring,switch,tubes" + "codes": "stick,ring,switch,tubes,ls_item" }, { "name": "Sword", @@ -45,15 +45,15 @@ "stages": [ { "img": "images/sword2.png", - "codes": "sword,ring,grass,switch,tubes" + "codes": "sword,ring,grass,switch,tubes,ls_item" }, { "img": "images/sword3.png", - "codes": "sword,ring,grass,switch,tubes" + "codes": "sword,ring,grass,switch,tubes,ls_item" }, { "img": "images/sword4.png", - "codes": "sword,ring,grass,switch,tubes,bigsword" + "codes": "sword,ring,grass,switch,tubes,bigsword,ls_item" } ] }, @@ -66,19 +66,19 @@ "stages": [ { "img": "images/sword1.png", - "codes": "stick,ring,switch,tubes,progsword" + "codes": "stick,ring,switch,tubes,progsword,ls_item" }, { "img": "images/sword2.png", - "codes": "sword,ring,grass,switch,tubes,progsword" + "codes": "sword,ring,grass,switch,tubes,progsword,ls_item" }, { "img": "images/sword3.png", - "codes": "sword,ring,grass,switch,tubes,progsword" + "codes": "sword,ring,grass,switch,tubes,progsword,ls_item" }, { "img": "images/sword4.png", - "codes": "sword,ring,grass,switch,tubes,bigsword,progsword" + "codes": "sword,ring,grass,switch,tubes,bigsword,progsword,ls_item" } ] }, @@ -115,7 +115,7 @@ "type": "toggle", "loop": true, "img": "images/magic_orb.png", - "codes": "orb" + "codes": "orb,ls_item" }, //Temporary "Grass Fix" LMAO i hate that this works tbh lmao { diff --git a/locations/locations_pop_er.json b/locations/locations_pop_er.json index c6396c4..781cccc 100644 --- a/locations/locations_pop_er.json +++ b/locations/locations_pop_er.json @@ -147,7 +147,11 @@ "sections": [ { "name": "Let the flowers guide you", - "access_rules": null, + "access_rules": [ + "gun", + "sword", + "ice_grapple_hard,orb,dagger" + ], "item_count": 1 } ] @@ -453,7 +457,11 @@ "sections": [ { "name": "Let the flowers guide you", - "access_rules": null, + "access_rules": [ + "gun", + "sword", + "ice_grapple_hard,orb,dagger" + ], "item_count": 1 } ] @@ -679,7 +687,8 @@ "name": "Overworld Belltower", "access_rules": [ "dash", - "@Overworld to West Garden Upper,$has_ladder|ladders_to_west_bell" + "@Overworld to West Garden Upper,$has_ladder|ladders_to_west_bell", + "[ice_grapple_med],dagger,orb" ], "children": [ { @@ -711,7 +720,9 @@ "name": "Overworld Belltower at Bell", "access_rules": [ "@Overworld Belltower,$has_ladder|ladders_to_west_bell", - "@Overworld above Patrol Cave,[glitches],staff" + "@Overworld above Patrol Cave,[glitches],staff", + "$has_ladder|ladders_near_dark_tomb,[glitches],staff", + "@LS Elev 6,staff,[glitches]" ], "children": [ { @@ -748,8 +759,9 @@ "access_rules": [ "dash", "@Back of Swamp Laurels Area", - "@Swamp Mid,glitches,$has_ladder|ladders_in_swamp,stick", - "@Swamp Mid,glitches,$has_ladder|ladders_in_swamp,sword" + "@Back of Swamp,[ladder_storage_med],$can_ls", + "@Swamp Mid,[ladder_storage_med],$can_ls,$has_ladder|ladders_in_swamp", + "@Swamp Mid,[ladder_storage_med],$can_ls" ], "children": [] }, @@ -757,10 +769,10 @@ "name": "Overworld Swamp Lower Entry", "access_rules": [ "$has_ladder|ladder_to_swamp", - "@Back of Swamp,glitches,stick", - "@Back of Swamp,glitches,sword", "@Caustic Light Cave", - "@Swamp Front" + "@Swamp Front", + "@Back of Swamp,[ladder_storage_easy],$can_ls", + "ice_grapple_hard,dagger,orb" ], "children": [ { @@ -791,9 +803,9 @@ { "name": "After Ruined Passage", "access_rules": [ - "[glitches],dagger,icerod,orb,staff", - "$has_ladder|ladders_near_weathervane", - "@Ruined Passage" + "@Ruined Passage", + "[ice_grapple_easy],dagger,icerod,orb,staff", + "$has_ladder|ladders_near_weathervane" ], "children": [ { @@ -825,7 +837,8 @@ "name": "Above Ruined Passage", "access_rules": [ "dash", - "$has_ladder|ladders_near_weathervane" + "$has_ladder|ladders_near_weathervane", + "ice_grapple_hard,dagger,orb" ], "children": [ { @@ -856,17 +869,17 @@ { "name": "East Overworld", "access_rules": [ - "[glitches],dagger,icerod,orb,staff", + "[ice_grapple_easy],dagger,icerod,orb,staff", "$has_ladder|ladders_near_overworld_checkpoint", "@Above Ruined Passage,$has_ladder|ladders_near_weathervane", "@Forest Belltower Main", - "@Fortress Exterior from East Forest,glitches,stick", - "@Fortress Exterior from East Forest,glitches,sword", + "@Fortress Exterior from East Forest", "@Fortress Exterior from Overworld", - "@Fortress Exterior near cave,glitches,$has_ladder|ladder_to_beneath_the_vault,stick", - "@Fortress Exterior near cave,glitches,$has_ladder|ladder_to_beneath_the_vault,sword", + "@Fortress Exterior near cave,[ladder_storage_easy],$can_ls,$has_ladder|ladder_to_beneath_the_vault", "@Overworld Special Shop Entry,dash", - "@Overworld at Patrol Cave,dash" + "@Overworld at Patrol Cave,dash", + "@LS Elev 3,[ladder_storage_med]", + "@LS Elev 5,[ladder_storage_med]" ], "children": [ { @@ -989,12 +1002,13 @@ "name": "Upper Overworld", "access_rules": [ "@Lower Mountain", - "@Overworld above Patrol Cave,[glitches],dagger,icerod,orb,staff", - "@Overworld above Patrol Cave,$has_ladder|ladders_near_patrol_cave", "@Overworld above Quarry Entrance,dash", "@Overworld above Quarry Entrance,orb", - "@Overworld after Temple Rafters,[glitches],dagger,icerod,orb,staff", - "@Overworld after Temple Rafters,$has_ladder|ladder_near_temple_rafters" + "@Overworld above Patrol Cave,$has_ladder|ladders_near_patrol_cave", + "@Overworld after Temple Rafters,$has_ladder|ladder_near_temple_rafters", + "@Overworld above Patrol Cave,[ice_grapple_easy],dagger,icerod,orb,staff", + "@Overworld after Temple Rafters,[ice_grapple_easy],dagger,icerod,orb,staff", + "@LS Elev 7,[ladder_storage_med]" ], "children": [ { @@ -1089,16 +1103,17 @@ "name": "Overworld after Temple Rafters", "access_rules": [ "@Sealed Temple Rafters", - "@Upper Overworld,$has_ladder|ladder_near_temple_rafters" + "@Upper Overworld,$has_ladder|ladder_near_temple_rafters", + "@Upper Overworld,[ice_grapple_med],dagger,orb" ], "children": [] }, { "name": "Overworld Quarry Entry", "access_rules": [ - "[glitches],dagger,orb", - "@Overworld after Envoy,$has_ladder|ladder_to_quarry", - "@Quarry Connector" + "@Quarry Connector", + "[ice_grapple_med],dagger,orb", + "@Overworld after Envoy,$has_ladder|ladder_to_quarry" ], "children": [] }, @@ -1109,7 +1124,8 @@ "bigsword", "dash", "orb", - "@Overworld Quarry Entry,$has_ladder|ladder_to_quarry" + "@Overworld Quarry Entry,$has_ladder|ladder_to_quarry", + "@LS Elev 3,[ladder_storage_med]" ], "children": [ { @@ -1152,7 +1168,10 @@ "$has_ladder|ladders_near_overworld_checkpoint", "orb", "@Overworld at Patrol Cave,$has_ladder|ladders_near_patrol_cave", - "@Upper Overworld,$has_ladder|ladders_near_patrol_cave" + "@Upper Overworld,$has_ladder|ladders_near_patrol_cave", + "@LS Elev 6,[ladder_storage_med]", + "@Overworld at Patrol Cave,[ice_grapple_easy],dagger,icerod,orb,staff", + "@East Overworld,[ice_grapple_easy],dagger,icerod,orb,staff" ], "children": [ { @@ -1187,8 +1206,7 @@ "access_rules": [ "@Overworld Beach,dash", "@West Garden Laurels Exit Region", - "@West Garden,glitches,stick", - "@West Garden,glitches,sword" + "@West Garden,[ladder_storage_easy],$can_ls" ], "children": [] }, @@ -1197,20 +1215,18 @@ "access_rules": [ "@Overworld Belltower,$has_ladder|ladders_to_west_bell", "@West Garden after Boss", - "@West Garden,glitches,$has_ladder|ladders_to_west_bell,stick", - "@West Garden,glitches,$has_ladder|ladders_to_west_bell,sword" + "@West Garden,[ladder_storage_easy],$can_ls", + "@Overworld Belltower,ice_grapple_hard,dagger,orb" ], "children": [] }, { "name": "Overworld to West Garden from Furnace", "access_rules": [ - "@Furnace Ladder Area,glitches,$has_ladder|ladder_in_dark_tomb,stick", - "@Furnace Ladder Area,glitches,$has_ladder|ladder_in_dark_tomb,sword", - "@Furnace Ladder Area,glitches,$has_ladder|ladders_to_west_bell,stick", - "@Furnace Ladder Area,glitches,$has_ladder|ladders_to_west_bell,sword", "@Furnace Walking Path", - "@West Garden" + "@West Garden", + "ice_grapple_hard,dagger,orb,staff,icerod", + "@Furnace Ladder Area,[ladder_storage_easy],$can_ls" ], "children": [ { @@ -1256,8 +1272,8 @@ "@Maze Cave", "@Overworld to Atoll Upper,$has_ladder|ladder_to_ruined_atoll", "@Ruined Atoll Lower Entry Area", - "@Ruined Atoll,glitches,stick", - "@Ruined Atoll,glitches,sword" + "@Ruined Atoll,[ladder_storage_easy],$can_ls", + "@LS Elev 0,[ladder_storage_med]" ], "children": [ { @@ -1473,7 +1489,7 @@ { "name": "Overworld Tunnel Turret", "access_rules": [ - "[glitches],dagger,icerod,orb,staff", + "[ice_grapple_easy],dagger,icerod,orb,staff", "dash", "@Furnace Ladder Area", "@Overworld Beach,$has_ladder|ladders_in_overworld_town" @@ -1518,15 +1534,15 @@ "access_rules": [ "@Beneath the Well Back", "@Furnace Fuse", - "@Furnace Ladder Area,glitches,stick", - "@Furnace Ladder Area,glitches,sword" + "@Furnace Ladder Area,[ladder_storage_easy],$can_ls", + "@Beneath the Well Front,ladder_storage_hard,$can_ls,$has_ladder|ladders_in_well" ], "children": [] }, { "name": "Overworld Ruined Passage Door", "access_rules": [ - "[glitches],dash", + "[laurels_zips],dash", "key:2", "@Ruined Passage" ], @@ -1535,9 +1551,10 @@ { "name": "Overworld Old House Door", "access_rules": [ - "[glitches],dagger,orb", + "[ice_grapple_med],dagger,orb", "oldkey", - "@Old House Front" + "@Old House Front", + "@LS Elev 3,ladder_storage_hard" ], "children": [] }, @@ -1545,7 +1562,9 @@ "name": "Overworld Southeast Cross Door", "access_rules": [ "cross", - "@Southeast Cross Room" + "@Southeast Cross Room", + "@LS Elev 1,ladder_storage_hard", + "ice_grapple_hard,dagger,orb" ], "children": [] }, @@ -1553,16 +1572,19 @@ "name": "Overworld Fountain Cross Door", "access_rules": [ "cross", - "@Fountain Cross Room" + "@Fountain Cross Room", + "@LS Elev 2,ladder_storage_hard", + "[ice_grapple_med],dagger,orb" ], "children": [] }, { "name": "Overworld Temple Door", "access_rules": [ - "[glitches],dagger,orb", + "[ice_grapple_med],dagger,orb", "ding,dong", - "@Sealed Temple" + "@Sealed Temple", + "@LS Elev 5,ladder_storage_hard" ], "children": [] }, @@ -1582,6 +1604,85 @@ ], "children": [] }, + { + "name": "LS Elev 0", + "access_rules": [ + "[ladder_storage_easy],$can_ls,$has_ladder|ladders_in_overworld_town", + "[ladder_storage_easy],$can_ls,$has_ladder|ladder_to_ruined_atoll,@Overworld Beach", + "[ladder_storage_easy],$can_ls,$has_ladder|ladder_to_swamp" + ], + "children": [] + }, + { + "name": "LS Elev 1", + "access_rules": [ + "@LS Elev 0,[ladder_storage_med]", + "[ladder_storage_easy],$can_ls,$has_ladder|ladders_near_weathervane", + "[ladder_storage_easy],$can_ls,$has_ladder|ladders_in_overworld_town", + "[ladder_storage_easy],$can_ls,$has_ladder|ladder_to_swamp" + ], + "children": [] + }, + { + "name": "LS Elev 2", + "access_rules": [ + "@LS Elev 1,[ladder_storage_med]", + "[ladder_storage_easy],$can_ls,$has_ladder|ladders_near_weathervane", + "[ladder_storage_easy],$can_ls,$has_ladder|ladders_to_west_bell,@Overworld Belltower" + ], + "children": [] + }, + { + "name": "LS Elev 3", + "access_rules": [ + "@LS Elev 2,[ladder_storage_med]", + "[ladder_storage_easy],$can_ls,$has_ladder|ladders_near_weathervane", + "[ladder_storage_easy],$can_ls,$has_ladder|ladder_to_quarry,@Overworld Quarry Entry", + "[ladder_storage_easy],$can_ls,$has_ladder|ladders_to_west_bell,@Overworld Belltower", + "[ladder_storage_easy],$can_ls,$has_ladder|ladders_in_overworld_town" + ], + "children": [] + }, + { + "name": "LS Elev 4", + "access_rules": [ + "@LS Elev 3,[ladder_storage_med]", + "[ladder_storage_easy],$can_ls,$has_ladder|ladders_near_dark_tomb", + "[ladder_storage_easy],$can_ls,$has_ladder|ladder_to_quarry,@Overworld Quarry Entry", + "[ladder_storage_easy],$can_ls,$has_ladder|ladders_to_west_bell,@Overworld Belltower", + "[ladder_storage_easy],$can_ls,$has_ladder|ladders_in_well", + "[ladder_storage_easy],$can_ls,$has_ladder|ladders_in_overworld_town" + ], + "children": [] + }, + { + "name": "LS Elev 5", + "access_rules": [ + "@LS Elev 4,[ladder_storage_med]", + "[ladder_storage_easy],$can_ls,$has_ladder|ladders_near_overworld_checkpoint", + "[ladder_storage_easy],$can_ls,$has_ladder|ladders_near_patrol_cave,@Overworld at Patrol Cave" + ], + "children": [] + }, + { + "name": "LS Elev 6", + "access_rules": [ + "@LS Elev 5,[ladder_storage_med]", + "[ladder_storage_easy],$can_ls,$has_ladder|ladders_near_patrol_cave,@Overworld at Patrol Cave", + "[ladder_storage_easy],$can_ls,$has_ladder|ladder_near_temple_rafters,@Overworld after Temple Rafters" + ], + "children": [] + }, + { + "name": "LS Elev 7", + "access_rules": [ + "@LS Elev 6,[ladder_storage_med]", + "[ladder_storage_easy],$can_ls,$has_ladder|ladders_near_patrol_cave,@Overworld at Patrol Cave", + "[ladder_storage_easy],$can_ls,$has_ladder|ladder_near_temple_rafters,@Overworld after Temple Rafters", + "[ladder_storage_easy],$can_ls,$has_ladder|ladders_near_dark_tomb" + ], + "children": [] + }, { "name": "Stick House", "access_rules": null, @@ -1624,7 +1725,7 @@ { "name": "Old House Front", "access_rules": [ - "@Old House Back,[glitches],dash", + "@Old House Back,[laurels_zips],dash", "@Overworld Old House Door", "@Relic Tower" ], @@ -1640,21 +1741,10 @@ { "name": "Furnace Fuse", "access_rules": [ - "glitches,$has_ladder|ladder_to_quarry,stick", - "glitches,$has_ladder|ladder_to_quarry,sword", - "glitches,$has_ladder|ladder_to_swamp,stick", - "glitches,$has_ladder|ladder_to_swamp,sword", - "glitches,$has_ladder|ladders_in_overworld_town,stick", - "glitches,$has_ladder|ladders_in_overworld_town,sword", - "glitches,$has_ladder|ladders_near_weathervane,stick", - "glitches,$has_ladder|ladders_near_weathervane,sword", + "@LS Elev 3,[ladder_storage_med]", "@Furnace Ladder Area,dash", "@Furnace Walking Path,dash", - "@Overworld Beach,glitches,$has_ladder|ladder_to_ruined_atoll,stick", - "@Overworld Beach,glitches,$has_ladder|ladder_to_ruined_atoll,sword", - "@Overworld Well to Furnace Rail", - "@Overworld to West Garden Upper,glitches,$has_ladder|ladders_to_west_bell,stick", - "@Overworld to West Garden Upper,glitches,$has_ladder|ladders_to_west_bell,sword" + "@Overworld Well to Furnace Rail" ], "children": [] }, @@ -1666,25 +1756,11 @@ { "name": "Furnace Walking Path", "access_rules": [ - "glitches,$has_ladder|ladder_in_dark_tomb,$has_ladder|ladder_to_swamp,stick", - "glitches,$has_ladder|ladder_in_dark_tomb,$has_ladder|ladder_to_swamp,sword", - "glitches,$has_ladder|ladder_in_dark_tomb,$has_ladder|ladders_in_overworld_town,stick", - "glitches,$has_ladder|ladder_in_dark_tomb,$has_ladder|ladders_in_overworld_town,sword", - "glitches,$has_ladder|ladder_in_dark_tomb,$has_ladder|ladders_near_weathervane,stick", - "glitches,$has_ladder|ladder_in_dark_tomb,$has_ladder|ladders_near_weathervane,sword", - "glitches,$has_ladder|ladder_to_swamp,$has_ladder|ladders_to_west_bell,stick", - "glitches,$has_ladder|ladder_to_swamp,$has_ladder|ladders_to_west_bell,sword", - "glitches,$has_ladder|ladders_in_overworld_town,$has_ladder|ladders_to_west_bell,stick", - "glitches,$has_ladder|ladders_in_overworld_town,$has_ladder|ladders_to_west_bell,sword", - "glitches,$has_ladder|ladders_near_weathervane,$has_ladder|ladders_to_west_bell,stick", - "glitches,$has_ladder|ladders_near_weathervane,$has_ladder|ladders_to_west_bell,sword", + "@LS Elev 0", + "@LS Elev 1", "@Dark Tomb Dark Exit", "@Furnace Fuse,dash", "@Furnace Ladder Area,dash", - "@Overworld Beach,glitches,$has_ladder|ladder_in_dark_tomb,$has_ladder|ladder_to_ruined_atoll,stick", - "@Overworld Beach,glitches,$has_ladder|ladder_in_dark_tomb,$has_ladder|ladder_to_ruined_atoll,sword", - "@Overworld Beach,glitches,$has_ladder|ladder_to_ruined_atoll,$has_ladder|ladders_to_west_bell,stick", - "@Overworld Beach,glitches,$has_ladder|ladder_to_ruined_atoll,$has_ladder|ladders_to_west_bell,sword", "@Overworld to West Garden from Furnace" ], "children": [] @@ -1771,23 +1847,8 @@ { "name": "Patrol Cave", "access_rules": [ - "glitches,$has_ladder|ladder_to_quarry,stick", - "glitches,$has_ladder|ladder_to_quarry,sword", - "glitches,$has_ladder|ladder_to_swamp,stick", - "glitches,$has_ladder|ladder_to_swamp,sword", - "glitches,$has_ladder|ladders_in_overworld_town,stick", - "glitches,$has_ladder|ladders_in_overworld_town,sword", - "glitches,$has_ladder|ladders_in_well,stick", - "glitches,$has_ladder|ladders_in_well,sword", - "glitches,$has_ladder|ladders_near_dark_tomb,stick", - "glitches,$has_ladder|ladders_near_dark_tomb,sword", - "glitches,$has_ladder|ladders_near_overworld_checkpoint,stick", - "glitches,$has_ladder|ladders_near_overworld_checkpoint,sword", - "glitches,$has_ladder|ladders_near_weathervane,stick", - "glitches,$has_ladder|ladders_near_weathervane,sword", "@Overworld at Patrol Cave", - "@Overworld to West Garden Upper,glitches,$has_ladder|ladders_to_west_bell,stick", - "@Overworld to West Garden Upper,glitches,$has_ladder|ladders_to_west_bell,sword" + "@LS Elev 5" ], "children": [ { @@ -1869,18 +1930,9 @@ { "name": "Ruined Passage", "access_rules": [ - "glitches,$has_ladder|ladder_to_swamp,stick", - "glitches,$has_ladder|ladder_to_swamp,sword", - "glitches,$has_ladder|ladders_in_overworld_town,stick", - "glitches,$has_ladder|ladders_in_overworld_town,sword", - "glitches,$has_ladder|ladders_near_weathervane,stick", - "glitches,$has_ladder|ladders_near_weathervane,sword", "@After Ruined Passage", - "@Overworld Beach,glitches,$has_ladder|ladder_to_ruined_atoll,stick", - "@Overworld Beach,glitches,$has_ladder|ladder_to_ruined_atoll,sword", "@Overworld Ruined Passage Door", - "@Overworld to West Garden Upper,glitches,$has_ladder|ladders_to_west_bell,stick", - "@Overworld to West Garden Upper,glitches,$has_ladder|ladders_to_west_bell,sword" + "@LS Elev 2" ], "children": [ { @@ -1918,7 +1970,8 @@ { "name": "Special Shop", "access_rules": [ - "@Overworld Special Shop Entry" + "@Overworld Special Shop Entry", + "@LS Elev 5" ], "children": [ { @@ -1949,7 +2002,8 @@ { "name": "Caustic Light Cave", "access_rules": [ - "@Overworld Swamp Lower Entry" + "@Overworld Swamp Lower Entry", + "@LS Elev 0" ], "children": [ { @@ -1988,8 +2042,7 @@ "name": "Maze Cave", "access_rules": [ "@Overworld Beach", - "@Overworld Swamp Lower Entry,glitches,$has_ladder|ladder_to_swamp,stick", - "@Overworld Swamp Lower Entry,glitches,$has_ladder|ladder_to_swamp,sword" + "@LS Elev 0" ], "children": [ { @@ -2141,8 +2194,7 @@ "name": "Hourglass Cave", "access_rules": [ "@Overworld Beach", - "@Overworld Swamp Lower Entry,glitches,$has_ladder|ladder_to_swamp,stick", - "@Overworld Swamp Lower Entry,glitches,$has_ladder|ladder_to_swamp,sword" + "@LS Elev 0" ], "children": [] }, @@ -2200,48 +2252,9 @@ { "name": "Sealed Temple Rafters", "access_rules": [ - "[glitches],dagger,dash,glitches,icerod,$has_ladder|ladder_to_quarry,orb,staff,stick", - "[glitches],dagger,dash,glitches,icerod,$has_ladder|ladder_to_quarry,orb,staff,sword", - "[glitches],dagger,dash,glitches,icerod,$has_ladder|ladder_to_swamp,orb,staff,stick", - "[glitches],dagger,dash,glitches,icerod,$has_ladder|ladder_to_swamp,orb,staff,sword", - "[glitches],dagger,dash,glitches,icerod,$has_ladder|ladders_in_overworld_town,orb,staff,stick", - "[glitches],dagger,dash,glitches,icerod,$has_ladder|ladders_in_overworld_town,orb,staff,sword", - "[glitches],dagger,dash,glitches,icerod,$has_ladder|ladders_in_well,orb,staff,stick", - "[glitches],dagger,dash,glitches,icerod,$has_ladder|ladders_in_well,orb,staff,sword", - "[glitches],dagger,dash,glitches,icerod,$has_ladder|ladders_near_dark_tomb,orb,staff,stick", - "[glitches],dagger,dash,glitches,icerod,$has_ladder|ladders_near_dark_tomb,orb,staff,sword", - "[glitches],dagger,dash,glitches,icerod,$has_ladder|ladders_near_patrol_cave,orb,staff,stick", - "[glitches],dagger,dash,glitches,icerod,$has_ladder|ladders_near_patrol_cave,orb,staff,sword", - "[glitches],dagger,dash,glitches,icerod,$has_ladder|ladders_near_weathervane,orb,staff,stick", - "[glitches],dagger,dash,glitches,icerod,$has_ladder|ladders_near_weathervane,orb,staff,sword", - "dash,glitches,$has_ladder|ladder_to_quarry,$has_ladder|ladders_near_patrol_cave,orb,staff,stick", - "dash,glitches,$has_ladder|ladder_to_quarry,$has_ladder|ladders_near_patrol_cave,orb,sword", - "dash,glitches,$has_ladder|ladders_near_dark_tomb,$has_ladder|ladders_near_patrol_cave,orb,stick", - "dash,glitches,$has_ladder|ladders_near_dark_tomb,$has_ladder|ladders_near_patrol_cave,orb,sword", - "dash,glitches,$has_ladder|ladders_near_overworld_checkpoint,orb,stick", - "dash,glitches,$has_ladder|ladders_near_overworld_checkpoint,orb,sword", - "glitches,$has_ladder|ladder_near_temple_rafters,$has_ladder|ladder_to_quarry,stick", - "glitches,$has_ladder|ladder_near_temple_rafters,$has_ladder|ladder_to_quarry,sword", - "glitches,$has_ladder|ladder_near_temple_rafters,$has_ladder|ladder_to_swamp,stick", - "glitches,$has_ladder|ladder_near_temple_rafters,$has_ladder|ladder_to_swamp,sword", - "glitches,$has_ladder|ladder_near_temple_rafters,$has_ladder|ladders_in_overworld_town,stick", - "glitches,$has_ladder|ladder_near_temple_rafters,$has_ladder|ladders_in_overworld_town,sword", - "glitches,$has_ladder|ladder_near_temple_rafters,$has_ladder|ladders_in_well,stick", - "glitches,$has_ladder|ladder_near_temple_rafters,$has_ladder|ladders_in_well,sword", - "glitches,$has_ladder|ladder_near_temple_rafters,$has_ladder|ladders_near_dark_tomb,stick", - "glitches,$has_ladder|ladder_near_temple_rafters,$has_ladder|ladders_near_dark_tomb,sword", - "glitches,$has_ladder|ladder_near_temple_rafters,$has_ladder|ladders_near_overworld_checkpoint,stick", - "glitches,$has_ladder|ladder_near_temple_rafters,$has_ladder|ladders_near_overworld_checkpoint,sword", - "glitches,$has_ladder|ladder_near_temple_rafters,$has_ladder|ladders_near_patrol_cave,stick", - "glitches,$has_ladder|ladder_near_temple_rafters,$has_ladder|ladders_near_patrol_cave,sword", - "glitches,$has_ladder|ladder_near_temple_rafters,$has_ladder|ladders_near_weathervane,stick", - "glitches,$has_ladder|ladder_near_temple_rafters,$has_ladder|ladders_near_weathervane,sword", "@Overworld after Temple Rafters", - "@Overworld to West Garden Upper,[glitches],dagger,dash,glitches,icerod,$has_ladder|ladders_to_west_bell,orb,staff,stick", - "@Overworld to West Garden Upper,[glitches],dagger,dash,glitches,icerod,$has_ladder|ladders_to_west_bell,orb,staff,sword", - "@Overworld to West Garden Upper,glitches,$has_ladder|ladder_near_temple_rafters,$has_ladder|ladders_to_west_bell,stick", - "@Overworld to West Garden Upper,glitches,$has_ladder|ladder_near_temple_rafters,$has_ladder|ladders_to_west_bell,sword", - "@Sealed Temple" + "@Sealed Temple", + "@LS Elev 6" ], "children": [] }, @@ -2311,25 +2324,10 @@ { "name": "Forest Belltower Main", "access_rules": [ - "glitches,$has_ladder|ladder_to_quarry,stick", - "glitches,$has_ladder|ladder_to_quarry,sword", - "glitches,$has_ladder|ladder_to_swamp,stick", - "glitches,$has_ladder|ladder_to_swamp,sword", - "glitches,$has_ladder|ladders_in_overworld_town,stick", - "glitches,$has_ladder|ladders_in_overworld_town,sword", - "glitches,$has_ladder|ladders_in_well,stick", - "glitches,$has_ladder|ladders_in_well,sword", - "glitches,$has_ladder|ladders_near_dark_tomb,stick", - "glitches,$has_ladder|ladders_near_dark_tomb,sword", - "glitches,$has_ladder|ladders_near_patrol_cave,stick", - "glitches,$has_ladder|ladders_near_patrol_cave,sword", - "glitches,$has_ladder|ladders_near_weathervane,stick", - "glitches,$has_ladder|ladders_near_weathervane,sword", "@East Overworld", "@Forest Belltower Upper", "@Fortress Exterior from East Forest", - "@Overworld to West Garden Upper,glitches,$has_ladder|ladders_to_west_bell,stick", - "@Overworld to West Garden Upper,glitches,$has_ladder|ladders_to_west_bell,sword" + "@LS Elev 5" ], "children": [ { @@ -2400,16 +2398,17 @@ { "name": "East Forest", "access_rules": [ - "@East Forest Dance Fox Spot,[glitches],dagger,icerod,orb,staff", + "@Forest Belltower Lower", "@East Forest Dance Fox Spot,dash", "@East Forest Portal", - "@Forest Belltower Lower", "@Forest Grave Path Main", "@Forest Grave Path Upper", "@Guard House 1 East", "@Guard House 1 West", "@Guard House 2 Upper", - "@Lower Forest,$has_ladder|ladders_to_lower_forest" + "@Lower Forest,$has_ladder|ladders_to_lower_forest", + "@East Forest Dance Fox Spot,[ice_grapple_easy],dagger,icerod,orb,staff", + "@Forest Grave Path Main,[ladder_storage_medium],$can_ls" ], "children": [ { @@ -2570,7 +2569,11 @@ "sections": [ { "name": "Follow the Flowers", - "access_rules": null, + "access_rules": [ + "gun", + "sword", + "ice_grapple_hard,orb,dagger" + ], "item_count": 1 } ] @@ -2580,9 +2583,10 @@ { "name": "East Forest Dance Fox Spot", "access_rules": [ - "@East Forest,[glitches],dagger,icerod,orb,staff", "@East Forest,dash", - "@Guard House 1 West" + "@Guard House 1 West", + "@East Forest,[ice_grapple_easy],dagger,icerod,orb,staff", + "@East Forest,[ladder_storage_medium],$can_ls" ], "children": [ { @@ -2641,7 +2645,7 @@ { "name": "Lower Forest", "access_rules": [ - "@East Forest,dagger,icerod,orb,staff", + "@East Forest,[ice_grapple_easy],dagger,icerod,orb,staff", "@East Forest,$has_ladder|ladders_to_lower_forest", "@Guard House 2 Lower" ], @@ -2875,8 +2879,7 @@ "access_rules": [ "@Forest Belltower Upper", "@Guard House 1 East", - "@Guard House 1 West,glitches,stick", - "@Guard House 1 West,glitches,sword" + "@Guard House 1 West,[ladder_storage_easy],$can_ls" ], "children": [ { @@ -2909,10 +2912,10 @@ "name": "Forest Grave Path Main", "access_rules": [ "@East Forest", - "@Forest Grave Path Upper,[glitches],dagger,icerod,orb,staff", + "@Forest Grave Path Upper,[ice_grapple_easy],dagger,icerod,orb,staff", "@Forest Grave Path Upper,dash", - "@Forest Grave Path by Grave,[glitches],dagger,orb", - "@Forest Grave Path by Grave,[glitches],dash" + "@Forest Grave Path by Grave,[ice_grapple_easy],dagger,orb", + "@Forest Grave Path by Grave,[laurels_zips],dash" ], "children": [ { @@ -2967,7 +2970,8 @@ "name": "Forest Grave Path Upper", "access_rules": [ "@East Forest", - "@Forest Grave Path Main,dash" + "@Forest Grave Path Main,dash", + "@Forest Grave Path Main,ice_grapple_hard,dagger,orb,staff,icerod" ], "children": [ { @@ -3230,11 +3234,8 @@ "name": "Dark Tomb Dark Exit", "access_rules": [ "@Dark Tomb Main", - "@Furnace Ladder Area,glitches,$has_ladder|ladder_in_dark_tomb,stick", - "@Furnace Ladder Area,glitches,$has_ladder|ladder_in_dark_tomb,sword", - "@Furnace Ladder Area,glitches,$has_ladder|ladders_to_west_bell,stick", - "@Furnace Ladder Area,glitches,$has_ladder|ladders_to_west_bell,sword", - "@Furnace Walking Path" + "@Furnace Walking Path", + "@Furnace Ladder Area,$can_ls,[ladder_storage_easy]" ], "children": [] }, @@ -3274,7 +3275,8 @@ "name": "Well Boss", "access_rules": [ "@Beneath the Well Back", - "@Dark Tomb Checkpoint,[glitches],dash" + "@Dark Tomb Checkpoint,[laurels_zips],dash", + "@Beneath the Well Front,ladder_storage_hard,$can_ls,$has_ladder|ladders_in_well" ], "children": [] }, @@ -3519,21 +3521,11 @@ { "name": "Beneath the Well Back", "access_rules": [ - "glitches,$has_ladder|ladder_to_quarry,stick", - "glitches,$has_ladder|ladder_to_quarry,sword", - "glitches,$has_ladder|ladder_to_swamp,stick", - "glitches,$has_ladder|ladder_to_swamp,sword", - "glitches,$has_ladder|ladders_in_overworld_town,stick", - "glitches,$has_ladder|ladders_in_overworld_town,sword", - "glitches,$has_ladder|ladders_near_weathervane,stick", - "glitches,$has_ladder|ladders_near_weathervane,sword", + "@LS Elev 3,[ladder_storage_med]", "@Beneath the Well Main,$has_ladder|ladders_in_well", - "@Overworld Beach,glitches,$has_ladder|ladder_to_ruined_atoll,stick", - "@Overworld Beach,glitches,$has_ladder|ladder_to_ruined_atoll,sword", "@Overworld Well to Furnace Rail", - "@Overworld to West Garden Upper,glitches,$has_ladder|ladders_to_west_bell,stick", - "@Overworld to West Garden Upper,glitches,$has_ladder|ladders_to_west_bell,sword", - "@Well Boss" + "@Well Boss", + "@Beneath the Well Front,ladder_storage_hard,$can_ls,$has_ladder|ladders_in_well" ], "children": [ { @@ -3659,23 +3651,13 @@ "name": "West Garden", "access_rules": [ "@Magic Dagger House", - "@Overworld Beach,glitches,$has_ladder|ladder_in_dark_tomb,$has_ladder|ladder_to_ruined_atoll,stick", - "@Overworld Beach,glitches,$has_ladder|ladder_in_dark_tomb,$has_ladder|ladder_to_ruined_atoll,sword", - "@Overworld Beach,glitches,$has_ladder|ladder_in_dark_tomb,$has_ladder|ladders_in_overworld_town,stick", - "@Overworld Beach,glitches,$has_ladder|ladder_in_dark_tomb,$has_ladder|ladders_in_overworld_town,sword", - "@Overworld Beach,glitches,$has_ladder|ladder_to_ruined_atoll,$has_ladder|ladders_to_west_bell,stick", - "@Overworld Beach,glitches,$has_ladder|ladder_to_ruined_atoll,$has_ladder|ladders_to_west_bell,sword", - "@Overworld Beach,glitches,$has_ladder|ladders_in_overworld_town,$has_ladder|ladders_to_west_bell,stick", - "@Overworld Beach,glitches,$has_ladder|ladders_in_overworld_town,$has_ladder|ladders_to_west_bell,sword", - "@Overworld Swamp Lower Entry,glitches,$has_ladder|ladder_in_dark_tomb,$has_ladder|ladder_to_swamp,stick", - "@Overworld Swamp Lower Entry,glitches,$has_ladder|ladder_in_dark_tomb,$has_ladder|ladder_to_swamp,sword", - "@Overworld Swamp Lower Entry,glitches,$has_ladder|ladder_to_swamp,$has_ladder|ladders_to_west_bell,stick", - "@Overworld Swamp Lower Entry,glitches,$has_ladder|ladder_to_swamp,$has_ladder|ladders_to_west_bell,sword", + "@LS Elev 0", "@Overworld to West Garden from Furnace", "@West Garden Hero's Grave Region", "@West Garden Laurels Exit Region,dash", - "@West Garden Portal Item,[glitches],dagger,icerod,orb,staff", - "@West Garden after Boss,dash" + "@West Garden Portal Item,[ice_grapple_easy],dagger,icerod,orb,staff", + "@West Garden after Boss,dash", + "@West Garden after Boss,[ice_grapple_med],dagger,orb" ], "children": [ { @@ -4159,7 +4141,7 @@ "name": "West Garden Portal Item", "access_rules": [ "@West Garden Portal,dash", - "@West Garden,[glitches],dagger,icerod,orb,staff" + "@West Garden,[ice_grapple_med],dagger,icerod,orb,staff" ], "children": [ { @@ -4192,12 +4174,7 @@ { "name": "West Garden Laurels Exit Region", "access_rules": [ - "@Overworld Beach,glitches,$has_ladder|ladder_to_ruined_atoll,stick", - "@Overworld Beach,glitches,$has_ladder|ladder_to_ruined_atoll,sword", - "@Overworld Beach,glitches,$has_ladder|ladders_in_overworld_town,stick", - "@Overworld Beach,glitches,$has_ladder|ladders_in_overworld_town,sword", - "@Overworld Swamp Lower Entry,glitches,$has_ladder|ladder_to_swamp,stick", - "@Overworld Swamp Lower Entry,glitches,$has_ladder|ladder_to_swamp,sword", + "@LS Elev 0", "@Overworld West Garden Laurels Entry", "@West Garden,dash" ], @@ -4206,25 +4183,12 @@ { "name": "West Garden after Boss", "access_rules": [ - "dash,glitches,$has_ladder|ladder_to_swamp,stick", - "dash,glitches,$has_ladder|ladder_to_swamp,sword", - "dash,glitches,$has_ladder|ladders_in_overworld_town,stick", - "dash,glitches,$has_ladder|ladders_in_overworld_town,sword", - "dash,glitches,$has_ladder|ladders_near_weathervane,stick", - "dash,glitches,$has_ladder|ladders_near_weathervane,sword", - "glitches,$has_ladder|ladder_to_swamp,$has_ladder|ladders_to_west_bell,stick", - "glitches,$has_ladder|ladder_to_swamp,$has_ladder|ladders_to_west_bell,sword", - "glitches,$has_ladder|ladders_in_overworld_town,$has_ladder|ladders_to_west_bell,stick", - "glitches,$has_ladder|ladders_in_overworld_town,$has_ladder|ladders_to_west_bell,sword", - "glitches,$has_ladder|ladders_near_weathervane,$has_ladder|ladders_to_west_bell,stick", - "glitches,$has_ladder|ladders_near_weathervane,$has_ladder|ladders_to_west_bell,sword", - "@Overworld Beach,dash,glitches,$has_ladder|ladder_to_ruined_atoll,stick", - "@Overworld Beach,dash,glitches,$has_ladder|ladder_to_ruined_atoll,sword", - "@Overworld Beach,glitches,$has_ladder|ladder_to_ruined_atoll,$has_ladder|ladders_to_west_bell,stick", - "@Overworld Beach,glitches,$has_ladder|ladder_to_ruined_atoll,$has_ladder|ladders_to_west_bell,sword", "@Overworld to West Garden Upper", "@West Garden,dash", - "@West Garden,sword" + "@West Garden,sword", + "@LS Elev 2", + "@West Garden,[ladder_storage_easy],$can_ls", + "@West Garden,[ice_grapple_med],dagger,orb" ], "children": [ { @@ -4289,12 +4253,6 @@ { "name": "Ruined Atoll", "access_rules": [ - "glitches,$has_ladder|ladder_to_swamp,orb,stick", - "glitches,$has_ladder|ladder_to_swamp,orb,sword", - "glitches,$has_ladder|ladders_in_overworld_town,orb,stick", - "glitches,$has_ladder|ladders_in_overworld_town,orb,sword", - "glitches,$has_ladder|ladders_near_weathervane,orb,stick", - "glitches,$has_ladder|ladders_near_weathervane,orb,sword", "pray", "@Overworld to Atoll Upper", "@Ruined Atoll Frog Eye,$has_ladder|ladders_to_frogs_domain", @@ -4303,7 +4261,8 @@ "@Ruined Atoll Lower Entry Area,dash", "@Ruined Atoll Lower Entry Area,orb", "@Ruined Atoll Portal", - "@Ruined Atoll Statue" + "@Ruined Atoll Statue", + "@LS Elev 1" ], "children": [ { @@ -4441,7 +4400,8 @@ "name": "[East] Locked Room Lower Chest", "access_rules": [ "dash", - "key:2" + "key:2", + "[ice_grapple_med],dagger,orb" ], "item_count": 1 }, @@ -4449,7 +4409,8 @@ "name": "[East] Locked Room Upper Chest", "access_rules": [ "dash", - "key:2" + "key:2", + "[ice_grapple_med],dagger,orb" ], "item_count": 1 } @@ -4565,7 +4526,11 @@ "sections": [ { "name": "Flowers Guide Thee", - "access_rules": null, + "access_rules": [ + "gun", + "sword", + "ice_grapple_hard,orb,dagger" + ], "item_count": 1 } ] @@ -4601,12 +4566,9 @@ "name": "Ruined Atoll Lower Entry Area", "access_rules": [ "@Overworld Beach", - "@Overworld Swamp Lower Entry,glitches,$has_ladder|ladder_to_swamp,$has_ladder|ladders_in_overworld_town,stick", - "@Overworld Swamp Lower Entry,glitches,$has_ladder|ladder_to_swamp,$has_ladder|ladders_in_overworld_town,sword", - "@Overworld Swamp Lower Entry,glitches,$has_ladder|ladder_to_swamp,orb,stick", - "@Overworld Swamp Lower Entry,glitches,$has_ladder|ladder_to_swamp,orb,sword", - "@Ruined Atoll,[glitches],dagger,icerod,orb,staff", - "@Ruined Atoll,dash" + "@Ruined Atoll,[ice_grapple_easy],dagger,icerod,orb,staff", + "@Ruined Atoll,dash", + "@LS Elev 0" ], "children": [ { @@ -4724,7 +4686,8 @@ "name": "Ruined Atoll Frog Eye", "access_rules": [ "@Frog Stairs Eye Exit", - "@Ruined Atoll,$has_ladder|ladders_to_frogs_domain" + "@Ruined Atoll,$has_ladder|ladders_to_frogs_domain", + "@Ruined Atoll,[ladder_storage_med],$can_ls" ], "children": [] }, @@ -4749,8 +4712,7 @@ "access_rules": [ "@Frog Stairs Upper,$has_ladder|ladders_to_frogs_domain", "@Ruined Atoll Frog Eye", - "@Ruined Atoll,glitches,stick", - "@Ruined Atoll,glitches,sword" + "@Ruined Atoll,[ladder_storage_med],$can_ls" ], "children": [] }, @@ -4760,8 +4722,11 @@ "@Frog Stairs Eye Exit,$has_ladder|ladders_to_frogs_domain", "@Frog Stairs Lower,$has_ladder|ladders_to_frogs_domain", "@Ruined Atoll Frog Mouth", - "@Ruined Atoll,glitches,stick", - "@Ruined Atoll,glitches,sword" + "@Frog Stairs Eye Exit,[ice_grapple_easy],dagger,orb,staff,icerod", + "@Ruined Atoll,[ladder_storage_med],$can_ls", + "@Ruined Atoll,[ladder_storage_easy],$can_ls,$has_ladder|ladders_in_south_atoll", + "@Ruined Atoll,[ladder_storage_easy],$can_ls,key:2", + "@Ruined Atoll,[ladder_storage_easy],$can_ls,[ice_grapple_med],dagger,orb" ], "children": [] }, @@ -4770,7 +4735,8 @@ "access_rules": [ "@Frog Stairs Upper,$has_ladder|ladders_to_frogs_domain", "@Frog Stairs to Frog's Domain,$has_ladder|ladders_to_frogs_domain", - "@Frog's Domain Back" + "@Frog's Domain Back", + "@Frog's Domain,ladder_storage_hard,$can_ls,$has_ladder|ladders_to_frogs_domain" ], "children": [] }, @@ -5037,7 +5003,8 @@ "name": "Frog's Domain Back", "access_rules": [ "@Frog Stairs Lower", - "@Frog's Domain,orb" + "@Frog's Domain,orb", + "@Frog's Domain,ladder_storage_hard,$can_ls,$has_ladder|ladders_to_frogs_domain" ], "children": [ { @@ -5453,28 +5420,13 @@ { "name": "Fortress Exterior from Overworld", "access_rules": [ - "glitches,$has_ladder|ladder_to_quarry,stick", - "glitches,$has_ladder|ladder_to_quarry,sword", - "glitches,$has_ladder|ladder_to_swamp,stick", - "glitches,$has_ladder|ladder_to_swamp,sword", - "glitches,$has_ladder|ladders_in_overworld_town,stick", - "glitches,$has_ladder|ladders_in_overworld_town,sword", - "glitches,$has_ladder|ladders_in_well,stick", - "glitches,$has_ladder|ladders_in_well,sword", - "glitches,$has_ladder|ladders_near_dark_tomb,stick", - "glitches,$has_ladder|ladders_near_dark_tomb,sword", - "glitches,$has_ladder|ladders_near_patrol_cave,stick", - "glitches,$has_ladder|ladders_near_patrol_cave,sword", - "glitches,$has_ladder|ladders_near_weathervane,stick", - "glitches,$has_ladder|ladders_near_weathervane,sword", "@East Overworld", "@Fortress Courtyard Upper", "@Fortress Courtyard,dash", "@Fortress Exterior from East Forest,dash", "@Fortress Exterior from East Forest,orb", "@Fortress Exterior near cave,dash", - "@Overworld to West Garden Upper,glitches,$has_ladder|ladders_to_west_bell,stick", - "@Overworld to West Garden Upper,glitches,$has_ladder|ladders_to_west_bell,sword" + "@LS Elev 5" ], "children": [ { @@ -5530,7 +5482,9 @@ "access_rules": [ "@Beneath the Vault Entry,$has_ladder|ladder_to_beneath_the_vault", "@Fortress Exterior from Overworld,dash", - "@Fortress Exterior from Overworld,pray" + "@Fortress Exterior from Overworld,pray", + "@Fortress Exterior from Overworld,[ladder_storage_easy],$can_ls", + "@Fortress Exterior from East Forest,[ladder_storage_easy],$can_ls" ], "children": [ { @@ -5594,18 +5548,23 @@ "access_rules": [ "@Eastern Vault Fortress", "@Fortress Courtyard Upper", - "@Fortress Exterior from Overworld,[glitches],dagger,icerod,orb,staff", "@Fortress Exterior from Overworld,dash", - "@Fortress Grave Path" + "@Fortress Grave Path", + "@Fortress Exterior near cave,ice_grapple_hard,dagger,orb,staff,icerod", + "@Fortress Exterior from Overworld,[ice_grapple_easy],dagger,orb,staff,icerod" ], "children": [] }, { "name": "Fortress Courtyard Upper", "access_rules": [ - "@Fortress Courtyard,[glitches],dagger,icerod,orb,staff", + "@Fortress Courtyard,[ice_grapple_easy],dagger,icerod,orb,staff", "@Fortress East Shortcut Upper", - "@Fortress Grave Path Upper" + "@Fortress Grave Path Upper", + "@Fortress Exterior from Overworld,[ladder_storage_med],$can_ls", + "@Fortress Exterior from East Forest,[ladder_storage_med],$can_ls", + "@Fortress Exterior near cave,[ladder_storage_med],$can_ls,$has_ladder|ladder_to_beneath_the_vault", + "Fortress Courtyard,[ice_grapple_easy],dagger,orb,staff,icerod" ], "children": [] }, @@ -5761,16 +5720,13 @@ "name": "Eastern Vault Fortress", "access_rules": [ "@Beneath the Vault Back", - "@Eastern Vault Fortress Gold Door,[glitches],dagger,icerod,orb,staff", "@Fortress Courtyard", "@Fortress East Shortcut Lower", "@Fortress East Shortcut Upper", - "@Fortress Exterior from East Forest,glitches,stick", - "@Fortress Exterior from East Forest,glitches,sword", - "@Fortress Exterior from Overworld,glitches,stick", - "@Fortress Exterior from Overworld,glitches,sword", - "@Fortress Exterior near cave,glitches,$has_ladder|ladder_to_beneath_the_vault,stick", - "@Fortress Exterior near cave,glitches,$has_ladder|ladder_to_beneath_the_vault,sword" + "@Eastern Vault Fortress Gold Door,[ice_grapple_med],dagger,orb,icerod,staff", + "@Fortress Exterior from Overworld,[ladder_storage_easy],$can_ls", + "@Fortress Exterior from East Forest,[ladder_storage_easy],$can_ls", + "@Fortress Exterior near cave,[ladder_storage_easy],$can_ls,$has_ladder|ladder_to_beneath_the_vault" ], "children": [ { @@ -5872,7 +5828,11 @@ "sections": [ { "name": "Bomb the Wall", - "access_rules": null, + "access_rules": [ + "gun", + "sword", + "ice_grapple_hard,orb,dagger" + ], "item_count": 1 } ] @@ -5882,7 +5842,7 @@ { "name": "Eastern Vault Fortress Gold Door", "access_rules": [ - "@Eastern Vault Fortress,[glitches],dagger,orb", + "@Eastern Vault Fortress,[ice_grapple_med],dagger,orb", "@Eastern Vault Fortress,pray", "@Fortress Arena" ], @@ -5893,13 +5853,10 @@ "access_rules": [ "@Eastern Vault Fortress", "@Fortress Courtyard Upper", - "@Fortress East Shortcut Lower,[glitches],dagger,icerod,orb,staff", - "@Fortress Exterior from East Forest,glitches,stick", - "@Fortress Exterior from East Forest,glitches,sword", - "@Fortress Exterior from Overworld,glitches,stick", - "@Fortress Exterior from Overworld,glitches,sword", - "@Fortress Exterior near cave,glitches,$has_ladder|ladder_to_beneath_the_vault,stick", - "@Fortress Exterior near cave,glitches,$has_ladder|ladder_to_beneath_the_vault,sword" + "@Fortress East Shortcut Lower,[ice_grapple_easy],dagger,icerod,orb,staff", + "@Fortress Exterior from Overworld,[ladder_storage_easy],$can_ls", + "@Fortress Exterior from East Forest,[ladder_storage_med],$can_ls", + "@Fortress Exterior near cave,[ladder_storage_med],$can_ls,$has_ladder|ladder_to_beneath_the_vault" ], "children": [] }, @@ -5939,15 +5896,12 @@ "name": "Fortress Grave Path", "access_rules": [ "@Fortress Courtyard", - "@Fortress Exterior from East Forest,glitches,stick", - "@Fortress Exterior from East Forest,glitches,sword", - "@Fortress Exterior from Overworld,glitches,stick", - "@Fortress Exterior from Overworld,glitches,sword", - "@Fortress Exterior near cave,glitches,$has_ladder|ladder_to_beneath_the_vault,stick", - "@Fortress Exterior near cave,glitches,$has_ladder|ladder_to_beneath_the_vault,sword", "@Fortress Grave Path Dusty Entrance Region,dash", - "@Fortress Grave Path Upper,[glitches],dagger,icerod,orb,staff", - "@Fortress Hero's Grave Region" + "@Fortress Grave Path Upper,[ice_grapple_easy],dagger,icerod,orb,staff", + "@Fortress Hero's Grave Region", + "@Fortress Exterior from Overworld,[ladder_storage_easy],$can_ls", + "@Fortress Exterior from East Forest,[ladder_storage_easy],$can_ls", + "@Fortress Exterior near cave,[ladder_storage_easy],$can_ls,$has_ladder|ladder_to_beneath_the_vault" ], "children": [] }, @@ -5955,12 +5909,9 @@ "name": "Fortress Grave Path Upper", "access_rules": [ "@Fortress Courtyard Upper", - "@Fortress Exterior from East Forest,glitches,stick", - "@Fortress Exterior from East Forest,glitches,sword", - "@Fortress Exterior from Overworld,glitches,stick", - "@Fortress Exterior from Overworld,glitches,sword", - "@Fortress Exterior near cave,glitches,$has_ladder|ladder_to_beneath_the_vault,stick", - "@Fortress Exterior near cave,glitches,$has_ladder|ladder_to_beneath_the_vault,sword" + "@Fortress Exterior from Overworld,[ladder_storage_easy],$can_ls", + "@Fortress Exterior from East Forest,[ladder_storage_med],$can_ls", + "@Fortress Exterior near cave,[ladder_storage_med],$can_ls,$has_ladder|ladder_to_beneath_the_vault" ], "children": [ { @@ -6088,11 +6039,10 @@ { "name": "Lower Mountain", "access_rules": [ - "@Lower Mountain Stairs,cross", - "@Overworld above Quarry Entrance,glitches,$has_ladder|ladders_near_dark_tomb,stick", - "@Overworld above Quarry Entrance,glitches,$has_ladder|ladders_near_dark_tomb,sword", + "@Upper Overworld", "@Quarry Back", - "@Upper Overworld" + "@Lower Mountain Stairs,cross", + "@LS Elev 7" ], "children": [] }, @@ -6100,7 +6050,8 @@ "name": "Lower Mountain Stairs", "access_rules": [ "@Lower Mountain,cross", - "@Top of the Mountain" + "@Top of the Mountain", + "@Lower Mountain,[ladder_storage_med],$can_ls" ], "children": [] }, @@ -6114,20 +6065,9 @@ { "name": "Quarry Connector", "access_rules": [ - "glitches,$has_ladder|ladder_to_swamp,stick", - "glitches,$has_ladder|ladder_to_swamp,sword", - "glitches,$has_ladder|ladders_in_overworld_town,stick", - "glitches,$has_ladder|ladders_in_overworld_town,sword", - "glitches,$has_ladder|ladders_in_well,stick", - "glitches,$has_ladder|ladders_in_well,sword", - "glitches,$has_ladder|ladders_near_weathervane,stick", - "glitches,$has_ladder|ladders_near_weathervane,sword", - "@Overworld Beach,glitches,$has_ladder|ladder_to_ruined_atoll,stick", - "@Overworld Beach,glitches,$has_ladder|ladder_to_ruined_atoll,sword", "@Overworld Quarry Entry", - "@Overworld to West Garden Upper,glitches,$has_ladder|ladders_to_west_bell,stick", - "@Overworld to West Garden Upper,glitches,$has_ladder|ladders_to_west_bell,sword", - "@Quarry Entry" + "@Quarry Entry", + "@LS Elev 4" ], "children": [] }, @@ -6238,7 +6178,10 @@ "sections": [ { "name": "Flowers Guide Thee", - "access_rules": null, + "access_rules": [ + "gun", + "sword" + ], "item_count": 1 } ] @@ -6540,7 +6483,11 @@ "sections": [ { "name": "Boomy", - "access_rules": null, + "access_rules": [ + "gun", + "sword", + "ice_grapple_hard,orb,dagger" + ], "item_count": 1 } ] @@ -6608,7 +6555,7 @@ { "name": "Monastery Front", "access_rules": [ - "@Monastery Back,[glitches],dash", + "@Monastery Back,[laurels_zips],dash", "@Quarry Monastery Entry" ], "children": [] @@ -6619,8 +6566,9 @@ "@Monastery Front", "@Monastery Hero's Grave Region", "@Monastery Rope", - "@Quarry Monastery Entry,glitches,stick", - "@Quarry Monastery Entry,glitches,sword" + "@Quarry Entry,[ladder_storage_med],$can_ls", + "@Quarry Monastery Entry,[ladder_storage_med],$can_ls", + "@Quarry Back,[ladder_storage_med],$can_ls" ], "children": [] }, @@ -6811,7 +6759,7 @@ { "name": "Even Lower Quarry", "access_rules": [ - "@Lower Quarry,[glitches],dagger,icerod,orb,staff", + "@Lower Quarry,[ice_grapple_easy],dagger,icerod,orb,staff", "@Lower Quarry,$has_ladder|ladders_in_lower_quarry" ], "children": [ @@ -6890,8 +6838,9 @@ "name": "Lower Quarry Zig Door", "access_rules": [ "@Even Lower Quarry,@Quarry Connector,orb,pray", - "@Quarry,impossible", - "@Rooted Ziggurat Entry" + "@Rooted Ziggurat Entry", + "@Quarry,ice_grapple_hard,dagger,orb,icerod,staff", + "@Even Lower Quarry,ice_grapple_hard,dagger,orb" ], "children": [] }, @@ -7013,18 +6962,18 @@ "name": "Rooted Ziggurat Middle Bottom", "access_rules": [ "@Rooted Ziggurat Lower Front", - "@Rooted Ziggurat Middle Top" + "@Rooted Ziggurat Middle Top", + "@Rooted Ziggurat Lower Back,[ladder_storage_med],$can_ls" ], "children": [] }, { "name": "Rooted Ziggurat Lower Front", "access_rules": [ - "@Rooted Ziggurat Lower Back,[glitches],dagger,icerod,orb,pray,staff,sword", + "@Rooted Ziggurat Lower Back,[ice_grapple_easy],dagger,icerod,orb,staff,pray,sword", "@Rooted Ziggurat Lower Back,dash,pray,sword", - "@Rooted Ziggurat Lower Back,glitches,stick", - "@Rooted Ziggurat Lower Back,glitches,sword", - "@Rooted Ziggurat Middle Bottom" + "@Rooted Ziggurat Middle Bottom", + "@Rooted Ziggurat Lower Back,[ladder_storage_med],$can_ls" ], "children": [ { @@ -7220,7 +7169,8 @@ "name": "Scavenger Queen", "access_rules": [ "[glitches],orb", - "sword" + "sword", + "[ice_grapple_med],dagger,orb" ], "item_count": 1, "hosted_item": "scavboss" @@ -7257,9 +7207,12 @@ "name": "Swamp Front", "access_rules": [ "@Overworld Swamp Lower Entry", - "@Swamp Mid,[glitches],dagger,orb", + "@Swamp Mid,ice_grapple_hard,dagger,orb", + "@Back of Swamp Laurels Area,[laurels_zips],dash", "@Swamp Mid,dash", - "@Swamp Mid,$has_ladder|ladders_in_swamp" + "@Swamp Mid,$has_ladder|ladders_in_swamp", + "@LS Elev 0", + "@Back of Swamp,[ladder_storage_med],$can_ls" ], "children": [ { @@ -7499,13 +7452,15 @@ { "name": "Swamp Mid", "access_rules": [ - "@Back of Swamp Laurels Area,[glitches],dagger,dash,icerod,orb,staff", - "@Swamp Front,[glitches],dagger,orb", + "@Back of Swamp Laurels Area,[ice_grapple_easy],dagger,icerod,orb,staff,dash", + "@Back of Swamp Laurels Area,[laurels_zips],dash", + "@Swamp Front,ice_grapple_hard,dagger,orb", "@Swamp Front,dash", "@Swamp Front,$has_ladder|ladders_in_swamp", - "@Swamp Ledge under Cathedral Door,[glitches],dagger,icerod,orb,staff", + "@Swamp Ledge under Cathedral Door,[ice_grapple_easy],dagger,icerod,orb,staff", "@Swamp Ledge under Cathedral Door,$has_ladder|ladders_in_swamp", - "@Swamp to Cathedral Main Entrance Region,[glitches],dagger,orb" + "@Swamp to Cathedral Main Entrance Region,[ice_grapple_easy],dagger,orb", + "@Back of Swamp,[ladder_storage_med],$can_ls" ], "children": [ { @@ -7723,7 +7678,8 @@ "name": "Swamp Ledge under Cathedral Door", "access_rules": [ "@Swamp Mid,$has_ladder|ladders_in_swamp", - "@Swamp to Cathedral Treasure Room" + "@Swamp to Cathedral Treasure Room", + "@Swamp Mid,ice_grapple_hard,dagger,orb,icerod,staff" ], "children": [ { @@ -7763,7 +7719,7 @@ "name": "Swamp to Cathedral Main Entrance Region", "access_rules": [ "@Cathedral", - "@Swamp Mid,[glitches],dagger,orb", + "@Swamp Mid,[ice_grapple_med],dagger,orb", "@Swamp Mid,dash,pray" ], "children": [] @@ -7789,7 +7745,8 @@ "name": "Back of Swamp Laurels Area", "access_rules": [ "@Back of Swamp,dash", - "@Overworld Swamp Upper Entry" + "@Overworld Swamp Upper Entry", + "@LS Elev 1" ], "children": [ { @@ -7823,7 +7780,9 @@ "name": "Cathedral", "access_rules": [ "@Cathedral Gauntlet Checkpoint", - "@Swamp to Cathedral Main Entrance Region" + "@Swamp to Cathedral Main Entrance Region", + "@Swamp Mid,ladder_storage_hard,$can_ls,$has_ladder|ladders_in_swamp", + "@Back of Swamp,ladder_storage_hard,$can_ls" ], "children": [ { @@ -8020,9 +7979,9 @@ { "name": "Cathedral Secret Legend Room", "access_rules": [ - "@Back of Swamp,cross,glitches,stick", - "@Back of Swamp,cross,glitches,sword", - "@Swamp to Cathedral Treasure Room" + "@Swamp to Cathedral Treasure Room", + "@Back of Swamp,cross,$can_ls,ladder_storage_hard", + "@Swamp Mid,cross,$can_ls,ladder_storage_hard,$has_ladder|ladders_in_swamp" ], "children": [ { @@ -8066,7 +8025,8 @@ { "name": "Cathedral Gauntlet Checkpoint", "access_rules": [ - "@Cathedral" + "@Cathedral,pray", + "@Cathedral,[ice_grapple_med],dagger,orb" ], "children": [] }, @@ -8110,8 +8070,7 @@ "access_rules": [ "@Back of Swamp", "@Cathedral Gauntlet,dash", - "@Swamp Mid,glitches,$has_ladder|ladders_in_swamp,stick", - "@Swamp Mid,glitches,$has_ladder|ladders_in_swamp,sword" + "@Swamp Mid,[ladder_storage_easy],$can_ls,$has_ladder|ladders_in_swamp" ], "children": [] }, @@ -8365,20 +8324,17 @@ { "name": "Shop", "access_rules": [ - "@Back of Swamp,glitches,stick", - "@Back of Swamp,glitches,sword", "@Cathedral Gauntlet Checkpoint", "@Eastern Vault Fortress", - "@Fortress Exterior from East Forest,glitches,stick", - "@Fortress Exterior from East Forest,glitches,sword", - "@Fortress Exterior from Overworld,glitches,stick", - "@Fortress Exterior from Overworld,glitches,sword", "@Fortress Exterior near cave", "@Quarry Entry", "@Ruined Atoll", "@Swamp Front", "@West Garden", - "@Windmill" + "@Windmill", + "@Back of Swamp,[ladder_storage_easy],$can_ls,$has_ladder|ladders_in_swamp", + "@Fortress Exterior from Overworld,[ladder_storage_easy],$can_ls", + "@Fortress Exterior from East Forest,[ladder_storage_easy],$can_ls" ], "children": [ { diff --git a/scripts/autotracking/archipelago.lua b/scripts/autotracking/archipelago.lua index f184dcc..aa73e3d 100644 --- a/scripts/autotracking/archipelago.lua +++ b/scripts/autotracking/archipelago.lua @@ -27,6 +27,20 @@ data_storage_table = { ["Granted Icebomb"] = "icebomb", } +-- the object's code (that you'd use in FindObjectForCode), the slot data value, and if it's a multi-stage option +local function set_option(code, slot_data_value, is_multi_stage) + local obj = Tracker:FindObjectForCode(code) + if not (obj or slot_data_value) then return end + + if is_multi_stage then + print(code) + print(slot_data_value) + obj.CurrentStage = slot_data_value + else + obj.Active = slot_data_value == 1 + end +end + function onSetReply(key, value, _) local slot_player = "Slot:" .. Archipelago.PlayerNumber if key == slot_player .. ":Current Map" then @@ -157,71 +171,15 @@ function onClear(slot_data) end end - if slot_data.entrance_rando ~= 0 then - --print("slot_data['entrance_rando']: " .. slot_data['entrance_rando']) - local obj = Tracker:FindObjectForCode("er_off") - if slot_data.entrance_rando == 0 then - obj.CurrentStage = 0 - else - obj.CurrentStage = 1 - end - end - - if slot_data.maskless then - --print("slot_data.maskless: " .. slot_data.maskless) - local obj = Tracker:FindObjectForCode("maskless") - if obj then - obj.Active = slot_data.maskless == 1 - end - end + set_option("er_off", slot_data.entrance_rando, false) - if slot_data.lanternless then - --print("slot_data.lanternless: " .. slot_data.lanternless) - local obj = Tracker:FindObjectForCode("lanternless") - if obj then - obj.Active = slot_data.lanternless == 1 - end - end + set_option("maskless", slot_data.maskless, false) + set_option("lanternless", slot_data.lanternless, false) - if slot_data.laurels_zips then - --print("slot_data.laurels_zips: " .. slot_data.laurels_zips) - local obj = Tracker:FindObjectForCode("laurels_zips") - if obj then - obj.Active = slot_data.laurels_zips == 1 - end - end - - if slot_data.ice_grappling then - if slot_data.ice_grappling == 0 then - Tracker:FindObjectForCode("ice_grapple_off").CurrentStage = 0 - elseif slot_data.ice_grappling == 1 then - Tracker:FindObjectForCode("ice_grapple_off").CurrentStage = 1 - elseif slot_data.ice_grappling == 2 then - Tracker:FindObjectForCode("ice_grapple_off").CurrentStage = 2 - elseif slot_data.ice_grappling == 3 then - Tracker:FindObjectForCode("ice_grapple_off").CurrentStage = 3 - end - end - - if slot_data.ladder_storage then - if slot_data.ladder_storage == 0 then - Tracker:FindObjectForCode("ladder_storage_off").CurrentStage = 0 - elseif slot_data.ladder_storage == 1 then - Tracker:FindObjectForCode("ladder_storage_off").CurrentStage = 1 - elseif slot_data.ladder_storage == 2 then - Tracker:FindObjectForCode("ladder_storage_off").CurrentStage = 2 - elseif slot_data.ladder_storage == 3 then - Tracker:FindObjectForCode("ladder_storage_off").CurrentStage = 3 - end - end - - if slot_data.ladder_storage_without_items then - --print("slot_data.ladder_storage_without_items: " .. slot_data.ladder_storage_without_items) - local obj = Tracker:FindObjectForCode("storage_no_items") - if obj then - obj.Active = slot_data.ladder_storage_without_items == 1 - end - end + set_option("laurels_zips", slot_data.laurels_zips, false) + set_option("ice_grapple_off", slot_data.ice_grappling, true) + set_option("ladder_storage_off", slot_data.ladder_storage, true) + set_option("storage_no_items", slot_data.ladder_storage_without_items, false) Tracker:FindObjectForCode("ladder_shuffle_off").CurrentStage = slot_data.shuffle_ladders diff --git a/scripts/logic_common.lua b/scripts/logic_common.lua index ad149b5..f0c821b 100644 --- a/scripts/logic_common.lua +++ b/scripts/logic_common.lua @@ -39,5 +39,15 @@ function has_ladder(ladderName) return Tracker:FindObjectForCode(ladderName).Active end +function can_ls() + if Tracker:ProviderCountForCode("ls_item") > 0 then + return true + end + if Tracker:FindObjectForCode("storage_no_items").Active then + return true + end + return false +end + ScriptHost:AddWatchForCode("ladderLayout", "ladder_shuffle_off", updateLayout) ScriptHost:AddWatchForCode("hintsLayout", "show_hints", updateLayout)