weeks:setNoteSprites(), rename deprecated.lua to extras.lua

src/love/main.lua

@@ -304,7 +304,7 @@ function love.load()
 		require "weeks.weekend1"
 	}
 
-	require "modules.deprecated"
+	require "modules.extras"
 
 	__VERSION__ = love.filesystem.getInfo("version.txt") and love.filesystem.read("version.txt") or "vUnknown"
 

src/love/modules/deprecated.lua → src/love/modules/extras.lua

@@ -1,5 +1,3 @@
--- REQUIRE THIS FILE AFTER ALL THE STATES. THIS FILE ADDS BACK DEPRECATED FUNCTIONS FROM THEM.
-
 function weeks.legacyGenerateNotes(self, chart)
     if importMods.inMod then
         importMods.setupScripts()
@@ -28,13 +26,6 @@ function weeks.legacyGenerateNotes(self, chart)
         speed = settings.customScrollSpeed
     end
 
-    noteSprites = {
-        sprites.leftArrow,
-        sprites.downArrow,
-        sprites.upArrow,
-        sprites.rightArrow
-    }
-
     for _, section in ipairs(chart.notes) do
         local mustHitSection = section.mustHitSection or false
         for _, noteData in ipairs(section.sectionNotes) do
@@ -150,8 +141,6 @@ function weeks.legacyGenerateNotes(self, chart)
     end
 end
 
--- I gotta rename this file..,..,.
--- This file will just have spare functions,.,.
 function weeks.cneGenerateNotes(self, chart, metadata)
     if importMods.inMod then
         importMods.setupScripts()
@@ -170,13 +159,6 @@ function weeks.cneGenerateNotes(self, chart, metadata)
     else
         speed = settings.customScrollSpeed
     end
-
-    noteSprites = {
-        sprites.leftArrow,
-        sprites.downArrow,
-        sprites.upArrow,
-        sprites.rightArrow
-    }
 
     for _, strumline in ipairs(chart.strumLines) do
         -- strumline.visible, if its nil, set to true

src/love/states/weeks.lua

@@ -374,33 +374,27 @@ return {
 		ratingPercent = 0.0
 		noteCounter = 0
 
-		if not pixel then
-			sprites.leftArrow = love.filesystem.load("sprites/left-arrow.lua")
-			sprites.downArrow = love.filesystem.load("sprites/down-arrow.lua")
-			sprites.upArrow = love.filesystem.load("sprites/up-arrow.lua")
-			sprites.rightArrow = love.filesystem.load("sprites/right-arrow.lua")
-
-			sprites.receptors = love.filesystem.load("sprites/receptor.lua")
-		else
-			sprites.leftArrow = love.filesystem.load("sprites/pixel/left-arrow.lua")
-			sprites.downArrow = love.filesystem.load("sprites/pixel/down-arrow.lua")
-			sprites.upArrow = love.filesystem.load("sprites/pixel/up-arrow.lua")
-			sprites.rightArrow = love.filesystem.load("sprites/pixel/right-arrow.lua")
-
-			sprites.receptors = love.filesystem.load("sprites/pixel/receptor.lua")
+		if not noteSprites then
+			self:setNoteSprites( -- the default sprites
+				love.filesystem.load("sprites/receptor.lua")(),
+				love.filesystem.load("sprites/left-arrow.lua")(),
+				love.filesystem.load("sprites/down-arrow.lua")(),
+				love.filesystem.load("sprites/up-arrow.lua")(),
+				love.filesystem.load("sprites/right-arrow.lua")()
+			)
 		end
 
 		enemyArrows = {
-			sprites.receptors(),
-			sprites.receptors(),
-			sprites.receptors(),
-			sprites.receptors()
+			noteSprites[5](),
+			noteSprites[5](),
+			noteSprites[5](),
+			noteSprites[5]()
 		}
 		boyfriendArrows= {
-			sprites.receptors(),
-			sprites.receptors(),
-			sprites.receptors(),
-			sprites.receptors()
+			noteSprites[5](),
+			noteSprites[5](),
+			noteSprites[5](),
+			noteSprites[5]()
 		}
 
 		for i = 1, 4 do
@@ -460,6 +454,16 @@ return {
 		HoldCover:setup()
 	end,
 
+	setNoteSprites = function(self, receptors, left, down, up, right)
+		noteSprites = {
+			left,
+			down,
+			up,
+			right,
+			receptors
+		}
+	end,
+
 	generateNotes = function(self, chart, metadata, difficulty)
 		local eventBpm
 		local chart = getFilePath(chart)
@@ -492,13 +496,6 @@ return {
 
 		if not bpm then bpm = 120 end
 
-		noteSprites = {
-			sprites.leftArrow,
-			sprites.downArrow,
-			sprites.upArrow,
-			sprites.rightArrow
-		}
-
 		local _speed = 1
 		if chartData.scrollSpeed[difficulty] then
 			_speed = chartData.scrollSpeed[difficulty]
@@ -1578,5 +1575,7 @@ return {
 		fakeBoyfriend = nil
 		importMods.removeScripts()
 		importMods.inMod = false
+
+		noteSprites = nil
 	end
 }