diff --git a/ootrando_overworldmap_hamsda/images/logic_colossus_gs.png b/ootrando_overworldmap_hamsda/images/logic_colossus_gs.png new file mode 100644 index 00000000..b9b20b18 Binary files /dev/null and b/ootrando_overworldmap_hamsda/images/logic_colossus_gs.png differ diff --git a/ootrando_overworldmap_hamsda/images/logic_dc_scarecrow_gs.png b/ootrando_overworldmap_hamsda/images/logic_dc_scarecrow_gs.png new file mode 100644 index 00000000..0d3a56e7 Binary files /dev/null and b/ootrando_overworldmap_hamsda/images/logic_dc_scarecrow_gs.png differ diff --git a/ootrando_overworldmap_hamsda/images/logic_forest_outdoors_ledge.png b/ootrando_overworldmap_hamsda/images/logic_forest_outdoors_ledge.png new file mode 100644 index 00000000..88f29068 Binary files /dev/null and b/ootrando_overworldmap_hamsda/images/logic_forest_outdoors_ledge.png differ diff --git a/ootrando_overworldmap_hamsda/images/logic_kakariko_tower_gs.png b/ootrando_overworldmap_hamsda/images/logic_kakariko_tower_gs.png new file mode 100644 index 00000000..f717728b Binary files /dev/null and b/ootrando_overworldmap_hamsda/images/logic_kakariko_tower_gs.png differ diff --git a/ootrando_overworldmap_hamsda/images/logic_lab_wall_gs.png b/ootrando_overworldmap_hamsda/images/logic_lab_wall_gs.png new file mode 100644 index 00000000..5e7a715c Binary files /dev/null and b/ootrando_overworldmap_hamsda/images/logic_lab_wall_gs.png differ diff --git a/ootrando_overworldmap_hamsda/images/logic_spirit_map_chest.png b/ootrando_overworldmap_hamsda/images/logic_spirit_map_chest.png new file mode 100644 index 00000000..0198142f Binary files /dev/null and b/ootrando_overworldmap_hamsda/images/logic_spirit_map_chest.png differ diff --git a/ootrando_overworldmap_hamsda/images/logic_spirit_sun_chest.png b/ootrando_overworldmap_hamsda/images/logic_spirit_sun_chest.png new file mode 100644 index 00000000..052c09d7 Binary files /dev/null and b/ootrando_overworldmap_hamsda/images/logic_spirit_sun_chest.png differ diff --git a/ootrando_overworldmap_hamsda/items/tricks.json b/ootrando_overworldmap_hamsda/items/tricks.json index df4c6493..277102a3 100644 --- a/ootrando_overworldmap_hamsda/items/tricks.json +++ b/ootrando_overworldmap_hamsda/items/tricks.json @@ -209,6 +209,55 @@ "img": "images/logic_wasteland_crossing.png", "codes": "logic_wasteland_crossing" }, + { + "name": "Desert Colossus Hill GS with Hookshot", + "type": "toggle", + "initial_active_state": false, + "img": "images/logic_colossus_gs.png", + "codes": "logic_colossus_gs" + }, + { + "name": "Dodongo's Cavern Scarecrow GS with Armos Statue", + "type": "toggle", + "initial_active_state": false, + "img": "images/logic_dc_scarecrow_gs.png", + "codes": "logic_dc_scarecrow_gs" + }, + { + "name": "Kakariko Tower GS with Jump Slash", + "type": "toggle", + "initial_active_state": false, + "img": "images/logic_kakariko_tower_gs.png", + "codes": "logic_kakariko_tower_gs" + }, + { + "name": "Lake Hylia Lab Wall GS with Jump Slash", + "type": "toggle", + "initial_active_state": false, + "img": "images/logic_lab_wall_gs.png", + "codes": "logic_lab_wall_gs" + }, + { + "name": "Spirit Temple Map Chest with Bow", + "type": "toggle", + "initial_active_state": false, + "img": "images/logic_spirit_map_chest.png", + "codes": "logic_spirit_map_chest" + }, + { + "name": "Spirit Temple Sun Block Room Chest with Bow", + "type": "toggle", + "initial_active_state": false, + "img": "images/logic_spirit_sun_chest.png", + "codes": "logic_spirit_sun_chest" + }, + { + "name": "Forest Temple NE Outdoors Ledge with Hover Boots", + "type": "toggle", + "initial_active_state": false, + "img": "images/logic_forest_outdoors_ledge.png", + "codes": "logic_forest_outdoors_ledge" + }, { "name": "Water Temple Boss Key Region with Hover Boots", "type": "toggle", diff --git a/ootrando_overworldmap_hamsda/layouts/options.json b/ootrando_overworldmap_hamsda/layouts/options.json index 9566eb2c..191c4bd0 100644 --- a/ootrando_overworldmap_hamsda/layouts/options.json +++ b/ootrando_overworldmap_hamsda/layouts/options.json @@ -257,6 +257,48 @@ "width": 200, "height": 16 }, + { + "type": "item", + "item": "logic_colossus_gs", + "width": 200, + "height": 16 + }, + { + "type": "item", + "item": "logic_dc_scarecrow_gs", + "width": 200, + "height": 16 + }, + { + "type": "item", + "item": "logic_kakariko_tower_gs", + "width": 200, + "height": 16 + }, + { + "type": "item", + "item": "logic_lab_wall_gs", + "width": 200, + "height": 16 + }, + { + "type": "item", + "item": "logic_spirit_map_chest", + "width": 200, + "height": 16 + }, + { + "type": "item", + "item": "logic_spirit_sun_chest", + "width": 200, + "height": 16 + }, + { + "type": "item", + "item": "logic_forest_outdoors_ledge", + "width": 200, + "height": 16 + }, { "type": "item", "item": "logic_water_boss_key_region", diff --git a/ootrando_overworldmap_hamsda/locations/dung_mq.json b/ootrando_overworldmap_hamsda/locations/dung_mq.json index 0b353923..67e25a61 100644 --- a/ootrando_overworldmap_hamsda/locations/dung_mq.json +++ b/ootrando_overworldmap_hamsda/locations/dung_mq.json @@ -879,7 +879,7 @@ "name": "NE Outdoors Ledge", "access_rules": [ "@Forest Temple MQ/NE Outdoors,longshot", - "@Forest Temple MQ/Outdoors Top Ledges,hoverboots,[longshot]", + "@Forest Temple MQ/Outdoors Top Ledges,[logic_forest_outdoors_ledge],hoverboots", "@Forest Temple MQ/Bow Region,forest_small_keys:5,bow", "@Forest Temple MQ/Bow Region,forest_small_keys:5,dinsfire,magic" ], diff --git a/ootrando_overworldmap_hamsda/locations/dung_reg.json b/ootrando_overworldmap_hamsda/locations/dung_reg.json index 8556525b..5bcc65cd 100644 --- a/ootrando_overworldmap_hamsda/locations/dung_reg.json +++ b/ootrando_overworldmap_hamsda/locations/dung_reg.json @@ -209,9 +209,10 @@ "name": "GS42 - Scarecrow", "short_name": "Scarecrow", "access_rules": [ - "@Dodongos Cavern/Lobby,$has_age|adult,[ocarina],[scarecrow],[hookshot]", + "@Dodongos Cavern/Lobby,$has_age|adult,ocarina,scarecrow,hookshot", "@Dodongos Cavern/Lobby,$has_age|adult,longshot", - "@Dodongos Cavern/Lobby,$can_child_attack,[$has_age|adult],[longshot]" + "@Dodongos Cavern/Lobby,[logic_dc_scarecrow_gs],$has_age|adult", + "@Dodongos Cavern/Lobby,[logic_dc_scarecrow_gs],$can_child_attack" ], "visibility_rules": [ "setting_tokens_dungeons" @@ -827,7 +828,7 @@ "access_rules": [ "@Forest Temple/NE Outdoors,hookshot", "@Forest Temple/Falling Room", - "@Forest Temple/Outdoors High Balconies,hoverboots,[hookshot]" + "@Forest Temple/Outdoors High Balconies,[logic_forest_outdoors_ledge],hoverboots" ], "item_count": 1 }, @@ -2049,13 +2050,17 @@ "short_name": "Sun Block", "access_rules": [ "@Spirit Temple/Central Chamber,$has_explosives,dinsfire,magic", - "@Spirit Temple/Central Chamber,$has_explosives,sticks,bow,[firearrow],[magic]", + "@Spirit Temple/Central Chamber,$has_explosives,magic,firearrow,bow,sticks", + "@Spirit Temple/Central Chamber,$has_explosives,[logic_spirit_map_chest],bow,sticks", "@Spirit Temple/Central Chamber,[spirit_small_keys:3],dinsfire,magic", - "@Spirit Temple/Central Chamber,[spirit_small_keys:3],sticks,bow,[firearrow],[magic]", + "@Spirit Temple/Central Chamber,[spirit_small_keys:3],magic,firearrow,bow,sticks", + "@Spirit Temple/Central Chamber,[spirit_small_keys:3],[logic_spirit_map_chest],bow,sticks", "@Spirit Temple/Central Chamber,[spirit_small_keys:2],setting_logic_chus_yes,dinsfire,magic", - "@Spirit Temple/Central Chamber,[spirit_small_keys:2],setting_logic_chus_yes,sticks,bow,[firearrow],[magic]", - "@Spirit Temple/Central Chamber,[spirit_small_keys:5],$child_colossus,$has_explosives,sticks", - "@Spirit Temple/Central Chamber,[spirit_small_keys:3],$has_age|adult,lift2,bow,[firearrow],[magic]" + "@Spirit Temple/Central Chamber,[spirit_small_keys:2],setting_logic_chus_yes,magic,firearrow,bow,sticks", + "@Spirit Temple/Central Chamber,[spirit_small_keys:2],setting_logic_chus_yes,[logic_spirit_map_chest],bow,sticks", + "@Spirit Temple/Central Chamber,[spirit_small_keys:5],$has_explosives,sticks", + "@Spirit Temple/Central Chamber,[spirit_small_keys:3],magic,firearrow,bow,lift2", + "@Spirit Temple/Central Chamber,[spirit_small_keys:3],[logic_spirit_map_chest],bow,lift2" ], "chest_unopened_img": "images/chest_brown_small_key.png", "item_count": 1 @@ -2094,7 +2099,18 @@ "name": "Map Chest", "short_name": "Map", "access_rules": [ - "@Spirit Temple/Sun Block Room Chest" + "@Spirit Temple/Central Chamber,$has_explosives,dinsfire,magic", + "@Spirit Temple/Central Chamber,$has_explosives,magic,firearrow,bow,sticks", + "@Spirit Temple/Central Chamber,$has_explosives,[logic_spirit_sun_chest],bow,sticks", + "@Spirit Temple/Central Chamber,[spirit_small_keys:3],dinsfire,magic", + "@Spirit Temple/Central Chamber,[spirit_small_keys:3],magic,firearrow,bow,sticks", + "@Spirit Temple/Central Chamber,[spirit_small_keys:3],[logic_spirit_sun_chest],bow,sticks", + "@Spirit Temple/Central Chamber,[spirit_small_keys:2],setting_logic_chus_yes,dinsfire,magic", + "@Spirit Temple/Central Chamber,[spirit_small_keys:2],setting_logic_chus_yes,magic,firearrow,bow,sticks", + "@Spirit Temple/Central Chamber,[spirit_small_keys:2],setting_logic_chus_yes,[logic_spirit_sun_chest],bow,sticks", + "@Spirit Temple/Central Chamber,[spirit_small_keys:5],$has_explosives,sticks", + "@Spirit Temple/Central Chamber,[spirit_small_keys:3],magic,firearrow,bow,lift2", + "@Spirit Temple/Central Chamber,[spirit_small_keys:3],[logic_spirit_sun_chest],bow,lift2" ], "chest_unopened_img": "images/chest_brown_map.png", "item_count": 1 diff --git a/ootrando_overworldmap_hamsda/locations/overworld.json b/ootrando_overworldmap_hamsda/locations/overworld.json index df807199..da8941c1 100644 --- a/ootrando_overworldmap_hamsda/locations/overworld.json +++ b/ootrando_overworldmap_hamsda/locations/overworld.json @@ -1588,8 +1588,8 @@ "name": "GS56 (N)", "access_rules": [ "boomerang", - "[boomerang],sticks", - "[boomerang],sword1", + "[logic_lab_wall_gs],sticks", + "[logic_lab_wall_gs],sword1", "{sling}", "{$has_explosives}" ], @@ -2106,8 +2106,7 @@ "name": "Talk to him", "access_rules": [ "$has_age|adult,hookshot", - "[logic_man_on_roof],$has_age|adult", - "[logic_man_on_roof],$has_age|child" + "[logic_man_on_roof]" ], "item_count": 1 } @@ -2599,8 +2598,8 @@ "access_rules": [ "sling", "$has_bombchus", - "[sling],sticks,$damage_single_instance", //TODO: trick logic_kakariko_tower_gs - "[sling],sword1,$damage_single_instance" + "[logic_kakariko_tower_gs],sticks,$damage_single_instance", + "[logic_kakariko_tower_gs],sword1,$damage_single_instance" ], "visibility_rules": [ "setting_tokens_overworld" @@ -6093,7 +6092,8 @@ "access_rules": [ "$child_colossus,setting_plant_no,beans", "$child_colossus,bean_colossus_yes", - "$adult_colossus,hookshot,[longshot]", + "$adult_colossus,longshot", + "$adult_colossus,hookshot,[logic_colossus_gs]", "{$adult_colossus,bow}" ], "visibility_rules": [