aboutsummaryrefslogtreecommitdiff
path: root/src/server/scripts
diff options
context:
space:
mode:
authorShauren <shauren.trinity@gmail.com>2021-03-02 23:11:49 +0100
committerShauren <shauren.trinity@gmail.com>2022-03-06 23:58:00 +0100
commitfc456f7512b3a5f1f5fdc5b17877018892070e4d (patch)
tree8eb961cada36a1dcc7410dc48118e73992ec24e0 /src/server/scripts
parentd9b7a40d432374034148368d766eb7e5a4c4fa9b (diff)
Core/Units: Renamed unknown unit flag (UNIT_FLAG_UNK_29 -> UNIT_FLAG_PREVENT_EMOTES_FROM_CHAT_TEXT)
(cherry picked from commit a34519bded8ae45705e7dddf6346008eea88ed39)
Diffstat (limited to 'src/server/scripts')
-rw-r--r--src/server/scripts/EasternKingdoms/ShadowfangKeep/boss_apothecary_hummel.cpp6
-rw-r--r--src/server/scripts/Kalimdor/HallsOfOrigination/boss_earthrager_ptah.cpp4
-rw-r--r--src/server/scripts/Northrend/IcecrownCitadel/boss_lady_deathwhisper.cpp10
-rw-r--r--src/server/scripts/Northrend/Ulduar/Ulduar/boss_xt002.cpp4
-rw-r--r--src/server/scripts/Northrend/zone_storm_peaks.cpp4
5 files changed, 13 insertions, 15 deletions
diff --git a/src/server/scripts/EasternKingdoms/ShadowfangKeep/boss_apothecary_hummel.cpp b/src/server/scripts/EasternKingdoms/ShadowfangKeep/boss_apothecary_hummel.cpp
index 080189461f8..e0cf29f5ef5 100644
--- a/src/server/scripts/EasternKingdoms/ShadowfangKeep/boss_apothecary_hummel.cpp
+++ b/src/server/scripts/EasternKingdoms/ShadowfangKeep/boss_apothecary_hummel.cpp
@@ -153,8 +153,7 @@ class boss_apothecary_hummel : public CreatureScript
_isDead = true;
me->RemoveAurasDueToSpell(SPELL_ALLURING_PERFUME);
DoCastSelf(SPELL_PERMANENT_FEIGN_DEATH, true);
- me->AddUnitFlag(UNIT_FLAG_UNK_29);
- me->AddUnitFlag(UNIT_FLAG_NOT_SELECTABLE);
+ me->AddUnitFlag(UnitFlags(UNIT_FLAG_PREVENT_EMOTES_FROM_CHAT_TEXT | UNIT_FLAG_NOT_SELECTABLE));
Talk(SAY_HUMMEL_DEATH);
}
}
@@ -175,8 +174,7 @@ class boss_apothecary_hummel : public CreatureScript
Talk(SAY_HUMMEL_DEATH);
events.Reset();
- me->RemoveUnitFlag(UNIT_FLAG_UNK_29);
- me->RemoveUnitFlag(UNIT_FLAG_NOT_SELECTABLE);
+ me->RemoveUnitFlag(UnitFlags(UNIT_FLAG_PREVENT_EMOTES_FROM_CHAT_TEXT | UNIT_FLAG_NOT_SELECTABLE));
instance->SetBossState(DATA_APOTHECARY_HUMMEL, DONE);
Map::PlayerList const& players = me->GetMap()->GetPlayers();
diff --git a/src/server/scripts/Kalimdor/HallsOfOrigination/boss_earthrager_ptah.cpp b/src/server/scripts/Kalimdor/HallsOfOrigination/boss_earthrager_ptah.cpp
index 9fedc46477c..31ec4005ce5 100644
--- a/src/server/scripts/Kalimdor/HallsOfOrigination/boss_earthrager_ptah.cpp
+++ b/src/server/scripts/Kalimdor/HallsOfOrigination/boss_earthrager_ptah.cpp
@@ -293,7 +293,7 @@ public:
{
if (Unit* ptah = GetCaster())
{
- ptah->AddUnitFlag(UnitFlags(UNIT_FLAG_NOT_SELECTABLE | UNIT_FLAG_UNK_29));
+ ptah->AddUnitFlag(UnitFlags(UNIT_FLAG_NOT_SELECTABLE | UNIT_FLAG_PREVENT_EMOTES_FROM_CHAT_TEXT));
ptah->AddUnitFlag2(UNIT_FLAG2_FEIGN_DEATH);
}
}
@@ -302,7 +302,7 @@ public:
{
if (Unit* ptah = GetCaster())
{
- ptah->RemoveUnitFlag(UnitFlags(UNIT_FLAG_NOT_SELECTABLE | UNIT_FLAG_UNK_29));
+ ptah->RemoveUnitFlag(UnitFlags(UNIT_FLAG_NOT_SELECTABLE | UNIT_FLAG_PREVENT_EMOTES_FROM_CHAT_TEXT));
ptah->RemoveUnitFlag2(UNIT_FLAG2_FEIGN_DEATH);
}
}
diff --git a/src/server/scripts/Northrend/IcecrownCitadel/boss_lady_deathwhisper.cpp b/src/server/scripts/Northrend/IcecrownCitadel/boss_lady_deathwhisper.cpp
index 1bd0bce987b..fdf2bd36b1f 100644
--- a/src/server/scripts/Northrend/IcecrownCitadel/boss_lady_deathwhisper.cpp
+++ b/src/server/scripts/Northrend/IcecrownCitadel/boss_lady_deathwhisper.cpp
@@ -644,12 +644,12 @@ struct npc_cult_fanatic : public ScriptedAI
DoCastSelf(SPELL_PERMANENT_FEIGN_DEATH);
DoCastSelf(SPELL_CLEAR_ALL_DEBUFFS);
DoCastSelf(SPELL_FULL_HEAL, true);
- me->AddUnitFlag(UnitFlags(UNIT_FLAG_STUNNED | UNIT_FLAG_UNK_29 | UNIT_FLAG_NOT_SELECTABLE));
+ me->AddUnitFlag(UnitFlags(UNIT_FLAG_STUNNED | UNIT_FLAG_PREVENT_EMOTES_FROM_CHAT_TEXT | UNIT_FLAG_NOT_SELECTABLE));
})
.Schedule(Seconds(6), [this](TaskContext /*context*/)
{
me->RemoveAurasDueToSpell(SPELL_PERMANENT_FEIGN_DEATH);
- me->RemoveUnitFlag(UnitFlags(UNIT_FLAG_STUNNED | UNIT_FLAG_UNK_29 | UNIT_FLAG_NOT_SELECTABLE));
+ me->RemoveUnitFlag(UnitFlags(UNIT_FLAG_STUNNED | UNIT_FLAG_PREVENT_EMOTES_FROM_CHAT_TEXT | UNIT_FLAG_NOT_SELECTABLE));
me->SetReactState(REACT_AGGRESSIVE);
DoZoneInCombat(me);
@@ -735,12 +735,12 @@ struct npc_cult_adherent : public ScriptedAI
DoCastSelf(SPELL_PERMANENT_FEIGN_DEATH);
DoCastSelf(SPELL_CLEAR_ALL_DEBUFFS);
DoCastSelf(SPELL_FULL_HEAL, true);
- me->AddUnitFlag(UnitFlags(UNIT_FLAG_STUNNED | UNIT_FLAG_UNK_29 | UNIT_FLAG_NOT_SELECTABLE));
- })
+ me->AddUnitFlag(UnitFlags(UNIT_FLAG_STUNNED | UNIT_FLAG_PREVENT_EMOTES_FROM_CHAT_TEXT | UNIT_FLAG_NOT_SELECTABLE));
+ })
.Schedule(Seconds(6), [this](TaskContext /*context*/)
{
me->RemoveAurasDueToSpell(SPELL_PERMANENT_FEIGN_DEATH);
- me->RemoveUnitFlag(UnitFlags(UNIT_FLAG_STUNNED | UNIT_FLAG_UNK_29 | UNIT_FLAG_NOT_SELECTABLE));
+ me->RemoveUnitFlag(UnitFlags(UNIT_FLAG_STUNNED | UNIT_FLAG_PREVENT_EMOTES_FROM_CHAT_TEXT | UNIT_FLAG_NOT_SELECTABLE));
me->SetReactState(REACT_AGGRESSIVE);
DoCastSelf(SPELL_SHROUD_OF_THE_OCCULT);
DoZoneInCombat(me);
diff --git a/src/server/scripts/Northrend/Ulduar/Ulduar/boss_xt002.cpp b/src/server/scripts/Northrend/Ulduar/Ulduar/boss_xt002.cpp
index dc0f4729651..96c5d3fb717 100644
--- a/src/server/scripts/Northrend/Ulduar/Ulduar/boss_xt002.cpp
+++ b/src/server/scripts/Northrend/Ulduar/Ulduar/boss_xt002.cpp
@@ -410,13 +410,13 @@ struct npc_xt002_heart : public NullCreatureAI
DoCast(xt002, SPELL_RIDE_VEHICLE_EXPOSED, true);
DoCastSelf(SPELL_HEART_OVERLOAD);
me->RemoveUnitFlag(UNIT_FLAG_NOT_SELECTABLE);
- me->AddUnitFlag(UNIT_FLAG_UNK_29);
+ me->AddUnitFlag(UNIT_FLAG_PREVENT_EMOTES_FROM_CHAT_TEXT);
}
else if (action == ACTION_DISPOSE_HEART)
{
DoCast(xt002, SPELL_HEART_RIDE_VEHICLE, true);
me->AddUnitFlag(UNIT_FLAG_NOT_SELECTABLE);
- me->RemoveUnitFlag(UNIT_FLAG_UNK_29);
+ me->RemoveUnitFlag(UNIT_FLAG_PREVENT_EMOTES_FROM_CHAT_TEXT);
}
}
diff --git a/src/server/scripts/Northrend/zone_storm_peaks.cpp b/src/server/scripts/Northrend/zone_storm_peaks.cpp
index 20408b10697..66ab85bbf94 100644
--- a/src/server/scripts/Northrend/zone_storm_peaks.cpp
+++ b/src/server/scripts/Northrend/zone_storm_peaks.cpp
@@ -1476,13 +1476,13 @@ public:
void HandleApply(AuraEffect const* /*aurEff*/, AuraEffectHandleModes /*mode*/)
{
- GetTarget()->AddUnitFlag(UNIT_FLAG_UNK_29);
+ GetTarget()->AddUnitFlag(UNIT_FLAG_PREVENT_EMOTES_FROM_CHAT_TEXT);
GetTarget()->AddUnitFlag2(UNIT_FLAG2_FEIGN_DEATH);
}
void HandleRemove(AuraEffect const* /*aurEff*/, AuraEffectHandleModes /*mode*/)
{
- GetTarget()->RemoveUnitFlag(UNIT_FLAG_UNK_29);
+ GetTarget()->RemoveUnitFlag(UNIT_FLAG_PREVENT_EMOTES_FROM_CHAT_TEXT);
GetTarget()->RemoveUnitFlag2(UNIT_FLAG2_FEIGN_DEATH);
}