Post-April-Fools fixes

htv04 · Apr 3, 2022 · cbb82e0 · cbb82e0
1 parent ccc0fe2
commit cbb82e0
Show file tree

Hide file tree

Showing 25 changed files with 176 additions and 24 deletions.
diff --git a/src/love/IMAGES/ARROWS.PNG b/src/love/IMAGES/ARROWS.PNG
diff --git a/src/love/IMAGES/BF.PNG b/src/love/IMAGES/BF.PNG
diff --git a/src/love/IMAGES/BFDEAD.PNG b/src/love/IMAGES/BFDEAD.PNG
diff --git a/src/love/IMAGES/GF.PNG b/src/love/IMAGES/GF.PNG
diff --git a/src/love/IMAGES/ICONS.PNG b/src/love/IMAGES/ICONS.PNG
diff --git a/src/love/IMAGES/SENPAI.PNG b/src/love/IMAGES/SENPAI.PNG
diff --git a/src/love/IMAGES/TITLEBG.PNG b/src/love/IMAGES/TITLEBG.PNG
diff --git a/src/love/IMAGES/WEEB1.PNG b/src/love/IMAGES/WEEB1.PNG
diff --git a/src/love/IMAGES/WEEB2.PNG b/src/love/IMAGES/WEEB2.PNG
diff --git a/src/love/IMAGES/WEEB3.PNG b/src/love/IMAGES/WEEB3.PNG
diff --git a/src/love/MENU.LUA b/src/love/MENU.LUA
@@ -27,8 +27,8 @@ local weekIDs = {
 local weekSongs = {
 	{
 		"Senpai",
-		"Roses",
-		"Thorns"
+		"Roses"
+		-- "Thorns" -- Broken
 	}
 }
 local difficultyStrs = {
@@ -50,7 +50,7 @@ menu = {
 
 		titleBG.x, titleBG.y = 160, 100
 
-		girlfriendTitle.x, girlfriendTitle.y = 160, 90
+		girlfriendTitle.x, girlfriendTitle.y = 160, 80
 
 		music:setLooping(true)
 		music:play()

diff --git a/src/love/MUSIC/FREAKY.OGG b/src/love/MUSIC/FREAKY.OGG
diff --git a/src/love/MUSIC/ROSE-V.OGG b/src/love/MUSIC/ROSE-V.OGG
diff --git a/src/love/MUSIC/ROSES-I.OGG b/src/love/MUSIC/ROSES-I.OGG
diff --git a/src/love/MUSIC/SENPAI-I.OGG b/src/love/MUSIC/SENPAI-I.OGG
diff --git a/src/love/MUSIC/SENPAI-V.OGG b/src/love/MUSIC/SENPAI-V.OGG
diff --git a/src/love/MUSIC/THORNS-I.OGG b/src/love/MUSIC/THORNS-I.OGG
diff --git a/src/love/MUSIC/THORNS-V.OGG b/src/love/MUSIC/THORNS-V.OGG
diff --git a/src/love/SPRITES/BF.LUA b/src/love/SPRITES/BF.LUA
@@ -18,7 +18,7 @@ along with this program.  If not, see <https://www.gnu.org/licenses/>.
 ------------------------------------------------------------------------------]]
 
 return Sprite (
-	love.graphics.newImage("IMAGES/BF.PNG"),
+	love.graphics.newImage("images/bf.png"),
 	-- Automatically generated from bfPixel.xml
 	{
 		{x = 166, y = 0, width = 73, height = 73, offsetX = 0, offsetY = 0, offsetWidth = 0, offsetHeight = 0}, -- 1: BF DOWN MISS instance 10000

diff --git a/src/love/SPRITES/BFDEAD.LUA b/src/love/SPRITES/BFDEAD.LUA
diff --git a/src/love/SPRITES/GF.LUA b/src/love/SPRITES/GF.LUA
@@ -18,7 +18,7 @@ along with this program.  If not, see <https://www.gnu.org/licenses/>.
 ------------------------------------------------------------------------------]]
 
 return Sprite (
-	love.graphics.newImage("IMAGES/GF.PNG"),
+	love.graphics.newImage("images/gf.png"),
 	-- Automatically generated from gfPixel.xml
 	{
 		{x = 0, y = 0, width = 120, height = 106, offsetX = 0, offsetY = 0, offsetWidth = 0, offsetHeight = 0}, -- 1: GF IDLE0000

diff --git a/src/love/SPRITES/SENPAI.LUA b/src/love/SPRITES/SENPAI.LUA
@@ -18,7 +18,7 @@ along with this program.  If not, see <https://www.gnu.org/licenses/>.
 ------------------------------------------------------------------------------]]
 
 return Sprite (
-	love.graphics.newImage("IMAGES/SENPAI.PNG"),
+	love.graphics.newImage("images/senpai.png"),
 	{
 		{x = 1755, y = 0, width = 125, height = 163, offsetX = 0, offsetY = 0, offsetWidth = 0, offsetHeight = 0}, -- 1: SENPAI DOWN NOTE instance 10000
 		{x = 1755, y = 0, width = 125, height = 163, offsetX = 0, offsetY = 0, offsetWidth = 0, offsetHeight = 0}, -- 2: SENPAI DOWN NOTE instance 10001

diff --git a/src/love/SPRITES/SENPAI2.LUA b/src/love/SPRITES/SENPAI2.LUA
@@ -18,7 +18,7 @@ along with this program.  If not, see <https://www.gnu.org/licenses/>.
 ------------------------------------------------------------------------------]]
 
 return Sprite (
-	love.graphics.newImage("IMAGES/SENPAI.PNG"),
+	love.graphics.newImage("images/senpai.png"),
 	{
 		{x = 0, y = 0, width = 125, height = 164, offsetX = 0, offsetY = 0, offsetWidth = 0, offsetHeight = 0}, -- 1: Angry Senpai DOWN NOTE instance 10000
 		{x = 0, y = 0, width = 125, height = 164, offsetX = 0, offsetY = 0, offsetWidth = 0, offsetHeight = 0}, -- 2: Angry Senpai DOWN NOTE instance 10001

diff --git a/src/love/WEEKS.LUA b/src/love/WEEKS.LUA
@@ -48,6 +48,7 @@ weeks = {
 
 		girlfriend = lovedos.filesystem.load("sprites/gf.lua")()
 		boyfriend = lovedos.filesystem.load("sprites/bf.lua")()
+		fakeBoyfriend = lovedos.filesystem.load("sprites/bfdead.lua")()
 
 		enemyIcon = sprites["icons"]()
 		boyfriendIcon = sprites["icons"]()
@@ -284,8 +285,8 @@ weeks = {
 		if not y then y = 0 end
 		if not offset then offset = 1 end
 
-		object.x = cam.x * offset + 160 + x
-		object.y = cam.y * offset + 100 + y
+		object.x = 160 + cam.x * offset + x
+		object.y = 100 + cam.y * offset + y
 	end,
 
 	updateUI = function(dt)
@@ -407,19 +408,18 @@ weeks = {
 		if health > 100 then
 			health = 100
 		elseif health <= 0 then -- Game over, yeah!
+			inst:stop()
+			voices:stop()
+
 			gameOver = true
 
-			if weekNum == 1 then -- TODO: Make this less gross
-				fakeBoyfriend:animate("dies", false)
-			else
-				boyfriend:animate("dies", false)
-			end
+			fakeBoyfriend:animate("dies", false)
 
 			Timer.clear()
 			Timer.tween(
 				2,
 				cam,
-				{x = -boyfriend.x, y = -boyfriend.y},
+				{x = -50, y = -30}, -- Gross hack
 				"out-quad",
 				function()
 					fakeBoyfriend:animate("dead", true)

diff --git a/src/love/WEEKS/WEEK6.LUA b/src/love/WEEKS/WEEK6.LUA
@@ -73,23 +73,17 @@ weeks[1] = {
 
 		if gameOver then
 			if input:pressed("confirm") then
-				inst:stop()
-				inst = love.audio.newSource("music/g-over2.wav", "stream")
-				inst:play()
-
 				Timer.clear()
 
-				cam.x, cam.y = -boyfriend.x, -boyfriend.y
-
-				boyfriend:animate("dead confirm", false)
+				cam.x, cam.y = 25, 0
 
 				weeks[1].load()
 			elseif input:pressed("gameBack") then
 				weeks[1].stop()
 			end
 
 			fakeBoyfriend:update(dt)
-			weeks.syncCamera(fakeBoyfriend, 0, 0)
+			weeks.syncCamera(fakeBoyfriend, 50, 30)
 
 			return
 		end
@@ -134,7 +128,7 @@ weeks[1] = {
 		enemyFrameTimer = enemyFrameTimer + 24 * dt
 
 		if not voices:isPlaying() then
-			if storyMode and songNum < 3 then
+			if storyMode and songNum < 2 then -- Thorns is broken
 				songNum = songNum + 1
 			else
 				graphics.fadeOut(1, weeks[1].stop)