diff --git a/changelog.md b/changelog.md index 95a0ace6..98532c34 100644 --- a/changelog.md +++ b/changelog.md @@ -1,5 +1,20 @@ # Changelog +## 2.4.1.0 + +- changed images for overworld ER to be more colorful +- changed ER Darunias spot visible on child map +- added new graves to ER captures +- added sequence breaks for new logic tricks: + - Forest Temple MQ NE outdoors ledge w/ hovers + - Fire Temple MQ big lava room bombable chest w/o hookshot + - Fire Temple MQ flame wall maze skip + - Water Temple falling platform room GS w/ hookshot + - Ice Cavern MQ scarecrow GS w/o anything + - Light Trial MQ w/o hookshot + - Link the Goron w/ dins + - DMC upper to lower w/ hammer + ## 2.4.0.2 - added MQ Forest Temple basement sequence break with 4 keys diff --git a/ootrando_overworldmap_hamsda.zip b/ootrando_overworldmap_hamsda.zip index af247ab7..a8f496dd 100644 Binary files a/ootrando_overworldmap_hamsda.zip and b/ootrando_overworldmap_hamsda.zip differ diff --git a/ootrando_overworldmap_hamsda/images/entrance_grotto_comp.png b/ootrando_overworldmap_hamsda/images/entrance_grotto_comp.png new file mode 100644 index 00000000..c9657140 Binary files /dev/null and b/ootrando_overworldmap_hamsda/images/entrance_grotto_comp.png differ diff --git a/ootrando_overworldmap_hamsda/images/entrance_grotto_dampe.png b/ootrando_overworldmap_hamsda/images/entrance_grotto_dampe.png new file mode 100644 index 00000000..25d4c9bf Binary files /dev/null and b/ootrando_overworldmap_hamsda/images/entrance_grotto_dampe.png differ diff --git a/ootrando_overworldmap_hamsda/images/entrance_grotto_hp.png b/ootrando_overworldmap_hamsda/images/entrance_grotto_hp.png new file mode 100644 index 00000000..708ffb2c Binary files /dev/null and b/ootrando_overworldmap_hamsda/images/entrance_grotto_hp.png differ diff --git a/ootrando_overworldmap_hamsda/images/entrance_overworld_bridge.png b/ootrando_overworldmap_hamsda/images/entrance_overworld_bridge.png index 5a17186f..6366d68f 100644 Binary files a/ootrando_overworldmap_hamsda/images/entrance_overworld_bridge.png and b/ootrando_overworldmap_hamsda/images/entrance_overworld_bridge.png differ diff --git a/ootrando_overworldmap_hamsda/images/entrance_overworld_cg.png b/ootrando_overworldmap_hamsda/images/entrance_overworld_cg.png index f45143a9..b9200fef 100644 Binary files a/ootrando_overworldmap_hamsda/images/entrance_overworld_cg.png and b/ootrando_overworldmap_hamsda/images/entrance_overworld_cg.png differ diff --git a/ootrando_overworldmap_hamsda/images/entrance_overworld_col.png b/ootrando_overworldmap_hamsda/images/entrance_overworld_col.png index 5965ca1e..6efa4e58 100644 Binary files a/ootrando_overworldmap_hamsda/images/entrance_overworld_col.png and b/ootrando_overworldmap_hamsda/images/entrance_overworld_col.png differ diff --git a/ootrando_overworldmap_hamsda/images/entrance_overworld_ct.png b/ootrando_overworldmap_hamsda/images/entrance_overworld_ct.png index 2295e0e4..0499ae7f 100644 Binary files a/ootrando_overworldmap_hamsda/images/entrance_overworld_ct.png and b/ootrando_overworldmap_hamsda/images/entrance_overworld_ct.png differ diff --git a/ootrando_overworldmap_hamsda/images/entrance_overworld_cte.png b/ootrando_overworldmap_hamsda/images/entrance_overworld_cte.png index d99a04f7..23a8c0a4 100644 Binary files a/ootrando_overworldmap_hamsda/images/entrance_overworld_cte.png and b/ootrando_overworldmap_hamsda/images/entrance_overworld_cte.png differ diff --git a/ootrando_overworldmap_hamsda/images/entrance_overworld_dmc.png b/ootrando_overworldmap_hamsda/images/entrance_overworld_dmc.png index 72cbafb1..d35896cf 100644 Binary files a/ootrando_overworldmap_hamsda/images/entrance_overworld_dmc.png and b/ootrando_overworldmap_hamsda/images/entrance_overworld_dmc.png differ diff --git a/ootrando_overworldmap_hamsda/images/entrance_overworld_dmt.png b/ootrando_overworldmap_hamsda/images/entrance_overworld_dmt.png index 435419ec..2a7293ba 100644 Binary files a/ootrando_overworldmap_hamsda/images/entrance_overworld_dmt.png and b/ootrando_overworldmap_hamsda/images/entrance_overworld_dmt.png differ diff --git a/ootrando_overworldmap_hamsda/images/entrance_overworld_gc.png b/ootrando_overworldmap_hamsda/images/entrance_overworld_gc.png index 75ecd6d5..e9bbbc92 100644 Binary files a/ootrando_overworldmap_hamsda/images/entrance_overworld_gc.png and b/ootrando_overworldmap_hamsda/images/entrance_overworld_gc.png differ diff --git a/ootrando_overworldmap_hamsda/images/entrance_overworld_gf.png b/ootrando_overworldmap_hamsda/images/entrance_overworld_gf.png index 47693494..ca22f004 100644 Binary files a/ootrando_overworldmap_hamsda/images/entrance_overworld_gf.png and b/ootrando_overworldmap_hamsda/images/entrance_overworld_gf.png differ diff --git a/ootrando_overworldmap_hamsda/images/entrance_overworld_gv.png b/ootrando_overworldmap_hamsda/images/entrance_overworld_gv.png index fb972ca3..dd7a813e 100644 Binary files a/ootrando_overworldmap_hamsda/images/entrance_overworld_gv.png and b/ootrando_overworldmap_hamsda/images/entrance_overworld_gv.png differ diff --git a/ootrando_overworldmap_hamsda/images/entrance_overworld_gy.png b/ootrando_overworldmap_hamsda/images/entrance_overworld_gy.png index ee7993a4..7dd08815 100644 Binary files a/ootrando_overworldmap_hamsda/images/entrance_overworld_gy.png and b/ootrando_overworldmap_hamsda/images/entrance_overworld_gy.png differ diff --git a/ootrando_overworldmap_hamsda/images/entrance_overworld_hf.png b/ootrando_overworldmap_hamsda/images/entrance_overworld_hf.png index f4334b1c..4d6207bb 100644 Binary files a/ootrando_overworldmap_hamsda/images/entrance_overworld_hf.png and b/ootrando_overworldmap_hamsda/images/entrance_overworld_hf.png differ diff --git a/ootrando_overworldmap_hamsda/images/entrance_overworld_kak.png b/ootrando_overworldmap_hamsda/images/entrance_overworld_kak.png index 786d6955..669075a4 100644 Binary files a/ootrando_overworldmap_hamsda/images/entrance_overworld_kak.png and b/ootrando_overworldmap_hamsda/images/entrance_overworld_kak.png differ diff --git a/ootrando_overworldmap_hamsda/images/entrance_overworld_kf.png b/ootrando_overworldmap_hamsda/images/entrance_overworld_kf.png index 201642d8..1e5c872e 100644 Binary files a/ootrando_overworldmap_hamsda/images/entrance_overworld_kf.png and b/ootrando_overworldmap_hamsda/images/entrance_overworld_kf.png differ diff --git a/ootrando_overworldmap_hamsda/images/entrance_overworld_lh.png b/ootrando_overworldmap_hamsda/images/entrance_overworld_lh.png index 6b440c09..08dd9296 100644 Binary files a/ootrando_overworldmap_hamsda/images/entrance_overworld_lh.png and b/ootrando_overworldmap_hamsda/images/entrance_overworld_lh.png differ diff --git a/ootrando_overworldmap_hamsda/images/entrance_overworld_llr.png b/ootrando_overworldmap_hamsda/images/entrance_overworld_llr.png index e4419b21..8782c3cc 100644 Binary files a/ootrando_overworldmap_hamsda/images/entrance_overworld_llr.png and b/ootrando_overworldmap_hamsda/images/entrance_overworld_llr.png differ diff --git a/ootrando_overworldmap_hamsda/images/entrance_overworld_lw.png b/ootrando_overworldmap_hamsda/images/entrance_overworld_lw.png index ecff4e47..5591ec78 100644 Binary files a/ootrando_overworldmap_hamsda/images/entrance_overworld_lw.png and b/ootrando_overworldmap_hamsda/images/entrance_overworld_lw.png differ diff --git a/ootrando_overworldmap_hamsda/images/entrance_overworld_sfm.png b/ootrando_overworldmap_hamsda/images/entrance_overworld_sfm.png index 08268b0e..08e6a4ad 100644 Binary files a/ootrando_overworldmap_hamsda/images/entrance_overworld_sfm.png and b/ootrando_overworldmap_hamsda/images/entrance_overworld_sfm.png differ diff --git a/ootrando_overworldmap_hamsda/images/entrance_overworld_wl.png b/ootrando_overworldmap_hamsda/images/entrance_overworld_wl.png index 9dcf054c..51b0521e 100644 Binary files a/ootrando_overworldmap_hamsda/images/entrance_overworld_wl.png and b/ootrando_overworldmap_hamsda/images/entrance_overworld_wl.png differ diff --git a/ootrando_overworldmap_hamsda/images/entrance_overworld_zd.png b/ootrando_overworldmap_hamsda/images/entrance_overworld_zd.png index 2c422c33..1fe952f8 100644 Binary files a/ootrando_overworldmap_hamsda/images/entrance_overworld_zd.png and b/ootrando_overworldmap_hamsda/images/entrance_overworld_zd.png differ diff --git a/ootrando_overworldmap_hamsda/images/entrance_overworld_zf.png b/ootrando_overworldmap_hamsda/images/entrance_overworld_zf.png index 5f798151..86de95d0 100644 Binary files a/ootrando_overworldmap_hamsda/images/entrance_overworld_zf.png and b/ootrando_overworldmap_hamsda/images/entrance_overworld_zf.png differ diff --git a/ootrando_overworldmap_hamsda/images/entrance_overworld_zr.png b/ootrando_overworldmap_hamsda/images/entrance_overworld_zr.png index bd8bb401..69d9b329 100644 Binary files a/ootrando_overworldmap_hamsda/images/entrance_overworld_zr.png and b/ootrando_overworldmap_hamsda/images/entrance_overworld_zr.png differ diff --git a/ootrando_overworldmap_hamsda/locations/dung_mq.json b/ootrando_overworldmap_hamsda/locations/dung_mq.json index 739f4904..e7bfe7be 100644 --- a/ootrando_overworldmap_hamsda/locations/dung_mq.json +++ b/ootrando_overworldmap_hamsda/locations/dung_mq.json @@ -722,7 +722,7 @@ "name": "GS71 - Scarecrow", "short_name": "Scarecrow", "access_rules": [ - "hookshot,ocarina,[scarecrow]", + "[hookshot],[ocarina],[scarecrow]", "longshot,hoverboots" ], "chest_unopened_img": "images/skulltula.png", diff --git a/ootrando_overworldmap_hamsda/locations/dung_mq_keys.json b/ootrando_overworldmap_hamsda/locations/dung_mq_keys.json index 683f0677..68d5edd3 100644 --- a/ootrando_overworldmap_hamsda/locations/dung_mq_keys.json +++ b/ootrando_overworldmap_hamsda/locations/dung_mq_keys.json @@ -106,7 +106,8 @@ "access_rules": [ "bow,longshot", "@Forest Temple MQ/Redead Chest,longshot", - "@Forest Temple MQ/Falling Room Chest" + "@Forest Temple MQ/Falling Room Chest", + "@Forest Temple MQ/NE Outdoors Upper Chest,hoverboots,[longshot]" ], "item_count": 1 }, @@ -258,7 +259,7 @@ "name": "Big Lava Room Bombable Chest", "short_name": "Lava Room Bombable", "access_rules": [ - "hammer,hookshot,$has_fire,$has_explosives" + "hammer,[hookshot],$has_fire,$has_explosives" ], "item_count": 1 }, @@ -369,7 +370,7 @@ "short_name": "Fire Maze Side", "access_rules": [ "@Fire Temple MQ/Freestanding Key,ocarina,time", - "@Fire Temple MQ/Freestanding Key,hoverboots" + "@Fire Temple MQ/Freestanding Key,[hoverboots]" ], "chest_unopened_img": "images/skulltula.png", "chest_opened_img": "images/skulltula_token.png", @@ -801,7 +802,8 @@ "name": "GS85 - Near Boss", "short_name": "Near Boss", "access_rules": [ - "@Shadow Temple MQ Skulltulas/GS84 - After Ship,bow" + "@Shadow Temple MQ Skulltulas/GS84 - After Ship,bow", + "@Shadow Temple MQ Skulltulas/GS84 - After Ship,bombchu,[bow]" ], "chest_unopened_img": "images/skulltula.png", "chest_opened_img": "images/skulltula_token.png", @@ -1357,7 +1359,7 @@ "name": "Castle Tower", "access_rules": [ "$can_LA,lift3,ocarina,time,$has_goron_tunic,$has_bottle,$can_see_with_lens,hammer,bombchu,shield3,firearrow,longshot", - "$can_LA,lift3,ocarina,time,$has_goron_tunic,$has_bottle,$can_see_with_lens,hammer,bombchu,shield3,firearrow,hookshot,hoverboots" + "$can_LA,lift3,ocarina,time,$has_goron_tunic,$has_bottle,$can_see_with_lens,hammer,bombchu,shield3,firearrow,[hookshot],hoverboots" ], "chest_unopened_img": "images/chest_golden_closed.png", "chest_opened_img": "images/chest_golden_open.png", diff --git a/ootrando_overworldmap_hamsda/locations/dung_reg_keys.json b/ootrando_overworldmap_hamsda/locations/dung_reg_keys.json index b7d19832..de62e832 100644 --- a/ootrando_overworldmap_hamsda/locations/dung_reg_keys.json +++ b/ootrando_overworldmap_hamsda/locations/dung_reg_keys.json @@ -519,15 +519,11 @@ "name": "Boss Key Chest", "short_name": "Boss Key", "access_rules": [ - "ironboots,longshot,hoverboots", "ironboots,longshot,$has_explosives,lift1", "ironboots,longshot,[hoverboots]", - "ironboots,longshot,[$has_explosives],[lift1]", - "ironboots,hoverboots,[longshot]", - "[ironboots],longshot,ocarina,lullaby,hoverboots", + "ironboots,[longshot],hoverboots", "[ironboots],longshot,ocarina,lullaby,$has_explosives,lift1", "[ironboots],longshot,ocarina,lullaby,[hoverboots]", - "[ironboots],longshot,ocarina,lulla0by,[$has_explosives],[lift1]", "{$hintable}" ], "capture_item": true, @@ -602,6 +598,7 @@ "short_name": "Platform Room", "access_rules": [ "longshot", + "[longshot],hookshot", "{bow}" ], "capture_item": true, @@ -614,8 +611,8 @@ "short_name": "Near Boss Key", "access_rules": [ "ironboots,longshot", - "[ironboots],longshot,ocarina,lullaby", - "ironboots,[longshot],hoverboots" + "ironboots,[longshot],hoverboots", + "[ironboots],longshot,ocarina,lullaby" ], "chest_unopened_img": "images/skulltula.png", "chest_opened_img": "images/skulltula_token.png", @@ -760,8 +757,8 @@ { "name": "Bongo Bongo", "access_rules": [ - "@Shadow Temple/Wind Hint Chest,ocarina,lullaby,bow", "@Shadow Temple/Wind Hint Chest,ocarina,lullaby,longshot,ocarina,[scarecrow]", + "@Shadow Temple/Wind Hint Chest,ocarina,lullaby,bow", "@Shadow Temple/Wind Hint Chest,ocarina,lullaby,bombchu,[bow]" ], "hosted_item": "shadow", diff --git a/ootrando_overworldmap_hamsda/locations/overworld.json b/ootrando_overworldmap_hamsda/locations/overworld.json index e31e254d..c9a88857 100644 --- a/ootrando_overworldmap_hamsda/locations/overworld.json +++ b/ootrando_overworldmap_hamsda/locations/overworld.json @@ -3752,8 +3752,7 @@ "ocarina,bolero,sword2,bean_crater_yes", "ocarina,bolero,sword2,hookshot", "ocarina,bolero,sword2,hoverboots", - "sword2,lift1", - "sword2,bow", + "$link_the_goron", "{ocarina,bolero}" ], "capture_item": true, @@ -3786,10 +3785,10 @@ "sword2,ocarina,bolero,bean_crater_yes", "sword2,ocarina,bolero,hoverboots,[setting_plant_no],[beans]", "sword2,ocarina,bolero,hoverboots,[bean_crater_yes]", - "$link_the_goron,hoverboots,[ocarina],[bolero],[setting_plant_no],[beans]", - "$link_the_goron,hoverboots,[ocarina],[bolero],[bean_crater_yes]", "sword2,hammer,hoverboots,[ocarina],[bolero],[setting_plant_no],[beans]", "sword2,hammer,hoverboots,[ocarina],[bolero],[bean_crater_yes]", + "$link_the_goron,hoverboots,[ocarina],[bolero],[setting_plant_no],[beans]", + "$link_the_goron,hoverboots,[ocarina],[bolero],[bean_crater_yes]", "{$hintable}", "{ocarina,bolero}", "{$link_the_goron}", @@ -3822,7 +3821,8 @@ "ocarina,bolero,hookshot", "ocarina,bolero,setting_plant_no,beans", "ocarina,bolero,bean_crater_yes", - "hoverboots" + "hoverboots", + "[]" ], "item_count": 1 } @@ -3849,7 +3849,8 @@ "ocarina,bolero,hookshot", "ocarina,bolero,setting_plant_no,beans", "ocarina,bolero,bean_crater_yes", - "hoverboots" + "hoverboots", + "[]" ], "visibility_rules": [ "setting_scrub_shuffle_yes" diff --git a/ootrando_overworldmap_hamsda/manifest.json b/ootrando_overworldmap_hamsda/manifest.json index ea3b2627..eff30168 100644 --- a/ootrando_overworldmap_hamsda/manifest.json +++ b/ootrando_overworldmap_hamsda/manifest.json @@ -1,7 +1,7 @@ { "name": "OoT Randomizer - Map and Item Tracker", "game_name": "Ocarina of Time Randomizer", - "package_version": "2.4.0.2", + "package_version": "2.4.1.0", "package_uid": "ootrando_overworldmap_hamsda", "author": "Hamsda", "variants": { diff --git a/ootrando_overworldmap_hamsda/scripts/logic.lua b/ootrando_overworldmap_hamsda/scripts/logic.lua index 6de8fd2d..6ba7e050 100644 --- a/ootrando_overworldmap_hamsda/scripts/logic.lua +++ b/ootrando_overworldmap_hamsda/scripts/logic.lua @@ -205,16 +205,17 @@ end function link_the_goron() if has("sword2") then - if - ( - has("lift1") - or - has("bow") - ) + if has("lift1") + or has("bow") then - return 1 + return 1, AccessibilityLevel.Normal else - return has_explosives() + local explo_count, explo_level = has_explosives() + if explo_count > 0 then + return explo_count, explo_level + elseif has("dinsfire") and has("magic") then + return 1, AccessibilityLevel.SequenceBreak + end end end return 0 @@ -222,15 +223,22 @@ end function dmc_central() if has("sword2") then - if - has("ocarina") and has("bolero") - or - has("hammer") and has("hoverboots") - then - return 1 + if has("ocarina") and has("bolero") then + return 1, AccessibilityLevel.Normal else - if has("hoverboots") or has("hookshot") then - return link_the_goron() + local goron_count, goron_level = link_the_goron() + if has("hoverboots") then + if has("hammer") then + return 1, AccessibilityLevel.Normal + else + return goron_count, goron_level + end + elseif has("hookshot") then + if goron_count > 0 then + return goron_count, goron_level + elseif has("hammer") then + return 1, AccessibilityLevel.SequenceBreak + end end end end diff --git a/ootrando_overworldmap_hamsda/var_entrance/items/cap_grottos.json b/ootrando_overworldmap_hamsda/var_entrance/items/cap_grottos.json index cb13daf0..a225f3fc 100644 --- a/ootrando_overworldmap_hamsda/var_entrance/items/cap_grottos.json +++ b/ootrando_overworldmap_hamsda/var_entrance/items/cap_grottos.json @@ -1,16 +1,16 @@ [ - { - "name": "Cow", - "type": "toggle", - "img": "images/entrance_grotto_cow.png", - "codes": "entrance_grotto_cow" - }, { "name": "Scrub", "type": "toggle", "img": "images/entrance_grotto_scrub.png", "codes": "entrance_grotto_scrub" }, + { + "name": "Cow", + "type": "toggle", + "img": "images/entrance_grotto_cow.png", + "codes": "entrance_grotto_cow" + }, { "name": "Deku Theater", "type": "toggle", @@ -18,10 +18,22 @@ "codes": "entrance_grotto_theater" }, { - "name": "Kakariko Bombable Grotto", + "name": "Composer Grave", "type": "toggle", - "img": "images/entrance_grotto_kak_bomb.png", - "codes": "entrance_grotto_kak_bomb" + "img": "images/entrance_grotto_comp.png", + "codes": "entrance_grotto_comp" + }, + { + "name": "Dampes Grave", + "type": "toggle", + "img": "images/entrance_grotto_dampe.png", + "codes": "entrance_grotto_dampe" + }, + { + "name": "Heart Piece Grave", + "type": "toggle", + "img": "images/entrance_grotto_hp.png", + "codes": "entrance_grotto_hp" }, { "name": "Front of Meadow Grotto", @@ -29,6 +41,12 @@ "img": "images/entrance_grotto_wolfos.png", "codes": "entrance_grotto_wolfos" }, + { + "name": "Field North Lon Lon Grotto", + "type": "toggle", + "img": "images/entrance_grotto_tektite.png", + "codes": "entrance_grotto_tektite" + }, { "name": "Castle Storms Grotto", "type": "toggle", @@ -36,16 +54,16 @@ "codes": "entrance_grotto_castle_storms" }, { - "name": "Field Kakariko Grotto", + "name": "Kakariko Bombable Grotto", "type": "toggle", - "img": "images/entrance_grotto_field_kak.png", - "codes": "entrance_grotto_field_kak" + "img": "images/entrance_grotto_kak_bomb.png", + "codes": "entrance_grotto_kak_bomb" }, { - "name": "Field North Lon Lon Grotto", + "name": "Field Kakariko Grotto", "type": "toggle", - "img": "images/entrance_grotto_tektite.png", - "codes": "entrance_grotto_tektite" + "img": "images/entrance_grotto_field_kak.png", + "codes": "entrance_grotto_field_kak" }, { "name": "Field Valley Grotto", diff --git a/ootrando_overworldmap_hamsda/var_entrance/items/cap_houses.json b/ootrando_overworldmap_hamsda/var_entrance/items/cap_houses.json index fd3f9166..9f9a1cb2 100644 --- a/ootrando_overworldmap_hamsda/var_entrance/items/cap_houses.json +++ b/ootrando_overworldmap_hamsda/var_entrance/items/cap_houses.json @@ -6,16 +6,22 @@ "codes": "entrance_house_shop" }, { - "name": "Bombchu Bowling", + "name": "Great Fairy", "type": "toggle", - "img": "images/entrance_house_bowling.png", - "codes": "entrance_house_bowling" + "img": "images/entrance_house_fairy.png", + "codes": "entrance_house_fairy" }, { - "name": "Mask Shop", + "name": "Links House", "type": "toggle", - "img": "images/entrance_house_masks.png", - "codes": "entrance_house_masks" + "img": "images/entrance_house_link.png", + "codes": "entrance_house_link" + }, + { + "name": "Temple of Time", + "type": "toggle", + "img": "images/entrance_house_tot.png", + "codes": "entrance_house_tot" }, { "name": "Child Shooting Gallery", @@ -29,6 +35,12 @@ "img": "images/entrance_house_shoot_adult.png", "codes": "entrance_house_shoot_adult" }, + { + "name": "Fishing Hole", + "type": "toggle", + "img": "images/entrance_house_fishing.png", + "codes": "entrance_house_fishing" + }, { "name": "Treasure Chest Game", "type": "toggle", @@ -36,46 +48,46 @@ "codes": "entrance_house_chest" }, { - "name": "Castle Town Rupee Room", + "name": "Cow", "type": "toggle", - "img": "images/entrance_house_pot.png", - "codes": "entrance_house_pot" + "img": "images/entrance_grotto_cow.png", + "codes": "entrance_house_cow" }, { - "name": "Great Fairy", + "name": "Bombchu Bowling", "type": "toggle", - "img": "images/entrance_house_fairy.png", - "codes": "entrance_house_fairy" + "img": "images/entrance_house_bowling.png", + "codes": "entrance_house_bowling" }, { - "name": "House of Skulltula", + "name": "Mask Shop", "type": "toggle", - "img": "images/entrance_house_skull.png", - "codes": "entrance_house_skull" + "img": "images/entrance_house_masks.png", + "codes": "entrance_house_masks" }, { - "name": "Cow", + "name": "Talon House", "type": "toggle", - "img": "images/entrance_grotto_cow.png", - "codes": "entrance_house_cow" + "img": "images/entrance_house_talon.png", + "codes": "entrance_house_talon" }, { - "name": "Windmill", + "name": "House of Skulltula", "type": "toggle", - "img": "images/entrance_house_windmill.png", - "codes": "entrance_house_windmill" + "img": "images/entrance_house_skull.png", + "codes": "entrance_house_skull" }, { - "name": "Links House", + "name": "Windmill", "type": "toggle", - "img": "images/entrance_house_link.png", - "codes": "entrance_house_link" + "img": "images/entrance_house_windmill.png", + "codes": "entrance_house_windmill" }, { - "name": "Fishing Hole", + "name": "Castle Town Rupee Room", "type": "toggle", - "img": "images/entrance_house_fishing.png", - "codes": "entrance_house_fishing" + "img": "images/entrance_house_pot.png", + "codes": "entrance_house_pot" }, { "name": "Lake Hylia Lab", @@ -83,16 +95,4 @@ "img": "images/entrance_house_lab.png", "codes": "entrance_house_lab" }, - { - "name": "Talon House", - "type": "toggle", - "img": "images/entrance_house_talon.png", - "codes": "entrance_house_talon" - }, - { - "name": "Temple of Time", - "type": "toggle", - "img": "images/entrance_house_tot.png", - "codes": "entrance_house_tot" - }, ] \ No newline at end of file diff --git a/ootrando_overworldmap_hamsda/var_entrance/items/cap_overworld.json b/ootrando_overworldmap_hamsda/var_entrance/items/cap_overworld.json index 6c77c012..201bfe08 100644 --- a/ootrando_overworldmap_hamsda/var_entrance/items/cap_overworld.json +++ b/ootrando_overworldmap_hamsda/var_entrance/items/cap_overworld.json @@ -1,4 +1,28 @@ [ + { + "name": "Kokiri Forest", + "type": "toggle", + "img": "images/entrance_overworld_kf.png", + "codes": "entrance_overworld_kf" + }, + { + "name": "Lost Woods", + "type": "toggle", + "img": "images/entrance_overworld_lw.png", + "codes": "entrance_overworld_lw" + }, + { + "name": "Lost Woods Bridge", + "type": "toggle", + "img": "images/entrance_overworld_bridge.png", + "codes": "entrance_overworld_bridge" + }, + { + "name": "Sacred Forest Meadow", + "type": "toggle", + "img": "images/entrance_overworld_sfm.png", + "codes": "entrance_overworld_sfm" + }, { "name": "Castle Grounds", "type": "toggle", @@ -24,40 +48,22 @@ "codes": "entrance_overworld_tot" }, { - "name": "Death Mountain Trail", - "type": "toggle", - "img": "images/entrance_overworld_dmt.png", - "codes": "entrance_overworld_dmt" - }, - { - "name": "Death Mountain Crater", - "type": "toggle", - "img": "images/entrance_overworld_dmc.png", - "codes": "entrance_overworld_dmc" - }, - { - "name": "Desert Colossus", - "type": "toggle", - "img": "images/entrance_overworld_col.png", - "codes": "entrance_overworld_col" - }, - { - "name": "Gerudo Fortress", + "name": "Hyrule Field", "type": "toggle", - "img": "images/entrance_overworld_gf.png", - "codes": "entrance_overworld_gf" + "img": "images/entrance_overworld_hf.png", + "codes": "entrance_overworld_hf" }, { - "name": "Gerudo Valley", + "name": "Lon Lon Ranch", "type": "toggle", - "img": "images/entrance_overworld_gv.png", - "codes": "entrance_overworld_gv" + "img": "images/entrance_overworld_llr.png", + "codes": "entrance_overworld_llr" }, { - "name": "Goron City", + "name": "Kakariko Village", "type": "toggle", - "img": "images/entrance_overworld_gc.png", - "codes": "entrance_overworld_gc" + "img": "images/entrance_overworld_kak.png", + "codes": "entrance_overworld_kak" }, { "name": "Graveyard", @@ -66,75 +72,69 @@ "codes": "entrance_overworld_gy" }, { - "name": "Haunted Wasteland", - "type": "toggle", - "img": "images/entrance_overworld_wl.png", - "codes": "entrance_overworld_wl" - }, - { - "name": "Hyrule Field", + "name": "Lake Hylia", "type": "toggle", - "img": "images/entrance_overworld_hf.png", - "codes": "entrance_overworld_hf" + "img": "images/entrance_overworld_lh.png", + "codes": "entrance_overworld_lh" }, { - "name": "Kakariko Village", + "name": "Zora River", "type": "toggle", - "img": "images/entrance_overworld_kak.png", - "codes": "entrance_overworld_kak" + "img": "images/entrance_overworld_zr.png", + "codes": "entrance_overworld_zr" }, { - "name": "Kokiri Forest", + "name": "Zoras Domain", "type": "toggle", - "img": "images/entrance_overworld_kf.png", - "codes": "entrance_overworld_kf" + "img": "images/entrance_overworld_zd.png", + "codes": "entrance_overworld_zd" }, { - "name": "Lake Hylia", + "name": "Zoras Fountain", "type": "toggle", - "img": "images/entrance_overworld_lh.png", - "codes": "entrance_overworld_lh" + "img": "images/entrance_overworld_zf.png", + "codes": "entrance_overworld_zf" }, { - "name": "Lon Lon Ranch", + "name": "Desert Colossus", "type": "toggle", - "img": "images/entrance_overworld_llr.png", - "codes": "entrance_overworld_llr" + "img": "images/entrance_overworld_col.png", + "codes": "entrance_overworld_col" }, { - "name": "Lost Woods", + "name": "Haunted Wasteland", "type": "toggle", - "img": "images/entrance_overworld_lw.png", - "codes": "entrance_overworld_lw" + "img": "images/entrance_overworld_wl.png", + "codes": "entrance_overworld_wl" }, { - "name": "Lost Woods Bridge", + "name": "Gerudo Fortress", "type": "toggle", - "img": "images/entrance_overworld_bridge.png", - "codes": "entrance_overworld_bridge" + "img": "images/entrance_overworld_gf.png", + "codes": "entrance_overworld_gf" }, { - "name": "Sacred Forest Meadow", + "name": "Gerudo Valley", "type": "toggle", - "img": "images/entrance_overworld_sfm.png", - "codes": "entrance_overworld_sfm" + "img": "images/entrance_overworld_gv.png", + "codes": "entrance_overworld_gv" }, { - "name": "Zora River", + "name": "Death Mountain Trail", "type": "toggle", - "img": "images/entrance_overworld_zr.png", - "codes": "entrance_overworld_zr" + "img": "images/entrance_overworld_dmt.png", + "codes": "entrance_overworld_dmt" }, { - "name": "Zora River", + "name": "Death Mountain Crater", "type": "toggle", - "img": "images/entrance_overworld_zd.png", - "codes": "entrance_overworld_zd" + "img": "images/entrance_overworld_dmc.png", + "codes": "entrance_overworld_dmc" }, { - "name": "Zoras Fountain", + "name": "Goron City", "type": "toggle", - "img": "images/entrance_overworld_zf.png", - "codes": "entrance_overworld_zf" + "img": "images/entrance_overworld_gc.png", + "codes": "entrance_overworld_gc" }, ] \ No newline at end of file diff --git a/ootrando_overworldmap_hamsda/var_entrance/layouts/capture.json b/ootrando_overworldmap_hamsda/var_entrance/layouts/capture.json index ace42fb7..3b01ab88 100644 --- a/ootrando_overworldmap_hamsda/var_entrance/layouts/capture.json +++ b/ootrando_overworldmap_hamsda/var_entrance/layouts/capture.json @@ -24,6 +24,11 @@ "entrance_grotto_cow", "entrance_grotto_theater", ], + [ + "entrance_grotto_comp", + "entrance_grotto_dampe", + "entrance_grotto_hp", + ], [ "entrance_grotto_wolfos", "entrance_grotto_tektite", diff --git a/ootrando_overworldmap_hamsda/var_entrance/locations/overworld.json b/ootrando_overworldmap_hamsda/var_entrance/locations/overworld.json index f7327ac0..30fce8b2 100644 --- a/ootrando_overworldmap_hamsda/var_entrance/locations/overworld.json +++ b/ootrando_overworldmap_hamsda/var_entrance/locations/overworld.json @@ -1619,6 +1619,112 @@ "name": "Graveyard", "color": "#6909a0", "children": [ + { + "name": "Graveyard -> Composer Grave", + "short_name": "Composer Grave", + "access_rules": [ + "setting_entrance_indoors" + ], + "sections": [ + { + "name": "Grotto", + "access_rules": [ + "ocarina,lullaby" + ], + "capture_item": true, + "capture_item_layout": "tracker_capture_grottos", + "item_count": 1 + } + ], + "map_locations": [ + { + "map": "child", + "x": 2099, + "y": 353 + }, + { + "map": "adult", + "x": 2099, + "y": 353 + } + ] + }, + { + "name": "Graveyard -> Dampes Grave", + "short_name": "Dampes Grave", + "access_rules": [ + "setting_entrance_indoors" + ], + "sections": [ + { + "name": "Grotto", + "capture_item": true, + "capture_item_layout": "tracker_capture_grottos", + "item_count": 1 + } + ], + "map_locations": [ + { + "map": "adult", + "x": 2030, + "y": 342 + } + ] + }, + { + "name": "Graveyard -> Heart Piece Grave", + "short_name": "Heart Piece Grave", + "access_rules": [ + "setting_entrance_indoors" + ], + "sections": [ + { + "name": "Grotto", + "capture_item": true, + "capture_item_layout": "tracker_capture_grottos", + "item_count": 1 + } + ], + "map_locations": [ + { + "map": "child", + "x": 2065, + "y": 350 + }, + { + "map": "adult", + "x": 2065, + "y": 350 + } + ] + }, + { + "name": "Graveyard -> Shield Grave", + "short_name": "Shield Grave", + "access_rules": [ + "setting_entrance_indoors" + ], + "sections": [ + { + "name": "Grotto", + "capture_item": true, + "capture_item_layout": "tracker_capture_grottos", + "item_count": 1 + } + ], + "map_locations": [ + { + "map": "child", + "x": 2030, + "y": 372 + }, + { + "map": "adult", + "x": 2030, + "y": 372 + } + ] + }, { "name": "Graveyard -> Dampes House", "short_name": "Dampes House", @@ -1636,13 +1742,13 @@ "map_locations": [ { "map": "child", - "x": 2044, - "y": 376 + "x": 2020, + "y": 402 }, { "map": "adult", - "x": 2044, - "y": 376 + "x": 2020, + "y": 402 } ] }, @@ -2674,6 +2780,11 @@ } ], "map_locations": [ + { + "map": "child", + "x": 1646, + "y": 90 + }, { "map": "adult", "x": 1646, diff --git a/ootrando_overworldmap_hamsda/var_keysanity/locations/dung_mq_keys.json b/ootrando_overworldmap_hamsda/var_keysanity/locations/dung_mq_keys.json index f5664590..6c699d5f 100644 --- a/ootrando_overworldmap_hamsda/var_keysanity/locations/dung_mq_keys.json +++ b/ootrando_overworldmap_hamsda/var_keysanity/locations/dung_mq_keys.json @@ -106,7 +106,8 @@ "access_rules": [ "forest_small_keys:1,bow,longshot", "@Forest Temple MQ/Redead Chest,longshot", - "@Forest Temple MQ/Falling Room Chest" + "@Forest Temple MQ/Falling Room Chest", + "@Forest Temple MQ/NE Outdoors Upper Chest,hoverboots,[longshot]" ], "item_count": 1 }, @@ -265,7 +266,7 @@ "name": "Big Lava Room Bombable Chest", "short_name": "Lava Room Bombable", "access_rules": [ - "hammer,hookshot,$has_fire,$has_explosives" + "hammer,[hookshot],$has_fire,$has_explosives" ], "item_count": 1 }, @@ -376,7 +377,7 @@ "short_name": "Fire Maze Side", "access_rules": [ "@Fire Temple MQ/Freestanding Key,ocarina,time", - "@Fire Temple MQ/Freestanding Key,hoverboots" + "@Fire Temple MQ/Freestanding Key,[hoverboots]" ], "chest_unopened_img": "images/skulltula.png", "chest_opened_img": "images/skulltula_token.png", @@ -808,7 +809,8 @@ "name": "GS85 - Near Boss", "short_name": "Near Boss", "access_rules": [ - "@Shadow Temple MQ Skulltulas/GS84 - After Ship,bow" + "@Shadow Temple MQ Skulltulas/GS84 - After Ship,bow", + "@Shadow Temple MQ Skulltulas/GS84 - After Ship,bombchu,[bow]" ], "chest_unopened_img": "images/skulltula.png", "chest_opened_img": "images/skulltula_token.png", @@ -1365,7 +1367,7 @@ "name": "Castle Tower", "access_rules": [ "gc_small_keys:3,$can_LA,lift3,ocarina,time,$has_goron_tunic,$has_bottle,$can_see_with_lens,hammer,bombchu,shield3,firearrow,longshot", - "gc_small_keys:3,$can_LA,lift3,ocarina,time,$has_goron_tunic,$has_bottle,$can_see_with_lens,hammer,bombchu,shield3,firearrow,hookshot,hoverboots" + "gc_small_keys:3,$can_LA,lift3,ocarina,time,$has_goron_tunic,$has_bottle,$can_see_with_lens,hammer,bombchu,shield3,firearrow,[hookshot],hoverboots" ], "chest_unopened_img": "images/chest_golden_closed.png", "chest_opened_img": "images/chest_golden_open.png", diff --git a/ootrando_overworldmap_hamsda/var_keysanity/locations/dung_reg_keys.json b/ootrando_overworldmap_hamsda/var_keysanity/locations/dung_reg_keys.json index c82b1c56..bad89f40 100644 --- a/ootrando_overworldmap_hamsda/var_keysanity/locations/dung_reg_keys.json +++ b/ootrando_overworldmap_hamsda/var_keysanity/locations/dung_reg_keys.json @@ -537,15 +537,11 @@ "name": "Boss Key Chest", "short_name": "Boss Key", "access_rules": [ - "water_small_keys:2,[water_small_keys:6],ironboots,longshot,hoverboots", "water_small_keys:2,[water_small_keys:6],ironboots,longshot,$has_explosives,lift1", "water_small_keys:2,[water_small_keys:6],ironboots,longshot,[hoverboots]", - "water_small_keys:2,[water_small_keys:6],ironboots,longshot,[$has_explosives],[lift1]", - "water_small_keys:2,[water_small_keys:6],ironboots,hoverboots,[longshot]", - "water_small_keys:2,[water_small_keys:6],[ironboots],longshot,ocarina,lullaby,hoverboots", + "water_small_keys:2,[water_small_keys:6],ironboots,[longshot],hoverboots", "water_small_keys:2,[water_small_keys:6],[ironboots],longshot,ocarina,lullaby,$has_explosives,lift1", "water_small_keys:2,[water_small_keys:6],[ironboots],longshot,ocarina,lullaby,[hoverboots]", - "water_small_keys:2,[water_small_keys:6],[ironboots],longshot,ocarina,lullaby,[$has_explosives],[lift1]", "{$hintable}" ], "capture_item": true, @@ -624,6 +620,7 @@ "short_name": "Platform Room", "access_rules": [ "water_small_keys:1,[water_small_keys:5],longshot", + "water_small_keys:1,[water_small_keys:5],[longshot],hookshot", "{water_small_keys:1,bow}" ], "capture_item": true, @@ -636,8 +633,8 @@ "short_name": "Near Boss Key", "access_rules": [ "water_small_keys:1,[water_small_keys:5],ironboots,longshot", - "water_small_keys:1,[water_small_keys:5],[ironboots],longshot,ocarina,lullaby", - "water_small_keys:1,[water_small_keys:5],ironboots,[longshot],hoverboots" + "water_small_keys:1,[water_small_keys:5],ironboots,[longshot],hoverboots", + "water_small_keys:1,[water_small_keys:5],[ironboots],longshot,ocarina,lullaby" ], "chest_unopened_img": "images/skulltula.png", "chest_opened_img": "images/skulltula_token.png", @@ -782,8 +779,8 @@ { "name": "Bongo Bongo", "access_rules": [ - "@Shadow Temple/Wind Hint Chest,ocarina,lullaby,shadow_boss_key,shadow_small_keys:5,bow", "@Shadow Temple/Wind Hint Chest,ocarina,lullaby,shadow_boss_key,shadow_small_keys:5,longshot,ocarina,[scarecrow]", + "@Shadow Temple/Wind Hint Chest,ocarina,lullaby,shadow_boss_key,shadow_small_keys:5,bow", "@Shadow Temple/Wind Hint Chest,ocarina,lullaby,shadow_boss_key,shadow_small_keys:5,bombchu,[bow]" ], "hosted_item": "shadow", diff --git a/repository.json b/repository.json index 0b745d9b..e30520ce 100644 --- a/repository.json +++ b/repository.json @@ -10,7 +10,7 @@ "pins", "chathud" ], - "version": "2.4.0.2", + "version": "2.4.1.0", "uid": "ootrando_overworldmap_hamsda", "link": "https://hamsda.github.io/OoTRMapTracker/ootrando_overworldmap_hamsda.zip", "variants": [