split cardkey load grid

coveleski · May 17, 2024 · baee73e · baee73e
1 parent b6b9961
commit baee73e
Show file tree

Hide file tree

Showing 6 changed files with 54 additions and 13 deletions.
diff --git a/items/options.json b/items/options.json
@@ -78,6 +78,32 @@
             }
         ]
     },
+    {
+        "name": "Card Key Option",
+        "type": "progressive",
+        "loop": true,
+        "allow_disabled": false,
+        "stages": [
+            {
+                "name": "Card Key - Vanilla",
+                "img_mods": "@disabled",
+                "img": "images/items/cardkey.png",
+                "codes": "opt_cardkey,opt_cardkey_off"
+            },
+            {
+                "name": "Card Key - Progressive",
+                "img_mods": "@disabled",
+                "img": "images/items/cardkey.png",
+                "codes": "opt_cardkey,opt_cardkey_prog"
+            },
+            {
+                "name": "Cardkey - Split",
+                "img": "images/items/cardkey.png",
+                "codes": "opt_cardkey,opt_cardkey_split",
+                "inherit_codes": false
+            }
+        ]
+    },
     {
         "name": "Second Fossil Check Requirement",
         "type": "consumable",

diff --git a/layouts/items.json b/layouts/items.json
@@ -133,7 +133,8 @@
                         "opt_trn",
                         "opt_dexsanity",
                         "opt_stonesanity",
-                        "opt_keyonly"
+                        "opt_keyonly",
+                        "opt_cardkey"
                     ]
                 ]
             },

diff --git a/layouts/split_cardkey.json b/layouts/split_cardkey.json
@@ -0,0 +1,10 @@
+{
+    "cardkey": {
+        "type": "itemgrid",
+        "background": "#212121",
+        "rows": [
+            ["cardkey2f", "cardkey3f", "cardkey4f", "cardkey5f", "cardkey6f"],
+            ["cardkey7f", "cardkey8f", "cardkey9f", "cardkey10f", "cardkey11f"]
+        ]
+    }
+}
diff --git a/layouts/tracker.json b/layouts/tracker.json
@@ -1,4 +1,4 @@
-{
+{
     "tracker_default": {
         "type": "container",
         "background": "#212121",
@@ -21,6 +21,10 @@
                                 "key": "shared_item_grid"
                             }
                         },
+                        {
+                            "type": "layout",
+                            "key": "cardkey",
+                        },
                         {
                             "type": "group",
                             "header": "Settings",

diff --git a/locations/locations.json b/locations/locations.json
@@ -758,7 +758,7 @@
               "name": "1F Receptionist",
               "item_count": 1,
               "access_rules": ["silphco"],
-              "visibility_rules": ["op_cardkey_prog", "op_cardkey_split"]
+              "visibility_rules": ["opt_cardkey_prog", "opt_cardkey_split"]
             },
             {
               "name": "2F Woman",
@@ -848,7 +848,7 @@
               "name": "4F Hostage",
               "item_count": 1,
               "access_rules": ["$cardkey(4)"],
-              "visibility_rules": ["op_cardkey_prog", "op_cardkey_split"]
+              "visibility_rules": ["opt_cardkey_prog", "opt_cardkey_split"]
             },
             {
               "name": "5F Southwest Item",
@@ -902,7 +902,7 @@
               "name": "5F Hostage",
               "item_count": 1,
               "access_rules": ["$cardkey(5)"],
-              "visibility_rules": ["op_cardkey_prog", "op_cardkey_split"]
+              "visibility_rules": ["opt_cardkey_prog", "opt_cardkey_split"]
             }
           ],
           "map_locations": [{ "map": "map", "x": 368, "y": 144 }]
@@ -945,7 +945,7 @@
               "name": "6F Hostage",
               "item_count": 1,
               "access_rules": [],
-              "visibility_rules": ["op_cardkey_prog", "op_cardkey_split"]
+              "visibility_rules": ["opt_cardkey_prog", "opt_cardkey_split"]
             },
             {
               "name": "7F West Item",
@@ -987,7 +987,7 @@
               "name": "7F Hostage",
               "item_count": 1,
               "access_rules": [],
-              "visibility_rules": ["op_cardkey_prog", "op_cardkey_split"]
+              "visibility_rules": ["opt_cardkey_prog", "opt_cardkey_split"]
             },
             {
               "name": "8F Rocket 1",
@@ -1011,7 +1011,7 @@
               "name": "8F Hostage",
               "item_count": 1,
               "access_rules": [],
-              "visibility_rules": ["op_cardkey_prog", "op_cardkey_split"]
+              "visibility_rules": ["opt_cardkey_prog", "opt_cardkey_split"]
             },
             {
               "name": "9F Rocket 1",
@@ -1041,7 +1041,7 @@
               "name": "9F Nurse",
               "item_count": 1,
               "access_rules": ["$cardkey(9)"],
-              "visibility_rules": ["op_cardkey_prog", "op_cardkey_split"]
+              "visibility_rules": ["opt_cardkey_prog", "opt_cardkey_split"]
             },
             {
               "name": "10F Left Item",
@@ -1077,7 +1077,7 @@
               "name": "10F Hostage",
               "item_count": 1,
               "access_rules": ["$cardkey(10)"],
-              "visibility_rules": ["op_cardkey_prog", "op_cardkey_split"]
+              "visibility_rules": ["opt_cardkey_prog", "opt_cardkey_split"]
             },
             {
               "name": "11F Rocket 1",
@@ -1106,7 +1106,7 @@
               "name": "11F Secretary",
               "item_count": 1,
               "access_rules": ["silphco"],
-              "visibility_rules": ["op_cardkey_prog", "op_cardkey_split"]
+              "visibility_rules": ["opt_cardkey_prog", "opt_cardkey_split"]
             }
           ],
           "map_locations": [{ "map": "map", "x": 340, "y": 144 }]

diff --git a/scripts/init.lua b/scripts/init.lua
@@ -7,7 +7,7 @@ local variant = Tracker.ActiveVariantUID
 IS_ITEMS_ONLY = variant:find("itemsonly")
 
 function split_key()
-    obj =  Tracker:FindObjectForCode('op_cardkey_split')
+    obj =  Tracker:FindObjectForCode('opt_cardkey_split')
     if obj.CurrentStage == 2 then
       Tracker:AddLayouts("layouts/split_cardkey.json")
     end
@@ -49,5 +49,5 @@ if PopVersion and PopVersion >= "0.18.0" then
 end
 -- Add a watch to dynamically load layout if progressive card keys enabled
 if PopVersion and PopVersion >= "0.1.0" then
-    ScriptHost:AddWatchForCode("loadCardKey", "op_cardkey_split", split_key)
+    ScriptHost:AddWatchForCode("loadCardKey", "opt_cardkey_split", split_key)
   end