.luarc.json

@@ -6,6 +6,5 @@
     "love.filesystem.load": "loadfile"
   },
   "workspace.ignoreDir": ["dev_utils"],
-  "diagnostics.ignoredFiles": "Disable",
+  "diagnostics.ignoredFiles": "Disable"
-  "hint.enable": true
 }

lib/character/behaviors/ai.lua

@@ -1,7 +1,6 @@
 local easing = require "lib.utils.easing"
-local pf     = require "lib.pathfinder"
+local pf = require "lib.pathfinder"
-local utils  = require "lib.utils.utils"
+local utils = require "lib.utils.utils"
-local task   = require "lib.utils.task"
 
 --- @alias AIAction fun(self: AIBehavior): Task<nil>
 
@@ -157,16 +156,6 @@ local behavior = {}
 behavior.__index = behavior
 behavior.id = "ai"
 
---- Заставляет ИИ сделать ход
----
---- По умолчанию ничего не делает
---- @return Task<nil>
-function behavior:makeTurn()
-    return function(callback)
-        callback()
-    end
-end
-
 --- @param class Class
 function behavior.new(class)
     return setmetatable({

lib/character/behaviors/stats.lua

@@ -37,8 +37,8 @@ function behavior.new(hp, mana, initiative, class, isInTurnOrder)
         hp = hp or 20,
         mana = mana or 10,
         initiative = initiative or 10,
-        class = class or "dev_warrior",
         isInTurnOrder = isInTurnOrder or true,
+        class = "dev_warrior",
         amIAlive = true
     }, behavior)
 end

lib/level/grid/character_grid.lua

@@ -1,6 +1,8 @@
 local utils = require "lib.utils.utils"
+local pQueue = require "lib.utils.priority_queue"
 --- @class CharacterGrid : Grid
 --- @field __grid {string: Id|nil}
+--- @field yOrderQueue PriorityQueue<Character> очередь отрисовки сверху вниз
 local grid = setmetatable({}, require "lib.level.grid.base")
 grid.__index = grid
 
@@ -27,13 +29,22 @@ function grid:add(id)
     end
 end
 
+--- @param a Character
+--- @param b Character
+local function drawCmp(a, b)
+    --- @TODO: это захардкожено, надо разделить поведения
+    return a:has(Tree.behaviors.positioned).position.y < b:has(Tree.behaviors.positioned).position.y
+end
+
 --- fills the grid with the actual data
 ---
 --- should be called as early as possible during every tick
 function grid:reload()
     self:reset()
+    self.yOrderQueue = pQueue.new(drawCmp)
     utils.each(Tree.level.characters, function(c)
         self:add(c.id)
+        self.yOrderQueue:insert(c)
     end)
 end
 

main.lua

@@ -1,4 +1,3 @@
---- @diagnostic disable: duplicate-set-field
 -- CameraLoader = require 'lib/camera'
 
 local character = require "lib/character/character"
@@ -152,11 +151,8 @@ function love.draw()
 end
 
 function love.resize(w, h)
-    --- SDL 2 bug when running on Wayland.
-    --- @see https://github.com/love2d/love/issues/2100
-    local actualW, actualH = love.graphics.getDimensions()
     local render = Tree.level.render
     if not render then return end
     render:free()
-    Tree.level.render = (require "lib.level.render").new { w = actualW, h = actualH }
+    Tree.level.render = (require "lib.level.render").new { w = w, h = h }
 end