TC Retail: Spell Method Changes

Untested and some methods disabled

Author: Niam5

ElunaSpellWrapper.cpp

@@ -7,7 +7,11 @@
 #include "ElunaIncludes.h"
 #include "ElunaTemplate.h"
 
+#if ELUNA_EXPANSION < EXP_RETAIL
 ElunaProcInfo::ElunaProcInfo(Unit* actor, Unit* actionTarget, uint32 typeMask,
+#else
+ElunaProcInfo::ElunaProcInfo(Unit* actor, Unit* actionTarget, ProcFlagsInit typeMask,
+#endif
     uint32 spellTypeMask, uint32 spellPhaseMask, uint32 hitMask,
     Spell* spell, SpellInfo const* spellInfo, SpellSchoolMask schoolMask, Map* map)
     : _actor(actor), _actionTarget(actionTarget), _typeMask(typeMask), _spellTypeMask(spellTypeMask), _spellPhaseMask(spellPhaseMask)
@@ -123,7 +127,11 @@ void ElunaProcInfo::ApplyToProcEventInfo(ProcEventInfo& procInfo) const
     }
 }
 
+#if ELUNA_EXPANSION < EXP_RETAIL
 ElunaSpellInfo::ElunaSpellInfo(uint32 spellId) : _spellInfo(sSpellMgr->GetSpellInfo(spellId))
+#else
+ElunaSpellInfo::ElunaSpellInfo(uint32 spellId) : _spellInfo(sSpellMgr->GetSpellInfo(spellId, DIFFICULTY_NONE))
+#endif
 {
 #ifdef ELUNA_TRINITY
     if (_spellInfo)

ElunaSpellWrapper.h

@@ -36,7 +36,11 @@ class ElunaProcInfo
 private:
     Unit* _actor;
     Unit* _actionTarget;
+#if ELUNA_EXPANSION < EXP_RETAIL
     uint32 _typeMask;
+#else
+    ProcFlagsInit _typeMask;
+#endif
     uint32 _spellTypeMask;
     uint32 _spellPhaseMask;
     uint32 _hitMask;
@@ -63,7 +67,11 @@ class ElunaProcInfo
 #endif
 
 public:
+#if ELUNA_EXPANSION < EXP_RETAIL
     ElunaProcInfo(Unit* actor, Unit* actionTarget, uint32 typeMask,
+#else
+    ElunaProcInfo(Unit* actor, Unit* actionTarget, ProcFlagsInit typeMask,
+#endif
         uint32 spellTypeMask, uint32 spellPhaseMask, uint32 hitMask,
         Spell* spell, SpellInfo const* spellInfo, SpellSchoolMask schoolMask, Map* map);
 
@@ -76,7 +84,11 @@ class ElunaProcInfo
     }
     Unit* GetActor() const { return _actor; }
     Unit* GetActionTarget() const { return _actionTarget; }
+#if ELUNA_EXPANSION < EXP_RETAIL
     uint32 GetTypeMask() const { return _typeMask; }
+#else
+    ProcFlagsInit GetTypeMask() const { return _typeMask; }
+#endif
     uint32 GetSpellTypeMask() const { return _spellTypeMask; }
     uint32 GetSpellPhaseMask() const { return _spellPhaseMask; }
     uint32 GetHitMask() const { return _hitMask; }

LuaEngine.h

@@ -656,7 +656,11 @@ class ELUNA_GAME_API Eluna
     void OnAuraDispel(Aura* aura, DispelInfo* dispelInfo);
     bool OnPeriodicTick(Aura* aura, AuraEffect const* auraEff, Unit* target);
     void OnPeriodicUpdate(Aura* aura, AuraEffect const* auraEff);
+#if ELUNA_EXPANSION < EXP_RETAIL
     void OnAuraCalcAmount(Aura* aura, AuraEffect const* auraEff, int32& amount, bool& canBeRecalculated);
+#else
+    void OnAuraCalcAmount(Aura* aura, AuraEffect const* auraEff, double& amount, bool& canBeRecalculated);
+#endif
     void OnCalcPeriodic(Aura* aura, AuraEffect const* auraEff, bool& isPeriodic, int32& amplitude);
     bool OnAuraCanProc(Aura* aura, ProcEventInfo& procInfo);
     bool OnAuraProc(Aura* aura, ProcEventInfo& procInfo);

hooks/SpellHooks.cpp

@@ -71,7 +71,11 @@ void Eluna::OnPeriodicUpdate(Aura* aura, AuraEffect const* auraEff)
     CallAllFunctions(binding, key);
 }
 
+#if ELUNA_EXPANSION < EXP_RETAIL
 void Eluna::OnAuraCalcAmount(Aura* aura, AuraEffect const* auraEff, int32& amount, bool& canBeRecalculated)
+#else
+void Eluna::OnAuraCalcAmount(Aura* aura, AuraEffect const* auraEff, double& amount, bool& canBeRecalculated)
+#endif
 {
     START_HOOK(SPELL_EVENT_ON_AURA_CALC_AMOUNT, aura);
 

methods/TrinityCore/ElunaProcInfoMethods.h

@@ -25,6 +25,7 @@ namespace LuaElunaProcInfo
         return 1;
     }
 
+#if ELUNA_EXPANSION < EXP_RETAIL
     /**
      * Returns the type mask of the proc event.
      *
@@ -35,6 +36,7 @@ namespace LuaElunaProcInfo
         E->Push(procInfo->GetTypeMask());
         return 1;
     }
+#endif
 
     /**
      * Returns the spell type mask of the proc event.
@@ -330,7 +332,11 @@ namespace LuaElunaProcInfo
         // Getters
         { "GetActor",          &LuaElunaProcInfo::GetActor },
         { "GetActionTarget",   &LuaElunaProcInfo::GetActionTarget },
+#if ELUNA_EXPANSION < EXP_RETAIL
         { "GetTypeMask",       &LuaElunaProcInfo::GetTypeMask },
+#else
+        { "GetTypeMask",       METHOD_REG_NONE },
+#endif
         { "GetSpellTypeMask",  &LuaElunaProcInfo::GetSpellTypeMask },
         { "GetSpellPhaseMask", &LuaElunaProcInfo::GetSpellPhaseMask },
         { "GetHitMask",        &LuaElunaProcInfo::GetHitMask },

methods/TrinityCore/GlobalMethods.h

@@ -3262,12 +3262,18 @@ namespace LuaGlobalFunctions
      * Returns the [SpellInfo] for the given spell ID, or nil if the spell does not exist.
      *
      * @param uint32 spellId : the spell ID to look up
+     * @param uint32 spellDiff : the difficulty level of the spell
      * @return [SpellInfo] spellInfo
      */
     int GetSpellInfo(Eluna* E)
     {
         uint32 spellId = E->CHECKVAL<uint32>(1);
+#if ELUNA_EXPANSION < EXP_RETAIL
         if (!sSpellMgr->GetSpellInfo(spellId))
+#else
+        uint32 spellDiff = E->CHECKVAL<uint32>(2);
+        if (!sSpellMgr->GetSpellInfo(spellId, static_cast<Difficulty>(spellDiff)))
+#endif
             return luaL_argerror(E->L, 1, "invalid spell id");
         ElunaSpellInfo info(spellId);
         E->Push(&info);