6 files changed, 71 insertions, 3 deletions

@@ -131,6 +131,14 @@ function WaitForMapFade()
   end
 end
 
+function ShakeCamera(period)
+  effect():shakeCamera(period)
+end
+
+function StopShakingCamera()
+  effect():stopShakingCamera()
+end
+
 function SetPartyDirection(spriteId, direction)
   animation():setSpriteDirection(spriteId, direction)
 
@@ -26,6 +26,15 @@ end
 
 function map2.mailbox_lightning()
   StartCutscene()
+  DisplayMessage("* The mailbox lid is open...\n* Peek inside?", "", SpeakerType.NONE)
+  ShowChoice("Yes", "No")
+  WaitForEndOfMessage()
+
+  if GetChoiceSelection() == 1 then
+    HideCutsceneBars()
+    return
+  end
+
   FadeMap(500, 0.5)
   WaitForMapFade()
 
@@ -38,11 +47,13 @@ function map2.mailbox_lightning()
   local lucasPos = GetPosition("lucas")
   CreateAnimatedSpriteAtPosition("lightning_from_mailbox", "lightning", lucasPos:x() + 56, lucasPos:y() - 72, "strike", Direction.DOWN_LEFT, SpriteLayer.ABOVE)
 
+  ShakeCamera(66)
   PlaySound("lightning_explosion.wav")
   SetDirection("lucas", Direction.DOWN)
   SetAnimation("lucas", "lightning_electrocute!")
   WaitForAnimation("lucas")
 
+  StopShakingCamera()
   DestroyNamedSprite("lightning_from_mailbox")
   SetAnimation("lucas", "lightning_collapse!")
   WaitForAnimation("lucas")
@@ -18,6 +18,22 @@ void EffectSystem::tick(double dt) {
 
     mapFade_ = (mapFadeDest_ - mapFadeStart_) / mapFadeLength_ * mapFadeThus_ + mapFadeStart_;
   }
+
+  if (cameraShaking_) {
+    cameraShakeTimer_.accumulate(dt);
+
+    while (cameraShakeTimer_.step()) {
+      cameraShakeOn_ = !cameraShakeOn_;
+    }
+
+    if (cameraShakeOn_) {
+      cameraShakeOffset_.x() = 8;
+      cameraShakeOffset_.y() = 8;
+    } else {
+      cameraShakeOffset_.x() = 0;
+      cameraShakeOffset_.y() = 0;
+    }
+  }
 }
 
 void EffectSystem::fadeScreen(int length, double amount) {
@@ -33,3 +49,15 @@ void EffectSystem::fadeMap(int length, double amount) {
   mapFadeLength_ = length;
   mapFadeThus_ = 0;
 }
+
+void EffectSystem::shakeCamera(int period) {
+  cameraShaking_ = true;
+  cameraShakeOffset_ = { 0, 0 };
+  cameraShakeOn_ = false;
+  cameraShakeTimer_ = Timer(period);
+}
+
+void EffectSystem::stopShakingCamera() {
+  cameraShaking_ = false;
+  cameraShakeOffset_ = { 0, 0 };
+}
@@ -2,6 +2,8 @@
 #define EFFECT_SYSTEM_H_0B497B39
 
 #include "system.h"
+#include "timer.h"
+#include "vector.h"
 
 class Game;
 
@@ -26,6 +28,12 @@ public:
   // - amount is [0,1]
   void fadeMap(int length, double amount);
 
+  // Shakes the viewport by 1 tile in both directions.
+  // - period is in milliseconds, it's actually a half period
+  void shakeCamera(int period);
+
+  void stopShakingCamera();
+
   /* Information */
 
   bool isScreenFaded() const { return screenFade_ > 0.0; }
@@ -40,6 +48,10 @@ public:
 
   bool isMapFadeComplete() const { return mapFade_ == mapFadeDest_; }
 
+  const vec2i& getCameraShakeOffset() const { return cameraShakeOffset_; }
+
+  bool isCameraShaking() const { return cameraShaking_; }
+
 private:
 
   Game& game_;
@@ -55,6 +67,11 @@ private:
   double mapFadeStart_ = 0.0;
   double mapFadeLength_ = 0.0;
   double mapFadeThus_ = 0.0;
+
+  bool cameraShaking_ = false;
+  vec2i cameraShakeOffset_ { 0, 0 };
+  bool cameraShakeOn_ = false;
+  Timer cameraShakeTimer_ { 0 };
 };
 
 #endif /* end of include guard: EFFECT_SYSTEM_H_0B497B39 */
@@ -194,9 +194,11 @@ void Renderer::render(Game& game) {
     renderSprite(sprite);
   }
 
+  vec2i viewport = game.getSystem<CameraSystem>().getCameraPosition() + effects.getCameraShakeOffset();
+
   SDL_Rect cameraField {
-    game.getSystem<CameraSystem>().getCameraPosition().x(),
-    game.getSystem<CameraSystem>().getCameraPosition().y(),
+    viewport.x(),
+    viewport.y(),
     game.getSystem<CameraSystem>().getFieldOfView().w(),
     game.getSystem<CameraSystem>().getFieldOfView().h()
   };
@@ -59,7 +59,9 @@ ScriptSystem::ScriptSystem(Game& game) : game_(game) {
     "fadeScreen", &EffectSystem::fadeScreen,
     "isScreenFadeComplete", &EffectSystem::isScreenFadeComplete,
     "fadeMap", &EffectSystem::fadeMap,
-    "isMapFadeComplete", &EffectSystem::isMapFadeComplete);
+    "isMapFadeComplete", &EffectSystem::isMapFadeComplete,
+    "shakeCamera", &EffectSystem::shakeCamera,
+    "stopShakingCamera", &EffectSystem::stopShakingCamera);
 
   engine_.new_usertype<Mixer>(
     "mixer",