Rewrite icons

src/love/main.lua

@@ -163,13 +163,12 @@ function love.load()
 	Object = require "lib.classic"
 	xml = require "lib.xml"
 	lovefftINST = require "lib.fft.lovefft"
-	lovefftBFVOCALS = require "lib.fft.lovefft"
-	lovefftENEMYVOCALS = require "lib.fft.lovefft"
 
 	-- Load modules
 	status = require "modules.status"
 	audio = require "modules.audio"
 	graphics = require "modules.graphics"
+	icon = require "modules.Icon"
 	camera = require "modules.camera"
 	beatHandler = require "modules.beatHandler"
 	util = require "modules.util"
@@ -189,7 +188,7 @@ function love.load()
 
 	playMenuMusic = true
 
-	-- disable vsync
+	-- disable vsy
 	love.window.setVSync(0)
 
 	graphics.setImageType(settings.setImageType)
@@ -259,6 +258,7 @@ function love.load()
 
 	-- Load week data
 	weekData = {
+		[0] = require "weeks.test",
 		require "weeks.tutorial",
 		require "weeks.week1",
 		require "weeks.week2",
@@ -270,8 +270,6 @@ function love.load()
 		require "weeks.weekend1"
 	}
 
-	testData = require "weeks.test"
-
 	require "modules.deprecated"
 
 	__VERSION__ = love.filesystem.getInfo("version.txt") and love.filesystem.read("version.txt") or "vUnknown"
@@ -289,6 +287,12 @@ function love.load()
 	}
 
 	weekMeta = { -- Add/remove weeks here
+		[0] = {
+			"Test",
+			{
+				"Test"
+			}
+		},
 		{
 			"Tutorial",
 			{
@@ -351,10 +355,6 @@ function love.load()
 				"Cocoa",
 				"Eggnog",
 				"Winter Horrorland"
-			},
-			{
-				"Cocoa",
-				"Eggnog"
 			}
 		},
 		{
@@ -384,7 +384,8 @@ function love.load()
 				"Darnell",
 				"Lit Up",
 				"2hot",
-				"Blazin"
+				"Blazin",
+				{"Cutscene", false}
 			}
 		}
 	}
@@ -450,6 +451,8 @@ function love.load()
 	Gamestate.switch(menu)
 
 	love.setFpsCap(settings.fpsCap)
+
+	DO_SAVE_DATA = true
 end
 
 function love.resize(width, height)
@@ -497,21 +500,6 @@ function love.keypressed(key)
 		end)
 	elseif key == "7" and not love.keyboard.isDown("lalt") then
 		Gamestate.switch(debugMenu)
-	elseif key == "7" and love.keyboard.isDown("lalt") then
-		status.setLoading(true)
-        graphics:fadeOutWipe(
-            0.7,
-            function()
-                _psychmod = false
-                storyMode = false
-
-                music:stop()
-
-                Gamestate.switch(testData, songNum)
-
-                status.setLoading(false)
-            end
-        )
 	elseif key == "`" and love.keyboard.isDown("lalt") then
 		status.setLoading(true)
 		graphics:fadeOutWipe(

src/love/modules/Checkbox.lua

@@ -18,7 +18,6 @@ function Checkbox:new(x,y,checked)
 
     self:setGraphicSize(math.floor(0.9 * self.width))
 
-    --self.daValue = checked
     self:set_daValue(checked)
 
     return self

src/love/modules/Icon.lua

@@ -0,0 +1,74 @@
+return {
+    imagePath = function(path)
+        return graphics.imagePath("icons/icon-" .. path)
+    end,
+    newIcon = function(path, scale)
+        if not graphics.cache[path] then
+            graphics.cache[path] = love.graphics.newImage(path)
+        end
+        local img = graphics.cache[path]
+        local frameData = {
+            {x = 0, y = 0, width = img:getWidth()/2, height = img:getHeight(), offsetX = 0, offsetY = 0, offsetWidth = img:getWidth()/2, offsetHeight = img:getHeight(), rotated = false},
+            {x = img:getWidth()/2, y = 0, width = img:getWidth(), height = img:getHeight(), offsetX = 0, offsetY = 0, offsetWidth = img:getWidth()/2, offsetHeight = img:getHeight(), rotated = false}
+        }
+        local image, width, height
+        local frames = {}
+        local frame
+        local anims = {}
+        local quads = {}
+        for i, frame in ipairs(frameData) do
+            quads[i] = love.graphics.newQuad(frame.x, frame.y, frame.width, frame.height, img:getDimensions())
+        end
+        frame = quads[1]
+        local curFrame = 1
+        -- 2 frames, width = img:getWidth()/2, height = img:getHeight()
+        --{x = 212, y = 0, width = 68, height = 196, offsetX = 0, offsetY = 0, offsetWidth = 0, offsetHeight = 0, rotated = false}, -- <- example frame data
+
+        local object = {
+            x = 0,
+			y = 0,
+			orientation = 0,
+			sizeX = 1,
+			sizeY = 1,
+			offsetX = 0,
+			offsetY = 0,
+			shearX = 0,
+			shearY = 0,
+            scale = scale or 1,
+
+			scrollFactor = {x=1,y=1},
+
+            clipRect = nil,
+			stencilInfo = nil,
+
+			alpha = 1,
+
+            flipX = false,
+            visible = true,
+
+            setFrame = function(self, frameNum)
+                curFrame = frameNum
+                frame = quads[frameNum]
+            end,
+
+            getCurFrame = function(self)
+                return curFrame
+            end,
+
+            update = function(self, dt)
+
+            end,
+
+            draw = function(self)
+                if not self.visible then return end
+
+                local ox = frameData[curFrame].offsetWidth/2 + frameData[curFrame].offsetX
+                local oy = frameData[curFrame].offsetHeight/2 + frameData[curFrame].offsetY
+
+                love.graphics.draw(img, frame, self.x, self.y, self.orientation, self.sizeX * self.scale, self.sizeY * self.scale, ox, oy)
+            end
+        }
+
+        return object
+    end,
+}

src/love/modules/beatHandler.lua

@@ -61,8 +61,6 @@ function beatHandler.update(dt)
     beatHandler.isBeatHit = false
     beatHandler.curBeat = math.abs(math.floor((musicTime / 1000) * (beatHandler.bpm / 60)))
 
-
-
     if math.floor((musicTime / 1000) * (beatHandler.bpm / 60)) > 0 then
         if beatHandler.curBeat > beatHandler.lastBeat then
             beatHandler.isBeatHit = true

src/love/modules/camera.lua

@@ -18,8 +18,6 @@ camera.points = {}
 
 camera.mustHit = true
 
--- e stands for extra
-
 function camera:moveToMain(time, x, y)
     if camTimer then 
         Timer.cancel(camTimer)

src/love/modules/graphics.lua

@@ -204,6 +204,8 @@ return {
 			clipRect = nil,
 			stencilInfo = nil,
 
+			optionsTable = optionsTable or {},
+
 			alpha = 1,
 
 			icon = optionsTable and optionsTable.icon or "boyfriend",
@@ -524,15 +526,11 @@ return {
 						love.graphics.draw(
 							sheet,
 							frames[self.curFrame],
-							--[[ (frameData[self.curFrame].rotated and y or x),
-							(frameData[self.curFrame].rotated and x or y), ]]
 							x,
 							y,
 							self.orientation + (frameData[self.curFrame].rotated and -math.rad(90) or 0),
 							self.sizeX * (self.flipX and -1 or 1),
 							self.sizeY,
-							--[[ (frameData[self.curFrame].rotated and oy or ox),
-							(frameData[self.curFrame].rotated and ox or oy), ]]
 							ox,
 							oy,
 							self.shearX,

src/love/sprites/characters/bfAndGF.lua

@@ -344,6 +344,6 @@ return graphics.newSprite(
 	{
 		sing_duration = 4,
 		isCharacter = true,
-		icon = "boyfriend"
+		icon = "bf"
 	}
 )

src/love/sprites/characters/boyfriend-car.lua

@@ -312,6 +312,7 @@ return graphics.newSprite(
 	false,
 	{
 		sing_duration = 4,
-		isCharacter = true
+		isCharacter = true,
+		icon = "bf"
 	}
 )

src/love/sprites/characters/boyfriend-christmas.lua

@@ -334,6 +334,6 @@ return graphics.newSprite(
 	{
 		sing_duration = 4,
 		isCharacter = true,
-		icon = "boyfriend"
+		icon = "bf",
 	}
 )

src/love/sprites/characters/boyfriend-pixel.lua

@@ -164,6 +164,7 @@ return graphics.newSprite(
 	{
 		sing_duration = 4,
 		isCharacter = true,
-		icon = "boyfriend (pixel)"
+		icon = "bf-pixel",
+		scale = 5
 	}
 )

src/love/sprites/characters/boyfriend.lua

@@ -540,6 +540,6 @@ return graphics.newSprite(
 	{
 		sing_duration = 4,
 		isCharacter = true,
-		icon = "boyfriend"
+		icon = "bf"
 	}
 )

src/love/sprites/characters/dearest-duo.lua

@@ -172,6 +172,6 @@ return graphics.newSprite(
 	{
 		sing_duration = 4,
 		isCharacter = true,
-		icon = "dearest duo"
+		icon = "parents-christmas"
 	}
 )

src/love/sprites/characters/mommy-mearest.lua

@@ -103,6 +103,6 @@ return graphics.newSprite(
 	{
 		sing_duration = 4,
 		isCharacter = true,
-		icon = "mommy mearest"
+		icon = "mom"
 	}
 )

src/love/sprites/characters/senpai-angry.lua

@@ -103,6 +103,7 @@ return graphics.newSprite(
 	{
 		sing_duration = 4,
 		isCharacter = true,
-		icon = "senpai"
+		icon = "senpai",
+		scale = 5
 	}
 )

src/love/sprites/characters/senpai.lua

@@ -118,6 +118,7 @@ return graphics.newSprite(
 	{
 		sing_duration = 4,
 		isCharacter = true,
-		icon = "senpai"
+		icon = "senpai",
+		scale = 5
 	}
 )

src/love/sprites/characters/skid-and-pump.lua

@@ -120,6 +120,6 @@ return graphics.newSprite(
 	{
 		sing_duration = 4,
 		isCharacter = true,
-		icon = "skid and pump"
+		icon = "spooky"
 	}
 )

src/love/sprites/characters/spirit.lua

@@ -135,6 +135,7 @@ return graphics.newSprite(
 	{
 		sing_duration = 4,
 		isCharacter = true,
-		icon = "spirit"
+		icon = "spirit",
+		scale = 5
 	}
 )