diff --git a/objects/Fan-MadeAccessories.aa8b38/ChaosBagManager.023240.json b/objects/Fan-MadeAccessories.aa8b38/ChaosBagManager.023240.json index ea1b770c..86a797b0 100644 --- a/objects/Fan-MadeAccessories.aa8b38/ChaosBagManager.023240.json +++ b/objects/Fan-MadeAccessories.aa8b38/ChaosBagManager.023240.json @@ -33,7 +33,7 @@ "IgnoreFoW": false, "LayoutGroupSortIndex": 0, "Locked": false, - "LuaScriptState": "{\"Bless\":8,\"Curse\":0}", + "LuaScriptState": "", "LuaScript_path": "Fan-MadeAccessories.aa8b38/ChaosBagManager.023240.ttslua", "MeasureMovement": false, "Name": "Custom_Token", @@ -48,9 +48,9 @@ "posX": 22.215, "posY": 5.651, "posZ": -34.811, - "rotX": 4, + "rotX": 0, "rotY": 270, - "rotZ": 357, + "rotZ": 0, "scaleX": 2.5, "scaleY": 1, "scaleZ": 2.5 diff --git a/objects/LuaScriptState.luascriptstate b/objects/LuaScriptState.luascriptstate index 277d64b4..56e3e6ae 100644 --- a/objects/LuaScriptState.luascriptstate +++ b/objects/LuaScriptState.luascriptstate @@ -1 +1 @@ -{"optionPanel":{"showChaosBagManager":false,"showCleanUpHelper":false,"showDrawButton":false,"showHandHelper":[],"showNavigationOverlay":false,"showTokenArranger":false,"useClueClickers":false,"useSnapTags":true}} +{"optionPanel":{"showAttachmentHelper":false,"showChaosBagManager":false,"showCleanUpHelper":false,"showCustomPlaymatImages":false,"showCYOA":false,"showDisplacementTool":false,"showDrawButton":false,"showHandHelper":[],"showNavigationOverlay":false,"showTokenArranger":false,"useClueClickers":false,"useSnapTags":true}} diff --git a/src/core/Global.ttslua b/src/core/Global.ttslua index 64389386..cee8d2a8 100644 --- a/src/core/Global.ttslua +++ b/src/core/Global.ttslua @@ -840,9 +840,25 @@ function applyOptionPanelChange(id, state) elseif id == "showChaosBagManager" then optionPanel[id] = spawnOrRemoveHelper(state, "Chaos Bag Manager", {-67.8, 1.4, -49.5}) + -- option: Show attachment helper + elseif id == "showAttachmentHelper" then + optionPanel[id] = spawnOrRemoveHelper(state, "Attachment Helper", {-64, 1.4, 0}) + -- option: Show navigation overlay elseif id == "showNavigationOverlay" then optionPanel[id] = spawnOrRemoveHelper(state, "jaqenZann's Navigation Overlay", {-11.7, 1.4, -15}) + + -- option: Show CYOA campaign guides + elseif id == "showCYOA" then + optionPanel[id] = spawnOrRemoveHelper(state, "CYOA Campaign Guides", {21.2, 1.4, -65.7}) + + -- option: Show custom playmat images + elseif id == "showCustomPlaymatImages" then + optionPanel[id] = spawnOrRemoveHelper(state, "Custom Playmat Images", {12, 1.4, -46.5}) + + -- option: Show displacement tool + elseif id == "showDisplacementTool" then + optionPanel[id] = spawnOrRemoveHelper(state, "Displacement Tool", {-60.7, 1.4, -49.5}) end end @@ -851,8 +867,8 @@ end ---@param name String Name of the helper object ---@param position Vector Position of the object (where it will spawn) ---@param rotation Vector Rotation of the object for spawning (default: {0, 270, 0}) ----@param color Color This is only needed for correctly setting the color of the "Hand Helper" --- returns the GUID of the spawnedObj (or nil if object was removed) +---@param color String This is only needed for correctly setting the color of the "Hand Helper" +---@return. GUID of the spawnedObj (or nil if object was removed) function spawnOrRemoveHelper(state, name, position, rotation, color) if state then Player.getPlayers()[1].pingTable(position) @@ -864,7 +880,7 @@ end -- copies the specified tool (by name) from the barrel ---@param name String Name of the object that should be copied ----@param position Position Desired position of the object +---@param position Table Desired position of the object function spawnHelperObject(name, position, rotation, color) local barrel = getObjectFromGUID(BARREL_GUID) @@ -907,7 +923,11 @@ function removeHelperObject(name) ["Clean Up Helper"] = "showCleanUpHelper", ["Hand Helper"] = "showHandHelper", ["Chaos Bag Manager"] = "showChaosBagManager", - ["jaqenZann's Navigation Overlay"] = "showNavigationOverlay" + ["jaqenZann's Navigation Overlay"] = "showNavigationOverlay", + ["Displacement Tool"] = "showDisplacementTool", + ["Custom Playmat Images"] = "showCustomPlaymatImages", + ["Attachment Helper"] = "showAttachmentHelper", + ["CYOA Campaign Guides"] = "showCYOA" } local data = optionPanel[referenceTable[name]] diff --git a/xml/OptionPanel.xml b/xml/OptionPanel.xml index afb322b1..75f4aff5 100644 --- a/xml/OptionPanel.xml +++ b/xml/OptionPanel.xml @@ -36,7 +36,7 @@ + preferredHeight="70"/> Enable snap tags - Only cards with the tag "Asset" will snap (official cards are supported by default). Disable this if you are having issues with custom content. + Only cards with the tag "Asset" will snap (official cards are supported by default). Disable this if you are having issues with custom content. @@ -185,7 +185,7 @@ Hand Helper - Never count your hand cards again! This tool does that for you and can even take "Dream-Enhancing Serum" into account. Also includes a button for randomly discard a card. + Never count your hand cards again! This tool does that for you and additionally enables easy discarding of random cards. @@ -208,6 +208,20 @@ + + + + + Attachment Helper + Provides a card-sized bag for cards that are attached to other cards (e.g. Backpack). + + + + + + + @@ -221,6 +235,48 @@ onValueChanged="onClick_toggleOption(showNavigationOverlay)"/> + + + + + + CYOA Campaign Guides + Displays in a "Choose Your Own Adventure" style redesigned campaign guides. + + + + + + + + + + + + Custom Playmat Images + Places a tool that displays custom playmat images for all cycles in a gallery-like fashion. + + + + + + + + + + + + Displacement Tool + This allows moving all objects on the main playmat in a chosen direction. + + + + + +