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

@@ -31,7 +31,6 @@ function ChoregraphySystem:new(action, choregraphy, subChoregraphy)
 end
 
 function ChoregraphySystem:update(dt)
-  self:updateQte(dt)
   self:updateSteps(dt)
   self.tweens:update(dt)
   self:updateSubChoregraphies(dt)
@@ -49,9 +48,4 @@ function ChoregraphySystem:endChoregraphy()
   self.fighter.turnSystem:applyDeath()
 end
 
-function ChoregraphySystem:draw()
-  self:drawQte()
-  self:drawSubChoregraphies()
-end
-
 return ChoregraphySystem

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

@@ -1,18 +1,23 @@
-local QteParent = Object:extend()
+local GuiElements = require "birb.modules.gui.elements.parent"
+local QteParent = GuiElements:extend()
 
-local TweenManager = require "birb.classes.time"
 local Prompts = require "scenes.battlesystem.choregraphy.qte.prompts"
 
 function QteParent:new(choregraphySystem, arguments)
   self.choregraphy = choregraphySystem
   self.arguments = arguments
-  self.tweens = TweenManager(self)
   self.isBlocking = nil
   self.prompts = Prompts(self)
   self.timer = 0
   self.timerActive = false
   self.isSuccess = false
   self.tag = ""
+
+  QteParent.super.new(self, "qte", -1, -1, 1, 1)
+
+  self:start()
+  self.isStarted = true
+  self:getFocus()
 end
 
 function QteParent:setTag(tag)
@@ -60,18 +65,13 @@ function QteParent:setOrigin(origin)
   end
 end
 
-function QteParent:updateQte(dt, isActive)
+function QteParent:updateElement(dt)
-  if (not self.isStarted) then
+  QteParent.super.updateElement(self, dt)
-    self:start()
+  self.prompts:update(dt)
-    self.isStarted = true
+end
-  else
+
-    self:update(dt)
+function QteParent:keypressed(key)
-    self.tweens:update(dt)
+  self:verifyPrompts(key)
-    self.prompts:update(dt)
-    if (isActive) then
-      self:verifyPrompts()
-    end
-  end
 end
 
 function QteParent:timerResponse(timer)
@@ -87,6 +87,7 @@ function QteParent:timerResponse(timer)
     self.prompts.defaultTimerValue = 0
   elseif (timer == "endQte") then
     self.choregraphy:removeQte()
+    self:destroy()
   end
 end
 
@@ -97,8 +98,8 @@ function QteParent:finish(success)
   self:endQte()
 end
 
-function QteParent:verifyPrompts()
+function QteParent:verifyPrompts(key)
-  local promptResult = self.prompts:verifyPrompts()
+  local promptResult = self.prompts:verifyPrompts(key)
   if (promptResult == 1) then
     self:promptSuccess()
   elseif (promptResult == -1) then

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

@@ -69,24 +69,21 @@ function Button:update(dt, isFirst)
         love.graphics.arc("fill", CANVAS_SIZE/2, CANVAS_SIZE/2, BTN_SIZE/2, 0 - (math.pi/2), ((math.pi*2*self.prompt:getTimer()) - (math.pi/2)), 16)
         love.graphics.setStencilTest()
         love.graphics.setCanvas()
+        utils.graphics.resetColor()
     end
 end
 
-function Button:verifyPrompts(sourceKeys, removeWhenPressed)
+function Button:verifyPrompts(key, removeWhenPressed)
     local mustBeRemoved = false
     local keyValue = 0
     self.lum = 1
-    for i, key in ipairs(keys) do
+    if (key == self.key) then
-        if (sourceKeys[key].isPressed) then
+        keyValue = 1
-            if (key == self.key) then
+        self.lum = 0.8
-                keyValue = 1
+        table.insert(self.circles, ButtonCircle())
-                self.lum = 0.8
+    else
-                table.insert(self.circles, ButtonCircle())
+        keyValue = -1
-            else
+        self.isFailed = true
-                keyValue = -1
-                self.isFailed = true
-            end
-        end
     end
     if (removeWhenPressed and keyValue == 1) then
         self.number = self.number - 1

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

@@ -31,11 +31,10 @@ function QtePrompts:update(dt)
     end
 end
 
-function QtePrompts:verifyPrompts()
+function QtePrompts:verifyPrompts(key)
     local buttonValue, mustBeRemoved = 0, false
     if (self.list[self.current] ~= nil) then
-        local keys = self.scene.sources[1].keys
+        buttonValue, mustBeRemoved = self.list[self.current]:verifyPrompts(key, self.removeWhenPressed)
-        buttonValue, mustBeRemoved = self.list[self.current]:verifyPrompts(keys, self.removeWhenPressed)
         if (not self.canPress and buttonValue == 1) then
             buttonValue = -1
         end

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

@@ -53,10 +53,4 @@ function ActionParent:finishAction()
   self.fighter:finishAction()
 end
 
-function ActionParent:draw()
-  if (self.choregraphy ~= nil) then
-    self.choregraphy:draw()
-  end
-end
-
 return ActionParent