3 files changed, 33 insertions, 15 deletions

@@ -65,13 +65,13 @@ 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]+)?: ([0-9,#]+))");
     std::smatch m;
     std::regex_match(animLine, m, re);
 
     std::string animName = m[1];
     Animation anim;
-    auto framestrs = splitStr<std::list<std::string>>(m[3], ",");
+    auto framestrs = splitStr<std::list<std::string>>(m[4], ",");
     for (const std::string& f : framestrs) {
       int times = 1;
       size_t repeat_it = f.find("#");
@@ -88,6 +88,15 @@ void AnimationSystem::initSprite(int spriteId, std::string_view filename) {
       anim.looping = false;
     }
 
+    if (m[3] != "") {
+      int frameRate = std::stoi(std::string(m[3]).substr(1));
+      switch (frameRate) {
+        case 5: anim.timerNum = 0; break;
+        case 60: anim.timerNum = 1; break;
+        default: throw std::invalid_argument("Invalid frame rate");
+      }
+    }
+
     int animId = sprite.animations.size();
     sprite.animations.push_back(std::move(anim));
 
@@ -101,18 +110,25 @@ void AnimationSystem::initSprite(int spriteId, std::string_view filename) {
 void AnimationSystem::tick(double dt) {
   if (game_.isGameplayPaused()) return;
 
-  animTimer_.accumulate(dt);
-  while (animTimer_.step()) {
-    for (Sprite& sprite : game_.getSprites() | game_.spriteView()) {
-      if (sprite.isAnimated && !sprite.animFinished && !sprite.animPaused) {
-        sprite.animationFrame++;
-
-        if (sprite.animationFrame >= sprite.animations[sprite.animationId].frameIndices.size()) {
-          if (sprite.animations[sprite.animationId].looping) {
-            sprite.animationFrame = 0;
-          } else {
-            sprite.animFinished = true;
-            sprite.animationFrame = sprite.animations[sprite.animationId].frameIndices.size() - 1;
+  for (int timerNum = 0; timerNum < animTimers_.size(); timerNum++) {
+    Timer& animTimer = animTimers_[timerNum];
+
+    animTimer.accumulate(dt);
+    while (animTimer.step()) {
+      for (Sprite& sprite : game_.getSprites() | game_.spriteView()) {
+        if (sprite.isAnimated &&
+            sprite.animations[sprite.animationId].timerNum == timerNum &&
+            !sprite.animFinished &&
+            !sprite.animPaused) {
+          sprite.animationFrame++;
+
+          if (sprite.animationFrame >= sprite.animations[sprite.animationId].frameIndices.size()) {
+            if (sprite.animations[sprite.animationId].looping) {
+              sprite.animationFrame = 0;
+            } else {
+              sprite.animFinished = true;
+              sprite.animationFrame = sprite.animations[sprite.animationId].frameIndices.size() - 1;
+            }
           }
         }
       }
@@ -2,6 +2,7 @@
 #define ANIMATION_SYSTEM_H_CCCC7CB8
 
 #include <string_view>
+#include <vector>
 #include "direction.h"
 #include "system.h"
 #include "timer.h"
@@ -28,7 +29,7 @@ private:
   void updateAnimation(int spriteId);
 
   Game& game_;
-  Timer animTimer_ {1000/5};//30fps * 1000 t/s;;
+  std::vector<Timer> animTimers_ = {{1000/5}, {1000/60}};//30fps * 1000 t/s;;
 };
 
 #endif /* end of include guard: ANIMATION_SYSTEM_H_CCCC7CB8 */
@@ -24,6 +24,7 @@ struct SpriteFrame {
 struct Animation {
   bool looping = true;
   std::vector<int> frameIndices;
+  int timerNum = 0;
 };
 
 enum class CharacterState {