improved ER map:

- added settings back in
- added default captures for non shuffled locations

refactored some of the shared logic as well

ootrando_overworldmap_hamsda/README.md

@@ -35,7 +35,7 @@ Some of this functionality might not be immediately obvious:
 - Right clicking ![Fairy Ocarina](images/fairyocarina.png "Fairy Ocarina")/![Ocarina of Time](images/ocarina.png "Ocarina of Time") will overlay it with ![Scarecrow](images/overlay_scarecrow.png "Scarecrow") indicating that you have confirmed the scarecrow song or started with free scarecrow. Locations that make use of the scarecrow will not show up unless this is turned on. The location of the scarecrow in Lake Hylia will automatically mark this when cleared first as child and then as adult.
 - ![Triforce Piece](images/triforce_piece.png "Triforce Piece") is used as a counter for Triforce pieces in the Triforce Hunt mode.
 
-## Settings (for map variants)
+## Settings (for non Entrance Randomizer variants with a map)
 
 There is a variety of toggles available to accomodate the different settings the randomizer offers. The settings are arranged to mimic the current GUI of the randomizer. The default for all of these should match the settings used for the weekly races (check out the OoTR discord for more info).
 
@@ -238,7 +238,9 @@ The entrance randomizer variants are very different from the regular map tracker
 
 All locations have a capture spot, where you can mark what is at that location. If the location is useless, just mark off the icon to clean up the map. Later you can see what led where by simply hovering over the locations.
 
-There are two variants, one for keysanity and one without, but none of the items are actually used for "logic" (to show/hide some entrances).
+The settings allow you to select which pools are actually shuffled (split based on Dev-R branch, since it is the most popular for ER). If they are not shuffled, the appropriate captures are placed at (almost) all locations and certain locations are hidden since they are useless regardless of any other settings.
+
+There are two variants, one for keysanity and one without, but none of the items are actually used for "logic" (to show/hide entrances).
 
 Additionally there are counters for the useful indoors entrances, so you can evaluate how much focus to put on exploring more entrances:
 

ootrando_overworldmap_hamsda/changelog.md

@@ -4,6 +4,9 @@
 
 - removed Gossip Stone map
 - changed names of most locations based on [this PR](https://github.com/TestRunnerSRL/OoT-Randomizer/pull/1021)
+- improved ER map:
+  - added settings back in
+  - added default captures for non shuffled locations
 
 ## 2.9.6.0
 

ootrando_overworldmap_hamsda/items/options_entrance.json

@@ -0,0 +1,60 @@
+[
+  {
+    "name": "Shuffle Interior Entrances",
+    "type": "progressive",
+    "allow_disabled": false,
+    "loop": true,
+    "initial_stage_idx": 2,
+    "stages": [
+      {
+        "img": "images/setting_entrance_interiors_off.png",
+        "codes": "setting_entrance_interiors,setting_entrance_interiors_off"
+      },
+      {
+        "img": "images/setting_entrance_interiors_simple.png",
+        "codes": "setting_entrance_interiors,setting_entrance_interiors_simple",
+        "inherits_codes": false
+      },
+      {
+        "img": "images/setting_entrance_interiors_all.png",
+        "codes": "setting_entrance_interiors_all"
+      }
+    ]
+  },
+  {
+    "name": "Shuffle Grotto Entrances",
+    "type": "progressive",
+    "allow_disabled": false,
+    "loop": true,
+    "initial_stage_idx": 1,
+    "stages": [
+      {
+        "img": "images/setting_entrance_grottos_off.png",
+        "codes": "setting_entrance_grottos,setting_entrance_grottos_off"
+      },
+      {
+        "img": "images/setting_entrance_grottos_shuffle.png",
+        "codes": "setting_entrance_grottos,setting_entrance_grottos_shuffle",
+        "inherits_codes": false
+      }
+    ]
+  },
+  {
+    "name": "Shuffle Dungeon Entrances",
+    "type": "progressive",
+    "allow_disabled": false,
+    "loop": true,
+    "initial_stage_idx": 1,
+    "stages": [
+      {
+        "img": "images/setting_entrance_dungeons_off.png",
+        "codes": "setting_entrance_dungeons,setting_entrance_dungeons_off"
+      },
+      {
+        "img": "images/setting_entrance_dungeons_shuffle.png",
+        "codes": "setting_entrance_dungeons,setting_entrance_dungeons_shuffle",
+        "inherits_codes": false
+      }
+    ]
+  }
+]

ootrando_overworldmap_hamsda/layouts/layouts_entrance.json

@@ -16,6 +16,12 @@
               "type": "group",
               "header": "Items",
               "dock": "top",
+              "header_content": {
+                "type": "button_popup",
+                "style": "settings",
+                "popup_background": "#FF212121",
+                "layout": "options_popup"
+              },
               "content": {
                 "type": "layout",
                 "key": "item_grid_tall"
@@ -113,6 +119,12 @@
                   "type": "group",
                   "header": "Items",
                   "dock": "top",
+                  "header_content": {
+                    "type": "button_popup",
+                    "style": "settings",
+                    "popup_background": "#FF212121",
+                    "layout": "options_popup"
+                  },
                   "content": {
                     "type": "layout",
                     "key": "item_grid_wide"

ootrando_overworldmap_hamsda/layouts/options_entrance.json

@@ -1,35 +1,22 @@
 {
-  "options_tall": {
-    "type": "itemgrid",
-    "h_alignment": "left",
-    "item_margin": "1,2",
-    "rows": [
-      [
-        "setting_entrance",
-        "",
-        "",
-        "",
-        "",
-        ""
-      ]
-    ]
-  },
-  "options_wide": {
-    "type": "itemgrid",
-    "h_alignment": "left",
-    "item_margin": "1,2",
-    "rows": [
-      [
-        "setting_entrance",
-        "",
-        "",
-        "",
-        "",
-        "",
-        "",
-        "",
-        ""
-      ]
+  "options_popup": {
+    "type": "tabbed",
+    "tabs": [
+      {
+        "title": "Main Rules",
+        "content": {
+          "type": "itemgrid",
+          //"h_alignment": "left",
+          "item_margin": "1,2",
+          "rows": [
+            [
+              "setting_entrance_interiors",
+              "setting_entrance_grottos",
+              "setting_entrance_dungeons"
+            ]
+          ]
+        }
+      }
     ]
   }
 }

ootrando_overworldmap_hamsda/locations/overworld_entrance.json

@@ -33,6 +33,9 @@
             "sections": [
               {
                 "name": "House",
+                "visibility_rules": [
+                  "setting_entrance_interiors_simple"
+                ],
                 "capture_item": true,
                 "capture_item_layout": "tracker_capture_houses",
                 "item_count": 1
@@ -52,6 +55,9 @@
             "sections": [
               {
                 "name": "House",
+                "visibility_rules": [
+                  "setting_entrance_interiors_simple"
+                ],
                 "capture_item": true,
                 "capture_item_layout": "tracker_capture_houses",
                 "item_count": 1
@@ -128,6 +134,9 @@
             "sections": [
               {
                 "name": "House",
+                "visibility_rules": [
+                  "setting_entrance_interiors_simple"
+                ],
                 "capture_item": true,
                 "capture_item_layout": "tracker_capture_houses",
                 "item_count": 1
@@ -155,6 +164,7 @@
             "map_locations": [
               {
                 "map": "entrances",
+                "size": 50,
                 "x": 2420,
                 "y": 875
               }
@@ -452,7 +462,8 @@
             "map_locations": [
               {
                 "map": "entrances",
-                "x": 2150,
+                "size": 50,
+                "x": 2140,
                 "y": 600
               }
             ]
@@ -1116,8 +1127,9 @@
             "map_locations": [
               {
                 "map": "entrances",
+                "size": 50,
                 "x": 1885,
-                "y": 395
+                "y": 405
               }
             ]
           },
@@ -1266,6 +1278,9 @@
             "sections": [
               {
                 "name": "House",
+                "visibility_rules": [
+                  "setting_entrance_interiors_simple"
+                ],
                 "capture_item": true,
                 "capture_item_layout": "tracker_capture_houses",
                 "item_count": 1
@@ -1293,6 +1308,7 @@
             "map_locations": [
               {
                 "map": "entrances",
+                "size": 50,
                 "x": 2145,
                 "y": 325
               }
@@ -1386,6 +1402,9 @@
             "sections": [
               {
                 "name": "House",
+                "visibility_rules": [
+                  "setting_entrance_interiors_simple"
+                ],
                 "capture_item": true,
                 "capture_item_layout": "tracker_capture_houses",
                 "item_count": 1
@@ -1786,6 +1805,7 @@
             "map_locations": [
               {
                 "map": "entrances",
+                "size": 50,
                 "x": 1685,
                 "y": 220
               }
@@ -1944,6 +1964,7 @@
             "map_locations": [
               {
                 "map": "entrances",
+                "size": 50,
                 "x": 1910,
                 "y": 80
               }
@@ -2165,6 +2186,7 @@
             "map_locations": [
               {
                 "map": "entrances",
+                "size": 50,
                 "x": 1015,
                 "y": 1380
               }
@@ -2487,6 +2509,7 @@
             "map_locations": [
               {
                 "map": "entrances",
+                "size": 50,
                 "x": 2490,
                 "y": 330
               }
@@ -2506,6 +2529,7 @@
             "map_locations": [
               {
                 "map": "entrances",
+                "size": 50,
                 "x": 2500,
                 "y": 275
               }
@@ -2542,6 +2566,9 @@
             "sections": [
               {
                 "name": "Grotto",
+                "visibility_rules": [
+                  "setting_entrance_grottos_shuffle"
+                ],
                 "capture_item": true,
                 "capture_item_layout": "tracker_capture_grottos",
                 "item_count": 1
@@ -2580,6 +2607,9 @@
             "sections": [
               {
                 "name": "House",
+                "visibility_rules": [
+                  "setting_entrance_interiors_simple"
+                ],
                 "capture_item": true,
                 "capture_item_layout": "tracker_capture_houses",
                 "item_count": 1
@@ -2670,6 +2700,7 @@
             "map_locations": [
               {
                 "map": "entrances",
+                "size": 50,
                 "x": 485,
                 "y": 435
               }
@@ -2815,6 +2846,7 @@
             "map_locations": [
               {
                 "map": "entrances",
+                "size": 50,
                 "x": 95,
                 "y": 315
               }