Feature: Added GetUnitFlags(), GetUnitFlagsTwo(), SetUnitFlags(flags), SetUnitFlagsTwo(flags), Added PlayerEvent OnApplyAura/OnRemoveAura

src/LuaEngine/CreatureMethods.h

@@ -914,6 +914,31 @@ auto const& threatlist = creature->GetThreatMgr().GetThreatList();
         Eluna::Push(L, creature->GetUInt32Value(UNIT_NPC_FLAGS));
         return 1;
     }
+
+    /**
+    * Returns the [Creature]'s Unit flags.
+    *
+    * These are used to control whether the NPC is attackable or not as well as many other different things,
+    *
+    *
+    * @return [unit_flags] unitFlags
+    */
+    int GetUnitFlags(lua_State* L, Creature* creature)
+    {
+        Eluna::Push(L, creature->GetUInt32Value(UNIT_FIELD_FLAGS));
+        return 1;
+    }
+
+    /**
+    * Returns the [Creature]'s Unit flags 2.
+    *
+    * @return [unit_flags2] unitFlags2
+    */
+    int GetUnitFlagsTwo(lua_State* L, Creature* creature)
+    {
+        Eluna::Push(L, creature->GetUInt32Value(UNIT_FIELD_FLAGS_2));
+        return 1;
+    }
 
     /**
      * Returns the [Creature]'s Extra flags.
@@ -923,6 +948,7 @@ auto const& threatlist = creature->GetThreatMgr().GetThreatList();
      *
      * @return [ExtraFlags] extraFlags
      */
+
     int GetExtraFlags(lua_State* L, Creature* creature)
     {
 #if defined(TRINITY) || defined(AZEROTHCORE)
@@ -982,6 +1008,30 @@ auto const& threatlist = creature->GetThreatMgr().GetThreatList();
         creature->SetUInt32Value(UNIT_NPC_FLAGS, flags);
         return 0;
     }
+
+    /**
+    * Sets the [Creature]'s UNIT flags to `flags`.
+    *
+    * @param [unit_flags] flags
+    */
+    int SetUnitFlags(lua_State* L, Creature* creature)
+    {
+        uint32 flags = Eluna::CHECKVAL<uint32>(L, 2);
+        creature->SetUInt32Value(UNIT_FIELD_FLAGS, flags);
+        return 0;
+    }
+
+    /**
+    * Sets the [Creature]'s UNIT flags2 to `flags`.
+    *
+    * @param [unit_flags2] flags
+    */
+    int SetUnitFlagsTwo(lua_State* L, Creature* creature)
+    {
+        uint32 flags = Eluna::CHECKVAL<uint32>(L, 2);
+        creature->SetUInt32Value(UNIT_FIELD_FLAGS_2, flags);
+        return 0;
+    }
 
 #if defined(TRINITY) || defined(AZEROTHCORE)
     /**

src/LuaEngine/Hooks.h

@@ -218,7 +218,9 @@ namespace Hooks
         PLAYER_EVENT_ON_COMPLETE_QUEST          =     54,       // (event, player, quest)
         PLAYER_EVENT_ON_CAN_GROUP_INVITE        =     55,       // (event, player, memberName) - Can return false to prevent inviting
         PLAYER_EVENT_ON_GROUP_ROLL_REWARD_ITEM  =     56,       // (event, player, item, count, voteType, roll)
-
+        PLAYER_EVENT_ON_APPLY_AURA              =     57,       // (event, player, aura, isNewAura)
+        PLAYER_EVENT_ON_REMOVE_AURA             =     58,       // (event, player, aura, isExpired)
+
         PLAYER_EVENT_COUNT
     };
 

src/LuaEngine/LuaFunctions.cpp

@@ -813,6 +813,8 @@ ElunaRegister<Creature> CreatureMethods[] =
     { "GetLootRecipient", &LuaCreature::GetLootRecipient },
     { "GetLootRecipientGroup", &LuaCreature::GetLootRecipientGroup },
     { "GetNPCFlags", &LuaCreature::GetNPCFlags },
+    { "GetUnitFlags", &LuaCreature::GetUnitFlags },
+    { "GetUnitFlagsTwo", &LuaCreature::GetUnitFlagsTwo },
     { "GetExtraFlags", &LuaCreature::GetExtraFlags },
 #if defined(CLASSIC) || defined(TBC) || defined(WOTLK)
     { "GetShieldBlockValue", &LuaCreature::GetShieldBlockValue },
@@ -838,6 +840,8 @@ ElunaRegister<Creature> CreatureMethods[] =
     { "SetLootMode", &LuaCreature::SetLootMode },
 #endif
     { "SetNPCFlags", &LuaCreature::SetNPCFlags },
+    { "SetUnitFlags", &LuaCreature::SetUnitFlags },
+    { "SetUnitFlagsTwo", &LuaCreature::SetUnitFlagsTwo },
 #if defined(TRINITY) || AZEROTHCORE
     { "SetReactState", &LuaCreature::SetReactState },
 #endif

src/LuaEngine/PlayerHooks.cpp

@@ -690,3 +690,21 @@ void Eluna::OnGroupRollRewardItem(Player* player, Item* item, uint32 count, Roll
     Push(roll);
     CallAllFunctions(PlayerEventBindings, key);
 }
+
+void Eluna::OnApplyAura(Player* player, Aura* aura, bool isNewAura)
+{
+    START_HOOK(PLAYER_EVENT_ON_APPLY_AURA);
+    Push(player);
+    Push(aura);
+    Push(isNewAura);
+    CallAllFunctions(PlayerEventBindings, key);
+}
+
+void Eluna::OnRemoveAura(Player* player, Aura* aura, bool isExpired)
+{
+    START_HOOK(PLAYER_EVENT_ON_REMOVE_AURA);
+    Push(player);
+    Push(aura);
+    Push(isExpired);
+    CallAllFunctions(PlayerEventBindings, key);
+}