Merge pull request #52 from Hamsda/dev

update to version 2.3.3.3
Hamsda · Mar 20, 2019 · 9745cf8 · 9745cf8
2 parents dcbacc8 + 672cbcc
commit 9745cf8
Show file tree

Hide file tree

Showing 13 changed files with 765 additions and 87 deletions.
diff --git a/changelog.md b/changelog.md
@@ -1,5 +1,10 @@
 # Changelog
 
+## 2.3.3.3
+
+- fixed unfreezing Kind Zora only showing as hintable
+- added horizontal layout back to the map variants
+
 ## 2.3.3.2
 
 - fixed adult ZF entry with open fountain

diff --git a/ootrando_overworldmap_hamsda.zip b/ootrando_overworldmap_hamsda.zip
diff --git a/...o_overworldmap_hamsda/layouts/shared.json → ...erworldmap_hamsda/layouts/item_grids.json b/...o_overworldmap_hamsda/layouts/shared.json → ...erworldmap_hamsda/layouts/item_grids.json
diff --git a/ootrando_overworldmap_hamsda/layouts/options.json b/ootrando_overworldmap_hamsda/layouts/options.json
@@ -0,0 +1,89 @@
+{
+  "options_tall": {
+    "type": "itemgrid",
+    "h_alignment": "left",
+    "item_margin": "1,2",
+    "rows": [
+      [
+        "setting_forest",
+        "setting_kak",
+        "setting_door",
+        "setting_fountain",
+        "setting_gerudo",
+        "setting_bridge"
+      ],
+      [
+        "setting_shuffle_sword1",
+        "setting_shuffle_ocarinas",
+        "setting_shuffle_egg",
+        "setting_shuffle_card",
+        "",
+        ""
+      ],
+      [
+        "setting_scrub_shuffle",
+        "setting_shopsanity",
+        "setting_cowsanity",
+        "setting_skulltulas_off",
+        "",
+        ""
+      ],
+      [
+        "setting_logic_chus",
+        "setting_lens",
+        "setting_fewer_tunics",
+        "",
+        "",
+        ""
+      ],
+      [
+        "setting_hints",
+        "setting_beans",
+        "",
+        "",
+        "",
+        ""
+      ]
+    ]
+  },
+  "options_wide": {
+    "type": "itemgrid",
+    "h_alignment": "left",
+    "item_margin": "1,2",
+    "rows": [
+      [
+        "setting_forest",
+        "setting_kak",
+        "setting_door",
+        "setting_fountain",
+        "setting_gerudo",
+        "setting_bridge",
+        "",
+        "",
+        ""
+      ],
+      [
+        "setting_shuffle_sword1",
+        "setting_shuffle_ocarinas",
+        "setting_shuffle_egg",
+        "setting_shuffle_card",
+        "setting_scrub_shuffle",
+        "setting_shopsanity",
+        "setting_cowsanity",
+        "setting_skulltulas_off",
+        ""
+      ],
+      [
+        "setting_logic_chus",
+        "setting_lens",
+        "setting_fewer_tunics",
+        "setting_hints",
+        "setting_beans",
+        "",
+        "",
+        "",
+        ""
+      ]
+    ]
+  }
+}
diff --git a/ootrando_overworldmap_hamsda/layouts/tracker.json b/ootrando_overworldmap_hamsda/layouts/tracker.json
@@ -25,51 +25,8 @@
               "type": "group",
               "header": "Settings",
               "content": {
-                "type": "itemgrid",
-                "h_alignment": "left",
-                "item_margin": "1,2",
-                "rows": [
-                  [
-                    "setting_forest",
-                    "setting_kak",
-                    "setting_door",
-                    "setting_fountain",
-                    "setting_gerudo",
-                    "setting_bridge"
-                  ],
-                  [
-                    "setting_shuffle_sword1",
-                    "setting_shuffle_ocarinas",
-                    "setting_shuffle_egg",
-                    "setting_shuffle_card",
-                    "",
-                    ""
-                  ],
-                  [
-                    "setting_scrub_shuffle",
-                    "setting_shopsanity",
-                    "setting_cowsanity",
-                    "setting_skulltulas_off",
-                    "",
-                    ""
-                  ],
-                  [
-                    "setting_logic_chus",
-                    "setting_lens",
-                    "setting_fewer_tunics",
-                    "",
-                    "",
-                    ""
-                  ],
-                  [
-                    "setting_hints",
-                    "setting_beans",
-                    "",
-                    "",
-                    "",
-                    ""
-                  ]
-                ]
+                "type": "layout",
+                "key": "options_tall"
               }
             }
           ]
@@ -131,7 +88,7 @@
       ]
     }
   },
-  "tracker_horizontal_old": {
+  "tracker_horizontal": {
     "type": "container",
     "background": "#212121",
     "content": {
@@ -161,44 +118,8 @@
                   "header": "Settings",
                   "h_alignment": "stretch",
                   "content": {
-                    "type": "itemgrid",
-                    "h_alignment": "left",
-                    "item_margin": "1,2",
-                    "rows": [
-                      [
-                        "setting_forest",
-                        "setting_kak",
-                        "setting_door",
-                        "setting_fountain",
-                        "setting_gerudo",
-                        "setting_bridge",
-                        "setting_hints",
-                        "",
-                        ""
-                      ],
-                      [
-                        "setting_logic_chus",
-                        "setting_lens",
-                        "setting_fewer_tunics",
-                        "setting_beans",
-                        "setting_scrub_shuffle",
-                        "setting_shopsanity",
-                        "setting_cowsanity",
-                        "setting_skulltulas_off",
-                        ""
-                      ],
-                      [
-                        "setting_shuffle_sword1",
-                        "setting_shuffle_ocarinas",
-                        "setting_shuffle_egg",
-                        "setting_shuffle_card",
-                        "",
-                        "",
-                        "",
-                        "",
-                        ""
-                      ]
-                    ]
+                    "type": "layout",
+                    "key": "options_wide",
                   }
                 }
               ]

diff --git a/ootrando_overworldmap_hamsda/locations/overworld.json b/ootrando_overworldmap_hamsda/locations/overworld.json
@@ -5001,6 +5001,7 @@
                       {
                         "name": "Unfreeze him",
                         "access_rules": [
+                          "sword2",
                           "{$hintable}"
                         ],
                         "capture_item": true,

diff --git 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.2",
+  "package_version": "2.3.3.3",
   "package_uid": "ootrando_overworldmap_hamsda",
   "author": "Hamsda",
   "variants": {

diff --git a/ootrando_overworldmap_hamsda/scripts/init.lua b/ootrando_overworldmap_hamsda/scripts/init.lua
@@ -20,7 +20,8 @@ Tracker:AddLocations("locations/dung_reg_keys.json")
 Tracker:AddLocations("locations/dung_mq.json")
 Tracker:AddLocations("locations/dung_mq_keys.json")
 
-Tracker:AddLayouts("layouts/shared.json")
+Tracker:AddLayouts("layouts/item_grids.json")
+Tracker:AddLayouts("layouts/options.json")
 Tracker:AddLayouts("layouts/tracker.json")
 Tracker:AddLayouts("layouts/capture.json")
 Tracker:AddLayouts("layouts/broadcast.json")