Merge pull request #53 from Hamsda/dev

update to version 2.3.3.4
Hamsda · Mar 24, 2019 · f0d4e7d · f0d4e7d
2 parents 9745cf8 + cd5f120
commit f0d4e7d
Show file tree

Hide file tree

Showing 12 changed files with 271 additions and 197 deletions.
diff --git 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
diff --git 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"
   }
 }
diff --git a/ootrando_overworldmap_hamsda/layouts/layouts.json 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
+              }
+            }
+          ]
+        }
+      ]
+    }
+  }
+}