fix NPCEntity

Author: usermicrodevices

include/database/Backend.hpp

@@ -1,9 +1,7 @@
-/**
- * @brief Abstract Database Backend Interface
- *
- * Provides a unified interface for database operations with support for
- * both PostgreSQL and Citus (distributed PostgreSQL) backends.
- */
+#include <nlohmann/json.hpp>
+
+#include "logging/Logger.hpp"
+
 class DatabaseBackend {
 public:
     virtual ~DatabaseBackend() = default;

include/game/InventorySystem.hpp

@@ -107,4 +107,4 @@ class InventorySystem {
     // Database operations
     bool LoadFromDatabase(uint64_t playerId);
     bool SaveToDatabase(uint64_t playerId);
-};
+};

include/game/NPCEntity.hpp

@@ -339,46 +339,6 @@ class NPCEntity : public GameEntity {
     void SetBehaviorState(NPCAIState st) { ai_state_ = st; };
     void MoveTo(const glm::vec3& destination, float speed_multiplier = 1.0f);
 
-private:
-    NPCType npc_type_;
-    NPCRarity rarity_;
-    NPCFaction faction_;
-    NPCAIState ai_state_;
-
-    NPCStats npc_stats_;
-    NPCAIProfile ai_profile_;
-    NPCLootTable loot_table_;
-    NPCDialogue dialogue_;
-
-    // Targeting
-    uint64_t target_id_ = 0;
-    std::vector<uint64_t> hate_list_; // Ordered by hate/damage dealt
-    std::unordered_map<uint64_t, float> damage_taken_; // Damage taken from each attacker
-
-    // 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;
-    float stun_timer_ = 0.0f;
-    float flee_timer_ = 0.0f;
-    float summon_cooldown_ = 0.0f;
-
-    // Patrol and movement
-    glm::vec3 spawn_position_;
-    std::queue<glm::vec3> patrol_queue_;
-
-    // Quests and trade
-    std::vector<std::string> quests_;
-    std::unordered_map<std::string, int> trade_items_;
-
-    // Special abilities
-    std::vector<std::string> abilities_;
-    std::unordered_map<std::string, float> ability_cooldowns_;
-
     // AI decision making
     void UpdateIdle(float delta_time);
     void UpdatePatrol(float delta_time);
@@ -432,6 +392,46 @@ class NPCEntity : public GameEntity {
     void SaveTradeItemsToJson(nlohmann::json& json) const;
     void LoadTradeItemsFromJson(const nlohmann::json& json);
 
+private:
+    NPCType npc_type_;
+    NPCRarity rarity_;
+    NPCFaction faction_;
+    NPCAIState ai_state_;
+
+    NPCStats npc_stats_;
+    NPCAIProfile ai_profile_;
+    NPCLootTable loot_table_;
+    NPCDialogue dialogue_;
+
+    // Targeting
+    uint64_t target_id_ = 0;
+    std::vector<uint64_t> hate_list_; // Ordered by hate/damage dealt
+    std::unordered_map<uint64_t, float> damage_taken_; // Damage taken from each attacker
+
+    // 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;
+    float stun_timer_ = 0.0f;
+    float flee_timer_ = 0.0f;
+    float summon_cooldown_ = 0.0f;
+
+    // Patrol and movement
+    glm::vec3 spawn_position_;
+    std::queue<glm::vec3> patrol_queue_;
+
+    // Quests and trade
+    std::vector<std::string> quests_;
+    std::unordered_map<std::string, int> trade_items_;
+
+    // Special abilities
+    std::vector<std::string> abilities_;
+    std::unordered_map<std::string, float> ability_cooldowns_;
+
     // Constants
     static constexpr float ATTACK_COOLDOWN_BASE = 2.0f;
     static constexpr float STUN_DURATION = 1.0f;

src/game/CollisionSystem.cpp

@@ -10,11 +10,18 @@
 static constexpr float EPSILON = 1e-6f;
 static constexpr float INV_EPSILON = 1e6f;
 
+float distance_between_vec3(glm::vec3 pos0, glm::vec3 pos1)
+{
+    glm::vec3 delta = pos0 - pos1;
+    return glm::dot(delta, delta);
+}
+
 // BoundingSphere implementation
 bool BoundingSphere::Intersects(const BoundingSphere& other) const {
     if (!IsValid() || !other.IsValid()) return false;
 
-    float distanceSquared = glm::distance2(center, other.center);
+    //float distanceSquared = glm::distance2(center, other.center);
+    float distanceSquared = distance_between_vec3(center, other.center);
     float radiusSum = radius + other.radius;
     return distanceSquared <= (radiusSum * radiusSum);
 }
@@ -717,7 +724,7 @@ bool CollisionSystem::TestSphereTriangle(const glm::vec3& sphereCenter, float ra
         float t = glm::dot(ap, ab) / glm::dot(ab, ab);
         t = std::clamp(t, 0.0f, 1.0f);
         glm::vec3 closest = a + ab * t;
-        float distSq = glm::distance2(sphereCenter, closest);
+        float distSq = distance_between_vec3(sphereCenter, closest);
         if (distSq < minDistanceSquared) {
             minDistanceSquared = distSq;
             closestPoint = closest;
@@ -730,7 +737,7 @@ bool CollisionSystem::TestSphereTriangle(const glm::vec3& sphereCenter, float ra
 
     // Check vertices
     auto checkVertex = [&](const glm::vec3& vertex) {
-        float distSq = glm::distance2(sphereCenter, vertex);
+        float distSq = distance_between_vec3(sphereCenter, vertex);
         if (distSq < minDistanceSquared) {
             minDistanceSquared = distSq;
             closestPoint = vertex;
@@ -829,7 +836,7 @@ bool CollisionSystem::TestRayTriangle(const glm::vec3& origin, const glm::vec3&
 
 bool CollisionSystem::ValidatePosition(const glm::vec3& position) const {
     // Check for NaN and infinite values
-    if (!glm::all(glm::isfinite(position))) {
+    if (!std::isfinite(position.x) || !std::isfinite(position.y) || !std::isfinite(position.z)) {
         return false;
     }
 

src/game/MobSystem.cpp

@@ -144,11 +144,11 @@ void MobSystem::OnMobDeath(uint64_t mobId, uint64_t killerId) {
     MobDeathInfo deathInfo;
     deathInfo.mobId = mobId;
     deathInfo.killerId = killerId;
-    deathInfo.mobType = mob->GetType();
+    deathInfo.mobType = mob->GetNPCType();
     deathInfo.deathPosition = mob->GetPosition();
     deathInfo.deathTime = std::chrono::steady_clock::now();
     deathInfo.level = 1; // TODO: Get level from mob
-    deathInfo.lootTableId = GetLootTableIdForMob(mob->GetType(), zoneName);
+    deathInfo.lootTableId = GetLootTableIdForMob(mob->GetNPCType(), zoneName);
 
     // Award experience
     float experience = GetExperienceReward(deathInfo.mobType, deathInfo.level);
@@ -183,7 +183,7 @@ void MobSystem::OnMobDeath(uint64_t mobId, uint64_t killerId) {
     gameLogic.FirePythonEvent("mob_death", {
         {"mobId", mobId},
         {"killerId", killerId},
-        {"mobType", static_cast<int>(mob->GetType())},
+        {"mobType", static_cast<int>(mob->GetNPCType())},
                               {"level", deathInfo.level},
                               {"experience", experience},
                               {"deathPosition", {

src/game/NPCSystem.cpp

@@ -85,11 +85,11 @@ void NPCManager::ProcessNPCAI(NPCEntity* npc, float deltaTime) {
 }
 
 void NPCManager::HandleCombat(NPCEntity* npc, float deltaTime) {
-    if (npc->GetBehaviorState() == NPCAIState::COMBAT) {
+    if (npc->GetAIState() == NPCAIState::COMBAT) {
         // Check if target is in attack range
         // If yes, attack
         // If no, chase
-        npc->Attack();
+        npc->PerformAttack();
     }
 }