1 files changed, 18 insertions, 2 deletions

@@ -65,7 +65,7 @@ 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);
 
@@ -78,6 +78,8 @@ void AnimationSystem::initSprite(int spriteId, std::string_view filename) {
 
     if (animName.back() == '!') {
       anim.looping = false;
+    } else if (animName.back() == '.') {
+      anim.manual = true;
     }
 
     int animId = sprite.animations.size();
@@ -96,7 +98,7 @@ void AnimationSystem::tick(double dt) {
   animTimer_.accumulate(dt);
   while (animTimer_.step()) {
     for (Sprite& sprite : game_.getSprites() | game_.spriteView()) {
-      if (sprite.isAnimated && !sprite.animFinished) {
+      if (sprite.isAnimated && !sprite.animFinished && !sprite.animPaused) {
         sprite.animationFrame++;
 
         if (sprite.animationFrame >= sprite.animations[sprite.animationId].frameIndices.size()) {
@@ -112,6 +114,19 @@ void AnimationSystem::tick(double dt) {
   }
 }
 
+void AnimationSystem::advanceAnimation(int spriteId) {
+  Sprite& sprite = game_.getSprite(spriteId);
+  Animation& animation = sprite.animations[sprite.animationId];
+
+  if (animation.manual) {
+    sprite.animationFrame++;
+
+    if (sprite.animationFrame >= animation.frameIndices.size()) {
+      sprite.animationFrame = 0;
+    }
+  }
+}
+
 void AnimationSystem::setSpriteDirection(int spriteId, Direction dir) {
   Sprite& sprite = game_.getSprite(spriteId);
   if (sprite.dir != dir) {
@@ -133,4 +148,5 @@ void AnimationSystem::updateAnimation(int spriteId) {
   sprite.animationId = sprite.nameDirToAnim[sprite.animationName][sprite.dir];
   sprite.animationFrame = 0;
   sprite.animFinished = false;
+  sprite.animPaused = false;
 }