Mirror/TrinityCore
1
0
Fork 0
mirror of https://github.com/TrinityCore/TrinityCore.git synced 2026-01-15 23:20:36 +01:00
Code Issues Packages Projects Releases Wiki Activity

Core/Units: Renamed unknown unit flag (UNIT_FLAG_UNK_29 -> UNIT_FLAG_PREVENT_EMOTES_FROM_CHAT_TEXT)

Browse Source 
(cherry picked from commit a34519bded)
This commit is contained in:
Shauren
2021-03-02 23:11:49 +01:00
parent d9b7a40d43
commit fc456f7512
8 changed files with 19 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/server/game/Entities/Unit/UnitDefines.h
View File

@@ -146,7 +146,7 @@ enum UnitFlags : uint32
UNIT_FLAG_SKINNABLE = 0x04000000,
UNIT_FLAG_MOUNT = 0x08000000,
UNIT_FLAG_UNK_28 = 0x10000000,
UNIT_FLAG_UNK_29 = 0x20000000, // used in Feing Death spell
UNIT_FLAG_PREVENT_EMOTES_FROM_CHAT_TEXT = 0x20000000, // Prevent automatically playing emotes from parsing chat text, for example "lol" in /say, ending message with ? or !, or using /yell
UNIT_FLAG_SHEATHE = 0x40000000,
UNIT_FLAG_IMMUNE = 0x80000000, // Immune to damage
};

6
src/server/game/Entities/Unit/enuminfo_UnitDefines.cpp
View File

@@ -60,7 +60,7 @@ TC_API_EXPORT EnumText EnumUtils<UnitFlags>::ToString(UnitFlags value)
case UNIT_FLAG_SKINNABLE: return { "UNIT_FLAG_SKINNABLE", "UNIT_FLAG_SKINNABLE", "" };
case UNIT_FLAG_MOUNT: return { "UNIT_FLAG_MOUNT", "UNIT_FLAG_MOUNT", "" };
case UNIT_FLAG_UNK_28: return { "UNIT_FLAG_UNK_28", "UNIT_FLAG_UNK_28", "" };
case UNIT_FLAG_UNK_29: return { "UNIT_FLAG_UNK_29", "UNIT_FLAG_UNK_29", "used in Feing Death spell" };
case UNIT_FLAG_PREVENT_EMOTES_FROM_CHAT_TEXT: return { "UNIT_FLAG_PREVENT_EMOTES_FROM_CHAT_TEXT", "UNIT_FLAG_PREVENT_EMOTES_FROM_CHAT_TEXT", "Prevent automatically playing emotes from parsing chat text, for example \042lol\042 in /say, ending message with ? or !, or using /yell" };
case UNIT_FLAG_SHEATHE: return { "UNIT_FLAG_SHEATHE", "UNIT_FLAG_SHEATHE", "" };
case UNIT_FLAG_IMMUNE: return { "UNIT_FLAG_IMMUNE", "UNIT_FLAG_IMMUNE", "Immune to damage" };
default: throw std::out_of_range("value");
@@ -104,7 +104,7 @@ TC_API_EXPORT UnitFlags EnumUtils<UnitFlags>::FromIndex(size_t index)
case 26: return UNIT_FLAG_SKINNABLE;
case 27: return UNIT_FLAG_MOUNT;
case 28: return UNIT_FLAG_UNK_28;
case 29: return UNIT_FLAG_UNK_29;
case 29: return UNIT_FLAG_PREVENT_EMOTES_FROM_CHAT_TEXT;
case 30: return UNIT_FLAG_SHEATHE;
case 31: return UNIT_FLAG_IMMUNE;
default: throw std::out_of_range("index");
@@ -145,7 +145,7 @@ TC_API_EXPORT size_t EnumUtils<UnitFlags>::ToIndex(UnitFlags value)
case UNIT_FLAG_SKINNABLE: return 26;
case UNIT_FLAG_MOUNT: return 27;
case UNIT_FLAG_UNK_28: return 28;
case UNIT_FLAG_UNK_29: return 29;
case UNIT_FLAG_PREVENT_EMOTES_FROM_CHAT_TEXT: return 29;
case UNIT_FLAG_SHEATHE: return 30;
case UNIT_FLAG_IMMUNE: return 31;
default: throw std::out_of_range("value");

4
src/server/game/Spells/Auras/SpellAuraEffects.cpp
View File

@@ -2143,7 +2143,7 @@ void AuraEffect::HandleFeignDeath(AuraApplication const* aurApp, uint8 mode, boo
if (aurApp->GetRemoveMode())
return;
target->AddUnitFlag(UNIT_FLAG_UNK_29);
target->AddUnitFlag(UNIT_FLAG_PREVENT_EMOTES_FROM_CHAT_TEXT);
target->AddUnitFlag2(UNIT_FLAG2_FEIGN_DEATH);
target->AddDynamicFlag(UNIT_DYNFLAG_DEAD);
target->AddUnitState(UNIT_STATE_DIED);
@@ -2153,7 +2153,7 @@ void AuraEffect::HandleFeignDeath(AuraApplication const* aurApp, uint8 mode, boo
}
else
{
target->RemoveUnitFlag(UNIT_FLAG_UNK_29);
target->RemoveUnitFlag(UNIT_FLAG_PREVENT_EMOTES_FROM_CHAT_TEXT);
target->RemoveUnitFlag2(UNIT_FLAG2_FEIGN_DEATH);
target->RemoveDynamicFlag(UNIT_DYNFLAG_DEAD);
target->ClearUnitState(UNIT_STATE_DIED);

6
src/server/scripts/EasternKingdoms/ShadowfangKeep/boss_apothecary_hummel.cpp
View File

@@ -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();

4
src/server/scripts/Kalimdor/HallsOfOrigination/boss_earthrager_ptah.cpp
View File

@@ -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);
}
}

10
src/server/scripts/Northrend/IcecrownCitadel/boss_lady_deathwhisper.cpp
View File

@@ -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);

4
src/server/scripts/Northrend/Ulduar/Ulduar/boss_xt002.cpp
View File

@@ -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);
}
}

4
src/server/scripts/Northrend/zone_storm_peaks.cpp
View File

@@ -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);
}