diff --git a/changelog.md b/changelog.md index 16e053b7..053fe16a 100644 --- a/changelog.md +++ b/changelog.md @@ -1,5 +1,9 @@ # Changelog +## 2.3.3.4 + +- changed layout to use map on right side again + ## 2.3.3.3 - fixed unfreezing Kind Zora only showing as hintable diff --git a/ootrando_overworldmap_hamsda.zip b/ootrando_overworldmap_hamsda.zip index 608f2ec2..c3765016 100644 Binary files a/ootrando_overworldmap_hamsda.zip and b/ootrando_overworldmap_hamsda.zip differ diff --git a/ootrando_overworldmap_hamsda/layouts/broadcast.json b/ootrando_overworldmap_hamsda/layouts/broadcast.json index 9e711129..5f2fef6c 100644 --- a/ootrando_overworldmap_hamsda/layouts/broadcast.json +++ b/ootrando_overworldmap_hamsda/layouts/broadcast.json @@ -1,12 +1,7 @@ { "tracker_broadcast": { - "type": "array", - "margin": "5,5,5,5", - "content": [ - { - "type": "layout", - "key": "item_grid_wide" - } - ] + "type": "layout", + "key": "item_grid_wide", + "margin": "5,5,5,5" } } \ No newline at end of file diff --git a/ootrando_overworldmap_hamsda/layouts/layouts.json b/ootrando_overworldmap_hamsda/layouts/layouts.json new file mode 100644 index 00000000..453da026 --- /dev/null +++ b/ootrando_overworldmap_hamsda/layouts/layouts.json @@ -0,0 +1,254 @@ +{ + "tracker_right_map": { + "type": "container", + "background": "#212121", + "content": { + "type": "dock", + "dropshadow": true, + "content": [ + { + "type": "dock", + "dock": "left", + "v_alignment": "stretch", + "margin": "0,0,3,0", + "content": [ + { + "type": "group", + "header": "Items", + "dock": "top", + "content": { + "type": "layout", + "key": "item_grid_tall" + } + }, + { + "type": "group", + "header": "Settings", + "content": { + "type": "layout", + "key": "options_tall" + } + } + ] + }, + { + "type": "dock", + "content": [ + { + "type": "tabbed", + "dock": "top", + "tabs": [ + { + "title": "Child", + "icon": "images/sword1.png", + "content": { + "type": "map", + "maps": [ + "child" + ] + } + }, + { + "title": "Adult", + "icon": "images/sword2.png", + "content": { + "type": "map", + "maps": [ + "adult" + ] + } + }, + { + "title": "Gossip Stones", + "icon": "images/gossip_stone.png", + "content": { + "type": "map", + "maps": [ + "gossips" + ] + } + } + ] + }, + { + "type": "group", + "header": "Pinned Locations", + "content": { + "type": "recentpins", + "style": "wrap", + "h_alignment": "stretch", + "v_alignment": "stretch", + "orientation": "horizontal", + "compact": true + } + } + ] + } + ] + } + }, + "tracker_top_map": { + "type": "container", + "background": "#212121", + "content": { + "type": "dock", + "dropshadow": true, + "content": [ + { + "type": "dock", + "dock": "bottom", + "content": [ + { + "type": "dock", + "dock": "left", + "margin": "0,0,3,0", + "content": [ + { + "type": "group", + "header": "Items", + "dock": "top", + "content": { + "type": "layout", + "key": "item_grid_wide" + } + }, + { + "type": "group", + "header": "Settings", + "h_alignment": "stretch", + "content": { + "type": "layout", + "key": "options_wide", + } + } + ] + }, + { + "type": "group", + "header": "Pinned Locations", + "content": { + "type": "recentpins", + "style": "wrap", + "h_alignment": "stretch", + "v_alignment": "stretch", + "orientation": "horizontal", + "compact": true + } + } + ] + }, + { + "type": "tabbed", + "tabs": [ + { + "title": "Child", + "icon": "images/sword1.png", + "content": { + "type": "map", + "maps": [ + "child" + ] + } + }, + { + "title": "Adult", + "icon": "images/sword2.png", + "content": { + "type": "map", + "maps": [ + "adult" + ] + } + }, + { + "title": "Gossip Stones", + "icon": "images/gossip_stone.png", + "content": { + "type": "map", + "maps": [ + "gossips" + ] + } + } + ] + } + ] + } + }, + "tracker_dual_map": { + "type": "container", + "background": "#212121", + "content": { + "type": "dock", + "dropshadow": true, + "content": [ + { + "type": "dock", + "dock": "left", + "v_alignment": "stretch", + "margin": "0,0,3,0", + "content": [ + { + "type": "group", + "header": "Items", + "dock": "top", + "content": { + "type": "layout", + "key": "item_grid_tall" + } + }, + { + "type": "group", + "header": "Settings", + "content": { + "type": "layout", + "key": "options_tall" + } + } + ] + }, + { + "type": "dock", + "content": [ + { + "type": "group", + "header": "Maps", + "dock": "top", + "content": { + "type": "dock", + "content": [ + { + "type": "map", + "dock": "top", + "maps": [ + "child" + ] + }, + { + "type": "map", + "dock": "bottom", + "maps": [ + "adult" + ] + } + ] + } + }, + { + "type": "group", + "header": "Pinned Locations", + "content": { + "type": "recentpins", + "style": "wrap", + "h_alignment": "stretch", + "v_alignment": "stretch", + "orientation": "horizontal", + "compact": true + } + } + ] + } + ] + } + } +} \ No newline at end of file diff --git a/ootrando_overworldmap_hamsda/layouts/tracker.json b/ootrando_overworldmap_hamsda/layouts/tracker.json index b9db131a..a3a0e562 100644 --- a/ootrando_overworldmap_hamsda/layouts/tracker.json +++ b/ootrando_overworldmap_hamsda/layouts/tracker.json @@ -1,180 +1,10 @@ { "tracker_default": { - "type": "container", - "background": "#212121", - "content": { - "type": "dock", - "dropshadow": true, - "content": [ - { - "type": "dock", - "dock": "left", - "v_alignment": "stretch", - "margin": "0,0,3,0", - "content": [ - { - "type": "group", - "header": "Items", - "dock": "top", - "content": { - "type": "layout", - "key": "item_grid_tall" - } - }, - { - "type": "group", - "header": "Settings", - "content": { - "type": "layout", - "key": "options_tall" - } - } - ] - }, - { - "type": "dock", - "content": [ - { - "type": "tabbed", - "dock": "top", - "tabs": [ - { - "title": "Child", - "icon": "images/sword1.png", - "content": { - "type": "map", - "maps": [ - "child" - ] - } - }, - { - "title": "Adult", - "icon": "images/sword2.png", - "content": { - "type": "map", - "maps": [ - "adult" - ] - } - }, - { - "title": "Gossip Stones", - "icon": "images/gossip_stone.png", - "content": { - "type": "map", - "maps": [ - "gossips" - ] - } - } - ] - }, - { - "type": "group", - "header": "Pinned Locations", - "margin": "3,0,0,0", - "content": { - "type": "recentpins", - "style": "wrap", - "h_alignment": "stretch", - "v_alignment": "stretch", - "orientation": "horizontal", - "compact": true - } - } - ] - } - ] - } + "type": "layout", + "key": "tracker_right_map" }, "tracker_horizontal": { - "type": "container", - "background": "#212121", - "content": { - "type": "dock", - "dropshadow": true, - "content": [ - { - "type": "dock", - "dock": "bottom", - "content": [ - { - "type": "dock", - "dock": "left", - "margin": "0,0,3,0", - "content": [ - { - "type": "group", - "header": "Items", - "dock": "top", - "content": { - "type": "layout", - "key": "item_grid_wide" - } - }, - { - "type": "group", - "header": "Settings", - "h_alignment": "stretch", - "content": { - "type": "layout", - "key": "options_wide", - } - } - ] - }, - { - "type": "group", - "header": "Pinned Locations", - "margin": "3,0,0,0", - "content": { - "type": "recentpins", - "style": "wrap", - "h_alignment": "stretch", - "v_alignment": "stretch", - "orientation": "horizontal", - "compact": true - } - } - ] - }, - { - "type": "tabbed", - "tabs": [ - { - "title": "Child", - "icon": "images/sword1.png", - "content": { - "type": "map", - "maps": [ - "child" - ] - } - }, - { - "title": "Adult", - "icon": "images/sword2.png", - "content": { - "type": "map", - "maps": [ - "adult" - ] - } - }, - { - "title": "Gossip Stones", - "icon": "images/gossip_stone.png", - "content": { - "type": "map", - "maps": [ - "gossips" - ] - } - } - ] - } - ] - } + "type": "layout", + "key": "tracker_right_map" } } \ No newline at end of file diff --git a/ootrando_overworldmap_hamsda/manifest.json b/ootrando_overworldmap_hamsda/manifest.json index 0d385d05..b15967e9 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.3.3.3", + "package_version": "2.3.3.4", "package_uid": "ootrando_overworldmap_hamsda", "author": "Hamsda", "variants": { diff --git a/ootrando_overworldmap_hamsda/scripts/init.lua b/ootrando_overworldmap_hamsda/scripts/init.lua index 83f6f2a0..69ab93bd 100644 --- a/ootrando_overworldmap_hamsda/scripts/init.lua +++ b/ootrando_overworldmap_hamsda/scripts/init.lua @@ -22,6 +22,7 @@ Tracker:AddLocations("locations/dung_mq_keys.json") Tracker:AddLayouts("layouts/item_grids.json") Tracker:AddLayouts("layouts/options.json") +Tracker:AddLayouts("layouts/layouts.json") Tracker:AddLayouts("layouts/tracker.json") Tracker:AddLayouts("layouts/capture.json") Tracker:AddLayouts("layouts/broadcast.json") \ No newline at end of file diff --git a/ootrando_overworldmap_hamsda/var_itemsonly/layouts/tracker.json b/ootrando_overworldmap_hamsda/var_itemsonly/layouts/tracker.json index 092b9d58..983d12a8 100644 --- a/ootrando_overworldmap_hamsda/var_itemsonly/layouts/tracker.json +++ b/ootrando_overworldmap_hamsda/var_itemsonly/layouts/tracker.json @@ -3,8 +3,6 @@ "type": "container", "background": "#212121", "width": 320, - //"width": 220, - "dropshadow": true, "content": { "type": "layout", "key": "item_grid_wide" diff --git a/ootrando_overworldmap_hamsda/var_itemsonlykeysanity/layouts/tracker.json b/ootrando_overworldmap_hamsda/var_itemsonlykeysanity/layouts/tracker.json index 092b9d58..983d12a8 100644 --- a/ootrando_overworldmap_hamsda/var_itemsonlykeysanity/layouts/tracker.json +++ b/ootrando_overworldmap_hamsda/var_itemsonlykeysanity/layouts/tracker.json @@ -3,8 +3,6 @@ "type": "container", "background": "#212121", "width": 320, - //"width": 220, - "dropshadow": true, "content": { "type": "layout", "key": "item_grid_wide" diff --git a/ootrando_overworldmap_hamsda/var_minimalist/layouts/broadcast.json b/ootrando_overworldmap_hamsda/var_minimalist/layouts/broadcast.json index 8120b9e4..d3acb085 100644 --- a/ootrando_overworldmap_hamsda/var_minimalist/layouts/broadcast.json +++ b/ootrando_overworldmap_hamsda/var_minimalist/layouts/broadcast.json @@ -1,12 +1,7 @@ { "tracker_broadcast": { - "type": "array", - "margin": "5,5,5,5", - "content": [ - { - "type": "layout", - "key": "item_grid_mini" - } - ] + "type": "layout", + "key": "item_grid_mini", + "margin": "5,5,5,5" } } \ No newline at end of file diff --git a/ootrando_overworldmap_hamsda/var_minimalist/layouts/tracker.json b/ootrando_overworldmap_hamsda/var_minimalist/layouts/tracker.json index d93b037a..58899e5e 100644 --- a/ootrando_overworldmap_hamsda/var_minimalist/layouts/tracker.json +++ b/ootrando_overworldmap_hamsda/var_minimalist/layouts/tracker.json @@ -3,7 +3,6 @@ "type": "container", "background": "#212121", "width": 220, - "dropshadow": true, "content": { "type": "layout", "key": "item_grid_mini" diff --git a/repository.json b/repository.json index 8b27cc59..383a7593 100644 --- a/repository.json +++ b/repository.json @@ -10,7 +10,7 @@ "pins", "chathud" ], - "version": "2.3.3.3", + "version": "2.3.3.4", "uid": "ootrando_overworldmap_hamsda", "link": "https://hamsda.github.io/OoTRMapTracker/ootrando_overworldmap_hamsda.zip", "variants": [