Merge pull request #23 from Hamsda/dev

update to version 2.1.3.4
Hamsda · Oct 29, 2018 · 414c663 · 414c663
2 parents abc3fbf + 6a05cf9
commit 414c663
Show file tree

Hide file tree

Showing 95 changed files with 149 additions and 95 deletions.
diff --git a/README.md b/README.md
@@ -24,7 +24,7 @@ The pack offers 4 different variants:
 ## Vanilla vs Master Quest Dungeons
 
 The Randomizer has the option to switch some or all dungeons to their Master Quest equivalents.  
-To accomodate for this, you can click on the dungeon labels to change them from vanilla ![vanilla deku](ootrando_overworldmap_hamsda/images/deku.png) to Master Quest ![mq deku](ootrando_overworldmap_hamsda/images/deku_mq.png). You can use this in the non map variants as well as a reminder.  
+To accomodate for this, you can click on the dungeon labels to change them from vanilla ![vanilla deku](ootrando_overworldmap_hamsda/images/label_deku.png) to Master Quest ![mq deku](ootrando_overworldmap_hamsda/images/label_deku_mq.png). You can use this in the non map variants as well as a reminder.  
 This also means that the key counts for the dungeons in the Keysanity variants will always go up to the maximum of vanilla and Master Quest: Forest Temple goes up to 6 small keys, because MQ Forest Temple has 6 small keys instead of 5 in vanilla; Water Temple also goes up to 6 small keys, because vanilla Water Temple has 6 small keys unlike the 2 it has in MQ.
 
 ## Special items

diff --git a/TODO b/TODO
diff --git a/changelog.md b/changelog.md
@@ -1,5 +1,15 @@
 # Changelog
 
+## 2.1.3.4
+
+- fixed SFM Storms grotto visibility
+- fixed child Goron City entrance with Dins
+- added Goron City left boulder maze sequence break with explosives and hoverboots
+- added Water Temple boss key chest sequence breaks with only hoverboots or only longshot
+- changed the bottle for minimal layout to only have 2 stages (bottle and letter)
+- changed the compact items for boots and tunics when only one half is obtained
+- improved chathud commands for dungeon prizes with secondary codes
+
 ## 2.1.3.3
 
 - changed Biggoron to be visible with just Stone of Agony (so you can mark him off without access)

diff --git a/ootrando_overworldmap_hamsda.zip b/ootrando_overworldmap_hamsda.zip
diff --git a/ootrando_overworldmap_hamsda/images/bluetunic-disabled.png b/ootrando_overworldmap_hamsda/images/bluetunic-disabled.png
diff --git a/ootrando_overworldmap_hamsda/images/bomb1.png b/ootrando_overworldmap_hamsda/images/bomb1.png
diff --git a/ootrando_overworldmap_hamsda/images/bomb2.png b/ootrando_overworldmap_hamsda/images/bomb2.png
diff --git a/ootrando_overworldmap_hamsda/images/bomb3.png b/ootrando_overworldmap_hamsda/images/bomb3.png
diff --git a/ootrando_overworldmap_hamsda/images/bomb4.png b/ootrando_overworldmap_hamsda/images/bomb4.png
diff --git a/ootrando_overworldmap_hamsda/images/bow3.png b/ootrando_overworldmap_hamsda/images/bow3.png
diff --git a/ootrando_overworldmap_hamsda/images/bow4.png b/ootrando_overworldmap_hamsda/images/bow4.png
diff --git a/ootrando_overworldmap_hamsda/images/bow5.png b/ootrando_overworldmap_hamsda/images/bow5.png
diff --git a/ootrando_overworldmap_hamsda/images/firemedallion_dc.png b/ootrando_overworldmap_hamsda/images/firemedallion_dc.png
diff --git a/ootrando_overworldmap_hamsda/images/firemedallion_deku.png b/ootrando_overworldmap_hamsda/images/firemedallion_deku.png
diff --git a/ootrando_overworldmap_hamsda/images/firemedallion_fit.png b/ootrando_overworldmap_hamsda/images/firemedallion_fit.png
diff --git a/ootrando_overworldmap_hamsda/images/firemedallion_ft.png b/ootrando_overworldmap_hamsda/images/firemedallion_ft.png
diff --git a/ootrando_overworldmap_hamsda/images/firemedallion_jabu.png b/ootrando_overworldmap_hamsda/images/firemedallion_jabu.png
diff --git a/ootrando_overworldmap_hamsda/images/firemedallion_sht.png b/ootrando_overworldmap_hamsda/images/firemedallion_sht.png
diff --git a/ootrando_overworldmap_hamsda/images/firemedallion_st.png b/ootrando_overworldmap_hamsda/images/firemedallion_st.png
diff --git a/ootrando_overworldmap_hamsda/images/firemedallion_unknown.png b/ootrando_overworldmap_hamsda/images/firemedallion_unknown.png
diff --git a/ootrando_overworldmap_hamsda/images/firemedallion_wt.png b/ootrando_overworldmap_hamsda/images/firemedallion_wt.png
diff --git a/ootrando_overworldmap_hamsda/images/forestmedallion_dc.png b/ootrando_overworldmap_hamsda/images/forestmedallion_dc.png
diff --git a/ootrando_overworldmap_hamsda/images/forestmedallion_deku.png b/ootrando_overworldmap_hamsda/images/forestmedallion_deku.png
diff --git a/ootrando_overworldmap_hamsda/images/forestmedallion_fit.png b/ootrando_overworldmap_hamsda/images/forestmedallion_fit.png
diff --git a/ootrando_overworldmap_hamsda/images/forestmedallion_ft.png b/ootrando_overworldmap_hamsda/images/forestmedallion_ft.png
diff --git a/ootrando_overworldmap_hamsda/images/forestmedallion_jabu.png b/ootrando_overworldmap_hamsda/images/forestmedallion_jabu.png
diff --git a/ootrando_overworldmap_hamsda/images/forestmedallion_sht.png b/ootrando_overworldmap_hamsda/images/forestmedallion_sht.png
diff --git a/ootrando_overworldmap_hamsda/images/forestmedallion_st.png b/ootrando_overworldmap_hamsda/images/forestmedallion_st.png
diff --git a/ootrando_overworldmap_hamsda/images/forestmedallion_unknown.png b/ootrando_overworldmap_hamsda/images/forestmedallion_unknown.png
diff --git a/ootrando_overworldmap_hamsda/images/forestmedallion_wt.png b/ootrando_overworldmap_hamsda/images/forestmedallion_wt.png
diff --git a/ootrando_overworldmap_hamsda/images/lightmedallion_dc.png b/ootrando_overworldmap_hamsda/images/lightmedallion_dc.png
diff --git a/ootrando_overworldmap_hamsda/images/lightmedallion_deku.png b/ootrando_overworldmap_hamsda/images/lightmedallion_deku.png
diff --git a/ootrando_overworldmap_hamsda/images/lightmedallion_fit.png b/ootrando_overworldmap_hamsda/images/lightmedallion_fit.png
diff --git a/ootrando_overworldmap_hamsda/images/lightmedallion_ft.png b/ootrando_overworldmap_hamsda/images/lightmedallion_ft.png
diff --git a/ootrando_overworldmap_hamsda/images/lightmedallion_jabu.png b/ootrando_overworldmap_hamsda/images/lightmedallion_jabu.png
diff --git a/ootrando_overworldmap_hamsda/images/lightmedallion_sht.png b/ootrando_overworldmap_hamsda/images/lightmedallion_sht.png
diff --git a/ootrando_overworldmap_hamsda/images/lightmedallion_st.png b/ootrando_overworldmap_hamsda/images/lightmedallion_st.png
diff --git a/ootrando_overworldmap_hamsda/images/lightmedallion_unknown.png b/ootrando_overworldmap_hamsda/images/lightmedallion_unknown.png
diff --git a/ootrando_overworldmap_hamsda/images/lightmedallion_wt.png b/ootrando_overworldmap_hamsda/images/lightmedallion_wt.png
diff --git a/ootrando_overworldmap_hamsda/images/nut2.png b/ootrando_overworldmap_hamsda/images/nut2.png
diff --git a/ootrando_overworldmap_hamsda/images/nut3.png b/ootrando_overworldmap_hamsda/images/nut3.png
diff --git a/ootrando_overworldmap_hamsda/images/nut4.png b/ootrando_overworldmap_hamsda/images/nut4.png
diff --git a/ootrando_overworldmap_hamsda/images/overlay_10.png b/ootrando_overworldmap_hamsda/images/overlay_10.png
diff --git a/ootrando_overworldmap_hamsda/images/overlay_20.png b/ootrando_overworldmap_hamsda/images/overlay_20.png
diff --git a/ootrando_overworldmap_hamsda/images/overlay_30.png b/ootrando_overworldmap_hamsda/images/overlay_30.png
diff --git a/ootrando_overworldmap_hamsda/images/overlay_30_green.png b/ootrando_overworldmap_hamsda/images/overlay_30_green.png
diff --git a/ootrando_overworldmap_hamsda/images/overlay_40.png b/ootrando_overworldmap_hamsda/images/overlay_40.png
diff --git a/ootrando_overworldmap_hamsda/images/overlay_40_green.png b/ootrando_overworldmap_hamsda/images/overlay_40_green.png
diff --git a/ootrando_overworldmap_hamsda/images/overlay_50_green.png b/ootrando_overworldmap_hamsda/images/overlay_50_green.png
diff --git a/ootrando_overworldmap_hamsda/images/redtunic-disabled.png b/ootrando_overworldmap_hamsda/images/redtunic-disabled.png
diff --git a/ootrando_overworldmap_hamsda/images/shadowmedallion_dc.png b/ootrando_overworldmap_hamsda/images/shadowmedallion_dc.png
diff --git a/ootrando_overworldmap_hamsda/images/shadowmedallion_deku.png b/ootrando_overworldmap_hamsda/images/shadowmedallion_deku.png
diff --git a/ootrando_overworldmap_hamsda/images/shadowmedallion_fit.png b/ootrando_overworldmap_hamsda/images/shadowmedallion_fit.png
diff --git a/ootrando_overworldmap_hamsda/images/shadowmedallion_ft.png b/ootrando_overworldmap_hamsda/images/shadowmedallion_ft.png
diff --git a/ootrando_overworldmap_hamsda/images/shadowmedallion_jabu.png b/ootrando_overworldmap_hamsda/images/shadowmedallion_jabu.png
diff --git a/ootrando_overworldmap_hamsda/images/shadowmedallion_sht.png b/ootrando_overworldmap_hamsda/images/shadowmedallion_sht.png
diff --git a/ootrando_overworldmap_hamsda/images/shadowmedallion_st.png b/ootrando_overworldmap_hamsda/images/shadowmedallion_st.png
diff --git a/ootrando_overworldmap_hamsda/images/shadowmedallion_unknown.png b/ootrando_overworldmap_hamsda/images/shadowmedallion_unknown.png
diff --git a/ootrando_overworldmap_hamsda/images/shadowmedallion_wt.png b/ootrando_overworldmap_hamsda/images/shadowmedallion_wt.png
diff --git a/ootrando_overworldmap_hamsda/images/sling3.png b/ootrando_overworldmap_hamsda/images/sling3.png
diff --git a/ootrando_overworldmap_hamsda/images/sling4.png b/ootrando_overworldmap_hamsda/images/sling4.png
diff --git a/ootrando_overworldmap_hamsda/images/sling5.png b/ootrando_overworldmap_hamsda/images/sling5.png
diff --git a/ootrando_overworldmap_hamsda/images/spiritmedallion_dc.png b/ootrando_overworldmap_hamsda/images/spiritmedallion_dc.png
diff --git a/ootrando_overworldmap_hamsda/images/spiritmedallion_deku.png b/ootrando_overworldmap_hamsda/images/spiritmedallion_deku.png
diff --git a/ootrando_overworldmap_hamsda/images/spiritmedallion_fit.png b/ootrando_overworldmap_hamsda/images/spiritmedallion_fit.png
diff --git a/ootrando_overworldmap_hamsda/images/spiritmedallion_ft.png b/ootrando_overworldmap_hamsda/images/spiritmedallion_ft.png
diff --git a/ootrando_overworldmap_hamsda/images/spiritmedallion_jabu.png b/ootrando_overworldmap_hamsda/images/spiritmedallion_jabu.png
diff --git a/ootrando_overworldmap_hamsda/images/spiritmedallion_sht.png b/ootrando_overworldmap_hamsda/images/spiritmedallion_sht.png
diff --git a/ootrando_overworldmap_hamsda/images/spiritmedallion_st.png b/ootrando_overworldmap_hamsda/images/spiritmedallion_st.png
diff --git a/ootrando_overworldmap_hamsda/images/spiritmedallion_unknown.png b/ootrando_overworldmap_hamsda/images/spiritmedallion_unknown.png
diff --git a/ootrando_overworldmap_hamsda/images/spiritmedallion_wt.png b/ootrando_overworldmap_hamsda/images/spiritmedallion_wt.png
diff --git a/ootrando_overworldmap_hamsda/images/stick1.png b/ootrando_overworldmap_hamsda/images/stick1.png
diff --git a/ootrando_overworldmap_hamsda/images/stick2.png b/ootrando_overworldmap_hamsda/images/stick2.png
diff --git a/ootrando_overworldmap_hamsda/images/stick3.png b/ootrando_overworldmap_hamsda/images/stick3.png
diff --git a/ootrando_overworldmap_hamsda/images/unknown-small.png b/ootrando_overworldmap_hamsda/images/unknown-small.png
diff --git a/ootrando_overworldmap_hamsda/images/unknown.png b/ootrando_overworldmap_hamsda/images/unknown.png
diff --git a/ootrando_overworldmap_hamsda/images/watermedallion_dc.png b/ootrando_overworldmap_hamsda/images/watermedallion_dc.png
diff --git a/ootrando_overworldmap_hamsda/images/watermedallion_deku.png b/ootrando_overworldmap_hamsda/images/watermedallion_deku.png
diff --git a/ootrando_overworldmap_hamsda/images/watermedallion_fit.png b/ootrando_overworldmap_hamsda/images/watermedallion_fit.png
diff --git a/ootrando_overworldmap_hamsda/images/watermedallion_ft.png b/ootrando_overworldmap_hamsda/images/watermedallion_ft.png
diff --git a/ootrando_overworldmap_hamsda/images/watermedallion_jabu.png b/ootrando_overworldmap_hamsda/images/watermedallion_jabu.png
diff --git a/ootrando_overworldmap_hamsda/images/watermedallion_sht.png b/ootrando_overworldmap_hamsda/images/watermedallion_sht.png
diff --git a/ootrando_overworldmap_hamsda/images/watermedallion_st.png b/ootrando_overworldmap_hamsda/images/watermedallion_st.png
diff --git a/ootrando_overworldmap_hamsda/images/watermedallion_unknown.png b/ootrando_overworldmap_hamsda/images/watermedallion_unknown.png
diff --git a/ootrando_overworldmap_hamsda/images/watermedallion_wt.png b/ootrando_overworldmap_hamsda/images/watermedallion_wt.png
diff --git a/ootrando_overworldmap_hamsda/items/dungeons.json b/ootrando_overworldmap_hamsda/items/dungeons.json
@@ -12,7 +12,7 @@
     "allow_disabled": false,
     "stages": [
       {
-        "img": "images/unknown-small.png",
+        "img": "images/unknown.png",
         "codes": "free"
       },
       {
@@ -65,33 +65,34 @@
     "loop": true,
     "stages": [
       {
-        "img": "images/unknown-small.png",
-        "codes": "deku"
+        "img": "images/unknown.png",
+        "codes": "deku",
+        "secondary_codes": "unknown"
       },
       {
         "img": "images/stones.png",
         "codes": "deku,stones",
-        "inherit_codes": false
+        "secondary_codes": "stones,stone"
       },
       {
         "img": "images/forestmedallion.png",
         "codes": "deku,forestmed",
-        "inherit_codes": false
+        "secondary_codes": "forest,forestmed"
       },
       {
         "img": "images/nocturne_medallions.png",
         "codes": "deku,noct_meds",
-        "inherit_codes": false
+        "secondary_codes": "noct_meds,nocturne"
       },
       {
         "img": "images/lacs_medallions.png",
         "codes": "deku,lacs_meds",
-        "inherit_codes": false
+        "secondary_codes": "lacs_meds,lacs,lightarrow"
       },
       {
         "img": "images/lightmedallion.png",
         "codes": "deku,lightmed",
-        "inherit_codes": false
+        "secondary_codes": "light,lightmed"
       }
     ]
   },
@@ -118,33 +119,34 @@
     "loop": true,
     "stages": [
       {
-        "img": "images/unknown-small.png",
-        "codes": "dodongo,dc"
+        "img": "images/unknown.png",
+        "codes": "dodongo,dc",
+        "secondary_codes": "unknown"
       },
       {
         "img": "images/stones.png",
-        "codes": "dodongo,stones",
-        "inherit_codes": false
+        "codes": "dodongo,dc,stones",
+        "secondary_codes": "stones,stone"
       },
       {
         "img": "images/forestmedallion.png",
-        "codes": "dodongo,forestmed",
-        "inherit_codes": false
+        "codes": "dodongo,dc,forestmed",
+        "secondary_codes": "forest,forestmed"
       },
       {
         "img": "images/nocturne_medallions.png",
-        "codes": "dodongo,noct_meds",
-        "inherit_codes": false
+        "codes": "dodongo,dc,noct_meds",
+        "secondary_codes": "noct_meds,nocturne"
       },
       {
         "img": "images/lacs_medallions.png",
-        "codes": "dodongo,lacs_meds",
-        "inherit_codes": false
+        "codes": "dodongo,dc,lacs_meds",
+        "secondary_codes": "lacs_meds,lacs,lightarrow"
       },
       {
         "img": "images/lightmedallion.png",
-        "codes": "dodongo,lightmed",
-        "inherit_codes": false
+        "codes": "dodongo,dc,lightmed",
+        "secondary_codes": "light,lightmed"
       }
     ]
   },
@@ -171,33 +173,34 @@
     "loop": true,
     "stages": [
       {
-        "img": "images/unknown-small.png",
-        "codes": "jabu"
+        "img": "images/unknown.png",
+        "codes": "jabu",
+        "secondary_codes": "unknown"
       },
       {
         "img": "images/stones.png",
         "codes": "jabu,stones",
-        "inherit_codes": false
+        "secondary_codes": "stones,stone"
       },
       {
         "img": "images/forestmedallion.png",
         "codes": "jabu,forestmed",
-        "inherit_codes": false
+        "secondary_codes": "forest,forestmed"
       },
       {
         "img": "images/nocturne_medallions.png",
         "codes": "jabu,noct_meds",
-        "inherit_codes": false
+        "secondary_codes": "noct_meds,nocturne"
       },
       {
         "img": "images/lacs_medallions.png",
         "codes": "jabu,lacs_meds",
-        "inherit_codes": false
+        "secondary_codes": "lacs_meds,lacs,lightarrow"
       },
       {
         "img": "images/lightmedallion.png",
         "codes": "jabu,lightmed",
-        "inherit_codes": false
+        "secondary_codes": "light,lightmed"
       }
     ]
   },
@@ -237,33 +240,34 @@
     "loop": true,
     "stages": [
       {
-        "img": "images/unknown-small.png",
-        "codes": "forest"
+        "img": "images/unknown.png",
+        "codes": "forest",
+        "secondary_codes": "unknown"
       },
       {
         "img": "images/stones.png",
         "codes": "forest,stones",
-        "inherit_codes": false
+        "secondary_codes": "stones,stone"
       },
       {
         "img": "images/forestmedallion.png",
         "codes": "forest,forestmed",
-        "inherit_codes": false
+        "secondary_codes": "forest,forestmed"
       },
       {
         "img": "images/nocturne_medallions.png",
         "codes": "forest,noct_meds",
-        "inherit_codes": false
+        "secondary_codes": "noct_meds,nocturne"
       },
       {
         "img": "images/lacs_medallions.png",
         "codes": "forest,lacs_meds",
-        "inherit_codes": false
+        "secondary_codes": "lacs_meds,lacs,lightarrow"
       },
       {
         "img": "images/lightmedallion.png",
         "codes": "forest,lightmed",
-        "inherit_codes": false
+        "secondary_codes": "light,lightmed"
       }
     ]
   },
@@ -303,33 +307,34 @@
     "loop": true,
     "stages": [
       {
-        "img": "images/unknown-small.png",
-        "codes": "fire"
+        "img": "images/unknown.png",
+        "codes": "fire",
+        "secondary_codes": "unknown"
       },
       {
         "img": "images/stones.png",
         "codes": "fire,stones",
-        "inherit_codes": false
+        "secondary_codes": "stones,stone"
       },
       {
         "img": "images/forestmedallion.png",
         "codes": "fire,forestmed",
-        "inherit_codes": false
+        "secondary_codes": "forest,forestmed"
       },
       {
         "img": "images/nocturne_medallions.png",
         "codes": "fire,noct_meds",
-        "inherit_codes": false
+        "secondary_codes": "noct_meds,nocturne"
       },
       {
         "img": "images/lacs_medallions.png",
         "codes": "fire,lacs_meds",
-        "inherit_codes": false
+        "secondary_codes": "lacs_meds,lacs,lightarrow"
       },
       {
         "img": "images/lightmedallion.png",
         "codes": "fire,lightmed",
-        "inherit_codes": false
+        "secondary_codes": "light,lightmed"
       }
     ]
   },
@@ -369,33 +374,34 @@
     "loop": true,
     "stages": [
       {
-        "img": "images/unknown-small.png",
-        "codes": "water"
+        "img": "images/unknown.png",
+        "codes": "water",
+        "secondary_codes": "unknown"
       },
       {
         "img": "images/stones.png",
         "codes": "water,stones",
-        "inherit_codes": false
+        "secondary_codes": "stones,stone"
       },
       {
         "img": "images/forestmedallion.png",
         "codes": "water,forestmed",
-        "inherit_codes": false
+        "secondary_codes": "forest,forestmed"
       },
       {
         "img": "images/nocturne_medallions.png",
         "codes": "water,noct_meds",
-        "inherit_codes": false
+        "secondary_codes": "noct_meds,nocturne"
       },
       {
         "img": "images/lacs_medallions.png",
         "codes": "water,lacs_meds",
-        "inherit_codes": false
+        "secondary_codes": "lacs_meds,lacs,lightarrow"
       },
       {
         "img": "images/lightmedallion.png",
         "codes": "water,lightmed",
-        "inherit_codes": false
+        "secondary_codes": "light,lightmed"
       }
     ]
   },
@@ -435,33 +441,34 @@
     "loop": true,
     "stages": [
       {
-        "img": "images/unknown-small.png",
-        "codes": "spirit"
+        "img": "images/unknown.png",
+        "codes": "spirit",
+        "secondary_codes": "unknown"
       },
       {
         "img": "images/stones.png",
         "codes": "spirit,stones",
-        "inherit_codes": false
+        "secondary_codes": "stones,stone"
       },
       {
         "img": "images/forestmedallion.png",
         "codes": "spirit,forestmed",
-        "inherit_codes": false
+        "secondary_codes": "forest,forestmed"
       },
       {
         "img": "images/nocturne_medallions.png",
         "codes": "spirit,noct_meds",
-        "inherit_codes": false
+        "secondary_codes": "noct_meds,nocturne"
       },
       {
         "img": "images/lacs_medallions.png",
         "codes": "spirit,lacs_meds",
-        "inherit_codes": false
+        "secondary_codes": "lacs_meds,lacs,lightarrow"
       },
       {
         "img": "images/lightmedallion.png",
         "codes": "spirit,lightmed",
-        "inherit_codes": false
+        "secondary_codes": "light,lightmed"
       }
     ]
   },
@@ -501,33 +508,34 @@
     "loop": true,
     "stages": [
       {
-        "img": "images/unknown-small.png",
-        "codes": "shadow"
+        "img": "images/unknown.png",
+        "codes": "shadow",
+        "secondary_codes": "unknown"
       },
       {
         "img": "images/stones.png",
         "codes": "shadow,stones",
-        "inherit_codes": false
+        "secondary_codes": "stones,stone"
       },
       {
         "img": "images/forestmedallion.png",
         "codes": "shadow,forestmed",
-        "inherit_codes": false
+        "secondary_codes": "forest,forestmed"
       },
       {
         "img": "images/nocturne_medallions.png",
         "codes": "shadow,noct_meds",
-        "inherit_codes": false
+        "secondary_codes": "noct_meds,nocturne"
       },
       {
         "img": "images/lacs_medallions.png",
         "codes": "shadow,lacs_meds",
-        "inherit_codes": false
+        "secondary_codes": "lacs_meds,lacs,lightarrow"
       },
       {
         "img": "images/lightmedallion.png",
         "codes": "shadow,lightmed",
-        "inherit_codes": false
+        "secondary_codes": "light,lightmed"
       }
     ]
   },