update to version 2.4.1.0 (#65)

update to version 2.4.1.0

changelog.md

@@ -1,5 +1,20 @@
 # Changelog
 
+## 2.4.1.0
+
+- changed images for overworld ER to be more colorful
+- changed ER Darunias spot visible on child map
+- added new graves to ER captures
+- added sequence breaks for new logic tricks:
+  - Forest Temple MQ NE outdoors ledge w/ hovers
+  - Fire Temple MQ big lava room bombable chest w/o hookshot
+  - Fire Temple MQ flame wall maze skip
+  - Water Temple falling platform room GS w/ hookshot
+  - Ice Cavern MQ scarecrow GS w/o anything
+  - Light Trial MQ w/o hookshot
+  - Link the Goron w/ dins
+  - DMC upper to lower w/ hammer
+
 ## 2.4.0.2
 
 - added MQ Forest Temple basement sequence break with 4 keys

ootrando_overworldmap_hamsda/locations/dung_mq.json

@@ -722,7 +722,7 @@
             "name": "GS71 - Scarecrow",
             "short_name": "Scarecrow",
             "access_rules": [
-              "hookshot,ocarina,[scarecrow]",
+              "[hookshot],[ocarina],[scarecrow]",
               "longshot,hoverboots"
             ],
             "chest_unopened_img": "images/skulltula.png",

ootrando_overworldmap_hamsda/locations/dung_mq_keys.json

@@ -106,7 +106,8 @@
         "access_rules": [
           "bow,longshot",
           "@Forest Temple MQ/Redead Chest,longshot",
-          "@Forest Temple MQ/Falling Room Chest"
+          "@Forest Temple MQ/Falling Room Chest",
+          "@Forest Temple MQ/NE Outdoors Upper Chest,hoverboots,[longshot]"
         ],
         "item_count": 1
       },
@@ -258,7 +259,7 @@
         "name": "Big Lava Room Bombable Chest",
         "short_name": "Lava Room Bombable",
         "access_rules": [
-          "hammer,hookshot,$has_fire,$has_explosives"
+          "hammer,[hookshot],$has_fire,$has_explosives"
         ],
         "item_count": 1
       },
@@ -369,7 +370,7 @@
             "short_name": "Fire Maze Side",
             "access_rules": [
               "@Fire Temple MQ/Freestanding Key,ocarina,time",
-              "@Fire Temple MQ/Freestanding Key,hoverboots"
+              "@Fire Temple MQ/Freestanding Key,[hoverboots]"
             ],
             "chest_unopened_img": "images/skulltula.png",
             "chest_opened_img": "images/skulltula_token.png",
@@ -801,7 +802,8 @@
             "name": "GS85 - Near Boss",
             "short_name": "Near Boss",
             "access_rules": [
-              "@Shadow Temple MQ Skulltulas/GS84 - After Ship,bow"
+              "@Shadow Temple MQ Skulltulas/GS84 - After Ship,bow",
+              "@Shadow Temple MQ Skulltulas/GS84 - After Ship,bombchu,[bow]"
             ],
             "chest_unopened_img": "images/skulltula.png",
             "chest_opened_img": "images/skulltula_token.png",
@@ -1357,7 +1359,7 @@
         "name": "Castle Tower",
         "access_rules": [
           "$can_LA,lift3,ocarina,time,$has_goron_tunic,$has_bottle,$can_see_with_lens,hammer,bombchu,shield3,firearrow,longshot",
-          "$can_LA,lift3,ocarina,time,$has_goron_tunic,$has_bottle,$can_see_with_lens,hammer,bombchu,shield3,firearrow,hookshot,hoverboots"
+          "$can_LA,lift3,ocarina,time,$has_goron_tunic,$has_bottle,$can_see_with_lens,hammer,bombchu,shield3,firearrow,[hookshot],hoverboots"
         ],
         "chest_unopened_img": "images/chest_golden_closed.png",
         "chest_opened_img": "images/chest_golden_open.png",

ootrando_overworldmap_hamsda/locations/dung_reg_keys.json

@@ -519,15 +519,11 @@
         "name": "Boss Key Chest",
         "short_name": "Boss Key",
         "access_rules": [
-          "ironboots,longshot,hoverboots",
           "ironboots,longshot,$has_explosives,lift1",
           "ironboots,longshot,[hoverboots]",
-          "ironboots,longshot,[$has_explosives],[lift1]",
-          "ironboots,hoverboots,[longshot]",
-          "[ironboots],longshot,ocarina,lullaby,hoverboots",
+          "ironboots,[longshot],hoverboots",
           "[ironboots],longshot,ocarina,lullaby,$has_explosives,lift1",
           "[ironboots],longshot,ocarina,lullaby,[hoverboots]",
-          "[ironboots],longshot,ocarina,lulla0by,[$has_explosives],[lift1]",
           "{$hintable}"
         ],
         "capture_item": true,
@@ -602,6 +598,7 @@
             "short_name": "Platform Room",
             "access_rules": [
               "longshot",
+              "[longshot],hookshot",
               "{bow}"
             ],
             "capture_item": true,
@@ -614,8 +611,8 @@
             "short_name": "Near Boss Key",
             "access_rules": [
               "ironboots,longshot",
-              "[ironboots],longshot,ocarina,lullaby",
-              "ironboots,[longshot],hoverboots"
+              "ironboots,[longshot],hoverboots",
+              "[ironboots],longshot,ocarina,lullaby"
             ],
             "chest_unopened_img": "images/skulltula.png",
             "chest_opened_img": "images/skulltula_token.png",
@@ -760,8 +757,8 @@
       {
         "name": "Bongo Bongo",
         "access_rules": [
-          "@Shadow Temple/Wind Hint Chest,ocarina,lullaby,bow",
           "@Shadow Temple/Wind Hint Chest,ocarina,lullaby,longshot,ocarina,[scarecrow]",
+          "@Shadow Temple/Wind Hint Chest,ocarina,lullaby,bow",
           "@Shadow Temple/Wind Hint Chest,ocarina,lullaby,bombchu,[bow]"
         ],
         "hosted_item": "shadow",

ootrando_overworldmap_hamsda/locations/overworld.json

@@ -3752,8 +3752,7 @@
                           "ocarina,bolero,sword2,bean_crater_yes",
                           "ocarina,bolero,sword2,hookshot",
                           "ocarina,bolero,sword2,hoverboots",
-                          "sword2,lift1",
-                          "sword2,bow",
+                          "$link_the_goron",
                           "{ocarina,bolero}"
                         ],
                         "capture_item": true,
@@ -3786,10 +3785,10 @@
                           "sword2,ocarina,bolero,bean_crater_yes",
                           "sword2,ocarina,bolero,hoverboots,[setting_plant_no],[beans]",
                           "sword2,ocarina,bolero,hoverboots,[bean_crater_yes]",
-                          "$link_the_goron,hoverboots,[ocarina],[bolero],[setting_plant_no],[beans]",
-                          "$link_the_goron,hoverboots,[ocarina],[bolero],[bean_crater_yes]",
                           "sword2,hammer,hoverboots,[ocarina],[bolero],[setting_plant_no],[beans]",
                           "sword2,hammer,hoverboots,[ocarina],[bolero],[bean_crater_yes]",
+                          "$link_the_goron,hoverboots,[ocarina],[bolero],[setting_plant_no],[beans]",
+                          "$link_the_goron,hoverboots,[ocarina],[bolero],[bean_crater_yes]",
                           "{$hintable}",
                           "{ocarina,bolero}",
                           "{$link_the_goron}",
@@ -3822,7 +3821,8 @@
                           "ocarina,bolero,hookshot",
                           "ocarina,bolero,setting_plant_no,beans",
                           "ocarina,bolero,bean_crater_yes",
-                          "hoverboots"
+                          "hoverboots",
+                          "[]"
                         ],
                         "item_count": 1
                       }
@@ -3849,7 +3849,8 @@
                           "ocarina,bolero,hookshot",
                           "ocarina,bolero,setting_plant_no,beans",
                           "ocarina,bolero,bean_crater_yes",
-                          "hoverboots"
+                          "hoverboots",
+                          "[]"
                         ],
                         "visibility_rules": [
                           "setting_scrub_shuffle_yes"

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

ootrando_overworldmap_hamsda/scripts/logic.lua

@@ -205,32 +205,40 @@ end
 
 function link_the_goron()
   if has("sword2") then
-    if 
-    (
-      has("lift1")
-      or
-      has("bow")
-    )
+    if has("lift1")
+    or has("bow")
     then
-      return 1
+      return 1, AccessibilityLevel.Normal
     else
-      return has_explosives()
+      local explo_count, explo_level = has_explosives()
+      if explo_count > 0 then
+        return explo_count, explo_level
+      elseif has("dinsfire") and has("magic") then
+        return 1, AccessibilityLevel.SequenceBreak
+      end
     end
   end
   return 0
 end
 
 function dmc_central()
   if has("sword2") then
-    if
-    has("ocarina") and has("bolero")
-    or
-    has("hammer") and has("hoverboots")
-    then
-      return 1
+    if has("ocarina") and has("bolero") then
+      return 1, AccessibilityLevel.Normal
     else
-      if has("hoverboots") or has("hookshot") then
-        return link_the_goron()
+      local goron_count, goron_level = link_the_goron()
+      if has("hoverboots") then
+        if has("hammer") then
+          return 1, AccessibilityLevel.Normal
+        else
+          return goron_count, goron_level
+        end
+      elseif has("hookshot") then
+        if goron_count > 0 then
+          return goron_count, goron_level
+        elseif has("hammer") then
+          return 1, AccessibilityLevel.SequenceBreak
+        end
       end
     end
   end

ootrando_overworldmap_hamsda/var_entrance/items/cap_grottos.json

@@ -1,51 +1,69 @@
 [
-  {
-    "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": "Cow",
+    "type": "toggle",
+    "img": "images/entrance_grotto_cow.png",
+    "codes": "entrance_grotto_cow"
+  },
   {
     "name": "Deku Theater",
     "type": "toggle",
     "img": "images/entrance_grotto_theater.png",
     "codes": "entrance_grotto_theater"
   },
   {
-    "name": "Kakariko Bombable Grotto",
+    "name": "Composer Grave",
     "type": "toggle",
-    "img": "images/entrance_grotto_kak_bomb.png",
-    "codes": "entrance_grotto_kak_bomb"
+    "img": "images/entrance_grotto_comp.png",
+    "codes": "entrance_grotto_comp"
+  },
+  {
+    "name": "Dampes Grave",
+    "type": "toggle",
+    "img": "images/entrance_grotto_dampe.png",
+    "codes": "entrance_grotto_dampe"
+  },
+  {
+    "name": "Heart Piece Grave",
+    "type": "toggle",
+    "img": "images/entrance_grotto_hp.png",
+    "codes": "entrance_grotto_hp"
   },
   {
     "name": "Front of Meadow Grotto",
     "type": "toggle",
     "img": "images/entrance_grotto_wolfos.png",
     "codes": "entrance_grotto_wolfos"
   },
+  {
+    "name": "Field North Lon Lon Grotto",
+    "type": "toggle",
+    "img": "images/entrance_grotto_tektite.png",
+    "codes": "entrance_grotto_tektite"
+  },
   {
     "name": "Castle Storms Grotto",
     "type": "toggle",
     "img": "images/entrance_grotto_castle_storms.png",
     "codes": "entrance_grotto_castle_storms"
   },
   {
-    "name": "Field Kakariko Grotto",
+    "name": "Kakariko Bombable Grotto",
     "type": "toggle",
-    "img": "images/entrance_grotto_field_kak.png",
-    "codes": "entrance_grotto_field_kak"
+    "img": "images/entrance_grotto_kak_bomb.png",
+    "codes": "entrance_grotto_kak_bomb"
   },
   {
-    "name": "Field North Lon Lon Grotto",
+    "name": "Field Kakariko Grotto",
     "type": "toggle",
-    "img": "images/entrance_grotto_tektite.png",
-    "codes": "entrance_grotto_tektite"
+    "img": "images/entrance_grotto_field_kak.png",
+    "codes": "entrance_grotto_field_kak"
   },
   {
     "name": "Field Valley Grotto",