Merge pull request #22 from usermicrodevices/develop

Develop

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)
@@ -58,8 +60,13 @@ find_package(ZLIB REQUIRED)
 # Find OpenSSL for encryption
 find_package(OpenSSL REQUIRED)
 
-# Add GLM include directory
-include_directories(${glm_INCLUDE_DIRS})
+# Find UUID library
+find_library(UUID_LIBRARY NAMES uuid)
+if(NOT UUID_LIBRARY)
+    message(FATAL_ERROR "libuuid not found - install libuuid-dev or equivalent")
+endif()
+
+find_library(CRYPT_LIB crypt)
 
 # Config system
 set(CONFIG_SOURCES
@@ -79,7 +86,10 @@ set(PROCESS_SOURCES
 # Scripting system
 set(SCRIPTING_SOURCES
     src/scripting/PythonAPI.cpp
+    #src/scripting/PythonEvent.cpp
+    src/scripting/PythonModule.cpp
     src/scripting/PythonScripting.cpp
+    src/scripting/ScriptHotReloader.cpp
 )
 
 # Network system
@@ -93,32 +103,36 @@ set(NETWORK_SOURCES
     src/network/WebSocketProtocol.cpp
 )
 
-# Core logic system
-set(LOGIC_CORE_SOURCES
-    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/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
@@ -130,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
@@ -160,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}
@@ -173,6 +191,8 @@ target_link_libraries(gameserver PRIVATE
     Python3::Python
     fmt::fmt
     spdlog::spdlog
+    ${UUID_LIBRARY}
+    ${CRYPT_LIB}
 )
 
 # Compiler flags

include/database/DbManager.hpp

@@ -46,6 +46,8 @@ class DbManager {
     void Shutdown();
     bool IsInitialized() const { return initialized_; }
 
+    std::string EscapeString(const std::string& input);
+
     // Backend Management
     bool SaveGameState(const std::string& key, const nlohmann::json& state);
     bool SetBackend(DatabaseType type, const nlohmann::json& config);
@@ -54,6 +56,13 @@ class DbManager {
     nlohmann::json Query(const std::string& sql) { return backend_->Query(sql); };
     nlohmann::json GetPlayer(uint64_t playerId){ return backend_->GetPlayer(playerId); };
 
+    bool UpdatePlayerPosition(uint64_t playerId, float x, float y, float z) {
+        if (backend_) {
+            return backend_->UpdatePlayerPosition(playerId, x, y, z);
+        }
+        return false;
+    }
+
     // Configuration
     bool LoadConfiguration(const std::string& configPath = "");
     nlohmann::json GetConfiguration() const { return config_; }

include/game/GameLogic.hpp

@@ -15,7 +15,7 @@
 #include "game/PlayerManager.hpp"
 #include "game/InventorySystem.hpp"
 #include "game/LootTableManager.hpp"
-#include "game/MobSystem.hpp"
+//#include "game/MobSystem.hpp"
 #include "game/SkillSystem.hpp"
 #include "game/QuestManager.hpp"
 #include "game/EntityManager.hpp"

include/game/LogicCore.hpp

@@ -20,14 +20,17 @@
 #include "network/BinaryProtocol.hpp"
 //#include "config/ConfigManager.hpp"
 //#include "logging/Logger.hpp"
-//#include "database/DbManager.hpp"
-//#include "game/RAIIThread.hpp"
+#include "database/DbManager.hpp"
+
+#include "game/RAIIThread.hpp"
 #include "game/LogicWorld.hpp"
 #include "game/LogicEntity.hpp"
-//#include "game/PlayerManager.hpp"
 
-class PythonScripting;
-class ScriptHotReloader;
+//class PlayerManager;
+#include "game/PlayerManager.hpp"
+
+//class PythonScripting;
+//class ScriptHotReloader;
 #include "scripting/PythonScripting.hpp"
 
 class LogicCore {

include/game/LogicWorld.hpp

@@ -60,6 +60,9 @@ class LogicWorld {
     int GetActiveChunkCount() const { return activeChunkCount_; }
     void SaveChunkData();
 
+    void SetTimeOfDay(float time); // 0.0 to 1.0
+    float GetTimeOfDay() const;
+
 private:
     LogicWorld();
     ~LogicWorld();
@@ -80,4 +83,5 @@ class LogicWorld {
     // Entity storage
     std::unordered_map<uint64_t, std::shared_ptr<GameEntity>> entities_;
     mutable std::mutex entitiesMutex_;
+    std::atomic<float> currentTimeOfDay_{0.0f};  // 0.0 to 1.0
 };

include/game/LootItem.hpp

@@ -1,9 +1,11 @@
 #pragma once
 
+#include <algorithm>
 #include <string>
 #include <vector>
-#include <nlohmann/json.hpp>
+
 #include <glm/glm.hpp>
+#include <nlohmann/json.hpp>
 
 enum class LootRarity {
     COMMON = 0,
@@ -59,6 +61,9 @@ class LootItem {
     const glm::vec3& GetIconColor() const { return iconColor_; }
 
     // Setters
+    void SetId(uint64_t id) { id_ = id; }
+    void SetName(const std::string& name) { name_ = name; }
+    void SetRarity(LootRarity rarity = LootRarity::COMMON) { rarity_ = rarity; }
     void SetStackSize(int size);
     void SetLevelRequirement(int level);
     void SetIconColor(const glm::vec3& color);

include/game/LootTable.hpp

@@ -1,13 +1,17 @@
 #pragma once
 
-#include <vector>
+#include <algorithm>
+#include <fstream>
 #include <random>
+#include <vector>
 #include <unordered_map>
 
+#include "logging/Logger.hpp"
 #include "game/LootItem.hpp"
 
 struct LootEntry {
-    std::string itemId;
+    uint64_t itemId;
+    std::string name;
     float dropChance = 0.0f;  // 0.0 to 1.0
     int minQuantity = 1;
     int maxQuantity = 1;

include/game/MobSystem.hpp

@@ -1,19 +1,24 @@
 // MobSystem.hpp
 #pragma once
 
-#include <vector>
-#include <unordered_map>
+#include <algorithm>
 #include <chrono>
+#include <cmath>
 #include <random>
+#include <vector>
+#include <unordered_map>
 
 #include <glm/glm.hpp>
 
-#include "game/WorldChunk.hpp"
-#include "game/LootTable.hpp"
+#include "logging/Logger.hpp"
+#include "config/ConfigManager.hpp"
 
-//#include "game/NPCEntity.hpp"
-enum class NPCType;
-class NPCEntity;
+//#include "game/WorldChunk.hpp"
+//#include "game/LootTable.hpp"
+//#include "game/PlayerManager.hpp"
+//#include "game/EntityManager.hpp"
+//#include "game/LootTableManager.hpp"
+#include "game/NPCEntity.hpp"
 
 // Mob spawn zone
 struct MobSpawnZone {
@@ -25,7 +30,7 @@ struct MobSpawnZone {
     int maxMobs = 10;
     float respawnTime = 30.0f; // seconds
     std::string name;
-    std::string lootTableId;  // Add loot table reference
+    std::string lootTableId;
 };
 
 // Mob variant (leveled version of a mob type)
@@ -35,7 +40,7 @@ struct MobVariant {
     float healthMultiplier = 1.0f;
     float damageMultiplier = 1.0f;
     float experienceReward = 10.0f;
-    std::string lootTableId;  // Reference to loot table
+    std::string lootTableId;
 };
 
 // Mob death info for rewards

include/game/NPCEntity.hpp

@@ -15,7 +15,7 @@
 
 #include "game/GameEntity.hpp"
 #include "game/LootTableManager.hpp"
-#include "game/MobSystem.hpp"
+//#include "game/MobSystem.hpp"
 #include "logging/Logger.hpp"
 #include "config/ConfigManager.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,10 @@ 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_;
     std::queue<glm::vec3> patrol_queue_;
 
@@ -439,6 +445,6 @@ class NPCEntity : public GameEntity {
     static constexpr float DESPAWN_DELAY = 10.0f;
 
     friend class NPCAISystem;
-    friend class MobSystem;
+    //friend class MobSystem;
     friend class EntityManager;
 };