From 0a49f9e06a9bec8e29489c3f3f7dd796efabdf25 Mon Sep 17 00:00:00 2001
From: entar <entar@squog.ru>
Date: Sun, 8 Jun 2025 13:25:01 +0700
Subject: [PATCH] New font, proper score and accuracy labels

---
 .gitignore                          |   7 +--
 fonts/FridayNightFunkin-Regular.ttf | Bin 0 -> 16316 bytes
 icon.png~                           |   2 -
 log.log                             |  26 +++++++-
 main.lua                            |   4 +-
 modules/states/playstate.lua        |  94 +++++++++++++++++++++-------
 settings.json                       |   2 +-
 stages/stageErect.json              |   2 +-
 8 files changed, 99 insertions(+), 38 deletions(-)
 create mode 100644 fonts/FridayNightFunkin-Regular.ttf
 delete mode 100644 icon.png~

diff --git a/.gitignore b/.gitignore
index 014f506..b62b9c2 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,10 +1,5 @@
 .vscode
 
 
-<<<<<<< HEAD
 settings.json
-=======
-
-settings.json
-settings.json
->>>>>>> 77b988b12d6638bf3085a33f181f082b2b93ef1a
+log.log
\ No newline at end of file
diff --git a/fonts/FridayNightFunkin-Regular.ttf b/fonts/FridayNightFunkin-Regular.ttf
new file mode 100644
index 0000000000000000000000000000000000000000..2dbc19fb6dd520355a88a07944aba5bdf521f04d
GIT binary patch
literal 16316
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
KlD0ualK%x}l3tYn

literal 0
HcmV?d00001

diff --git a/icon.png~ b/icon.png~
deleted file mode 100644
index 4c38794..0000000
--- a/icon.png~
+++ /dev/null
@@ -1,2 +0,0 @@
-�PNG
-
diff --git a/log.log b/log.log
index 48658be..be78ab8 100644
--- a/log.log
+++ b/log.log
@@ -5,14 +5,34 @@ No chart file
 No chart file
 No chart file
 Is chart file
-<<<<<<< HEAD
 No chart file
 Is chart file
 No chart file
 No chart file
-=======
+Is chart file
+No chart file
+Is chart file
+Is chart file
+Is chart file
+Is chart file
+Is chart file
+Is chart file
+Is chart file
+Is chart file
+Is chart file
+Is chart file
+Is chart file
+Is chart file
+Is chart file
+Is chart file
+Is chart file
+Is chart file
+Is chart file
+Is chart file
+Is chart file
+Is chart file
+Is chart file
 Is chart file
 Is chart file
 Is chart file
->>>>>>> 77b988b12d6638bf3085a33f181f082b2b93ef1a
 Is chart file
\ No newline at end of file
diff --git a/main.lua b/main.lua
index a7575ae..3845de4 100644
--- a/main.lua
+++ b/main.lua
@@ -43,7 +43,7 @@ local function setup()
   freaky:play()
 end
 
-local font = love.graphics.newFont("fonts/Phantomuff.ttf", 40)
+local font = love.graphics.newFont("fonts/FridayNightFunkin-Regular.ttf", 40)
 
 local gettingKey
 
@@ -69,7 +69,7 @@ function love.draw()
     curState.draw()
   else
     myTypes.drawSprites()
-    love.graphics.print({{0,0,0}, string.format("Song: %s, Difficulty: %s, List: %s", curSong.name, curDiff, logging.dump(curDiffList))}, font, love.graphics.getWidth()/4, love.graphics:getHeight()/2 + 250, 0, 1, 1, 200)
+    love.graphics.print({{0,0,0}, string.format("SONG: %s, DIFFICULTY: %s", curSong.name, curDiff)}, font, love.graphics.getWidth()/4, love.graphics:getHeight()/2 + 250, 0, 1, 1, 200)
     love.graphics.print(
       {{0,0,0}, string.format("Left: %s, Down: %s, Up: %s, Right: %s \nDownscroll: %s", 
       keybinds[1],
diff --git a/modules/states/playstate.lua b/modules/states/playstate.lua
index d2468d0..9bd0b9b 100644
--- a/modules/states/playstate.lua
+++ b/modules/states/playstate.lua
@@ -63,6 +63,14 @@ local function state(songName, songDifficulty)
 
     local icons = {}
 
+    local ui = {
+        timebar = true,
+        healthIcons = true, -- If halth is false it wont render either way
+        health = true,
+        score = true,
+        ratings = true,
+    }
+
     local settings = {}
 
     local ratings = {
@@ -73,6 +81,8 @@ local function state(songName, songDifficulty)
         miss = 0,
     }
     local score = 0
+    local totalScore = 0 -- If you hit ALL sicks
+    local accuracy = 100
 
     local rankWindows = {
         {
@@ -127,6 +137,7 @@ local function state(songName, songDifficulty)
 
     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 receptors = {}
     local splashes = {}
@@ -247,6 +258,9 @@ local function state(songName, songDifficulty)
             closestNote:destroy()
 
             score = score + rating.score
+            totalScore = totalScore + rankWindows[1].score
+
+            accuracy = (score / totalScore) * 100
         end
     end
 
@@ -511,34 +525,43 @@ local function state(songName, songDifficulty)
 
         myTypes.drawSprites()
 
+        if ui.ratings then
+            for index, window in next, rankWindows do
+                love.graphics.print({{0,0,0,1}, tostring(ratings[window.rating])}, evenBiggerFont, 200, 330 + 75 * (index - 1))
+            end
+            -- love.graphics.print({{0,0,0,1}, string.format("Sick: %s \nGood: %s \nBad: %s \nShit: %s \nMiss: %s", ratings.sick, ratings.good, ratings.bad, ratings.shit, ratings.miss)}, biggerFont, 0, 100)
+        end
+        if 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(255,0,0)
+            love.graphics.rectangle("fill", 560, settings.Downscroll and 30 or 1020, 800, 30)
+            love.graphics.setColor(0,255,0)
+            love.graphics.rectangle("fill", 1360 - health * 400, settings.Downscroll and 30 or 1020, health * 400, 30)
+
+            love.graphics.setColor(0,0,0)
+            love.graphics.rectangle("line", 560, settings.Downscroll and 30 or 1050, 800, 30)
+
+            love.graphics.setColor(255,255,255)
+
+            if ui.healthIcons then
+                love.graphics.draw(icons.bf.image, health > .2 and icons.bf.alive or icons.bf.dead, 1510 - health * 400, settings.Downscroll and 0 or 930, 0, -1, 1)
+
+                if characters.dad then
+                    love.graphics.draw(icons.dad.image, health < 1.8 and icons.dad.alive or icons.dad.dead, 1210 - health * 400, settings.Downscroll and 0 or 930)
+                end
+            end
+        end
+        -- HEALTH BAR
+
         love.graphics.setCanvas()
 
         love.graphics.draw(mainCanvas, (love.graphics.getWidth() - (love.graphics.getWidth() * zoom)) / 2, (love.graphics.getHeight() - love.graphics.getHeight() * zoom) / 2, 0, love.graphics.getWidth()/1920 * zoom, (love.graphics.getHeight()/1080 * zoom))
 
         love.graphics.print({{0,0,0,1}, string.format("FPS: %s \nVolume: %s", love.timer.getFPS(), volume)}, font)
-
-        love.graphics.print({{0,0,0,1}, string.format("Sick: %s \nGood: %s \nBad: %s \nShit: %s \nMiss: %s", ratings.sick, ratings.good, ratings.bad, ratings.shit, ratings.miss)}, biggerFont, 0, 100)
-    
-
-        -- HEALTH BAR
-        if playing then
-            love.graphics.setColor(255,0,0)
-            love.graphics.rectangle("fill", 440, settings.Downscroll and 30 or 690, 400, 15)
-            love.graphics.setColor(0,255,0)
-            love.graphics.rectangle("fill", 840 - health * 200, settings.Downscroll and 30 or 690, health * 200, 15)
-
-            love.graphics.setColor(0,0,0)
-            love.graphics.rectangle("line", 440, settings.Downscroll and 30 or 690, 400, 15)
-
-            love.graphics.setColor(255,255,255)
-
-            love.graphics.draw(icons.bf.image, health > .2 and icons.bf.alive or icons.bf.dead, 960 - health * 200, settings.Downscroll and 0 or 720, 0, -1, 1)
-
-            if characters.dad then
-                love.graphics.draw(icons.dad.image, health < 1.8 and icons.dad.alive or icons.dad.dead, 715 - health * 200, settings.Downscroll and 0 or 720)
-            end
-        end
-        -- HEALTH BAR
     end
 
     love.window.setMode(1280, 720, { fullscreen = false , resizable = false})
@@ -764,6 +787,31 @@ local function state(songName, songDifficulty)
             end
             module.characters = characters
         end
+
+        local sickImage = myTypes.Image("images/ui/sick.png")
+        local goodImage = myTypes.Image("images/ui/good.png")
+        local badImage = myTypes.Image("images/ui/bad.png")
+        local shitImage = myTypes.Image("images/ui/shit.png")
+
+        sickImage.position.y = 330
+        goodImage.position.y = 405
+        badImage.position.y = 480
+        shitImage.position.y = 555
+
+        sickImage.ui = true
+        goodImage.ui = true
+        badImage.ui = true
+        shitImage.ui = true
+
+        sickImage.layer = 7
+        goodImage.layer = 7
+        badImage.layer = 7
+        shitImage.layer = 7
+
+        sickImage.resize = myTypes.Vector2(0.5,0.5)
+        goodImage.resize = myTypes.Vector2(0.5,0.5)
+        badImage.resize = myTypes.Vector2(0.5,0.5)
+        shitImage.resize = myTypes.Vector2(0.5,0.5)
     end
 
     function state.finish()
diff --git a/settings.json b/settings.json
index 5fd564a..8e375d8 100644
--- a/settings.json
+++ b/settings.json
@@ -1 +1 @@
-{"Downscroll":true, "Keybinds":["a", "s", "up", "right"]}
\ No newline at end of file
+{"Keybinds":["a", "s", "up", "right"], "Downscroll":true}
\ No newline at end of file
diff --git a/stages/stageErect.json b/stages/stageErect.json
index 93d066b..dbc9de6 100644
--- a/stages/stageErect.json
+++ b/stages/stageErect.json
@@ -8,7 +8,7 @@
 	"opponent": [200, -175],
 	"hide_girlfriend": false,
 
-	"camera_boyfriend": [150, -300],
+	"camera_boyfriend": [150, -400],
 	"camera_opponent": [-300, 300],
 	"camera_girlfriend": [0, 0],
 	"camera_speed": 1