diff --git a/config.json b/config.json
index d53587e0..7ace3af2 100644
--- a/config.json
+++ b/config.json
@@ -3,7 +3,6 @@
"ComponentTags_path": "ComponentTags.json",
"CustomUIAssets_path": "CustomUIAssets.json",
"DecalPallet_path": "DecalPallet.json",
- "Decals": [],
"GameComplexity": "",
"GameMode": "Arkham Horror LCG - Super Complete Edition",
"GameType": "",
@@ -201,7 +200,9 @@
"NavigationOverlayHandler.797ede",
"CampaignImporterExporter.334ee3",
"Bloodborne-CityoftheUnseen.1e7a0b",
- "TheColorOutofOz.806d9a"
+ "TheColorOutofOz.806d9a",
+ "TokenArranger.022907",
+ "ChaosBagManager.023240"
],
"PlayArea": 1,
"PlayerCounts": [
diff --git a/modsettings/ComponentTags.json b/modsettings/ComponentTags.json
index 83a638b1..8d28dfae 100644
--- a/modsettings/ComponentTags.json
+++ b/modsettings/ComponentTags.json
@@ -83,6 +83,10 @@
{
"displayed": "CameraZoom_ignore",
"normalized": "camerazoom_ignore"
+ },
+ {
+ "displayed": "TokenArranger",
+ "normalized": "tokenarranger"
}
]
}
diff --git a/objects/OptionPanelSource.830bd0/ChaosBagManager.023240.json b/objects/ChaosBagManager.023240.json
similarity index 94%
rename from objects/OptionPanelSource.830bd0/ChaosBagManager.023240.json
rename to objects/ChaosBagManager.023240.json
index bc4802ed..364994bd 100644
--- a/objects/OptionPanelSource.830bd0/ChaosBagManager.023240.json
+++ b/objects/ChaosBagManager.023240.json
@@ -32,7 +32,7 @@
"HideWhenFaceDown": false,
"IgnoreFoW": false,
"LayoutGroupSortIndex": 0,
- "Locked": false,
+ "Locked": true,
"LuaScript": "require(\"accessories/ChaosBagManager\")",
"LuaScriptState": "",
"MeasureMovement": false,
@@ -45,9 +45,9 @@
],
"Tooltip": true,
"Transform": {
- "posX": 22.215,
- "posY": 5.651,
- "posZ": -34.811,
+ "posX": -66,
+ "posY": 1.531,
+ "posZ": -49.5,
"rotX": 0,
"rotY": 270,
"rotZ": 0,
diff --git a/objects/LuaScriptState.luascriptstate b/objects/LuaScriptState.luascriptstate
index 3404240e..599af236 100644
--- a/objects/LuaScriptState.luascriptstate
+++ b/objects/LuaScriptState.luascriptstate
@@ -1 +1 @@
-{"acknowledgedUpgradeVersions":[],"optionPanel":{"cardLanguage":"en","playAreaSnapTags":true,"showAttachmentHelper":false,"showChaosBagManager":false,"showCleanUpHelper":false,"showCustomPlaymatImages":false,"showCYOA":false,"showDisplacementTool":false,"showDrawButton":false,"showHandHelper":[],"showSearchAssistant":[],"showTitleSplash":true,"showTokenArranger":false,"useClueClickers":false,"useSnapTags":true}}
+{"acknowledgedUpgradeVersions":[],"optionPanel":{"cardLanguage":"en","playAreaSnapTags":true,"showAttachmentHelper":false,"showCleanUpHelper":false,"showCustomPlaymatImages":false,"showCYOA":false,"showDisplacementTool":false,"showDrawButton":false,"showHandHelper":[],"showSearchAssistant":[],"showTitleSplash":true,"useClueClickers":false,"useSnapTags":true}}
diff --git a/objects/OptionPanelSource.830bd0.json b/objects/OptionPanelSource.830bd0.json
index 623fc02b..98907beb 100644
--- a/objects/OptionPanelSource.830bd0.json
+++ b/objects/OptionPanelSource.830bd0.json
@@ -14,8 +14,6 @@
"r": 0.70588
},
"ContainedObjects_order": [
- "ChaosBagManager.023240",
- "TokenArranger.022907",
"CYOACampaignGuides.e87ea2",
"AttachmentHelper.7f4976",
"SearchAssistant.17aed0",
diff --git a/objects/OptionPanelSource.830bd0/TokenArranger.022907.json b/objects/TokenArranger.022907.json
similarity index 97%
rename from objects/OptionPanelSource.830bd0/TokenArranger.022907.json
rename to objects/TokenArranger.022907.json
index 6c12cf42..8deb01fe 100644
--- a/objects/OptionPanelSource.830bd0/TokenArranger.022907.json
+++ b/objects/TokenArranger.022907.json
@@ -32,7 +32,7 @@
"HideWhenFaceDown": false,
"IgnoreFoW": false,
"LayoutGroupSortIndex": 0,
- "Locked": false,
+ "Locked": true,
"LuaScript": "require(\"accessories/TokenArranger\")",
"LuaScriptState": "",
"MeasureMovement": false,
@@ -46,7 +46,7 @@
"Tooltip": true,
"Transform": {
"posX": -42.3,
- "posY": 1.53,
+ "posY": 1.531,
"posZ": -46.5,
"rotX": 0,
"rotY": 270,
@@ -57,4 +57,4 @@
},
"Value": 0,
"XmlUI": ""
-}
+}
\ No newline at end of file
diff --git a/src/accessories/TokenArranger.ttslua b/src/accessories/TokenArranger.ttslua
index 7ac2e2a8..86a57721 100644
--- a/src/accessories/TokenArranger.ttslua
+++ b/src/accessories/TokenArranger.ttslua
@@ -59,7 +59,6 @@ function onLoad(saveState)
end
createButtonsAndInputs(true)
- layout()
-- context menu items
self.addContextMenuItem("Load default values", function()
@@ -233,14 +232,14 @@ function createPercentageButton(tokenCount, valueCount, tokenName)
percentageLabel.click_function = "none"
percentageLabel.width = 0
percentageLabel.height = 0
- percentageLabel.position = Vector(2.3, -0.05, 0.875 * valueCount)
+ local startPos = Vector(2.3, -0.05, 0.875 * valueCount)
if percentage == "cumulative" then
percentageLabel.scale = {1.5, 1.5, 1.5}
- percentageLabel.position.z = percentageLabel.position.z - 2.85
+ percentageLabel.position = startPos - Vector(0, 0, 2.85)
else
percentageLabel.scale = {2, 2, 2}
- percentageLabel.position.z = percentageLabel.position.z - 2.675
+ percentageLabel.position = startPos - Vector(0, 0, 2.675)
end
-- determine font_color
@@ -262,7 +261,7 @@ function createPercentageButton(tokenCount, valueCount, tokenName)
-- optionally create label for cumulative percentage
if percentage == "cumulative" then
- percentageLabel.position.z = percentageLabel.position.z - 2.45
+ percentageLabel.position = startPos - Vector(0, 0, 2.45)
percentageLabel.font_color = {1, 1, 1}
-- only display one digit for 100%
diff --git a/src/core/Global.ttslua b/src/core/Global.ttslua
index 5246ed61..18bea7c0 100644
--- a/src/core/Global.ttslua
+++ b/src/core/Global.ttslua
@@ -951,10 +951,6 @@ function applyOptionPanelChange(id, state)
elseif id == "showTitleSplash" then
optionPanel[id] = state
- -- option: Show token arranger
- elseif id == "showTokenArranger" then
- optionPanel[id] = spawnOrRemoveHelper(state, "Token Arranger", {-42.3, 1.6, -46.5})
-
-- option: Show clean up helper
elseif id == "showCleanUpHelper" then
optionPanel[id] = spawnOrRemoveHelper(state, "Clean Up Helper", {-66, 1.6, 46})
@@ -975,10 +971,6 @@ function applyOptionPanelChange(id, state)
optionPanel[id][i] = spawnOrRemoveHelper(state, "Search Assistant", pos, rot)
end
- -- option: Show chaos bag manager
- elseif id == "showChaosBagManager" then
- optionPanel[id] = spawnOrRemoveHelper(state, "Chaos Bag Manager", {-66, 1.6, -49.5})
-
-- option: Show attachment helper
elseif id == "showAttachmentHelper" then
optionPanel[id] = spawnOrRemoveHelper(state, "Attachment Helper", {-62, 1.4, 0})
@@ -1049,11 +1041,9 @@ end
function removeHelperObject(name)
-- links objects name to the respective option name (to grab the GUID for removal)
local referenceTable = {
- ["Token Arranger"] = "showTokenArranger",
["Clean Up Helper"] = "showCleanUpHelper",
["Hand Helper"] = "showHandHelper",
["Search Assistant"] = "showSearchAssistant",
- ["Chaos Bag Manager"] = "showChaosBagManager",
["Displacement Tool"] = "showDisplacementTool",
["Custom Playmat Images"] = "showCustomPlaymatImages",
["Attachment Helper"] = "showAttachmentHelper",
@@ -1101,7 +1091,6 @@ function onClick_defaultSettings()
playAreaSnapTags = true,
showAttachmentHelper = false,
showCleanUpHelper = false,
- showChaosBagManager = false,
showCustomPlaymatImages = false,
showCYOA = false,
showDisplacementTool = false,
@@ -1109,7 +1098,6 @@ function onClick_defaultSettings()
showHandHelper = {},
showSearchAssistant = {},
showTitleSplash = true,
- showTokenArranger = false,
useClueClickers = false,
useSnapTags = true
}
diff --git a/xml/OptionPanel.xml b/xml/OptionPanel.xml
index b1d3cdce..5c0da12f 100644
--- a/xml/OptionPanel.xml
+++ b/xml/OptionPanel.xml
@@ -252,20 +252,6 @@
-
-
-
-
-
- Panel for easy addition or removal of chaos tokens to the bag - very useful for EotE because of Frost tokens!
-
- |
-
-
- |
-
-
@@ -349,20 +335,6 @@
onValueChanged="onClick_toggleOption(showSearchAssistant)"/>
|
-
-
-
-
-
-
- See the contents of the chaos bag at a glance! This tool displays a sorted table of the tokens to allow easier guessing of your odds.
-
- |
-
-
- |
-