add missed SkillSystem implementations

Author: usermicrodevices

CMakeLists.txt

@@ -18,8 +18,10 @@ else()
     message(STATUS "ASIO found via find_package")
 endif()
 
+# Add GLM include directory
 set(GLM_DIR "${CMAKE_SOURCE_DIR}/thirdparty/glm")
 set(GLM_INCLUDE_DIRS "${GLM_DIR}")
+include_directories(${glm_INCLUDE_DIRS})
 
 find_package(nlohmann_json 3.2.0 QUIET)
 if(NOT nlohmann_json_FOUND)
@@ -64,8 +66,7 @@ if(NOT UUID_LIBRARY)
     message(FATAL_ERROR "libuuid not found - install libuuid-dev or equivalent")
 endif()
 
-# Add GLM include directory
-include_directories(${glm_INCLUDE_DIRS})
+find_library(CRYPT_LIB crypt)
 
 # Config system
 set(CONFIG_SOURCES
@@ -102,38 +103,36 @@ set(NETWORK_SOURCES
     src/network/WebSocketProtocol.cpp
 )
 
-# Core logic system
-set(LOGIC_CORE_SOURCES
-    src/game/LootItem.cpp
-    src/game/LootTable.cpp
-    src/game/LootTableManager.cpp
-    src/game/MobSystem.cpp
-    src/game/LogicCore.cpp
-    src/game/LogicWorld.cpp
-    src/game/LogicEntity.cpp
-    src/game/GameLogic.cpp
-    src/game/EntityManager.cpp
-    src/game/Player.cpp
-    src/game/PlayerManager.cpp
-    src/game/QuestManager.cpp
-    src/game/NPCEntity.cpp
-)
-
 # Loot system source files
 set(LOOT_SOURCES
     src/game/LootItem.cpp
     src/game/InventorySystem.cpp
     src/game/LootTable.cpp
+    src/game/LootTableManager.cpp
 )
 
 # 3D world system
 set(WORLD_SOURCES
     src/game/WorldChunk.cpp
     src/game/WorldGenerator.cpp
+    src/game/NPCEntity.cpp
     src/game/NPCSystem.cpp
     src/game/MobSystem.cpp
     src/game/GameEntity.cpp
     src/game/CollisionSystem.cpp
+    src/game/LogicWorld.cpp
+)
+
+# Core logic system
+set(LOGIC_CORE_SOURCES
+    src/game/LogicCore.cpp
+    src/game/LogicEntity.cpp
+    src/game/GameLogic.cpp
+    src/game/EntityManager.cpp
+    src/game/SkillSystem.cpp
+    src/game/Player.cpp
+    src/game/PlayerManager.cpp
+    src/game/QuestManager.cpp
 )
 
 # Database system
@@ -145,10 +144,9 @@ set(DATABASE_SOURCES
 if(USE_CITUS)
     message(STATUS "Building with Citus support")
     list(APPEND DATABASE_SOURCES src/database/CitusClient.cpp)
-    add_definitions(-DUSE_CITUS=1)
 else()
     message(STATUS "Building without Citus (PostgreSQL only)")
-    add_definitions(-DUSE_CITUS=0)
+    # No definition added here – Citus code is completely excluded
 endif()
 
 # Include directories
@@ -175,6 +173,11 @@ add_executable(gameserver
     ${DATABASE_SOURCES}
 )
 
+# Add target-specific preprocessor definitions
+if(USE_CITUS)
+    target_compile_definitions(gameserver PRIVATE USE_CITUS=1)
+endif()
+
 # Link libraries
 target_link_libraries(gameserver PRIVATE
     ${OPENGL_LIBRARIES}
@@ -189,6 +192,7 @@ target_link_libraries(gameserver PRIVATE
     fmt::fmt
     spdlog::spdlog
     ${UUID_LIBRARY}
+    ${CRYPT_LIB}
 )
 
 # Compiler flags

include/game/NPCEntity.hpp

@@ -403,6 +403,10 @@ class NPCEntity : public GameEntity {
     NPCLootTable loot_table_;
     NPCDialogue dialogue_;
 
+    glm::vec3 move_target_;
+    bool has_move_target_ = false;
+    float move_speed_multiplier_ = 1.0f;
+
     // Targeting
     uint64_t target_id_ = 0;
     std::vector<uint64_t> hate_list_; // Ordered by hate/damage dealt
@@ -411,8 +415,6 @@ class NPCEntity : public GameEntity {
     // AI state tracking
     float state_timer_ = 0.0f;
     float idle_timer_ = 0.0f;
-    float patrol_index_ = 0.0f;
-    bool patrol_direction_ = true; // true = forward, false = backward
 
     // Combat tracking
     float attack_cooldown_ = 0.0f;
@@ -421,6 +423,8 @@ class NPCEntity : public GameEntity {
     float summon_cooldown_ = 0.0f;
 
     // Patrol and movement
+    float patrol_index_ = 0.0f;
+    bool patrol_direction_ = true; // true = forward, false = backward
     float patrol_wait_timer_ = 0.0f;
     bool waiting_at_patrol_point_ = false;
     glm::vec3 spawn_position_;

include/game/SkillSystem.hpp

@@ -12,6 +12,7 @@
 #include <string>
 #include <set>
 
+#include <glm/glm.hpp>
 #include <nlohmann/json.hpp>
 
 #include "logging/Logger.hpp"
@@ -67,7 +68,7 @@ struct SkillRequirement {
     std::string required_attribute;
     std::string required_item;
     std::string required_quest;
-    
+
     nlohmann::json Serialize() const;
     void Deserialize(const nlohmann::json& data);
 };
@@ -81,7 +82,7 @@ struct SkillEffect {
     std::string stat_modified;
     float modifier = 0.0f;
     std::vector<std::string> additional_effects;
-    
+
     nlohmann::json Serialize() const;
     void Deserialize(const nlohmann::json& data);
 };
@@ -93,33 +94,33 @@ struct SkillData {
     SkillType type = SkillType::ACTIVE;
     SkillTarget target = SkillTarget::SINGLE_TARGET;
     SkillResource resource = SkillResource::MANA;
-    
+
     float resource_cost = 0.0f;
     float cooldown = 0.0f;
     float cast_time = 0.0f;
     float range = 0.0f;
     float area_radius = 0.0f;
     float duration = 0.0f;
-    
+
     int max_level = 1;
     int required_level = 1;
     std::vector<SkillRequirement> requirements;
     std::vector<SkillEffect> effects;
-    
+
     std::string icon_path;
     std::string animation_name;
     std::string sound_effect;
     std::string visual_effect;
-    
+
     bool is_toggleable = false;
     bool is_channeled = false;
     bool is_interruptible = true;
     bool can_crit = false;
     bool scales_with_level = true;
-    
+
     float level_scaling_factor = 1.0f;
     std::string scaling_attribute;
-    
+
     nlohmann::json Serialize() const;
     void Deserialize(const nlohmann::json& data);
 };
@@ -132,112 +133,106 @@ struct PlayerSkill {
     bool unlocked = false;
     bool equipped = false;
     int slot = -1;
-    
+
     // Cooldown tracking
     float current_cooldown = 0.0f;
     std::chrono::steady_clock::time_point last_used_time;
-    
+
     // For toggleable/channeled skills
     bool is_active = false;
     bool is_channeling = false;
     float channel_time_remaining = 0.0f;
-    
+
     nlohmann::json Serialize() const;
     void Deserialize(const nlohmann::json& data);
 };
 
 class SkillSystem {
 public:
     static SkillSystem& GetInstance();
-    
+
     // Skill data management
     bool LoadSkillData(const std::string& file_path);
     bool SaveSkillData(const std::string& file_path);
     const SkillData* GetSkillData(const std::string& skill_id) const;
     std::vector<std::string> GetSkillsByType(SkillType type) const;
     std::vector<std::string> GetSkillsByClass(PlayerClass player_class) const;
-    
+
     // Player skill management
     bool LearnSkill(uint64_t player_id, const std::string& skill_id, int level = 1);
     bool ForgetSkill(uint64_t player_id, const std::string& skill_id);
     bool UpgradeSkill(uint64_t player_id, const std::string& skill_id);
     bool SetSkillLevel(uint64_t player_id, const std::string& skill_id, int level);
     bool EquipSkill(uint64_t player_id, const std::string& skill_id, int slot);
     bool UnequipSkill(uint64_t player_id, const std::string& skill_id);
-    
+
     // Skill usage and cooldowns
     bool CanUseSkill(uint64_t player_id, const std::string& skill_id) const;
     bool UseSkill(uint64_t player_id, const std::string& skill_id, uint64_t target_id = 0, const glm::vec3& target_position = glm::vec3(0.0f));
     bool InterruptSkill(uint64_t player_id, const std::string& skill_id);
     bool ToggleSkill(uint64_t player_id, const std::string& skill_id);
-    
+
     // Query methods
     int GetSkillLevel(uint64_t player_id, const std::string& skill_id) const;
     bool HasSkill(uint64_t player_id, const std::string& skill_id) const;
     bool IsSkillEquipped(uint64_t player_id, const std::string& skill_id) const;
     float GetSkillCooldownRemaining(uint64_t player_id, const std::string& skill_id) const;
     std::vector<PlayerSkill> GetPlayerSkills(uint64_t player_id) const;
     std::vector<PlayerSkill> GetEquippedSkills(uint64_t player_id) const;
-    
+
     // Skill effects and calculations
     float CalculateSkillValue(uint64_t player_id, const std::string& skill_id, const std::string& effect_type) const;
     float CalculateResourceCost(uint64_t player_id, const std::string& skill_id) const;
     float CalculateCooldown(uint64_t player_id, const std::string& skill_id) const;
-    
+
     // Update methods
     void UpdatePlayerCooldowns(uint64_t player_id, float delta_time);
     void UpdateActiveSkills(uint64_t player_id, float delta_time);
     void UpdateChanneledSkills(uint64_t player_id, float delta_time);
-    
+
     // Skill requirements checking
     bool MeetsSkillRequirements(uint64_t player_id, const std::string& skill_id) const;
     std::vector<std::string> GetMissingRequirements(uint64_t player_id, const std::string& skill_id) const;
-    
+
     // Skill trees and specializations
     bool UnlockSkillTree(uint64_t player_id, const std::string& tree_id);
     bool IsSkillTreeUnlocked(uint64_t player_id, const std::string& tree_id) const;
     std::vector<std::string> GetUnlockedSkillTrees(uint64_t player_id) const;
-    
+
     // Serialization
     bool LoadPlayerSkills(uint64_t player_id);
     bool SavePlayerSkills(uint64_t player_id);
     nlohmann::json SerializePlayerSkills(uint64_t player_id) const;
     bool DeserializePlayerSkills(uint64_t player_id, const nlohmann::json& data);
-    
+
     // Skill effects application (called by UseSkill)
     void ApplySkillEffects(uint64_t caster_id, uint64_t target_id, const std::string& skill_id);
     void ApplyAreaEffect(uint64_t caster_id, const glm::vec3& center, float radius, const std::string& skill_id);
     void ApplyConeEffect(uint64_t caster_id, const glm::vec3& direction, float angle, float range, const std::string& skill_id);
-    
+
 private:
     SkillSystem();
     ~SkillSystem() = default;
-    
+
     struct PlayerSkillData {
         std::unordered_map<std::string, PlayerSkill> skills;
         std::unordered_map<std::string, bool> unlocked_trees;
         std::unordered_map<int, std::string> equipped_slots;  // slot -> skill_id
         float global_cooldown = 0.0f;
         bool is_global_cooldown_active = false;
-        
+
         // Active/channeled skills tracking
         std::set<std::string> active_skills;
         std::set<std::string> channeling_skills;
-        
+
         nlohmann::json Serialize() const;
         void Deserialize(const nlohmann::json& data);
     };
-    
+
     mutable std::mutex mutex_;
     std::unordered_map<uint64_t, PlayerSkillData> player_skills_;
     std::unordered_map<std::string, SkillData> skill_database_;
-    
-#ifdef USE_CITUS
-    CitusClient& db_client_;
-#else
-    std::unique_ptr<PostgreSQLBackend> db_backend_;
-#endif
-    
+
     // Helper methods
     bool ValidateSkillSlot(int slot) const;
     bool HasSkillPoint(uint64_t player_id) const;
@@ -246,26 +241,26 @@ class SkillSystem {
     void StartGlobalCooldown(uint64_t player_id, float duration);
     void UpdateGlobalCooldown(uint64_t player_id, float delta_time);
     bool IsGlobalCooldownActive(uint64_t player_id) const;
-    
+
     // Effect application helpers
     void ApplyDamageEffect(uint64_t caster_id, uint64_t target_id, const SkillEffect& effect);
     void ApplyHealingEffect(uint64_t caster_id, uint64_t target_id, const SkillEffect& effect);
     void ApplyBuffEffect(uint64_t caster_id, uint64_t target_id, const SkillEffect& effect);
     void ApplySummonEffect(uint64_t caster_id, const SkillEffect& effect, const glm::vec3& position);
     void ApplyTeleportEffect(uint64_t caster_id, const glm::vec3& target_position);
-    
-    // Database operations
+
+    // Database operations – always implemented using DbManager
     bool LoadSkillDataFromDatabase();
     bool SaveSkillDataToDatabase();
     bool LoadPlayerSkillsFromDatabase(uint64_t player_id);
     bool SavePlayerSkillsToDatabase(uint64_t player_id);
-    
+
     // Constants
     static constexpr int MAX_SKILL_LEVEL = 100;
     static constexpr int MAX_EQUIPPED_SKILLS = 12;
     static constexpr int SKILL_POINTS_PER_LEVEL = 1;
     static constexpr float GLOBAL_COOLDOWN_DURATION = 1.5f;
-    
+
     // Callbacks for skill effects (can be overridden by game-specific logic)
     std::function<void(uint64_t, uint64_t, const std::string&)> on_skill_used_;
     std::function<void(uint64_t, const std::string&, float)> on_skill_cooldown_start_;