4 files changed, 31 insertions, 11 deletions

@@ -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