TC Retail: Fixes

Fix compat
Enable more functions
Fix warning
TC Retail: Remove duplicate check
TC Retail: Adjust method for changed core call
TC Retail: GUID difference correction
TC Retail: Fix PCH build fail
Enable Item Random functions

Author: Niam5

ElunaEventMgr.cpp

@@ -225,8 +225,10 @@ ElunaEventProcessor* EventMgr::GetGlobalProcessor(GlobalEventSpace space)
 
 uint64 EventMgr::CreateObjectProcessor(WorldObject* obj)
 {
-#if !ELUNA_CMANGOS && !ELUNA_VMANGOS
+#if !ELUNA_CMANGOS && !ELUNA_VMANGOS && (ELUNA_EXPANSION != EXP_RETAIL)
     uint64 id = obj->GetGUID().GetRawValue();
+#elif ELUNA_EXPANSION == EXP_RETAIL
+    uint64 id = obj->GetGUID().GetCounter();
 #else
     uint64 id = obj->GetObjectGuid().GetRawValue();
 #endif

ElunaIncludes.h

@@ -20,6 +20,7 @@
 #include "DBCStores.h"
 #else
 #include "DB2Stores.h"
+#include "ChatPackets.h"
 #endif
 #include "GameEventMgr.h"
 #include "GossipDef.h"

ElunaTemplate.h

@@ -155,6 +155,9 @@ MAKE_ELUNA_OBJECT_VALUE_IMPL(unsigned long long);
 MAKE_ELUNA_OBJECT_VALUE_IMPL(ObjectGuid);
 MAKE_ELUNA_OBJECT_VALUE_IMPL(WorldPacket);
 MAKE_ELUNA_OBJECT_VALUE_IMPL(ElunaQuery);
+#if ELUNA_EXPANSION == EXP_RETAIL
+MAKE_ELUNA_OBJECT_VALUE_IMPL(std::vector<SpellPowerCost>);
+#endif
 
 template<typename T = void>
 struct ElunaRegister

LuaEngine.h

@@ -576,7 +576,11 @@ class ELUNA_GAME_API Eluna
     void OnRemoveMember(Group* group, ObjectGuid guid, uint8 method);
     void OnChangeLeader(Group* group, ObjectGuid newLeaderGuid, ObjectGuid oldLeaderGuid);
     void OnDisband(Group* group);
+#if ELUNA_EXPANSION < EXP_RETAIL
     void OnCreate(Group* group, ObjectGuid leaderGuid, GroupType groupType);
+#else
+    void OnCreate(Group* group, ObjectGuid leaderGuid, GroupFlags groupFlags);
+#endif
     bool OnMemberAccept(Group* group, Player* player);
 
     /* Map */

hooks/GroupHooks.cpp

@@ -65,6 +65,7 @@ void Eluna::OnDisband(Group* group)
     CallAllFunctions(binding, key);
 }
 
+#if ELUNA_EXPANSION < EXP_RETAIL
 void Eluna::OnCreate(Group* group, ObjectGuid leaderGuid, GroupType groupType)
 {
     START_HOOK(GROUP_EVENT_ON_CREATE);
@@ -73,6 +74,16 @@ void Eluna::OnCreate(Group* group, ObjectGuid leaderGuid, GroupType groupType)
     HookPush(groupType);
     CallAllFunctions(binding, key);
 }
+#else
+void Eluna::OnCreate(Group* group, ObjectGuid leaderGuid, GroupFlags groupFlags)
+{
+    START_HOOK(GROUP_EVENT_ON_CREATE);
+    HookPush(group);
+    HookPush(leaderGuid);
+    HookPush(groupFlags);
+    CallAllFunctions(binding, key);
+}
+#endif
 
 bool Eluna::OnMemberAccept(Group* group, Player* player)
 {

hooks/Hooks.h

@@ -9,6 +9,8 @@
 
 #if defined ELUNA_CMANGOS
 #include "Platform/Define.h"
+#elif defined ELUNA_TRINITY
+#include "Define.h"
 #endif
 #include <utility>
 

methods/TrinityCore/GlobalMethods.h

@@ -366,7 +366,7 @@ namespace LuaGlobalFunctions
 #endif
         return 1;
     }
-#if ELUNA_EXPANSION < EXP_RETAIL
+
     /**
      * Builds a [GameObject]'s GUID.
      *
@@ -382,7 +382,11 @@ namespace LuaGlobalFunctions
     {
         uint32 lowguid = E->CHECKVAL<uint32>(1);
         uint32 entry = E->CHECKVAL<uint32>(2);
+#if ELUNA_EXPANSION < EXP_RETAIL
         E->Push(ObjectGuid::Create<HIGHGUID_GAMEOBJECT>(entry, lowguid));
+#else
+        E->Push(ObjectGuid::Create<HighGuid::GameObject>(E->GetBoundMapId(), entry, lowguid));
+#endif
         return 1;
     }
 
@@ -401,10 +405,13 @@ namespace LuaGlobalFunctions
     {
         uint32 lowguid = E->CHECKVAL<uint32>(1);
         uint32 entry = E->CHECKVAL<uint32>(2);
+#if ELUNA_EXPANSION < EXP_RETAIL
         E->Push(ObjectGuid::Create<HIGHGUID_UNIT>(entry, lowguid));
+#else
+        E->Push(ObjectGuid::Create<HighGuid::Creature>(E->GetBoundMapId(), entry, lowguid));
+#endif
         return 1;
     }
-#endif
 
     /**
      * Returns the low GUID from a GUID.
@@ -1661,7 +1668,6 @@ namespace LuaGlobalFunctions
         return 0;
     }
 
-#if ELUNA_EXPANSION < EXP_RETAIL
     /**
      * Performs an in-game spawn and returns the [Creature] or [GameObject] spawned.
      *
@@ -1690,13 +1696,15 @@ namespace LuaGlobalFunctions
         float o = E->CHECKVAL<float>(8);
         bool save = E->CHECKVAL<bool>(9, false);
         uint32 durorresptime = E->CHECKVAL<uint32>(10, 0);
+#if ELUNA_EXPANSION < EXP_RETAIL
         uint32 phase = E->CHECKVAL<uint32>(11, PHASEMASK_NORMAL);
 
         if (!phase)
         {
             E->Push();
             return 1;
         }
+#endif
 
         Map* map = eMapMgr->FindMap(mapID, instanceID);
         if (!map)
@@ -1712,14 +1720,21 @@ namespace LuaGlobalFunctions
             if (save)
             {
                 Creature* creature = new Creature();
+#if ELUNA_EXPANSION < EXP_RETAIL
                 if (!creature->Create(map->GenerateLowGuid<HighGuid::Unit>(), map, phase, entry, pos))
+#else
+                if (!creature->CreateCreature(entry, map, pos))
+#endif
                 {
                     delete creature;
                     E->Push();
                     return 1;
                 }
-
+#if ELUNA_EXPANSION < EXP_RETAIL
                 creature->SaveToDB(map->GetId(), (1 << map->GetSpawnMode()), phase);
+#else
+                creature->SaveToDB();
+#endif
 
                 uint32 db_guid = creature->GetSpawnId();
 
@@ -1735,13 +1750,20 @@ namespace LuaGlobalFunctions
                     E->Push();
                     return 1;
                 }
-
+#if ELUNA_EXPANSION < EXP_RETAIL
                 eObjectMgr->AddCreatureToGrid(db_guid, eObjectMgr->GetCreatureData(db_guid));
+#else
+                eObjectMgr->AddCreatureToGrid(eObjectMgr->GetCreatureData(db_guid));
+#endif
                 E->Push(creature);
             }
             else
             {
+#if ELUNA_EXPANSION < EXP_RETAIL
                 TempSummon* creature = map->SummonCreature(entry, pos, NULL, durorresptime);
+#else
+                TempSummon* creature = map->SummonCreature(entry, pos, NULL, Milliseconds(durorresptime));
+#endif
                 if (!creature)
                 {
                     E->Push();
@@ -1778,7 +1800,11 @@ namespace LuaGlobalFunctions
             uint32 guidLow = map->GenerateLowGuid<HighGuid::GameObject>();
             QuaternionData rot = QuaternionData::fromEulerAnglesZYX(o, 0.f, 0.f);
 
+#if ELUNA_EXPANSION < EXP_RETAIL
             if (!object->Create(guidLow, objectInfo->entry, map, phase, Position(x, y, z, o), rot, 0, GO_STATE_READY))
+#else
+            if (!object->CreateGameObject(objectInfo->entry, map, Position(x, y, z, o), rot, 0, GO_STATE_READY))
+#endif
             {
                 delete object;
                 E->Push();
@@ -1791,7 +1817,11 @@ namespace LuaGlobalFunctions
             if (save)
             {
                 // fill the gameobject data and save to the db
+#if ELUNA_EXPANSION < EXP_RETAIL
                 object->SaveToDB(map->GetId(), (1 << map->GetSpawnMode()), phase);
+#else
+                object->SaveToDB();
+#endif
                 guidLow = object->GetSpawnId();
 
                 // delete the old object and do a clean load from DB with a fresh new GameObject instance.
@@ -1806,7 +1836,11 @@ namespace LuaGlobalFunctions
                     E->Push();
                     return 1;
                 }
+#if ELUNA_EXPANSION < EXP_RETAIL
                 eObjectMgr->AddGameobjectToGrid(guidLow, eObjectMgr->GetGameObjectData(guidLow));
+#else
+                eObjectMgr->AddGameobjectToGrid(eObjectMgr->GetGameObjectData(guidLow));
+#endif
             }
             else
                 map->AddToMap(object);
@@ -1817,7 +1851,6 @@ namespace LuaGlobalFunctions
         E->Push();
         return 1;
     }
-#endif
 
     /**
      * Creates a [WorldPacket].
@@ -2025,7 +2058,6 @@ namespace LuaGlobalFunctions
         return 0;
     }
 
-#if ELUNA_EXPANSION < EXP_RETAIL
     /**
      * Sends mail to a [Player].
      *
@@ -2098,7 +2130,11 @@ namespace LuaGlobalFunctions
                 luaL_error(E->L, "Item entry %d has invalid amount %d", entry, amount);
                 continue;
             }
+#if ELUNA_EXPANSION < EXP_RETAIL
             if (Item* item = Item::CreateItem(entry, amount))
+#else
+            if (Item* item = Item::CreateItem(entry, amount, ItemContext::NONE))
+#endif
             {
                 item->SaveToDB(trans);
                 draft.AddItem(item);
@@ -2117,7 +2153,6 @@ namespace LuaGlobalFunctions
 
         return addedItems;
     }
-#endif
 
     /**
      * Performs a bitwise AND (a & b).
@@ -2207,7 +2242,6 @@ namespace LuaGlobalFunctions
         return 1;
     }
 
-#if ELUNA_EXPANSION < EXP_RETAIL
     /**
      * Adds a taxi path to a specified map, returns the used pathId.
      *
@@ -2326,7 +2360,9 @@ namespace LuaGlobalFunctions
         }
         if (startNode >= nodeId)
             return 1;
+#if ELUNA_EXPANSION < EXP_RETAIL
         sTaxiPathSetBySource[startNode][nodeId - 1] = TaxiPathBySourceAndDestination(pathId, price);
+#endif
         TaxiPathEntry* pathEntry = new TaxiPathEntry();
 
         pathEntry->FromTaxiNode = startNode;
@@ -2339,7 +2375,6 @@ namespace LuaGlobalFunctions
         E->Push(pathId);
         return 1;
     }
-#endif
     /**
      * Returns `true` if Eluna is in compatibility mode, `false` if in multistate.
      *
@@ -3217,17 +3252,12 @@ namespace LuaGlobalFunctions
         { "GetPlayerCount", &LuaGlobalFunctions::GetPlayerCount },
         { "GetPlayerGUID", &LuaGlobalFunctions::GetPlayerGUID },
         { "GetItemGUID", &LuaGlobalFunctions::GetItemGUID },
+        { "GetObjectGUID", &LuaGlobalFunctions::GetObjectGUID },
+        { "GetUnitGUID", &LuaGlobalFunctions::GetUnitGUID },
         { "GetGUIDLow", &LuaGlobalFunctions::GetGUIDLow },
         { "GetGUIDType", &LuaGlobalFunctions::GetGUIDType },
         { "GetGUIDEntry", &LuaGlobalFunctions::GetGUIDEntry },
         { "GetAreaName", &LuaGlobalFunctions::GetAreaName },
-#if ELUNA_EXPANSION < EXP_RETAIL
-        { "GetObjectGUID", &LuaGlobalFunctions::GetObjectGUID },
-        { "GetUnitGUID", &LuaGlobalFunctions::GetUnitGUID },
-#else
-        { "GetObjectGUID", METHOD_REG_NONE },
-        { "GetUnitGUID", METHOD_REG_NONE },
-#endif
         { "bit_not", &LuaGlobalFunctions::bit_not },
         { "bit_xor", &LuaGlobalFunctions::bit_xor },
         { "bit_rshift", &LuaGlobalFunctions::bit_rshift },
@@ -3267,22 +3297,16 @@ namespace LuaGlobalFunctions
         { "CreateLuaEvent", &LuaGlobalFunctions::CreateLuaEvent },
         { "RemoveEventById", &LuaGlobalFunctions::RemoveEventById },
         { "RemoveEvents", &LuaGlobalFunctions::RemoveEvents },
-        { "CreatePacket", &LuaGlobalFunctions::CreatePacket },
-#if ELUNA_EXPANSION < EXP_RETAIL
         { "PerformIngameSpawn", &LuaGlobalFunctions::PerformIngameSpawn },
-        { "SendMail", &LuaGlobalFunctions::SendMail },
-        { "AddTaxiPath", &LuaGlobalFunctions::AddTaxiPath },
-#else
-        { "PerformIngameSpawn", METHOD_REG_NONE },
-        { "SendMail", METHOD_REG_NONE },
-        { "AddTaxiPath", METHOD_REG_NONE },
-#endif
+        { "CreatePacket", &LuaGlobalFunctions::CreatePacket },
         { "AddVendorItem", &LuaGlobalFunctions::AddVendorItem },
         { "VendorRemoveItem", &LuaGlobalFunctions::VendorRemoveItem },
         { "VendorRemoveAllItems", &LuaGlobalFunctions::VendorRemoveAllItems },
         { "Kick", &LuaGlobalFunctions::Kick },
         { "Ban", &LuaGlobalFunctions::Ban },
         { "SaveAllPlayers", &LuaGlobalFunctions::SaveAllPlayers },
+        { "SendMail", &LuaGlobalFunctions::SendMail },
+        { "AddTaxiPath", &LuaGlobalFunctions::AddTaxiPath },
         { "CreateInt64", &LuaGlobalFunctions::CreateLongLong },
         { "CreateUint64", &LuaGlobalFunctions::CreateULongLong },
         { "StartGameEvent", &LuaGlobalFunctions::StartGameEvent },