diff --git a/changelog.md b/changelog.md index 513ca271..f06287ac 100644 --- a/changelog.md +++ b/changelog.md @@ -1,5 +1,16 @@ # Changelog +## 2.2.0.2 + +- fixed MQ Fire Temple GS68 key requirement and capture +- recent accessible changes: + - added Shadow Temple falling spikes upper sequence break for strength + - added Shadow Temple entrance with fire arrows sequence break + - added royal tomb torches sequence break for fire + - added GTG sequence break for hookshot + - removed Gerudo Valley bridge crossing sequence break with hookshot +- added Shadow Temple Bongo sequence break with chus (I only added it to MQ oops) + ## 2.2.0.1 - fixed a few capture locations that were missing a `"capture_item": true` oops diff --git a/ootrando_overworldmap_hamsda.zip b/ootrando_overworldmap_hamsda.zip index 155e0f3b..20788d09 100644 Binary files a/ootrando_overworldmap_hamsda.zip and b/ootrando_overworldmap_hamsda.zip differ diff --git a/ootrando_overworldmap_hamsda/layouts/shared.json b/ootrando_overworldmap_hamsda/layouts/shared.json index 36ce18ca..c63adac2 100644 --- a/ootrando_overworldmap_hamsda/layouts/shared.json +++ b/ootrando_overworldmap_hamsda/layouts/shared.json @@ -60,8 +60,8 @@ "wallet1", "magic", "card", - "icetrap", "agony", + "icetrap", "skulltula" ], [ @@ -397,8 +397,8 @@ "nocturnecheck", "preludecheck", "card", - "icetrap", - "agony" + "agony", + "icetrap" ] ] }, diff --git a/ootrando_overworldmap_hamsda/locations/dungeons.json b/ootrando_overworldmap_hamsda/locations/dungeons.json index 7c0885f2..6214a992 100644 --- a/ootrando_overworldmap_hamsda/locations/dungeons.json +++ b/ootrando_overworldmap_hamsda/locations/dungeons.json @@ -1009,7 +1009,9 @@ "parent": "Kakariko A", "access_rules": [ "shadow_reg,ocarina,nocturne,dinsfire,magic,$can_see_with_lens,sword2,hoverboots", - "shadow_reg,ocarina,nocturne,dinsfire,magic,$can_see_with_lens,sword2,hookshot" + "shadow_reg,ocarina,nocturne,dinsfire,magic,$can_see_with_lens,sword2,hookshot", + "shadow_reg,ocarina,nocturne,bow,firearrow,[dinsfire],magic,$can_see_with_lens,sword2,hoverboots", + "shadow_reg,ocarina,nocturne,bow,firearrow,[dinsfire],magic,$can_see_with_lens,sword2,hookshot" ], "sections": [ { @@ -1052,7 +1054,7 @@ { "name": "Falling Spikes Upper", "access_rules": [ - "@Shadow Temple/Like-Like Room,lift1" + "@Shadow Temple/Like-Like Room,[lift1]" ], "item_count": 2 }, @@ -1090,14 +1092,14 @@ { "name": "Boss Key Room", "access_rules": [ - "@Shadow Temple/After Wind Room,ocarina,lullaby" + "@Shadow Temple/After Wind Room,ocarina,lullaby,dinsfire,magic" ], "item_count": 1 }, { "name": "Boss Key Chest", "access_rules": [ - "@Shadow Temple/After Wind Room,ocarina,lullaby" + "@Shadow Temple/Boss Key Room" ], "chest_unopened_img": "images/chest_golden_closed.png", "chest_opened_img": "images/chest_golden_open.png", @@ -1115,8 +1117,10 @@ { "name": "Bongo Bongo", "access_rules": [ - "@Shadow Temple/Boss Key Room,bow", - "@Shadow Temple/Boss Key Room,longshot,ocarina,[scarecrow]" + "@Shadow Temple/After Wind Room,ocarina,lullaby,bow", + "@Shadow Temple/After Wind Room,ocarina,lullaby,longshot,ocarina,[scarecrow]", + "@Shadow Temple/After Wind Room,ocarina,lullaby,bombchu,[bow]", + "@Shadow Temple/After Wind Room,ocarina,lullaby,bombchu,[longshot],[ocarina],[scarecrow]" ], "hosted_item": "shadow", "chest_unopened_img": "images/HC.png", @@ -1842,14 +1846,16 @@ { "name": "Wolfos", "access_rules": [ - "hookshot" + "[hookshot]" ], "item_count": 1 }, { "name": "Like-Like", "access_rules": [ - "hookshot,lift2,$can_see_with_lens" + "hookshot,lift2,$can_see_with_lens", + "bombs,shield2,[hookshot],lift2,$can_see_with_lens", + "bombs,shield3,[hookshot],lift2,$can_see_with_lens" ], "item_count": 4 }, @@ -1857,6 +1863,8 @@ "name": "Eye Statue", "access_rules": [ "hookshot,bow,$can_see_with_lens", + "bombs,shield2,[hookshot],bow,$can_see_with_lens", + "bombs,shield3,[hookshot],bow,$can_see_with_lens", "hookshot,hammer,bow" ], "item_count": 1 @@ -1864,21 +1872,27 @@ { "name": "Near Scarecrow", "access_rules": [ - "hookshot,bow,$can_see_with_lens" + "hookshot,bow,$can_see_with_lens", + "bombs,shield2,[hookshot],bow,$can_see_with_lens", + "bombs,shield3,[hookshot],bow,$can_see_with_lens" ], "item_count": 1 }, { "name": "Flaming Enemies", "access_rules": [ - "hookshot" + "hookshot", + "bombs,shield2,[hookshot],$can_see_with_lens", + "bombs,shield3,[hookshot],$can_see_with_lens" ], "item_count": 1 }, { "name": "Hammer Pillar", "access_rules": [ - "hookshot,[hammer]" + "hookshot,[hammer]", + "bombs,shield2,[hookshot],[hammer],$can_see_with_lens", + "bombs,shield3,[hookshot],[hammer],$can_see_with_lens" ], "item_count": 1 }, diff --git a/ootrando_overworldmap_hamsda/locations/mq.json b/ootrando_overworldmap_hamsda/locations/mq.json index 4ffd6563..71a3a05d 100644 --- a/ootrando_overworldmap_hamsda/locations/mq.json +++ b/ootrando_overworldmap_hamsda/locations/mq.json @@ -921,7 +921,7 @@ "name": "GS68 - Above Fire Wall Maze", "short_name": "Above Fire Wall Maze", "access_rules": [ - "@Fire Temple MQ/West Tower Top Chest" + "@Fire Temple MQ/Freestanding Key" ], "chest_unopened_img": "images/skulltula.png", "chest_opened_img": "images/skulltula_token.png", @@ -1102,7 +1102,9 @@ "parent": "Kakariko A", "access_rules": [ "shadow_mq,ocarina,nocturne,dinsfire,magic,$can_see_with_lens,sword2,hoverboots", - "shadow_mq,ocarina,nocturne,dinsfire,magic,$can_see_with_lens,sword2,hookshot" + "shadow_mq,ocarina,nocturne,dinsfire,magic,$can_see_with_lens,sword2,hookshot", + "shadow_mq,ocarina,nocturne,bow,firearrow,[dinsfire],magic,$can_see_with_lens,sword2,hoverboots", + "shadow_mq,ocarina,nocturne,bow,firearrow,[dinsfire],magic,$can_see_with_lens,sword2,hookshot" ], "sections": [ { @@ -1151,7 +1153,7 @@ { "name": "Falling Spikes Upper Chest", "access_rules": [ - "@Shadow Temple MQ/Falling Spikes Lower Chest,lift1" + "@Shadow Temple MQ/Falling Spikes Lower Chest,[lift1]" ], "item_count": 1 }, @@ -1240,7 +1242,7 @@ { "name": "Spike Walls Left Chest", "access_rules": [ - "@Shadow Temple MQ/Freestanding Key" + "@Shadow Temple MQ/Freestanding Key,dinsfire,magic" ], "item_count": 1 }, @@ -1514,9 +1516,7 @@ "name": "Silver Gauntlets Chest", "access_rules": [ "sword2,lift2,longshot,bombchu", - "sword2,lift2,longshot,bombchu,ocarina,time,$can_see_with_lens", - "ocarina,requiem,bombchu,time", - "ocarina,requiem,bombchu,time,$can_see_with_lens" //TODO + "ocarina,requiem,bombchu,time" ], "item_count": 1 }, diff --git a/ootrando_overworldmap_hamsda/locations/overworld.json b/ootrando_overworldmap_hamsda/locations/overworld.json index b38bfafc..c6418eb7 100644 --- a/ootrando_overworldmap_hamsda/locations/overworld.json +++ b/ootrando_overworldmap_hamsda/locations/overworld.json @@ -1796,6 +1796,7 @@ "name": "Torches", "access_rules": [ "$has_fire", + "sticks,[$has_fire]", "{agony}" ], "capture_item": true, @@ -4772,8 +4773,7 @@ "carpenter_rescue_yes", "gerudo_fortress_open", "ocarina,epona", - "longshot", - "hookshot,[longshot]" + "longshot" ], "children": [ { diff --git a/ootrando_overworldmap_hamsda/manifest.json b/ootrando_overworldmap_hamsda/manifest.json index 8ea314c5..e861a819 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.2.0.1", + "package_version": "2.2.0.2", "package_uid": "ootrando_overworldmap_hamsda", "author": "Hamsda", "variants": { diff --git a/ootrando_overworldmap_hamsda/var_keysanity/layouts/shared.json b/ootrando_overworldmap_hamsda/var_keysanity/layouts/shared.json index 4894e451..5dd9bcf1 100644 --- a/ootrando_overworldmap_hamsda/var_keysanity/layouts/shared.json +++ b/ootrando_overworldmap_hamsda/var_keysanity/layouts/shared.json @@ -60,8 +60,8 @@ "wallet1", "magic", "card", - "icetrap", "agony", + "icetrap", "skulltula" ], [ @@ -560,8 +560,8 @@ "nocturnecheck", "preludecheck", "card", - "icetrap", - "agony" + "agony", + "icetrap" ] ] }, diff --git a/ootrando_overworldmap_hamsda/var_keysanity/locations/dungeons.json b/ootrando_overworldmap_hamsda/var_keysanity/locations/dungeons.json index 7b024d8e..0a57aa26 100644 --- a/ootrando_overworldmap_hamsda/var_keysanity/locations/dungeons.json +++ b/ootrando_overworldmap_hamsda/var_keysanity/locations/dungeons.json @@ -1026,7 +1026,9 @@ "parent": "Kakariko A", "access_rules": [ "shadow_reg,ocarina,nocturne,dinsfire,magic,$can_see_with_lens,sword2,hoverboots", - "shadow_reg,ocarina,nocturne,dinsfire,magic,$can_see_with_lens,sword2,hookshot" + "shadow_reg,ocarina,nocturne,dinsfire,magic,$can_see_with_lens,sword2,hookshot", + "shadow_reg,ocarina,nocturne,bow,firearrow,[dinsfire],magic,$can_see_with_lens,sword2,hoverboots", + "shadow_reg,ocarina,nocturne,bow,firearrow,[dinsfire],magic,$can_see_with_lens,sword2,hookshot" ], "sections": [ { @@ -1069,7 +1071,7 @@ { "name": "Falling Spikes Upper", "access_rules": [ - "@Shadow Temple/Like-Like Room,lift1" + "@Shadow Temple/Like-Like Room,[lift1]" ], "item_count": 2 }, @@ -1107,14 +1109,14 @@ { "name": "Boss Key Room", "access_rules": [ - "@Shadow Temple/After Wind Room,shadow_small_keys:4,ocarina,lullaby" + "@Shadow Temple/After Wind Room,shadow_small_keys:4,ocarina,lullaby,dinsfire,magic" ], "item_count": 1 }, { "name": "Boss Key Chest", "access_rules": [ - "@Shadow Temple/After Wind Room,shadow_small_keys:4,ocarina,lullaby" + "@Shadow Temple/Boss Key Room" ], "chest_unopened_img": "images/chest_golden_closed.png", "chest_opened_img": "images/chest_golden_open.png", @@ -1132,8 +1134,10 @@ { "name": "Bongo Bongo", "access_rules": [ - "@Shadow Temple/Boss Key Room,shadow_boss_key,shadow_small_keys:5,bow", - "@Shadow Temple/Boss Key Room,shadow_boss_key,shadow_small_keys:5,longshot,ocarina,[scarecrow]" + "@Shadow Temple/After Wind Room,ocarina,lullaby,shadow_boss_key,shadow_small_keys:5,bow", + "@Shadow Temple/After Wind Room,ocarina,lullaby,shadow_boss_key,shadow_small_keys:5,longshot,ocarina,[scarecrow]", + "@Shadow Temple/After Wind Room,ocarina,lullaby,shadow_boss_key,shadow_small_keys:5,bombchu,[bow]", + "@Shadow Temple/After Wind Room,ocarina,lullaby,shadow_boss_key,shadow_small_keys:5,bombchu,[longshot],[ocarina],[scarecrow]" ], "hosted_item": "shadow", "chest_unopened_img": "images/HC.png", @@ -1881,14 +1885,16 @@ { "name": "Wolfos", "access_rules": [ - "hookshot" + "[hookshot]" ], "item_count": 1 }, { "name": "Like-Like", "access_rules": [ - "hookshot,lift2,$can_see_with_lens" + "hookshot,lift2,$can_see_with_lens", + "bombs,shield2,[hookshot],lift2,$can_see_with_lens", + "bombs,shield3,[hookshot],lift2,$can_see_with_lens" ], "item_count": 4 }, @@ -1896,6 +1902,8 @@ "name": "Eye Statue", "access_rules": [ "hookshot,bow,$can_see_with_lens", + "bombs,shield2,[hookshot],bow,$can_see_with_lens", + "bombs,shield3,[hookshot],bow,$can_see_with_lens", "$has_explosives,hookshot,hammer,bow", "gtg_small_keys:2,hookshot,hammer,bow" ], @@ -1904,7 +1912,9 @@ { "name": "Near Scarecrow", "access_rules": [ - "hookshot,bow,$can_see_with_lens" + "hookshot,bow,$can_see_with_lens", + "bombs,shield2,[hookshot],bow,$can_see_with_lens", + "bombs,shield3,[hookshot],bow,$can_see_with_lens" ], "item_count": 1 }, @@ -1912,6 +1922,8 @@ "name": "Flaming Enemies", "access_rules": [ "hookshot,$can_see_with_lens", + "bombs,shield2,[hookshot],$can_see_with_lens", + "bombs,shield3,[hookshot],$can_see_with_lens", "$has_explosives,hookshot", "gtg_small_keys:2,hookshot" ], @@ -1921,6 +1933,8 @@ "name": "Hammer Pillar", "access_rules": [ "hookshot,$can_see_with_lens,[hammer]", + "bombs,shield2,[hookshot],[hammer],$can_see_with_lens", + "bombs,shield3,[hookshot],[hammer],$can_see_with_lens", "$has_explosives,hookshot,[hammer]", "gtg_small_keys:2,hookshot,[hammer]" ], diff --git a/ootrando_overworldmap_hamsda/var_keysanity/locations/mq.json b/ootrando_overworldmap_hamsda/var_keysanity/locations/mq.json index d3d0acd8..1a2fcbf5 100644 --- a/ootrando_overworldmap_hamsda/var_keysanity/locations/mq.json +++ b/ootrando_overworldmap_hamsda/var_keysanity/locations/mq.json @@ -927,7 +927,7 @@ "name": "GS68 - Above Fire Wall Maze", "short_name": "Above Fire Wall Maze", "access_rules": [ - "@Fire Temple MQ/West Tower Top Chest" + "@Fire Temple MQ/Freestanding Key,fire_small_keys:4" ], "chest_unopened_img": "images/skulltula.png", "chest_opened_img": "images/skulltula_token.png", @@ -1108,7 +1108,9 @@ "parent": "Kakariko A", "access_rules": [ "shadow_mq,ocarina,nocturne,dinsfire,magic,$can_see_with_lens,sword2,hoverboots", - "shadow_mq,ocarina,nocturne,dinsfire,magic,$can_see_with_lens,sword2,hookshot" + "shadow_mq,ocarina,nocturne,dinsfire,magic,$can_see_with_lens,sword2,hookshot", + "shadow_mq,ocarina,nocturne,bow,firearrow,[dinsfire],magic,$can_see_with_lens,sword2,hoverboots", + "shadow_mq,ocarina,nocturne,bow,firearrow,[dinsfire],magic,$can_see_with_lens,sword2,hookshot" ], "sections": [ { @@ -1157,7 +1159,7 @@ { "name": "Falling Spikes Upper Chest", "access_rules": [ - "@Shadow Temple MQ/Falling Spikes Lower Chest,lift1" + "@Shadow Temple MQ/Falling Spikes Lower Chest,[lift1]" ], "item_count": 1 }, @@ -1246,7 +1248,7 @@ { "name": "Spike Walls Left Chest", "access_rules": [ - "@Shadow Temple MQ/Freestanding Key,shadow_small_keys:5" + "@Shadow Temple MQ/Freestanding Key,shadow_small_keys:5,dinsfire,magic" ], "item_count": 1 }, diff --git a/repository.json b/repository.json index 3f091967..fd121f45 100644 --- a/repository.json +++ b/repository.json @@ -10,7 +10,7 @@ "pins", "chathud" ], - "version": "2.2.0.1", + "version": "2.2.0.2", "uid": "ootrando_overworldmap_hamsda", "link": "https://hamsda.github.io/OoTRMapTracker/ootrando_overworldmap_hamsda.zip", "variants": [