From 89568ad3b5d59392b506376e7c0dc04a601abe65 Mon Sep 17 00:00:00 2001
From: Kazhnuz <kazhnuz@chlore.net>
Date: Thu, 15 Aug 2019 09:13:08 +0200
Subject: [PATCH] improvement(cbs): add turn counting to battle HUD

---
 .../assets/gui/{ => strings}/hudbonus.png     | Bin
 .../assets/gui/{ => strings}/hudscore.png     | Bin
 .../assets/gui/{ => strings}/hudtime.png      | Bin
 .../assets/gui/strings/hudturn.png            | Bin 0 -> 712 bytes
 .../scenes/battlesystem/assets.lua            |   2 ++
 .../scenes/battlesystem/init.lua              |   6 ------
 .../scenes/battlesystem/world.lua             |  20 +++++++++++++++++-
 7 files changed, 21 insertions(+), 7 deletions(-)
 rename sonic-radiance.love/assets/gui/{ => strings}/hudbonus.png (100%)
 rename sonic-radiance.love/assets/gui/{ => strings}/hudscore.png (100%)
 rename sonic-radiance.love/assets/gui/{ => strings}/hudtime.png (100%)
 create mode 100644 sonic-radiance.love/assets/gui/strings/hudturn.png

diff --git a/sonic-radiance.love/assets/gui/hudbonus.png b/sonic-radiance.love/assets/gui/strings/hudbonus.png
similarity index 100%
rename from sonic-radiance.love/assets/gui/hudbonus.png
rename to sonic-radiance.love/assets/gui/strings/hudbonus.png
diff --git a/sonic-radiance.love/assets/gui/hudscore.png b/sonic-radiance.love/assets/gui/strings/hudscore.png
similarity index 100%
rename from sonic-radiance.love/assets/gui/hudscore.png
rename to sonic-radiance.love/assets/gui/strings/hudscore.png
diff --git a/sonic-radiance.love/assets/gui/hudtime.png b/sonic-radiance.love/assets/gui/strings/hudtime.png
similarity index 100%
rename from sonic-radiance.love/assets/gui/hudtime.png
rename to sonic-radiance.love/assets/gui/strings/hudtime.png
diff --git a/sonic-radiance.love/assets/gui/strings/hudturn.png b/sonic-radiance.love/assets/gui/strings/hudturn.png
new file mode 100644
index 0000000000000000000000000000000000000000..5de4459391d8c7aff2bda653bbb9f85a3d78f08b
GIT binary patch
literal 712
zcmV;(0yq7MP)<h;3K|Lk000e1NJLTq0018V000aK1^@s6n(Sr_0004nX+uL$Nkc;*
zaB^>EX>4Tx04R}tkv&MmKpe$iQ?*4Z9V{r~kfAzR5ET(zv<gM25Nd^19ZW9$5Slb3
zDK3tJYr(;f#j1mgv#t)Vf*|+-;^OM0=prTlFDbN$_29T4@9sVB-T^|b#5Aj86wq|r
zOeNxCCc7dAUJ*nXU6@9n%q(M8l9FgUzV6}U>s^dzwLkag=uvYP1AHR!3^Podc%681
z(>6Ho6GvE4R*BDvM@+gP@gvt2kKZ^KTo!m{#7w8=h$F;ep@o$eW<^sYo*<5@nojvb
z#$%Q97H6$gVU2t87lv~B@)Fl+4kCdCEJA_^1r=<d1RF70by6&(Xg}V@Kj8W$aw+86
z03*jd%FrOYe(*o|-K~`$AM=tzaiH_XaXyBCz%Ed)I?ng8<J3<8|1)r<H~r-rF!f1#
zwW&pqfbceOaoyCEJ>YT&=zlU~Q+6dkO(CBL-p}ZpvOw=G(7o#Q*4W4C1CXY!k~hG?
zAuwE^?6o%U4z~98@0mt_KYa6Yt7W3d@Bjb+24YJ`L;(K){{a7>y{D4^000SaNLh0L
z01FcU01FcV0GgZ_00007bV*G`2jd722Lm`VcV)u>000?uMObu0Z*6U5Zgc=ca%Ew3
zWn>_CX>@2HM@dakSAh-}0001=Nkl<ZILp0L!3}^Q47?KFOymSEqT~3~MV!DToPnPU
z;76rm5sk<tO*mSvElml4!+)SapL0?GusGRvJmuWR9suA%KKA}hdw>K(Ui=A{-g6)4
zh5&sh`WC5TwvG>|Zno6T_L44k{{>ZZ<~pZ1?|2&0@d||?6_Yi&A)h4t;<_!+xs)W<
uy?Q&-#pNrk*vutpX-{MOo7!)Q-}zRbGgl9AiG5c90000<MNUMnLSTYC%rj8{

literal 0
HcmV?d00001

diff --git a/sonic-radiance.love/scenes/battlesystem/assets.lua b/sonic-radiance.love/scenes/battlesystem/assets.lua
index 4d6f9e4..6190692 100644
--- a/sonic-radiance.love/scenes/battlesystem/assets.lua
+++ b/sonic-radiance.love/scenes/battlesystem/assets.lua
@@ -22,6 +22,8 @@ return {
     {"m_speedster", "assets/gui/emblem_speedster_mask.png"},
     {"m_technic",   "assets/gui/emblem_technic_mask.png"},
     {"m_power",     "assets/gui/emblem_power_mask.png"},
+
+    {"hudturn",     "assets/gui/strings/hudturn.png"},
   },
   ["fonts"]    = {
     {"small",         "assets/gui/fonts/PixelOperator.ttf", 16},
diff --git a/sonic-radiance.love/scenes/battlesystem/init.lua b/sonic-radiance.love/scenes/battlesystem/init.lua
index 752cccb..2eab6c1 100644
--- a/sonic-radiance.love/scenes/battlesystem/init.lua
+++ b/sonic-radiance.love/scenes/battlesystem/init.lua
@@ -5,14 +5,10 @@ local BattleSystem = Scene:extend()
 local World         = require "scenes.battlesystem.world"
 local MenuSystem    = require "scenes.battlesystem.menu"
 
-local gui         = require "game.modules.gui"
-
-
 function BattleSystem:new()
   BattleSystem.super.new(self)
 
   self.assets:batchImport("scenes.battlesystem.assets")
-  self.frame     = gui.newBorder(424, 30, 8)
 
   self:initManagers()
 
@@ -31,8 +27,6 @@ end
 
 function BattleSystem:draw()
   self.world:draw()
-
-  love.graphics.draw(self.frame, 424, 20, 0, -1, -1)
 end
 
 function BattleSystem:exit()
diff --git a/sonic-radiance.love/scenes/battlesystem/world.lua b/sonic-radiance.love/scenes/battlesystem/world.lua
index 529932f..5696faa 100644
--- a/sonic-radiance.love/scenes/battlesystem/world.lua
+++ b/sonic-radiance.love/scenes/battlesystem/world.lua
@@ -10,6 +10,8 @@ local POSITIONS = {
   {x = 2, y = 6},
 }
 
+local gui         = require "game.modules.gui"
+
 -- INIT FUNCTIONS
 -- Initialize the battle world
 
@@ -24,7 +26,7 @@ function World:new(scene, battlefile)
 
   self.turns      = {}
   self.turns.current        = 1
-  self.turns.number         = 1
+  self.turns.number         = 0
   self.turns.isFinished     = true
   self.turns.changeBattler  = true
   self.battlers   = {}
@@ -40,6 +42,7 @@ function World:new(scene, battlefile)
 
   self:initHeroes()
   self:initEnnemies()
+  self:initHUD()
 end
 
 function World:initHeroes(battlefile)
@@ -230,6 +233,10 @@ function World:drawShadows()
   end
 end
 
+function World:initHUD()
+  self.frame  = gui.newBorder(424, 30, 4)
+end
+
 function World:drawHUD()
   for i,v in ipairs(self.actionlist) do
     v.actor:drawIcon(4 + (i-1)*(20), 6)
@@ -241,6 +248,17 @@ function World:drawHUD()
   for i,v in ipairs(self.battlers) do
     v:drawHUD()
   end
+
+  local x, y = 362, 3
+
+  love.graphics.draw(self.frame, 424, 20, 0, -1, -1)
+  self.assets.images["hudturn"]:draw(x, y)
+  self.assets.fonts["hudnbrs"]:set()
+  local turnnbr = self.turns.number
+  if (turnnbr < 10) then
+    turnnbr = "0" .. turnnbr
+  end
+  love.graphics.print(turnnbr, x + 33, y + 1)
 end