chore(cbs): put choregraphy folder at the root

sonic-radiance.love/scenes/battlesystem/choregraphy/init.lua

@@ -1,11 +1,11 @@
 local ChoregraphySystem = Object:extend()
 
-local QteMixin = require "scenes.battlesystem.controllers.fighters.systems.choregraphy.mixins.qtes"
-local StepsMixin = require "scenes.battlesystem.controllers.fighters.systems.choregraphy.mixins.steps"
-local TagsMixin = require "scenes.battlesystem.controllers.fighters.systems.choregraphy.mixins.tags"
-local CountersMixin = require "scenes.battlesystem.controllers.fighters.systems.choregraphy.mixins.counters"
-local WrappersMixin = require "scenes.battlesystem.controllers.fighters.systems.choregraphy.mixins.wrappers"
-local SubChoregraphiesMixin = require "scenes.battlesystem.controllers.fighters.systems.choregraphy.mixins.subchoregraphies"
+local QteMixin = require "scenes.battlesystem.choregraphy.mixins.qtes"
+local StepsMixin = require "scenes.battlesystem.choregraphy.mixins.steps"
+local TagsMixin = require "scenes.battlesystem.choregraphy.mixins.tags"
+local CountersMixin = require "scenes.battlesystem.choregraphy.mixins.counters"
+local WrappersMixin = require "scenes.battlesystem.choregraphy.mixins.wrappers"
+local SubChoregraphiesMixin = require "scenes.battlesystem.choregraphy.mixins.subchoregraphies"
 
 local TweenManager = require "birb.classes.time"
 

sonic-radiance.love/scenes/battlesystem/choregraphy/mixins/qtes.lua

@@ -1,6 +1,6 @@
 local QteMixin = Object:extend()
 
-local qteObjectList = require "scenes.battlesystem.controllers.fighters.systems.choregraphy.qte"
+local qteObjectList = require "scenes.battlesystem.choregraphy.qte"
 
 function QteMixin:initQte()
     self.qte = {}

sonic-radiance.love/scenes/battlesystem/choregraphy/mixins/steps.lua

@@ -1,9 +1,9 @@
 local StepsMixins = Object:extend()
 
 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)
     self.currentStepId = 0

sonic-radiance.love/scenes/battlesystem/choregraphy/mixins/subchoregraphies.lua

@@ -1,6 +1,6 @@
 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)
     self.subChoregraphies = {} 

sonic-radiance.love/scenes/battlesystem/choregraphy/qte/init.lua

@@ -1,6 +1,6 @@
 local qtes = {}
 
-local baseURI = "scenes.battlesystem.controllers.fighters.systems.choregraphy.qte."
+local baseURI = "scenes.battlesystem.choregraphy.qte."
 
 qtes["simplePrompt"] = require (baseURI .. "simpleprompt")
 

sonic-radiance.love/scenes/battlesystem/choregraphy/qte/parent.lua

@@ -1,7 +1,7 @@
 local QteParent = Object:extend()
 
 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)
   self.choregraphy = choregraphySystem

sonic-radiance.love/scenes/battlesystem/choregraphy/qte/prompts/init.lua

@@ -1,5 +1,5 @@
 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
 

sonic-radiance.love/scenes/battlesystem/choregraphy/qte/simpleprompt.lua

@@ -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()
 
 function SimplePrompt:start()

sonic-radiance.love/scenes/battlesystem/choregraphy/step/addGFX.lua

@@ -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()
 
 function StepGFX:new(controller, args)

sonic-radiance.love/scenes/battlesystem/choregraphy/step/addQTE.lua

@@ -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()
 
 function StepQTE:new(controller, args)

sonic-radiance.love/scenes/battlesystem/choregraphy/step/goTo.lua

@@ -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()
 
 function GoToStep:new(controller, args)

sonic-radiance.love/scenes/battlesystem/choregraphy/step/goTo3D.lua

@@ -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()
 
 function GoTo3DStep:new(controller, args)

sonic-radiance.love/scenes/battlesystem/choregraphy/step/init.lua

@@ -1,6 +1,6 @@
 local actions = {}
 
-local baseURI = "scenes.battlesystem.controllers.fighters.systems.choregraphy.step."
+local baseURI = "scenes.battlesystem.choregraphy.step."
 
 actions["addGFX"] = require(baseURI .. "addGFX")
 actions["addQTE"] = require(baseURI .. "addQTE")

sonic-radiance.love/scenes/battlesystem/choregraphy/step/jump.lua

@@ -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()
 
 function JumpStep:new(controller, args)

sonic-radiance.love/scenes/battlesystem/choregraphy/step/jumpBack.lua

@@ -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()
 
 function JumpBackStep:new(controller, args)

sonic-radiance.love/scenes/battlesystem/choregraphy/step/playSFX.lua

@@ -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()
 
 function PlaySFX:new(system, args)

sonic-radiance.love/scenes/battlesystem/choregraphy/step/sendDamage.lua

@@ -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 maputils = require "scenes.battlesystem.utils"

sonic-radiance.love/scenes/battlesystem/choregraphy/step/sendStatus.lua

@@ -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()
 
 function SendStatus:new(system, args)

sonic-radiance.love/scenes/battlesystem/choregraphy/step/setAnimSpeed.lua

@@ -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()
 
 function SetAnimSpeedStep:new(controller, args)

sonic-radiance.love/scenes/battlesystem/choregraphy/step/setAnimation.lua

@@ -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()
 
 function AnimationSetterStep:new(controller, args)

sonic-radiance.love/scenes/battlesystem/choregraphy/step/setCounter.lua

@@ -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()
 
 function SetCounterStep:new(system, args)

sonic-radiance.love/scenes/battlesystem/choregraphy/step/skipTo.lua

@@ -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()
 
 function SkipToStep:new(system, args)

sonic-radiance.love/scenes/battlesystem/choregraphy/step/startSubChoregraphies.lua

@@ -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()
 
 function StartSubchoregraphiesStep:new(controller, args)

sonic-radiance.love/scenes/battlesystem/choregraphy/step/stopMov.lua

@@ -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()
 
 function StopMovStep:new(controller, args)

sonic-radiance.love/scenes/battlesystem/choregraphy/step/useItemEffect.lua

@@ -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()
 
 function UseItemEffect:new(system, args)

sonic-radiance.love/scenes/battlesystem/choregraphy/step/wait.lua

@@ -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()
 
 function WaitStep:new(controller, args)

sonic-radiance.love/scenes/battlesystem/choregraphy/step/waitActorFinished.lua

@@ -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()
 
 function WaitActorFinishedStep:new(controller, args)

sonic-radiance.love/scenes/battlesystem/choregraphy/step/waitFor.lua

@@ -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()
 
 function WaitForStep:new(controller, args)

sonic-radiance.love/scenes/battlesystem/choregraphy/subchoregraphy.lua

@@ -1,10 +1,10 @@
 local SubChoregraphy = Object:extend()
 
-local QteMixin = require "scenes.battlesystem.controllers.fighters.systems.choregraphy.mixins.qtes"
-local StepsMixin = require "scenes.battlesystem.controllers.fighters.systems.choregraphy.mixins.steps"
-local TagsMixin = require "scenes.battlesystem.controllers.fighters.systems.choregraphy.mixins.tags"
-local CountersMixin = require "scenes.battlesystem.controllers.fighters.systems.choregraphy.mixins.counters"
-local WrappersMixin = require "scenes.battlesystem.controllers.fighters.systems.choregraphy.mixins.wrappers"
+local QteMixin = require "scenes.battlesystem.choregraphy.mixins.qtes"
+local StepsMixin = require "scenes.battlesystem.choregraphy.mixins.steps"
+local TagsMixin = require "scenes.battlesystem.choregraphy.mixins.tags"
+local CountersMixin = require "scenes.battlesystem.choregraphy.mixins.counters"
+local WrappersMixin = require "scenes.battlesystem.choregraphy.mixins.wrappers"
 
 SubChoregraphy:implement(QteMixin)
 SubChoregraphy:implement(StepsMixin)

sonic-radiance.love/scenes/battlesystem/controllers/fighters/systems/actions/parent.lua

@@ -1,6 +1,6 @@
 local ActionParent = Object:extend()
 
-local ChoregraphySystem = require "scenes.battlesystem.controllers.fighters.systems.choregraphy"
+local ChoregraphySystem = require "scenes.battlesystem.choregraphy"
 
 function ActionParent:new(fighter)
   self.fighter = fighter

sonic-radiance.love/scenes/menus/debugmenus/choregraphy/mocks/action.lua

@@ -1,7 +1,7 @@
 local ActionParent = require "scenes.battlesystem.controllers.fighters.systems.actions.parent"
 local ActionMock = ActionParent:extend()
 
-local ChoregraphySystem = require "scenes.battlesystem.controllers.fighters.systems.choregraphy"
+local ChoregraphySystem = require "scenes.battlesystem.choregraphy"
 
 function ActionMock:new(fighter, data)
   ActionMock.super.new(self, fighter)