Merge pull request #107 from Hamsda:ootr

update to version 3.3.1.0
Hamsda · Feb 2, 2021 · 75dd886 · 75dd886
2 parents b5f713b + 5fc8fcc
commit 75dd886
Show file tree

Hide file tree

Showing 7 changed files with 69 additions and 14 deletions.
diff --git a/ootrando_overworldmap_hamsda.zip b/ootrando_overworldmap_hamsda.zip
diff --git a/ootrando_overworldmap_hamsda/changelog.md b/ootrando_overworldmap_hamsda/changelog.md
@@ -1,5 +1,10 @@
 # Changelog
 
+## 3.3.1.0
+
+- fixed Spirit fire locked chests with sticks
+- added blue fire logic to ER (buying not supported)
+
 ## 3.3.0.0
 
 - fixed child scarecrow showing w/ scarecrow marked

diff --git a/ootrando_overworldmap_hamsda/locations/dung_reg.json b/ootrando_overworldmap_hamsda/locations/dung_reg.json
@@ -1967,7 +1967,7 @@
       {
         "name": "Central Chamber",
         "access_rules": [
-          "@Spirit Temple/Child Climb,$has_explosives",
+          "@Spirit Temple/Child Entry,spirit_small_keys:1,$has_explosives",
           "@Spirit Temple/Early Adult,spirit_small_keys:1"
         ],
         "visibility_rules": [
@@ -2093,7 +2093,7 @@
           "@Spirit Temple/Central Chamber,[spirit_small_keys:2],setting_logic_chus_yes,dinsfire,magic",
           "@Spirit Temple/Central Chamber,[spirit_small_keys:2],setting_logic_chus_yes,magic,firearrow,bow,sticks",
           "@Spirit Temple/Central Chamber,[spirit_small_keys:2],setting_logic_chus_yes,[logic_spirit_map_chest],bow,sticks",
-          "@Spirit Temple/Central Chamber,[spirit_small_keys:5],$has_explosives,sticks",
+          "@Spirit Temple/Central Chamber,$child_colossus,[spirit_small_keys:5],$has_explosives,sticks",
           "@Spirit Temple/Central Chamber,[spirit_small_keys:3],magic,firearrow,bow,lift2",
           "@Spirit Temple/Central Chamber,[spirit_small_keys:3],[logic_spirit_map_chest],bow,lift2"
         ],
@@ -2143,7 +2143,7 @@
           "@Spirit Temple/Central Chamber,[spirit_small_keys:2],setting_logic_chus_yes,dinsfire,magic",
           "@Spirit Temple/Central Chamber,[spirit_small_keys:2],setting_logic_chus_yes,magic,firearrow,bow,sticks",
           "@Spirit Temple/Central Chamber,[spirit_small_keys:2],setting_logic_chus_yes,[logic_spirit_sun_chest],bow,sticks",
-          "@Spirit Temple/Central Chamber,[spirit_small_keys:5],$has_explosives,sticks",
+          "@Spirit Temple/Central Chamber,$child_colossus,[spirit_small_keys:5],$has_explosives,sticks",
           "@Spirit Temple/Central Chamber,[spirit_small_keys:3],magic,firearrow,bow,lift2",
           "@Spirit Temple/Central Chamber,[spirit_small_keys:3],[logic_spirit_sun_chest],bow,lift2"
         ],

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": "3.3.0.0",
+  "package_version": "3.3.1.0",
   "package_uid": "ootrando_overworldmap_hamsda",
   "author": "Hamsda",
   "variants": {

diff --git a/ootrando_overworldmap_hamsda/scripts/logic_entrance.lua b/ootrando_overworldmap_hamsda/scripts/logic_entrance.lua
@@ -246,6 +246,40 @@ function has_bottle()
   return or_accessibility(deliver, travel)
 end
 
+blue_fire_locations = {
+  ["either"] = {
+    "Ganons Castle Water Trial",
+    "Ganons Castle MQ Water Trial",
+    "Gerudo Training Grounds MQ Stalfos Room",
+    "Ice Cavern MQ Map Room"
+  },
+  ["adult"] = {
+    "Ice Cavern"
+  }
+}
+function has_blue_fire()
+  local bottle = has_bottle()
+
+  if bottle == AccessibilityLevel.None then
+    return AccessibilityLevel.None
+  end
+
+  --TODO: shopsanity
+  --if has("wallet2") then
+  --  return bottle
+  --end
+
+  for age, locations in pairs(blue_fire_locations) do
+    for _, location in ipairs(locations) do
+      if access_region(location, age) == AccessibilityLevel.Normal then
+        return bottle
+      end
+    end
+  end
+
+  return AccessibilityLevel.SequenceBreak
+end
+
 function drain_well()
   if has("ocarina") and has("storm") then
     return access_region("Kak Windmill", "child")

diff --git a/ootrando_overworldmap_hamsda/scripts/regions.lua b/ootrando_overworldmap_hamsda/scripts/regions.lua
@@ -58,6 +58,23 @@ data_per_region = {
           return AccessibilityLevel.Normal
         end
       },
+      --non starting age has guaranteed access to ToT
+      --this makes it so you don't have to SW to begin exploring
+      ["Temple of Time"] = {
+        ["fixed"] = true,
+        ["child_access"] = function()
+          if has("setting_age_adult") then
+            return AccessibilityLevel.Normal
+          end
+          return AccessibilityLevel.None
+        end,
+        ["adult_access"] = function()
+          if has("setting_age_child") then
+            return AccessibilityLevel.Normal
+          end
+          return AccessibilityLevel.None
+        end
+      },
       ["Prelude of Light Warp"] = {
         ["child_access"] = function()
           if has("ocarina") and has("prelude") then
@@ -4712,8 +4729,7 @@ data_per_region = {
           return AccessibilityLevel.Normal
         end,
         ["adult_access"] = function()
-          --TODO: blue fire
-          return has_bottle()
+          return has_blue_fire()
         end
       },
       ["ZD Storms Grotto"] = {
@@ -10895,7 +10911,7 @@ data_per_region = {
       },
       ["Ice Cavern Compass Chest"] = {
         ["child_access"] = function()
-          return has_bottle() --TODO: blue fire
+          return has_blue_fire()
         end,
         ["adult_access"] = function()
           return has_bottle()
@@ -10904,7 +10920,7 @@ data_per_region = {
       ["Ice Cavern Iron Boots Chest"] = {
         ["child_access"] = function()
           if has("sling") or has("sticks") or has("sword1") or (has("dinsfire") and has("magic")) then
-            return has_bottle() --TODO: blue fire
+            return has_blue_fire()
           end
           return AccessibilityLevel.None
         end,
@@ -10915,7 +10931,7 @@ data_per_region = {
       ["Sheik in Ice Cavern"] = {
         ["child_access"] = function()
           if has("sling") or has("sticks") or has("sword1") or (has("dinsfire") and has("magic")) then
-            return has_bottle() --TODO: blue fire
+            return has_blue_fire()
           end
           return AccessibilityLevel.None
         end,
@@ -10925,7 +10941,7 @@ data_per_region = {
       },
       ["Ice Cavern Freestanding PoH"] = {
         ["child_access"] = function()
-          return has_bottle() --TODO: blue fire
+          return has_blue_fire()
         end,
         ["adult_access"] = function()
           return has_bottle()
@@ -10948,7 +10964,7 @@ data_per_region = {
       ["Ice Cavern GS Heart Piece Room"] = {
         ["child_access"] = function()
           if has("boomerang") then
-            return has_bottle() --TODO: blue fire
+            return has_blue_fire()
           end
           return AccessibilityLevel.None
         end,
@@ -10962,7 +10978,7 @@ data_per_region = {
       ["Ice Cavern GS Push Block Room"] = {
         ["child_access"] = function()
           if has("boomerang") then
-            return has_bottle() --TODO: blue fire
+            return has_blue_fire()
           end
           return AccessibilityLevel.None
         end,
@@ -11015,7 +11031,7 @@ data_per_region = {
       },
       ["Ice Cavern MQ Iron Boots Region"] = {
         ["child_access"] = function()
-          return has_bottle() --TODO: blue fire
+          return has_blue_fire()
         end,
         ["adult_access"] = function()
           return has_bottle()

diff --git a/repository.json b/repository.json
@@ -10,7 +10,7 @@
         "pins",
         "chathud"
       ],
-      "version": "3.3.0.0",
+      "version": "3.3.1.0",
       "uid": "ootrando_overworldmap_hamsda",
       "link": "https://hamsda.github.io/EmoTrackerPacks/ootrando_overworldmap_hamsda.zip",
       "documentation_url": "https://github.com/Hamsda/EmoTrackerPacks/blob/master/ootrando_overworldmap_hamsda/README.md",