diff --git a/sonic-radiance.love/scenes/battlesystem/controllers/fighters/systems/choregraphy/conditions.lua b/sonic-radiance.love/scenes/battlesystem/choregraphy/conditions.lua similarity index 100% rename from sonic-radiance.love/scenes/battlesystem/controllers/fighters/systems/choregraphy/conditions.lua rename to sonic-radiance.love/scenes/battlesystem/choregraphy/conditions.lua diff --git a/sonic-radiance.love/scenes/battlesystem/controllers/fighters/systems/choregraphy/init.lua b/sonic-radiance.love/scenes/battlesystem/choregraphy/init.lua similarity index 64% rename from sonic-radiance.love/scenes/battlesystem/controllers/fighters/systems/choregraphy/init.lua rename to sonic-radiance.love/scenes/battlesystem/choregraphy/init.lua index 82d7b1f..b2bc558 100644 --- a/sonic-radiance.love/scenes/battlesystem/controllers/fighters/systems/choregraphy/init.lua +++ b/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" diff --git a/sonic-radiance.love/scenes/battlesystem/controllers/fighters/systems/choregraphy/mixins/counters.lua b/sonic-radiance.love/scenes/battlesystem/choregraphy/mixins/counters.lua similarity index 100% rename from sonic-radiance.love/scenes/battlesystem/controllers/fighters/systems/choregraphy/mixins/counters.lua rename to sonic-radiance.love/scenes/battlesystem/choregraphy/mixins/counters.lua diff --git a/sonic-radiance.love/scenes/battlesystem/controllers/fighters/systems/choregraphy/mixins/qtes.lua b/sonic-radiance.love/scenes/battlesystem/choregraphy/mixins/qtes.lua similarity index 93% rename from sonic-radiance.love/scenes/battlesystem/controllers/fighters/systems/choregraphy/mixins/qtes.lua rename to sonic-radiance.love/scenes/battlesystem/choregraphy/mixins/qtes.lua index 1d1a75f..f803717 100644 --- a/sonic-radiance.love/scenes/battlesystem/controllers/fighters/systems/choregraphy/mixins/qtes.lua +++ b/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 = {} diff --git a/sonic-radiance.love/scenes/battlesystem/controllers/fighters/systems/choregraphy/mixins/steps.lua b/sonic-radiance.love/scenes/battlesystem/choregraphy/mixins/steps.lua similarity index 90% rename from sonic-radiance.love/scenes/battlesystem/controllers/fighters/systems/choregraphy/mixins/steps.lua rename to sonic-radiance.love/scenes/battlesystem/choregraphy/mixins/steps.lua index 308de1c..a21bc28 100644 --- a/sonic-radiance.love/scenes/battlesystem/controllers/fighters/systems/choregraphy/mixins/steps.lua +++ b/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 diff --git a/sonic-radiance.love/scenes/battlesystem/controllers/fighters/systems/choregraphy/mixins/subchoregraphies.lua b/sonic-radiance.love/scenes/battlesystem/choregraphy/mixins/subchoregraphies.lua similarity index 94% rename from sonic-radiance.love/scenes/battlesystem/controllers/fighters/systems/choregraphy/mixins/subchoregraphies.lua rename to sonic-radiance.love/scenes/battlesystem/choregraphy/mixins/subchoregraphies.lua index b1a1e44..fcda1d3 100644 --- a/sonic-radiance.love/scenes/battlesystem/controllers/fighters/systems/choregraphy/mixins/subchoregraphies.lua +++ b/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 = {} diff --git a/sonic-radiance.love/scenes/battlesystem/controllers/fighters/systems/choregraphy/mixins/tags.lua b/sonic-radiance.love/scenes/battlesystem/choregraphy/mixins/tags.lua similarity index 100% rename from sonic-radiance.love/scenes/battlesystem/controllers/fighters/systems/choregraphy/mixins/tags.lua rename to sonic-radiance.love/scenes/battlesystem/choregraphy/mixins/tags.lua diff --git a/sonic-radiance.love/scenes/battlesystem/controllers/fighters/systems/choregraphy/mixins/wrappers.lua b/sonic-radiance.love/scenes/battlesystem/choregraphy/mixins/wrappers.lua similarity index 100% rename from sonic-radiance.love/scenes/battlesystem/controllers/fighters/systems/choregraphy/mixins/wrappers.lua rename to sonic-radiance.love/scenes/battlesystem/choregraphy/mixins/wrappers.lua diff --git a/sonic-radiance.love/scenes/battlesystem/controllers/fighters/systems/choregraphy/qte/init.lua b/sonic-radiance.love/scenes/battlesystem/choregraphy/qte/init.lua similarity index 51% rename from sonic-radiance.love/scenes/battlesystem/controllers/fighters/systems/choregraphy/qte/init.lua rename to sonic-radiance.love/scenes/battlesystem/choregraphy/qte/init.lua index 625a0a6..8fe75e9 100644 --- a/sonic-radiance.love/scenes/battlesystem/controllers/fighters/systems/choregraphy/qte/init.lua +++ b/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") diff --git a/sonic-radiance.love/scenes/battlesystem/controllers/fighters/systems/choregraphy/qte/parent.lua b/sonic-radiance.love/scenes/battlesystem/choregraphy/qte/parent.lua similarity index 97% rename from sonic-radiance.love/scenes/battlesystem/controllers/fighters/systems/choregraphy/qte/parent.lua rename to sonic-radiance.love/scenes/battlesystem/choregraphy/qte/parent.lua index 8b20d89..0afa2be 100644 --- a/sonic-radiance.love/scenes/battlesystem/controllers/fighters/systems/choregraphy/qte/parent.lua +++ b/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 diff --git a/sonic-radiance.love/scenes/battlesystem/controllers/fighters/systems/choregraphy/qte/prompts/button.lua b/sonic-radiance.love/scenes/battlesystem/choregraphy/qte/prompts/button.lua similarity index 100% rename from sonic-radiance.love/scenes/battlesystem/controllers/fighters/systems/choregraphy/qte/prompts/button.lua rename to sonic-radiance.love/scenes/battlesystem/choregraphy/qte/prompts/button.lua diff --git a/sonic-radiance.love/scenes/battlesystem/controllers/fighters/systems/choregraphy/qte/prompts/init.lua b/sonic-radiance.love/scenes/battlesystem/choregraphy/qte/prompts/init.lua similarity index 93% rename from sonic-radiance.love/scenes/battlesystem/controllers/fighters/systems/choregraphy/qte/prompts/init.lua rename to sonic-radiance.love/scenes/battlesystem/choregraphy/qte/prompts/init.lua index 72ae231..7283b39 100644 --- a/sonic-radiance.love/scenes/battlesystem/controllers/fighters/systems/choregraphy/qte/prompts/init.lua +++ b/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 diff --git a/sonic-radiance.love/scenes/battlesystem/controllers/fighters/systems/choregraphy/qte/simpleprompt.lua b/sonic-radiance.love/scenes/battlesystem/choregraphy/qte/simpleprompt.lua similarity index 74% rename from sonic-radiance.love/scenes/battlesystem/controllers/fighters/systems/choregraphy/qte/simpleprompt.lua rename to sonic-radiance.love/scenes/battlesystem/choregraphy/qte/simpleprompt.lua index ad2e58f..a86b868 100644 --- a/sonic-radiance.love/scenes/battlesystem/controllers/fighters/systems/choregraphy/qte/simpleprompt.lua +++ b/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() diff --git a/sonic-radiance.love/scenes/battlesystem/controllers/fighters/systems/choregraphy/step/addGFX.lua b/sonic-radiance.love/scenes/battlesystem/choregraphy/step/addGFX.lua similarity index 84% rename from sonic-radiance.love/scenes/battlesystem/controllers/fighters/systems/choregraphy/step/addGFX.lua rename to sonic-radiance.love/scenes/battlesystem/choregraphy/step/addGFX.lua index c0e5c2c..e5439bc 100644 --- a/sonic-radiance.love/scenes/battlesystem/controllers/fighters/systems/choregraphy/step/addGFX.lua +++ b/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) diff --git a/sonic-radiance.love/scenes/battlesystem/controllers/fighters/systems/choregraphy/step/addQTE.lua b/sonic-radiance.love/scenes/battlesystem/choregraphy/step/addQTE.lua similarity index 82% rename from sonic-radiance.love/scenes/battlesystem/controllers/fighters/systems/choregraphy/step/addQTE.lua rename to sonic-radiance.love/scenes/battlesystem/choregraphy/step/addQTE.lua index 0971db1..107a652 100644 --- a/sonic-radiance.love/scenes/battlesystem/controllers/fighters/systems/choregraphy/step/addQTE.lua +++ b/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) diff --git a/sonic-radiance.love/scenes/battlesystem/controllers/fighters/systems/choregraphy/step/goTo.lua b/sonic-radiance.love/scenes/battlesystem/choregraphy/step/goTo.lua similarity index 85% rename from sonic-radiance.love/scenes/battlesystem/controllers/fighters/systems/choregraphy/step/goTo.lua rename to sonic-radiance.love/scenes/battlesystem/choregraphy/step/goTo.lua index 4ef6d73..fa6a502 100644 --- a/sonic-radiance.love/scenes/battlesystem/controllers/fighters/systems/choregraphy/step/goTo.lua +++ b/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) diff --git a/sonic-radiance.love/scenes/battlesystem/controllers/fighters/systems/choregraphy/step/goTo3D.lua b/sonic-radiance.love/scenes/battlesystem/choregraphy/step/goTo3D.lua similarity index 86% rename from sonic-radiance.love/scenes/battlesystem/controllers/fighters/systems/choregraphy/step/goTo3D.lua rename to sonic-radiance.love/scenes/battlesystem/choregraphy/step/goTo3D.lua index 51590e4..50c9536 100644 --- a/sonic-radiance.love/scenes/battlesystem/controllers/fighters/systems/choregraphy/step/goTo3D.lua +++ b/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) diff --git a/sonic-radiance.love/scenes/battlesystem/controllers/fighters/systems/choregraphy/step/init.lua b/sonic-radiance.love/scenes/battlesystem/choregraphy/step/init.lua similarity index 92% rename from sonic-radiance.love/scenes/battlesystem/controllers/fighters/systems/choregraphy/step/init.lua rename to sonic-radiance.love/scenes/battlesystem/choregraphy/step/init.lua index 68c8953..c42a5c0 100644 --- a/sonic-radiance.love/scenes/battlesystem/controllers/fighters/systems/choregraphy/step/init.lua +++ b/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") diff --git a/sonic-radiance.love/scenes/battlesystem/controllers/fighters/systems/choregraphy/step/jump.lua b/sonic-radiance.love/scenes/battlesystem/choregraphy/step/jump.lua similarity index 85% rename from sonic-radiance.love/scenes/battlesystem/controllers/fighters/systems/choregraphy/step/jump.lua rename to sonic-radiance.love/scenes/battlesystem/choregraphy/step/jump.lua index 712d737..7bfd76b 100644 --- a/sonic-radiance.love/scenes/battlesystem/controllers/fighters/systems/choregraphy/step/jump.lua +++ b/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) diff --git a/sonic-radiance.love/scenes/battlesystem/controllers/fighters/systems/choregraphy/step/jumpBack.lua b/sonic-radiance.love/scenes/battlesystem/choregraphy/step/jumpBack.lua similarity index 85% rename from sonic-radiance.love/scenes/battlesystem/controllers/fighters/systems/choregraphy/step/jumpBack.lua rename to sonic-radiance.love/scenes/battlesystem/choregraphy/step/jumpBack.lua index 47c4bc8..d0ac080 100644 --- a/sonic-radiance.love/scenes/battlesystem/controllers/fighters/systems/choregraphy/step/jumpBack.lua +++ b/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) diff --git a/sonic-radiance.love/scenes/battlesystem/controllers/fighters/systems/choregraphy/step/parent.lua b/sonic-radiance.love/scenes/battlesystem/choregraphy/step/parent.lua similarity index 100% rename from sonic-radiance.love/scenes/battlesystem/controllers/fighters/systems/choregraphy/step/parent.lua rename to sonic-radiance.love/scenes/battlesystem/choregraphy/step/parent.lua diff --git a/sonic-radiance.love/scenes/battlesystem/controllers/fighters/systems/choregraphy/step/playSFX.lua b/sonic-radiance.love/scenes/battlesystem/choregraphy/step/playSFX.lua similarity index 69% rename from sonic-radiance.love/scenes/battlesystem/controllers/fighters/systems/choregraphy/step/playSFX.lua rename to sonic-radiance.love/scenes/battlesystem/choregraphy/step/playSFX.lua index e5d24ac..64c47a5 100644 --- a/sonic-radiance.love/scenes/battlesystem/controllers/fighters/systems/choregraphy/step/playSFX.lua +++ b/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) diff --git a/sonic-radiance.love/scenes/battlesystem/controllers/fighters/systems/choregraphy/step/sendDamage.lua b/sonic-radiance.love/scenes/battlesystem/choregraphy/step/sendDamage.lua similarity index 82% rename from sonic-radiance.love/scenes/battlesystem/controllers/fighters/systems/choregraphy/step/sendDamage.lua rename to sonic-radiance.love/scenes/battlesystem/choregraphy/step/sendDamage.lua index bc39b93..5022f5b 100644 --- a/sonic-radiance.love/scenes/battlesystem/controllers/fighters/systems/choregraphy/step/sendDamage.lua +++ b/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" diff --git a/sonic-radiance.love/scenes/battlesystem/controllers/fighters/systems/choregraphy/step/sendStatus.lua b/sonic-radiance.love/scenes/battlesystem/choregraphy/step/sendStatus.lua similarity index 78% rename from sonic-radiance.love/scenes/battlesystem/controllers/fighters/systems/choregraphy/step/sendStatus.lua rename to sonic-radiance.love/scenes/battlesystem/choregraphy/step/sendStatus.lua index 1681383..09cc6f6 100644 --- a/sonic-radiance.love/scenes/battlesystem/controllers/fighters/systems/choregraphy/step/sendStatus.lua +++ b/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) diff --git a/sonic-radiance.love/scenes/battlesystem/controllers/fighters/systems/choregraphy/step/setAnimSpeed.lua b/sonic-radiance.love/scenes/battlesystem/choregraphy/step/setAnimSpeed.lua similarity index 80% rename from sonic-radiance.love/scenes/battlesystem/controllers/fighters/systems/choregraphy/step/setAnimSpeed.lua rename to sonic-radiance.love/scenes/battlesystem/choregraphy/step/setAnimSpeed.lua index 2ee6cce..5168fdd 100644 --- a/sonic-radiance.love/scenes/battlesystem/controllers/fighters/systems/choregraphy/step/setAnimSpeed.lua +++ b/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) diff --git a/sonic-radiance.love/scenes/battlesystem/controllers/fighters/systems/choregraphy/step/setAnimation.lua b/sonic-radiance.love/scenes/battlesystem/choregraphy/step/setAnimation.lua similarity index 86% rename from sonic-radiance.love/scenes/battlesystem/controllers/fighters/systems/choregraphy/step/setAnimation.lua rename to sonic-radiance.love/scenes/battlesystem/choregraphy/step/setAnimation.lua index cbae4ff..e2790a4 100644 --- a/sonic-radiance.love/scenes/battlesystem/controllers/fighters/systems/choregraphy/step/setAnimation.lua +++ b/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) diff --git a/sonic-radiance.love/scenes/battlesystem/controllers/fighters/systems/choregraphy/step/setCounter.lua b/sonic-radiance.love/scenes/battlesystem/choregraphy/step/setCounter.lua similarity index 75% rename from sonic-radiance.love/scenes/battlesystem/controllers/fighters/systems/choregraphy/step/setCounter.lua rename to sonic-radiance.love/scenes/battlesystem/choregraphy/step/setCounter.lua index 174391d..69853b2 100644 --- a/sonic-radiance.love/scenes/battlesystem/controllers/fighters/systems/choregraphy/step/setCounter.lua +++ b/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) diff --git a/sonic-radiance.love/scenes/battlesystem/controllers/fighters/systems/choregraphy/step/skipTo.lua b/sonic-radiance.love/scenes/battlesystem/choregraphy/step/skipTo.lua similarity index 69% rename from sonic-radiance.love/scenes/battlesystem/controllers/fighters/systems/choregraphy/step/skipTo.lua rename to sonic-radiance.love/scenes/battlesystem/choregraphy/step/skipTo.lua index 780d1fb..9d05010 100644 --- a/sonic-radiance.love/scenes/battlesystem/controllers/fighters/systems/choregraphy/step/skipTo.lua +++ b/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) diff --git a/sonic-radiance.love/scenes/battlesystem/controllers/fighters/systems/choregraphy/step/startSubChoregraphies.lua b/sonic-radiance.love/scenes/battlesystem/choregraphy/step/startSubChoregraphies.lua similarity index 83% rename from sonic-radiance.love/scenes/battlesystem/controllers/fighters/systems/choregraphy/step/startSubChoregraphies.lua rename to sonic-radiance.love/scenes/battlesystem/choregraphy/step/startSubChoregraphies.lua index 474d54b..a593fb4 100644 --- a/sonic-radiance.love/scenes/battlesystem/controllers/fighters/systems/choregraphy/step/startSubChoregraphies.lua +++ b/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) diff --git a/sonic-radiance.love/scenes/battlesystem/controllers/fighters/systems/choregraphy/step/stopMov.lua b/sonic-radiance.love/scenes/battlesystem/choregraphy/step/stopMov.lua similarity index 78% rename from sonic-radiance.love/scenes/battlesystem/controllers/fighters/systems/choregraphy/step/stopMov.lua rename to sonic-radiance.love/scenes/battlesystem/choregraphy/step/stopMov.lua index ca36a43..b5c2c5c 100644 --- a/sonic-radiance.love/scenes/battlesystem/controllers/fighters/systems/choregraphy/step/stopMov.lua +++ b/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) diff --git a/sonic-radiance.love/scenes/battlesystem/controllers/fighters/systems/choregraphy/step/useItemEffect.lua b/sonic-radiance.love/scenes/battlesystem/choregraphy/step/useItemEffect.lua similarity index 70% rename from sonic-radiance.love/scenes/battlesystem/controllers/fighters/systems/choregraphy/step/useItemEffect.lua rename to sonic-radiance.love/scenes/battlesystem/choregraphy/step/useItemEffect.lua index e0a12fb..8bce57b 100644 --- a/sonic-radiance.love/scenes/battlesystem/controllers/fighters/systems/choregraphy/step/useItemEffect.lua +++ b/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) diff --git a/sonic-radiance.love/scenes/battlesystem/controllers/fighters/systems/choregraphy/step/wait.lua b/sonic-radiance.love/scenes/battlesystem/choregraphy/step/wait.lua similarity index 76% rename from sonic-radiance.love/scenes/battlesystem/controllers/fighters/systems/choregraphy/step/wait.lua rename to sonic-radiance.love/scenes/battlesystem/choregraphy/step/wait.lua index 5098318..aede32c 100644 --- a/sonic-radiance.love/scenes/battlesystem/controllers/fighters/systems/choregraphy/step/wait.lua +++ b/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) diff --git a/sonic-radiance.love/scenes/battlesystem/controllers/fighters/systems/choregraphy/step/waitActorFinished.lua b/sonic-radiance.love/scenes/battlesystem/choregraphy/step/waitActorFinished.lua similarity index 80% rename from sonic-radiance.love/scenes/battlesystem/controllers/fighters/systems/choregraphy/step/waitActorFinished.lua rename to sonic-radiance.love/scenes/battlesystem/choregraphy/step/waitActorFinished.lua index 7392a3f..fc7b62f 100644 --- a/sonic-radiance.love/scenes/battlesystem/controllers/fighters/systems/choregraphy/step/waitActorFinished.lua +++ b/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) diff --git a/sonic-radiance.love/scenes/battlesystem/controllers/fighters/systems/choregraphy/step/waitFor.lua b/sonic-radiance.love/scenes/battlesystem/choregraphy/step/waitFor.lua similarity index 77% rename from sonic-radiance.love/scenes/battlesystem/controllers/fighters/systems/choregraphy/step/waitFor.lua rename to sonic-radiance.love/scenes/battlesystem/choregraphy/step/waitFor.lua index ff41299..0a33d39 100644 --- a/sonic-radiance.love/scenes/battlesystem/controllers/fighters/systems/choregraphy/step/waitFor.lua +++ b/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) diff --git a/sonic-radiance.love/scenes/battlesystem/controllers/fighters/systems/choregraphy/subchoregraphy.lua b/sonic-radiance.love/scenes/battlesystem/choregraphy/subchoregraphy.lua similarity index 60% rename from sonic-radiance.love/scenes/battlesystem/controllers/fighters/systems/choregraphy/subchoregraphy.lua rename to sonic-radiance.love/scenes/battlesystem/choregraphy/subchoregraphy.lua index cb76444..45f0c2d 100644 --- a/sonic-radiance.love/scenes/battlesystem/controllers/fighters/systems/choregraphy/subchoregraphy.lua +++ b/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) diff --git a/sonic-radiance.love/scenes/battlesystem/controllers/fighters/systems/actions/parent.lua b/sonic-radiance.love/scenes/battlesystem/controllers/fighters/systems/actions/parent.lua index 2a1c397..25bd887 100644 --- a/sonic-radiance.love/scenes/battlesystem/controllers/fighters/systems/actions/parent.lua +++ b/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 diff --git a/sonic-radiance.love/scenes/menus/debugmenus/choregraphy/mocks/action.lua b/sonic-radiance.love/scenes/menus/debugmenus/choregraphy/mocks/action.lua index 859c3b8..7095fb5 100644 --- a/sonic-radiance.love/scenes/menus/debugmenus/choregraphy/mocks/action.lua +++ b/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)