fix NPCEntity

Author: usermicrodevices

include/game/LogicEntity.hpp

@@ -5,11 +5,17 @@
 #include <memory>
 #include <mutex>
 
+#include "config/ConfigManager.hpp"
+#include "logging/Logger.hpp"
+#include "network/BinaryProtocol.hpp"
+#include "network/ConnectionManager.hpp"
+
 #include "game/NPCSystem.hpp"
 #include "game/MobSystem.hpp"
 #include "game/EntityManager.hpp"
 #include "game/CollisionSystem.hpp"
-#include "game/LootItem.hpp"
+//#include "game/LootItem.hpp"
+#include "game/LootTableManager.hpp"
 
 class LogicEntity {
 public:

include/game/LootTableManager.hpp

@@ -19,6 +19,9 @@
 
 class LootTableManager {
 public:
+    LootTableManager();
+    ~LootTableManager();
+
     // Singleton pattern
     static LootTableManager& GetInstance();
 
@@ -78,8 +81,6 @@ class LootTableManager {
     );
 
 private:
-    LootTableManager();
-    ~LootTableManager() = default;
 
     // Helper methods for loot generation
     std::shared_ptr<LootItem> CreateItemFromEntry(

include/game/NPCEntity.hpp

@@ -171,6 +171,8 @@ struct NPCAIProfile {
     float patrol_speed = 2.0f;
     float chase_speed_multiplier = 1.5f;
     float flee_health_threshold = 0.3f;
+    float sight_range = 25.0f;
+    float chase_range = 40.0f;
 
     bool can_summon_allies = false;
     int max_allies = 0;
@@ -245,6 +247,7 @@ class NPCEntity : public GameEntity {
     // AI and behavior
     const NPCAIProfile& GetAIProfile() const { return ai_profile_; }
     void SetAIProfile(const NPCAIProfile& profile);
+    void SetDefaultAIProfile();
 
     void UpdateAI(float delta_time);
     void SetTarget(uint64_t target_id);
@@ -329,10 +332,12 @@ class NPCEntity : public GameEntity {
     std::string GetRarityString() const;
     std::string GetFactionString() const;
     std::string GetAIStateString() const;
+    std::string AIStateToString(NPCAIState state) const;
 
     NPCStats GetStats() const { return npc_stats_; };
     uint64_t GetOwnerId() const { return target_id_; };
     void SetBehaviorState(NPCAIState st) { ai_state_ = st; };
+    void MoveTo(const glm::vec3& destination, float speed_multiplier = 1.0f);
 
 private:
     NPCType npc_type_;

src/game/EntityManager.cpp

@@ -10,7 +10,6 @@ EntityManager& EntityManager::GetInstance() {
 EntityManager::EntityManager() : nextEntityId_(1) {
     Logger::Info("EntityManager initialized");
 }
-
 // =============== Entity Lifecycle ===============
 uint64_t EntityManager::CreateEntity(EntityType type, const glm::vec3& position) {
     std::lock_guard<std::mutex> lock(mutex_);
@@ -26,7 +25,7 @@ uint64_t EntityManager::CreateEntity(EntityType type, const glm::vec3& position)
             break;
         }
         case EntityType::NPC: {
-            auto npcEntity = std::make_unique<NPCEntity>(position);
+            auto npcEntity = std::make_unique<NPCEntity>(NPCType::VILLAGER, position);
             npcEntities_[entityId] = npcEntity.get();
             entity = std::move(npcEntity);
             break;
@@ -410,4 +409,4 @@ void EntityManager::DeactivateEntity(uint64_t entityId) {
     inactiveEntities_[entityId] = std::move(it->second);
     entities_.erase(it);
     Logger::Debug("Deactivated entity {} to pool", entityId);
-}
+}

src/game/GameLogic.cpp

@@ -443,13 +443,13 @@ void GameLogic::HandleFamiliarCommand(uint64_t sessionId, const nlohmann::json&
         }
 
         if (command == "follow") {
-            familiar->SetBehaviorState(NPCBehaviorState::FOLLOW);
+            familiar->SetBehaviorState(NPCAIState::FOLLOW);
             familiar->SetTarget(playerId);
         } else if (command == "attack") {
-            familiar->SetBehaviorState(NPCBehaviorState::CHASE);
+            familiar->SetBehaviorState(NPCAIState::CHASE);
             familiar->SetTarget(targetId);
         } else if (command == "stay") {
-            familiar->SetBehaviorState(NPCBehaviorState::IDLE);
+            familiar->SetBehaviorState(NPCAIState::IDLE);
             familiar->SetTarget(0);
         }
 
@@ -556,7 +556,7 @@ void GameLogic::GameLoop() {
 
     auto lastUpdate = std::chrono::steady_clock::now();
 
-    while (instanceMutex_) {
+    while (!instanceMutex_.try_lock()) {
         try {
             auto startTime = std::chrono::steady_clock::now();
 
@@ -589,7 +589,9 @@ void GameLogic::GameLoop() {
             Logger::Error("Error in game loop: {}", e.what());
         }
     }
-    
+
+    instanceMutex_.unlock();
+
     Logger::Info("Game loop stopped");
 }
 

src/game/LogicEntity.cpp

@@ -1,7 +1,3 @@
-#include "config/ConfigManager.hpp"
-#include "logging/Logger.hpp"
-#include "network/BinaryProtocol.hpp"
-#include "network/ConnectionManager.hpp"
 #include "game/LogicEntity.hpp"
 
 LogicEntity::LogicEntity()
@@ -21,8 +17,9 @@ void LogicEntity::Initialize() {
     auto& config = ConfigManager::GetInstance();
     // Initialize loot systems
     //inventorySystem_ = std::make_unique<InventorySystem>();
-    lootTableManager_ = std::make_unique<LootTableManager>();
-    lootTableManager_->LoadLootTables("config/loot_tables.json");
+    //lootTableManager_ = std::make_unique<LootTableManager>();
+    //lootTableManager_->LoadLootTables("config/loot_tables.json");
+    LootTableManager::GetInstance().LoadLootTables("config/loot_tables.json");
     Logger::Info("LogicEntity initialized");
 }