From d5bdf04cca65fa2e5a9edefb576a405c88559d63 Mon Sep 17 00:00:00 2001
From: hondacrx <prelude_20032002@yahoo.com>
Date: Wed, 3 Nov 2021 12:34:28 -0400
Subject: [PATCH] Misc updates.

---
 Source/Framework/Constants/ConditionConst.cs |  1 +
 Source/Framework/Constants/GuildConst.cs     | 61 +++++++++++---------
 Source/Framework/Constants/ServiceHash.cs    |  9 ++-
 Source/Game/Spells/SpellInfo.cs              |  1 +
 4 files changed, 42 insertions(+), 30 deletions(-)

diff --git a/Source/Framework/Constants/ConditionConst.cs b/Source/Framework/Constants/ConditionConst.cs
index 0f6a6642c..72d41a168 100644
--- a/Source/Framework/Constants/ConditionConst.cs
+++ b/Source/Framework/Constants/ConditionConst.cs
@@ -104,6 +104,7 @@ namespace Framework.Constants
         Graveyard = 27,
         AreaTrigger = 28,
         ConversationLine = 29,
+        AreatriggerClientTriggered = 30,
         Max
     }
 
diff --git a/Source/Framework/Constants/GuildConst.cs b/Source/Framework/Constants/GuildConst.cs
index 24608f871..7a2f4363d 100644
--- a/Source/Framework/Constants/GuildConst.cs
+++ b/Source/Framework/Constants/GuildConst.cs
@@ -15,6 +15,8 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
+using System;
+
 namespace Framework.Constants
 {
     public class GuildConst
@@ -49,30 +51,34 @@ namespace Framework.Constants
         public static uint MasterDethroneInactiveDays = 90;
     }
 
+    [Flags]
     public enum GuildRankRights
     {
-        None = 0x00000000,
-        GChatListen = 0x00000001,
-        GChatSpeak = 0x00000002,
-        OffChatListen = 0x00000004,
-        OffChatSpeak = 0x00000008,
-        Invite = 0x00000010,
-        Remove = 0x00000020,
-        Roster = 0x00000040,
-        Promote = 0x00000080,
-        Demote = 0x00000100,
-        Unk200 = 0x00000200,
-        Unk400 = 0x00000400,
-        Unk800 = 0x00000800,
-        SetMotd = 0x00001000,
-        EditPublicNote = 0x00002000,
-        ViewOffNote = 0x00004000,
-        EOffNote = 0x00008000,
-        ModifyGuildInfo = 0x00010000,
-        WithdrawGoldLock = 0x00020000,                   // remove money withdraw capacity
-        WithdrawRepair = 0x00040000,                   // withdraw for repair
-        WithdrawGold = 0x00080000,                   // withdraw gold
-        CreateGuildEvent = 0x00100000,                   // wotlk
+        None = 0x00,
+        GChatListen = 0x01,
+        GChatSpeak = 0x02,
+        OffChatListen = 0x04,
+        OffChatSpeak = 0x08,
+        Invite = 0x10,
+        Remove = 0x20,
+        Roster = 0x40,
+        Promote = 0x80,
+        Demote = 0x100,
+        Unk200 = 0x200,
+        Unk400 = 0x400,
+        Unk800 = 0x800,
+        SetMotd = 0x1000,
+        EditPublicNote = 0x2000,
+        ViewOffNote = 0x4000,
+        EOffNote = 0x8000,
+        ModifyGuildInfo = 0x10000,
+        WithdrawGoldLock = 0x20000,                   // remove money withdraw capacity
+        WithdrawRepair = 0x40000,                   // withdraw for repair
+        WithdrawGold = 0x80000,                   // withdraw gold
+        CreateGuildEvent = 0x100000,                   // wotlk
+        InAuthenticatedRank = 0x200000,
+        EditGuildBankTabInfo = 0x400000,
+        Officer = 0x800000,
         All = 0x00DDFFBF
     }
 
@@ -85,13 +91,14 @@ namespace Framework.Constants
         public const int Initiate = 4;
     }
 
+    [Flags]
     public enum GuildMemberFlags
     {
-        None = 0,
-        Online = 1,
-        AFK = 2,
-        DND = 3,
-        Mobile = 4
+        None = 0x00,
+        Online = 0x01,
+        AFK = 0x02,
+        DND = 0x04,
+        Mobile = 0x08
     }
 
     public enum GuildMemberData
diff --git a/Source/Framework/Constants/ServiceHash.cs b/Source/Framework/Constants/ServiceHash.cs
index ce23fa9e4..4fe57dc6d 100644
--- a/Source/Framework/Constants/ServiceHash.cs
+++ b/Source/Framework/Constants/ServiceHash.cs
@@ -23,16 +23,19 @@ namespace Framework.Constants
         AccountListener = 0x54DFDA17u,
         AuthenticationListener = 0x71240E35u,
         AuthenticationService = 0xDECFC01u,
-        ChallengeService = 0xDBBF6F19u,
         ChallengeListener = 0xBBDA171Fu,
-        ChannelService = 0xB732DB32u,
-        ChannelListener = 0xBF8C8094u,
+        ClubListener = 0x80909D73u,
+        ClubMembershipListener = 0x2B34597Bu,
+        ClubMembershipService = 0x94B94786u,
+        ClubService = 0xE273DE0Eu,
         ConnectionService = 0x65446991u,
         FriendsService = 0xA3DDB1BDu,
         FriendsListener = 0x6F259A13u,
         GameUtilitiesService = 0x3FC1274Du,
+        PresenceListener = 0x890AB85Fu,
         PresenceService = 0xFA0796FFu,
         ReportService = 0x7CAF61C9u,
+        ReportServiceV2 = 0x3A4218FBu,
         ResourcesService = 0xECBE75BAu,
         UserManagerService = 0x3E19268Au,
         UserManagerListener = 0xBC872C22u
diff --git a/Source/Game/Spells/SpellInfo.cs b/Source/Game/Spells/SpellInfo.cs
index a3da4bde0..15f46a4b7 100644
--- a/Source/Game/Spells/SpellInfo.cs
+++ b/Source/Game/Spells/SpellInfo.cs
@@ -3291,6 +3291,7 @@ namespace Game.Spells
                         case 40268: // Spiritual Vengeance, Teron Gorefiend, Black Temple
                         case 61987: // Avenging Wrath Marker
                         case 61988: // Divine Shield exclude aura
+                        case 64412: // Phase Punch, Algalon the Observer, Ulduar
                         case 72410: // Rune of Blood, Saurfang, Icecrown Citadel
                         case 71204: // Touch of Insignificance, Lady Deathwhisper, Icecrown Citadel
                             return false;