lib/spell/spell.lua

@@ -1,5 +1,6 @@
 local Query        = require "lib.spell.target_query"
 local targetTest   = require "lib.spell.target_test"
+local task         = require "lib.utils.task"
 
 --- @alias SpellPreview "default" Подсветка возможных целей
 --- | "path" Подсветка пути до цели
@@ -13,7 +14,7 @@ local targetTest   = require "lib.spell.target_test"
 --- @field distance? integer Сторона квадрата с центром в позиции кастера, в пределах которого должна находиться цель, либо отсутствие ограничения
 --- @field update fun(self: Spell, caster: Character, dt: number): nil Изменяет состояние спелла
 --- @field draw fun(self: Spell): nil Рисует превью каста, ничего не должна изменять в идеальном мире
---- @field cast fun(self: Spell, caster: Character, target: Vec3): Task<nil> | nil Вызывается в момент каста, изменяет мир.
+--- @field cast fun(self: Spell, caster: Character, target: Vec3): Task<nil> Вызывается в момент каста, изменяет мир.
 local spell        = {}
 spell.__index      = spell
 spell.tag          = "spell_base"
@@ -22,35 +23,63 @@ spell.baseCooldown = 1
 spell.targetQuery  = Query(targetTest.any)
 spell.previewType  = "default"
 
-function spell:update(caster, dt) end
+function spell:update(caster, dt)
+    if self.previewType == "path" then
+        local charPos = caster:has(Tree.behaviors.positioned).position:floor()
+        --- @type Vec3
+        local mpos = Tree.level.camera:toWorldPosition(Vec3 { love.mouse.getX(), love.mouse.getY() }):floor()
+        if self.targetQuery.test(caster, mpos) then
+            self.path = require "lib.pathfinder" (charPos, mpos)
+        else
+            self.path = nil
+        end
+    end
+end
 
-function spell:draw() end
+function spell:draw()
+    if self.previewType == "path" then
+        local path = self.path --[[@as Deque?]]
+        if not path then return end
+        --- Это отрисовка пути персонажа к мышке
+        Tree.level.camera:attach()
+        love.graphics.setCanvas(Tree.level.render.textures.overlayLayer)
+        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)
+        end
+        love.graphics.setCanvas()
+        Tree.level.camera:detach()
+        love.graphics.setColor(1, 1, 1)
+    end
+end
 
-function spell:cast(caster, target) return end
+function spell:cast(caster, target) return task.fromValue() end
 
 --- Конструктор [Spell]
---- @param data {tag: string, baseCost: integer, baseCooldown: integer, targetQuery: SpellTargetQuery, distance: integer?, onCast: fun(caster: Character, target: Vec3): Task}
+--- @param data {tag: string, baseCost: integer, baseCooldown: integer, targetQuery: SpellTargetQuery?, previewType: SpellPreview?, distance: integer?, onCast: fun(caster: Character, target: Vec3): Task}
 --- @return Spell
 function spell.new(data)
-    local newSpell = {
+    local newSpell = setmetatable({
         tag = data.tag,
         baseCost = data.baseCost,
         baseCooldown = data.baseCooldown,
         targetQuery = data.targetQuery,
+        previewType = data.previewType,
         distance = data.distance
-    }
+    }, spell)
+
+    newSpell.targetQuery = newSpell.distance
+        and newSpell.targetQuery:intersect(Query(targetTest.distance(newSpell.distance)))
+        or newSpell.targetQuery
 
     function newSpell:cast(caster, target)
-        local targetQuery = self.distance
+        if not self.targetQuery.test(caster, target) then return task.fromValue() end -- проверка корректности цели
-            and self.targetQuery:intersect(Query(targetTest.distance(self.distance)))
-            or self.targetQuery
-        if not targetQuery.test(caster, target) then return end -- проверка корректности цели
 
         -- проверка на достаточное количество маны
         if caster:try(Tree.behaviors.stats, function(stats)
                 return stats.mana < self.baseCost
             end) then
-            return
+            return task.fromValue()
         end
 
         caster:try(Tree.behaviors.stats, function(stats)
@@ -60,7 +89,7 @@ function spell.new(data)
         return data.onCast(caster, target)
     end
 
-    return setmetatable(newSpell, spell)
+    return newSpell
 end
 
 return spell

lib/spell/target_test.lua

@@ -20,7 +20,6 @@ return {
             return caster:try(Tree.behaviors.positioned, function(p)
                 local dist = math.max(math.abs(p.position.x - targetPosition.x),
                     math.abs(p.position.y - targetPosition.y))
-                print("dist:", dist)
                 return dist <= radius
             end)
         end

lib/spellbook.lua

@@ -7,66 +7,37 @@
 --- --TODO: каждый каст должен возвращать объект, который позволит отследить момент завершения анимации спелла
 --- Да, это Future/Promise/await/async
 
-local task       = require 'lib.utils.task'
+local task           = require 'lib.utils.task'
-local spell      = require 'lib.spell.spell'
+local spell          = require 'lib.spell.spell'
-local targetTest = require 'lib.spell.target_test'
+local targetTest     = require 'lib.spell.target_test'
-local Query      = require "lib.spell.target_query"
+local Query          = require "lib.spell.target_query"
-local easing     = require "lib.utils.easing"
+local easing         = require "lib.utils.easing"
 
-local walk       = setmetatable({
+local walk           = spell.new {
-    --- @type Deque
+    tag = "dev_move",
-    path = nil
+    previewType = "path",
-}, spell)
+    baseCooldown = 1,
-walk.tag         = "dev_move"
+    baseCost = 2,
+    targetQuery = Query(targetTest.any):exclude(Query(targetTest.character)),
+    distance = 3,
+    onCast = function(caster, target)
+        local initialPos = caster:has(Tree.behaviors.positioned).position:floor()
+        local path = require "lib.pathfinder" (initialPos, target)
+        path:pop_front()
+        if path:is_empty() then
+            print("[Walk]: the path is empty", initialPos, target)
+            return task.fromValue()
+        end
 
-function walk:cast(caster, target)
+        local sprite = caster:has(Tree.behaviors.sprite)
-    if not caster:try(Tree.behaviors.stats, function(stats)
+        assert(sprite, "[Walk]", "WTF DUDE WHERE'S YOUR SPRITE")
-            return stats.mana >= 2
+        if not sprite then
-        end) then
+            return task.fromValue()
-        return
+        end
+
+        return caster:has(Tree.behaviors.tiled):followPath(path)
     end
-
+}
-    local initialPos = caster:has(Tree.behaviors.positioned).position:floor()
-    local path = require "lib.pathfinder" (initialPos, target)
-    path:pop_front()
-    if path:is_empty() then
-        print("[Walk]: the path is empty", initialPos, target)
-        return
-    end
-
-    caster:try(Tree.behaviors.stats, function(stats)
-        stats.mana = stats.mana - 2
-    end)
-
-    local sprite = caster:has(Tree.behaviors.sprite)
-    assert(sprite, "[Walk]", "WTF DUDE WHERE'S YOUR SPRITE")
-    if not sprite then
-        return
-    end
-
-    return caster:has(Tree.behaviors.tiled):followPath(path)
-end
-
-function walk:update(caster, dt)
-    local charPos = caster:has(Tree.behaviors.positioned).position:floor()
-    --- @type Vec3
-    local mpos = Tree.level.camera:toWorldPosition(Vec3 { love.mouse.getX(), love.mouse.getY() }):floor()
-    self.path = require "lib.pathfinder" (charPos, mpos)
-end
-
-function walk:draw()
-    if not self.path then return end
-    --- Это отрисовка пути персонажа к мышке
-    Tree.level.camera:attach()
-    love.graphics.setCanvas(Tree.level.render.textures.overlayLayer)
-    love.graphics.setColor(0.6, 0.75, 0.5)
-    for p in self.path:values() do
-        love.graphics.circle("fill", p.x + 0.45, p.y + 0.45, 0.1)
-    end
-    love.graphics.setCanvas()
-    Tree.level.camera:detach()
-    love.graphics.setColor(1, 1, 1)
-end
 
 local regenerateMana = spell.new {
     tag = "dev_mana",
@@ -101,7 +72,7 @@ local regenerateMana = spell.new {
     end
 }
 
-local attack = spell.new {
+local attack         = spell.new {
     tag = "dev_attack",
     baseCooldown = 1,
     baseCost = 2,
@@ -151,7 +122,7 @@ local attack = spell.new {
 }
 
 ----------------------------------------
-local spellbook = {
+local spellbook      = {
     walk = walk,
     regenerateMana = regenerateMana,
     attack = attack