Merge pull request #113 from Hamsda:ootr

update to version 3.4.0.0
Hamsda · Mar 29, 2021 · ff1bc86 · ff1bc86
2 parents 75dd886 + 2b3b3ea
commit ff1bc86
Show file tree

Hide file tree

Showing 36 changed files with 15,927 additions and 13,220 deletions.
diff --git a/ootrando_overworldmap_hamsda.zip b/ootrando_overworldmap_hamsda.zip
diff --git a/ootrando_overworldmap_hamsda/changelog.md b/ootrando_overworldmap_hamsda/changelog.md
@@ -1,5 +1,15 @@
 # Changelog
 
+## 3.4.0.0
+
+- updated minimal layout (can now use this one as broadcast layout for the regular map tracker)
+- fixed missing `ZD King Zora Thawed` in ER
+- changed non shuffled ER locations will now be displayed on the non ER map
+- changed ER to two maps only, `Locations` and `Exits`
+- added graveyard pad as adult spawn
+- added LACS condition setting
+- changed ER layout tabs
+
 ## 3.3.1.0
 
 - fixed Spirit fire locked chests with sticks

diff --git a/ootrando_overworldmap_hamsda/images/door.png b/ootrando_overworldmap_hamsda/images/door.png
diff --git a/ootrando_overworldmap_hamsda/images/door_grey.png b/ootrando_overworldmap_hamsda/images/door_grey.png
diff --git a/ootrando_overworldmap_hamsda/images/map_grey.png b/ootrando_overworldmap_hamsda/images/map_grey.png
diff --git a/ootrando_overworldmap_hamsda/images/setting_bridge_100gs.png b/ootrando_overworldmap_hamsda/images/setting_bridge_100gs.png
diff --git a/ootrando_overworldmap_hamsda/images/setting_lacs_amount.png b/ootrando_overworldmap_hamsda/images/setting_lacs_amount.png
diff --git a/ootrando_overworldmap_hamsda/images/setting_lacs_dungeons.png b/ootrando_overworldmap_hamsda/images/setting_lacs_dungeons.png
diff --git a/ootrando_overworldmap_hamsda/images/setting_lacs_gs.png b/ootrando_overworldmap_hamsda/images/setting_lacs_gs.png
diff --git a/ootrando_overworldmap_hamsda/images/setting_lacs_medallions.png b/ootrando_overworldmap_hamsda/images/setting_lacs_medallions.png
diff --git a/ootrando_overworldmap_hamsda/images/setting_lacs_stones.png b/ootrando_overworldmap_hamsda/images/setting_lacs_stones.png
diff --git a/ootrando_overworldmap_hamsda/images/setting_lacs_vanilla.png b/ootrando_overworldmap_hamsda/images/setting_lacs_vanilla.png
diff --git a/ootrando_overworldmap_hamsda/items/capture_spawns.json b/ootrando_overworldmap_hamsda/items/capture_spawns.json
@@ -35,6 +35,12 @@
     "img": "images/entrance_overworld_sfm.png",
     "codes": "entrance_overworld_sfm"
   },
+  {
+    "name": "Graveyard Warp Pad Region",
+    "type": "toggle",
+    "img": "images/entrance_overworld_gy_pad.png",
+    "codes": "entrance_overworld_gy_pad"
+  },
   {
     "name": "DMC Fairy",
     "type": "toggle",

diff --git a/ootrando_overworldmap_hamsda/items/options.json b/ootrando_overworldmap_hamsda/items/options.json
@@ -379,6 +379,49 @@
       }
     ]
   },
+  {
+    "name": "LACS Condition",
+    "type": "progressive",
+    "allow_disabled": false,
+    "loop": true,
+    "initial_stage_idx": 2,
+    "stages": [
+      {
+        "img": "images/setting_lacs_vanilla.png",
+        "codes": "setting_lacs,setting_lacs_vanilla",
+        "inherit_codes": false
+      },
+      {
+        "img": "images/setting_lacs_stones.png",
+        "codes": "setting_lacs,setting_lacs_stones",
+        "inherit_codes": false
+      },
+      {
+        "img": "images/setting_lacs_medallions.png",
+        "codes": "setting_lacs,setting_lacs_medallions",
+        "inherit_codes": false
+      },
+      {
+        "img": "images/setting_lacs_dungeons.png",
+        "codes": "setting_lacs,setting_lacs_dungeons",
+        "inherit_codes": false
+      },
+      {
+        "img": "images/setting_lacs_gs.png",
+        "codes": "setting_lacs,setting_lacs_gs",
+        "inherit_codes": false
+      }
+    ]
+  },
+  {
+    "name": "LACS Amount",
+    "type": "consumable",
+    "img": "images/setting_lacs_amount.png",
+    "codes": "setting_lacs_amount",
+    "disabled_img_mods": "@enabled",
+    "max_quantity": 6,
+    "initial_quantity": 6
+  },
   {
     "name": "Skip Child Zelda",
     "type": "progressive",

diff --git a/ootrando_overworldmap_hamsda/items/quest.json b/ootrando_overworldmap_hamsda/items/quest.json
@@ -525,5 +525,113 @@
         "img": "images/label_shadow.png"
       }
     ]
+  },
+  {
+    "name": "Kokiri's Emerald Label",
+    "type": "progressive",
+    "allow_disabled": false,
+    "loop": true,
+    "stages": [
+      {
+        "img": "images/label_unknown.png",
+        "codes": "emeraldlabel"
+      },
+      {
+        "img": "images/label_deku.png"
+      },
+      {
+        "img": "images/label_dodongo.png"
+      },
+      {
+        "img": "images/label_jabu.png"
+      },
+      {
+        "img": "images/label_forest.png"
+      },
+      {
+        "img": "images/label_fire.png"
+      },
+      {
+        "img": "images/label_water.png"
+      },
+      {
+        "img": "images/label_spirit.png"
+      },
+      {
+        "img": "images/label_shadow.png"
+      }
+    ]
+  },
+  {
+    "name": "Goron's Ruby Label",
+    "type": "progressive",
+    "allow_disabled": false,
+    "loop": true,
+    "stages": [
+      {
+        "img": "images/label_unknown.png",
+        "codes": "rubylabel"
+      },
+      {
+        "img": "images/label_deku.png"
+      },
+      {
+        "img": "images/label_dodongo.png"
+      },
+      {
+        "img": "images/label_jabu.png"
+      },
+      {
+        "img": "images/label_forest.png"
+      },
+      {
+        "img": "images/label_fire.png"
+      },
+      {
+        "img": "images/label_water.png"
+      },
+      {
+        "img": "images/label_spirit.png"
+      },
+      {
+        "img": "images/label_shadow.png"
+      }
+    ]
+  },
+  {
+    "name": "Zora's Sapphire Label",
+    "type": "progressive",
+    "allow_disabled": false,
+    "loop": true,
+    "stages": [
+      {
+        "img": "images/label_unknown.png",
+        "codes": "sapphirelabel"
+      },
+      {
+        "img": "images/label_deku.png"
+      },
+      {
+        "img": "images/label_dodongo.png"
+      },
+      {
+        "img": "images/label_jabu.png"
+      },
+      {
+        "img": "images/label_forest.png"
+      },
+      {
+        "img": "images/label_fire.png"
+      },
+      {
+        "img": "images/label_water.png"
+      },
+      {
+        "img": "images/label_spirit.png"
+      },
+      {
+        "img": "images/label_shadow.png"
+      }
+    ]
   }
 ]
diff --git a/ootrando_overworldmap_hamsda/layouts/capture_spawns.json b/ootrando_overworldmap_hamsda/layouts/capture_spawns.json
@@ -36,7 +36,7 @@
           "entrance_overworld_gf",
           "entrance_overworld_zd",
           "entrance_overworld_sfm",
-          ""
+          "entrance_overworld_gy_pad"
         ],
         [
           "entrance_spawn_dmc_ff",