feat: tweak the game config and assets

Author: sdragos1

client/src/systems/game/texture_mapper/texture_mapper.cpp

@@ -26,7 +26,7 @@ Texture TextureMapper::MapBulletType(const sdk::game::types::ProjectileType type
       return Texture{.name = "enemy_pack", .scale = 2, .rect = {531, 225, 32, 32}};
     }
     default: {
-      return Texture{.name = "player", .scale = 1.5, .rect = {300, 121, 32, 10}};
+      return Texture{.name = "player", .scale = 2, .rect = {227, 278, 10, 8}};
     }
   }
 }

server/game_files/archetypes/enemies/grappler.json

@@ -52,7 +52,7 @@
           "scriptName": "zigzagMovementScript",
           "customValues": {
             "verticalSpeed": 100.0,
-            "horizontalSpeed": 80.0,
+            "horizontalSpeed": 150.0,
             "upperLimitOffset": 100.0,
             "lowerLimitOffset": 100.0
           }

server/game_files/archetypes/enemies/void_eater.json

@@ -42,7 +42,7 @@
         {
           "scriptName": "voidEaterScript",
           "customValues": {
-            "health": 1500.0,
+            "health": 3000.0,
             "scoreIncrease": 2000,
             "fireRate": 0.6,
             "bulletArchetype": "void_eater_bullet"

server/game_files/archetypes/projectiles/pata_bullet.json

@@ -19,8 +19,8 @@
       "name": "box_collider2d",
       "data": {
         "size": {
-          "x": 48,
-          "y": 15
+          "x": 20,
+          "y": 16
         },
         "collisionLayers": [
           4

server/game_files/levels/the_den.json

@@ -6,20 +6,28 @@
       "maxTime": 15.0,
       "enemies": [
         {
-          "name": "void_eater",
-          "count": 5
+          "name": "enemy_pata_normal",
+          "count": 10
+        },
+        {
+          "name": "grappler",
+          "count": 2
         }
       ]
     },
     {
-      "maxTime": 30.0,
+      "maxTime": 40.0,
       "enemies": [
         {
           "name": "enemy_pata_normal",
-          "count": 10
+          "count": 20
         },
         {
           "name": "grappler",
+          "count": 5
+        },
+        {
+          "name": "enforcer",
           "count": 2
         }
       ]
@@ -29,15 +37,40 @@
       "enemies": [
         {
           "name": "enemy_pata_normal",
-          "count": 15
+          "count": 20
         },
         {
           "name": "enemy_pata_big",
-          "count": 15
+          "count": 7
         },
         {
           "name": "grappler",
+          "count": 10
+        },
+        {
+          "name": "electric_shark",
+          "count": 10
+        },
+        {
+          "name": "enforcer",
+          "count": 10
+        }
+      ]
+    },
+    {
+      "maxTime": 20.0,
+      "enemies": [
+        {
+          "name": "void_eater",
+          "count": 1
+        },
+        {
+          "name": "electric_shark",
           "count": 5
+        },
+        {
+          "name": "grappler",
+          "count": 20
         }
       ]
     }

server/game_files/levels/tutorial.json

@@ -7,7 +7,27 @@
       "enemies": [
         {
           "name": "enemy_pata_normal",
-          "count": 15
+          "count": 1
+        },
+        {
+          "name": "enemy_pata_big",
+          "count": 1
+        },
+        {
+          "name": "grappler",
+          "count": 1
+        },
+        {
+          "name": "enforcer",
+          "count": 1
+        },
+        {
+          "name": "void_eater",
+          "count": 1
+        },
+        {
+          "name": "electric_shark",
+          "count": 1
         }
       ]
     }

server/src/app/room/game_service/game_service.cpp

@@ -68,13 +68,13 @@ int GameService::Run(std::shared_ptr<Room> api) {
     std::cerr << e.what() << std::endl;
     return EXIT_FAILURE;
   }
+  StartGameClock();
   while (gameRunning_) {
     ticksManager_.Update();
     messageHandler_.Run(registry_, api_, players_);
     ExecuteGameLogic();
     network::StateBroadcaster::Run(registry_, api_);
     ticksManager_.WaitUntilNextTick();
-    UpdateTotalGameTime();
   }
   HandleGameEnd();
   return EXIT_SUCCESS;
@@ -128,6 +128,7 @@ void GameService::UpdatePlayerScores() {
 }
 
 void GameService::HandleGameEnd() {
+  GetTotalGameTime();
   if (win_) {
     logger_.Info("Game ended, players won", "🎉");
   } else {
@@ -137,6 +138,7 @@ void GameService::HandleGameEnd() {
   if (totalScore == 0) {
     win_ = false;
   }
+  logger_.Info("Total game time: " + std::to_string(totalGameTime_) + "s", "⏱️");
   logger_.Info("Score penalty: " + std::to_string(scorePenalty_), "🔻");
   logger_.Info("Total score: " + std::to_string(totalScore), "🏆");
   this->api_->EndGame(totalScore, totalGameTime_, win_);
@@ -152,11 +154,6 @@ void GameService::CheckGameEnd() {
   }
 }
 
-void GameService::UpdateTotalGameTime() {
-  totalGameTime_ +=
-      std::chrono::duration_cast<std::chrono::seconds>(ticksManager_.DeltaTime()).count();
-}
-
 unsigned int GameService::ComputeTotalScore() const {
   unsigned int totalScore = 0;
 
@@ -198,3 +195,9 @@ void GameService::CheckTooFarEntities() {
     }
   }
 }
+
+void GameService::GetTotalGameTime() {
+  const auto currentTime = std::chrono::steady_clock::now();
+  totalGameTime_ =
+      std::chrono::duration_cast<std::chrono::seconds>(currentTime - startTime_).count();
+}

server/src/app/room/game_service/game_service.hpp

@@ -93,11 +93,6 @@ class GameService {
    */
   void CheckGameEnd();
 
-  /**
-   * @brief Update the total time of the game
-   */
-  void UpdateTotalGameTime();
-
   /**
    * @brief Compute the total score of the game
    * @return The total score
@@ -109,6 +104,16 @@ class GameService {
    */
   void CheckTooFarEntities();
 
+  /**
+   * @brief Start game clock
+   */
+  inline void StartGameClock() { startTime_ = std::chrono::steady_clock::now(); }
+
+  /**
+   * @brief Update total game time
+   */
+  void GetTotalGameTime();
+
  private:
   /// @brief Game running flag
   bool gameRunning_{true};
@@ -160,5 +165,8 @@ class GameService {
 
   /// @brief Total score of the game
   int scorePenalty_{0};
+
+  /// @brief Start time of the game
+  std::chrono::steady_clock::time_point startTime_;
 };
 }  // namespace rtype::server::game

server/src/app/room/game_service/scripts/enemies/enemy_default_script.hpp

@@ -13,7 +13,7 @@
 #include "zygarde/src/utils/timer/timer.hpp"
 
 namespace rtype::server::game::scripts {
-static constexpr zygarde::core::types::Vector3f kPataProjectileOffsetPosition{-40, 30, 0};
+static constexpr zygarde::core::types::Vector3f kPataProjectileOffsetPosition{-30, 30, 0};
 }
 
 namespace rtype::server::game::scripts {