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

fixed token discarding

Browse Source
This commit is contained in:
Chr1Z93 2024-11-19 19:03:20 +01:00
parent a7dcf7c893
commit 47e491913f
1 changed files with 18 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
src/core/Global.ttslua
View File

@ -2929,14 +2929,24 @@ function removeTokensFromObject(params)
end
end
for _, obj in ipairs(searchLib.onObject(object, "isTileOrToken")) do
if tokenChecker.isChaosToken(obj) then
returnChaosTokenToBag({ token = obj, fromBag = false })
elseif obj.getGUID() ~= "4ee1f2" and -- table
obj ~= self and
obj.memo ~= nil and
obj.getLock() == false then
trash.putObject(obj)
if cardTokens[object] then
-- check if this card was moved with tokens on it
for _, tokenData in ipairs(cardTokens[object]) do
tokenData.token.locked = false
trash.putObject(tokenData.token)
end
cardTokens[object] = nil
else
-- search area for tokens
for _, obj in ipairs(searchLib.onObject(object, "isTileOrToken")) do
if tokenChecker.isChaosToken(obj) then
returnChaosTokenToBag({ token = obj, fromBag = false })
elseif obj.getGUID() ~= "4ee1f2" and -- table
obj ~= self and
obj.memo ~= nil and
obj.getLock() == false then
trash.putObject(obj)
end
end
end
end