rework some thingies

src/love/.vscode/settings.json

@@ -4,7 +4,9 @@
     ],
     "Lua.diagnostics.disable": [
         "redundant-parameter",
-        "missing-parameter"
+        "missing-parameter",
+        "lowercase-global",
+        "assign-type-mismatch"
     ],
     "Lua.runtime.version": "LuaJIT",
     "Lua.runtime.special": [],

src/love/data/characters/BaseCharacter.lua

@@ -9,6 +9,7 @@ function Character:new(luaPath)
     self.shearX, self.shearY = 0, 0
     self.optionsTable = self.spr.optionsTable
     self.icon = self.optionsTable.icon
+    self.flipX, self.flipY = false, false
     self.holdTimer = 0
     self.maxHoldTimer = self.spr.maxHoldTimer
 
@@ -23,6 +24,7 @@ function Character:update(dt)
     self.spr.sizeX, self.spr.sizeY = self.sizeX, self.sizeY
     self.spr.offsetX, self.spr.offsetY = self.spr.offsetX, self.spr.offsetY
     self.spr.shearX, self.spr.shearY = self.shearX, self.shearY
+    self.spr.flipX, self.spr.flipY = self.flipX, self.flipY
 
     self.spr.holdTimer = self.holdTimer
 end

src/love/data/weeks/weekData.lua

@@ -0,0 +1,12 @@
+return {
+    [0] = require "weeks.test",
+    require "weeks.tutorial",
+    require "weeks.week1",
+    require "weeks.week2",
+    require "weeks.week3",
+    require "weeks.week4",
+    require "weeks.week5",
+    require "weeks.week6",
+    require "weeks.week7",
+    require "weeks.weekend1"
+}

src/love/data/weeks/weekDescriptions.lua

@@ -0,0 +1,11 @@
+return { -- Add your week description here
+    "TEACHING TIME",
+    "DADDY DEAREST",
+    "SPOOKY MONTH",
+    "PICO",
+    "MOMMY MUST MURDER",
+    "RED SNOW",
+    "HATING SIMULATOR FT. MOAWLING",
+    "TANKMAN FT. JOHNYUTAH",
+    "DUE DEBTS"
+}

src/love/data/weeks/weekMeta.lua

@@ -0,0 +1,80 @@
+return { -- Add/remove weeks here
+    [0] = {
+        "Test",
+        {
+            "Test"
+        }
+    },
+    {
+        "Tutorial",
+        {
+            {"Tutorial"}
+        }
+    },
+    {
+        "Week 1",
+        {
+            {"Bopeebo",   erect=true},
+            {"Fresh",     erect=true},
+            {"Dadbattle", erect=true}
+        }
+    },
+    {
+        "Week 2",
+        {
+            {"Spookeez",  erect=true},
+            {"South",     erect=true},
+            {"Monster"}
+        }
+    },
+    {
+        "Week 3",
+        {
+            {"Pico",        erect=true},
+            {"Philly Nice", erect=true},
+            {"Blammed",     erect=true}
+        }
+    },
+    {
+        "Week 4",
+        {
+            {"Satin Panties", erect=true},
+            {"High",          erect=true},
+            {"M.I.L.F"}
+        }
+    },
+    {
+        "Week 5",
+        {
+            {"Cocoa"},
+            {"Eggnog", erect=true},
+            {"Winter Horrorland"}
+        }
+    },
+    {
+        "Week 6",
+        {
+            {"Senpai", erect=true},
+            {"Roses",  erect=true},
+            {"Thorns", erect=true}
+        }
+    },
+    {
+        "Week 7",
+        {
+            {"Ugh"},
+            {"Guns"},
+            {"Stress"}
+        }
+    },
+    {
+        "Weekend 1",
+        {
+            {"Darnell"},
+            {"Lit Up"},
+            {"2hot"},
+            {"Blazin"},
+            {"Cutscene", show=false}
+        }
+    }
+}

src/love/main.lua

@@ -35,13 +35,7 @@ function uitextflarge(text,x,y,limit,align,hovered,r,sx,sy,ox,oy,kx,ky)
 	local oy = oy or 0
 	local kx = kx or 0
 	local ky = ky or 0
-	--[[ if not hovered then graphics.setColor(0,0,0) else graphics.setColor(1,1,1) end
-	love.graphics.printf(text,x-6,y,limit,align,r,sx,sy,ox,oy,kx,ky)
-	love.graphics.printf(text,x+6,y,limit,align,r,sx,sy,ox,oy,kx,ky)
-	love.graphics.printf(text,x,y-6,limit,align,r,sx,sy,ox,oy,kx,ky)
-	love.graphics.printf(text,x,y+6,limit,align,r,sx,sy,ox,oy,kx,ky)
-	if not hovered then graphics.setColor(1,1,1) else graphics.setColor(0,0,0) end
-	love.graphics.printf(text,x,y,limit,align,r,sx,sy,ox,oy,kx,ky) ]]
+
 	if not hovered then graphics.setColor(0,0,0) else graphics.setColor(1,1,1) end
 	for i = -6, 6 do
 		for j = -6, 6 do
@@ -296,145 +290,24 @@ function love.load()
 	TankmanDatingSim = require "misc.dating"
 
 	-- Load week data
-	weekData = {
-		[0] = require "weeks.test",
-		require "weeks.tutorial",
-		require "weeks.week1",
-		require "weeks.week2",
-		require "weeks.week3",
-		require "weeks.week4",
-		require "weeks.week5",
-		require "weeks.week6",
-		require "weeks.week7",
-		require "weeks.weekend1"
-	}
+	weekData = require "data.weeks.weekData"
+	weekDesc = require "data.weeks.weekDescriptions"
+	weekMeta = require "data.weeks.weekMeta"
+	for i, week in ipairs(weekMeta) do
+		for k, song in ipairs(week[2]) do
+			if type(song) == "table" then
+				if song.show == nil then 
+					song.show = true 
+				end
+			end
+		end
+	end
+	modWeekPlacement = #weekMeta -- everything after the main weeks is a mod folder.
 
 	require "modules.extras"
 
 	__VERSION__ = love.filesystem.getInfo("version.txt") and love.filesystem.read("version.txt") or "vUnknown"
 
-	weekDesc = { -- Add your week description here
-		"TEACHING TIME",
-		"DADDY DEAREST",
-		"SPOOKY MONTH",
-		"PICO",
-		"MOMMY MUST MURDER",
-		"RED SNOW",
-		"HATING SIMULATOR FT. MOAWLING",
-		"TANKMAN FT. JOHNYUTAH",
-		"DUE DEBTS"
-	}
-
-	weekMeta = { -- Add/remove weeks here
-		[0] = {
-			"Test",
-			{
-				"Test"
-			}
-		},
-		{
-			"Tutorial",
-			{
-				"Tutorial"
-			}
-		},
-		{
-			"Week 1",
-			{
-				"Bopeebo",
-				"Fresh",
-				"Dadbattle"
-			},
-			-- Erect remix's
-			{
-				"Bopeebo",
-				"Fresh",
-				"Dadbattle"
-			}
-		},
-		{
-			"Week 2",
-			{
-				"Spookeez",
-				"South",
-				"Monster"
-			},
-			{
-				"Spookeez",
-				"South"
-			}
-		},
-		{
-			"Week 3",
-			{
-				"Pico",
-				"Philly Nice",
-				"Blammed"
-			},
-			{
-				"Pico",
-				"Philly Nice",
-				"Blammed"
-			}
-		},
-		{
-			"Week 4",
-			{
-				"Satin Panties",
-				"High",
-				"M.I.L.F"
-			},
-			{
-				"Satin Panties",
-				"High"
-			}
-		},
-		{
-			"Week 5",
-			{
-				"Cocoa",
-				"Eggnog",
-				"Winter Horrorland"
-			},
-			{
-				"Eggnog"
-			}
-		},
-		{
-			"Week 6",
-			{
-				"Senpai",
-				"Roses",
-				"Thorns"
-			},
-			{
-				"Senpai",
-				"Roses",
-				"Thorns"
-			}
-		},
-		{
-			"Week 7",
-			{
-				"Ugh",
-				"Guns",
-				"Stress"
-			}
-		},
-		{
-			"Weekend 1",
-			{
-				"Darnell",
-				"Lit Up",
-				"2hot",
-				"Blazin",
-				{"Cutscene", false}
-			}
-		}
-	}
-
-	modWeekPlacement = #weekMeta -- everything after the main weeks is a mod folder.
-
 	-- LÖVE init
 	if curOS == "OS X" then
 		love.window.setIcon(love.image.newImageData("icons/macos.png"))
@@ -493,7 +366,6 @@ function love.load()
 		(love.audio.getVolume())
 	))
 
-
 	volumeWidth = {width = 160 }
 
 	if CONSTANTS.OPTIONS.DO_MODS then

src/love/modules/Icon.lua

@@ -7,6 +7,9 @@ return {
             graphics.cache[path] = love.graphics.newImage(path)
         end
         local img = graphics.cache[path]
+        if path:find("-pixel") then
+            img:setFilter("nearest")
+        end
         local frameData = {
             {
                 x = 0, y = 0, 

src/love/modules/xml/Sprite.lua

@@ -67,6 +67,7 @@ function Sprite.getFramesFromSparrow(tex, desc)
 
     local f = {texture=tex, frames={}}
     local sw, sh = tex:getWidth(), tex:getHeight()
+    ---@diagnostic disable-next-line: param-type-mismatch
     for i, c in ipairs(xml.parse(desc)) do
         if c.tag == "SubTexture" then
             table.insert(f.frames, Sprite.newFrame(

src/love/stages/streets.lua

@@ -94,6 +94,7 @@ return {
             girlfriend:draw()
 
             enemy:draw()
+            boyfriend:draw()
 
             stageImages["spraycanPile"]:draw()
 		love.graphics.pop()