update to version 2.4.0.0 (#60)

update to version 2.4.0.0
Hamsda · May 12, 2019 · a6cf7e1 · a6cf7e1
2 parents a18959d + 17f7971
commit a6cf7e1
Show file tree

Hide file tree

Showing 71 changed files with 5,681 additions and 35 deletions.
diff --git a/changelog.md b/changelog.md
@@ -1,5 +1,11 @@
 # Changelog
 
+## 2.4.0.0
+
+- fixed MQ Spirit unintentionally showing up on child map
+- added entrance randomizer variant
+- added map and compass to capture layout
+
 ## 2.3.3.9
 
 - fixed back of MQ DC with chus in logic

diff --git a/ootrando_overworldmap_hamsda.zip b/ootrando_overworldmap_hamsda.zip
diff --git a/ootrando_overworldmap_hamsda/images/compass.png b/ootrando_overworldmap_hamsda/images/compass.png
diff --git a/ootrando_overworldmap_hamsda/images/entrance_grotto_castle_storms.png b/ootrando_overworldmap_hamsda/images/entrance_grotto_castle_storms.png
diff --git a/ootrando_overworldmap_hamsda/images/entrance_grotto_cow.png b/ootrando_overworldmap_hamsda/images/entrance_grotto_cow.png
diff --git a/ootrando_overworldmap_hamsda/images/entrance_grotto_field_kak.png b/ootrando_overworldmap_hamsda/images/entrance_grotto_field_kak.png
diff --git a/ootrando_overworldmap_hamsda/images/entrance_grotto_field_valley.png b/ootrando_overworldmap_hamsda/images/entrance_grotto_field_valley.png
diff --git a/ootrando_overworldmap_hamsda/images/entrance_grotto_kak_bomb.png b/ootrando_overworldmap_hamsda/images/entrance_grotto_kak_bomb.png
diff --git a/ootrando_overworldmap_hamsda/images/entrance_grotto_scrub.png b/ootrando_overworldmap_hamsda/images/entrance_grotto_scrub.png
diff --git a/ootrando_overworldmap_hamsda/images/entrance_grotto_tektite.png b/ootrando_overworldmap_hamsda/images/entrance_grotto_tektite.png
diff --git a/ootrando_overworldmap_hamsda/images/entrance_grotto_theater.png b/ootrando_overworldmap_hamsda/images/entrance_grotto_theater.png
diff --git a/ootrando_overworldmap_hamsda/images/entrance_grotto_wolfos.png b/ootrando_overworldmap_hamsda/images/entrance_grotto_wolfos.png
diff --git a/ootrando_overworldmap_hamsda/images/entrance_house_bowling.png b/ootrando_overworldmap_hamsda/images/entrance_house_bowling.png
diff --git a/ootrando_overworldmap_hamsda/images/entrance_house_chest.png b/ootrando_overworldmap_hamsda/images/entrance_house_chest.png
diff --git a/ootrando_overworldmap_hamsda/images/entrance_house_fairy.png b/ootrando_overworldmap_hamsda/images/entrance_house_fairy.png
diff --git a/ootrando_overworldmap_hamsda/images/entrance_house_fishing.png b/ootrando_overworldmap_hamsda/images/entrance_house_fishing.png
diff --git a/ootrando_overworldmap_hamsda/images/entrance_house_lab.png b/ootrando_overworldmap_hamsda/images/entrance_house_lab.png
diff --git a/ootrando_overworldmap_hamsda/images/entrance_house_link.png b/ootrando_overworldmap_hamsda/images/entrance_house_link.png
diff --git a/ootrando_overworldmap_hamsda/images/entrance_house_masks.png b/ootrando_overworldmap_hamsda/images/entrance_house_masks.png
diff --git a/ootrando_overworldmap_hamsda/images/entrance_house_pot.png b/ootrando_overworldmap_hamsda/images/entrance_house_pot.png
diff --git a/ootrando_overworldmap_hamsda/images/entrance_house_shoot_adult.png b/ootrando_overworldmap_hamsda/images/entrance_house_shoot_adult.png
diff --git a/ootrando_overworldmap_hamsda/images/entrance_house_shoot_child.png b/ootrando_overworldmap_hamsda/images/entrance_house_shoot_child.png
diff --git a/ootrando_overworldmap_hamsda/images/entrance_house_shop.png b/ootrando_overworldmap_hamsda/images/entrance_house_shop.png
diff --git a/ootrando_overworldmap_hamsda/images/entrance_house_skull.png b/ootrando_overworldmap_hamsda/images/entrance_house_skull.png
diff --git a/ootrando_overworldmap_hamsda/images/entrance_house_talon.png b/ootrando_overworldmap_hamsda/images/entrance_house_talon.png
diff --git a/ootrando_overworldmap_hamsda/images/entrance_house_tot.png b/ootrando_overworldmap_hamsda/images/entrance_house_tot.png
diff --git a/ootrando_overworldmap_hamsda/images/entrance_house_windmill.png b/ootrando_overworldmap_hamsda/images/entrance_house_windmill.png
diff --git a/ootrando_overworldmap_hamsda/images/entrance_overworld_bridge.png b/ootrando_overworldmap_hamsda/images/entrance_overworld_bridge.png
diff --git a/ootrando_overworldmap_hamsda/images/entrance_overworld_cg.png b/ootrando_overworldmap_hamsda/images/entrance_overworld_cg.png
diff --git a/ootrando_overworldmap_hamsda/images/entrance_overworld_col.png b/ootrando_overworldmap_hamsda/images/entrance_overworld_col.png
diff --git a/ootrando_overworldmap_hamsda/images/entrance_overworld_ct.png b/ootrando_overworldmap_hamsda/images/entrance_overworld_ct.png
diff --git a/ootrando_overworldmap_hamsda/images/entrance_overworld_cte.png b/ootrando_overworldmap_hamsda/images/entrance_overworld_cte.png
diff --git a/ootrando_overworldmap_hamsda/images/entrance_overworld_dmc.png b/ootrando_overworldmap_hamsda/images/entrance_overworld_dmc.png
diff --git a/ootrando_overworldmap_hamsda/images/entrance_overworld_dmt.png b/ootrando_overworldmap_hamsda/images/entrance_overworld_dmt.png
diff --git a/ootrando_overworldmap_hamsda/images/entrance_overworld_gc.png b/ootrando_overworldmap_hamsda/images/entrance_overworld_gc.png
diff --git a/ootrando_overworldmap_hamsda/images/entrance_overworld_gf.png b/ootrando_overworldmap_hamsda/images/entrance_overworld_gf.png
diff --git a/ootrando_overworldmap_hamsda/images/entrance_overworld_gv.png b/ootrando_overworldmap_hamsda/images/entrance_overworld_gv.png
diff --git a/ootrando_overworldmap_hamsda/images/entrance_overworld_gy.png b/ootrando_overworldmap_hamsda/images/entrance_overworld_gy.png
diff --git a/ootrando_overworldmap_hamsda/images/entrance_overworld_hf.png b/ootrando_overworldmap_hamsda/images/entrance_overworld_hf.png
diff --git a/ootrando_overworldmap_hamsda/images/entrance_overworld_kak.png b/ootrando_overworldmap_hamsda/images/entrance_overworld_kak.png
diff --git a/ootrando_overworldmap_hamsda/images/entrance_overworld_kf.png b/ootrando_overworldmap_hamsda/images/entrance_overworld_kf.png
diff --git a/ootrando_overworldmap_hamsda/images/entrance_overworld_lh.png b/ootrando_overworldmap_hamsda/images/entrance_overworld_lh.png
diff --git a/ootrando_overworldmap_hamsda/images/entrance_overworld_llr.png b/ootrando_overworldmap_hamsda/images/entrance_overworld_llr.png
diff --git a/ootrando_overworldmap_hamsda/images/entrance_overworld_lw.png b/ootrando_overworldmap_hamsda/images/entrance_overworld_lw.png
diff --git a/ootrando_overworldmap_hamsda/images/entrance_overworld_sfm.png b/ootrando_overworldmap_hamsda/images/entrance_overworld_sfm.png
diff --git a/ootrando_overworldmap_hamsda/images/entrance_overworld_wl.png b/ootrando_overworldmap_hamsda/images/entrance_overworld_wl.png
diff --git a/ootrando_overworldmap_hamsda/images/entrance_overworld_zd.png b/ootrando_overworldmap_hamsda/images/entrance_overworld_zd.png
diff --git a/ootrando_overworldmap_hamsda/images/entrance_overworld_zf.png b/ootrando_overworldmap_hamsda/images/entrance_overworld_zf.png
diff --git a/ootrando_overworldmap_hamsda/images/entrance_overworld_zr.png b/ootrando_overworldmap_hamsda/images/entrance_overworld_zr.png
diff --git a/ootrando_overworldmap_hamsda/images/map.png b/ootrando_overworldmap_hamsda/images/map.png
diff --git a/...worldmap_hamsda/images/oot_overworld2.png → ...rworldmap_hamsda/images/overworld_map.png b/...worldmap_hamsda/images/oot_overworld2.png → ...rworldmap_hamsda/images/overworld_map.png
diff --git a/ootrando_overworldmap_hamsda/images/setting_entrance_ext.png b/ootrando_overworldmap_hamsda/images/setting_entrance_ext.png
diff --git a/ootrando_overworldmap_hamsda/images/setting_entrance_int.png b/ootrando_overworldmap_hamsda/images/setting_entrance_int.png
diff --git a/ootrando_overworldmap_hamsda/items/dungeons.json b/ootrando_overworldmap_hamsda/items/dungeons.json
@@ -658,5 +658,17 @@
     "type": "toggle",
     "img": "images/boss_key.png",
     "codes": "generic_boss_key"
+  },
+  {
+    "name": "Generic Map",
+    "type": "toggle",
+    "img": "images/map.png",
+    "codes": "generic_map"
+  },
+  {
+    "name": "Generic Compass",
+    "type": "toggle",
+    "img": "images/compass.png",
+    "codes": "generic_compass"
   }
 ]
diff --git a/ootrando_overworldmap_hamsda/layouts/capture.json b/ootrando_overworldmap_hamsda/layouts/capture.json
@@ -31,7 +31,7 @@
         [
           "boomerang",
           "lens",
-          "",
+          "beans",
           "hammer",
           "lightarrow",
           "nayruslove",
@@ -75,13 +75,13 @@
         [
           "",
           "",
-          "",
-          "",
+          "generic_map",
+          "generic_compass",
+          "generic_small_key",
+          "generic_boss_key",
+          "rupee",
           "HP",
           "HC",
-          "rupee",
-          "generic_small_key",
-          "generic_boss_key"
         ]
       ]
     }

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.9",
+  "package_version": "2.4.0.0",
   "package_uid": "ootrando_overworldmap_hamsda",
   "author": "Hamsda",
   "variants": {
@@ -19,6 +19,9 @@
     },
     "var_minimalist": {
       "display_name": "Items Only (minimal)"
+    },
+    "var_entrance": {
+      "display_name": "Entrance Randomizer"
     }
   }
 }
diff --git a/ootrando_overworldmap_hamsda/maps/maps.json b/ootrando_overworldmap_hamsda/maps/maps.json
@@ -3,18 +3,18 @@
     "name": "child",
     "location_size": 35,
     "location_border_thickness": 5,
-    "img": "images/oot_overworld2.png"
+    "img": "images/overworld_map.png"
   },
   {
     "name": "adult",
     "location_size": 35,
     "location_border_thickness": 5,
-    "img": "images/oot_overworld2.png"
+    "img": "images/overworld_map.png"
   },
   {
     "name": "gossips",
     "location_size": 35,
     "location_border_thickness": 5,
-    "img": "images/oot_overworld2.png"
+    "img": "images/overworld_map.png"
   }
 ]
diff --git a/ootrando_overworldmap_hamsda/scripts/init.lua b/ootrando_overworldmap_hamsda/scripts/init.lua
@@ -1,28 +1,54 @@
-Tracker:AddItems("items/options.json")
-Tracker:AddItems("items/quest.json")
-Tracker:AddItems("items/equipment.json")
-Tracker:AddItems("items/items.json")
-Tracker:AddItems("items/dungeons.json")
-Tracker:AddItems("items/sequences.json")
+if Tracker.ActiveVariantUID == "var_entrance" then
+  Tracker:AddItems("items/options.json")
+  Tracker:AddItems("items/quest.json")
+  Tracker:AddItems("items/equipment.json")
+  Tracker:AddItems("items/items.json")
+  Tracker:AddItems("items/dungeons.json")
+  Tracker:AddItems("items/cap_grottos.json")
+  Tracker:AddItems("items/cap_houses.json")
+  Tracker:AddItems("items/cap_dungeons.json")
+  Tracker:AddItems("items/cap_overworld.json")
+
+  ScriptHost:LoadScript("scripts/logic.lua")
+  ScriptHost:LoadScript("scripts/update.lua")
 
-if Tracker.ActiveVariantUID == "var_itemsonlykeysanity" then
-  Tracker:FindObjectForCode("setting_gerudo").CurrentStage = 0
-end
+  Tracker:AddMaps("maps/maps.json")
 
-ScriptHost:LoadScript("scripts/logic.lua")
-ScriptHost:LoadScript("scripts/update.lua")
+  Tracker:AddLocations("locations/overworld.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")
+else
+  Tracker:AddItems("items/options.json")
+  Tracker:AddItems("items/quest.json")
+  Tracker:AddItems("items/equipment.json")
+  Tracker:AddItems("items/items.json")
+  Tracker:AddItems("items/dungeons.json")
+  Tracker:AddItems("items/sequences.json")
 
-Tracker:AddMaps("maps/maps.json")
+  if Tracker.ActiveVariantUID == "var_itemsonlykeysanity" then
+    Tracker:FindObjectForCode("setting_gerudo").CurrentStage = 0
+  end
 
-Tracker:AddLocations("locations/overworld.json")
-Tracker:AddLocations("locations/dung_reg.json")
-Tracker:AddLocations("locations/dung_reg_keys.json")
-Tracker:AddLocations("locations/dung_mq.json")
-Tracker:AddLocations("locations/dung_mq_keys.json")
+  ScriptHost:LoadScript("scripts/logic.lua")
+  ScriptHost:LoadScript("scripts/update.lua")
 
-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")
+  Tracker:AddMaps("maps/maps.json")
+
+  Tracker:AddLocations("locations/overworld.json")
+  Tracker:AddLocations("locations/dung_reg.json")
+  Tracker:AddLocations("locations/dung_reg_keys.json")
+  Tracker:AddLocations("locations/dung_mq.json")
+  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")
+end
diff --git a/ootrando_overworldmap_hamsda/var_entrance/items/cap_dungeons.json b/ootrando_overworldmap_hamsda/var_entrance/items/cap_dungeons.json
@@ -0,0 +1,68 @@
+[
+  {
+    "name": "Deku",
+    "type": "toggle",
+    "img": "images/label_deku.png",
+    "codes": "entrance_dungeon_deku"
+  },
+  {
+    "name": "DC",
+    "type": "toggle",
+    "img": "images/label_dodongo.png",
+    "codes": "entrance_dungeon_dodongo"
+  },
+  {
+    "name": "Jabu",
+    "type": "toggle",
+    "img": "images/label_jabu.png",
+    "codes": "entrance_dungeon_jabu"
+  },
+  {
+    "name": "Forest",
+    "type": "toggle",
+    "img": "images/label_forest.png",
+    "codes": "entrance_dungeon_forest"
+  },
+  {
+    "name": "Fire",
+    "type": "toggle",
+    "img": "images/label_fire.png",
+    "codes": "entrance_dungeon_fire"
+  },
+  {
+    "name": "Water",
+    "type": "toggle",
+    "img": "images/label_water.png",
+    "codes": "entrance_dungeon_water"
+  },
+  {
+    "name": "Spirit",
+    "type": "toggle",
+    "img": "images/label_spirit.png",
+    "codes": "entrance_dungeon_spirit"
+  },
+  {
+    "name": "Shadow",
+    "type": "toggle",
+    "img": "images/label_shadow.png",
+    "codes": "entrance_dungeon_shadow"
+  },
+  {
+    "name": "Well",
+    "type": "toggle",
+    "img": "images/label_botw.png",
+    "codes": "entrance_dungeon_botw"
+  },
+  {
+    "name": "IC",
+    "type": "toggle",
+    "img": "images/label_ice.png",
+    "codes": "entrance_dungeon_ice"
+  },
+  {
+    "name": "GTG",
+    "type": "toggle",
+    "img": "images/label_gtg.png",
+    "codes": "entrance_dungeon_gtg"
+  },
+]
diff --git a/ootrando_overworldmap_hamsda/var_entrance/items/cap_grottos.json b/ootrando_overworldmap_hamsda/var_entrance/items/cap_grottos.json
@@ -0,0 +1,56 @@
+[
+  {
+    "name": "Cow",
+    "type": "toggle",
+    "img": "images/entrance_grotto_cow.png",
+    "codes": "entrance_grotto_cow"
+  },
+  {
+    "name": "Scrub",
+    "type": "toggle",
+    "img": "images/entrance_grotto_scrub.png",
+    "codes": "entrance_grotto_scrub"
+  },
+  {
+    "name": "Deku Theater",
+    "type": "toggle",
+    "img": "images/entrance_grotto_theater.png",
+    "codes": "entrance_grotto_theater"
+  },
+  {
+    "name": "Kakariko Bombable Grotto",
+    "type": "toggle",
+    "img": "images/entrance_grotto_kak_bomb.png",
+    "codes": "entrance_grotto_kak_bomb"
+  },
+  {
+    "name": "Front of Meadow Grotto",
+    "type": "toggle",
+    "img": "images/entrance_grotto_wolfos.png",
+    "codes": "entrance_grotto_wolfos"
+  },
+  {
+    "name": "Castle Storms Grotto",
+    "type": "toggle",
+    "img": "images/entrance_grotto_castle_storms.png",
+    "codes": "entrance_grotto_castle_storms"
+  },
+  {
+    "name": "Field Kakariko Grotto",
+    "type": "toggle",
+    "img": "images/entrance_grotto_field_kak.png",
+    "codes": "entrance_grotto_field_kak"
+  },
+  {
+    "name": "Field North Lon Lon Grotto",
+    "type": "toggle",
+    "img": "images/entrance_grotto_tektite.png",
+    "codes": "entrance_grotto_tektite"
+  },
+  {
+    "name": "Field Valley Grotto",
+    "type": "toggle",
+    "img": "images/entrance_grotto_field_valley.png",
+    "codes": "entrance_grotto_field_valley"
+  },
+]