Merge pull request #24 from Hamsda/dev

update to version 2.1.3.5

changelog.md

@@ -1,5 +1,21 @@
 # Changelog
 
+## 2.1.3.5
+
+- added `Move King Zora`
+  - new location on child map to indicate you showed Rutos letter
+  - added sequence breakable checks to the Zoras Fountain locations for moving him
+- fixed Impas cow is always in logic
+- added/fixed a few MQ things:
+  - added MQ Deku Tree Gohma sequence break for sling
+  - added MQ Shadow Temple stalfos room sequence break with just hookshot
+  - fixed MQ Shadow Temple Bongo requires bow (and added chu sequence break for it)
+  - fixed MQ Water Temple wrong ironboots and lullaby sequence breaks
+  - fixed MQ Spirit Temple sun block room
+  - fixed MQ Ganons Castle scrubs lens logic
+  - added MQ GTG stalfos room sequence break with just hookshot
+- fixed Zoras Fountain child/adult logic
+
 ## 2.1.3.4
 
 - fixed SFM Storms grotto visibility

ootrando_overworldmap_hamsda/items/sequences.json

@@ -117,5 +117,22 @@
         "inherit_codes": false
       }
     ]
+  },
+  {
+    "name": "Move King Zora",
+    "type": "progressive",
+    "allow_disabled": false,
+    "stages": [
+      {
+        "img": "images/king_zora.png",
+        "img_mods": "@disabled",
+        "codes": "king_zora_moved_no"
+      },
+      {
+        "img": "images/king_zora.png",
+        "codes": "king_zora_moved_yes",
+        "inherit_codes": false
+      }
+    ]
   }
 ]

ootrando_overworldmap_hamsda/locations/dungeons.json

@@ -1695,7 +1695,7 @@
     "name": "Ice Cavern",
     "parent": "Zoras Fountain A",
     "access_rules": [
-      "ice_reg,@logic/ice cavern"
+      "ice_reg,@logic/adult fountain,bottle"
     ],
     "sections": [
       {
@@ -1719,7 +1719,7 @@
       {
         "name": "Sheik in Ice Cavern",
         "access_rules": [
-          "@logic/ice cavern",
+          "bottle",
           "{agony}"
         ],
         "capture_item": true,

ootrando_overworldmap_hamsda/locations/mq.json

@@ -37,8 +37,7 @@
       {
         "name": "Basement",
         "access_rules": [
-          "sticks",
-          "dinsfire,magic"
+          "@Deku Tree MQ/Slingshot Room Back"
         ],
         "item_count": 1
       },
@@ -60,8 +59,8 @@
       {
         "name": "Queen Gohma",
         "access_rules": [
-          "sling,sticks,shield1",
-          "sling,dinsfire,magic,sword1,shield1"
+          "[sling],sticks,shield1",
+          "[sling],dinsfire,magic,sword1,shield1"
         ],
         "hosted_item": "deku",
         "chest_unopened_img": "images/HC.png",
@@ -772,8 +771,7 @@
         "name": "Chest Near Boss",
         "access_rules": [
           "hoverboots,@logic/has fire",
-          "hookshot,bow,firearrow,magic",
-          "hookshot,dinsfire,magic"
+          "hookshot,@logic/has fire"
         ],
         "item_count": 1
       },
@@ -947,8 +945,7 @@
       {
         "name": "Map Chest",
         "access_rules": [
-          "ironboots,@logic/has fire",
-          "longshot,[ironboots],@logic/has fire"
+          "ironboots,@logic/has fire"
         ],
         "item_count": 1
       },
@@ -963,9 +960,7 @@
         "name": "Compass Chest",
         "access_rules": [
           "ocarina,lullaby,ironboots,bow",
-          "ocarina,lullaby,ironboots,dinsfire,magic",
-          "ocarina,lullaby,longshot,[ironboots],bow",
-          "ocarina,lullaby,longshot,[ironboots],dinsfire,magic"
+          "ocarina,lullaby,ironboots,dinsfire,magic"
         ],
         "item_count": 1
       },
@@ -1056,7 +1051,7 @@
             "name": "GS76 - Lizalfos Hallway",
             "short_name": "Lizalfos Hallway",
             "access_rules": [
-              "@Water Temple MQ/Longshot Chest,dinsfire,magic"
+              "ocarina,lullaby,ironboots,dinsfire,magic"
             ],
             "chest_unopened_img": "images/skulltula.png",
             "chest_opened_img": "images/skulltula_token.png",
@@ -1066,7 +1061,7 @@
             "name": "GS77 - Before Upper Water Switch",
             "short_name": "Before Upper Water Switch",
             "access_rules": [
-              "@Water Temple MQ/Longshot Chest,longshot"
+              "ocarina,lullaby,ironboots,longshot"
             ],
             "chest_unopened_img": "images/skulltula.png",
             "chest_opened_img": "images/skulltula_token.png",
@@ -1179,14 +1174,15 @@
       {
         "name": "Stalfos Room Chest",
         "access_rules": [
-          "@Shadow Temple MQ/Invisible Spikes Chest,longshot"
+          "@Shadow Temple MQ/Invisible Spikes Chest,longshot",
+          "@Shadow Temple MQ/Invisible Spikes Chest,hookshot,[longshot]"
         ],
         "item_count": 1
       },
       {
         "name": "Wind Hint Chest",
         "access_rules": [
-          "@Shadow Temple MQ/Falling Spikes Lower Chest,hoverboots,hookshot"
+          "@Shadow Temple MQ/Invisible Spikes Chest,hookshot"
         ],
         "item_count": 1
       },
@@ -1238,7 +1234,8 @@
       {
         "name": "Bongo Bongo",
         "access_rules": [
-          "@Shadow Temple MQ/Wind Hint Chest,ocarina,lullaby"
+          "@Shadow Temple MQ/Wind Hint Chest,ocarina,lullaby,bow",
+          "@Shadow Temple MQ/Wind Hint Chest,ocarina,lullaby,bombchu,[bow]"
         ],
         "hosted_item": "shadow",
         "chest_unopened_img": "images/HC.png",
@@ -1448,7 +1445,8 @@
       {
         "name": "Sun Block Room Chest",
         "access_rules": [
-          "sword2,lift2,longshot,bombchu,ocarina,time"
+          "sword2,lift2,longshot,bombchu",
+          "ocarina,requiem,bombchu,time"
         ],
         "item_count": 1
       },
@@ -1841,6 +1839,9 @@
           {
             "name": "Hidden Room",
             "short_name": "Hidden Room",
+            "access_rules": [
+              "@logic/lens"
+            ],
             "chest_unopened_img": "images/deku_scrub.png",
             "chest_opened_img": "images/deku_scrub_grey.png",
             "item_count": 5
@@ -1860,7 +1861,7 @@
     "name": "Ice Cavern MQ",
     "parent": "Zoras Fountain A",
     "access_rules": [
-      "ice_mq,@logic/ice cavern"
+      "ice_mq,@logic/adult fountain,bottle"
     ],
     "sections": [
       {
@@ -1887,7 +1888,7 @@
       {
         "name": "Sheik in Ice Cavern",
         "access_rules": [
-          "@logic/ice cavern",
+          "bottle",
           "{agony}"
         ],
         "capture_item": true,
@@ -1995,7 +1996,8 @@
         "name": "Underwater Silver Rupee Chest",
         "access_rules": [
           "@Gerudo Training Grounds MQ/Dinolfos Chest,hoverboots,@logic/has fire,ironboots,@logic/bluetunic",
-          "@Gerudo Training Grounds MQ/Maze Right Central Chest,@logic/has fire,ironboots,@logic/bluetunic"
+          "@Gerudo Training Grounds MQ/Maze Right Central Chest,longshot,@logic/has fire,ironboots,@logic/bluetunic",
+          "@Gerudo Training Grounds MQ/Maze Right Central Chest,bow,@logic/has fire,ironboots,@logic/bluetunic"
         ],
         "capture_item": true,
         "item_count": 1
@@ -2010,7 +2012,7 @@
       {
         "name": "Before Heavy Block Chest",
         "access_rules": [
-          "@Gerudo Training Grounds MQ/First Iron Knuckle Chest,longshot"
+          "@Gerudo Training Grounds MQ/First Iron Knuckle Chest,hookshot,[longshot]"
         ],
         "item_count": 1
       },
@@ -2022,16 +2024,16 @@
         "item_count": 1
       },
       {
-        "name": "Eye Statue Chest",
+        "name": "Second Iron Knuckle Chest",
         "access_rules": [
-          "@Gerudo Training Grounds MQ/Second Iron Knuckle Chest,bow"
+          "@Gerudo Training Grounds MQ/Before Heavy Block Chest,ocarina,time,@logic/lens,bottle"
         ],
         "item_count": 1
       },
       {
-        "name": "Second Iron Knuckle Chest",
+        "name": "Eye Statue Chest",
         "access_rules": [
-          "@Gerudo Training Grounds MQ/Before Heavy Block Chest,ocarina,time,@logic/lens,bottle"
+          "@Gerudo Training Grounds MQ/Second Iron Knuckle Chest,bow"
         ],
         "item_count": 1
       },

ootrando_overworldmap_hamsda/locations/overworld.json

@@ -108,10 +108,20 @@
         "item_count": 1
       },
       {
-        "name": "ice cavern",
+        "name": "child fountain",
         "access_rules": [
-          "@logic/explosives,[ocarina],[lullaby],ruto,sword2",
-          "scale1,[ocarina],[lullaby],ruto,sword2"
+          "@logic/explosives,[ocarina],[lullaby],ruto,[king_zora_moved_yes]",
+          "scale1,ruto,[king_zora_moved_yes]"
+        ],
+        "item_count": 1
+      },
+      {
+        "name": "adult fountain",
+        "access_rules": [
+          "@logic/explosives,ocarina,lullaby,ruto,[king_zora_moved_yes],sword2",
+          "scale1,ruto,[king_zora_moved_yes],sword2,ocarina,lullaby",
+          "@logic/explosives,[ocarina],[lullaby],ruto,[king_zora_moved_yes],sword2,hoverboots",
+          "scale1,ruto,[king_zora_moved_yes],sword2,[ocarina],[lullaby],hoverboots"
         ],
         "item_count": 1
       }
@@ -1421,10 +1431,6 @@
                     "sections": [
                       {
                         "name": "HP in Cage",
-                        "access_rules": [
-                          "[bombs]",
-                          "sword2,[hookshot]"
-                        ],
                         "chest_unopened_img": "images/HP.png",
                         "chest_opened_img": "images/HP_grey.png",
                         "item_count": 1
@@ -3137,6 +3143,25 @@
                       }
                     ]
                   },
+                  {
+                    "name": "Move King Zora",
+                    "sections": [
+                      {
+                        "name": "Show Letter",
+                        "access_rules": [
+                          "king_zora_moved_no,ruto"
+                        ],
+                        "hosted_item": "king_zora_moved_yes"
+                      }
+                    ],
+                    "map_locations": [
+                      {
+                        "map": "child",
+                        "x": 2624,
+                        "y": 367
+                      }
+                    ]
+                  },
                   {
                     "name": "Zora Shop",
                     "access_rules": [
@@ -3185,8 +3210,7 @@
               {
                 "name": "Zoras Fountain C",
                 "access_rules": [
-                  "@logic/explosives,[ocarina],[lullaby],ruto",
-                  "scale1,ruto"
+                  "@logic/child fountain"
                 ],
                 "children": [
                   {
@@ -4525,8 +4549,9 @@
                 "name": "King Zora",
                 "access_rules": [
                   "bottle,[wallet2]",
-                  "bottle,@logic/ice cavern",
-                  "bottle,@Ganons Castle/Water Trial"
+                  "bottle,@logic/adult fountain",
+                  "bottle,@Ganons Castle/Water Trial",
+                  "bottle,@Gerudo Training Grounds MQ/Before Heavy Block Chest"
                 ],
                 "sections": [
                   {
@@ -4578,8 +4603,7 @@
           {
             "name": "Zoras Fountain A",
             "access_rules": [
-              "@logic/explosives,[ocarina],[lullaby],ruto",
-              "scale1,[ocarina],[lullaby],ruto"
+              "@logic/adult fountain"
             ],
             "children": [
               {

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.1.3.4",
+  "package_version": "2.1.3.5",
   "package_uid": "ootrando_overworldmap_hamsda",
   "author": "Hamsda",
   "variants": {

ootrando_overworldmap_hamsda/var_keysanity/locations/dungeons.json

@@ -1709,7 +1709,7 @@
     "name": "Ice Cavern",
     "parent": "Zoras Fountain A",
     "access_rules": [
-      "ice_reg,@logic/ice cavern"
+      "ice_reg,@logic/adult fountain,bottle"
     ],
     "sections": [
       {
@@ -1733,7 +1733,7 @@
       {
         "name": "Sheik in Ice Cavern",
         "access_rules": [
-          "@logic/ice cavern",
+          "bottle",
           "{agony}"
         ],
         "capture_item": true,