From 47301e3bb306f1a8157bb89aaf08176472721433 Mon Sep 17 00:00:00 2001 From: Kazhnuz Date: Tue, 27 Jul 2021 12:45:41 +0200 Subject: [PATCH] improvement: support 3D positionning for gfx --- .../datas/gamedata/ennemies/skills/tackle.lua | 2 +- sonic-radiance.love/datas/gamedata/skills/attack.lua | 2 +- sonic-radiance.love/datas/gamedata/skills/hitcombo.lua | 8 ++++---- sonic-radiance.love/datas/gamedata/skills/homming.lua | 2 +- sonic-radiance.love/datas/gamedata/skills/spindash.lua | 2 +- sonic-radiance.love/datas/parsers/choregraphystep.lua | 2 +- .../fighters/systems/choregraphy/step/addGFX.lua | 4 ++-- 7 files changed, 11 insertions(+), 11 deletions(-) diff --git a/sonic-radiance.love/datas/gamedata/ennemies/skills/tackle.lua b/sonic-radiance.love/datas/gamedata/ennemies/skills/tackle.lua index 521868d..ade250b 100644 --- a/sonic-radiance.love/datas/gamedata/ennemies/skills/tackle.lua +++ b/sonic-radiance.love/datas/gamedata/ennemies/skills/tackle.lua @@ -15,7 +15,7 @@ return { choregraphy = { -- the main attack choregraphy {"goTo3D", "none", "target", -0.4, 0, 0, 0.5, true}, {"sendDamage", "none", 120, "basic", "none", false}, - {'addGFX', "sentDamage", 'hitGFX', "target", -0.4, 0, true, false}, + {'addGFX', "sentDamage", 'hitGFX', "target", -0.4, 0, 0, true, false}, {'playSFX', "sentDamage", 'hitconnect'}, {'jumpBack', "none", 4, 8, true}, {"wait", "none", 0.1}, diff --git a/sonic-radiance.love/datas/gamedata/skills/attack.lua b/sonic-radiance.love/datas/gamedata/skills/attack.lua index 5475df4..f7b58d9 100644 --- a/sonic-radiance.love/datas/gamedata/skills/attack.lua +++ b/sonic-radiance.love/datas/gamedata/skills/attack.lua @@ -21,7 +21,7 @@ return { {'playSFX', "none", 'spinrelease'}, {"waitFor", "none", "actionFinished:playerMove"}, {"sendDamage", "none", 100, "basic", "none", false}, - {'addGFX', "sentDamage", 'hitGFX', "target", 0, 0, true, false}, + {'addGFX', "sentDamage", 'hitGFX', "target", 0, 0, 0, true, false}, {'playSFX', "sentDamage", 'hitconnect'}, {'jumpBack', "none", 4, 8, true}, {"wait", "none", 0.1}, diff --git a/sonic-radiance.love/datas/gamedata/skills/hitcombo.lua b/sonic-radiance.love/datas/gamedata/skills/hitcombo.lua index 544511c..f6e0538 100644 --- a/sonic-radiance.love/datas/gamedata/skills/hitcombo.lua +++ b/sonic-radiance.love/datas/gamedata/skills/hitcombo.lua @@ -23,21 +23,21 @@ return { {'playSFX', "none", 'hit'}, {'setAnimation', "none", 'hit1start', true}, {'sendDamage', "none", 40, "basic", "none", false}, - {'addGFX',"sentDamage", 'hitGFX', "actor", 0.75, 0, true, false}, + {'addGFX',"sentDamage", 'hitGFX', "actor", 0.75, 0, 0, true, false}, {'playSFX', "sentDamage", 'hitconnect'}, {'setAnimation', "none", 'hit1end', true}, {'playSFX', "none", 'hit'}, {'setAnimation', "none", 'hit2start', true}, {'sendDamage', "none", 40, "basic", "none", false}, - {'addGFX',"sentDamage", 'hitGFX', "actor", 0.75, 0, true, false}, + {'addGFX',"sentDamage", 'hitGFX', "actor", 0.75, 0, 0, true, false}, {'playSFX', "sentDamage", 'hitconnect'}, {'setAnimation', "none", 'hit2end', true}, {'playSFX', "none", 'hit'}, {'setAnimation', "none", 'hit3start', true}, {'sendDamage', "none", 40, "basic", "none", false}, - {'addGFX',"sentDamage", 'hitGFX', "actor", 0.75, 0, true, false}, + {'addGFX',"sentDamage", 'hitGFX', "actor", 0.75, 0, 0, true, false}, {'playSFX', "sentDamage", 'hitconnect'}, {'setAnimation', "none", 'hit3end', true}, {'setAnimation', "none", 'idle', false}, @@ -46,7 +46,7 @@ return { {"setAnimation", "qteSuccess:1", "upper", false}, {"waitFor", "qteSuccess:1", "haveFrameSignal:hitconnect"}, {'sendDamage', "qteSuccess:1", 75, "basic", "none", false}, - {'addGFX', {"qteSuccess:1", "sentDamage"}, 'hitGFX', "actor", 0.75, 0, true, false}, + {'addGFX', {"qteSuccess:1", "sentDamage"}, 'hitGFX', "actor", 0.75, 0, 0, true, false}, {'playSFX', {"qteSuccess:1", "sentDamage"}, 'hitconnect'}, {'wait', "none", 0.2}, diff --git a/sonic-radiance.love/datas/gamedata/skills/homming.lua b/sonic-radiance.love/datas/gamedata/skills/homming.lua index 2a2f195..30548bf 100644 --- a/sonic-radiance.love/datas/gamedata/skills/homming.lua +++ b/sonic-radiance.love/datas/gamedata/skills/homming.lua @@ -26,7 +26,7 @@ return { {'playSFX', "none", 'spinrelease'}, {"waitFor", "none", "actionFinished:dashToEnnemy"}, {"sendDamage", "none", 30, "aerial", "none", false}, - {'addGFX', "sentDamage", 'hitGFX', "target", 0, 0, true, false}, + {'addGFX', "sentDamage", 'hitGFX', "target", 0, 0, 4, true, false}, {'playSFX', "sentDamage", 'hitconnect'}, {"taggedAction", "jumpingHero", {'jumpBack', "none", 5.5, 5.5, false}}, {"wait", "none", 0.1}, diff --git a/sonic-radiance.love/datas/gamedata/skills/spindash.lua b/sonic-radiance.love/datas/gamedata/skills/spindash.lua index 937014e..875d37b 100644 --- a/sonic-radiance.love/datas/gamedata/skills/spindash.lua +++ b/sonic-radiance.love/datas/gamedata/skills/spindash.lua @@ -15,7 +15,7 @@ return { {'playSFX', "none", 'spinrelease'}, {"goTo", "none", "target", 0, 0, 0.3, true}, {"sendDamage", "none", 120, "basic", "none", false}, - {'addGFX', "sentDamage", 'hitGFX', "target", 0, 0, true, false}, + {'addGFX', "sentDamage", 'hitGFX', "target", 0, 0, 0, true, false}, {'playSFX', "sentDamage", 'hitconnect'}, {'jumpBack', "none", 4, 8, true}, {"wait", "none", 0.1}, diff --git a/sonic-radiance.love/datas/parsers/choregraphystep.lua b/sonic-radiance.love/datas/parsers/choregraphystep.lua index ec25fe0..cb92c48 100644 --- a/sonic-radiance.love/datas/parsers/choregraphystep.lua +++ b/sonic-radiance.love/datas/parsers/choregraphystep.lua @@ -2,7 +2,7 @@ return { headings = {"name", "condition"}, argumentLists = { ["wait"] = {"duration"}, - ["addGFX"] = {'sprite', "origin", "x", "y", "affectedByDirection", 'blockProcess'}, + ["addGFX"] = {'sprite', "origin", "x", "y", "z", "affectedByDirection", 'blockProcess'}, ["playSFX"] = {"sfx"}, ["sendDamage"] = {"power", "type", "element", "isSpecial"}, ["goTo"] = {"origin", "x", "y", "duration", "blockProcess"}, diff --git a/sonic-radiance.love/scenes/battlesystem/controllers/fighters/systems/choregraphy/step/addGFX.lua b/sonic-radiance.love/scenes/battlesystem/controllers/fighters/systems/choregraphy/step/addGFX.lua index cb8349f..c0e5c2c 100644 --- a/sonic-radiance.love/scenes/battlesystem/controllers/fighters/systems/choregraphy/step/addGFX.lua +++ b/sonic-radiance.love/scenes/battlesystem/controllers/fighters/systems/choregraphy/step/addGFX.lua @@ -6,9 +6,9 @@ function StepGFX:new(controller, args) end function StepGFX:start() - local x, y = self:getStepCoordinate() + local x, y, z = self:getStepCoordinate() - self.choregraphy.world.obj.GFX(self.choregraphy.world, x, y, 0, self.arguments.sprite, self, self.arguments.blockProcess, self.tag) + self.choregraphy.world.obj.GFX(self.choregraphy.world, x, y, z, self.arguments.sprite, self, self.arguments.blockProcess, self.tag) if (not self.arguments.blockProcess) then self:finish()