turn-order #17

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

View File

@ -19,7 +19,8 @@ controls.keymap = {
cameraMoveScroll = control("mouse", "3"), cameraMoveScroll = control("mouse", "3"),
fullMana = control("key", "m"), fullMana = control("key", "m"),
select = control("mouse", "1"), select = control("mouse", "1"),
endTurnTest = control("key", "e") endTurnTest = control("key", "e"),
toggleTurns = control("key", "r"),
} }
local currentKeys = {} local currentKeys = {}

View File

@ -26,7 +26,7 @@ function selector:update(dt)
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] 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
local char = Tree.level.characters[self.id] local char = Tree.level.characters[self.id]

View File

@ -1,5 +1,6 @@
--- @class TurnOrder --- @class TurnOrder
--- @field order Id[] возможно в будущем тут будет не айди персонажа, а айди фракции, в которой состоят несколько персонажей --- @field order Id[] возможно в будущем тут будет не айди персонажа, а айди фракции, в которой состоят несколько персонажей
--- @field isTurnsEnabled boolean
local turnOrder = {} local turnOrder = {}
turnOrder.__index = turnOrder turnOrder.__index = turnOrder
@ -40,4 +41,8 @@ function turnOrder:next()
end end
end end
function turnOrder:toggleTurns()
self.isTurnsEnabled = not self.isTurnsEnabled
end
return { new = new } return { new = new }

View File

@ -31,6 +31,10 @@ function love.update(dt)
if Tree.controls:isJustPressed("endTurnTest") then if Tree.controls:isJustPressed("endTurnTest") then
Tree.level.turnOrder:next() Tree.level.turnOrder:next()
end end
if Tree.controls:isJustPressed("toggleTurns") then
print('toggle turns')
Tree.level.turnOrder:toggleTurns()
end
Tree.controls:cache() Tree.controls:cache()