fix Player

Author: usermicrodevices

include/game/GameEntity.hpp

@@ -1,11 +1,13 @@
 #pragma once
 
 #include <algorithm>
+#include <chrono>
 #include <cmath>
 #include <cstdint>
 #include <iomanip>
 #include <memory>
 #include <random>
+#include <shared_mutex>
 #include <sstream>
 #include <string>
 #include <vector>
@@ -200,7 +202,7 @@ class GameEntity : public std::enable_shared_from_this<GameEntity> {
     // JSON
     nlohmann::json ToJson() const;
     nlohmann::json JsonGetPosition() const;
-    nlohmann::json JsonGetAttribute() const;
+    nlohmann::json JsonGetAttribute(const std::string& key, const nlohmann::json& defaultValue = {}) const;
     void JsonSetAttribute(const std::string& key, const nlohmann::json& value);
     nlohmann::json JsonGetAttributes() const;
 
@@ -251,6 +253,8 @@ class GameEntity : public std::enable_shared_from_this<GameEntity> {
     static std::atomic<uint64_t> next_entity_id_;
 
 private:
+    mutable std::shared_mutex mutex_;
+    std::chrono::steady_clock::time_point last_movement_;
 
     // Events
     //std::unordered_map<std::string, std::vector<EventCallback>> event_callbacks_;

include/game/GameLogic.hpp

@@ -14,6 +14,7 @@
 // #include "game/ChunkLOD.hpp"
 // #include "game/CollisionSystem.hpp"
 #include "game/LogicCore.hpp"
+#include "game/PlayerManager.hpp"
 
 class GameLogic : public LogicCore
 {
@@ -63,7 +64,7 @@ class GameLogic : public LogicCore
     void DespawnNPC(uint64_t npcId);
     NPCEntity* GetNPCEntity(uint64_t npcId);
     GameEntity* GetEntity(uint64_t entityId);
-    Player* GetPlayer(uint64_t playerId);
+    std::shared_ptr<Player> GetPlayer(uint64_t playerId);
 
     // Collision methods
     CollisionResult CheckCollision(const glm::vec3& position, float radius, uint64_t excludeEntityId = 0);
@@ -112,8 +113,6 @@ class GameLogic : public LogicCore
     static GameLogic* instance_;
 
     // Component systems
-    LogicWorld worldLogic_;
-    LogicEntity entityLogic_;
     //PlayerManager& playerManager_;
 
     // Database backend

include/game/LogicEntity.hpp

@@ -18,8 +18,7 @@
 
 class LogicEntity {
 public:
-    LogicEntity();
-    ~LogicEntity();
+    static LogicEntity& GetInstance();
 
     // Initialization
     void Initialize();
@@ -46,6 +45,12 @@ class LogicEntity {
     int GetActiveNPCCount() const { return activeNPCCount_; }
 
 private:
+    LogicEntity();
+    ~LogicEntity();
+
+    static std::mutex instanceMutex_;
+    static LogicEntity* instance_;
+
     std::unique_ptr<NPCManager> npcManager_;
     std::unordered_map<uint64_t, std::unique_ptr<NPCEntity>> npcEntities_;
     std::mutex npcMutex_;

include/game/Player.hpp

@@ -25,7 +25,6 @@
 
 class InventorySystem;
 class SkillSystem;
-class QuestSystem;
 
 struct PlayerAttributes {
     int strength = 10;        // Physical power
@@ -159,6 +158,10 @@ class Player : public GameEntity {
     const std::string& GetUsername() const { return username_; }
 
     void UpdatePosition(float x, float y, float z);
+    void UpdateHeartbeat();
+    bool IsHeartbeatExpired(int timeoutSeconds) const;
+    void ApplyDamage(int damage, int64_t attackerId);
+    void ApplyHealing(int amount, int64_t healerId);
 
     // Player-specific properties
     void SetPlayerClass(PlayerClass player_class) { player_class_ = player_class; }
@@ -271,7 +274,7 @@ class Player : public GameEntity {
     // Player systems access
     InventorySystem& GetInventorySystem() const { return inventory_system_; }
     SkillSystem& GetSkillSystem() const { return skill_system_; }
-    QuestSystem& GetQuestSystem() const { return quest_system_; }
+    QuestManager& GetQuestManager() const { return quest_manager_; }
 
     // Utility methods
     bool IsAlive() const { return stats_.health > 0; }
@@ -298,6 +301,10 @@ class Player : public GameEntity {
 
     void SetCosmetic(const std::string& slot, const std::string& cosmetic_id);
     std::string GetCosmetic(const std::string& slot) const;
+    float GetDistanceTo(const glm::vec3& other) const;
+    void AddCurrencyGold(int amount);
+    void AddCurrencyGems(int amount);
+    void SetOnline(bool online);
 
     // Player session
     void SetSessionId(uint64_t session_id) { session_id_ = session_id; }
@@ -310,13 +317,20 @@ class Player : public GameEntity {
     virtual nlohmann::json Serialize() const override;
     virtual void Deserialize(const nlohmann::json& data) override;
     nlohmann::json JsonGetInventory() const;
+    nlohmann::json ToJson() const;
 
 private:
     int64_t id_;
     std::string username_;
 
     //struct Position {float x, y, z;} position_;
-    //nlohmann::json attributes_;
+    std::chrono::system_clock::time_point last_movement_;
+
+    bool online_ = false;
+    std::chrono::system_clock::time_point created_at_;
+    std::chrono::system_clock::time_point last_login_;
+    std::chrono::system_clock::time_point last_logout_;
+    std::chrono::system_clock::time_point last_heartbeat_;
 
     mutable std::shared_mutex mutex_;
 
@@ -341,7 +355,7 @@ class Player : public GameEntity {
         nlohmann::json buff_data;
         float duration;
         float time_remaining;
-        std::chrono::steady_clock::time_point applied_time;
+        std::chrono::system_clock::time_point applied_time;
     };
     std::unordered_map<std::string, ActiveBuff> active_buffs_;
 
@@ -350,7 +364,7 @@ class Player : public GameEntity {
         std::string ability_id;
         float duration;
         float time_remaining;
-        std::chrono::steady_clock::time_point start_time;
+        std::chrono::system_clock::time_point start_time;
     };
     std::unordered_map<std::string, Cooldown> cooldowns_;
 
@@ -377,7 +391,7 @@ class Player : public GameEntity {
     // Systems
     InventorySystem& inventory_system_;
     SkillSystem& skill_system_;
-    QuestSystem& quest_system_;
+    QuestManager& quest_manager_;
 
     // Private methods
     void OnLevelUp();
@@ -404,14 +418,14 @@ class Player : public GameEntity {
     struct DamageSource {
         uint64_t attacker_id;
         int damage;
-        std::chrono::steady_clock::time_point timestamp;
+        std::chrono::system_clock::time_point timestamp;
     };
     std::deque<DamageSource> damage_sources_;
 
     struct HealingSource {
         uint64_t healer_id;
         int healing;
-        std::chrono::steady_clock::time_point timestamp;
+        std::chrono::system_clock::time_point timestamp;
     };
     std::deque<HealingSource> healing_sources_;
 

include/game/QuestManager.hpp

@@ -8,6 +8,7 @@
 #include <filesystem>
 #include <memory>
 #include <mutex>
+#include <shared_mutex>
 #include <string>
 #include <unordered_map>
 #include <vector>

src/game/GameEntity.cpp

@@ -715,7 +715,7 @@ uint64_t GameEntity::GenerateEntityId() {
 
 nlohmann::json GameEntity::JsonGetPosition() const {
     std::shared_lock<std::shared_mutex> lock(mutex_);
-    return {
+    return nlohmann::json{
         {"x", position_.x},
         {"y", position_.y},
         {"z", position_.z},
@@ -726,15 +726,15 @@ nlohmann::json GameEntity::JsonGetPosition() const {
 
 void GameEntity::JsonSetAttribute(const std::string& key, const nlohmann::json& value) {
     std::unique_lock<std::shared_mutex> lock(mutex_);
-    attributes_[key] = value;
+    properties_[key] = value;
 }
 
 nlohmann::json GameEntity::JsonGetAttribute(const std::string& key, const nlohmann::json& defaultValue) const {
     std::shared_lock<std::shared_mutex> lock(mutex_);
-    return attributes_.value(key, defaultValue);
+    return properties_.value(key, defaultValue);
 }
 
 nlohmann::json GameEntity::JsonGetAttributes() const {
     std::shared_lock<std::shared_mutex> lock(mutex_);
-    return attributes_;
+    return properties_;
 }