nchebrov/azerothcore-wotlk
1
0
Fork 0
mirror of https://github.com/mod-playerbots/azerothcore-wotlk.git synced 2026-01-16 02:20:27 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix(Scripts/BlackTemple): Implement emotes when opening Najentus and … (#19946)

Browse Source 
* fix(Scripts/BlackTemple): Implement emotes when opening Najentus and Den of Mortal Delights

* only check if state is done
This commit is contained in:
Andrew
2024-09-15 07:48:11 -03:00
committed by GitHub
parent 99b39e5045
commit 8b16f7d243
5 changed files with 58 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
src/server/scripts/Outland/BlackTemple/black_temple.h
View File

@@ -42,7 +42,8 @@ enum DataTypes
DATA_GATHIOS_THE_SHATTERER = 12,
DATA_HIGH_NETHERMANCER_ZEREVOR = 13,
DATA_LADY_MALANDE = 14,
DATA_VERAS_DARKSHADOW = 15
DATA_VERAS_DARKSHADOW = 15,
DATA_BLACK_TEMPLE_TRIGGER = 16
};
enum CreatureIds
@@ -82,7 +83,8 @@ enum CreatureIds
NPC_ASHTONGUE_STALKER = 23374,
NPC_STORM_FURY = 22848,
NPC_DRAGON_TURTLE = 22885
NPC_DRAGON_TURTLE = 22885,
NPC_BLACK_TEMPLE_TRIGGER = 22984
};
enum GameObjectIds
@@ -113,6 +115,12 @@ enum MiscIds
SPELL_SUMMON_SHADOWFIENDS = 41159
};
enum Texts
{
EMOTE_NAJENTUS_DEFEATED = 0,
EMOTE_LOWER_TEMPLE_DEFEATED = 1
};
template <class AI, class T>
inline AI* GetBlackTempleAI(T* obj)
{

34
src/server/scripts/Outland/BlackTemple/instance_black_temple.cpp
View File

@@ -62,6 +62,7 @@ ObjectData const creatureData[] =
{ NPC_VERAS_DARKSHADOW, DATA_VERAS_DARKSHADOW },
{ NPC_AKAMA_ILLIDAN, DATA_AKAMA_ILLIDAN },
{ NPC_ILLIDAN_STORMRAGE, DATA_ILLIDAN_STORMRAGE },
{ NPC_BLACK_TEMPLE_TRIGGER, DATA_BLACK_TEMPLE_TRIGGER },
{ 0, 0 }
};
@@ -165,18 +166,31 @@ public:
if (!InstanceScript::SetBossState(type, state))
return false;
if (type == DATA_SHADE_OF_AKAMA && state == DONE)
if (state == DONE)
{
for (ObjectGuid const& guid : ashtongueGUIDs)
if (Creature* ashtongue = instance->GetCreature(guid))
ashtongue->SetFaction(FACTION_ASHTONGUE_DEATHSWORN);
}
else if (type == DATA_ILLIDARI_COUNCIL && state == DONE)
{
if (Creature* akama = GetCreature(DATA_AKAMA_ILLIDAN))
akama->AI()->DoAction(0);
}
switch (type)
{
case DATA_HIGH_WARLORD_NAJENTUS:
if (Creature* trigger = GetCreature(DATA_BLACK_TEMPLE_TRIGGER))
trigger->AI()->Talk(EMOTE_NAJENTUS_DEFEATED);
break;
case DATA_SHADE_OF_AKAMA:
for (ObjectGuid const& guid : ashtongueGUIDs)
if (Creature* ashtongue = instance->GetCreature(guid))
ashtongue->SetFaction(FACTION_ASHTONGUE_DEATHSWORN);
break;
case DATA_ILLIDARI_COUNCIL:
if (Creature* akama = GetCreature(DATA_AKAMA_ILLIDAN))
akama->AI()->DoAction(0);
break;
default:
break;
}
if (AllBossesDone({ DATA_SHADE_OF_AKAMA, DATA_TERON_GOREFIEND, DATA_GURTOGG_BLOODBOIL, DATA_RELIQUARY_OF_SOULS }))
if (Creature* trigger = GetCreature(DATA_BLACK_TEMPLE_TRIGGER))
trigger->AI()->Talk(EMOTE_LOWER_TEMPLE_DEFEATED);
}
return true;
}