From 56e9af6ac3da95d39fc45b146426b0e4e2c94284 Mon Sep 17 00:00:00 2001
From: Kazhnuz <kazhnuz@chlore.net>
Date: Sun, 18 Aug 2019 19:02:14 +0200
Subject: [PATCH] feat(cbs): add a skill system, and adapt the basic attack to
 use it

---
 .../assets/sprites/gfx/hit.lua                |  18 +++
 .../assets/sprites/gfx/hit.png                | Bin 0 -> 1820 bytes
 .../datas/gamedata/skills/attack.lua          |  53 ++++++++
 .../scenes/battlesystem/actors/gfx.lua        |  29 +++++
 .../scenes/battlesystem/actors/hero.lua       | 120 ++++++++++++++++--
 .../scenes/battlesystem/actors/init.lua       |   1 +
 .../scenes/battlesystem/actors/parent.lua     |   2 +-
 .../scenes/battlesystem/assets.lua            |   3 +-
 8 files changed, 212 insertions(+), 14 deletions(-)
 create mode 100644 sonic-radiance.love/assets/sprites/gfx/hit.lua
 create mode 100644 sonic-radiance.love/assets/sprites/gfx/hit.png
 create mode 100644 sonic-radiance.love/datas/gamedata/skills/attack.lua
 create mode 100644 sonic-radiance.love/scenes/battlesystem/actors/gfx.lua

diff --git a/sonic-radiance.love/assets/sprites/gfx/hit.lua b/sonic-radiance.love/assets/sprites/gfx/hit.lua
new file mode 100644
index 0000000..522cd88
--- /dev/null
+++ b/sonic-radiance.love/assets/sprites/gfx/hit.lua
@@ -0,0 +1,18 @@
+return {
+  metadata = {
+    height      = 32,
+    width       = 32,
+    defaultAnim = "default",
+    ox          = 16,
+    oy          = 32,
+  },
+  animations = {
+    ["default"] = {
+      startAt     = 1,
+      endAt       = 5,
+      loop        = 1,
+      speed       = 15,
+      pauseAtEnd  = false,
+    },
+  }
+}
diff --git a/sonic-radiance.love/assets/sprites/gfx/hit.png b/sonic-radiance.love/assets/sprites/gfx/hit.png
new file mode 100644
index 0000000000000000000000000000000000000000..6b0bcf9a72a5f480e2c20da188bf30aa4ac6e89c
GIT binary patch
literal 1820
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
KMNUMnLSTaUd^Fww

literal 0
HcmV?d00001

diff --git a/sonic-radiance.love/datas/gamedata/skills/attack.lua b/sonic-radiance.love/datas/gamedata/skills/attack.lua
new file mode 100644
index 0000000..0ffcbff
--- /dev/null
+++ b/sonic-radiance.love/datas/gamedata/skills/attack.lua
@@ -0,0 +1,53 @@
+-- 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 = "Attack",  -- unused for this attack, but still usefull sometimes
+  cost = 00,        -- the pp cost of the attack. Will be ignored if it's set
+                    -- as character default attack
+
+  target = nil,     -- which area can be selected as a target with the cursor.
+  -- if not nil : {ox, oy, shape, size, affectedByDirection}
+
+  targetNumber = 1, -- how many ennemy you can target with the attack.
+
+  effectArea = {1, 0, "point", 1, true}, -- which area is affected by the attack
+  -- if not nil : {ox, oy, shape, size, affectedByDirection}
+
+  choregraphy = { -- the main attack choregraphy
+    {'setAnimation', 'hit1', true},
+    {'addGFX', 'hitGFX', 0.75, 0, true, false},
+    {'sendDamage', 33, 100, false, false},
+    {'setAnimation', 'hit2', true},
+    {'addGFX', 'hitGFX', 0.75, 0, true, false},
+    {'sendDamage', 33, 100, false, false},
+    {'setAnimation', 'hit3', true},
+    {'addGFX', 'hitGFX', 0.75, 0, true, false},
+    {'sendDamage', 33, 100, false, false},
+    {'setAnimation', 'idle', false},
+    {'wait', 0.5}
+  },
+
+  onContact = { -- if the attack move and touch multiple ennemies, you can add
+    -- specific effect when you touch the ennemy.
+  },
+}
+
+--[[
+                        CHOREGRAPHY POSSIBLE EFFECTS
+-- "wait" :: Simply wait before doing the next command
+--        :: {"wait", duration}
+
+-- "setAnimation" :: Change the animation of the battler
+--                   {"setAnimation", animation, blockProcess}
+
+-- "addGFX" :: Show a GFX relatively to the target position
+--          :: (player if target is nil)
+--          :: {"addGFX", "gfxname", x, y, affectedByDirection, blockProcess}
+
+-- "sendDamage" :: Send Damage on the whole target Area
+--              ::
+--              :: {"sendDamage", damageEffect, accuracy, isSpecial, isAerial}
+]]
diff --git a/sonic-radiance.love/scenes/battlesystem/actors/gfx.lua b/sonic-radiance.love/scenes/battlesystem/actors/gfx.lua
new file mode 100644
index 0000000..acdec2f
--- /dev/null
+++ b/sonic-radiance.love/scenes/battlesystem/actors/gfx.lua
@@ -0,0 +1,29 @@
+local Parent = require("scenes.battlesystem.actors.parent")
+local GFX = Parent:extend()
+
+function GFX:new(world, x, y, z, spritename, creator, blockProcess)
+  local width, height = world.assets.sprites[spritename]:getDimensions()
+
+  GFX.super.new(self, world, x, y, z)
+  self:setSprite(spritename, width/2, height, true)
+  self:cloneSprite()
+  self.creator = creator
+  self.blockProcess = blockProcess or false
+
+  self.direction = 1
+end
+
+function GFX:animationEnded(animation)
+  core.debug:print("gfx", 'Current animation "' .. animation .. '" have ended, destroying gfx')
+  self:destroy()
+end
+
+function GFX:draw()
+  self:drawSprite()
+end
+
+function GFX:drawShadow()
+
+end
+
+return GFX
diff --git a/sonic-radiance.love/scenes/battlesystem/actors/hero.lua b/sonic-radiance.love/scenes/battlesystem/actors/hero.lua
index 792dcf5..acfdee1 100644
--- a/sonic-radiance.love/scenes/battlesystem/actors/hero.lua
+++ b/sonic-radiance.love/scenes/battlesystem/actors/hero.lua
@@ -24,6 +24,7 @@ function Hero:new(world, x, y, charid, charnumber)
   self.actionPerTurn = game.characters.list[self.charid].turns
 
   self:initSprite()
+  self:initChoregraphySystem()
 end
 
 -- INFO FUNCTIONS
@@ -58,6 +59,11 @@ function Hero:update(dt)
   Hero.super.update(self, dt)
 
   self.keys = self.scene:getKeys(1)
+
+  if (self.isChoregraphyActive) then
+    self:updateChoregraphy()
+  end
+
   if (self.currentAction == "moving") then
     self:updateMoving(dt)
   elseif (self.currentAction == "selectAttack") then
@@ -148,7 +154,8 @@ function Hero:receiveSignal(action_type, id)
     self.turnAction = "defend"
     self:switchActiveBattler( )
   elseif (action_type == "attack") then
-    self:changeAnimation("hit1")
+    --self:changeAnimation("hit1")
+    self:startChoregraphy("attack")
   else
     self:switchActiveBattler( )
   end
@@ -163,6 +170,8 @@ end
 function Hero:timerResponse(timer)
   if timer == "switchActiveBattler" then
     self.world:switchActiveBattler()
+  elseif timer == "wait" then
+    self.choregraphy.changeAction = true
   end
 end
 
@@ -183,6 +192,101 @@ function Hero:switchActiveBattler()
   self.tweens:newTimer(0.15, "switchActiveBattler")
 end
 
+-- CHOREGRAPHY FUNCTIONS
+-- All functions related to the choregraphy system
+
+function Hero:initChoregraphySystem()
+  self.choregraphy = {}
+  self.choregraphy.current      = 0
+  self.choregraphy.isFinished   = false
+  self.choregraphy.changeAction = true
+  self.choregraphy.data = {}
+  self.choregraphy.effectArea   = nil
+  self.choregraphy.dx           = self.x
+  self.choregraphy.dy           = self.y
+  self.choregraphy.blockedBy    = ""
+
+  self.isChoregraphyActive      = false
+end
+
+function Hero:startChoregraphy(skill, dx, dy)
+  local skill = require("datas.gamedata.skills." .. skill)
+  self.choregraphy.current      = 0
+  self.choregraphy.isFinished   = false
+  self.choregraphy.changeAction = true
+  self.choregraphy.data         = skill.choregraphy
+  self.choregraphy.effectArea   = skill.effectArea
+  self.choregraphy.dx           = dx or self.x
+  self.choregraphy.dy           = dy or self.y
+
+  self.isChoregraphyActive      = true
+end
+
+function Hero:updateChoregraphy(dt)
+  if (self.choregraphy.changeAction) then
+    self:switchAction()
+  end
+end
+
+function Hero:switchAction()
+  self.choregraphy.current = self.choregraphy.current + 1
+  local nextAction = self.choregraphy.data[self.choregraphy.current]
+  if nextAction == nil then
+    self.isChoregraphyActive = false
+    self:switchActiveBattler()
+  else
+    self:doChoregraphyAction(nextAction)
+  end
+end
+
+function Hero:doChoregraphyAction(choregraphyAction)
+  local type = choregraphyAction[1] or "unknown"
+  self.choregraphy.changeAction = true
+
+  if type == "wait" then
+    local duration = choregraphyAction[2] or 1
+    self:wait(duration)
+  elseif type == "setAnimation" then
+    local animation     = choregraphyAction[2]
+    local blockProcess  = choregraphyAction[3]
+    self:changeAnimation(animation)
+    if (blockProcess) then
+      self.choregraphy.blockedBy    = animation
+      self.choregraphy.changeAction = false
+    end
+  elseif type == "sendDamage" then
+    local xx = self.x + self.direction
+    local yy = self.y
+    local power     = choregraphyAction[2]
+    local accuracy  = choregraphyAction[3]
+    local isSpecial = choregraphyAction[4]
+    local isAerial  = choregraphyAction[5]
+    self:sendDamage(xx, yy, power, accuracy, isSpecial, isAerial)
+  elseif type == "addGFX" then
+    local sprite    = choregraphyAction[2]
+    local dx        = choregraphyAction[3]
+    local dy        = choregraphyAction[4]
+    local affectedByDirection = choregraphyAction[5]
+    if (affectedByDirection) then
+      dx = dx * self.direction
+    end
+    local blockProcess = choregraphyAction[6]
+
+    local x         = self.x
+    local y         = self.y
+    local z         = 0
+
+    self.world.obj.GFX(self.world, x + dx, y + dy, z, sprite, self, blockProcess)
+  else
+    core.debug:warning("cbs/hero", "unknown action type " .. type)
+  end
+end
+
+function Hero:wait(time)
+  self.tweens:newTimer(time, "wait")
+  self.choregraphy.changeAction = false
+end
+
 -- SPRITE FUNCTIONS
 -- Handle the hero sprite
 
@@ -195,17 +299,9 @@ function Hero:initSprite()
 end
 
 function Hero:animationEnded(animation)
-  if (animation == "hit1") then
-    self:sendDamage(self.x + self.direction, self.y, 33, 100, false, false)
-    self:changeAnimation("hit2")
-  elseif (animation == "hit2") then
-    self:sendDamage(self.x + self.direction, self.y, 33, 100, false, false)
-    self:changeAnimation("hit3")
-  elseif (animation == "hit3") then
-    self:sendDamage(self.x + self.direction, self.y, 33, 100, false, false)
-    core.debug:print("cbs/hero", "normal combo finished, switching actor")
-    self:changeAnimation("idle")
-    self:switchActiveBattler( )
+  if (animation == self.choregraphy.blockedBy) then
+    self.choregraphy.blockedBy    = ""
+    self.choregraphy.changeAction = true
   end
 end
 
diff --git a/sonic-radiance.love/scenes/battlesystem/actors/init.lua b/sonic-radiance.love/scenes/battlesystem/actors/init.lua
index 72dcf74..5d7066d 100644
--- a/sonic-radiance.love/scenes/battlesystem/actors/init.lua
+++ b/sonic-radiance.love/scenes/battlesystem/actors/init.lua
@@ -4,5 +4,6 @@ local baseURI = "scenes.battlesystem.actors."
 
 entities.Hero       = require(baseURI .. "hero")
 entities.Ennemy     = require(baseURI .. "ennemy")
+entities.GFX        = require(baseURI .. "gfx")
 
 return entities
diff --git a/sonic-radiance.love/scenes/battlesystem/actors/parent.lua b/sonic-radiance.love/scenes/battlesystem/actors/parent.lua
index 646b41b..0ae9d8f 100644
--- a/sonic-radiance.love/scenes/battlesystem/actors/parent.lua
+++ b/sonic-radiance.love/scenes/battlesystem/actors/parent.lua
@@ -28,7 +28,7 @@ function Parent:new(world, x, y, z)
   self.isDestroyed = false
 
   self.tweens = TweenManager(self)
-  
+
   self:setSprite()
   self:register()
 end
diff --git a/sonic-radiance.love/scenes/battlesystem/assets.lua b/sonic-radiance.love/scenes/battlesystem/assets.lua
index 62db59f..4664ec5 100644
--- a/sonic-radiance.love/scenes/battlesystem/assets.lua
+++ b/sonic-radiance.love/scenes/battlesystem/assets.lua
@@ -6,7 +6,8 @@ return {
     {"borders",       "assets/backgrounds/borders"},
   },
   ["sprites"]  = {
-    {"cursorground",  "assets/gui/cursor/ground"}
+    {"cursorground",  "assets/gui/cursor/ground"},
+    {"hitGFX",        "assets/sprites/gfx/hit"},
   },
   ["textures"] = {
     {"menucursor",    "assets/gui/cursor-menulist.png"},