diff --git a/lib/level/selector.lua b/lib/level/selector.lua index e70f333..3951998 100644 --- a/lib/level/selector.lua +++ b/lib/level/selector.lua @@ -25,7 +25,7 @@ function selector:update(dt) local selectedId = Tree.level.characterGrid:get(Vec3 { mousePosition.x, mousePosition.y }) 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 return self:select(selectedId) else @@ -33,6 +33,7 @@ function selector:update(dt) char:try(Tree.behaviors.spellcaster, function(b) if not b.cast then + if selectedId ~= Tree.level.turnOrder.order[1] and Tree.level.turnOrder.isTurnsEnabled then return end self:select(selectedId) return end diff --git a/lib/level/turn_order.lua b/lib/level/turn_order.lua index 2f8ff3b..eeeb95a 100644 --- a/lib/level/turn_order.lua +++ b/lib/level/turn_order.lua @@ -6,7 +6,8 @@ turnOrder.__index = turnOrder local function new() return setmetatable({ - order = {} + order = {}, + isTurnsEnabled = true }, turnOrder) end