Merge pull request #7 from SapphireSapphic/auto-tabbing

Auto tabbing, auto-layout switching, removed prog. sword variant

.vscode/settings.json

@@ -1,5 +1,16 @@
 {
     "files.associations": {
         "*.json": "jsonc"
-    }
+    },
+    "Lua.diagnostics.globals": [
+        "PopVersion",
+        "AutoTracker",
+        "Tracker",
+        "Archipelago",
+        "ScriptHost",
+        "ENABLE_DEBUG_LOG"
+    ],
+    "Lua.diagnostics.disable": [
+        "lowercase-global"
+    ]
 }

items/common_pop.json

@@ -731,7 +731,7 @@
 	{
 		"name": "Glitch Mode",
 		"type": "progressive",
-		"loop": true,
+		"loop": false,
 		"allow_disabled": false,
 		"stages": [
 			{//Glitchless
@@ -749,7 +749,7 @@
 	{
 		"name": "Randomizer Mode",
 		"type": "progressive",
-		"loop": true,
+		"loop": false,
 		"allow_disabled": false,
 		"stages": [
 			{//Classic
@@ -764,6 +764,24 @@
 			}
 		]
 	},
+	{
+		"name": "Sword Setting",
+		"type": "progressive",
+		"loop": false,
+		"allow_disabled": false,
+		"stages": [
+			{
+				"name": "Stick and Swords",
+				"img": "images/stickandswords.png",
+				"codes": "progswordSetting"
+			},
+			{
+				"name": "Progressive Swords",
+				"img": "images/progressiveswords.png",
+				"codes": "progswordSetting"
+			}
+		]
+	},
 	//Bosses
 	{
 		"name": "Guard Captain",
@@ -814,6 +832,14 @@
 		"img":"images/heir.png",
 		"codes": "heir"
 	},
+	//Layout Switching
+	{
+		"name": "Progressive Sword Layout",
+		"type": "toggle",
+		"loop": false,
+		"img":"images/sword1.png",
+		"codes": "progswordLayout"
+	},
 	//Statics
 	{
 		"name": "Silver Chest",

layouts/itemspop.json

@@ -16,7 +16,7 @@
 					["stick", "sword", "dagger", "icerod", "staff", "orb", "gun", "hourglass"],
 					["attrelic", "defrelic", "hprelic", "potionrelic", "sprelic", "mprelic","hexquest"],
 					["pray","cross","dath","goldenpower","justawell","ding", "dong"],
-					["gknight", "engine", "librarian", "scavboss", "gauntlet", "heir"]
+					["captain", "gknight", "engine", "librarian", "scavboss", "gauntlet", "heir", "auto_tab"]
                 ]
             }
 		]

layouts/itemspop_progsword.json

@@ -0,0 +1,24 @@
+{
+    "shared_item_grid": {
+        "type":"array",
+        "orientation": "horizontal",
+        "content": [
+            {
+                "type": "itemgrid",
+                "h_alignment": "center",
+				"margin": "-1,0,-5,0",
+                "item_margin": "1,2",
+				"item_size": 40,
+                "rows": [
+					["healshard", "heal", "red", "green", "blue", "oldkey", "key"],
+                    ["shield", "light", "dash", "vaultkey", "slot", "manual", "soul"],
+					["dynamite", "firebomb", "icebomb", "lure", "effigy", "wishes", "mask"],
+					["progsword", "dagger", "icerod", "staff", "orb", "gun", "hourglass","hexquest"],
+					["attrelic", "defrelic", "hprelic", "potionrelic", "sprelic", "mprelic"],
+					["pray","cross","dath","goldenpower","justawell","ding", "dong"],
+					["captain", "gknight", "engine", "librarian", "scavboss", "gauntlet", "heir", "auto_tab"]
+                ]
+            }
+		]
+    }
+}

layouts/trackerpop.json

@@ -26,7 +26,19 @@
                         "item": "hexagonquest"
                     }
                 ]
-            }            
+            },
+			{
+                "type": "group",
+                "header": "Sword Setting",
+                "header_background": "#3e4b57",
+                "content":[
+                    {
+                        "type": "item",
+                        "margin": "-5,-1,-5,-5",
+                        "item": "progswordSetting"
+                    }
+                ]
+            }
         ]
     },
     "tracker_horizontal": {

locations/locations_pop.json

@@ -2909,32 +2909,32 @@
 							}
 						]
 					},
-					//{
-					//	"name": "Guard Captain",
-					//	"short_name": "Captain",
-					//	"map_locations": [
-					//		{
-					//			"map": "fullmap",
-					//			"x": 3900,
-					//			"y": 2565
-					//		},
-					//		{
-					//			"map": "east_forest",
-					//			"x": 220,
-					//			"y": 70,
-					//			"size": 35
-					//		}
-					//	],
-					//	"sections": [
-					//		{
-					//			"name": "Also, you need to defeat this guy!",
-					//			"hosted_item": "captain",
-					//			"access_rules": [
-					//				"ring"
-					//			]
-					//		}
-					//	]
-					//},
+					{
+						"name": "Guard Captain",
+						"short_name": "Captain",
+						"map_locations": [
+							{
+								"map": "fullmap",
+								"x": 3900,
+								"y": 2565
+							},
+							{
+								"map": "east_forest",
+								"x": 220,
+								"y": 70,
+								"size": 35
+							}
+						],
+						"sections": [
+							{
+								"name": "Also, you need to defeat this guy!",
+								"hosted_item": "captain",
+								"access_rules": [
+									"ring"
+								]
+							}
+						]
+					},
 					{
 						"name": "Forest Belltower - After Guard Captain",
 						"short_name": "",
@@ -7504,7 +7504,7 @@
 				],
 				"children": [
 					{
-						"name": "Visit the Heir",
+						"name": "Complete the Game",
 						"short_name": "Visit Heir",
 						"map_locations": [
 							{
@@ -7516,19 +7516,18 @@
 								"map": "far_shore",
 								"x": 825,
 								"y": 930,
-								"size": 45
+								"size": 60
 							}
 						],
 						"sections": [
 							{
-								"name": "Now it's Nighttime!",
+								"name": "What ending did you get?",
 								"access_rules": [
 									"red,green,blue,ding,dong",
 									"red,green,blue,[glitches],orb,freeze",
 									"red,green,blue,dash"
 								],
-								"item_count": 1,
-								"hosted_item": "visit"
+								"hosted_item": "heir"
 							}
 						]
 					},

manifest.json

@@ -2,7 +2,7 @@
   "name": "Tunic Randomizer - Item & Map Tracker",
   "game_name": "Tunic",
   "platform": "PC",
-  "package_version": "1.5.6",
+  "package_version": "1.6.0",
   "package_uid": "tunic_sapphiresapphic",
   "author": "SapphireSapphic, Scout_JD, Br00ty",
   "variants": {
@@ -12,12 +12,6 @@
         "ap"
       ]
     },
-    "var_progsword": {
-      "display_name": "Map Tracker (Progressive Sword)",
-      "flags": [
-        "ap"
-      ]
-    },
     "items_only": {
       "display_name": "Item Tracker",
       "flags": [