Merge pull request #26 from Hamsda/dev

update to version 2.1.4.0
Hamsda · Dec 5, 2018 · d0732e4 · d0732e4
2 parents fddc013 + dcfc8a2
commit d0732e4
Show file tree

Hide file tree

Showing 25 changed files with 314 additions and 149 deletions.
diff --git a/changelog.md b/changelog.md
@@ -1,5 +1,20 @@
 # Changelog
 
+## 2.1.4.0
+
+- changed horizontal tracker layout to be the same as vertical
+- changed items only variants to be fixed size
+- fixed Colossus arch HP logic
+- added MQ GTG SoT block sequence break
+- fixed MQ Forest Temple logic (hopefully)
+- fixed end of DC with chus in logic
+- added wasteland sequence break for longshot/hoverboots
+- added checks for child being able to attack to a lot of locations
+- fixed upper DMC can be opened as adult with hammer for child
+- added Zoras River upper HP hoverboots sequence break
+- fixed DMC bean to access middle and upper DMC
+- added Gerudo Fortress option and changed logic accordingly
+
 ## 2.1.3.5
 
 - added `Move King Zora`

diff --git a/ootrando_overworldmap_hamsda.zip b/ootrando_overworldmap_hamsda.zip
diff --git a/ootrando_overworldmap_hamsda/images/gerudo_fortress_fast.png b/ootrando_overworldmap_hamsda/images/gerudo_fortress_fast.png
diff --git a/ootrando_overworldmap_hamsda/images/gerudo_fortress_normal.png b/ootrando_overworldmap_hamsda/images/gerudo_fortress_normal.png
diff --git a/ootrando_overworldmap_hamsda/images/gerudo_fortress_open.png b/ootrando_overworldmap_hamsda/images/gerudo_fortress_open.png
diff --git a/ootrando_overworldmap_hamsda/items/options.json b/ootrando_overworldmap_hamsda/items/options.json
@@ -78,6 +78,28 @@
       }
     ]
   },
+  {
+    "name": "Gerudo Fortress",
+    "type": "progressive",
+    "allow_disabled": false,
+    "loop": true,
+    "stages": [
+      {
+        "img": "images/gerudo_fortress_normal.png",
+        "codes": "gerudo_fortress,gerudo_fortress_normal"
+      },
+      {
+        "img": "images/gerudo_fortress_fast.png",
+        "codes": "gerudo_fortress,gerudo_fortress_fast",
+        "inherit_codes": false
+      },
+      {
+        "img": "images/gerudo_fortress_open.png",
+        "codes": "gerudo_fortress,gerudo_fortress_open",
+        "inherit_codes": false
+      }
+    ]
+  },
   {
     "name": "Lens Requirement",
     "type": "progressive",

diff --git a/ootrando_overworldmap_hamsda/items/quest.json b/ootrando_overworldmap_hamsda/items/quest.json
@@ -11,12 +11,6 @@
     "img": "images/gerudocard.png",
     "codes": "gerudocard,card"
   },
-  {
-    "name": "Carpenter Rescue",
-    "type": "toggle",
-    "img": "images/gerudo_symbol_colored.png",
-    "codes": "carpenter,rescue"
-  },
   {
     "name": "Gold Skulltula Tokens",
     "type": "consumable",

diff --git a/ootrando_overworldmap_hamsda/items/sequences.json b/ootrando_overworldmap_hamsda/items/sequences.json
@@ -118,6 +118,23 @@
       }
     ]
   },
+  {
+    "name": "Carpenter Rescue",
+    "type": "progressive",
+    "allow_disabled": false,
+    "stages": [
+      {
+        "img": "images/gerudo_symbol_colored.png",
+        "img_mods": "@disabled",
+        "codes": "carpenter_rescue_no"
+      },
+      {
+        "img": "images/gerudo_symbol_colored.png",
+        "codes": "carpenter_rescue_yes",
+        "inherit_codes": false
+      }
+    ]
+  },
   {
     "name": "Move King Zora",
     "type": "progressive",

diff --git a/ootrando_overworldmap_hamsda/layouts/shared.json b/ootrando_overworldmap_hamsda/layouts/shared.json
@@ -60,7 +60,7 @@
             "wallet1",
             "magic",
             "card",
-            "carpenter",
+            "",
             "agony",
             "skulltula"
           ],
@@ -397,7 +397,7 @@
             "nocturnecheck",
             "preludecheck",
             "card",
-            "carpenter",
+            "",
             "agony"
           ]
         ]

diff --git a/ootrando_overworldmap_hamsda/layouts/tracker.json b/ootrando_overworldmap_hamsda/layouts/tracker.json
@@ -34,16 +34,16 @@
                     "type_forest",
                     "type_kak",
                     "type_door",
-                    "type_lens",
-                    "fewer_tunics"
+                    "gerudo_fortress",
+                    "logic_chus"
                   ],
                   [
-                    "logic_chus",
+                    "type_lens",
+                    "fewer_tunics",
                     "scrub_shuffle",
                     "shopsanity",
                     "all_skulltulas",
-                    "beans_plant",
-                    ""
+                    "beans_plant"
                   ]
                 ]
               }
@@ -97,7 +97,7 @@
       ]
     }
   },
-  "tracker_horizontal": {
+  "tracker_horizontal_old": {
     "type": "container",
     "background": "#212121",
     "content": {
@@ -136,21 +136,21 @@
                         "type_forest",
                         "type_kak",
                         "type_door",
-                        "type_lens",
-                        "fewer_tunics",
+                        "gerudo_fortress",
+                        "logic_chus",
                         "",
                         "",
                         ""
                       ],
                       [
-                        "logic_chus",
+                        "type_lens",
+                        "fewer_tunics",
                         "scrub_shuffle",
                         "shopsanity",
                         "all_skulltulas",
                         "beans_plant",
                         "",
                         "",
-                        "",
                         ""
                       ]
                     ]

diff --git a/ootrando_overworldmap_hamsda/locations/dungeons.json b/ootrando_overworldmap_hamsda/locations/dungeons.json
@@ -54,6 +54,9 @@
           {
             "name": "GS8 - Compass Room",
             "short_name": "Compass Room",
+            "access_rules": [
+              "@logic/can child attack"
+            ],
             "chest_unopened_img": "images/skulltula.png",
             "chest_opened_img": "images/skulltula_token.png",
             "item_count": 1
@@ -82,6 +85,9 @@
           {
             "name": "GS10 - Basement Gate",
             "short_name": "Gate",
+            "access_rules": [
+              "@logic/can child attack"
+            ],
             "chest_unopened_img": "images/skulltula.png",
             "chest_opened_img": "images/skulltula_token.png",
             "item_count": 1
@@ -153,15 +159,17 @@
       {
         "name": "Above Boss",
         "access_rules": [
-          "@Dodongos Cavern/Bomb Bag Chest,@logic/explosives",
+          "@Dodongos Cavern/Bomb Bag Chest,bombs",
+          "@Dodongos Cavern/Bomb Bag Chest,bombchu,[bombs]",
           "{agony}"
         ],
         "item_count": 1
       },
       {
         "name": "King Dodongo",
         "access_rules": [
-          "@Dodongos Cavern/Bomb Bag Chest,@logic/explosives"
+          "@Dodongos Cavern/Bomb Bag Chest,bombs",
+          "@Dodongos Cavern/Bomb Bag Chest,bombchu,[bombs]"
         ],
         "hosted_item": "dodongo",
         "chest_unopened_img": "images/HC.png",
@@ -1789,7 +1797,13 @@
     "sections": [
       {
         "name": "Free the carpenters",
-        "hosted_item": "carpenter",
+        "access_rules":[
+          "gerudo_fortress_normal,[bow]",
+          "gerudo_fortress_normal,[hookshot]",
+          "gerudo_fortress_normal,[hoverboots]",
+          "gerudo_fortress_fast"
+        ],
+        "hosted_item": "carpenter_rescue_yes",
         "item_count": 1
       }
     ],
@@ -1805,7 +1819,8 @@
     "name": "Gerudo Training Grounds",
     "parent": "Gerudo Fortress",
     "access_rules": [
-      "gtg_reg,carpenter,card"
+      "gtg_reg,carpenter_rescue_yes,card",
+      "gtg_reg,gerudo_fortress_open,card"
     ],
     "sections": [
       {

diff --git a/ootrando_overworldmap_hamsda/locations/mq.json b/ootrando_overworldmap_hamsda/locations/mq.json
@@ -213,7 +213,8 @@
       {
         "name": "Under Grave",
         "access_rules": [
-          "@logic/explosives"
+          "bombs",
+          "bombchu,[bombs]"
         ],
         "item_count": 1
       },
@@ -321,7 +322,7 @@
             "name": "GS42 - Back Area",
             "short_name": "Back Area",
             "access_rules": [
-              "@logic/explosives"
+              "@Dodongos Cavern MQ/Under Grave"
             ],
             "chest_unopened_img": "images/skulltula.png",
             "chest_opened_img": "images/skulltula_token.png",
@@ -598,25 +599,31 @@
       {
         "name": "Redead Chest",
         "access_rules": [
-          "[lift1]",
-          "[bombchu]"
+          "hoverboots",
+          "lift1",
+          "bombchu,[lift1]"
         ],
         "item_count": 1
       },
       {
         "name": "Well Chest",
         "access_rules": [
-          "bow",
-          "@Forest Temple MQ/Redead Chest,ironboots,[bow]"
+          "bow"
         ],
         "item_count": 1
       },
       {
         "name": "NE Outdoors Upper Chest",
         "access_rules": [
           "bow,[firearrow]",
-          "bow,[ocarina],[time]",
           "bow,[longshot]",
+          "bow,[ocarina],[time]",
+          "bow,[hoverboots]",
+          "@Forest Temple MQ/Redead Chest,longshot",
+          "@Forest Temple MQ/Redead Chest,ironboots,[ocarina],[time]",
+          "@Forest Temple MQ/Redead Chest,ironboots,[hoverboots]",
+          "@Forest Temple MQ/Redead Chest,scale2,[ocarina],[time]",
+          "@Forest Temple MQ/Redead Chest,scale2,[hoverboots]"
         ],
         "item_count": 1
       },
@@ -654,21 +661,23 @@
         "access_rules": [
           "@Forest Temple MQ/Bow Chest,bow",
           "@Forest Temple MQ/Bow Chest,dinsfire,magic",
+          "bow,longshot,ocarina,time"
         ],
         "item_count": 1
       },
       {
         "name": "NE Outdoors Lower Chest",
         "access_rules": [
           "bow,longshot",
+          "@Forest Temple MQ/Redead Chest,longshot",
           "@Forest Temple MQ/Falling Room Chest"
         ],
         "item_count": 1
       },
       {
         "name": "Near Boss Chest",
         "access_rules": [
-          "@Forest Temple MQ/Falling Room Chest,bow"
+          "@Forest Temple MQ/Falling Room Chest,@Forest Temple MQ/Bow Chest,bow"
         ],
         "item_count": 1
       },
@@ -727,6 +736,7 @@
             "short_name": "Outdoor East",
             "access_rules": [
               "@Forest Temple MQ/Redead Chest,ironboots",
+              "@Forest Temple MQ/Redead Chest,longshot",
               "@Forest Temple MQ/Redead Chest,scale2",
               "bow"
             ],
@@ -1954,7 +1964,8 @@
     "name": "Gerudo Training Grounds MQ",
     "parent": "Gerudo Fortress",
     "access_rules": [
-      "gtg_mq,carpenter,card"
+      "gtg_mq,carpenter_rescue_yes,card",
+      "gtg_mq,gerudo_fortress_open,card"
     ],
     "sections": [
       {
@@ -2026,7 +2037,7 @@
       {
         "name": "Second Iron Knuckle Chest",
         "access_rules": [
-          "@Gerudo Training Grounds MQ/Before Heavy Block Chest,ocarina,time,@logic/lens,bottle"
+          "@Gerudo Training Grounds MQ/Before Heavy Block Chest,[ocarina],[time],@logic/lens,bottle"
         ],
         "item_count": 1
       },