feat(Assets): Added walk animation to all units and flip

kyranet · Apr 21, 2019 · 8379b09 · 8379b09
1 parent db9ce56
commit 8379b09
Show file tree

Hide file tree

Showing 15 changed files with 44 additions and 22 deletions.
diff --git a/Drakhtar/Controllers/PlayerController.cpp b/Drakhtar/Controllers/PlayerController.cpp
@@ -52,11 +52,13 @@ void PlayerController::onClickMove(Box* boxClicked) {
       ->setRoute(board_->pathToRoute(path))
       ->setDuration(static_cast<int>(
           floor(static_cast<double>(path.size()) * GAME_FRAMERATE * 0.25)))
+      ->setOnStart([unit]() { unit->getTexture()->setAnimation("walk"); })
       ->setOnUpdate([unit](Vector2D<double> updated) {
         unit->setPosition({static_cast<int>(std::floor(updated.getX())),
                            static_cast<int>(std::floor(updated.getY()))});
       })
       ->setOnComplete([this, unit, boxClicked]() {
+        unit->getTexture()->setAnimation("default");
         hasMoved_ = true;
         locked_ = false;
         // If there are enemies in range, highlight them, otherwise skip turn

diff --git a/Drakhtar/Structures/Game.cpp b/Drakhtar/Structures/Game.cpp
@@ -52,62 +52,82 @@ void Game::load() {
   textures->add("Units-BlueArcher", "../images/Units/BlueArcher.png", 5, 3)
       ->addAnimation("default", {0, 1})
       ->addAnimation("attack", {2, 3, 4, 5, 6, 7, 8, 9, 10})
-      ->setFlip(SDL_FLIP_HORIZONTAL);
+      ->addAnimation("walk", {11, 12});
   textures->add("Units-BlueKnight", "../images/Units/BlueKnight.png", 5, 3)
       ->addAnimation("default", {0, 1})
-      ->addAnimation("attack", {2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12})
-      ->setFlip(SDL_FLIP_HORIZONTAL)
+      ->addAnimation("attack", {2, 3, 4, 5, 6, 7, 8, 9, 10})
+      ->addAnimation("walk", {11, 12})
       ->setScale({1.5, 1.5});
   textures->add("Units-BlueMage", "../images/Units/BlueMage.png", 3, 3)
       ->addAnimation("default", {0, 1})
-      ->addAnimation("attack", {2, 3, 4, 5, 6, 7, 8});
+      ->addAnimation("attack", {2, 3, 4, 5, 6})
+      ->addAnimation("walk", {7, 8});
   textures->add("Units-BlueMonster", "../images/Units/BlueMonster.png", 4, 3)
       ->addAnimation("default", {0, 1})
-      ->addAnimation("attack", {2, 3, 4, 5, 6, 7, 8, 9, 10});
+      ->addAnimation("attack", {2, 3, 4, 5, 6, 7, 8})
+      ->addAnimation("walk", {9, 10});
   textures->add("Units-BlueSoldier", "../images/Units/BlueSoldier.png", 4, 3)
       ->addAnimation("default", {0, 1})
-      ->addAnimation("attack", {2, 3, 4, 5, 6, 7, 8, 9, 10, 11})
-      ->setFlip(SDL_FLIP_HORIZONTAL);
+      ->addAnimation("attack", {2, 3, 4, 5, 6, 7, 8})
+      ->addAnimation("walk", {9, 10});
   textures->add("Units-Thassa", "../images/Units/Thassa.png", 4, 3)
+      ->addAnimation("default", {0, 1})
+      ->addAnimation("attack", {2, 3, 4, 5, 6, 7, 8, 9, 10});
+  textures->add("Units-BlueValar", "../images/Units/BlueValar.png", 5, 3)
       ->addAnimation("default", {0, 1})
       ->addAnimation("attack", {2, 3, 4, 5, 6, 7, 8, 9, 10})
-      ->setFlip(SDL_FLIP_HORIZONTAL);
+      ->addAnimation("walk", {11, 12});
   textures->add("Units-Abeizhul", "../images/Units/Abeizhul.png", 4, 3)
       ->addAnimation("default", {0, 1})
-      ->addAnimation("attack", {2, 3, 4, 5, 6, 7, 8, 9, 10, 11});
+      ->addAnimation("attack", {2, 3, 4, 5, 6, 7, 8, 9})
+      ->addAnimation("walk", {10, 11})
+      ->setFlip(SDL_FLIP_HORIZONTAL);
   textures->add("Units-Dreilay", "../images/Units/Dreilay.png", 5, 3)
       ->addAnimation("default", {0, 1})
-      ->addAnimation("attack", {2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12});
+      ->addAnimation("attack", {2, 3, 4, 5, 6, 7, 8, 9, 10})
+      ->addAnimation("walk", {11, 12})
+      ->setFlip(SDL_FLIP_HORIZONTAL);
   textures->add("Units-RedArcher", "../images/Units/RedArcher.png", 5, 3)
       ->addAnimation("default", {0, 1})
-      ->addAnimation("attack", {2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12});
+      ->addAnimation("attack", {2, 3, 4, 5, 6, 7, 8, 9, 10})
+      ->addAnimation("walk", {11, 12})
+      ->setFlip(SDL_FLIP_HORIZONTAL);
   textures->add("Units-RedKnight", "../images/Units/RedKnight.png", 5, 3)
       ->addAnimation("default", {0, 1})
-      ->addAnimation("attack", {2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12})
-      ->setScale({1.5, 1.5});
+      ->addAnimation("attack", {2, 3, 4, 5, 6, 7, 8, 9, 10})
+      ->addAnimation("walk", {11, 12})
+      ->setScale({1.5, 1.5})
+      ->setFlip(SDL_FLIP_HORIZONTAL);
   textures->add("Units-RedMage", "../images/Units/RedMage.png", 4, 3)
       ->addAnimation("default", {0, 1})
-      ->addAnimation("attack", {2, 3, 4, 5, 6, 7, 8, 9, 10})
+      ->addAnimation("attack", {2, 3, 4, 5, 6, 7, 8})
+      ->addAnimation("walk", {9, 10})
       ->setFlip(SDL_FLIP_HORIZONTAL);
   textures->add("Units-RedMonster", "../images/Units/RedMonster.png", 4, 3)
       ->addAnimation("default", {0, 1})
-      ->addAnimation("attack", {2, 3, 4, 5, 6, 7, 8, 9, 10})
+      ->addAnimation("attack", {2, 3, 4, 5, 6, 7, 8})
+      ->addAnimation("walk", {9, 10})
       ->setFlip(SDL_FLIP_HORIZONTAL);
   textures->add("Units-RedSoldier", "../images/Units/RedSoldier.png", 4, 3)
       ->addAnimation("default", {0, 1})
-      ->addAnimation("attack", {2, 3, 4, 5, 6, 7, 8, 9, 10, 11});
+      ->addAnimation("attack", {2, 3, 4, 5, 6, 7, 8, 9})
+      ->addAnimation("walk", {10, 11})
+      ->setFlip(SDL_FLIP_HORIZONTAL);
   textures->add("Units-Sheissa", "../images/Units/Sheissa.png", 4, 3)
       ->addAnimation("default", {0, 1})
-      ->addAnimation("attack", {2, 3, 4, 5, 6, 7, 8, 9, 10});
-  textures->add("Units-BlueValar", "../images/Units/BlueValar.png", 5, 3)
-      ->addAnimation("default", {0, 1})
-      ->addAnimation("attack", {2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12});
+      ->addAnimation("attack", {2, 3, 4, 5, 6, 7, 8})
+      ->addAnimation("walk", {9, 10})
+      ->setFlip(SDL_FLIP_HORIZONTAL);
   textures->add("Units-RedValar", "../images/Units/RedValar.png", 5, 3)
       ->addAnimation("default", {0, 1})
-      ->addAnimation("attack", {2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12});
+      ->addAnimation("attack", {2, 3, 4, 5, 6, 7, 8, 9, 10})
+      ->addAnimation("walk", {11, 12})
+      ->setFlip(SDL_FLIP_HORIZONTAL);
   textures->add("Units-Zamdran", "../images/Units/Zamdran.png", 4, 4)
       ->addAnimation("default", {0, 1})
-      ->addAnimation("attack", {2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14});
+      ->addAnimation("attack", {2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12})
+      ->addAnimation("walk", {13, 14})
+      ->setFlip(SDL_FLIP_HORIZONTAL);
 
   // UI
   textures->add("UI-cellFrame", "../images/UI/cellFrame.png", 1, 1);

diff --git a/images/Units/Abeizhul.png b/images/Units/Abeizhul.png
diff --git a/images/Units/BlueArcher.png b/images/Units/BlueArcher.png
diff --git a/images/Units/BlueKnight.png b/images/Units/BlueKnight.png
diff --git a/images/Units/BlueSoldier.png b/images/Units/BlueSoldier.png
diff --git a/images/Units/BlueValar.png b/images/Units/BlueValar.png
diff --git a/images/Units/Dreilay.png b/images/Units/Dreilay.png
diff --git a/images/Units/RedArcher.png b/images/Units/RedArcher.png
diff --git a/images/Units/RedKnight.png b/images/Units/RedKnight.png
diff --git a/images/Units/RedSoldier.png b/images/Units/RedSoldier.png
diff --git a/images/Units/RedValar.png b/images/Units/RedValar.png
diff --git a/images/Units/Sheissa.png b/images/Units/Sheissa.png
diff --git a/images/Units/Thassa.png b/images/Units/Thassa.png
diff --git a/images/Units/Zamdran.png b/images/Units/Zamdran.png