From 2343cd8eb0a0a7e4424c7fe1cef0fda5061b2d6d Mon Sep 17 00:00:00 2001 From: Chr1Z93 Date: Thu, 9 Mar 2023 23:55:40 +0100 Subject: [PATCH] updated positions --- src/core/Global.ttslua | 16 ++++++++-------- src/playermat/Playmat.ttslua | 4 ++++ src/playermat/PlaymatApi.ttslua | 10 +++++++++- src/playermat/Zones.ttslua | 6 +++--- 4 files changed, 24 insertions(+), 12 deletions(-) diff --git a/src/core/Global.ttslua b/src/core/Global.ttslua index e3e7afbf..cbca475f 100644 --- a/src/core/Global.ttslua +++ b/src/core/Global.ttslua @@ -850,17 +850,17 @@ function applyOptionPanelChange(id, state) -- option: Show hand helper for each player elseif id == "showHandHelper" then - optionPanel[id][1] = spawnOrRemoveHelper(state, "Hand Helper", {-50.85, 1.6, 7.32}, {0, 270, 0}) - optionPanel[id][2] = spawnOrRemoveHelper(state, "Hand Helper", {-50.85, 1.6, -24.88}, {0, 270, 0}) - optionPanel[id][3] = spawnOrRemoveHelper(state, "Hand Helper", {-39.13, 1.6, 22.45}, {0, 000, 0}) - optionPanel[id][4] = spawnOrRemoveHelper(state, "Hand Helper", {-21.57, 1.6, -22.45}, {0, 180, 0}) + optionPanel[id][1] = spawnOrRemoveHelper(state, "Hand Helper", playmatAPI.transformLocalPosition({0.05, 0, -1.182}, "White") , {0, 270, 0}) + optionPanel[id][2] = spawnOrRemoveHelper(state, "Hand Helper", playmatAPI.transformLocalPosition({0.05, 0, -1.182}, "Orange"), {0, 270, 0}) + optionPanel[id][3] = spawnOrRemoveHelper(state, "Hand Helper", playmatAPI.transformLocalPosition({0.05, 0, -1.182}, "Green"), {0, 000, 0}) + optionPanel[id][4] = spawnOrRemoveHelper(state, "Hand Helper", playmatAPI.transformLocalPosition({0.05, 0, -1.182}, "Red"), {0, 180, 0}) -- option: Show search assistant for each player elseif id == "showSearchAssistant" then - optionPanel[id][1] = spawnOrRemoveHelper(state, "Search Assistant", {-50.85, 1.6, 10.25}, {0, 270, 0}) - optionPanel[id][2] = spawnOrRemoveHelper(state, "Search Assistant", {-50.85, 1.6, -21.95}, {0, 270, 0}) - optionPanel[id][3] = spawnOrRemoveHelper(state, "Search Assistant", {-36.20, 1.6, 22.45}, {0, 000, 0}) - optionPanel[id][4] = spawnOrRemoveHelper(state, "Search Assistant", {-24.50, 1.6, -22.45}, {0, 180, 0}) + optionPanel[id][1] = spawnOrRemoveHelper(state, "Search Assistant", playmatAPI.transformLocalPosition({-0.3, 0, -1.182}, "White"), {0, 270, 0}) + optionPanel[id][2] = spawnOrRemoveHelper(state, "Search Assistant", playmatAPI.transformLocalPosition({-0.3, 0, -1.182}, "Orange"), {0, 270, 0}) + optionPanel[id][3] = spawnOrRemoveHelper(state, "Search Assistant", playmatAPI.transformLocalPosition({-0.3, 0, -1.182}, "Green"), {0, 000, 0}) + optionPanel[id][4] = spawnOrRemoveHelper(state, "Search Assistant", playmatAPI.transformLocalPosition({-0.3, 0, -1.182}, "Red"), {0, 180, 0}) -- option: Show chaos bag manager elseif id == "showChaosBagManager" then diff --git a/src/playermat/Playmat.ttslua b/src/playermat/Playmat.ttslua index 0893bf38..d1250715 100644 --- a/src/playermat/Playmat.ttslua +++ b/src/playermat/Playmat.ttslua @@ -700,6 +700,10 @@ function returnGlobalDiscardPosition() return self.positionToWorld(DISCARD_PILE_POSITION) end +function transformLocalPosition(localPos) + return self.positionToWorld(localPos) +end + -- Sets this playermat's draw 1 button to visible ---@param visible Boolean. Whether the draw 1 button should be visible function showDrawButton(visible) diff --git a/src/playermat/PlaymatApi.ttslua b/src/playermat/PlaymatApi.ttslua index a04893fc..d9f11010 100644 --- a/src/playermat/PlaymatApi.ttslua +++ b/src/playermat/PlaymatApi.ttslua @@ -48,7 +48,7 @@ do return mat.call("getHandColor") end - -- Returns if there is the card"Dream-Enhancing Serum" on the requested playermat + -- Returns if there is the card "Dream-Enhancing Serum" on the requested playermat ---@param matColor String Color of the playermat PlaymatApi.isDES = function(matColor) local mat = getObjectFromGUID(MAT_IDS[matColor]) @@ -70,6 +70,14 @@ do return mat.call("returnGlobalDiscardPosition") end + -- Transforms a local position into a global position + ---@param localPos Table Local position to be transformed + ---@param matColor String Color of the playermat + PlaymatApi.transformLocalPosition = function(localPos, matColor) + local mat = getObjectFromGUID(MAT_IDS[matColor]) + return mat.call("transformLocalPosition", localPos) + end + -- Sets the requested playermat's snap points to limit snapping to matching card types or not. If -- matchTypes is true, the main card slot snap points will only snap assets, while the -- investigator area point will only snap Investigators. If matchTypes is false, snap points will diff --git a/src/playermat/Zones.ttslua b/src/playermat/Zones.ttslua index 96ab1bce..6efb17aa 100644 --- a/src/playermat/Zones.ttslua +++ b/src/playermat/Zones.ttslua @@ -28,9 +28,9 @@ do playerMatGuids["White"] = "8b081b" playerMatGuids["Green"] = "383d8b" - local commonZones = {} + local commonZones = {} commonZones["Investigator"] = { -1.17702, 0, 0.00209 } - commonZones["Minicard"] = { -0.16, 0, -1.222326 } + commonZones["Minicard"] = { -1.17702, 0, -1.45 } commonZones["Deck"] = { -1.822724, 0, -0.02940192 } commonZones["Discard"] = { -1.822451, 0, 0.6092291 } commonZones["Ally"] = { -0.6157398, 0, 0.02435675 } @@ -48,7 +48,7 @@ do commonZones["Threat3"] = { 0.002246313, 0, -0.6430681 } commonZones["Threat4"] = { 0.4590618, 0, -0.6432732 } - local zoneData = {} + local zoneData = {} zoneData["White"] = {} zoneData["White"]["Investigator"] = commonZones["Investigator"] zoneData["White"]["Minicard"] = commonZones["Minicard"]