Add Azerothcore methods and necessary changes to defines

Author: Foereaper

ElunaConfig.cpp

@@ -4,7 +4,7 @@
 * Please see the included DOCS/LICENSE.md for more information
 */
 
-#if defined ELUNA_TRINITY
+#if defined ELUNA_TRINITY || defined ELUNA_AZEROTHCORE
 #include "Config.h"
 #else
 #include "Config/Config.h"
@@ -56,6 +56,8 @@ void ElunaConfig::SetConfig(ElunaConfigBoolValues index, char const* fieldname,
 {
 #if defined ELUNA_TRINITY
     SetConfig(index, sConfigMgr->GetBoolDefault(fieldname, defvalue));
+#elif defined ELUNA_AZEROTHCORE
+    SetConfig(index, sConfigMgr->GetOption<bool>(fieldname, defvalue));
 #else
     SetConfig(index, sConfig.GetBoolDefault(fieldname, defvalue));
 #endif
@@ -67,6 +69,8 @@ void ElunaConfig::SetConfig(ElunaConfigStringValues index, char const* fieldname
     SetConfig(index, sConfigMgr->GetStringDefault(fieldname, defvalue));
 #elif defined ELUNA_CMANGOS
     SetConfig(index, sConfig.GetStringDefault(fieldname, defvalue));
+#elif defined ELUNA_AZEROTHCORE
+    SetConfig(index, sConfigMgr->GetOption<std::string>(fieldname, defvalue));
 #else
     SetConfig(index, sConfig.GetStringDefault(fieldname, defvalue.c_str()));
 #endif
@@ -76,6 +80,8 @@ void ElunaConfig::SetConfig(ElunaConfigUInt32Values index, char const* fieldname
 {
 #if defined ELUNA_TRINITY
     SetConfig(index, sConfigMgr->GetIntDefault(fieldname, defvalue));
+#elif defined ELUNA_AZEROTHCORE
+    SetConfig(index, sConfigMgr->GetOption<uint32>(fieldname, defvalue));
 #else
     SetConfig(index, sConfig.GetIntDefault(fieldname, defvalue));
 #endif

ElunaCreatureAI.h

@@ -12,7 +12,7 @@
 #include "AI/BaseAI/CreatureAI.h"
 #endif
 
-#if defined ELUNA_TRINITY
+#if defined ELUNA_TRINITY || defined ELUNA_AZEROTHCORE
 struct ScriptedAI;
 typedef ScriptedAI NativeScriptedAI;
 #elif defined ELUNA_CMANGOS || ELUNA_MANGOS
@@ -29,7 +29,7 @@ struct ElunaCreatureAI : NativeScriptedAI
     bool justSpawned;
     // used to delay movementinform hook (WP hook)
     std::vector< std::pair<uint32, uint32> > movepoints;
-#if !defined ELUNA_TRINITY
+#if !defined ELUNA_TRINITY && !defined ELUNA_AZEROTHCORE
 #define me  m_creature
 #endif
     ElunaCreatureAI(Creature* creature) : NativeScriptedAI(creature), justSpawned(true)
@@ -73,7 +73,7 @@ struct ElunaCreatureAI : NativeScriptedAI
         }
     }
 
-#if defined ELUNA_TRINITY
+#if defined ELUNA_TRINITY || defined ELUNA_AZEROTHCORE
     // Called for reaction when initially engaged - this will always happen _after_ JustEnteredCombat
     // Called at creature aggro either by MoveInLOS or Attack Start
     void JustEngagedWith(Unit* target) override
@@ -94,6 +94,8 @@ struct ElunaCreatureAI : NativeScriptedAI
     // Called at any Damage from any attacker (before damage apply)
 #if defined ELUNA_TRINITY || defined ELUNA_CMANGOS 
     void DamageTaken(Unit* attacker, uint32& damage, DamageEffectType damageType, SpellInfo const* spellInfo) override
+#elif defined ELUNA_AZEROTHCORE
+    void DamageTaken(Unit* attacker, uint32& damage, DamageEffectType damagetype, SpellSchoolMask damageSchoolMask) override
 #else
     void DamageTaken(Unit* attacker, uint32& damage) override
 #endif
@@ -102,6 +104,8 @@ struct ElunaCreatureAI : NativeScriptedAI
         {
 #if defined ELUNA_TRINITY || defined ELUNA_CMANGOS
             NativeScriptedAI::DamageTaken(attacker, damage, damageType, spellInfo);
+#elif defined ELUNA_AZEROTHCORE
+            NativeScriptedAI::DamageTaken(attacker, damage, damagetype, damageSchoolMask);
 #else
             NativeScriptedAI::DamageTaken(attacker, damage);
 #endif
@@ -151,7 +155,7 @@ struct ElunaCreatureAI : NativeScriptedAI
             NativeScriptedAI::AttackStart(target);
     }
 
-#if defined ELUNA_TRINITY
+#if defined ELUNA_TRINITY || defined ELUNA_AZEROTHCORE
     // Called for reaction at stopping attack at no attackers or targets
     void EnterEvadeMode(EvadeReason /*why*/) override
 #else
@@ -199,7 +203,7 @@ struct ElunaCreatureAI : NativeScriptedAI
             NativeScriptedAI::CorpseRemoved(respawnDelay);
     }
 
-#if !defined ELUNA_TRINITY && !defined ELUNA_VMANGOS
+#if !defined ELUNA_TRINITY && !defined ELUNA_VMANGOS && !defined ELUNA_AZEROTHCORE
     // Enables use of MoveInLineOfSight
     bool IsVisible(Unit* who) const override
     {
@@ -237,7 +241,7 @@ struct ElunaCreatureAI : NativeScriptedAI
             NativeScriptedAI::SpellHitTarget(target, spell);
     }
 
-#if defined ELUNA_TRINITY
+#if defined ELUNA_TRINITY || defined ELUNA_AZEROTHCORE
     // Called when the creature is summoned successfully by other creature
     void IsSummonedBy(WorldObject* summoner) override
     {
@@ -266,7 +270,7 @@ struct ElunaCreatureAI : NativeScriptedAI
     }
 #endif
 
-#if !defined ELUNA_TRINITY
+#if !defined ELUNA_TRINITY && !defined ELUNA_AZEROTHCORE
 #undef me
 #endif
 };

ElunaEventMgr.h

@@ -18,7 +18,7 @@
 #endif
 #include <map>
 
-#if defined ELUNA_TRINITY
+#if defined ELUNA_TRINITY || defined ELUNA_AZEROTHCORE
 #include "Define.h"
 #else
 #include "Platform/Define.h"

ElunaIncludes.h

@@ -26,7 +26,11 @@
 #include "GuildMgr.h"
 #include "Language.h"
 #include "Mail.h"
+#if defined ELUNA_AZEROTHCORE
+#include "MapMgr.h"
+#else
 #include "MapManager.h"
+#endif
 #include "ObjectAccessor.h"
 #include "ObjectMgr.h"
 #include "Opcodes.h"
@@ -40,7 +44,7 @@
 #include "TemporarySummon.h"
 #include "WorldPacket.h"
 #include "WorldSession.h"
-#if defined ELUNA_TRINITY
+#if defined ELUNA_TRINITY || defined ELUNA_AZEROTHCORE
 #include "Battleground.h"
 #include "Config.h"
 #include "DatabaseEnv.h"
@@ -49,7 +53,12 @@
 #include "MiscPackets.h"
 #include "MotionMaster.h"
 #include "ScriptedCreature.h"
+#if defined ELUNA_TRINITY
 #include "SpellHistory.h"
+#endif
+#if defined ELUNA_AZEROTHCORE
+#include "WorldSessionMgr.h"
+#endif
 #include "SpellInfo.h"
 #include "WeatherMgr.h"
 #elif defined ELUNA_VMANGOS
@@ -109,7 +118,7 @@
 #endif
 #endif
 
-#if !defined ELUNA_TRINITY
+#if !defined ELUNA_TRINITY && !defined ELUNA_AZEROTHCORE
 #include "Config/Config.h"
 #include "BattleGroundMgr.h"
 #if !defined ELUNA_MANGOS
@@ -154,13 +163,25 @@ typedef Opcodes OpcodesList;
 #define REGEN_TIME_FULL
 #endif
 
-#if defined ELUNA_TRINITY
+#if defined ELUNA_AZEROTHCORE
+#define CORE_NAME               "AzerothCore"
+#define REGEN_TIME_FULL
+#endif
+
+#if defined ELUNA_TRINITY || defined ELUNA_AZEROTHCORE
 #define CORE_VERSION            (GitRevision::GetFullVersion())
 #define eWorld                  (sWorld)
+#if defined ELUNA_AZEROTHCORE
+#define eWorldSessionMgr        (sWorldSessionMgr)
+#endif
 #define eMapMgr                 (sMapMgr)
 #define eGuildMgr               (sGuildMgr)
 #define eObjectMgr              (sObjectMgr)
+#if defined ELUNA_AZEROTHCORE
+#define eAccountMgr()           AccountMgr::
+#else
 #define eAccountMgr             (sAccountMgr)
+#endif
 #define eAuctionMgr             (sAuctionMgr)
 #define eGameEventMgr           (sGameEventMgr)
 #define eObjectAccessor()       ObjectAccessor::

ElunaInstanceAI.h

@@ -8,7 +8,7 @@
 #define _ELUNA_INSTANCE_DATA_H
 
 #include "LuaEngine.h"
-#if defined ELUNA_TRINITY
+#if defined ELUNA_TRINITY || defined ELUNA_AZEROTHCORE
 #include "InstanceScript.h"
 #include "Map.h"
 #elif defined ELUNA_CMANGOS
@@ -82,7 +82,7 @@ class ElunaInstanceAI : public InstanceData
      *   data table to/from the core.
      */
     void Load(const char* data) override;
-#if defined ELUNA_TRINITY
+#if defined ELUNA_TRINITY || defined ELUNA_AZEROTHCORE
     // Simply calls Save, since the functions are a bit different in name and data types on different cores
     std::string GetSaveData() override
     {
@@ -148,7 +148,7 @@ class ElunaInstanceAI : public InstanceData
         instance->GetEluna()->OnPlayerEnterInstance(this, player);
     }
 
-#if defined ELUNA_TRINITY
+#if defined ELUNA_TRINITY || defined ELUNA_AZEROTHCORE
     void OnGameObjectCreate(GameObject* gameobject) override
 #else
     void OnObjectCreate(GameObject* gameobject) override

ElunaLoader.cpp

@@ -356,14 +356,14 @@ void ElunaLoader::ReloadElunaForMap(int mapId)
     if (mapId != RELOAD_CACHE_ONLY)
     {
         if (mapId == RELOAD_GLOBAL_STATE || mapId == RELOAD_ALL_STATES)
-#if defined ELUNA_TRINITY
+#if defined ELUNA_TRINITY || defined ELUNA_AZEROTHCORE
             if (Eluna* e = sWorld->GetEluna())
 #else
             if (Eluna* e = sWorld.GetEluna())
 #endif
                 e->ReloadEluna();
 
-#if defined ELUNA_TRINITY
+#if defined ELUNA_TRINITY || defined ELUNA_AZEROTHCORE
         sMapMgr->DoForAllMaps([&](Map* map)
 #else
         sMapMgr.DoForAllMaps([&](Map* map)

ElunaUtility.cpp

@@ -22,7 +22,7 @@
 
 uint32 ElunaUtil::GetCurrTime()
 {
-#if defined ELUNA_TRINITY || ELUNA_MANGOS
+#if defined ELUNA_TRINITY || defined ELUNA_MANGOS  || defined ELUNA_AZEROTHCORE
     return getMSTime();
 #else
     return WorldTimer::getMSTime();
@@ -31,7 +31,7 @@ uint32 ElunaUtil::GetCurrTime()
 
 uint32 ElunaUtil::GetTimeDiff(uint32 oldMSTime)
 {
-#if defined ELUNA_TRINITY || ELUNA_MANGOS
+#if defined ELUNA_TRINITY || defined ELUNA_MANGOS  || defined ELUNA_AZEROTHCORE
     return GetMSTimeDiffToNow(oldMSTime);
 #else
     return WorldTimer::getMSTimeDiff(oldMSTime, WorldTimer::getMSTime());

ElunaUtility.h

@@ -18,7 +18,7 @@
 #include "SharedDefines.h"
 #include "ObjectGuid.h"
 #include "Log.h"
-#if defined ELUNA_TRINITY
+#if defined ELUNA_TRINITY 
 #include "QueryResult.h"
 #else
 #include "Database/QueryResult.h"
@@ -35,14 +35,18 @@
 #include <mutex>
 #include <memory>
 
-#if defined ELUNA_TRINITY || ELUNA_CMANGOS
+#if defined ELUNA_TRINITY || ELUNA_CMANGOS || ELUNA_AZEROTHCORE
 #define USING_BOOST
 #endif
 
 #if defined TRINITY_PLATFORM && defined TRINITY_PLATFORM_WINDOWS
 #if TRINITY_PLATFORM == TRINITY_PLATFORM_WINDOWS
 #define ELUNA_WINDOWS
 #endif
+#elif defined AC_PLATFORM && defined AC_PLATFORM_WINDOWS
+#if AC_PLATFORM == AC_PLATFORM_WINDOWS
+#define ELUNA_WINDOWS
+#endif
 #elif defined PLATFORM && defined PLATFORM_WINDOWS
 #if PLATFORM == PLATFORM_WINDOWS
 #define ELUNA_WINDOWS
@@ -51,7 +55,7 @@
 #error Eluna could not determine platform
 #endif
 
-#if defined ELUNA_TRINITY
+#if defined ELUNA_TRINITY || ELUNA_AZEROTHCORE
 typedef QueryResult ElunaQuery;
 #define GET_GUID                GetGUID
 #define HIGHGUID_PLAYER         HighGuid::Player
@@ -81,6 +85,18 @@ typedef QueryResult ElunaQuery;
 #define ELUNA_LOG_INFO(...)     ELUNA_LOG_TC_FMT(TC_LOG_INFO, __VA_ARGS__);
 #define ELUNA_LOG_ERROR(...)    ELUNA_LOG_TC_FMT(TC_LOG_ERROR, __VA_ARGS__);
 #define ELUNA_LOG_DEBUG(...)    ELUNA_LOG_TC_FMT(TC_LOG_DEBUG, __VA_ARGS__);
+#elif defined ELUNA_AZEROTHCORE
+#include "fmt/printf.h"
+#define ELUNA_LOG_AC_FMT(AC_LOG_MACRO, ...) \
+    try { \
+        std::string message = fmt::sprintf(__VA_ARGS__); \
+        AC_LOG_MACRO("eluna", "{}", message); \
+    } catch (const std::exception& e) { \
+        AC_LOG_MACRO("eluna", "Failed to format log message: {}", e.what()); \
+    }
+#define ELUNA_LOG_INFO(...)     ELUNA_LOG_AC_FMT(LOG_INFO, __VA_ARGS__);
+#define ELUNA_LOG_ERROR(...)    ELUNA_LOG_AC_FMT(LOG_ERROR, __VA_ARGS__);
+#define ELUNA_LOG_DEBUG(...)    ELUNA_LOG_AC_FMT(LOG_DEBUG, __VA_ARGS__);
 #elif defined ELUNA_VMANGOS
 typedef std::shared_ptr<QueryNamedResult> ElunaQuery;
 #define ASSERT                  MANGOS_ASSERT

LuaEngine.h

@@ -59,10 +59,12 @@ class SpellCastTargets;
 class Unit;
 class Weather;
 class WorldPacket;
+#if !defined ELUNA_AZEROTHCORE
 struct AreaTriggerEntry;
+#endif
 struct AuctionEntry;
 
-#if defined ELUNA_TRINITY
+#if defined ELUNA_TRINITY || defined ELUNA_AZEROTHCORE
 class Battleground;
 class GameObjectAI;
 class InstanceScript;
@@ -72,6 +74,9 @@ struct ItemTemplate;
 typedef Battleground BattleGround;
 typedef BattlegroundTypeId BattleGroundTypeId;
 typedef InstanceScript InstanceData;
+#if defined ELUNA_AZEROTHCORE
+typedef AreaTrigger AreaTriggerEntry;
+#endif
 #else
 class InstanceData;
 struct ItemPrototype;
@@ -141,6 +146,8 @@ enum MethodFlags : uint32
 #if defined ELUNA_TRINITY
 #define ELUNA_GAME_API TC_GAME_API
 #define TRACKABLE_PTR_NAMESPACE ::Trinity::
+#elif defined ELUNA_AZEROTHCORE
+#define ELUNA_GAME_API AC_GAME_API
 #else
 #define ELUNA_GAME_API
 #if defined ELUNA_CMANGOS
@@ -246,15 +253,15 @@ class ELUNA_GAME_API Eluna
     template<typename T>
     void HookPush(T const* ptr)                     { Push(ptr); ++push_counter; }
 
-#if defined ELUNA_TRINITY
+#if defined ELUNA_TRINITY || defined ELUNA_AZEROTHCORE
     QueryCallbackProcessor queryProcessor;
 #endif
 public:
 
     lua_State* L;
     std::unique_ptr<EventMgr> eventMgr;
 
-#if defined ELUNA_TRINITY
+#if defined ELUNA_TRINITY || defined ELUNA_AZEROTHCORE
     QueryCallbackProcessor& GetQueryProcessor() { return queryProcessor; }
 #endif
 

hooks/CreatureHooks.cpp

@@ -299,7 +299,7 @@ bool Eluna::SpellHitTarget(Creature* me, WorldObject* target, SpellInfo const* s
     return CallAllFunctionsBool(CreatureEventBindings, CreatureUniqueBindings, entry_key, unique_key);
 }
 
-#if defined ELUNA_TRINITY
+#if defined ELUNA_TRINITY || defined ELUNA_AZEROTHCORE
 
 bool Eluna::SummonedCreatureDies(Creature* me, Creature* summon, Unit* killer)
 {