chore: completely redo the fighters organisation

This commit is contained in:
Kazhnuz 2021-08-15 16:50:53 +02:00
parent 34e1558f18
commit cb6bd66174
22 changed files with 34 additions and 34 deletions

View file

@ -1,9 +0,0 @@
local actions = {}
actions.attack = require "scenes.battlesystem.controllers.fighters.systems.actions.attack"
actions.skill = require "scenes.battlesystem.controllers.fighters.systems.actions.skill"
actions.item = require "scenes.battlesystem.controllers.fighters.systems.actions.item"
actions.defend = require "scenes.battlesystem.controllers.fighters.systems.actions.defend"
actions.flee = require "scenes.battlesystem.controllers.fighters.systems.actions.flee"
return actions

View file

@ -1,5 +0,0 @@
local folder = "scenes.battlesystem.controllers.fighters.systems.behaviours."
return {
["random"] = require(folder .. "random")
}

View file

@ -1,4 +1,4 @@
local ActionParent = require "scenes.battlesystem.controllers.fighters.systems.actions.parent" local ActionParent = require "scenes.battlesystem.fighters.character.actions.parent"
local AttackAction = ActionParent:extend() local AttackAction = ActionParent:extend()
function AttackAction:new(fighter) function AttackAction:new(fighter)

View file

@ -1,4 +1,4 @@
local ActionParent = require "scenes.battlesystem.controllers.fighters.systems.actions.parent" local ActionParent = require "scenes.battlesystem.fighters.character.actions.parent"
local DefendAction = ActionParent:extend() local DefendAction = ActionParent:extend()
function DefendAction:new(fighter) function DefendAction:new(fighter)

View file

@ -1,4 +1,4 @@
local ActionParent = require "scenes.battlesystem.controllers.fighters.systems.actions.parent" local ActionParent = require "scenes.battlesystem.fighters.character.actions.parent"
local FleeAction = ActionParent:extend() local FleeAction = ActionParent:extend()
local STATS = require "datas.consts.stats" local STATS = require "datas.consts.stats"

View file

@ -0,0 +1,9 @@
local actions = {}
actions.attack = require "scenes.battlesystem.fighters.character.actions.attack"
actions.skill = require "scenes.battlesystem.fighters.character.actions.skill"
actions.item = require "scenes.battlesystem.fighters.character.actions.item"
actions.defend = require "scenes.battlesystem.fighters.character.actions.defend"
actions.flee = require "scenes.battlesystem.fighters.character.actions.flee"
return actions

View file

@ -1,4 +1,4 @@
local ActionParent = require "scenes.battlesystem.controllers.fighters.systems.actions.parent" local ActionParent = require "scenes.battlesystem.fighters.character.actions.parent"
local ItemAction = ActionParent:extend() local ItemAction = ActionParent:extend()
local EffectManager = require "game.loot.effectManager" local EffectManager = require "game.loot.effectManager"

View file

@ -1,4 +1,4 @@
local ActionParent = require "scenes.battlesystem.controllers.fighters.systems.actions.parent" local ActionParent = require "scenes.battlesystem.fighters.character.actions.parent"
local SkillAction = ActionParent:extend() local SkillAction = ActionParent:extend()
function SkillAction:new(fighter, skill) function SkillAction:new(fighter, skill)

View file

@ -1,9 +1,9 @@
local FighterParent = require "scenes.battlesystem.controllers.fighters.parent" local FighterParent = require "scenes.battlesystem.fighters.fighter"
local HeroFighter = FighterParent:extend() local HeroFighter = FighterParent:extend()
local StatusBar = require "game.modules.gui.statusbar" local StatusBar = require "game.modules.gui.statusbar"
local SelectionSystem = require "scenes.battlesystem.controllers.fighters.systems.selection" local SelectionSystem = require "scenes.battlesystem.fighters.character.selection"
local actionList = require "scenes.battlesystem.controllers.fighters.systems.actions" local actionList = require "scenes.battlesystem.fighters.character.actions"
local HEROES_LINE = 2; local HEROES_LINE = 2;
local HUDSIZE = 91 local HUDSIZE = 91

View file

@ -1,7 +1,7 @@
local FighterControllerParent = require "scenes.battlesystem.controllers.parent" local FighterControllerParent = require "scenes.battlesystem.fighters.parent"
local EnnemyController = FighterControllerParent:extend() local EnnemyController = FighterControllerParent:extend()
local Villain = require "scenes.battlesystem.controllers.fighters.villain" local Villain = require "scenes.battlesystem.fighters.ennemy"
local STATS = require "datas.consts.stats" local STATS = require "datas.consts.stats"
function EnnemyController:new(owner, battleData) function EnnemyController:new(owner, battleData)

View file

@ -1,4 +1,4 @@
local ActionParent = require "scenes.battlesystem.controllers.fighters.systems.actions.parent" local ActionParent = require "scenes.battlesystem.fighters.character.actions.parent"
local EnnemyAction = ActionParent:extend() local EnnemyAction = ActionParent:extend()
function EnnemyAction:new(fighter, skill) function EnnemyAction:new(fighter, skill)

View file

@ -0,0 +1,5 @@
local folder = "scenes.battlesystem.fighters.ennemy.behaviours."
return {
["random"] = require(folder .. "random")
}

View file

@ -1,4 +1,4 @@
local ParentBehaviour = require "scenes.battlesystem.controllers.fighters.systems.behaviours.parent" local ParentBehaviour = require "scenes.battlesystem.fighters.ennemy.behaviours.parent"
local RandomBehaviour = ParentBehaviour:extend() local RandomBehaviour = ParentBehaviour:extend()
function RandomBehaviour:new(fighter, skilldata, targetList) function RandomBehaviour:new(fighter, skilldata, targetList)

View file

@ -1,10 +1,10 @@
local FighterParent = require "scenes.battlesystem.controllers.fighters.parent" local FighterParent = require "scenes.battlesystem.fighters.fighter"
local VillainFighter = FighterParent:extend() local VillainFighter = FighterParent:extend()
local SimpleHPBar = require "game.modules.gui.simplehpbar" local SimpleHPBar = require "game.modules.gui.simplehpbar"
local BossHPBar = require "game.modules.gui.bosshpbar" local BossHPBar = require "game.modules.gui.bosshpbar"
local EnnemyAction = require "scenes.battlesystem.controllers.fighters.systems.ennemyaction" local EnnemyAction = require "scenes.battlesystem.fighters.ennemy.action"
local behaviourList = require "scenes.battlesystem.controllers.fighters.systems.behaviours" local behaviourList = require "scenes.battlesystem.fighters.ennemy.behaviours"
local POSITIONS = {1, 3, 5} local POSITIONS = {1, 3, 5}

View file

@ -1,7 +1,7 @@
local FighterControllerParent = require "scenes.battlesystem.controllers.parent" local FighterControllerParent = require "scenes.battlesystem.fighters.parent"
local HeroFighterController = FighterControllerParent:extend() local HeroFighterController = FighterControllerParent:extend()
local Character = require "scenes.battlesystem.controllers.fighters.character" local Character = require "scenes.battlesystem.fighters.character"
function HeroFighterController:new(owner) function HeroFighterController:new(owner)
self.super.new(self, owner) self.super.new(self, owner)

View file

@ -1,7 +1,7 @@
local TurnController = Object:extend() local TurnController = Object:extend()
local Player = require "scenes.battlesystem.controllers.player" local Player = require "scenes.battlesystem.fighters.player"
local Ennemy = require "scenes.battlesystem.controllers.ennemy" local Ennemy = require "scenes.battlesystem.fighters.ennemies"
local HUD = require "scenes.battlesystem.gui.hud" local HUD = require "scenes.battlesystem.gui.hud"

View file

@ -1,4 +1,4 @@
local ActionParent = require "scenes.battlesystem.controllers.fighters.systems.actions.parent" local ActionParent = require "scenes.battlesystem.fighters.character.actions.parent"
local ActionMock = ActionParent:extend() local ActionMock = ActionParent:extend()
local ChoregraphySystem = require "scenes.battlesystem.choregraphy" local ChoregraphySystem = require "scenes.battlesystem.choregraphy"