6 files changed, 26 insertions, 1 deletions

@@ -344,3 +344,12 @@ function StopBobbing(spriteName)
   local sprite = getSprite(spriteId)
   sprite.bobsWhenNormal = false
 end
+
+--- Sets the animation slowdown for a sprite.
+-- @param spriteName the alias of the sprite to modify
+-- @param amount the number of animation frames needed to advance the sprite's animation (1 means the effect is disabled)
+function SetAnimationSlowdown(spriteName, amount)
+  local spriteId = getSpriteByAlias(spriteName)
+  local sprite = getSprite(spriteId)
+  sprite.animSlowdown = amount
+end
@@ -3,6 +3,7 @@ underwater = {}
 function underwater.leave()
   AllowCrouching()
   StopBobbing("lucas")
+  SetAnimationSlowdown("lucas", 1)
 end
 
 function underwater.fish2()
@@ -3,6 +3,7 @@ underwater_start = {}
 function underwater_start.init()
   PreventCrouching()
   StartBobbing("lucas")
+  SetAnimationSlowdown("lucas", 2)
 end
 
 function underwater_start.talk_to_fish1()
@@ -120,6 +120,16 @@ void AnimationSystem::tick(double dt) {
             sprite.animations[sprite.animationId].timerNum == timerNum &&
             !sprite.animFinished &&
             !sprite.animPaused) {
+          if (sprite.animSlowdown > 1) {
+            sprite.animSlowdownProgress++;
+
+            if (sprite.animSlowdownProgress == sprite.animSlowdown) {
+              sprite.animSlowdownProgress = 0;
+            } else {
+              continue;
+            }
+          }
+
           sprite.animationFrame++;
 
           if (sprite.animationFrame >= sprite.animations[sprite.animationId].frameIndices.size()) {
@@ -177,4 +187,5 @@ void AnimationSystem::updateAnimation(int spriteId) {
   sprite.animationFrame = 0;
   sprite.animFinished = false;
   sprite.animPaused = false;
+  sprite.animSlowdownProgress = 0;
 }
@@ -41,7 +41,8 @@ ScriptSystem::ScriptSystem(Game& game) : game_(game) {
     "paused", &Sprite::paused,
     "clipping", &Sprite::clipping,
     "cantCrouch", &Sprite::cantCrouch,
-    "bobsWhenNormal", &Sprite::bobsWhenNormal);
+    "bobsWhenNormal", &Sprite::bobsWhenNormal,
+    "animSlowdown", &Sprite::animSlowdown);
 
   engine_.new_usertype<MessageSystem>(
     "message",
@@ -78,11 +78,13 @@ public:
   bool hasShadow = false;
   int bobAmount = 0;
   bool bobbingDown = false;
+  int animSlowdownProgress = 0;
 
   // Animation (controls)
   bool normallyHasShadow = false;
   bool animPaused = false;
   bool bobbing = false;
+  int animSlowdown = 1; // Animation will only advance every X frames (so, 1 means it's disabled)
 
   // Character
   bool orientable = false;