chore(cbs): put choregraphy folder at the root
This commit is contained in:
parent
d66b7003ba
commit
b513ed8ace
37 changed files with 41 additions and 41 deletions
|
@ -1,11 +1,11 @@
|
||||||
local ChoregraphySystem = Object:extend()
|
local ChoregraphySystem = Object:extend()
|
||||||
|
|
||||||
local QteMixin = require "scenes.battlesystem.controllers.fighters.systems.choregraphy.mixins.qtes"
|
local QteMixin = require "scenes.battlesystem.choregraphy.mixins.qtes"
|
||||||
local StepsMixin = require "scenes.battlesystem.controllers.fighters.systems.choregraphy.mixins.steps"
|
local StepsMixin = require "scenes.battlesystem.choregraphy.mixins.steps"
|
||||||
local TagsMixin = require "scenes.battlesystem.controllers.fighters.systems.choregraphy.mixins.tags"
|
local TagsMixin = require "scenes.battlesystem.choregraphy.mixins.tags"
|
||||||
local CountersMixin = require "scenes.battlesystem.controllers.fighters.systems.choregraphy.mixins.counters"
|
local CountersMixin = require "scenes.battlesystem.choregraphy.mixins.counters"
|
||||||
local WrappersMixin = require "scenes.battlesystem.controllers.fighters.systems.choregraphy.mixins.wrappers"
|
local WrappersMixin = require "scenes.battlesystem.choregraphy.mixins.wrappers"
|
||||||
local SubChoregraphiesMixin = require "scenes.battlesystem.controllers.fighters.systems.choregraphy.mixins.subchoregraphies"
|
local SubChoregraphiesMixin = require "scenes.battlesystem.choregraphy.mixins.subchoregraphies"
|
||||||
|
|
||||||
local TweenManager = require "birb.classes.time"
|
local TweenManager = require "birb.classes.time"
|
||||||
|
|
|
@ -1,6 +1,6 @@
|
||||||
local QteMixin = Object:extend()
|
local QteMixin = Object:extend()
|
||||||
|
|
||||||
local qteObjectList = require "scenes.battlesystem.controllers.fighters.systems.choregraphy.qte"
|
local qteObjectList = require "scenes.battlesystem.choregraphy.qte"
|
||||||
|
|
||||||
function QteMixin:initQte()
|
function QteMixin:initQte()
|
||||||
self.qte = {}
|
self.qte = {}
|
|
@ -1,9 +1,9 @@
|
||||||
local StepsMixins = Object:extend()
|
local StepsMixins = Object:extend()
|
||||||
|
|
||||||
local Predicate = require "birb.classes.predicate"
|
local Predicate = require "birb.classes.predicate"
|
||||||
local Conditions = require "scenes.battlesystem.controllers.fighters.systems.choregraphy.conditions"
|
local Conditions = require "scenes.battlesystem.choregraphy.conditions"
|
||||||
|
|
||||||
local stepObjectList = require "scenes.battlesystem.controllers.fighters.systems.choregraphy.step"
|
local stepObjectList = require "scenes.battlesystem.choregraphy.step"
|
||||||
|
|
||||||
function StepsMixins:initSteps(choregraphy)
|
function StepsMixins:initSteps(choregraphy)
|
||||||
self.currentStepId = 0
|
self.currentStepId = 0
|
|
@ -1,6 +1,6 @@
|
||||||
local SubChoregraphiesMixin = Object:extend()
|
local SubChoregraphiesMixin = Object:extend()
|
||||||
|
|
||||||
local SubChoregraphy = require "scenes.battlesystem.controllers.fighters.systems.choregraphy.subchoregraphy"
|
local SubChoregraphy = require "scenes.battlesystem.choregraphy.subchoregraphy"
|
||||||
|
|
||||||
function SubChoregraphiesMixin:initSubchoregraphies(subChoregraphy)
|
function SubChoregraphiesMixin:initSubchoregraphies(subChoregraphy)
|
||||||
self.subChoregraphies = {}
|
self.subChoregraphies = {}
|
|
@ -1,6 +1,6 @@
|
||||||
local qtes = {}
|
local qtes = {}
|
||||||
|
|
||||||
local baseURI = "scenes.battlesystem.controllers.fighters.systems.choregraphy.qte."
|
local baseURI = "scenes.battlesystem.choregraphy.qte."
|
||||||
|
|
||||||
qtes["simplePrompt"] = require (baseURI .. "simpleprompt")
|
qtes["simplePrompt"] = require (baseURI .. "simpleprompt")
|
||||||
|
|
|
@ -1,7 +1,7 @@
|
||||||
local QteParent = Object:extend()
|
local QteParent = Object:extend()
|
||||||
|
|
||||||
local TweenManager = require "birb.classes.time"
|
local TweenManager = require "birb.classes.time"
|
||||||
local Prompts = require "scenes.battlesystem.controllers.fighters.systems.choregraphy.qte.prompts"
|
local Prompts = require "scenes.battlesystem.choregraphy.qte.prompts"
|
||||||
|
|
||||||
function QteParent:new(choregraphySystem, arguments)
|
function QteParent:new(choregraphySystem, arguments)
|
||||||
self.choregraphy = choregraphySystem
|
self.choregraphy = choregraphySystem
|
|
@ -1,5 +1,5 @@
|
||||||
local QtePrompts = Object:extend()
|
local QtePrompts = Object:extend()
|
||||||
local Button = require "scenes.battlesystem.controllers.fighters.systems.choregraphy.qte.prompts.button"
|
local Button = require "scenes.battlesystem.choregraphy.qte.prompts.button"
|
||||||
|
|
||||||
QtePrompts.BEGINTIME = 0.2
|
QtePrompts.BEGINTIME = 0.2
|
||||||
|
|
|
@ -1,4 +1,4 @@
|
||||||
local Parent = require "scenes.battlesystem.controllers.fighters.systems.choregraphy.qte.parent"
|
local Parent = require "scenes.battlesystem.choregraphy.qte.parent"
|
||||||
local SimplePrompt = Parent:extend()
|
local SimplePrompt = Parent:extend()
|
||||||
|
|
||||||
function SimplePrompt:start()
|
function SimplePrompt:start()
|
|
@ -1,4 +1,4 @@
|
||||||
local StepParent = require "scenes.battlesystem.controllers.fighters.systems.choregraphy.step.parent"
|
local StepParent = require "scenes.battlesystem.choregraphy.step.parent"
|
||||||
local StepGFX = StepParent:extend()
|
local StepGFX = StepParent:extend()
|
||||||
|
|
||||||
function StepGFX:new(controller, args)
|
function StepGFX:new(controller, args)
|
|
@ -1,4 +1,4 @@
|
||||||
local StepParent = require "scenes.battlesystem.controllers.fighters.systems.choregraphy.step.parent"
|
local StepParent = require "scenes.battlesystem.choregraphy.step.parent"
|
||||||
local StepQTE = StepParent:extend()
|
local StepQTE = StepParent:extend()
|
||||||
|
|
||||||
function StepQTE:new(controller, args)
|
function StepQTE:new(controller, args)
|
|
@ -1,4 +1,4 @@
|
||||||
local StepParent = require "scenes.battlesystem.controllers.fighters.systems.choregraphy.step.parent"
|
local StepParent = require "scenes.battlesystem.choregraphy.step.parent"
|
||||||
local GoToStep = StepParent:extend()
|
local GoToStep = StepParent:extend()
|
||||||
|
|
||||||
function GoToStep:new(controller, args)
|
function GoToStep:new(controller, args)
|
|
@ -1,4 +1,4 @@
|
||||||
local StepParent = require "scenes.battlesystem.controllers.fighters.systems.choregraphy.step.parent"
|
local StepParent = require "scenes.battlesystem.choregraphy.step.parent"
|
||||||
local GoTo3DStep = StepParent:extend()
|
local GoTo3DStep = StepParent:extend()
|
||||||
|
|
||||||
function GoTo3DStep:new(controller, args)
|
function GoTo3DStep:new(controller, args)
|
|
@ -1,6 +1,6 @@
|
||||||
local actions = {}
|
local actions = {}
|
||||||
|
|
||||||
local baseURI = "scenes.battlesystem.controllers.fighters.systems.choregraphy.step."
|
local baseURI = "scenes.battlesystem.choregraphy.step."
|
||||||
|
|
||||||
actions["addGFX"] = require(baseURI .. "addGFX")
|
actions["addGFX"] = require(baseURI .. "addGFX")
|
||||||
actions["addQTE"] = require(baseURI .. "addQTE")
|
actions["addQTE"] = require(baseURI .. "addQTE")
|
|
@ -1,4 +1,4 @@
|
||||||
local StepParent = require "scenes.battlesystem.controllers.fighters.systems.choregraphy.step.parent"
|
local StepParent = require "scenes.battlesystem.choregraphy.step.parent"
|
||||||
local JumpStep = StepParent:extend()
|
local JumpStep = StepParent:extend()
|
||||||
|
|
||||||
function JumpStep:new(controller, args)
|
function JumpStep:new(controller, args)
|
|
@ -1,4 +1,4 @@
|
||||||
local StepParent = require "scenes.battlesystem.controllers.fighters.systems.choregraphy.step.parent"
|
local StepParent = require "scenes.battlesystem.choregraphy.step.parent"
|
||||||
local JumpBackStep = StepParent:extend()
|
local JumpBackStep = StepParent:extend()
|
||||||
|
|
||||||
function JumpBackStep:new(controller, args)
|
function JumpBackStep:new(controller, args)
|
|
@ -1,4 +1,4 @@
|
||||||
local StepParent = require "scenes.battlesystem.controllers.fighters.systems.choregraphy.step.parent"
|
local StepParent = require "scenes.battlesystem.choregraphy.step.parent"
|
||||||
local PlaySFX = StepParent:extend()
|
local PlaySFX = StepParent:extend()
|
||||||
|
|
||||||
function PlaySFX:new(system, args)
|
function PlaySFX:new(system, args)
|
|
@ -1,4 +1,4 @@
|
||||||
local StepParent = require "scenes.battlesystem.controllers.fighters.systems.choregraphy.step.parent"
|
local StepParent = require "scenes.battlesystem.choregraphy.step.parent"
|
||||||
local SendDamage = StepParent:extend()
|
local SendDamage = StepParent:extend()
|
||||||
|
|
||||||
local maputils = require "scenes.battlesystem.utils"
|
local maputils = require "scenes.battlesystem.utils"
|
|
@ -1,4 +1,4 @@
|
||||||
local StepParent = require "scenes.battlesystem.controllers.fighters.systems.choregraphy.step.parent"
|
local StepParent = require "scenes.battlesystem.choregraphy.step.parent"
|
||||||
local SendStatus = StepParent:extend()
|
local SendStatus = StepParent:extend()
|
||||||
|
|
||||||
function SendStatus:new(system, args)
|
function SendStatus:new(system, args)
|
|
@ -1,4 +1,4 @@
|
||||||
local StepParent = require "scenes.battlesystem.controllers.fighters.systems.choregraphy.step.parent"
|
local StepParent = require "scenes.battlesystem.choregraphy.step.parent"
|
||||||
local SetAnimSpeedStep = StepParent:extend()
|
local SetAnimSpeedStep = StepParent:extend()
|
||||||
|
|
||||||
function SetAnimSpeedStep:new(controller, args)
|
function SetAnimSpeedStep:new(controller, args)
|
|
@ -1,4 +1,4 @@
|
||||||
local StepParent = require "scenes.battlesystem.controllers.fighters.systems.choregraphy.step.parent"
|
local StepParent = require "scenes.battlesystem.choregraphy.step.parent"
|
||||||
local AnimationSetterStep = StepParent:extend()
|
local AnimationSetterStep = StepParent:extend()
|
||||||
|
|
||||||
function AnimationSetterStep:new(controller, args)
|
function AnimationSetterStep:new(controller, args)
|
|
@ -1,4 +1,4 @@
|
||||||
local StepParent = require "scenes.battlesystem.controllers.fighters.systems.choregraphy.step.parent"
|
local StepParent = require "scenes.battlesystem.choregraphy.step.parent"
|
||||||
local SetCounterStep = StepParent:extend()
|
local SetCounterStep = StepParent:extend()
|
||||||
|
|
||||||
function SetCounterStep:new(system, args)
|
function SetCounterStep:new(system, args)
|
|
@ -1,4 +1,4 @@
|
||||||
local StepParent = require "scenes.battlesystem.controllers.fighters.systems.choregraphy.step.parent"
|
local StepParent = require "scenes.battlesystem.choregraphy.step.parent"
|
||||||
local SkipToStep = StepParent:extend()
|
local SkipToStep = StepParent:extend()
|
||||||
|
|
||||||
function SkipToStep:new(system, args)
|
function SkipToStep:new(system, args)
|
|
@ -1,4 +1,4 @@
|
||||||
local StepParent = require "scenes.battlesystem.controllers.fighters.systems.choregraphy.step.parent"
|
local StepParent = require "scenes.battlesystem.choregraphy.step.parent"
|
||||||
local StartSubchoregraphiesStep = StepParent:extend()
|
local StartSubchoregraphiesStep = StepParent:extend()
|
||||||
|
|
||||||
function StartSubchoregraphiesStep:new(controller, args)
|
function StartSubchoregraphiesStep:new(controller, args)
|
|
@ -1,4 +1,4 @@
|
||||||
local StepParent = require "scenes.battlesystem.controllers.fighters.systems.choregraphy.step.parent"
|
local StepParent = require "scenes.battlesystem.choregraphy.step.parent"
|
||||||
local StopMovStep = StepParent:extend()
|
local StopMovStep = StepParent:extend()
|
||||||
|
|
||||||
function StopMovStep:new(controller, args)
|
function StopMovStep:new(controller, args)
|
|
@ -1,4 +1,4 @@
|
||||||
local StepParent = require "scenes.battlesystem.controllers.fighters.systems.choregraphy.step.parent"
|
local StepParent = require "scenes.battlesystem.choregraphy.step.parent"
|
||||||
local UseItemEffect = StepParent:extend()
|
local UseItemEffect = StepParent:extend()
|
||||||
|
|
||||||
function UseItemEffect:new(system, args)
|
function UseItemEffect:new(system, args)
|
|
@ -1,4 +1,4 @@
|
||||||
local StepParent = require "scenes.battlesystem.controllers.fighters.systems.choregraphy.step.parent"
|
local StepParent = require "scenes.battlesystem.choregraphy.step.parent"
|
||||||
local WaitStep = StepParent:extend()
|
local WaitStep = StepParent:extend()
|
||||||
|
|
||||||
function WaitStep:new(controller, args)
|
function WaitStep:new(controller, args)
|
|
@ -1,4 +1,4 @@
|
||||||
local StepParent = require "scenes.battlesystem.controllers.fighters.systems.choregraphy.step.parent"
|
local StepParent = require "scenes.battlesystem.choregraphy.step.parent"
|
||||||
local WaitActorFinishedStep = StepParent:extend()
|
local WaitActorFinishedStep = StepParent:extend()
|
||||||
|
|
||||||
function WaitActorFinishedStep:new(controller, args)
|
function WaitActorFinishedStep:new(controller, args)
|
|
@ -1,4 +1,4 @@
|
||||||
local StepParent = require "scenes.battlesystem.controllers.fighters.systems.choregraphy.step.parent"
|
local StepParent = require "scenes.battlesystem.choregraphy.step.parent"
|
||||||
local WaitForStep = StepParent:extend()
|
local WaitForStep = StepParent:extend()
|
||||||
|
|
||||||
function WaitForStep:new(controller, args)
|
function WaitForStep:new(controller, args)
|
|
@ -1,10 +1,10 @@
|
||||||
local SubChoregraphy = Object:extend()
|
local SubChoregraphy = Object:extend()
|
||||||
|
|
||||||
local QteMixin = require "scenes.battlesystem.controllers.fighters.systems.choregraphy.mixins.qtes"
|
local QteMixin = require "scenes.battlesystem.choregraphy.mixins.qtes"
|
||||||
local StepsMixin = require "scenes.battlesystem.controllers.fighters.systems.choregraphy.mixins.steps"
|
local StepsMixin = require "scenes.battlesystem.choregraphy.mixins.steps"
|
||||||
local TagsMixin = require "scenes.battlesystem.controllers.fighters.systems.choregraphy.mixins.tags"
|
local TagsMixin = require "scenes.battlesystem.choregraphy.mixins.tags"
|
||||||
local CountersMixin = require "scenes.battlesystem.controllers.fighters.systems.choregraphy.mixins.counters"
|
local CountersMixin = require "scenes.battlesystem.choregraphy.mixins.counters"
|
||||||
local WrappersMixin = require "scenes.battlesystem.controllers.fighters.systems.choregraphy.mixins.wrappers"
|
local WrappersMixin = require "scenes.battlesystem.choregraphy.mixins.wrappers"
|
||||||
|
|
||||||
SubChoregraphy:implement(QteMixin)
|
SubChoregraphy:implement(QteMixin)
|
||||||
SubChoregraphy:implement(StepsMixin)
|
SubChoregraphy:implement(StepsMixin)
|
|
@ -1,6 +1,6 @@
|
||||||
local ActionParent = Object:extend()
|
local ActionParent = Object:extend()
|
||||||
|
|
||||||
local ChoregraphySystem = require "scenes.battlesystem.controllers.fighters.systems.choregraphy"
|
local ChoregraphySystem = require "scenes.battlesystem.choregraphy"
|
||||||
|
|
||||||
function ActionParent:new(fighter)
|
function ActionParent:new(fighter)
|
||||||
self.fighter = fighter
|
self.fighter = fighter
|
||||||
|
|
|
@ -1,7 +1,7 @@
|
||||||
local ActionParent = require "scenes.battlesystem.controllers.fighters.systems.actions.parent"
|
local ActionParent = require "scenes.battlesystem.controllers.fighters.systems.actions.parent"
|
||||||
local ActionMock = ActionParent:extend()
|
local ActionMock = ActionParent:extend()
|
||||||
|
|
||||||
local ChoregraphySystem = require "scenes.battlesystem.controllers.fighters.systems.choregraphy"
|
local ChoregraphySystem = require "scenes.battlesystem.choregraphy"
|
||||||
|
|
||||||
function ActionMock:new(fighter, data)
|
function ActionMock:new(fighter, data)
|
||||||
ActionMock.super.new(self, fighter)
|
ActionMock.super.new(self, fighter)
|
||||||
|
|
Loading…
Reference in a new issue