Changed the score text to be near the healthbar like in the real game
This commit is contained in:
parent
092f6d38ac
commit
b4334d8653
@ -151,6 +151,7 @@ local function state(songName, songDifficulty, show)
|
||||
local font = love.graphics.newFont("fonts/Phantomuff.ttf", 15)
|
||||
local biggerFont = love.graphics.newFont("fonts/Phantomuff.ttf", 30)
|
||||
local evenBiggerFont = love.graphics.newFont("fonts/FridayNightFunkin-Regular.ttf", 50)
|
||||
local big = love.graphics.newFont(30)
|
||||
|
||||
local receptors = {}
|
||||
local opponentReceptors = {}
|
||||
@ -678,7 +679,6 @@ local function state(songName, songDifficulty, show)
|
||||
elseif event.name == "hey!" then
|
||||
characters.bf:PlayAnimation("hey")
|
||||
end
|
||||
|
||||
for index, module in next, modules do
|
||||
if module.onEvent then
|
||||
module.onEvent(event)
|
||||
@ -747,22 +747,18 @@ local function state(songName, songDifficulty, show)
|
||||
|
||||
render.drawUI()
|
||||
|
||||
if playing and ui.score then
|
||||
love.graphics.print({{0,0,0,1}, string.format("Score: %s Accuracy: %s", score, tostring(accuracy):sub(1, 5))}, evenBiggerFont, 760, settings.Downscroll and 1030 or 50)
|
||||
end
|
||||
|
||||
-- HEALTH BAR
|
||||
if playing and ui.health then
|
||||
love.graphics.setColor(characters.dad and characters.dad.colors[1]/255 or 0,
|
||||
characters.dad and characters.dad.colors[2]/255 or 1,
|
||||
characters.dad and characters.dad.colors[1]/255 or 0
|
||||
)
|
||||
love.graphics.rectangle("fill", 560, settings.Downscroll and 30 or 1020, 800, 30)
|
||||
love.graphics.rectangle("fill", 560, settings.Downscroll and 30 or 960, 800, 30)
|
||||
love.graphics.setColor(characters.bf.colors[1]/255,characters.bf.colors[2]/255,characters.bf.colors[3]/255)
|
||||
love.graphics.rectangle("fill", 1360 - health * 400, settings.Downscroll and 30 or 1020, health * 400, 30)
|
||||
love.graphics.rectangle("fill", 1360 - health * 400, settings.Downscroll and 30 or 960, health * 400, 30)
|
||||
|
||||
love.graphics.setColor(0,0,0)
|
||||
love.graphics.rectangle("line", 560, settings.Downscroll and 30 or 1050, 800, 30)
|
||||
love.graphics.rectangle("line", 560, settings.Downscroll and 30 or 960, 800, 30)
|
||||
|
||||
love.graphics.setColor(1,1,1)
|
||||
|
||||
@ -774,6 +770,9 @@ local function state(songName, songDifficulty, show)
|
||||
end
|
||||
end
|
||||
end
|
||||
if playing and ui.score then
|
||||
love.graphics.print({{0,0,0,1}, string.format("Score: %s Accuracy: %s", score, tostring(accuracy):sub(1, 5))}, big, 760, settings.Downscroll and 70 or 940)
|
||||
end
|
||||
|
||||
for i, module in next, modules do
|
||||
if module.onDraw then
|
||||
@ -857,7 +856,7 @@ local function state(songName, songDifficulty, show)
|
||||
|
||||
conductor.stepCrochet = conductor:calculateCrochet(chart.bpm)/4
|
||||
|
||||
local noteSkin = chart.noteSkin or "NOTE_assets"
|
||||
local noteSkin = chart.noteSkin or "NOTE_assets" --will do this sometiems
|
||||
local noteSplash = chart.splashSkin or "noteSplashes"
|
||||
|
||||
for i = 0, 3 do
|
||||
@ -1056,7 +1055,6 @@ local function state(songName, songDifficulty, show)
|
||||
end
|
||||
|
||||
function state.keypressed(key, un, is)
|
||||
print(key)
|
||||
if key == "space" then
|
||||
if playing then
|
||||
paused = not paused
|
||||
|
Loading…
x
Reference in New Issue
Block a user