adam/SCED
1
0
Fork 0
Code Actions Releases 8 Activity

code update

Browse Source
This commit is contained in:
Chr1Z93 2024-11-19 18:58:04 +01:00
parent c6a94dba80
commit a7dcf7c893
1 changed files with 17 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
src/core/Global.ttslua
View File

@ -2867,7 +2867,7 @@ function moveCardWithTokens(params)
-- wait for the card to finish moving, update token position/rotation regularly -- wait for the card to finish moving, update token position/rotation regularly
Wait.condition( Wait.condition(
function() cardTokens[card] = nil end, function() stopTokenTransformUpdating(card) end,
function() function()
if card ~= nil and cardTokens[card] ~= nil and #cardTokens[card] ~= 0 then if card ~= nil and cardTokens[card] ~= nil and #cardTokens[card] ~= 0 then
updateTokenTransform(card) updateTokenTransform(card)
@ -2880,12 +2880,19 @@ function moveCardWithTokens(params)
end end
function storeTokenTransform(card) function storeTokenTransform(card)
if cardTokens[card] ~= nil then
stopTokenTransformUpdating(card)
end
cardTokens[card] = {} cardTokens[card] = {}
local cardRot = card.getRotation() local cardRot = card.getRotation()
for _, token in ipairs(searchLib.onObject(card, "isTileOrToken", 0.95)) do for _, token in ipairs(searchLib.onObject(card, "isTileOrToken", 0.95)) do
if not token.locked then if not token.locked then
local tokenPos = token.getPosition() + Vector(0, 0.1, 0) -- small offset so tokens don't collide with card -- offset to stop the token from colliding with the card
local tokenPos = token.getPosition() + Vector(0, 0.01, 0)
token.setPosition(tokenPos) token.setPosition(tokenPos)
-- store local transform data
table.insert(cardTokens[card], { table.insert(cardTokens[card], {
token = token, token = token,
localPos = card.positionToLocal(tokenPos), localPos = card.positionToLocal(tokenPos),
@ -2899,9 +2906,17 @@ function updateTokenTransform(card)
for _, tokenData in ipairs(cardTokens[card] or {}) do for _, tokenData in ipairs(cardTokens[card] or {}) do
tokenData.token.setPosition(card.positionToWorld(tokenData.localPos)) tokenData.token.setPosition(card.positionToWorld(tokenData.localPos))
tokenData.token.setRotation(card.getRotation() + tokenData.localRot) tokenData.token.setRotation(card.getRotation() + tokenData.localRot)
tokenData.token.locked = true
end end
end end
function stopTokenTransformUpdating(card)
for _, tokenData in ipairs(cardTokens[card] or {}) do
tokenData.token.locked = false
end
cardTokens[card] = nil
end
-- removes tokens from the provided card/deck -- removes tokens from the provided card/deck
function removeTokensFromObject(params) function removeTokensFromObject(params)
local object = params.object local object = params.object