Fix gf idle dance left and right being swapped

VanillaEngineDevs · Jun 12, 2024 · 7de5ba8 · 7de5ba8
1 parent f6aa0a2
commit 7de5ba8
Show file tree

Hide file tree

Showing 19 changed files with 7 additions and 5 deletions.
diff --git a/src/love/images/dds/menu/menu_mods.dds b/src/love/images/dds/menu/menu_mods.dds
diff --git a/src/love/images/dds/week7/tank0.dds b/src/love/images/dds/week7/tank0.dds
diff --git a/src/love/images/dds/week7/tank1.dds b/src/love/images/dds/week7/tank1.dds
diff --git a/src/love/images/dds/week7/tank2.dds b/src/love/images/dds/week7/tank2.dds
diff --git a/src/love/images/dds/week7/tank3.dds b/src/love/images/dds/week7/tank3.dds
diff --git a/src/love/images/dds/week7/tank4.dds b/src/love/images/dds/week7/tank4.dds
diff --git a/src/love/images/dds/week7/tank5.dds b/src/love/images/dds/week7/tank5.dds
diff --git a/src/love/images/dds/week7/tankGround.dds b/src/love/images/dds/week7/tankGround.dds
diff --git a/src/love/images/dds/week7/tankSky.dds b/src/love/images/dds/week7/tankSky.dds
diff --git a/src/love/images/png/week7/tank0.png b/src/love/images/png/week7/tank0.png
diff --git a/src/love/images/png/week7/tank1.png b/src/love/images/png/week7/tank1.png
diff --git a/src/love/images/png/week7/tank2.png b/src/love/images/png/week7/tank2.png
diff --git a/src/love/images/png/week7/tank3.png b/src/love/images/png/week7/tank3.png
diff --git a/src/love/images/png/week7/tank4.png b/src/love/images/png/week7/tank4.png
diff --git a/src/love/images/png/week7/tank5.png b/src/love/images/png/week7/tank5.png
diff --git a/src/love/images/png/week7/tankGround.png b/src/love/images/png/week7/tankGround.png
diff --git a/src/love/images/png/week7/tankSky.png b/src/love/images/png/week7/tankSky.png
diff --git a/src/love/modules/graphics.lua b/src/love/modules/graphics.lua
@@ -480,9 +480,9 @@ return {
 							if (not self:isAnimated() and util.startsWith(self:getAnimName(), "sing")) or (self:getAnimName() == "danceLeft" or self:getAnimName() == "danceRight" or (not self:isAnimated() and self:getAnimName() == "sad")) then
 								self.danced = not self.danced
 								if not self.danced then
-									self:animate("danceLeft", false)
-								else
 									self:animate("danceRight", false)
+								else
+									self:animate("danceLeft", false)
 								end	
 							end
 						end

diff --git a/src/love/states/weeks.lua b/src/love/states/weeks.lua
@@ -671,9 +671,11 @@ return {
 		musicThres = 0
 
 		countingDown = true
-		if girlfriend then girlfriend:beat(countNumVal) end
-		if boyfriend then boyfriend:beat(countNumVal) end
-		if enemy then enemy:beat(countNumVal) end
+		if countNumVal % 2 == 1 then
+			if girlfriend then girlfriend:beat(countNumVal) end
+			if boyfriend then boyfriend:beat(countNumVal) end
+			if enemy then enemy:beat(countNumVal) end
+		end
 		if CONSTANTS.WEEKS.COUNTDOWN_SOUNDS[countNumVal] then audio.playSound(sounds.countdown[CONSTANTS.WEEKS.COUNTDOWN_SOUNDS[countNumVal]]) end
 		if countNumVal == 4 then 
 			countdownFade[1] = 0