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

Merge pull request #824 from argonui/token-spawning

Browse Source 
Updated token offsets for 2 / 3 / 4 tokens
This commit is contained in:
dscarpac 2024-08-15 16:55:10 -05:00 committed by GitHub
commit ee95af53d1
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
1 changed files with 26 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

48
src/core/Global.ttslua
View File

@ -1995,32 +1995,36 @@ end
-- Generates the offsets for tokens on a card (clues on locations are different and have their own function) -- Generates the offsets for tokens on a card (clues on locations are different and have their own function)
---@param maxTokens number Maximum amount of tokens on a card ---@param maxTokens number Maximum amount of tokens on a card
function TokenManager.generateOffsets(maxTokens) function TokenManager.generateOffsets(maxTokens)
tokenOffsets = {} tokenOffsets = {
for numTokens = 1, maxTokens do [1] = { Vector(0, 3, -0.2) },
if numTokens == 1 then [2] = { Vector(0.4, 3, -0.2), Vector(-0.4, 3, -0.2) },
tokenOffsets[1] = { Vector(0, 3, -0.2) } [3] = { Vector(0, 3, -0.9), Vector(0.4, 3, -0.2), Vector(-0.4, 3, -0.2) },
else [4] = { Vector(0.4, 3, -0.9), Vector(-0.4, 3, -0.9), Vector(0.4, 3, -0.2), Vector(-0.4, 3, -0.2) }
local offsets = {} }
local rows = math.min(4, math.ceil(numTokens / 3))
local tokensPlaced = 0 -- generate offsets for numTokens > 4 dynamically
for row = 1, rows do for numTokens = 5, maxTokens do
local y = 3 local offsets = {}
local z = -0.9 + (row - 1) * 0.7 local rows = math.min(4, math.ceil(numTokens / 3))
local tokensInRow = math.min(3, numTokens - tokensPlaced) local tokensPlaced = 0
for col = 1, tokensInRow do for row = 1, rows do
local x = 0 local y = 3
if tokensInRow == 2 then local z = -0.9 + (row - 1) * 0.7
x = col == 1 and -0.4 or 0.4 local tokensInRow = math.min(3, numTokens - tokensPlaced)
elseif tokensInRow == 3 then for col = 1, tokensInRow do
x = (col - 2) * 0.7 local x = 0
end if tokensInRow == 2 then
table.insert(offsets, Vector(x, y, z)) x = col == 1 and -0.4 or 0.4
tokensPlaced = tokensPlaced + 1 elseif tokensInRow == 3 then
x = (col - 2) * 0.7
end end
table.insert(offsets, Vector(x, y, z))
tokensPlaced = tokensPlaced + 1
end end
tokenOffsets[numTokens] = offsets
end end
tokenOffsets[numTokens] = offsets
end end
return tokenOffsets
end end
-- Spawns tokens for the card. This function is built to just throw a card at it and let it do -- Spawns tokens for the card. This function is built to just throw a card at it and let it do