lib/level/level.lua

@@ -10,8 +10,6 @@ local utils = require "lib.utils.utils"
 local level = {}
 level.__index = level
 
-local path = nil
-
 --- @param type "procedural"|"handmaded"
 --- @param template Procedural|Handmaded
 local function new(type, template)
@@ -27,25 +25,11 @@ local function new(type, template)
     }, level)
 end
 
-local mposCache = nil
-
 function level:update(dt)
     self.characterGrid:reset()
     utils.each(self.characters, function(el)
         el:update(dt)
     end)
-    if self.characters[self.selector.id] then
-        local charPos = self.characters[self.selector.id].logic.mapLogic.position:floor()
-        --- @type Vec3
-        local mpos = self.camera:toWorldPosition(Vec3 { love.mouse.getX(), love.mouse.getY() }):floor()
-
-        -- ДУШИ здесь больше нет, приводите рыжих обратно
-        if not path or tostring(mpos) ~= mposCache then
-            path = require "lib.pathfinder" (charPos, mpos) -- ?????
-        end
-        mposCache = tostring(mpos)
-        -- path = (require "lib.pathfinder")(charPos, mpos)
-    end
     self.camera:update(dt)
     self.selector:update(dt)
 end
@@ -54,7 +38,12 @@ function level:draw()
     self.map:draw()
 
     --- Это отрисовка пути персонажа к мышке
-    if self.selector.id and path then
+    if self.selector.id then
+        local charPos = self.characters[self.selector.id].logic.mapLogic.position:floor()
+        --- @type Vec3
+        local mpos = self.camera:toWorldPosition(Vec3 { love.mouse.getX(), love.mouse.getY() }):floor()
+        local path = (require "lib.pathfinder")(charPos, mpos)
+
         love.graphics.setColor(0.6, 0.75, 0.5)
         for p in path:values() do
             love.graphics.circle("fill", p.x + 0.45, p.y + 0.45, 0.1)

lib/ui/layout.lua

@@ -1,6 +1,5 @@
 local Vec3 = require "lib.utils.vec3"
 local ui = require "lib.ui.core"
-local controls = require "lib.controls"
 
 --- @type Rectangle
 local ReactiveRectangle = ui.Rectangle {
@@ -15,9 +14,6 @@ function ReactiveRectangle:update(dt)
     if mx > self.origin.x and mx < self.origin.x + self.size.x
         and my > self.origin.y and my < self.origin.y + self.size.y
     then
-        if controls:isJustPressed("select") then
-            controls:consume("select")
-        end
         self.color = { 0, 1, 0 }
     else
         self.color = { 1, 0, 0 }