Core/Units: Named unit flags linked to CreatureDifficulty flags

2 files changed, 16 insertions, 16 deletions

diff --git a/src/server/game/Entities/Creature/Creature.cpp b/src/server/game/Entities/Creature/Creature.cpp
index ae57f430667..cfea52352f4 100644
--- a/src/server/game/Entities/Creature/Creature.cpp
+++ b/src/server/game/Entities/Creature/Creature.cpp
@@ -3278,7 +3278,7 @@ void Creature::SetSpellFocus(Spell const* focusSpell, WorldObject const* target)
         }
     }
 
-    if (!HasUnitFlag2(UNIT_FLAG2_DISABLE_TURN))
+    if (!HasUnitFlag2(UNIT_FLAG2_CANNOT_TURN))
     {
         // Face the target - we need to do this before the unit state is modified for no-turn spells
         if (target)
@@ -3324,7 +3324,7 @@ void Creature::ReleaseSpellFocus(Spell const* focusSpell, bool withDelay)
 
     if (IsPet()) // player pets do not use delay system
     {
-        if (!HasUnitFlag2(UNIT_FLAG2_DISABLE_TURN))
+        if (!HasUnitFlag2(UNIT_FLAG2_CANNOT_TURN))
             ReacquireSpellFocusTarget();
     }
     else // don't allow re-target right away to prevent visual bugs
@@ -3343,7 +3343,7 @@ void Creature::ReacquireSpellFocusTarget()
 
     SetUpdateFieldValue(m_values.ModifyValue(&Unit::m_unitData).ModifyValue(&UF::UnitData::Target), _spellFocusInfo.Target);
 
-    if (!HasUnitFlag2(UNIT_FLAG2_DISABLE_TURN))
+    if (!HasUnitFlag2(UNIT_FLAG2_CANNOT_TURN))
     {
         if (!_spellFocusInfo.Target.IsEmpty())
         {
diff --git a/src/server/game/Entities/Creature/CreatureData.h b/src/server/game/Entities/Creature/CreatureData.h
index 96f97cbaf9e..626dbaa03ea 100644
--- a/src/server/game/Entities/Creature/CreatureData.h
+++ b/src/server/game/Entities/Creature/CreatureData.h
@@ -62,7 +62,7 @@ enum CreatureDifficultyFlags
     CREATURE_DIFFICULTYFLAGS_IGNORE_COMBAT                     = 0x02000000,
     CREATURE_DIFFICULTYFLAGS_UNK12                             = 0x04000000,
     CREATURE_DIFFICULTYFLAGS_SUMMON_GUARD_IF_IN_AGGRO_RANGE    = 0x08000000, // Creature will summon a guard if player is within its aggro range (even if creature doesn't attack per se)
-    CREATURE_DIFFICULTYFLAGS_ONLY_SWIM                         = 0x10000000, // UNIT_FLAG_UNK_15
+    CREATURE_DIFFICULTYFLAGS_CAN_SWIM                          = 0x10000000, // UnitFlags 0x8000 UNIT_FLAG_CAN_SWIM
     CREATURE_DIFFICULTYFLAGS_UNK13                             = 0x20000000, // Related to gravity
     CREATURE_DIFFICULTYFLAGS_TFLAG_UNK5                        = 0x40000000, // CREATURE_TYPEFLAGS_UNK5
     CREATURE_DIFFICULTYFLAGS_LARGE_AOI                         = 0x80000000  // UnitFlags2 0x200000
@@ -95,7 +95,7 @@ enum CreatureDifficultyFlags2
     CREATURE_DIFFICULTYFLAGS_2_UNK16                           = 0x00400000,
     CREATURE_DIFFICULTYFLAGS_2_UNK17                           = 0x00800000,
     CREATURE_DIFFICULTYFLAGS_2_UNK18                           = 0x01000000,
-    CREATURE_DIFFICULTYFLAGS_2_HIDE_BODY                       = 0x02000000, // UNIT_FLAG2_UNK1
+    CREATURE_DIFFICULTYFLAGS_2_HIDE_BODY                       = 0x02000000, // UnitFlags2 0x2 UNIT_FLAG2_HIDE_BODY
     CREATURE_DIFFICULTYFLAGS_2_UNK19                           = 0x04000000,
     CREATURE_DIFFICULTYFLAGS_2_SERVER_ONLY                     = 0x08000000,
     CREATURE_DIFFICULTYFLAGS_2_CAN_SAFE_FALL                   = 0x10000000,
@@ -108,13 +108,13 @@ enum CreatureDifficultyFlags3
 {
     CREATURE_DIFFICULTYFLAGS_3_UNK1                           = 0x00000001,
     CREATURE_DIFFICULTYFLAGS_3_UNK2                           = 0x00000002,
-    CREATURE_DIFFICULTYFLAGS_3_INSTANTLY_APPEAR_MODEL         = 0x00000004, // UNIT_FLAG2_INSTANTLY_APPEAR_MODEL
+    CREATURE_DIFFICULTYFLAGS_3_DONT_FADE_IN                   = 0x00000004, // UNIT_FLAG2_INSTANTLY_APPEAR_MODEL
     CREATURE_DIFFICULTYFLAGS_3_MASK_UID                       = 0x00000008, // CREATURE_TYPEFLAG_MASK_UID
     CREATURE_DIFFICULTYFLAGS_3_ENGINEERLOOT                   = 0x00000010, // CREATURE_TYPEFLAGS_ENGINEERLOOT
     CREATURE_DIFFICULTYFLAGS_3_UNK3                           = 0x00000020,
     CREATURE_DIFFICULTYFLAGS_3_UNK4                           = 0x00000040,
     CREATURE_DIFFICULTYFLAGS_3_UNK5                           = 0x00000080,
-    CREATURE_DIFFICULTYFLAGS_3_CANNOT_SWIM                    = 0x00000100, // UNIT_FLAG_UNK_14
+    CREATURE_DIFFICULTYFLAGS_3_CANT_SWIM                      = 0x00000100, // UnitFlags 0x4000
     CREATURE_DIFFICULTYFLAGS_3_EXOTIC                         = 0x00000200, // CREATURE_TYPEFLAGS_EXOTIC
     CREATURE_DIFFICULTYFLAGS_3_GIGANTIC_AOI                   = 0x00000400, // Since MoP, creatures with that flag have UnitFlags2 0x400000
     CREATURE_DIFFICULTYFLAGS_3_INFINITE_AOI                   = 0x00000800, // Since MoP, creatures with that flag have UnitFlags2 0x40000000
@@ -131,7 +131,7 @@ enum CreatureDifficultyFlags3
     CREATURE_DIFFICULTYFLAGS_3_PROJECTILE_COLLISION           = 0x00400000, // CREATURE_TYPEFLAGS_PROJECTILE_COLLISION
     CREATURE_DIFFICULTYFLAGS_3_CAN_BE_MULTITAPPED             = 0x00800000,
     CREATURE_DIFFICULTYFLAGS_3_DO_NOT_PLAY_MOUNTED_ANIMATIONS = 0x01000000, // CREATURE_TYPEFLAGS_DO_NOT_PLAY_MOUNTED_ANIMATIONS
-    CREATURE_DIFFICULTYFLAGS_3_DISABLE_TURN                   = 0x02000000, // UNIT_FLAG2_DISABLE_TURN
+    CREATURE_DIFFICULTYFLAGS_3_CANNOT_TURN                    = 0x02000000, // UnitFlags2 0x8000
     CREATURE_DIFFICULTYFLAGS_3_UNK12                          = 0x04000000,
     CREATURE_DIFFICULTYFLAGS_3_UNK13                          = 0x08000000,
     CREATURE_DIFFICULTYFLAGS_3_UNK14                          = 0x10000000,
@@ -157,17 +157,17 @@ enum CreatureDifficultyFlags4
     CREATURE_DIFFICULTYFLAGS_4_UNK9                                = 0x00001000,
     CREATURE_DIFFICULTYFLAGS_4_UNK10                               = 0x00002000,
     CREATURE_DIFFICULTYFLAGS_4_UNK11                               = 0x00004000,
-    CREATURE_DIFFICULTYFLAGS_4_UFLAG2_UNK20                        = 0x00008000, // UnitFlags2 0x100000
+    CREATURE_DIFFICULTYFLAGS_4_TREAT_AS_RAID_UNIT_FOR_HELPFUL_SPELLS = 0x00008000, // UnitFlags2 0x100000
     CREATURE_DIFFICULTYFLAGS_4_UNK12                               = 0x00010000,
     CREATURE_DIFFICULTYFLAGS_4_UNK13                               = 0x00020000,
     CREATURE_DIFFICULTYFLAGS_4_UNK14                               = 0x00040000,
     CREATURE_DIFFICULTYFLAGS_4_FORCE_GOSSIP                        = 0x00080000, // CREATURE_TYPEFLAGS_FORCE_GOSSIP
     CREATURE_DIFFICULTYFLAGS_4_UNK15                               = 0x00100000,
     CREATURE_DIFFICULTYFLAGS_4_DO_NOT_SHEATHE                      = 0x00200000, // CREATURE_TYPEFLAGS_DO_NOT_SHEATHE
-    CREATURE_DIFFICULTYFLAGS_4_IGNORE_SPELL_MIN_RANGE_RESTRICTIONS = 0x00400000, // UnitFlags2 0x8000000
+    CREATURE_DIFFICULTYFLAGS_4_ATTACKER_IGNORES_MINIMUM_RANGES     = 0x00400000, // UnitFlags2 0x8000000
     CREATURE_DIFFICULTYFLAGS_4_UNK16                               = 0x00800000,
-    CREATURE_DIFFICULTYFLAGS_4_PREVENT_SWIM                        = 0x01000000, // UnitFlags2 0x1000000
-    CREATURE_DIFFICULTYFLAGS_4_HIDE_IN_COMBAT_LOG                  = 0x02000000, // UnitFlags2 0x2000000
+    CREATURE_DIFFICULTYFLAGS_4_AI_WILL_ONLY_SWIM_IF_TARGET_SWIMS   = 0x01000000, // UnitFlags2 0x1000000
+    CREATURE_DIFFICULTYFLAGS_4_DONT_GENERATE_COMBAT_LOG_WHEN_ENGAGED_WITH_NPCS = 0x02000000, // UnitFlags2 0x2000000
     CREATURE_DIFFICULTYFLAGS_4_UNK17                               = 0x04000000,
     CREATURE_DIFFICULTYFLAGS_4_UNK18                               = 0x08000000,
     CREATURE_DIFFICULTYFLAGS_4_UNK19                               = 0x10000000,
@@ -178,20 +178,20 @@ enum CreatureDifficultyFlags4
 
 enum CreatureDifficultyFlags5
 {
-    CREATURE_DIFFICULTYFLAGS_5_UNTARGETABLE_BY_CLIENT       = 0x00000001, // UNIT_FLAG2_UNTARGETABLE_BY_CLIENT
+    CREATURE_DIFFICULTYFLAGS_5_UNTARGETABLE_BY_CLIENT       = 0x00000001, // UnitFlags2 0x4000000 UNIT_FLAG2_UNTARGETABLE_BY_CLIENT
     CREATURE_DIFFICULTYFLAGS_5_UNK1                         = 0x00000002,
-    CREATURE_DIFFICULTYFLAGS_5_UFLAG2_UNK30                 = 0x00000004, // UnitFlags2 0x10000000
+    CREATURE_DIFFICULTYFLAGS_5_UNINTERACTIBLE_IF_HOSTILE    = 0x00000004, // UnitFlags2 0x10000000
     CREATURE_DIFFICULTYFLAGS_5_UNK2                         = 0x00000008,
     CREATURE_DIFFICULTYFLAGS_5_UNK3                         = 0x00000010,
     CREATURE_DIFFICULTYFLAGS_5_UNK4                         = 0x00000020,
     CREATURE_DIFFICULTYFLAGS_5_UNK5                         = 0x00000040,
     CREATURE_DIFFICULTYFLAGS_5_UNK6                         = 0x00000080,
-    CREATURE_DIFFICULTYFLAGS_5_CAN_INTERACT_EVEN_IF_HOSTILE = 0x00000100, // UNIT_FLAG2_ALLOW_ENEMY_INTERACT
+    CREATURE_DIFFICULTYFLAGS_5_INTERACT_WHILE_HOSTILE       = 0x00000100, // UnitFlags2 0x4000 UNIT_FLAG2_INTERACT_WHILE_HOSTILE
     CREATURE_DIFFICULTYFLAGS_5_UNK7                         = 0x00000200,
     CREATURE_DIFFICULTYFLAGS_5_TFLAG2_UNK1                  = 0x00000400, // CREATURE_TYPEFLAGS_2_UNK1
     CREATURE_DIFFICULTYFLAGS_5_TFLAG2_UNK2                  = 0x00000800, // CREATURE_TYPEFLAGS_2_UNK2
     CREATURE_DIFFICULTYFLAGS_5_TFLAG2_UNK3                  = 0x00001000, // CREATURE_TYPEFLAGS_2_UNK3
-    CREATURE_DIFFICULTYFLAGS_5_UFLAG2_UNK19                 = 0x00002000, // UnitFlags2 0x80000
+    CREATURE_DIFFICULTYFLAGS_5_SUPPRESS_HIGHLIGHT_WHEN_TARGETED_OR_MOUSED_OVER = 0x00002000, // UnitFlags2 0x80000 141
     CREATURE_DIFFICULTYFLAGS_5_UNK8                         = 0x00004000,
     CREATURE_DIFFICULTYFLAGS_5_UNK9                         = 0x00008000,
     CREATURE_DIFFICULTYFLAGS_5_UNK10                        = 0x00010000,