diff --git a/index.md b/index.md new file mode 100644 index 00000000..9c1456ca --- /dev/null +++ b/index.md @@ -0,0 +1,3 @@ +# OoTRMapTracker + +You are probably looking for [the link to the zip.](https://hamsda.github.io/OoTRMapTracker/ootrando_overworldmap_hamsda.zip) \ No newline at end of file diff --git a/ootrando_overworldmap_hamsda.zip b/ootrando_overworldmap_hamsda.zip index fd013dda..9f3251fc 100644 Binary files a/ootrando_overworldmap_hamsda.zip and b/ootrando_overworldmap_hamsda.zip differ diff --git a/ootrando_overworldmap_hamsda/changelog.md b/ootrando_overworldmap_hamsda/changelog.md index 64bda801..39982717 100644 --- a/ootrando_overworldmap_hamsda/changelog.md +++ b/ootrando_overworldmap_hamsda/changelog.md @@ -1,5 +1,10 @@ # Changelog +## 2.1.1.1 + +- fixed Spirit Temple GS98 to separate hookshot/rang for adult/child +- fixed keysanity layouts + ## 2.1.1.0 - changed song icons (thanks Raizuto_Gaming#1769) diff --git a/ootrando_overworldmap_hamsda/locations/dungeons.json b/ootrando_overworldmap_hamsda/locations/dungeons.json index 8e2401d7..c6cc2445 100644 --- a/ootrando_overworldmap_hamsda/locations/dungeons.json +++ b/ootrando_overworldmap_hamsda/locations/dungeons.json @@ -1350,8 +1350,9 @@ "name": "GS98 - Room Before Iron Knuckle Child Side", "short_name": "Before Knuckle", "access_rules": [ - "boomerang,@Spirit Temple/Torch Puzzle", - "hookshot,@Spirit Temple/Torch Puzzle" + "@Spirit Temple/Lower Child,@logic/explosives,sticks,boomerang", + "@Spirit Temple/Lower Child,@logic/explosives,dinsfire,magic,boomerang", + "@Spirit Temple/Mirror Room,@logic/has fire,hookshot" ], "chest_unopened_img": "images/skulltula.png", "chest_opened_img": "images/skulltula_token.png", diff --git a/ootrando_overworldmap_hamsda/manifest.json b/ootrando_overworldmap_hamsda/manifest.json index ab8dd3d7..fbffa130 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.1.1.0", + "package_version": "2.1.1.1", "package_uid": "ootrando_overworldmap_hamsda", "author": "Hamsda", "variants": { diff --git a/ootrando_overworldmap_hamsda/var_keysanity/layouts/capture.json b/ootrando_overworldmap_hamsda/var_keysanity/layouts/capture.json new file mode 100644 index 00000000..9f909ecb --- /dev/null +++ b/ootrando_overworldmap_hamsda/var_keysanity/layouts/capture.json @@ -0,0 +1,77 @@ +{ + "tracker_capture_item": { + "type": "container", + "content": { + "type": "itemgrid", + "item_margin": "1,2", + "rows": [ + [ + "sticks", + "nuts", + "bombs", + "bow", + "firearrow", + "dinsfire", + "sword1", + "", + "sword3" + ], + [ + "slingshot", + "ocarina", + "bombchu", + "hookshot", + "icearrow", + "faroreswind", + "shield1", + "shield2", + "shield3" + ], + [ + "boomerang", + "lens", + "beans", + "hammer", + "lightarrow", + "nayruslove", + "lift1", + "redtunic", + "bluetunic" + ], + [ + "bottle1", + "", + "", + "", + "adulttrade", + "kidtrade", + "scale1", + "ironboots", + "hoverboots" + ], + [ + "lullaby", + "epona", + "saria", + "sun", + "time", + "storm", + "wallet1", + "magic", + "" + ], + [ + "minuet", + "bolero", + "serenade", + "requiem", + "nocturne", + "prelude", + "carpenter", + "card", + "" + ] + ] + } + } +} \ No newline at end of file diff --git a/ootrando_overworldmap_hamsda/var_keysanity/layouts/tracker.json b/ootrando_overworldmap_hamsda/var_keysanity/layouts/tracker.json index ae4810bb..c9567932 100644 --- a/ootrando_overworldmap_hamsda/var_keysanity/layouts/tracker.json +++ b/ootrando_overworldmap_hamsda/var_keysanity/layouts/tracker.json @@ -1,79 +1,4 @@ { - "tracker_capture_item": { - "type": "container", - "content": { - "type": "itemgrid", - "item_margin": "1,2", - "rows": [ - [ - "sticks", - "nuts", - "bombs", - "bow", - "firearrow", - "dinsfire", - "sword1", - "", - "sword3" - ], - [ - "slingshot", - "ocarina", - "bombchu", - "hookshot", - "icearrow", - "faroreswind", - "shield1", - "shield2", - "shield3" - ], - [ - "boomerang", - "lens", - "beans", - "hammer", - "lightarrow", - "nayruslove", - "lift1", - "redtunic", - "bluetunic" - ], - [ - "bottle1", - "", - "", - "", - "adulttrade", - "kidtrade", - "scale1", - "ironboots", - "hoverboots" - ], - [ - "lullaby", - "epona", - "saria", - "sun", - "time", - "storm", - "wallet1", - "magic", - "" - ], - [ - "minuet", - "bolero", - "serenade", - "requiem", - "nocturne", - "prelude", - "carpenter", - "card", - "" - ] - ] - } - }, "tracker_default": { "type": "container", "background": "#212121", @@ -514,17 +439,25 @@ "rows": [ [ "type_bridge", - "open_forest", - "open_door", - "show_skulltulas", + "type_forest", + "type_door", + "", "", "" ], [ + "type_kak", "type_lens", "logic_chus", + "", + "", + "" + ], + [ "scrub_shuffle", "shopsanity", + "show_skulltulas", + "", "", "" ] @@ -987,19 +920,14 @@ "rows": [ [ "type_bridge", - "open_forest", - "open_door", - "show_skulltulas", - "", - "" - ], - [ + "type_forest", + "type_door", + "type_kak", "type_lens", "logic_chus", "scrub_shuffle", "shopsanity", - "", - "" + "show_skulltulas" ] ] } diff --git a/ootrando_overworldmap_hamsda/var_keysanity/locations/dungeons.json b/ootrando_overworldmap_hamsda/var_keysanity/locations/dungeons.json index 45f26b78..3072cd73 100644 --- a/ootrando_overworldmap_hamsda/var_keysanity/locations/dungeons.json +++ b/ootrando_overworldmap_hamsda/var_keysanity/locations/dungeons.json @@ -1364,8 +1364,9 @@ "name": "GS98 - Room Before Iron Knuckle Child Side", "short_name": "Before Knuckle", "access_rules": [ - "boomerang,@Spirit Temple/Torch Puzzle", - "hookshot,@Spirit Temple/Torch Puzzle" + "@Spirit Temple/Lower Child,spirit_small_keys:1,@logic/explosives,sticks,boomerang", + "@Spirit Temple/Lower Child,spirit_small_keys:1,@logic/explosives,dinsfire,magic,boomerang", + "@Spirit Temple/Mirror Room,@logic/has fire,hookshot" ], "chest_unopened_img": "images/skulltula.png", "chest_opened_img": "images/skulltula_token.png", diff --git a/repository.json b/repository.json index 1a8a124e..45f72eb4 100644 --- a/repository.json +++ b/repository.json @@ -10,7 +10,7 @@ "pins", "chathud" ], - "version": "2.1.1.0", + "version": "2.1.1.1", "uid": "ootrando_overworldmap_hamsda", "link": "https://hamsda.github.io/OoTRMapTracker/ootrando_overworldmap_hamsda.zip", "variants": [