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

Merge branch 'main' into navigation-overlay

Browse Source
This commit is contained in:
Chr1Z93 2023-05-08 00:18:40 +02:00
commit 99270cede9
2 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
objects/MythosArea.9f334f.json
View File

@ -13,7 +13,7 @@
}, },
"Rotation": { "Rotation": {
"x": 0, "x": 0,
"y": 135, "y": 315,
"z": 0 "z": 0
} }
}, },

8
src/core/token/TokenManager.ttslua
View File

@ -342,7 +342,7 @@ do
if extraUses ~= nil and extraUses[type] ~= nil then if extraUses ~= nil and extraUses[type] ~= nil then
tokenCount = tokenCount + extraUses[type] tokenCount = tokenCount + extraUses[type]
end end
log("Spawning single use tokens for "..card.getName()..'['..card.getDescription()..']: '..tokenCount.."x "..token) --log("Spawning single use tokens for "..card.getName()..'['..card.getDescription()..']: '..tokenCount.."x "..token)
TokenManager.spawnTokenGroup(card, token, tokenCount) TokenManager.spawnTokenGroup(card, token, tokenCount)
else else
for i, useInfo in ipairs(uses) do for i, useInfo in ipairs(uses) do
@ -353,7 +353,7 @@ do
if extraUses ~= nil and extraUses[type] ~= nil then if extraUses ~= nil and extraUses[type] ~= nil then
tokenCount = tokenCount + extraUses[type] tokenCount = tokenCount + extraUses[type]
end end
log("Spawning use array tokens for "..card.getName()..'['..card.getDescription()..']: '..tokenCount.."x "..token) --log("Spawning use array tokens for "..card.getName()..'['..card.getDescription()..']: '..tokenCount.."x "..token)
-- Shift each spawned group after the first down so they don't pile on each other -- Shift each spawned group after the first down so they don't pile on each other
TokenManager.spawnTokenGroup(card, token, tokenCount, (i - 1) * 0.8) TokenManager.spawnTokenGroup(card, token, tokenCount, (i - 1) * 0.8)
end end
@ -383,7 +383,7 @@ do
internal.spawnPlayerCardTokensFromDataHelper = function(card, playerData) internal.spawnPlayerCardTokensFromDataHelper = function(card, playerData)
token = playerData.tokenType token = playerData.tokenType
tokenCount = playerData.tokenCount tokenCount = playerData.tokenCount
log("Spawning data helper tokens for "..card.getName()..'['..card.getDescription()..']: '..tokenCount.."x "..token) --log("Spawning data helper tokens for "..card.getName()..'['..card.getDescription()..']: '..tokenCount.."x "..token)
TokenManager.spawnTokenGroup(card, token, tokenCount) TokenManager.spawnTokenGroup(card, token, tokenCount)
tokenSpawnTracker.markTokensSpawned(card.getGUID()) tokenSpawnTracker.markTokensSpawned(card.getGUID())
end end
@ -416,7 +416,7 @@ do
return 0 return 0
end end
log(card.getName() .. ' : ' .. locationData.type .. ' : ' .. locationData.value .. ' : ' .. locationData.clueSide) --log(card.getName() .. ' : ' .. locationData.type .. ' : ' .. locationData.value .. ' : ' .. locationData.clueSide)
if ((card.is_face_down and locationData.clueSide == 'back') if ((card.is_face_down and locationData.clueSide == 'back')
or (not card.is_face_down and locationData.clueSide == 'front')) then or (not card.is_face_down and locationData.clueSide == 'front')) then
if locationData.type == 'fixed' then if locationData.type == 'fixed' then