From cc648b54acc4e04569d929b9ddf7aaa8ad749361 Mon Sep 17 00:00:00 2001 From: GuglioIsStupid Date: Wed, 8 May 2024 21:52:29 -0400 Subject: [PATCH] some fixies and some duplications removes --- src/love/.backup/boyfriend.xml | 501 ------------------ src/love/.backup/girlfriend.xml | 257 --------- src/love/.backup/notes.xml | 92 ---- src/love/conf.lua | 1 + src/love/main.lua | 6 +- src/love/modules/constants.lua | 16 +- src/love/modules/deprecated.lua | 4 +- src/love/modules/xml/Sprite.lua | 2 +- .../{weekend1 => characters}/darnell.lua | 2 +- .../sprites/{weekend1 => characters}/nene.lua | 2 +- src/love/stages/tank.lua | 2 +- src/love/states/debug/debugMenu.lua | 1 + src/love/states/menu/menuCredits.lua | 2 +- src/love/states/menu/menuSelect.lua | 12 +- src/love/states/weeks.lua | 29 +- src/love/substates/settings-keybinds.lua | 2 +- src/love/weeks/weekend1.lua | 2 +- 17 files changed, 45 insertions(+), 888 deletions(-) delete mode 100644 src/love/.backup/boyfriend.xml delete mode 100644 src/love/.backup/girlfriend.xml delete mode 100644 src/love/.backup/notes.xml rename src/love/sprites/{weekend1 => characters}/darnell.lua (99%) rename src/love/sprites/{weekend1 => characters}/nene.lua (99%) diff --git a/src/love/.backup/boyfriend.xml b/src/love/.backup/boyfriend.xml deleted file mode 100644 index 50b7bd2e..00000000 --- a/src/love/.backup/boyfriend.xml +++ /dev/null @@ -1,501 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/src/love/.backup/girlfriend.xml b/src/love/.backup/girlfriend.xml deleted file mode 100644 index bec3d85e..00000000 --- a/src/love/.backup/girlfriend.xml +++ /dev/null @@ -1,257 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/src/love/.backup/notes.xml b/src/love/.backup/notes.xml deleted file mode 100644 index 2ea69c27..00000000 --- a/src/love/.backup/notes.xml +++ /dev/null @@ -1,92 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/src/love/conf.lua b/src/love/conf.lua index 61574ad6..466c549e 100644 --- a/src/love/conf.lua +++ b/src/love/conf.lua @@ -26,6 +26,7 @@ function love.conf(t) t.identity = "VE-FNFR" t.version = "11.4" t.console = _debug + t.window.vsync = false if _debug then local major, minor, revision, codename = love.getVersion() diff --git a/src/love/main.lua b/src/love/main.lua index 0d08249a..1eea9c3b 100644 --- a/src/love/main.lua +++ b/src/love/main.lua @@ -142,6 +142,7 @@ function borderedText(text,x,y,r,sx,sy,ox,oy,kx,ky,alpha) graphics.setColor(1,1,1, alpha or 1) love.graphics.print(text,x,y,r,sx,sy,ox,oy,kx,ky) end + mainDrawing = true require "modules.overrides" @@ -160,7 +161,7 @@ function love.load() json = require "lib.json" lume = require "lib.lume" Object = require "lib.classic" - xml = require "lib.xml".parse + xml = require "lib.xml" lovefftINST = require "lib.fft.lovefft" lovefftBFVOCALS = require "lib.fft.lovefft" lovefftENEMYVOCALS = require "lib.fft.lovefft" @@ -664,6 +665,9 @@ function love.focus(t) end function love.quit() + if settings.lastDEBUGOption then + settings.showDebug = settings.lastDEBUGOption + end saveSettings(false) saveSavedata() end \ No newline at end of file diff --git a/src/love/modules/constants.lua b/src/love/modules/constants.lua index b18a99cc..77b8ef54 100644 --- a/src/love/modules/constants.lua +++ b/src/love/modules/constants.lua @@ -63,7 +63,21 @@ CONSTANTS.WEEKS = { "go", "set", "ready" - } + }, + JUDGE_THRES = { + PERFECT_THRES = 5, + MISS_THRES = 160, + KILLER_THRES = 12.5, + SICK_THRES = 45, + GOOD_THRES = 90, + BAD_THRES = 135, + SHIT_THRES = 160 + }, + MAX_SCORE = 500, + MIN_SCORE = 0, + MISS_SCORE = 0, + SCORING_OFFSET = 54.00, + SCORING_SLOPE = 0.080 } return CONSTANTS \ No newline at end of file diff --git a/src/love/modules/deprecated.lua b/src/love/modules/deprecated.lua index 12d3b0b0..ca37a0f8 100644 --- a/src/love/modules/deprecated.lua +++ b/src/love/modules/deprecated.lua @@ -29,9 +29,9 @@ function weeks.legacyGenerateNotes(self, chart) sprites.rightArrow } - for i, section in ipairs(chart.notes) do + for _, section in ipairs(chart.notes) do local mustHitSection = section.mustHitSection or false - for j, noteData in ipairs(section.sectionNotes) do + for _, noteData in ipairs(section.sectionNotes) do local time = noteData[1] local noteType = noteData[2] local noteVer = noteData[4] or "normal" diff --git a/src/love/modules/xml/Sprite.lua b/src/love/modules/xml/Sprite.lua index bca720bf..17e21903 100644 --- a/src/love/modules/xml/Sprite.lua +++ b/src/love/modules/xml/Sprite.lua @@ -67,7 +67,7 @@ function Sprite.getFramesFromSparrow(tex, desc) local f = {texture=tex, frames={}} local sw, sh = tex:getWidth(), tex:getHeight() - for i, c in ipairs(xml(desc)) do + for i, c in ipairs(xml.parse(desc)) do if c.tag == "SubTexture" then table.insert(f.frames, Sprite.newFrame( c.attr.name, diff --git a/src/love/sprites/weekend1/darnell.lua b/src/love/sprites/characters/darnell.lua similarity index 99% rename from src/love/sprites/weekend1/darnell.lua rename to src/love/sprites/characters/darnell.lua index 7f0859fa..dc62e21b 100644 --- a/src/love/sprites/weekend1/darnell.lua +++ b/src/love/sprites/characters/darnell.lua @@ -1,5 +1,5 @@ return graphics.newSprite( - love.graphics.newImage(graphics.imagePath("weekend1/darnell")), + love.graphics.newImage(graphics.imagePath("characters/darnell")), -- Automatically generated from darnell.xml { {x = 432, y = 921, width = 374, height = 471, offsetX = -44, offsetY = -79, offsetWidth = 643, offsetHeight = 665, rotated = false}, -- 1: Idle0001 diff --git a/src/love/sprites/weekend1/nene.lua b/src/love/sprites/characters/nene.lua similarity index 99% rename from src/love/sprites/weekend1/nene.lua rename to src/love/sprites/characters/nene.lua index ed96cc93..e9c85844 100644 --- a/src/love/sprites/weekend1/nene.lua +++ b/src/love/sprites/characters/nene.lua @@ -1,5 +1,5 @@ return graphics.newSprite( - love.graphics.newImage(graphics.imagePath("weekend1/Nene")), + love.graphics.newImage(graphics.imagePath("characters/Nene")), -- Automatically generated from Nene.xml { {x = 0, y = 0, width = 433, height = 294, offsetX = 42, offsetY = -45, offsetWidth = 312, offsetHeight = 496, rotated = true}, -- 1: ComboCheer0001 diff --git a/src/love/stages/tank.lua b/src/love/stages/tank.lua index 297f0687..6a924995 100644 --- a/src/love/stages/tank.lua +++ b/src/love/stages/tank.lua @@ -56,7 +56,7 @@ return { if not inCutscene then tankAngle = (tankAngle or 10) + (tankSpeed or 7) * dt - stageImages["Tank Rolling"].x = 0 + 1500 * math.cos(math.pi / 180 * (1 * tankAngle + 180)) + stageImages["Tank Rolling"].x = 1500 * math.cos(math.pi / 180 * (1 * tankAngle + 180)) stageImages["Tank Rolling"].y = 1200 + 1100 * math.sin(math.pi / 180 * (1 * tankAngle + 180)) stageImages["Tank Rolling"].orientation = math.rad(tankAngle - 90 + 15) diff --git a/src/love/states/debug/debugMenu.lua b/src/love/states/debug/debugMenu.lua index ebd12dc8..be69c214 100644 --- a/src/love/states/debug/debugMenu.lua +++ b/src/love/states/debug/debugMenu.lua @@ -16,6 +16,7 @@ return { state = frameDebug } } + settings.lastDEBUGOption = settings.showDebug settings.showDebug = false end, diff --git a/src/love/states/menu/menuCredits.lua b/src/love/states/menu/menuCredits.lua index 9ca0266c..e4eedd5d 100644 --- a/src/love/states/menu/menuCredits.lua +++ b/src/love/states/menu/menuCredits.lua @@ -19,7 +19,7 @@ return { } }, ["Friday Night Funkin"] = { - heading = CreateText("Friday Night Funkin'", true), + heading = CreateText("Friday Night Funkin", true), selected = false, members = { {name = CreateText("ninjamuffin99"), desc = "Programmer", selected = false, callback = function() love.system.openURL("https://twitter.com/ninja_muffin99") end}, diff --git a/src/love/states/menu/menuSelect.lua b/src/love/states/menu/menuSelect.lua index 409f7b6b..2ea0535d 100644 --- a/src/love/states/menu/menuSelect.lua +++ b/src/love/states/menu/menuSelect.lua @@ -1,13 +1,8 @@ -local leftFunc, rightFunc, confirmFunc, backFunc, drawFunc +local confirmFunc -local menuState local menuButton -local function switchMenu(menu) - menuState = 1 -end - return { enter = function(self, previous) @@ -40,7 +35,7 @@ return { end ) end - }, + }, { sprite = love.filesystem.load("sprites/menu/freeplay.lua")(), confirm = function() @@ -111,8 +106,6 @@ return { buttons[menuButton].confirm() end - switchMenu(1) - graphics:fadeInWipe(0.6) end, @@ -171,7 +164,6 @@ return { love.graphics.pop() love.graphics.setFont(font) love.graphics.pop() - end, leave = function(self) diff --git a/src/love/states/weeks.lua b/src/love/states/weeks.lua index 0a669cb4..4f52fef0 100644 --- a/src/love/states/weeks.lua +++ b/src/love/states/weeks.lua @@ -18,10 +18,6 @@ along with this program. If not, see . ------------------------------------------------------------------------------]] -- Nabbed from the JS source of FNF v0.3.0 (PBOT1 Scoring) -local MaxScore, ScoringOffset, ScoringSlope = 500, 54.00, 0.080 -local MinScore, MissScore = 9, 0 -local PerfectThres, MissThres, KillerThres, SickThres, GoodThres, BadThres, ShitThres = 5, 160, 12.5, 45, 90, 135, 160 - local DefaultTimeSignatureNum = 4 local timeSignatureNum = DefaultTimeSignatureNum @@ -409,7 +405,6 @@ return { elseif chartData.scrollSpeed["default"] then _speed = chartData.scrollSpeed["default"] end - if settings.customScrollSpeed == 1 then speed = _speed @@ -728,29 +723,29 @@ return { end, judgeNote = function(self, msTiming) - if msTiming <= SickThres then + if msTiming <= CONSTANTS.WEEKS.JUDGE_THRES.SICK_THRES then return "sick" - elseif msTiming < GoodThres then + elseif msTiming < CONSTANTS.WEEKS.JUDGE_THRES.GOOD_THRES then return "good" - elseif msTiming < BadThres then + elseif msTiming < CONSTANTS.WEEKS.JUDGE_THRES.BAD_THRES then return "bad" - elseif msTiming < ShitThres then + elseif msTiming < CONSTANTS.WEEKS.JUDGE_THRES.SHIT_THRES then return "shit" else - return miss + return "miss" end end, scoreNote = function(self, msTiming) - if msTiming > MissThres then - return MissScore + if msTiming > CONSTANTS.WEEKS.JUDGE_THRES.MISS_THRES then + return CONSTANTS.WEEKS.MISS_SCORE else - if msTiming < PerfectThres then - return MaxScore + if msTiming < CONSTANTS.WEEKS.JUDGE_THRES.PERFECT_THRES then + return CONSTANTS.WEEKS.MAX_SCORE else - local factor = 1 - 1 / (1 + math.exp(-ScoringSlope * (msTiming - ScoringOffset))) + local factor = 1 - 1 / (1 + math.exp(-CONSTANTS.WEEKS.SCORING_SLOPE * (msTiming - CONSTANTS.WEEKS.SCORING_OFFSET))) --var score = funkin_play_scoring_Scoring.PBOT1_MAX_SCORE * factor + funkin_play_scoring_Scoring.PBOT1_MIN_SCORE | 0; - local score = bit.bxor(MaxScore * factor + MinScore, 0) + local score = bit.bxor(CONSTANTS.WEEKS.MAX_SCORE * factor + CONSTANTS.WEEKS.MIN_SCORE, 0) return score end end @@ -917,7 +912,7 @@ return { if #boyfriendNote > 0 then for j = 1, #boyfriendNote do if boyfriendNote[j] and boyfriendNote[j]:getAnimName() == "on" then - if (boyfriendNote[j].time - musicTime <= MissThres) then + if (boyfriendNote[j].time - musicTime <= CONSTANTS.WEEKS.JUDGE_THRES.MISS_THRES) then local notePos local ratingAnim diff --git a/src/love/substates/settings-keybinds.lua b/src/love/substates/settings-keybinds.lua index 506557e3..69a10302 100644 --- a/src/love/substates/settings-keybinds.lua +++ b/src/love/substates/settings-keybinds.lua @@ -32,7 +32,7 @@ local invalidkeys = { ["lsuper"] = "lsuper", ["menu"] = "menu", } -local curInput = inputList[i] + return { enter = function(self) images = { diff --git a/src/love/weeks/weekend1.lua b/src/love/weeks/weekend1.lua index 8e8e1c5e..b6936fb5 100644 --- a/src/love/weeks/weekend1.lua +++ b/src/love/weeks/weekend1.lua @@ -143,7 +143,7 @@ return { elseif noteType == "wekend-1-kickcan" then character:animate("kick-can") return true - elseif noteType == "weekend-1-kneecan" then + elseif noteType == "weekend-1-kneecan" then character:animate("knee-forward") return true end