Core/Spells: Implemented Spell attributesEx8

Remove custom flag spell scalable and apply flag SPELL_ATTR8_AURA_SEND_AMOUNT

4 files changed, 38 insertions, 7 deletions

diff --git a/src/server/game/Miscellaneous/SharedDefines.h b/src/server/game/Miscellaneous/SharedDefines.h
index a41070fa1e1..654f9d6da3e 100755
--- a/src/server/game/Miscellaneous/SharedDefines.h
+++ b/src/server/game/Miscellaneous/SharedDefines.h
@@ -563,6 +563,42 @@ enum SpellAttr7
     SPELL_ATTR7_UNK31                            = 0x80000000  // 31 only 70769
 };
 
+enum SpellAttr8
+{
+    SPELL_ATTR8_UNK0                             =    0x00000001, // 0
+    SPELL_ATTR8_UNK1                             =    0x00000002, // 1
+    SPELL_ATTR8_UNK2                             =    0x00000004, // 2
+    SPELL_ATTR8_UNK3                             =    0x00000008, // 3
+    SPELL_ATTR8_UNK4                             =    0x00000010, // 4
+    SPELL_ATTR8_UNK5                             =    0x00000020, // 5
+    SPELL_ATTR8_UNK6                             =    0x00000040, // 6
+    SPELL_ATTR8_UNK7                             =    0x00000080, // 7
+    SPELL_ATTR8_UNK8                             =    0x00000100, // 8
+    SPELL_ATTR8_UNK9                             =    0x00000200, // 9
+    SPELL_ATTR8_UNK10                            =    0x00000400, // 10
+    SPELL_ATTR8_UNK11                            =    0x00000800, // 11
+    SPELL_ATTR8_AURA_SEND_AMOUNT                 =    0x00001000, // 12 Aura must have flag AFLAG_ANY_EFFECT_AMOUNT_SENT to send amount
+    SPELL_ATTR8_UNK13                            =    0x00002000, // 13
+    SPELL_ATTR8_UNK14                            =    0x00004000, // 14
+    SPELL_ATTR8_UNK15                            =    0x00008000, // 15
+    SPELL_ATTR8_UNK16                            =    0x00010000, // 16
+    SPELL_ATTR8_UNK17                            =    0x00020000, // 17
+    SPELL_ATTR8_UNK18                            =    0x00040000, // 18
+    SPELL_ATTR8_UNK19                            =    0x00080000, // 19
+    SPELL_ATTR8_ARMOR_SPECIALIZATION             =    0x00100000, // 20
+    SPELL_ATTR8_UNK21                            =    0x00200000, // 21
+    SPELL_ATTR8_UNK22                            =    0x00400000, // 22
+    SPELL_ATTR8_UNK23                            =    0x00800000, // 23
+    SPELL_ATTR8_UNK24                            =    0x01000000, // 24
+    SPELL_ATTR8_UNK25                            =    0x02000000, // 25
+    SPELL_ATTR8_RAID_MARKER                      =    0x04000000, // 26 probably spell no need learn to cast
+    SPELL_ATTR8_UNK27                            =    0x08000000, // 27
+    SPELL_ATTR8_GUILD_PERKS                      =    0x10000000, // 28
+    SPELL_ATTR8_MASTERY                          =    0x20000000, // 29
+    SPELL_ATTR8_UNK30                            =    0x40000000, // 30
+    SPELL_ATTR8_UNK31                            =    0x80000000  // 31
+};
+
 #define MIN_TALENT_SPEC         0
 #define MAX_TALENT_SPEC         1
 #define MIN_TALENT_SPECS        1
diff --git a/src/server/game/Spells/Auras/SpellAuras.cpp b/src/server/game/Spells/Auras/SpellAuras.cpp
index be3f33bb5f1..f5b9c5b2cf2 100755
--- a/src/server/game/Spells/Auras/SpellAuras.cpp
+++ b/src/server/game/Spells/Auras/SpellAuras.cpp
@@ -148,7 +148,7 @@ void AuraApplication::_InitFlags(Unit* caster, uint8 effMask)
         _flags |= positiveFound ? AFLAG_POSITIVE : AFLAG_NEGATIVE;
     }
 
-    if (GetBase()->GetSpellInfo()->AttributesCu & SPELL_ATTR0_CU_SCALABLE)
+    if (GetBase()->GetSpellInfo()->AttributesEx8 & SPELL_ATTR8_AURA_SEND_AMOUNT)
         _flags |= AFLAG_ANY_EFFECT_AMOUNT_SENT;
 }
 
diff --git a/src/server/game/Spells/SpellInfo.h b/src/server/game/Spells/SpellInfo.h
index 46f9906c4de..a338b8d627f 100644
--- a/src/server/game/Spells/SpellInfo.h
+++ b/src/server/game/Spells/SpellInfo.h
@@ -175,7 +175,7 @@ enum SpellCustomAttributes
     SPELL_ATTR0_CU_CONE_LINE                     = 0x00000004,
     SPELL_ATTR0_CU_SHARE_DAMAGE                  = 0x00000008,
     SPELL_ATTR0_CU_NO_INITIAL_THREAT             = 0x00000010,
-    SPELL_ATTR0_CU_SCALABLE                      = 0x00000020,
+    SPELL_ATTR0_CU_NONE2                         = 0x00000020,   // UNUSED
     SPELL_ATTR0_CU_AURA_CC                       = 0x00000040,
     SPELL_ATTR0_CU_DIRECT_DAMAGE                 = 0x00000100,
     SPELL_ATTR0_CU_CHARGE                        = 0x00000200,
diff --git a/src/server/game/Spells/SpellMgr.cpp b/src/server/game/Spells/SpellMgr.cpp
index a1df9b997ef..fda59f27e0e 100644
--- a/src/server/game/Spells/SpellMgr.cpp
+++ b/src/server/game/Spells/SpellMgr.cpp
@@ -2670,11 +2670,6 @@ void SpellMgr::LoadSpellCustomAttr()
                 case SPELL_AURA_POWER_BURN:
                     spellInfo->AttributesCu |= SPELL_ATTR0_CU_NO_INITIAL_THREAT;
                     break;
-                case SPELL_AURA_MOUNTED:
-                case SPELL_AURA_OVERRIDE_ACTIONBAR_SPELLS:
-                case SPELL_AURA_OVERRIDE_ACTIONBAR_SPELLS_2:
-                    spellInfo->AttributesCu |= SPELL_ATTR0_CU_SCALABLE;
-                    break;
             }
 
             switch (spellInfo->Effects[j].Effect)