Merge pull request #116 from Hamsda:ootr

update to version 3.4.3.0
Hamsda · May 9, 2021 · ab2a3d4 · ab2a3d4
2 parents 45da11e + c5e4953
commit ab2a3d4
Show file tree

Hide file tree

Showing 6 changed files with 45 additions and 29 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,11 @@
 # Changelog
 
+## 3.4.3.0
+
+- improved same-scene interior connections
+- fixed DMT falling rocks GS sequence break
+- fixed chu bowling showing sequence breakable in ER
+
 ## 3.4.2.0
 
 - fixed big poes in ER

diff --git a/ootrando_overworldmap_hamsda/locations/overworld.json b/ootrando_overworldmap_hamsda/locations/overworld.json
@@ -3058,7 +3058,7 @@
                         "short_name": "GS",
                         "access_rules": [
                           "$has_age|adult,$night_gs,hammer",
-                          "$has_age|adult,$night_gs,[logic_trail_gs_upper]"
+                          "$has_age|adult,$night_gs,$dmc_upper,[logic_trail_gs_upper]"
                         ],
                         "visibility_rules": [
                           "setting_tokens_overworld"

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

diff --git a/ootrando_overworldmap_hamsda/scripts/regions.lua b/ootrando_overworldmap_hamsda/scripts/regions.lua
@@ -2803,18 +2803,30 @@ data_per_region = {
     ["locations"] = {
       ["Market Bombchu Bowling First Prize"] = {
         ["child_access"] = function()
-          return has_bombchus()
+          if has_bombchus() == AccessibilityLevel.Normal then
+            return AccessibilityLevel.Normal
+          end
+          return AccessibilityLevel.None
         end,
         ["adult_access"] = function()
-          return has_bombchus()
+          if has_bombchus() == AccessibilityLevel.Normal then
+            return AccessibilityLevel.Normal
+          end
+          return AccessibilityLevel.None
         end
       },
       ["Market Bombchu Bowling Second Prize"] = {
         ["child_access"] = function()
-          return has_bombchus()
+          if has_bombchus() == AccessibilityLevel.Normal then
+            return AccessibilityLevel.Normal
+          end
+          return AccessibilityLevel.None
         end,
         ["adult_access"] = function()
-          return has_bombchus()
+          if has_bombchus() == AccessibilityLevel.Normal then
+            return AccessibilityLevel.Normal
+          end
+          return AccessibilityLevel.None
         end
       }
     },
@@ -15513,31 +15525,29 @@ function build_regions()
               set_location_access(age, location, new_access, access)
             end
           end
-          if not region_data.interior then
-            if type(region_data.exits) == "table" then
-              for exit, exit_data in pairs(region_data.exits) do
-                local age_func = (age == 1) and "child_access" or "adult_access"
-                local new_access = exit_data[age_func]()
+          if type(region_data.exits) == "table" then
+            for exit, exit_data in pairs(region_data.exits) do
+              local age_func = (age == 1) and "child_access" or "adult_access"
+              local new_access = exit_data[age_func]()
 
-                local same_scene =
-                  region_data.scene and data_per_region[exit] and data_per_region[exit].scene and
-                  region_data.scene == data_per_region[exit].scene
+              local same_scene =
+                region_data.scene and data_per_region[exit] and data_per_region[exit].scene and
+                region_data.scene == data_per_region[exit].scene
 
-                if region_data.special and (not same_scene) then
-                  if not has(special_regions[region].setting) then
-                    set_region_access(age, exit, new_access, access)
-                  elseif special_regions[region].origin then
-                    set_region_access(age, special_regions[region].origin, access, access)
-                  end
-                else
-                  if exit_data.fixed or same_scene then
+              if region_data.special and (not same_scene) then
+                if not has(special_regions[region].setting) then
+                  set_region_access(age, exit, new_access, access)
+                elseif special_regions[region].origin then
+                  set_region_access(age, special_regions[region].origin, access, access)
+                end
+              else
+                if exit_data.fixed or same_scene then
+                  set_region_access(age, exit, new_access, access)
+                elseif not same_scene and not region_data.dungeon and not region_data.interior then
+                  if exit_data.setting and not has(exit_data.setting) then
                     set_region_access(age, exit, new_access, access)
-                  elseif not same_scene and not region_data.dungeon then
-                    if exit_data.setting and not has(exit_data.setting) then
-                      set_region_access(age, exit, new_access, access)
-                    elseif exit_data.capture and data_per_region[exit_data.capture] then
-                      set_region_access(age, exit_data.capture, new_access, access)
-                    end
+                  elseif exit_data.capture and data_per_region[exit_data.capture] then
+                    set_region_access(age, exit_data.capture, new_access, access)
                   end
                 end
               end

diff --git a/repository.json b/repository.json
@@ -10,7 +10,7 @@
         "pins",
         "chathud"
       ],
-      "version": "3.4.2.0",
+      "version": "3.4.3.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",