renamed a few settings

Hamsda · Aug 15, 2020 · 9f717b6 · 9f717b6
1 parent 8b73faa
commit 9f717b6
Show file tree

Hide file tree

Showing 4 changed files with 10 additions and 10 deletions.
diff --git a/ootrando_overworldmap_hamsda/items/options.json b/ootrando_overworldmap_hamsda/items/options.json
@@ -8,16 +8,16 @@
     "stages": [
       {
         "img": "images/setting_forest_closed.png",
-        "codes": "setting_forest,closed_forest"
+        "codes": "setting_forest,setting_forest_closed"
       },
       {
         "img": "images/setting_forest_deku.png",
-        "codes": "setting_forest,closed_deku",
+        "codes": "setting_forest,setting_forest_deku",
         "inherits_codes": false
       },
       {
         "img": "images/setting_forest_open.png",
-        "codes": "setting_forest,open_forest",
+        "codes": "setting_forest,setting_forest_open",
         "inherits_codes": false
       }
     ]
@@ -31,11 +31,11 @@
     "stages": [
       {
         "img": "images/setting_door_closed.png",
-        "codes": "setting_door,closed_door"
+        "codes": "setting_door,setting_door_closed"
       },
       {
         "img": "images/setting_door_open.png",
-        "codes": "setting_door,open_door",
+        "codes": "setting_door,setting_door_open",
         "inherit_codes": false
       }
     ]

diff --git a/ootrando_overworldmap_hamsda/locations/dung_mq.json b/ootrando_overworldmap_hamsda/locations/dung_mq.json
@@ -3,7 +3,7 @@
     "name": "Deku Tree MQ",
     "parent": "Kokiri Forest",
     "access_rules": [
-      "deku_mq,$has_age|child,open_forest",
+      "deku_mq,$has_age|child,setting_forest_open",
       "deku_mq,$has_age|child,sword1,shield1"
     ],
     "sections": [

diff --git a/ootrando_overworldmap_hamsda/locations/dung_reg.json b/ootrando_overworldmap_hamsda/locations/dung_reg.json
@@ -3,7 +3,7 @@
     "name": "Deku Tree",
     "parent": "Kokiri Forest",
     "access_rules": [
-      "deku_reg,$has_age|child,open_forest",
+      "deku_reg,$has_age|child,setting_forest_open",
       "deku_reg,$has_age|child,sword1,shield1"
     ],
     "sections": [

diff --git a/ootrando_overworldmap_hamsda/scripts/logic.lua b/ootrando_overworldmap_hamsda/scripts/logic.lua
@@ -9,7 +9,7 @@ function has(item, amount)
 end
 
 function can_time_travel()
-  if has("open_door")
+  if has("setting_door_open")
   or (has("ocarina") and has("time"))
   then
     return 1
@@ -173,8 +173,8 @@ function hidden_grotto()
 end
 
 function can_leave_forest()
-  if has("open_forest")
-  or has("closed_deku")
+  if has("setting_forest_open")
+  or has("setting_forest_deku")
   or has("sling") and has("sword1") 
   then
     return 1