From f11284917757303b8b9ecb4854538492056be2e7 Mon Sep 17 00:00:00 2001 From: Chr1Z93 Date: Sun, 1 Jan 2023 17:55:21 +0100 Subject: [PATCH 1/2] elder sign button and rotation fix --- .../ChaosBagManager.023240.json | 6 +++--- .../ChaosBagManager.023240.ttslua | 9 ++++----- src/core/Global.ttslua | 6 +++--- 3 files changed, 10 insertions(+), 11 deletions(-) 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/Fan-MadeAccessories.aa8b38/ChaosBagManager.023240.ttslua b/objects/Fan-MadeAccessories.aa8b38/ChaosBagManager.023240.ttslua index 10d54327..362bb223 100644 --- a/objects/Fan-MadeAccessories.aa8b38/ChaosBagManager.023240.ttslua +++ b/objects/Fan-MadeAccessories.aa8b38/ChaosBagManager.023240.ttslua @@ -48,7 +48,6 @@ local BUTTON_POSITION = { -- common button parameters local buttonParameters = {} buttonParameters.function_owner = self -buttonParameters.color = { 0, 0, 0, 0 } buttonParameters.width = 300 buttonParameters.height = 300 @@ -62,7 +61,7 @@ function onLoad() -- create buttons for tokens for i = 1, #BUTTON_POSITION do local funcName = "buttonClick" .. i - self.setVar(funcName, function(_, _, isRightClick) buttonClick(_, _, isRightClick, i) end) + self.setVar(funcName, function(_, _, isRightClick) buttonClick(i, isRightClick) end) buttonParameters.click_function = funcName buttonParameters.tooltip = BUTTON_TOOLTIP[i] @@ -70,8 +69,8 @@ function onLoad() if i < 7 then buttonParameters.position.z = -0.778 - elseif i > 12 then - buttonParameters.position.z = 0.75 + elseif i > 11 then + buttonParameters.position.z = 0.755 end self.createButton(buttonParameters) @@ -111,7 +110,7 @@ function getChaosBag() end -- click function for buttons -function buttonClick(_, _, isRightClick, index) +function buttonClick(index, isRightClick) chaosbag = getChaosBag() -- error handling: chaos bag not found diff --git a/src/core/Global.ttslua b/src/core/Global.ttslua index 01c0729a..51674430 100644 --- a/src/core/Global.ttslua +++ b/src/core/Global.ttslua @@ -823,7 +823,7 @@ function applyOptionPanelChange(id, state) -- delete previously pulled out tokens for _, token in ipairs(getObjectsWithTag("to_be_deleted")) do token.destruct() end - optionPanel[id] = spawnOrRemoveHelper(state, "Token Arranger", {-42.3, 1.4, -46.5}) + optionPanel[id] = spawnOrRemoveHelper(state, "Token Arranger", {-42.3, 1.6, -46.5}) -- option: Show clean up helper elseif id == "showCleanUpHelper" then @@ -838,11 +838,11 @@ function applyOptionPanelChange(id, state) -- option: Show chaos bag manager elseif id == "showChaosBagManager" then - optionPanel[id] = spawnOrRemoveHelper(state, "Chaos Bag Manager", {-67.8, 1.4, -49.5}) + optionPanel[id] = spawnOrRemoveHelper(state, "Chaos Bag Manager", {-67.8, 1.6, -49.5}) -- option: Show navigation overlay elseif id == "showNavigationOverlay" then - optionPanel[id] = spawnOrRemoveHelper(state, "jaqenZann's Navigation Overlay", {-11.7, 1.4, -15}) + optionPanel[id] = spawnOrRemoveHelper(state, "jaqenZann's Navigation Overlay", {-11.7, 1.6, -15}) end end From 9976a6506045c1721c65af939dab76b0061c25b6 Mon Sep 17 00:00:00 2001 From: Chr1Z <97286811+Chr1Z93@users.noreply.github.com> Date: Tue, 3 Jan 2023 22:05:38 +0100 Subject: [PATCH 2/2] make button invisible --- objects/Fan-MadeAccessories.aa8b38/ChaosBagManager.023240.ttslua | 1 + 1 file changed, 1 insertion(+) diff --git a/objects/Fan-MadeAccessories.aa8b38/ChaosBagManager.023240.ttslua b/objects/Fan-MadeAccessories.aa8b38/ChaosBagManager.023240.ttslua index 362bb223..a64b2883 100644 --- a/objects/Fan-MadeAccessories.aa8b38/ChaosBagManager.023240.ttslua +++ b/objects/Fan-MadeAccessories.aa8b38/ChaosBagManager.023240.ttslua @@ -48,6 +48,7 @@ local BUTTON_POSITION = { -- common button parameters local buttonParameters = {} buttonParameters.function_owner = self +buttonParameters.color = { 0, 0, 0, 0 } buttonParameters.width = 300 buttonParameters.height = 300