diff --git a/lib/controls.lua b/lib/controls.lua index e91e21b..652d26a 100644 --- a/lib/controls.lua +++ b/lib/controls.lua @@ -19,7 +19,8 @@ controls.keymap = { cameraMoveScroll = control("mouse", "3"), fullMana = control("key", "m"), select = control("mouse", "1"), - endTurnTest = control("key", "e") + endTurnTest = control("key", "e"), + toggleTurns = control("key", "r"), } local currentKeys = {} diff --git a/lib/level/selector.lua b/lib/level/selector.lua index db894bb..e70f333 100644 --- a/lib/level/selector.lua +++ b/lib/level/selector.lua @@ -26,7 +26,7 @@ function selector:update(dt) if not self.id then -- 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) else local char = Tree.level.characters[self.id] diff --git a/lib/level/turn_order.lua b/lib/level/turn_order.lua index 83e7572..2f8ff3b 100644 --- a/lib/level/turn_order.lua +++ b/lib/level/turn_order.lua @@ -1,5 +1,6 @@ --- @class TurnOrder --- @field order Id[] возможно в будущем тут будет не айди персонажа, а айди фракции, в которой состоят несколько персонажей +--- @field isTurnsEnabled boolean local turnOrder = {} turnOrder.__index = turnOrder @@ -40,4 +41,8 @@ function turnOrder:next() end end +function turnOrder:toggleTurns() + self.isTurnsEnabled = not self.isTurnsEnabled +end + return { new = new } diff --git a/main.lua b/main.lua index 24847cf..fe01759 100644 --- a/main.lua +++ b/main.lua @@ -31,6 +31,10 @@ function love.update(dt) if Tree.controls:isJustPressed("endTurnTest") then Tree.level.turnOrder:next() end + if Tree.controls:isJustPressed("toggleTurns") then + print('toggle turns') + Tree.level.turnOrder:toggleTurns() + end Tree.controls:cache()