changed closed forest behavior to include sequence breaking Gohma

Hamsda · Aug 15, 2020 · 75b7488 · 75b7488
1 parent 9f717b6
commit 75b7488
Show file tree

Hide file tree

Showing 3 changed files with 22 additions and 7 deletions.
diff --git a/ootrando_overworldmap_hamsda/changelog.md b/ootrando_overworldmap_hamsda/changelog.md
@@ -1,5 +1,9 @@
 # Changelog
 
+## x
+
+- changed closed forest behavior to include sequence breaking Gohma
+
 ## 2.9.3.0
 
 - changed dungeon size on the maps

diff --git a/ootrando_overworldmap_hamsda/locations/dung_reg.json b/ootrando_overworldmap_hamsda/locations/dung_reg.json
@@ -84,8 +84,8 @@
         "name": "GS11 - Basement Back Room",
         "short_name": "Back Room",
         "access_rules": [
-          "$has_explosives,[sling],boomerang,sticks",
-          "$has_explosives,[sling],boomerang,dinsfire,magic",
+          "$has_explosives,[sling],boomerang,sticks", //TODO: trick logic_deku_b1_skip
+          "$has_explosives,[sling],boomerang,dinsfire,magic", //TODO: trick logic_deku_b1_skip
           "{$has_explosives,sling,sticks}",
           "{$has_explosives,sling,dinsfire,magic}"
         ],
@@ -100,8 +100,8 @@
       {
         "name": "Queen Gohma",
         "access_rules": [
-          "shield1,[sling],sticks",
-          "shield1,[sling],sword1,dinsfire,magic"
+          "shield1,[sling],sticks", //TODO: trick logic_deku_b1_skip
+          "shield1,[sling],sword1,dinsfire,magic" //TODO: trick logic_deku_b1_skip
         ],
         "hosted_item": "deku",
         "chest_unopened_img": "images/HC.png",

diff --git a/ootrando_overworldmap_hamsda/scripts/logic.lua b/ootrando_overworldmap_hamsda/scripts/logic.lua
@@ -175,12 +175,23 @@ end
 function can_leave_forest()
   if has("setting_forest_open")
   or has("setting_forest_deku")
-  or has("sling") and has("sword1") 
+  --or has_age("adult")
   then
     return 1
-  else
-    return 0
   end
+
+  if has("shield1") and has("sword1") then
+    if has("sling") then
+      return 1
+    end
+    return 1, AccessibilityLevel.SequenceBreak --TODO: trick logic_deku_b1_skip
+  end
+
+  if has("deku") then
+    return 1, AccessibilityLevel.SequenceBreak
+  end
+
+  return 0
 end
 
 function beyond_mido()