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

@@ -11,7 +11,7 @@ end
 
 function AttackAction:startAction()
   core.debug:print("cbs/action", "Starting attack action")
-  self:finishAction()
+  self:loadChoregraphy("attack")
 end
 
 return AttackAction

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

@@ -1,5 +1,7 @@
 local ActionParent = Object:extend()
 
+local ChoregraphySystem = require "scenes.battlesystem.controllers.fighters.systems.choregraphy"
+
 function ActionParent:new(fighter)
   self.fighter = fighter
   self.target = nil
@@ -14,6 +16,15 @@ function ActionParent:update(dt)
   end
 end
 
+function ActionParent:loadChoregraphy(skillname)
+  local skill = game.skills:getSkillData(skillname)
+  self.choregraphy = ChoregraphySystem(self, skill.choregraphy)
+end
+
+function ActionParent:loadChoregraphyFromSkill(skill)
+  self.choregraphy = ChoregraphySystem(self, skill.choregraphy)
+end
+
 function ActionParent:needTarget()
   -- needTarget, targetEnnemies
   return false, false
@@ -28,6 +39,10 @@ function ActionParent:start()
   self:startAction()
 end
 
+function ActionParent:choregraphyEnded()
+  self:finishAction()
+end
+
 function ActionParent:startAction()
 
   self:finishAction()

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

@@ -12,7 +12,7 @@ end
 
 function SkillAction:startAction()
   core.debug:print("cbs/action", "Starting flee action")
-  self:finishAction()
+  self:loadChoregraphyFromSkill(self.data)
 end
 
 return SkillAction