From 242e90c80343278bd2e505601948d6c6a1db0b2a Mon Sep 17 00:00:00 2001
From: Kazhnuz <kazhnuz@kobold.cafe>
Date: Sun, 2 Aug 2020 16:43:15 +0200
Subject: [PATCH] fix: make emblem and icon character-dependent

---
 .../datas/gamedata/characters/sonic/init.lua               | 4 ++++
 .../scenes/battlesystem/controllers/fighters/character.lua | 2 +-
 sonic-radiance.love/scenes/battlesystem/gui/statusbar.lua  | 7 +++++--
 3 files changed, 10 insertions(+), 3 deletions(-)

diff --git a/sonic-radiance.love/datas/gamedata/characters/sonic/init.lua b/sonic-radiance.love/datas/gamedata/characters/sonic/init.lua
index 76b518a..e51bfcd 100644
--- a/sonic-radiance.love/datas/gamedata/characters/sonic/init.lua
+++ b/sonic-radiance.love/datas/gamedata/characters/sonic/init.lua
@@ -12,4 +12,8 @@ return {
   isUnlockedAtStart = true,
   canGoSuper        = true,
   canBreakCraft     = false,
+
+  icon = 1,
+  charset = "perso",
+  charId = 1,
 }
diff --git a/sonic-radiance.love/scenes/battlesystem/controllers/fighters/character.lua b/sonic-radiance.love/scenes/battlesystem/controllers/fighters/character.lua
index 3a6e604..5bd29b9 100644
--- a/sonic-radiance.love/scenes/battlesystem/controllers/fighters/character.lua
+++ b/sonic-radiance.love/scenes/battlesystem/controllers/fighters/character.lua
@@ -144,7 +144,7 @@ end
 
 -- DRAW FUNCTIONS
 function HeroFighter:drawIcon(x, y)
-  local iconID = 1
+  local iconID = self.abstract.data.icon
   self.assets.tileset["charicons"]:drawTile(iconID, x, y)
 end
 
diff --git a/sonic-radiance.love/scenes/battlesystem/gui/statusbar.lua b/sonic-radiance.love/scenes/battlesystem/gui/statusbar.lua
index c7a3dbf..91d8fdc 100644
--- a/sonic-radiance.love/scenes/battlesystem/gui/statusbar.lua
+++ b/sonic-radiance.love/scenes/battlesystem/gui/statusbar.lua
@@ -34,11 +34,14 @@ function StatusBar:updatePP()
 end
 
 function StatusBar:drawEmblem(x, y)
-  self.assets.images["e_speedster"]:draw(x, y)
+  local emblem1 = "e_" .. self.abstract.data.class
+  local emblem2 = "m_" .. self.abstract.data.class
+
+  self.assets.images[emblem1]:draw(x, y)
   core.screen:setScissor(x, y-16, 32, 40)
   self.assets.sprites[self.charid]:drawAnimation(x+14, y+14)
   core.screen:resetScissor( )
-  self.assets.images["m_speedster"]:draw(x, y)
+  self.assets.images[emblem2]:draw(x, y)
 end
 
 function StatusBar:draw()