turn-order #17

Merged
PeaAshMeter merged 9 commits from turn-order into main 2025-11-09 17:56:10 +03:00
2 changed files with 4 additions and 2 deletions
Showing only changes of commit 3caa3b926e - Show all commits

View File

@ -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

View File

@ -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