fix turns when you click on another char
This commit is contained in:
parent
7beb421486
commit
3caa3b926e
@ -25,7 +25,7 @@ function selector:update(dt)
|
|||||||
local selectedId = Tree.level.characterGrid:get(Vec3 { mousePosition.x, mousePosition.y })
|
local selectedId = Tree.level.characterGrid:get(Vec3 { mousePosition.x, mousePosition.y })
|
||||||
|
|
||||||
if not self.id then
|
if not self.id then
|
||||||
-- print(selectedId, Tree.level.turnOrder.order[1])
|
print(selectedId, Tree.level.turnOrder.order[1])
|
||||||
if selectedId ~= Tree.level.turnOrder.order[1] and Tree.level.turnOrder.isTurnsEnabled then return end
|
if selectedId ~= Tree.level.turnOrder.order[1] and Tree.level.turnOrder.isTurnsEnabled then return end
|
||||||
return self:select(selectedId)
|
return self:select(selectedId)
|
||||||
else
|
else
|
||||||
@ -33,6 +33,7 @@ function selector:update(dt)
|
|||||||
|
|
||||||
char:try(Tree.behaviors.spellcaster, function(b)
|
char:try(Tree.behaviors.spellcaster, function(b)
|
||||||
if not b.cast then
|
if not b.cast then
|
||||||
|
if selectedId ~= Tree.level.turnOrder.order[1] and Tree.level.turnOrder.isTurnsEnabled then return end
|
||||||
self:select(selectedId)
|
self:select(selectedId)
|
||||||
return
|
return
|
||||||
end
|
end
|
||||||
|
|||||||
@ -6,7 +6,8 @@ turnOrder.__index = turnOrder
|
|||||||
|
|
||||||
local function new()
|
local function new()
|
||||||
return setmetatable({
|
return setmetatable({
|
||||||
order = {}
|
order = {},
|
||||||
|
isTurnsEnabled = true
|
||||||
}, turnOrder)
|
}, turnOrder)
|
||||||
end
|
end
|
||||||
|
|
||||||
|
|||||||
Loading…
x
Reference in New Issue
Block a user