From e72fa0cc7f4884191117cc4c160279cb6b0f77aa Mon Sep 17 00:00:00 2001 From: Kazhnuz Date: Sat, 25 Jul 2020 16:47:58 +0200 Subject: [PATCH] fix: drop spin jump and revamp a bit the spindash --- .../gamedata/characters/sonic/skills.lua | 2 +- .../datas/gamedata/skills/attack.lua | 13 +++++---- .../datas/gamedata/skills/spinattack.lua | 22 ++++++++++----- .../datas/gamedata/skills/spindash.lua | 19 +++++++++++++ .../datas/gamedata/skills/spinjump.lua | 27 ------------------- 5 files changed, 41 insertions(+), 42 deletions(-) create mode 100644 sonic-radiance.love/datas/gamedata/skills/spindash.lua delete mode 100644 sonic-radiance.love/datas/gamedata/skills/spinjump.lua diff --git a/sonic-radiance.love/datas/gamedata/characters/sonic/skills.lua b/sonic-radiance.love/datas/gamedata/characters/sonic/skills.lua index b68f655..2aed1c1 100644 --- a/sonic-radiance.love/datas/gamedata/characters/sonic/skills.lua +++ b/sonic-radiance.love/datas/gamedata/characters/sonic/skills.lua @@ -1,7 +1,7 @@ return { --{attack_name, level}, {"spinattack", 2}, - {"spinjump", 3}, + --{"spinjump", 3}, {"spindash", 8}, {"hommingattack", 11}, {"spinattack", 15}, diff --git a/sonic-radiance.love/datas/gamedata/skills/attack.lua b/sonic-radiance.love/datas/gamedata/skills/attack.lua index c9c6e3a..3b094d3 100644 --- a/sonic-radiance.love/datas/gamedata/skills/attack.lua +++ b/sonic-radiance.love/datas/gamedata/skills/attack.lua @@ -12,31 +12,30 @@ return { targetNumber = 1, -- 0 for targeting all ennemies choregraphy = { -- the main attack choregraphy - --{'goTo', "none", "target", 0, 0} + {'goTo', "none", "target", -1, 0, 0.3, true}, {'playSFX', "none", 'hit'}, {'setAnimation', "none", 'hit1start', true}, {'sendDamage', "none", 33, 100, false, false}, - {'addGFX',"sentDamage", 'hitGFX', "target", 0.75, 0, true, false}, + {'addGFX',"sentDamage", 'hitGFX', "actor", 0.75, 0, true, false}, {'playSFX', "sentDamage", 'hitconnect'}, {'setAnimation', "none", 'hit1end', true}, {'playSFX', "none", 'hit'}, {'setAnimation', "none", 'hit2start', true}, {'sendDamage', "none", 33, 100, false, false}, - {'addGFX',"sentDamage", 'hitGFX', "target", 0.75, 0, true, false}, + {'addGFX',"sentDamage", 'hitGFX', "actor", 0.75, 0, true, false}, {'playSFX', "sentDamage", 'hitconnect'}, {'setAnimation', "none", 'hit2end', true}, {'playSFX', "none", 'hit'}, {'setAnimation', "none", 'hit3start', true}, {'sendDamage', "none", 33, 100, false, false}, - {'addGFX',"sentDamage", 'hitGFX', "target", 0.75, 0, true, false}, + {'addGFX',"sentDamage", 'hitGFX', "actor", 0.75, 0, true, false}, {'playSFX', "sentDamage", 'hitconnect'}, {'setAnimation', "none", 'hit3end', true}, {'setAnimation', "none", 'idle', false}, - --{'wait', "none", 0.2}, - --{'goTo', "none", "start", 0, 0}, - {'wait', "none", 0.5} + {'wait', "none", 0.2}, + {'goTo', "none", "start", 0, 0, 0.3, true} }, onContact = { -- if the attack move and touch multiple ennemies, you can add diff --git a/sonic-radiance.love/datas/gamedata/skills/spinattack.lua b/sonic-radiance.love/datas/gamedata/skills/spinattack.lua index e1c3656..d7c6daf 100644 --- a/sonic-radiance.love/datas/gamedata/skills/spinattack.lua +++ b/sonic-radiance.love/datas/gamedata/skills/spinattack.lua @@ -1,12 +1,16 @@ +-- A basic file describing the basic attack, in order to make it customizable one +-- day ? + +-- Also serve as a tutoriel for how to create a file attack and choregraphy + return { name = "spinattack", - cost = 05, + cost = 03, + targetNumber = 1, -- 0 for targeting all ennemies targetEnnemies = true, - choregraphy = { - {"setAnimation", "none", "spindash", false}, - {'playSFX', "none", 'spincharge'}, - {"wait", "none", 0.5}, + + choregraphy = { -- the main attack choregraphy {"setAnimation", "none", "spin", false}, {'playSFX', "none", 'spinrelease'}, {"goTo", "none", "target", 0, 0, 0.3, true}, @@ -14,6 +18,10 @@ return { {'addGFX', "sentDamage", 'hitGFX', "target", 0, 0, true, false}, {'playSFX', "sentDamage", 'hitconnect'}, {'jumpBack', "none", 0.3, true}, - {'setAnimation', "none", 'idle', false}, - } + {'goTo', "none", "start", 0, 0, 0.2, true} + }, + + onContact = { -- if the attack move and touch multiple ennemies, you can add + -- specific effect when you touch the ennemy. + }, } diff --git a/sonic-radiance.love/datas/gamedata/skills/spindash.lua b/sonic-radiance.love/datas/gamedata/skills/spindash.lua new file mode 100644 index 0000000..7f67d37 --- /dev/null +++ b/sonic-radiance.love/datas/gamedata/skills/spindash.lua @@ -0,0 +1,19 @@ +return { + name = "spindash", + cost = 05, + targetNumber = 1, -- 0 for targeting all ennemies + targetEnnemies = true, + choregraphy = { + {"setAnimation", "none", "spindash", false}, + {'playSFX', "none", 'spincharge'}, + {"wait", "none", 0.5}, + {"setAnimation", "none", "spin", false}, + {'playSFX', "none", 'spinrelease'}, + {"goTo", "none", "target", 0, 0, 0.3, true}, + {"sendDamage", "none", 120, 100, false, false}, + {'addGFX', "sentDamage", 'hitGFX', "target", 0, 0, true, false}, + {'playSFX', "sentDamage", 'hitconnect'}, + {'jumpBack', "none", 0.3, true}, + {'goTo', "none", "start", 0, 0, 0.2, true} + } +} diff --git a/sonic-radiance.love/datas/gamedata/skills/spinjump.lua b/sonic-radiance.love/datas/gamedata/skills/spinjump.lua deleted file mode 100644 index fe79331..0000000 --- a/sonic-radiance.love/datas/gamedata/skills/spinjump.lua +++ /dev/null @@ -1,27 +0,0 @@ --- A basic file describing the basic attack, in order to make it customizable one --- day ? - --- Also serve as a tutoriel for how to create a file attack and choregraphy - -return { - name = "spinjump", - cost = 03, - - targetNumber = 1, -- 0 for targeting all ennemies - targetEnnemies = true, - - choregraphy = { -- the main attack choregraphy - {"setAnimation", "none", "spinjump", false}, - {'playSFX', "none", 'jump'}, - {'jumpTo', 'none', "target", 0, 0, 0.5, true}, - {"sendDamage", "none", 110, 100, false, true}, - {'addGFX', "sentDamage", 'hitGFX', "target", 0, 0, true, false}, - {'playSFX', "sentDamage", 'hitconnect'}, - {'jumpBack', "none", 0.3, true}, - {'setAnimation', "none", 'idle', false}, - }, - - onContact = { -- if the attack move and touch multiple ennemies, you can add - -- specific effect when you touch the ennemy. - }, -}