From d6b62a41e225bbf339e537182fd7780a0600e685 Mon Sep 17 00:00:00 2001 From: Kazhnuz Date: Tue, 4 Aug 2020 19:53:11 +0200 Subject: [PATCH] fix: improve bevel Fix #23 --- sonic-radiance.love/assets/gui/barborder.png | Bin 224 -> 3292 bytes sonic-radiance.love/assets/gui/egghead.png | Bin 0 -> 664 bytes sonic-radiance.love/assets/gui/status_bar.png | Bin 6128 -> 6893 bytes .../game/modules/gui/emblem.lua | 16 +++++-- .../game/modules/gui/simplehpbar.lua | 5 ++- .../game/modules/gui/statusbar.lua | 42 ++++++++++-------- .../scenes/battlesystem/actors/ennemy.lua | 2 +- .../scenes/battlesystem/assets.lua | 3 +- 8 files changed, 42 insertions(+), 26 deletions(-) create mode 100644 sonic-radiance.love/assets/gui/egghead.png diff --git a/sonic-radiance.love/assets/gui/barborder.png b/sonic-radiance.love/assets/gui/barborder.png index 4e321ef5ba4c1e2da1b62d26042cb77e43441d58..b6de2e03a07924288b2baec09795d08fe9edc534 100644 GIT binary patch delta 3252 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 diff --git a/sonic-radiance.love/assets/gui/egghead.png b/sonic-radiance.love/assets/gui/egghead.png new file mode 100644 index 0000000000000000000000000000000000000000..3a5e6b73d19b74865dbb6d15473c8da7467c83cf GIT binary patch literal 664 zcmV;J0%!e+P)EX>4Tx04R}tkv&MmKpe$iKcqz}4t5Z6$WWbH5Eao)t5Adrp;l;lcSTOix%k-{RDAVPqQIx48bLV{L}6cZWRPkQ)=9KT2|nOqex zax9<*6_Voz|AXJ%n#GB6Hz|??dR}b%V+0880jVfq16NwdUuy!>pQJZB zTI>ku-v%zOJDR))TuDQLn_i_3FWT~t44RCM> zjFu>S-Q(Ti?%w`A)9&vFq6l)jMq$4*00006VoOIv0RI600RN!9r;`8x010qNS#tmY zE+YT{E+YYWr9XB6000McNliru
    2B_8n$3t<2N02y>eSad^gZEa<4bO1wgWnpw> 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 FV1nAh11bOj diff --git a/sonic-radiance.love/game/modules/gui/emblem.lua b/sonic-radiance.love/game/modules/gui/emblem.lua index 094a65e..b5d2e33 100644 --- a/sonic-radiance.love/game/modules/gui/emblem.lua +++ b/sonic-radiance.love/game/modules/gui/emblem.lua @@ -9,14 +9,24 @@ function Emblem:new(abstract, scene) end function Emblem:draw(x, y) - local emblem1 = "e_" .. self.abstract.data.class - local emblem2 = "m_" .. self.abstract.data.class + self:drawBackground(x, y) + self:drawForeground(x, y) +end - self.assets.images[emblem1]:draw(x, y) +function Emblem:drawForeground(x, y) + local emblem2 = "m_" .. self.abstract.data.class core.screen:setScissor(x, y-16, 32, 40) self.assets.sprites[self.charid]:drawAnimation(x+14, y+14) core.screen:resetScissor( ) self.assets.images[emblem2]:draw(x, y) end +function Emblem:drawBackground(x, y) + local emblem1 = "e_" .. self.abstract.data.class + + self.assets.images[emblem1]:draw(x, y) + +end + + return Emblem diff --git a/sonic-radiance.love/game/modules/gui/simplehpbar.lua b/sonic-radiance.love/game/modules/gui/simplehpbar.lua index c568eb2..e3b2adc 100644 --- a/sonic-radiance.love/game/modules/gui/simplehpbar.lua +++ b/sonic-radiance.love/game/modules/gui/simplehpbar.lua @@ -20,9 +20,10 @@ end function SimpleHPBar:draw(x, y) love.graphics.setColor(0, 0, 0, 1) gui.drawBar(x, y, 26, 4) + love.graphics.rectangle("fill", x, y, 24, 4) love.graphics.setColor(248/255, 160/255, 0, 1) - local bar = math.floor(24 * (self.hp / self.baseHP)) - gui.drawBar(x, y + 1, bar, 2) + local bar = math.max(0, math.floor(22 * (self.hp / self.baseHP))) + love.graphics.rectangle("fill", x + 1, y + 1, math.floor(bar), 2) love.graphics.setColor(1, 1, 1, 1) end diff --git a/sonic-radiance.love/game/modules/gui/statusbar.lua b/sonic-radiance.love/game/modules/gui/statusbar.lua index f38604a..f1b8a77 100644 --- a/sonic-radiance.love/game/modules/gui/statusbar.lua +++ b/sonic-radiance.love/game/modules/gui/statusbar.lua @@ -31,32 +31,36 @@ function StatusBar:updatePP() end function StatusBar:draw(x, y) - self.emblem:draw(x, y) - self.assets.images["statusbar"]:draw(x+12, y-6) + self.emblem:drawBackground(x, y) + self:drawStatusArea(x+10, y-8) + self.emblem:drawForeground(x, y) +end - local hpmax = self.stats.hpmax - local ppmax = self.stats.ppmax +function StatusBar:drawStatusArea(x, y) +self.assets.images["statusbar"]:draw(x, y) - local bar1 = math.floor((self.hp/self.stats.hpmax)*58) - local bar2 = math.floor((self.pp/self.stats.ppmax)*58) +local hpmax = self.stats.hpmax +local ppmax = self.stats.ppmax - love.graphics.setColor(248/255, 160/255, 0, 1) - gui.drawBar(x+29, y+5, bar1, 7) - love.graphics.setColor(0, 248/255, 248/255, 1) - gui.drawBar(x+17, y+17, bar2, 7) - utils.graphics.resetColor() +local bar1 = math.floor((self.hp/self.stats.hpmax)*58) +local bar2 = math.floor((self.pp/self.stats.ppmax)*58) - self.assets.fonts["hudnbrs_small"]:set() - love.graphics.print(math.floor(self.hp) .. "/" .. hpmax, x+34, y+5) - love.graphics.print(math.floor(self.pp) .. "/" .. ppmax, x+28, y+17) +love.graphics.setColor(248/255, 160/255, 0, 1) +gui.drawBar(x+10, y+11, bar1, 7) +love.graphics.setColor(0, 248/255, 248/255, 1) +gui.drawBar(x+22, y+23, bar2, 7) +utils.graphics.resetColor() - local lvl = self.abstract.level +self.assets.fonts["hudnbrs_small"]:set() +love.graphics.print(math.floor(self.hp) .. "/" .. hpmax, x+16, y+11) +love.graphics.print(math.floor(self.pp) .. "/" .. ppmax, x+32, y+23) - if lvl < 100 then - lvl = "0" .. lvl - end +local lvl = self.abstract.level - love.graphics.print(lvl, x+73, y-5) +if lvl < 100 then + lvl = "0" .. lvl +end + love.graphics.print(lvl, x+42, y+1) end return StatusBar diff --git a/sonic-radiance.love/scenes/battlesystem/actors/ennemy.lua b/sonic-radiance.love/scenes/battlesystem/actors/ennemy.lua index 4732d80..edac56b 100644 --- a/sonic-radiance.love/scenes/battlesystem/actors/ennemy.lua +++ b/sonic-radiance.love/scenes/battlesystem/actors/ennemy.lua @@ -14,7 +14,7 @@ function Ennemy:draw() Ennemy.super.draw(self) local x, y = self.world.map:gridToPixel(self.x, self.y, true) - self.owner:drawHUD(x - 14, y - 38) + self.owner:drawHUD(x - 12, y - 38) if (self.isSelected) then local height = 32 diff --git a/sonic-radiance.love/scenes/battlesystem/assets.lua b/sonic-radiance.love/scenes/battlesystem/assets.lua index 244881b..94dd0d1 100644 --- a/sonic-radiance.love/scenes/battlesystem/assets.lua +++ b/sonic-radiance.love/scenes/battlesystem/assets.lua @@ -25,7 +25,8 @@ return { {"m_power", "assets/gui/emblem_power_mask.png"}, {"hudturn", "assets/gui/strings/hudturn.png"}, - {"battlecompleted", "assets/gui/strings/battle_completed.png" } + {"battlecompleted", "assets/gui/strings/battle_completed.png" }, + {"egghead", "assets/gui/egghead.png"} }, ["fonts"] = { {"small", "assets/gui/fonts/PixelOperator.ttf", 16},