huge update, logic rework start, autotracking settings

Br00ty · Oct 18, 2023 · f4ce65e · f4ce65e
1 parent 7f15bbd
commit f4ce65e
Show file tree

Hide file tree

Showing 14 changed files with 397 additions and 108 deletions.
diff --git a/.vscode/settings.json b/.vscode/settings.json
@@ -0,0 +1,18 @@
+{
+    "Lua.diagnostics.globals": [
+        "Tracker",
+        "ScriptHost",
+        "onSetReply",
+        "onClear",
+        "Archipelago",
+        "onItem",
+        "onLocation",
+        "onScout",
+        "onBounce",
+        "PopVersion",
+        "AutoTracker"
+    ],
+    "Lua.diagnostics.disable": [
+        "lowercase-global"
+    ]
+}
diff --git a/images/logic_settings/expert.png b/images/logic_settings/expert.png
diff --git a/images/logic_settings/hard.png b/images/logic_settings/hard.png
diff --git a/images/logic_settings/lunatic.png b/images/logic_settings/lunatic.png
diff --git a/images/logic_settings/normal.png b/images/logic_settings/normal.png
diff --git a/images/logic_settings/obscure.png b/images/logic_settings/obscure.png
diff --git a/items/items.json b/items/items.json
@@ -97,6 +97,42 @@
         "img": "images/items/gameover.png",
         "codes": "gameover"
     },
+    // LOGIC
+    {
+        "name": "Logic Levels",
+        "type": "progressive",
+        "allow_disabled": false,
+        "initial_stage_idx": 0,
+        "loop": true,
+        "stages": [
+            {
+                "img": "images/logic_settings/normal.png",
+                "codes": "logic,normal",
+                "inherit_codes": true
+            },
+            {
+                "img": "images/logic_settings/hard.png",
+                "codes": "logic,hard",
+                "inherit_codes": true
+            },
+            {
+                "img": "images/logic_settings/expert.png",
+                "codes": "logic,expert",
+                "inherit_codes": true
+            },
+            {
+                "img": "images/logic_settings/lunatic.png",
+                "codes": "logic,lunatic",
+                "inherit_codes": true
+            }
+        ]
+    },
+    {
+        "name": "Obscure Knowledge",
+        "type": "toggle",
+        "img": "images/logic_settings/obscure.png",
+        "codes": "obscure"
+    },
     // EXAMPLE CODE
     {
         "name": "Progressive",

diff --git a/layouts/broadcast.json b/layouts/broadcast.json
@@ -1,18 +1,45 @@
-//sets the layout for the broadcast view
-{
+{
     "tracker_broadcast": {
         "type": "array",
         "orientation": "vertical",
         "margin": "0,0",
         "content": [
             {
                 "type": "array",
-                "orientation": "horizontal",
+                "orientation": "vertical",
                 "margin": "0,0",
                 "content": [
                     {
-                        "type": "layout",
-                        "key": "shared_item_grid"
+                        "type": "itemgrid",
+                        "item_margin": "5, 7",
+                        "item_size": 60,
+                        "h_alignment": "left",
+                        "rows": [
+                            [
+                                "breaker",
+                                "slide"           
+                            ],
+                            [
+                                "sunsetter",
+                                "strikebreak"
+                            ],
+                            [
+                                "greaves",
+                                "heliacal"           
+                            ],
+                            [
+                                "cutter",
+                                "solar"           
+                            ],
+                            [
+                                "ascendant",
+                                "cling"           
+                            ],
+                            [
+                                "smallkey",
+                                "majorkey"           
+                            ]
+                        ]
                     }
                 ]
             }

diff --git a/layouts/items.json b/layouts/items.json
@@ -6,7 +6,7 @@
         "content": [
             {
                 "type": "array",
-                "orientation": "horizontal",
+                "orientation": "vertical",
                 "margin": "0,0",
                 "content": [
                     {
@@ -40,6 +40,21 @@
                                 "majorkey"           
                             ]
                         ]
+                    },
+                    {
+                        "type": "itemgrid",
+                        //"margin": "0,40",
+                        "item_margin": "0,5",
+                        "item_size": "140, 46", 
+                        "h_alignment": "left",
+                        "rows": [
+                            [
+                                "normal"
+                            ],
+                            [
+                                "obscure"
+                            ]
+                        ]
                     }
                 ]
             }