diff --git a/src/love/images/dds/menu/menu_mods.dds b/src/love/images/dds/menu/menu_mods.dds new file mode 100644 index 00000000..fdee1663 Binary files /dev/null and b/src/love/images/dds/menu/menu_mods.dds differ diff --git a/src/love/images/dds/week7/tank0.dds b/src/love/images/dds/week7/tank0.dds index 045c663d..dbfee439 100644 Binary files a/src/love/images/dds/week7/tank0.dds and b/src/love/images/dds/week7/tank0.dds differ diff --git a/src/love/images/dds/week7/tank1.dds b/src/love/images/dds/week7/tank1.dds index ba87b945..7877da04 100644 Binary files a/src/love/images/dds/week7/tank1.dds and b/src/love/images/dds/week7/tank1.dds differ diff --git a/src/love/images/dds/week7/tank2.dds b/src/love/images/dds/week7/tank2.dds index 30ff8526..1910ffc5 100644 Binary files a/src/love/images/dds/week7/tank2.dds and b/src/love/images/dds/week7/tank2.dds differ diff --git a/src/love/images/dds/week7/tank3.dds b/src/love/images/dds/week7/tank3.dds index ff0d35e9..1978e309 100644 Binary files a/src/love/images/dds/week7/tank3.dds and b/src/love/images/dds/week7/tank3.dds differ diff --git a/src/love/images/dds/week7/tank4.dds b/src/love/images/dds/week7/tank4.dds index ebf332f0..4fdfe185 100644 Binary files a/src/love/images/dds/week7/tank4.dds and b/src/love/images/dds/week7/tank4.dds differ diff --git a/src/love/images/dds/week7/tank5.dds b/src/love/images/dds/week7/tank5.dds index 590c0333..13bdcb39 100644 Binary files a/src/love/images/dds/week7/tank5.dds and b/src/love/images/dds/week7/tank5.dds differ diff --git a/src/love/images/dds/week7/tankGround.dds b/src/love/images/dds/week7/tankGround.dds index 46db66f6..3c10c3d0 100644 Binary files a/src/love/images/dds/week7/tankGround.dds and b/src/love/images/dds/week7/tankGround.dds differ diff --git a/src/love/images/dds/week7/tankSky.dds b/src/love/images/dds/week7/tankSky.dds index 647382dc..f9648b22 100644 Binary files a/src/love/images/dds/week7/tankSky.dds and b/src/love/images/dds/week7/tankSky.dds differ diff --git a/src/love/images/png/week7/tank0.png b/src/love/images/png/week7/tank0.png index ed98947d..d3387f66 100644 Binary files a/src/love/images/png/week7/tank0.png and b/src/love/images/png/week7/tank0.png differ diff --git a/src/love/images/png/week7/tank1.png b/src/love/images/png/week7/tank1.png index d1cc80ba..ad82dec4 100644 Binary files a/src/love/images/png/week7/tank1.png and b/src/love/images/png/week7/tank1.png differ diff --git a/src/love/images/png/week7/tank2.png b/src/love/images/png/week7/tank2.png index b59a6cf6..15f280e3 100644 Binary files a/src/love/images/png/week7/tank2.png and b/src/love/images/png/week7/tank2.png differ diff --git a/src/love/images/png/week7/tank3.png b/src/love/images/png/week7/tank3.png index 8851921f..d3281b86 100644 Binary files a/src/love/images/png/week7/tank3.png and b/src/love/images/png/week7/tank3.png differ diff --git a/src/love/images/png/week7/tank4.png b/src/love/images/png/week7/tank4.png index 76e55347..a111eef4 100644 Binary files a/src/love/images/png/week7/tank4.png and b/src/love/images/png/week7/tank4.png differ diff --git a/src/love/images/png/week7/tank5.png b/src/love/images/png/week7/tank5.png index 484e15d6..b955747c 100644 Binary files a/src/love/images/png/week7/tank5.png and b/src/love/images/png/week7/tank5.png differ diff --git a/src/love/images/png/week7/tankGround.png b/src/love/images/png/week7/tankGround.png index be495f83..956b9e9e 100644 Binary files a/src/love/images/png/week7/tankGround.png and b/src/love/images/png/week7/tankGround.png differ diff --git a/src/love/images/png/week7/tankSky.png b/src/love/images/png/week7/tankSky.png index 6fa685ce..9a0a6207 100644 Binary files a/src/love/images/png/week7/tankSky.png and b/src/love/images/png/week7/tankSky.png differ diff --git a/src/love/modules/graphics.lua b/src/love/modules/graphics.lua index 5ab32bda..1a8b3eb5 100644 --- 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 index 2067ad7a..907bda99 100644 --- 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