From d7a15d4d91e32fd0409f313eb21a635f4723c8dc Mon Sep 17 00:00:00 2001 From: Kazhnuz Date: Sat, 17 Jul 2021 21:53:10 +0200 Subject: [PATCH] feat: add conditions for finished actions --- .../fighters/systems/choregraphy/conditions.lua | 9 +++++++++ .../controllers/fighters/systems/choregraphy/init.lua | 4 ++-- 2 files changed, 11 insertions(+), 2 deletions(-) diff --git a/sonic-radiance.love/scenes/battlesystem/controllers/fighters/systems/choregraphy/conditions.lua b/sonic-radiance.love/scenes/battlesystem/controllers/fighters/systems/choregraphy/conditions.lua index a25f4bb..272d153 100644 --- a/sonic-radiance.love/scenes/battlesystem/controllers/fighters/systems/choregraphy/conditions.lua +++ b/sonic-radiance.love/scenes/battlesystem/controllers/fighters/systems/choregraphy/conditions.lua @@ -11,8 +11,17 @@ end function Conditions.qteFailure(cond, predicate, asker) return (Conditions.isQteSuccess(cond, predicate, asker) == false) end + function Conditions.none(cond, predicate, asker) return true end +function Conditions.actionFinished(cond, predicate, asker) + return asker:testTagAction(cond[2], 2) +end + +function Conditions.actionStarted(cond, predicate, asker) + return asker:testTagAction(cond[2], 1) +end + return Conditions \ No newline at end of file diff --git a/sonic-radiance.love/scenes/battlesystem/controllers/fighters/systems/choregraphy/init.lua b/sonic-radiance.love/scenes/battlesystem/controllers/fighters/systems/choregraphy/init.lua index 721c54a..4939688 100644 --- a/sonic-radiance.love/scenes/battlesystem/controllers/fighters/systems/choregraphy/init.lua +++ b/sonic-radiance.love/scenes/battlesystem/controllers/fighters/systems/choregraphy/init.lua @@ -103,12 +103,12 @@ function ChoregraphySystem:testTagAction(tag, statut) end function ChoregraphySystem:startTagAction(tag) - self.finishedTagActions[tag] = ACTION_FINISHED + self.finishedTagActions[tag] = ACTION_STARTED end function ChoregraphySystem:finishTagAction(tag) core.debug:print("choregraphy/step", "Tag action " .. tag .. " finished.") - self.finishedTagActions[tag] = ACTION_STARTED + self.finishedTagActions[tag] = ACTION_FINISHED end function ChoregraphySystem:sendDamage(power, type, element, isSpecial)