From b530a0911928700cd8abe476d506452d28a78435 Mon Sep 17 00:00:00 2001
From: Kazhnuz <kazhnuz@kobold.cafe>
Date: Wed, 5 Aug 2020 11:54:39 +0200
Subject: [PATCH] feat: add badnics icon

---
 .../assets/sprites/characters/badnics.png         | Bin 0 -> 749 bytes
 .../scenes/battlesystem/assets.lua                |   3 +++
 .../battlesystem/controllers/fighters/villain.lua |   5 ++---
 sonic-radiance.love/scenes/battlesystem/utils.lua |   2 +-
 4 files changed, 6 insertions(+), 4 deletions(-)
 create mode 100644 sonic-radiance.love/assets/sprites/characters/badnics.png

diff --git a/sonic-radiance.love/assets/sprites/characters/badnics.png b/sonic-radiance.love/assets/sprites/characters/badnics.png
new file mode 100644
index 0000000000000000000000000000000000000000..cfa82dc668fbb62d6c918e2586cd670f044045e8
GIT binary patch
literal 749
zcmV<J0uud+P)<h;3K|Lk000e1NJLTq000sI000sQ1^@s6R?d!B0004nX+uL$Nkc;*
zaB^>EX>4Tx04R}tkv&MmP!xqvQ%j3f1nnT=kfAzR5ET(8twIqhgj%6h2a}inL6e50
z#l=x@EjakISaoo5*44pP5CnffoE)7LU8KbOl0u6ZA6(wYdG8$VyAKc=Wu{qOV}Pbt
z%~T>TX0oed@D(8hsQNG?Gs~Ehq$E7o*FAiEzl-rK?|Xl)9yMn%z$X&VGQ+GAZxByy
zRt?Vk#1U4MRpN8vQIi@Ze&o91@*C%Z!vfEYnCa9!afDbbbg<IFtY~V)lf+R~(<xub
zxU6#C;;fZxtkoxfVK}F+EOVV|2nj4=2@*sosG)>1s)*69lVTx7=W!4JpyQXwrI4!x
zMvetkph0&0;D7LYwpM;(+)WC{fxwGxe+&b`U7%UF?eAmTZk_=CXW&Y2`zsA#`jhl}
zTZ<k6z1zUWbz4*RfXf|V;K`6p*^&HILOu_?pV2pEf&N>dd(E9&>l~*KK$>Qiya5gl
zfsq1buY0^Z)H%0*@3iLk16&?*o<LM)5&!@I24YJ`L;(K){{a7>y{D4^000SaNLh0L
z04^f{04^f|c%?sf00007bV*G`2jmC^2{R@35yC$J000?uMObu0Z*6U5Zgc=ca%Ew3
zWn>_CX>@2HM@dakSAh-}0002QNkl<ZILob+%MFAu3`Acd6rnv)M#|W7XoD^&hcYN5
zCl0x=hgDX_Yd#UoDI}T6*z({8+LZ^;0Q7XXL`KqA$ihr!V%hAyc@YWwj?M%MCKe_Z
zQ?St@vQ#N5$upUmyb<&IMR|C%)~>yFQv=EI(v3bmTT55&sX6kcks4*Mr~5Vk=$_XW
z3)z~NNcbDx!u49<D)ik=X(OpB7LwaorHv%BAJ){DZ#U4c(&kY__A+ONHWG-0`=Ql>
fRsW-!Chy?`l-f@?$ll$200000NkvXXu0mjf``1Qk

literal 0
HcmV?d00001

diff --git a/sonic-radiance.love/scenes/battlesystem/assets.lua b/sonic-radiance.love/scenes/battlesystem/assets.lua
index b4259fb..f1c7ca4 100644
--- a/sonic-radiance.love/scenes/battlesystem/assets.lua
+++ b/sonic-radiance.love/scenes/battlesystem/assets.lua
@@ -17,6 +17,9 @@ return {
     {"actorsShadow",  "assets/sprites/shadow.png"},
     {"emptytile",     "assets/backgrounds/tilemask.png"},
 
+    {"badnicsIcon",     "assets/sprites/characters/badnics.png"},
+
+
     {"e_speedster", "assets/gui/emblem_speedster.png"},
     {"e_technic",   "assets/gui/emblem_technic.png"},
     {"e_power",     "assets/gui/emblem_power.png"},
diff --git a/sonic-radiance.love/scenes/battlesystem/controllers/fighters/villain.lua b/sonic-radiance.love/scenes/battlesystem/controllers/fighters/villain.lua
index 4f78249..f635d2a 100644
--- a/sonic-radiance.love/scenes/battlesystem/controllers/fighters/villain.lua
+++ b/sonic-radiance.love/scenes/battlesystem/controllers/fighters/villain.lua
@@ -84,9 +84,8 @@ end
 
 -- DRAW FUNCTIONS
 function VillainFighter:drawIcon(x, y)
-  love.graphics.setColor(1, 0, 0, 1)
-  love.graphics.rectangle("fill", x, y, 16, 16)
-  love.graphics.setColor(1, 1, 1, 1)
+  self.assets.images["badnicsIcon"]:draw(x-1, y-2)
+  self.assets.fonts["hudnbrs_small"]:print(self.id, x+10, y+8)
 end
 
 function VillainFighter:drawHUD(x, y)
diff --git a/sonic-radiance.love/scenes/battlesystem/utils.lua b/sonic-radiance.love/scenes/battlesystem/utils.lua
index 8c940a0..675dcab 100644
--- a/sonic-radiance.love/scenes/battlesystem/utils.lua
+++ b/sonic-radiance.love/scenes/battlesystem/utils.lua
@@ -14,7 +14,7 @@ function maputils.sortBattlers(a, b)
 
   if (aspeed == bspeed) then
     if (a.fighter.isHero == b.fighter.isHero) then
-      return (a.fighter.id > b.fighter.id)
+      return (a.fighter.id < b.fighter.id)
     else
       return a.fighter.isHero
     end