From c5216334f6fed0bc887a57d00df2e60a182a43c3 Mon Sep 17 00:00:00 2001 From: HTV04 <53527582+HTV04@users.noreply.github.com> Date: Wed, 4 Aug 2021 00:13:15 -0400 Subject: [PATCH] More v1.0.1 --- src/love/menu.lua | 4 ---- src/love/sprites/week4/limo-dancer.lua | 2 +- src/love/weeks/week2.lua | 6 ++++++ src/love/weeks/week4.lua | 6 ++++++ src/love/weeks/week5.lua | 2 +- 5 files changed, 14 insertions(+), 6 deletions(-) diff --git a/src/love/menu.lua b/src/love/menu.lua index e431bc22..065701dd 100644 --- a/src/love/menu.lua +++ b/src/love/menu.lua @@ -249,10 +249,6 @@ return { end love.graphics.pop() love.graphics.pop() - - if isLoading then - love.graphics.print("Loading...", lovesize.getWidth() - 175, lovesize.getHeight() - 50) - end end, leave = function(self) diff --git a/src/love/sprites/week4/limo-dancer.lua b/src/love/sprites/week4/limo-dancer.lua index 600f1fec..117ce58d 100644 --- a/src/love/sprites/week4/limo-dancer.lua +++ b/src/love/sprites/week4/limo-dancer.lua @@ -56,5 +56,5 @@ return Sprite ( ["anim"] = {start = 1, stop = 30, speed = 24, offsetX = 0, offsetY = 0} }, "anim", - true + false ) diff --git a/src/love/weeks/week2.lua b/src/love/weeks/week2.lua index d870260d..bafb6681 100644 --- a/src/love/weeks/week2.lua +++ b/src/love/weeks/week2.lua @@ -110,6 +110,12 @@ return { weeks:safeAnimate(boyfriend, "shaking", true, 3) end + if musicThres ~= oldMusicThres and math.fmod(musicTime, 60000 / bpm) < 100 then + if enemy.anim.name == "idle" then + enemy.anim.speed = 14.4 / (120 / bpm) + end + end + if health >= 80 then if enemyIcon.anim.name == "skid and pump" then enemyIcon:animate("skid and pump losing", false) diff --git a/src/love/weeks/week4.lua b/src/love/weeks/week4.lua index eb97125e..8b742bab 100644 --- a/src/love/weeks/week4.lua +++ b/src/love/weeks/week4.lua @@ -170,6 +170,12 @@ return { limoDancer:update(dt) limo:update(dt) + if musicThres ~= oldMusicThres and math.fmod(musicTime, 120000 / bpm) < 100 then + limoDancer:animate("anim", false) + + limoDancer.anim.speed = 14.4 / (60 / bpm) + end + if health >= 80 then if enemyIcon.anim.name == "mommy mearest" then enemyIcon:animate("mommy mearest losing", false) diff --git a/src/love/weeks/week5.lua b/src/love/weeks/week5.lua index 2ce791da..41812398 100644 --- a/src/love/weeks/week5.lua +++ b/src/love/weeks/week5.lua @@ -283,7 +283,7 @@ return { if gameOver then return end love.graphics.push() - love.graphics.translate(lovesize.getWidth() / 2, lovesize.getHeight() / 2) + love.graphics.translate(lovesize.getWidth() / 2, lovesize.getHeight() / 2) love.graphics.scale(cam.sizeX, cam.sizeY) love.graphics.push()