start to tricks logic

take the wheel scipio
SapphireSapphic · Oct 30, 2024 · 48b0765 · 48b0765
1 parent 0da599a
commit 48b0765
Show file tree

Hide file tree

Showing 23 changed files with 536 additions and 287 deletions.
diff --git a/TunicTracker.zip b/TunicTracker.zip
diff --git a/images/tricks/ice_grappling_easy.png b/images/tricks/ice_grappling_easy.png
diff --git a/images/tricks/ice_grappling_hard.png b/images/tricks/ice_grappling_hard.png
diff --git a/images/tricks/ice_grappling_med.png b/images/tricks/ice_grappling_med.png
diff --git a/images/tricks/ice_grappling_off.png b/images/tricks/ice_grappling_off.png
diff --git a/images/tricks/ladder_storage_easy.png b/images/tricks/ladder_storage_easy.png
diff --git a/images/tricks/ladder_storage_hard.png b/images/tricks/ladder_storage_hard.png
diff --git a/images/tricks/ladder_storage_med.png b/images/tricks/ladder_storage_med.png
diff --git a/images/tricks/ladder_storage_off.png b/images/tricks/ladder_storage_off.png
diff --git a/images/tricks/ladder_storage_without_items.png b/images/tricks/ladder_storage_without_items.png
diff --git a/images/tricks/ladder_storage_without_items_gray.png b/images/tricks/ladder_storage_without_items_gray.png
diff --git a/images/tricks/lanternless.png b/images/tricks/lanternless.png
diff --git a/images/tricks/lanternless_gray.png b/images/tricks/lanternless_gray.png
diff --git a/images/tricks/laurels_zips.png b/images/tricks/laurels_zips.png
diff --git a/images/tricks/laurels_zips_gray.png b/images/tricks/laurels_zips_gray.png
diff --git a/images/tricks/maskless.png b/images/tricks/maskless.png
diff --git a/images/tricks/maskless_gray.png b/images/tricks/maskless_gray.png
diff --git a/items/common_pop.json b/items/common_pop.json
diff --git a/layouts/itemspop.json b/layouts/itemspop.json
@@ -125,5 +125,169 @@
 				["pray","cross","icerod","silver"]
             ]
         }
-    }
+    },
+	"settings": {
+        "type":"array",
+        "orientation": "vertical",
+        "content": [
+            {
+				"type": "group",
+				"header": "Glitch Mode",
+				"header_background": "#3e4b57",
+				"content": [
+				  {
+					"type": "item",
+					"item_margin": "-5,-1,-5,-5",
+					"item": "mode"
+				  }
+				]
+			  },
+			  {
+				"type": "group",
+				"header": "Classic/Hexagon Quest",
+				"header_background": "#3e4b57",
+				"content": [
+				  {
+					"type": "item",
+					"item_margin": "-5,-1,-5,-5",
+					"item": "hexagonquest"
+				  }
+				]
+			  },
+			  {
+				"type": "group",
+				"header": "Sword Setting",
+				"header_background": "#3e4b57",
+				"content": [
+				  {
+					"type": "item",
+					"item_margin": "-5,-1,-5,-5",
+					"item": "progswordSetting"
+				  }
+				]
+			  },
+			  {
+				"type": "group",
+				"header": "Ladder Shuffle",
+				"header_background": "#3e4b57",
+				"content": [
+				  {
+					"type": "item",
+					"item_margin": "-5,-1,-5,-5",
+					"item": "ladder_shuffle_off"
+				  }
+				]
+			  },
+			{
+				"type": "group",
+				"header": "Pack Settings",
+				"header_background": "#3e4b57",
+				"content": [
+				  {
+					"type": "array",
+					"orientation": "horizontal",
+					"content": [
+					  {
+						"type": "item",
+						"max_width": 80,
+						"item_margin": "5,5,5,5",
+						"item": "auto_tab"
+					  },
+					  {
+						"type": "item",
+						"max_width": 80,
+						"item_margin": "5,5,5,5",
+						"item": "show_hints"
+					  }
+					]
+				  }
+				]
+			  }
+		]
+    },
+	"tricks_toggle": {
+		"type": "array",
+		"orientation": "vertical",
+		"item_size": "20",
+		"content": [
+			{
+				"type": "group",
+				"header": "Maskless",
+				"header_background": "#3e4b57",
+				"content": [
+					{
+						"type": "item",
+						"item_margin": "-5,-1,-5,-5",
+						"item": "maskless",
+						"max_width": 350
+					}
+				]
+			},
+			{
+				"type": "group",
+				"header": "Lanternless",
+				"header_background": "#3e4b57",
+				"content": [
+					{
+						"type": "item",
+						"item_margin": "-5,-1,-5,-5",
+						"item": "lanternless",
+						"max_width": 350
+					}
+				]
+			},
+			{
+				"type": "group",
+				"header": "Laurels Zips",
+				"header_background": "#3e4b57",
+				"content": [
+					{
+						"type": "item",
+						"item_margin": "-5,-1,-5,-5",
+						"item": "laurels_zips",
+						"max_width": 350
+					}
+				]
+			},
+			{
+				"type": "group",
+				"header": "Ice Grappling",
+				"header_background": "#3e4b57",
+				"content": [
+					{
+						"type": "item",
+						"item_margin": "-5,-1,-5,-5",
+						"item": "ice_grapple_off",
+						"max_width": 350
+					}
+				]
+			},
+			{
+				"type": "group",
+				"header": "Ladder Storage",
+				"header_background": "#3e4b57",
+				"content": [
+					{
+						"type": "item",
+						"item_margin": "-5,-1,-5,-5",
+						"item": "ladder_storage_off",
+						"max_width": 350
+					}
+				]
+			},
+			{
+				"type": "group",
+				"header": "Ladder Storage without Items",
+				"header_background": "#3e4b57",
+				"content": [
+					{
+						"type": "item",
+						"item_margin": "-5,-1,-5,-5",
+						"item": "storage_no_items",
+						"max_width": 350
+					}
+				]
+			}
+		]
+	}
 }
diff --git a/layouts/settings_popup_pop.json b/layouts/settings_popup_pop.json
@@ -0,0 +1,21 @@
+{
+    "settings_popup": {
+        "type": "tabbed",
+        "tabs": [
+            {
+                "title": "Settings",
+                "content": {
+                    "type": "layout",
+                    "key": "settings"
+                }
+            },
+            {
+                "title": "Tricks",
+                "content": {
+                    "type": "layout",
+                    "key": "tricks_toggle"
+                }
+            }
+        ]
+    }
+}
diff --git a/layouts/trackerpop.json b/layouts/trackerpop.json
@@ -1,83 +1,4 @@
 {
-  "settings_popup": {
-    "type": "array",
-    "margin": "5",
-    "content": [
-      {
-        "type": "group",
-        "header": "Glitch Mode",
-        "header_background": "#3e4b57",
-        "content": [
-          {
-            "type": "item",
-            "margin": "-5,-1,-5,-5",
-            "item": "mode"
-          }
-        ]
-      },
-      {
-        "type": "group",
-        "header": "Classic/Hexagon Quest",
-        "header_background": "#3e4b57",
-        "content": [
-          {
-            "type": "item",
-            "margin": "-5,-1,-5,-5",
-            "item": "hexagonquest"
-          }
-        ]
-      },
-      {
-        "type": "group",
-        "header": "Sword Setting",
-        "header_background": "#3e4b57",
-        "content": [
-          {
-            "type": "item",
-            "margin": "-5,-1,-5,-5",
-            "item": "progswordSetting"
-          }
-        ]
-      },
-      {
-        "type": "group",
-        "header": "Ladder Shuffle",
-        "header_background": "#3e4b57",
-        "content": [
-          {
-            "type": "item",
-            "margin": "-5,-1,-5,-5",
-            "item": "ladder_shuffle_off"
-          }
-        ]
-      },
-      {
-        "type": "group",
-        "header": "Pack Settings",
-        "header_background": "#3e4b57",
-        "content": [
-          {
-            "type": "array",
-            "orientation": "horizontal",
-            "content": [
-              {
-                "type": "item",
-                "max_width": 80,
-                "margin": "5,5,5,5",
-                "item": "auto_tab"
-              },
-              {
-                "type": "item",
-                "max_width": 80,
-                "margin": "5,5,5,5",
-                "item": "show_hints"
-              }
-            ]
-          }
-        ]
-      }
-    ]
-  },
   "tracker_horizontal": {
     "type": "container",
     "background": "#877373",

diff --git a/scripts/autotracking/archipelago.lua b/scripts/autotracking/archipelago.lua
@@ -167,7 +167,61 @@ function onClear(slot_data)
         end
     end
 
+    if slot_data.maskless then
+        --print("slot_data.maskless: " .. slot_data.maskless)
+        local obj = Tracker:FindObjectForCode("maskless")
+        if obj then
+            obj.Active = slot_data.maskless == 1
+        end
+    end
+
+    if slot_data.lanternless then
+        --print("slot_data.lanternless: " .. slot_data.lanternless)
+        local obj = Tracker:FindObjectForCode("lanternless")
+        if obj then
+            obj.Active = slot_data.lanternless == 1
+        end
+    end
+
+    if slot_data.laurels_zips then
+        --print("slot_data.laurels_zips: " .. slot_data.laurels_zips)
+        local obj = Tracker:FindObjectForCode("laurels_zips")
+        if obj then
+            obj.Active = slot_data.laurels_zips == 1
+        end
+    end
 
+    if slot_data.ice_grappling then
+        if slot_data.ice_grappling == 0 then
+            Tracker:FindObjectForCode("ice_grapple_off").CurrentStage = 0
+        elseif slot_data.ice_grappling == 1 then
+            Tracker:FindObjectForCode("ice_grapple_off").CurrentStage = 1
+        elseif slot_data.ice_grappling == 2 then
+            Tracker:FindObjectForCode("ice_grapple_off").CurrentStage = 2
+        elseif slot_data.ice_grappling == 3 then
+            Tracker:FindObjectForCode("ice_grapple_off").CurrentStage = 3
+        end
+    end
+
+    if slot_data.ladder_storage then
+        if slot_data.ladder_storage == 0 then
+            Tracker:FindObjectForCode("ladder_storage_off").CurrentStage = 0
+        elseif slot_data.ladder_storage == 1 then
+            Tracker:FindObjectForCode("ladder_storage_off").CurrentStage = 1
+        elseif slot_data.ladder_storage == 2 then
+            Tracker:FindObjectForCode("ladder_storage_off").CurrentStage = 2
+        elseif slot_data.ladder_storage == 3 then
+            Tracker:FindObjectForCode("ladder_storage_off").CurrentStage = 3
+        end
+    end
+
+    if slot_data.ladder_storage_without_items then
+        --print("slot_data.ladder_storage_without_items: " .. slot_data.ladder_storage_without_items)
+        local obj = Tracker:FindObjectForCode("storage_no_items")
+        if obj then
+            obj.Active = slot_data.ladder_storage_without_items == 1
+        end
+    end
 
     Tracker:FindObjectForCode("ladder_shuffle_off").CurrentStage = slot_data.shuffle_ladders
 

diff --git a/scripts/init.lua b/scripts/init.lua
@@ -22,14 +22,14 @@ if PopVersion then
   Tracker:AddLayouts("layouts/itemspop.json")
   Tracker:AddLayouts("layouts/trackerpop.json")
   Tracker:AddLayouts("layouts/standard_broadcastpop.json")
+  Tracker:AddLayouts("layouts/settings_popup_pop.json")
 else
   Tracker:AddItems("items/common.json")
   Tracker:AddLayouts("layouts/items.json")
   Tracker:AddLayouts("layouts/tracker.json")
   Tracker:AddLayouts("layouts/standard_broadcast.json")
 end
 
-
 -- Utility Script for helper functions etc.
 ScriptHost:LoadScript("scripts/utils.lua")