Compare commits
No commits in common. "fcf5e7933ccc4d4e1f5d402871bcb95cbfe839fa" and "3838037006074a55a97db179f16a1cf7262b06c9" have entirely different histories.
fcf5e7933c
...
3838037006
@ -35,7 +35,6 @@ local function spawn(name, spriteDir, position, size, level)
|
||||
}
|
||||
|
||||
Tree.level.characters[char.id] = char
|
||||
Tree.level.turnOrder:updateOrder()
|
||||
return char
|
||||
end
|
||||
|
||||
|
||||
@ -7,7 +7,6 @@ local utils = require "lib.utils.utils"
|
||||
--- @field selector Selector
|
||||
--- @field camera Camera
|
||||
--- @field tileGrid TileGrid
|
||||
--- @field turnOrder TurnOrder
|
||||
local level = {}
|
||||
level.__index = level
|
||||
|
||||
@ -25,7 +24,6 @@ local function new(type, template)
|
||||
tileGrid = (require "lib.level.grid.tile_grid").new(type, template, size),
|
||||
selector = (require "lib.level.selector").new(),
|
||||
camera = (require "lib.level.camera").new(),
|
||||
turnOrder = (require "lib.level.turn_order").new(),
|
||||
}, level)
|
||||
end
|
||||
|
||||
|
||||
@ -1,43 +0,0 @@
|
||||
--- @class TurnOrder
|
||||
--- @field order Id[] возможно в будущем тут будет не айди персонажа, а айди фракции, в которой состоят несколько персонажей
|
||||
local turnOrder = {}
|
||||
turnOrder.__index = turnOrder
|
||||
|
||||
local function new()
|
||||
return setmetatable({
|
||||
order = {}
|
||||
}, turnOrder)
|
||||
end
|
||||
|
||||
function turnOrder:updateOrder()
|
||||
local order = {}
|
||||
local count = 1
|
||||
for k, _ in ipairs(Tree.level.characters) do
|
||||
order[count] = k
|
||||
count = count + 1
|
||||
end
|
||||
self.order = order
|
||||
|
||||
print('[Level]: Turn order has been updated!')
|
||||
for _, v in ipairs(self.order) do
|
||||
print('[Level]: id:', v)
|
||||
end
|
||||
end
|
||||
|
||||
function turnOrder:next()
|
||||
self.order[#self.order + 1] = self.order[1]
|
||||
self.order[1] = nil
|
||||
|
||||
local order = {}
|
||||
for i = 1, #self.order do
|
||||
order[i] = self.order[i + 1]
|
||||
end
|
||||
|
||||
self.order = order
|
||||
print('[Level]: Triggered next turn')
|
||||
for _, v in ipairs(self.order) do
|
||||
print('[Level]: id:', v)
|
||||
end
|
||||
end
|
||||
|
||||
return { new = new }
|
||||
@ -52,8 +52,6 @@ function walk:cast(caster, target)
|
||||
onEnd = function() caster:has(Tree.behaviors.spellcaster):endCast() end,
|
||||
}:run()
|
||||
|
||||
Tree.level.turnOrder:next()
|
||||
|
||||
return true
|
||||
end
|
||||
|
||||
@ -104,7 +102,7 @@ function attack:cast(caster, target)
|
||||
return false
|
||||
end
|
||||
|
||||
caster:try(Tree.behaviors.stats, function(stats)
|
||||
caster:try(Tree.behaviors.stats, function (stats)
|
||||
stats.mana = stats.mana - 2
|
||||
end)
|
||||
|
||||
|
||||
2
main.lua
2
main.lua
@ -12,8 +12,6 @@ end
|
||||
function love.load()
|
||||
character.spawn("Foodor", Tree.assets.files.sprites.character)
|
||||
character.spawn("Baris", Tree.assets.files.sprites.character, Vec3 { 3, 3 })
|
||||
character.spawn("Foodor Jr", Tree.assets.files.sprites.character, Vec3 { 0, 3 })
|
||||
character.spawn("Baris Jr", Tree.assets.files.sprites.character, Vec3 { 0, 6 })
|
||||
love.window.setMode(1080, 720, { resizable = true, msaa = 4, vsync = true })
|
||||
end
|
||||
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user