some fixies and some duplications removes

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()

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

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

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"

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,

src/love/sprites/weekend1/darnell.lua → 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

src/love/sprites/weekend1/nene.lua → 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

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)

src/love/states/debug/debugMenu.lua

@@ -16,6 +16,7 @@ return {
                 state = frameDebug
             }
         }
+        settings.lastDEBUGOption = settings.showDebug
         settings.showDebug = false
     end,
 

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},

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)

src/love/states/weeks.lua

@@ -18,10 +18,6 @@ along with this program.  If not, see <https://www.gnu.org/licenses/>.
 ------------------------------------------------------------------------------]]
 
 -- 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
 

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 = {

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