Skip to content

Commit

Permalink
Improve Stadium event in UBRS
Browse files Browse the repository at this point in the history 
* More flavour to the encounter:
- Lord Victor Nefarius and Warchief Rend Blackhand will now randomly
yell during the encounter
- Make Lord Victor Nefarius walk back and forth while Gyth and Rend are
preparing
  • Loading branch information
@cala
cala committed Jul 6, 2017
1 parent ef9801a commit ad8d124
Show file tree
Hide file tree
Showing 2 changed files with 75 additions and 23 deletions.
25 changes: 15 additions & 10 deletions sql/scriptdev2/scriptdev2.sql
View file
Expand Up @@ -1854,23 +1854,28 @@ INSERT INTO script_texts (entry,content_default,sound,type,language,emote,commen

(-1229004,'Excellent... it would appear as if the meddlesome insects have arrived just in time to feed my legion. Welcome, mortals!',0,1,0,1,'nefarius SAY_INTRO_1'),
(-1229005,'Let not even a drop of their blood remain upon the arena floor, my children. Feast on their souls!',0,1,0,1,'nefarius SAY_INTRO_2'),
(-1229006,'Foolsss...Kill the one in the dress!',0,1,0,0,'nefarius SAY_ATTACK_1'),
(-1229007,'Sire, let me join the fray! I shall tear their spines out with my bare hands!',0,1,0,1,'rend SAY_REND_JOIN'),
(-1229008,'Concentrate your attacks upon the healer!',0,1,0,0,'nefarius SAY_ATTACK_2'),
(-1229009,'Inconceivable!',0,1,0,0,'nefarius SAY_ATTACK_3'),
(-1229010,'Do not force my hand, children! I shall use your hides to line my boots.',0,1,0,0,'nefarius SAY_ATTACK_4'),
(-1229011,'Defilers!',0,1,0,0,'rend SAY_LOSE_1'),
(-1229012,'Impossible!',0,1,0,0,'rend SAY_LOSE_2'),
(-1229013,'Your efforts will prove fruitless. None shall stand in our way!',0,1,0,0,'nefarius SAY_LOSE_3'),
(-1229014,'THIS CANNOT BE!!! Rend, deal with these insects.',0,1,0,1,'nefarius SAY_LOSE_4'),
(-1229006,'Foolsss...Kill the one in the dress!',0,1,0,0,'nefarius SAY_NEFARIUS_TAUNT1'),
(-1229007,'Sire, let me join the fray! I shall tear their spines out with my bare hands!',0,1,0,1,'rend SAY_REND_TAUNT1'),
(-1229008,'Concentrate your attacks upon the healer!',0,1,0,0,'nefarius SAY_NEFARIUS_TAUNT2'),
(-1229009,'Inconceivable!',0,1,0,0,'nefarius SAY_NEFARIUS_TAUNT3'),
(-1229010,'Do not force my hand, children! I shall use your hides to line my boots.',0,1,0,0,'nefarius SAY_NEFARIUS_TAUNT4'),
(-1229011,'Defilers!',0,1,0,0,'rend SAY_REND_TAUNT2'),
(-1229012,'Impossible!',0,1,0,0,'rend SAY_REND_TAUNT3'),
(-1229013,'Your efforts will prove fruitless. None shall stand in our way!',0,1,0,0,'nefarius SAY_NEFARIUS_TAUNT5'),
(-1229014,'THIS CANNOT BE!!! Rend, deal with these insects.',0,1,0,1,'nefarius SAY_NEFARIUS_LOSE1'),
(-1229015,'With pleasure...',0,1,0,0,'rend SAY_REND_ATTACK'),
(-1229016,'The Warchief shall make quick work of you, mortals. Prepare yourselves!',0,1,0,25,'nefarius SAY_WARCHIEF'),
(-1229017,'Taste in my power!',0,1,0,0,'nefarius SAY_BUFF_GYTH'),
(-1229018,'Your victory shall be short lived. The days of both the Alliance and Horde are coming to an end. The next time we meet shall be the last.',0,1,0,1,'nefarius SAY_VICTORY'),

(-1229019,'%s is knocked off his drake!',0,2,0,0,'rend EMOTE_KNOCKED_OFF'),

(-1229020,'Intruders are destroying our eggs! Stop!!',0,1,0,0,'rookery hatcher - SAY_ROOKERY_EVENT_START');
(-1229020,'Intruders are destroying our eggs! Stop!!',0,1,0,0,'rookery hatcher - SAY_ROOKERY_EVENT_START'),

(-1229021,'I promise you an eternity of dung clean up duty for this failure!',0,1,0,0,'nefarius SAY_NEFARIUS_TAUNT6'),
(-1229022,'Use the freezing breath, imbecile!',0,1,0,0,'nefarius SAY_NEFARIUS_TAUNT7'),
(-1229023,'I will wear your skin as a fashion accessory!',0,1,0,0,'nefarius SAY_NEFARIUS_TAUNT8'),
(-1229024,'Flee while you still have chance, mortals. You will pray for a swift death should I enter the arena.',0,1,0,0,'rend SAY_REND_TAUNT3');

-- -1 230 000 BLACKROCK DEPTHS
INSERT INTO script_texts (entry,content_default,sound,type,language,emote,comment) VALUES
Expand Down
73 changes: 60 additions & 13 deletions ...game/AI/ScriptDevAI/scripts/eastern_kingdoms/blackrock_spire/instance_blackrock_spire.cpp
View file
Expand Up @@ -33,22 +33,28 @@ enum
AREATRIGGER_BEAST_AGGRO = 2066,
AREATRIGGER_BEAST_INTRO = 2067,

// Arena event dialogue - handled by instance
// Arena event dialogue intro and outro - handled by instance
SAY_NEFARIUS_INTRO_1 = -1229004,
SAY_NEFARIUS_INTRO_2 = -1229005,
SAY_NEFARIUS_ATTACK_1 = -1229006,
SAY_REND_JOIN = -1229007,
SAY_NEFARIUS_ATTACK_2 = -1229008,
SAY_NEFARIUS_ATTACK_3 = -1229009,
SAY_NEFARIUS_ATTACK_4 = -1229010,
SAY_REND_LOSE_1 = -1229011,
SAY_REND_LOSE_2 = -1229012,
SAY_NEFARIUS_LOSE_3 = -1229013,
SAY_NEFARIUS_LOSE_4 = -1229014,
SAY_NEFARIUS_LOSE1 = -1229014,
SAY_REND_ATTACK = -1229015,
SAY_NEFARIUS_WARCHIEF = -1229016,
SAY_NEFARIUS_VICTORY = -1229018,

// Arena event random taunt - handled on creature death
SAY_NEFARIUS_TAUNT1 = -1229006,
SAY_NEFARIUS_TAUNT2 = -1229008,
SAY_NEFARIUS_TAUNT3 = -1229009,
SAY_NEFARIUS_TAUNT4 = -1229010,
SAY_NEFARIUS_TAUNT5 = -1229013,
SAY_NEFARIUS_TAUNT6 = -1229021,
SAY_NEFARIUS_TAUNT7 = -1229022,
SAY_NEFARIUS_TAUNT8 = -1229023,
SAY_REND_TAUNT1 = -1229007,
SAY_REND_TAUNT2 = -1229011,
SAY_REND_TAUNT3 = -1229012,
SAY_REND_TAUNT4 = -1229024,

// Emberseer event
EMOTE_BEGIN = -1229000,
SPELL_EMBERSEER_GROWING = 16048,
Expand Down Expand Up @@ -82,7 +88,7 @@ static const DialogueEntry aStadiumDialogue[] =
{SAY_NEFARIUS_INTRO_1, NPC_LORD_VICTOR_NEFARIUS, 7000},
{SAY_NEFARIUS_INTRO_2, NPC_LORD_VICTOR_NEFARIUS, 5000},
{NPC_BLACKHAND_HANDLER, 0, 0},
{SAY_NEFARIUS_LOSE_4, NPC_LORD_VICTOR_NEFARIUS, 3000},
{SAY_NEFARIUS_LOSE1 , NPC_LORD_VICTOR_NEFARIUS, 3000},
{SAY_REND_ATTACK, NPC_REND_BLACKHAND, 2000},
{SAY_NEFARIUS_WARCHIEF, NPC_LORD_VICTOR_NEFARIUS, 0},
{SAY_NEFARIUS_VICTORY, NPC_LORD_VICTOR_NEFARIUS, 5000},
Expand Down Expand Up @@ -392,6 +398,40 @@ void instance_blackrock_spire::OnCreatureDeath(Creature* pCreature)
// check if it's summoned - some npcs with the same entry are already spawned in the instance
if (!pCreature->IsTemporarySummon())
break;

// 5% chance for Rend or Lord Victor Nefarius to taunt players when one of the creature is killed (% is guesswork)
// Lord Victor Nefarius
if (urand(0, 100) < 5)
{
if (Creature* pNefarius = GetSingleCreatureFromStorage(NPC_LORD_VICTOR_NEFARIUS))
{
switch (urand(0, 7))
{
case 0: DoScriptText(SAY_NEFARIUS_TAUNT1, pNefarius); break;
case 1: DoScriptText(SAY_NEFARIUS_TAUNT2, pNefarius); break;
case 2: DoScriptText(SAY_NEFARIUS_TAUNT3, pNefarius); break;
case 3: DoScriptText(SAY_NEFARIUS_TAUNT4, pNefarius); break;
case 4: DoScriptText(SAY_NEFARIUS_TAUNT5, pNefarius); break;
case 5: DoScriptText(SAY_NEFARIUS_TAUNT6, pNefarius); break;
case 6: DoScriptText(SAY_NEFARIUS_TAUNT7, pNefarius); break;
case 7: DoScriptText(SAY_NEFARIUS_TAUNT8, pNefarius); break;
}
}
}
// Warchief Rend Blackhand
if (urand(0, 100) < 5)
{
if (Creature* pRend = GetSingleCreatureFromStorage(NPC_REND_BLACKHAND))
{
switch (urand(0, 3))
{
case 0: DoScriptText(SAY_REND_TAUNT1, pRend); break;
case 1: DoScriptText(SAY_REND_TAUNT2, pRend); break;
case 2: DoScriptText(SAY_REND_TAUNT3, pRend); break;
case 3: DoScriptText(SAY_REND_TAUNT4, pRend); break;
}
}
}
--m_uiStadiumMobsAlive;
if (m_uiStadiumMobsAlive == 0)
DoSendNextStadiumWave();
Expand Down Expand Up @@ -543,13 +583,16 @@ void instance_blackrock_spire::JustDidDialogueStep(int32 iEntry)
}
break;
case SAY_NEFARIUS_WARCHIEF:
// Prepare for Gyth - note: Nefarius should be moving around the balcony
// Prepare for Gyth
if (Creature* pRend = GetSingleCreatureFromStorage(NPC_REND_BLACKHAND))
{
pRend->ForcedDespawn(5000);
pRend->SetWalk(false);
pRend->GetMotionMaster()->MovePoint(0, aStadiumLocs[6].m_fX, aStadiumLocs[6].m_fY, aStadiumLocs[6].m_fZ);
}
// Make Lord Nefarius walk back and forth while Rend is preparing Glyth
if (Creature* pNefarius = GetSingleCreatureFromStorage(NPC_LORD_VICTOR_NEFARIUS))
pNefarius->GetMotionMaster()->MoveWaypoint(0);
m_uiStadiumEventTimer = 30000;
break;
case SAY_NEFARIUS_VICTORY:
Expand Down Expand Up @@ -597,12 +640,16 @@ void instance_blackrock_spire::DoSendNextStadiumWave()
}
// All waves are cleared - start Gyth intro
else if (m_uiStadiumWaves == MAX_STADIUM_WAVES)
StartNextDialogueText(SAY_NEFARIUS_LOSE_4);
StartNextDialogueText(SAY_NEFARIUS_LOSE1);
else
{
// Send Gyth
if (Creature* pNefarius = GetSingleCreatureFromStorage(NPC_LORD_VICTOR_NEFARIUS))
{
// Stop Lord Nefarius from moving and put him back in place
pNefarius->GetMotionMaster()->MoveIdle();
pNefarius->GetMotionMaster()->MovePoint(0, aStadiumLocs[5].m_fX, aStadiumLocs[5].m_fY, aStadiumLocs[5].m_fZ);

if (Creature* pTemp = pNefarius->SummonCreature(NPC_GYTH, aStadiumLocs[1].m_fX, aStadiumLocs[1].m_fY, aStadiumLocs[1].m_fZ, 0.0f, TEMPSUMMON_DEAD_DESPAWN, 0))
pTemp->GetMotionMaster()->MovePoint(0, aStadiumLocs[2].m_fX, aStadiumLocs[2].m_fY, aStadiumLocs[2].m_fZ);
}
Expand Down

1 comment on commit ad8d124

@cala
Copy link
Contributor Author

@cala cala commented on ad8d124 Jul 6, 2017

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

DB update: cmangos/classic-db@8761c45

Please sign in to comment.