Commit 5807636
committed
[s2819] Update Dire Maul Tribute Run event
The other part of the event is handled by DB-Scripts
Based on the work of @Tobschinski
(based on commit SD2[3078] - 01fb50b)
Signed-off-by: Xfurry <xfurry@scriptdev2.com>1 parent dcffa50 commit 5807636
5 files changed
Lines changed: 31 additions & 9 deletions
File tree
- scripts/kalimdor/dire_maul
- sql
- updates
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
@@ -79,11 +79,14 @@ enum | |||
| 79 | 79 | SAY_FREE_IMMOLTHAR = -1429000, | |
| 80 | 80 | SAY_KILL_IMMOLTHAR = -1429001, | |
| 81 | 81 | SAY_IRONBARK_REDEEM = -1429002, | |
| 82 | + SAY_CHORUSH_KING_DEAD = -1429003, | ||
| 82 | 83 | ||
| 83 | 84 | FACTION_HOSTILE = 14, | |
| 84 | - SPELL_KING_OF_GORDOK = 22799, | ||
| 85 | + FACTION_FRIENDLY = 35, | ||
| 85 | 86 | }; | |
| 86 | 87 | ||
| 88 | + static const float afMizzleSpawnLoc[4] = {683.296f, 484.384f, 29.544f, 0.0174f}; | ||
| 89 | + | ||
| 87 | 90 | class instance_dire_maul : public ScriptedInstance | |
| 88 | 91 | { | |
| 89 | 92 | public: | |
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
@@ -75,7 +75,7 @@ void instance_dire_maul::OnCreatureCreate(Creature* pCreature) | |||
| 75 | 75 | // North | |
| 76 | 76 | case NPC_CHORUSH: | |
| 77 | 77 | case NPC_KING_GORDOK: | |
| 78 | - case NPC_MIZZLE_THE_CRAFTY: | ||
| 78 | + case NPC_CAPTAIN_KROMCRUSH: | ||
| 79 | 79 | break; | |
| 80 | 80 | ||
| 81 | 81 | default: | |
@@ -243,12 +243,26 @@ void instance_dire_maul::SetData(uint32 uiType, uint32 uiData) | |||
| 243 | 243 | m_auiEncounter[uiType] = uiData; | |
| 244 | 244 | if (uiData == DONE) | |
| 245 | 245 | { | |
| 246 | - // Apply Aura to players in the map | ||
| 247 | - Map::PlayerList const& players = instance->GetPlayers(); | ||
| 248 | - for (Map::PlayerList::const_iterator itr = players.begin(); itr != players.end(); ++itr) | ||
| 246 | + // change faction to certian ogres | ||
| 247 | + if (Creature* pOgre = GetSingleCreatureFromStorage(NPC_CAPTAIN_KROMCRUSH)) | ||
| 248 | + pOgre->SetFactionTemporary(FACTION_FRIENDLY, TEMPFACTION_RESTORE_RESPAWN); | ||
| 249 | + | ||
| 250 | + if (Creature* pOgre = GetSingleCreatureFromStorage(NPC_CHORUSH)) | ||
| 249 | 251 | { | |
| 250 | - if (Player* pPlayer = itr->getSource()) | ||
| 251 | - pPlayer->CastSpell(pPlayer, SPELL_KING_OF_GORDOK, true); | ||
| 252 | + // Chorush evades and yells on king death (if alive) | ||
| 253 | + if (pOgre->isAlive()) | ||
| 254 | + { | ||
| 255 | + DoScriptText(SAY_CHORUSH_KING_DEAD, pOgre); | ||
| 256 | + pOgre->SetFactionTemporary(FACTION_FRIENDLY, TEMPFACTION_RESTORE_RESPAWN); | ||
| 257 | + pOgre->AI()->EnterEvadeMode(); | ||
| 258 | + } | ||
| 259 | + | ||
| 260 | + // start WP movement for Mizzle; event handled by movement and gossip dbscripts | ||
| 261 | + if (Creature* pMizzle = pOgre->SummonCreature(NPC_MIZZLE_THE_CRAFTY, afMizzleSpawnLoc[0], afMizzleSpawnLoc[1], afMizzleSpawnLoc[2], afMizzleSpawnLoc[3], TEMPSUMMON_DEAD_DESPAWN, 0, true)) | ||
| 262 | + { | ||
| 263 | + pMizzle->SetWalk(false); | ||
| 264 | + pMizzle->GetMotionMaster()->MoveWaypoint(); | ||
| 265 | + } | ||
| 252 | 266 | } | |
| 253 | 267 | } | |
| 254 | 268 | break; | |
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
@@ -1,4 +1,4 @@ | |||
| 1 | 1 | #ifndef __SD2_REVISION_NR_H__ | |
| 2 | 2 | #define __SD2_REVISION_NR_H__ | |
| 3 | - #define SD2_REVISION_NR "s2818" | ||
| 3 | + #define SD2_REVISION_NR "s2819" | ||
| 4 | 4 | #endif // __SD2_REVISION_NR_H__ | |
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
@@ -1514,7 +1514,9 @@ INSERT INTO script_texts (entry,content_default,sound,type,language,emote,commen | |||
| 1514 | 1514 | (-1429000,'The demon is loose! Quickly we must restrain him!',0,6,0,0,'highborne summoner SAY_FREE_IMMOLTHAR'), | |
| 1515 | 1515 | (-1429001,'Who dares disrupt the sanctity of Eldre\'Thalas? Face me, cowards!',0,6,0,0,'prince tortheldrin SAY_KILL_IMMOLTHAR'), | |
| 1516 | 1516 | ||
| 1517 | - (-1429002,'At last... Freed from his cursed grasp!',0,6,0,0,'old ironbark SAY_IRONBARK_REDEEM'); | ||
| 1517 | + (-1429002,'At last... Freed from his cursed grasp!',0,6,0,0,'old ironbark SAY_IRONBARK_REDEEM'), | ||
| 1518 | + | ||
| 1519 | + (-1429003,'The king is dead - OH NOES! Summon Mizzle da Crafty! He knows what to do next!',0,1,0,0,'cho\'rush SAY_KING_DEAD'); | ||
| 1518 | 1520 | ||
| 1519 | 1521 | -- -1 469 000 BLACKWING LAIR | |
| 1520 | 1522 | INSERT INTO script_texts (entry,content_default,sound,type,language,emote,comment) VALUES | |
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
@@ -0,0 +1,3 @@ | |||
| 1 | + DELETE FROM script_texts WHERE entry=-1429003; | ||
| 2 | + INSERT INTO script_texts (entry,content_default,sound,type,language,emote,comment) VALUES | ||
| 3 | + (-1429003,'The king is dead - OH NOES! Summon Mizzle da Crafty! He knows what to do next!',0,1,0,0,'cho\'rush SAY_KING_DEAD'); | ||
0 commit comments