refactor turn-order

i should leave this peace of oxygen etc etc

Co-authored-by: Ivan Yuriev <ivanyr44@gmail.com>

lib/level/turn_order.lua

@@ -1,28 +1,6 @@
---- @class TurnOrder
+local PriorityQueue = require "lib.utils.priority_queue"
---- @field walked integer[]
---- @field notWalked integer[]
---- @field isTurnsEnabled boolean
-local turnOrder = {}
-turnOrder.__index = turnOrder
 
-local function new()
+local sortInitiative = function(id_a, id_b)
-    return setmetatable({
-        walked = {},
-        notWalked = {},
-        isTurnsEnabled = true
-    }, turnOrder)
-end
-
-function turnOrder:updateOrder()
-    local notWalked = {}
-    local count = 1
-    for id, char in ipairs(Tree.level.characters) do
-        char:try(Tree.behaviors.stats, function(stats)
-            notWalked[count] = id
-            count = count + 1
-        end)
-    end
-    table.sort(notWalked, function(id_a, id_b)
     local res = Tree.level.characters[id_a]:try(Tree.behaviors.stats, function(astats)
         local res = Tree.level.characters[id_b]:try(Tree.behaviors.stats, function(bstats)
             return astats.initiative > bstats.initiative
@@ -30,36 +8,52 @@ function turnOrder:updateOrder()
         return res
     end)
     return res or false
-    end)
+end
-    self.notWalked = notWalked
 
-    print('[Level]: Turn order has been updated!')
+--- @class TurnOrder
+--- @field characterIds Id[]
+--- @field walked PriorityQueue
+--- @field notWalked PriorityQueue
+--- @field isTurnsEnabled boolean
+local turnOrder = {}
+turnOrder.__index = turnOrder
+
+local function new()
+    return setmetatable({
+        walked = PriorityQueue.new(sortInitiative),
+        notWalked = PriorityQueue.new(sortInitiative),
+        isTurnsEnabled = true
+    }, turnOrder)
 end
 
 function turnOrder:next()
-    table.insert(self.walked, self.notWalked[1])
+    local cur = self.notWalked:pop()
-    self.notWalked[1] = nil
+    self.walked:insert(cur)
+end
 
-    local notWalked = {}
+function turnOrder:reorder()
-    for i = 1, #self.notWalked do
+    local _walked, _notWalked = PriorityQueue.new(sortInitiative), PriorityQueue.new(sortInitiative)
-        notWalked[i] = self.notWalked[i + 1]
+    local charId = self.walked:pop()
-        print(notWalked[i], i)
+    while charId do
+        _walked:insert(charId)
+        charId = self.walked:pop()
     end
 
-    self.notWalked = notWalked
+    charId = self.notWalked:pop()
-
+    while charId do
-    Tree.level.selector:select(nil)
+        _notWalked:insert(charId)
-
+        charId = self.notWalked:pop()
-    print('[Level]: Triggered next turn')
-    print('[Level]:', next(self.notWalked))
-    if #self.notWalked == 0 then
-        self:updateOrder()
-        self.walked = {}
     end
 end
 
-function turnOrder:toggleTurns()
+--- @param count number
-    self.isTurnsEnabled = not self.isTurnsEnabled
+function turnOrder:getOrder(count)
+
+end
+
+--- @param id Id
+function turnOrder:add(id)
+    table.insert(self.characterIds, id)
 end
 
 return { new = new }