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

resolving comments

Browse Source
This commit is contained in:
Chr1Z93 2023-01-03 23:25:56 +01:00
parent eac84f583d
commit 644025df7a
1 changed files with 9 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -165,11 +165,9 @@ do
TokenManager.spawnCounterToken = function(card, tokenType, tokenValue, shiftDown) TokenManager.spawnCounterToken = function(card, tokenType, tokenValue, shiftDown)
if tokenValue < 1 or tokenValue > 50 then return end if tokenValue < 1 or tokenValue > 50 then return end
local pos = card.positionToWorld(card.positionToLocal(card.getPosition()) + Vector(0, 0.2, shiftDown)) local pos = card.positionToWorld(Vector(0, 0.2, shiftDown))
local rot = card.getRotation() local rot = card.getRotation()
TokenManager.spawnToken(pos, tokenType, rot, function(spawned) TokenManager.spawnToken(pos, tokenType, rot, function(spawned) spawned.setState(tokenValue) end)
spawned.setState(tokenValue)
end)
end end
-- Spawns a number of tokens. -- Spawns a number of tokens.
@ -230,10 +228,16 @@ do
local tokenTemplate = tokenTemplates[tokenType] local tokenTemplate = tokenTemplates[tokenType]
-- Take ONLY the Y-value for rotation, so we don't flip the token coming out of the bag -- Take ONLY the Y-value for rotation, so we don't flip the token coming out of the bag
local rot = Vector(tokenTemplate.Transform.rotX,
270,
tokenTemplate.Transform.rotZ)
if rotation ~= nil then
rot.y = rotation.y
end
return spawnObjectData({ return spawnObjectData({
data = tokenTemplate, data = tokenTemplate,
position = position, position = position,
rotation = Vector(tokenTemplate.Transform.rotX, rotation.y or 270, tokenTemplate.Transform.rotZ), rotation = rot,
callback_function = callback callback_function = callback
}) })
end end