Merge pull request #258 from argonui/layout

Adding token remover for white/orange, moving Phase Tracker

config.json

@@ -190,7 +190,7 @@
     "ArkhamSCE300-1272023-Page1.f873a8",
     "VictoryDisplay.6ccd6d",
     "CampaignOverview.e03c01",
-    "OptionPanelSource.830bd0" 
+    "OptionPanelSource.830bd0"
   ],
   "PlayArea": 1,
   "PlayerCounts": [

objects/AllPlayerCards.15bb07/LivingInkUpgradeSheet.19a05b.json

@@ -58,4 +58,4 @@
   },
   "Value": 0,
   "XmlUI": ""
-}
+}

objects/Cluetokens.31fa39.json

@@ -46,7 +46,7 @@
   "Sticky": true,
   "Tooltip": true,
   "Transform": {
-    "posX": -55.458,
+    "posX": -55.48,
     "posY": 1.65,
     "posZ": -1.12,
     "rotX": 0,

objects/Damagetokens.480bda.json

@@ -56,7 +56,7 @@
   "Sticky": true,
   "Tooltip": true,
   "Transform": {
-    "posX": -53.235,
+    "posX": -53.24,
     "posY": 1.65,
     "posZ": 1.12,
     "rotX": 0,

objects/Doomtokens.47ffc3.json

@@ -46,7 +46,7 @@
   "Sticky": true,
   "Tooltip": true,
   "Transform": {
-    "posX": -55.458,
+    "posX": -55.48,
     "posY": 1.65,
     "posZ": 1.12,
     "rotX": 0,

objects/Fan-MadeAccessories.aa8b38/GenericDifficultySelector.8112ff.json

@@ -54,4 +54,4 @@
   },
   "Value": 0,
   "XmlUI": ""
-}
+}

objects/Fan-MadeScenariosCampaignsMiscellany.66e97c/Fan-MadeCampaigns.89c32e.json

@@ -41,7 +41,7 @@
     "CloseEncountersoftheLV-426Kind.4f5421",
     "CelticRising.4d305a",
     "CallofthePlaguebearer.613b64",
-    "BetrayalattheMountainsofMadness084.ef939a",
+    "BetrayalattheMountainsofMadness.ef939a",
     "TheApproachingStorm.ab6b9a",
     "AliceinWonderland.39916d",
     "AgesUnwound.f7e5eb",

objects/Fan-MadeScenariosCampaignsMiscellany.66e97c/Fan-MadeCampaigns.89c32e/TheColorOutofOz.be7d21.json

@@ -82,4 +82,4 @@
   },
   "Value": 0,
   "XmlUI": ""
-}
+}

objects/Horrortokens.c3ecf4.json

@@ -46,7 +46,7 @@
   "Sticky": true,
   "Tooltip": true,
   "Transform": {
-    "posX": -53.235,
+    "posX": -53.24,
     "posY": 1.65,
     "posZ": -1.12,
     "rotX": 0,

objects/LeadInvestigator.acaa93.json

@@ -45,12 +45,12 @@
   ],
   "Tooltip": true,
   "Transform": {
-    "posX": -61.051,
+    "posX": -45,
-    "posY": 1.581,
+    "posY": 1.62,
-    "posZ": -0.008,
+    "posZ": 0,
     "rotX": 0,
     "rotY": 270,
-    "rotZ": 180,
+    "rotZ": 0,
     "scaleX": 0.61,
     "scaleY": 1,
     "scaleZ": 0.61

objects/OptionPanelSource.830bd0.json

@@ -44,7 +44,6 @@
   "MeshIndex": -1,
   "Name": "Bag",
   "Nickname": "OptionPanel Source",
-  "Number": 0,
   "Snap": true,
   "Sticky": true,
   "Tooltip": true,

objects/OptionPanelSource.830bd0/CYOACampaignGuides.e87ea2.json

@@ -86,4 +86,4 @@
   },
   "Value": 0,
   "XmlUI": ""
-}
+}

objects/OptionPanelSource.830bd0/CleanUpHelper.26cf4b.json

@@ -74,4 +74,4 @@
   },
   "Value": 0,
   "XmlUI_path": "OptionPanelSource.830bd0/CleanUpHelper.26cf4b.xml"
-}
+}

objects/OptionPanelSource.830bd0/CustomPlaymatImages.004fe7.json

@@ -54,4 +54,4 @@
   },
   "Value": 0,
   "XmlUI": ""
-}
+}

objects/OptionPanelSource.830bd0/jaqenZannsNavigationOverlay.a8affa/Custom_Assetbundle.cecc3e.json

@@ -49,4 +49,4 @@
   },
   "Value": 0,
   "XmlUI": ""
-}
+}

objects/PhaseTracker.d0c8fa.json

@@ -87,9 +87,9 @@
       ],
       "Tooltip": true,
       "Transform": {
-        "posX": -58.148,
+        "posX": -11.3,
-        "posY": 1.565,
+        "posY": 1.52,
-        "posZ": 0,
+        "posZ": -16,
         "rotX": 0,
         "rotY": 270,
         "rotZ": 0,
@@ -147,9 +147,9 @@
       ],
       "Tooltip": true,
       "Transform": {
-        "posX": -58.148,
+        "posX": -11.3,
-        "posY": 1.565,
+        "posY": 1.52,
-        "posZ": 0,
+        "posZ": -16,
         "rotX": 0,
         "rotY": 270,
         "rotZ": 0,
@@ -207,9 +207,9 @@
       ],
       "Tooltip": true,
       "Transform": {
-        "posX": -58.148,
+        "posX": -11.3,
-        "posY": 1.565,
+        "posY": 1.52,
-        "posZ": 0,
+        "posZ": -16,
         "rotX": 0,
         "rotY": 270,
         "rotZ": 0,
@@ -227,9 +227,9 @@
   ],
   "Tooltip": true,
   "Transform": {
-    "posX": -58.148,
+    "posX": -11.3,
-    "posY": 1.565,
+    "posY": 1.52,
-    "posZ": 0,
+    "posZ": -16,
     "rotX": 0,
     "rotY": 270,
     "rotZ": 0,

objects/ScriptingTrigger.a2f932.json

@@ -35,11 +35,11 @@
     "posY": 3.5,
     "posZ": 0,
     "rotX": 0,
-    "rotY": 90,
+    "rotY": 0,
     "rotZ": 0,
     "scaleX": 37,
     "scaleY": 4,
-    "scaleZ": 36.5
+    "scaleZ": 37
   },
   "Value": 0,
   "XmlUI": ""

objects/TokenRemover.0a5a29.json

@@ -45,15 +45,15 @@
   ],
   "Tooltip": true,
   "Transform": {
-    "posX": -6.755,
+    "posX": -57.72,
-    "posY": 1.583,
+    "posY": 1.481,
-    "posZ": -16.526,
+    "posZ": 0,
     "rotX": 0,
-    "rotY": 90,
+    "rotY": 270,
     "rotZ": 0,
-    "scaleX": 0.8,
+    "scaleX": 1,
     "scaleY": 1,
-    "scaleZ": 0.8
+    "scaleZ": 1
   },
   "Value": 0,
   "XmlUI": ""

src/core/Global.ttslua

@@ -878,7 +878,7 @@ function applyOptionPanelChange(id, state)
 
   -- option: Show attachment helper
   elseif id == "showAttachmentHelper" then
-    optionPanel[id] = spawnOrRemoveHelper(state, "Attachment Helper", {-64, 1.4, 0})
+    optionPanel[id] = spawnOrRemoveHelper(state, "Attachment Helper", {-61, 1.4, 0})
 
   -- option: Show navigation overlay
   elseif id == "showNavigationOverlay" then
@@ -935,6 +935,9 @@ function spawnHelperObject(name, position, rotation)
   for _, obj in ipairs(sourceBag.getData().ContainedObjects) do
     if obj["Nickname"] == name then
       spawnTable.data = obj
+      spawnTable.callback_function = function(spawnedObj)
+        Wait.time(function() spawnedObj.setLock(true) end, 2)
+      end
       return spawnObjectData(spawnTable)
     end
   end