Added non-looping animations

Lucas can get electrocuted now.

8 files changed, 67 insertions, 13 deletions

@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<map version="1.4" tiledversion="1.4.3" orientation="orthogonal" renderorder="right-down" width="64" height="64" tilewidth="16" tileheight="16" infinite="0" nextlayerid="3" nextobjectid="5">
+<map version="1.4" tiledversion="1.4.3" orientation="orthogonal" renderorder="right-down" width="64" height="64" tilewidth="16" tileheight="16" infinite="0" nextlayerid="3" nextobjectid="6">
  <tileset firstgid="1" name="fromRom" tilewidth="16" tileheight="16" tilecount="180" columns="10">
   <image source="map2_tiles.png" width="160" height="288"/>
   <tile id="61">
@@ -651,6 +651,12 @@
    </properties>
    <point/>
   </object>
+  <object id="5" name="mailbox_lightning" type="tileSprite" x="519" y="422.667">
+   <properties>
+    <property name="interactionScript" value="mailbox_lightning"/>
+   </properties>
+   <point/>
+  </object>
  </objectgroup>
  <layer id="1" name="Layer 0" width="64" height="64">
   <data encoding="csv">
@@ -59,11 +59,24 @@ function HideCutsceneBars()
   playerSprite.controllable = true
 end
 
+function SetDirection(spriteName, dir)
+  local spriteId = getSpriteByAlias(spriteName)
+  animation():setSpriteDirection(spriteId, dir)
+end
+
 function SetAnimation(spriteName, animName)
   local spriteId = getSpriteByAlias(spriteName)
   animation():setSpriteAnimation(spriteId, animName)
 end
 
+function WaitForAnimation(spriteName)
+  local spriteId = getSpriteByAlias(spriteName)
+  local sprite = getSprite(spriteId)
+  repeat
+    coroutine.yield()
+  until sprite.animFinished
+end
+
 function PlaySound(filename)
   mixer():playSound("../res/sfx/" .. filename)
 end
@@ -23,3 +23,17 @@ function map2.mailbox1()
 
   HideCutsceneBars()
 end
+
+function map2.mailbox_lightning()
+  StartCutscene()
+  DisplayMessage("* ...?", "", SpeakerType.NONE)
+  WaitForEndOfMessage()
+
+  SetDirection("lucas", Direction.DOWN)
+  SetAnimation("lucas", "electrocute!")
+  WaitForAnimation("lucas")
+
+  DisplayMessage("* It was lightning.\n\fAh.", "", SpeakerType.NONE)
+  WaitForEndOfMessage()
+  HideCutsceneBars()
+end
@@ -31,4 +31,5 @@ run[up_left]: 70,78,86,94
 run[up]: 71,79,87,95
 run[up_right]: 72,80,88,96
 run[right]: 73,81,89,97
-run[down_right]: 74,82,90,98
\ No newline at end of file
+run[down_right]: 74,82,90,98
+electrocute![down]: 116,117,118,116,117,118,116,117,118,119,120,121,122
\ No newline at end of file
@@ -65,21 +65,26 @@ void AnimationSystem::initSprite(int spriteId, std::string_view filename) {
   std::string animLine;
   std::getline(datafile, animLine); // blank
   while (std::getline(datafile, animLine)) {
-    std::regex re(R"(([a-z]+)\[([a-z_]+)\]: ([0-9,]+))");
+    std::regex re(R"(([a-z!]+)\[([a-z_]+)\]: ([0-9,]+))");
     std::smatch m;
     std::regex_match(animLine, m, re);
 
-    std::vector<int> frames;
+    std::string animName = m[1];
+    Animation anim;
     auto framestrs = splitStr<std::list<std::string>>(m[3], ",");
     for (const std::string& f : framestrs) {
-      frames.push_back(std::stoi(f));
+      anim.frameIndices.push_back(std::stoi(f));
+    }
+
+    if (animName.back() == '!') {
+      anim.looping = false;
     }
 
     int animId = sprite.animations.size();
-    sprite.animations.push_back(std::move(frames));
+    sprite.animations.push_back(std::move(anim));
 
     Direction dir = directionFromString(std::string(m[2]));
-    sprite.nameDirToAnim[m[1]][dir] = animId;
+    sprite.nameDirToAnim[animName][dir] = animId;
   }
 
   updateAnimation(spriteId);
@@ -89,10 +94,17 @@ void AnimationSystem::tick(double dt) {
   animTimer_.accumulate(dt);
   while (animTimer_.step()) {
     for (Sprite& sprite : game_.getSprites() | game_.spriteView()) {
-      if (sprite.isAnimated) {
+      if (sprite.isAnimated && !sprite.animFinished) {
         sprite.animationFrame++;
-        if (sprite.animationFrame >= sprite.animations[sprite.animationId].size()) {
-          sprite.animationFrame = 0;
+        if (sprite.animations[sprite.animationId].looping) {
+          if (sprite.animationFrame >= sprite.animations[sprite.animationId].frameIndices.size()) {
+            sprite.animationFrame = 0;
+          }
+        } else {
+          if (sprite.animationFrame >= sprite.animations[sprite.animationId].frameIndices.size() - 1) {
+            sprite.animationFrame = sprite.animations[sprite.animationId].frameIndices.size() - 1;
+            sprite.animFinished = true;
+          }
         }
       }
     }
@@ -119,4 +131,5 @@ void AnimationSystem::updateAnimation(int spriteId) {
   Sprite& sprite = game_.getSprite(spriteId);
   sprite.animationId = sprite.nameDirToAnim[sprite.animationName][sprite.dir];
   sprite.animationFrame = 0;
+  sprite.animFinished = false;
 }
@@ -130,7 +130,7 @@ void Renderer::render(Game& game) {
         SDL_RenderCopy(ren_.get(), textures_.at(shadowTexId).get(), nullptr, &shadowDest);
       }
 
-      const SpriteFrame& frame = sprite.frames.at(sprite.animations.at(sprite.animationId).at(sprite.animationFrame));
+      const SpriteFrame& frame = sprite.frames.at(sprite.animations.at(sprite.animationId).frameIndices.at(sprite.animationFrame));
       const SDL_Rect& src = frame.srcRect;
       SDL_Rect dest { sprite.loc.x() - frame.center.x(), sprite.loc.y() - frame.center.y(), frame.size.w(), frame.size.h() };
       SDL_RenderCopy(ren_.get(), textures_.at(loadImageFromFile(sprite.spritesheet)).get(), &src, &dest);
@@ -16,7 +16,8 @@ ScriptSystem::ScriptSystem(Game& game) : game_(game) {
     "dir", &Sprite::dir,
     "followers", &Sprite::followers,
     "characterState", &Sprite::characterState,
-    "controllable", &Sprite::controllable);
+    "controllable", &Sprite::controllable,
+    "animFinished", &Sprite::animFinished);
 
   engine_.new_usertype<MessageSystem>(
     "message",
@@ -16,6 +16,11 @@ struct SpriteFrame {
   vec2i size;
 };
 
+struct Animation {
+  bool looping = true;
+  std::vector<int> frameIndices;
+};
+
 enum class CharacterState {
   Still,
   Walking,
@@ -48,8 +53,9 @@ public:
   int animationId = 0;
   int animationFrame = 0;
   std::vector<SpriteFrame> frames;
-  std::vector<std::vector<int>> animations;
+  std::vector<Animation> animations;
   std::map<std::string, std::map<Direction, int>> nameDirToAnim;
+  bool animFinished = false;
   bool hasShadow = false;
 
   // Character