From 33c44594cd85e6ddbaae566e65ec13809b870d51 Mon Sep 17 00:00:00 2001 From: Gacko Date: Mon, 3 Dec 2012 21:41:34 +0100 Subject: Core/DB: Creature text for 26 script files --- .../scripts/Northrend/Gundrak/boss_moorabi.cpp | 26 ++- .../scripts/Northrend/Gundrak/boss_slad_ran.cpp | 22 ++- .../IcecrownCitadel/boss_blood_queen_lana_thel.cpp | 3 +- .../Northrend/IcecrownCitadel/boss_sindragosa.cpp | 3 +- .../Northrend/Naxxramas/boss_anubrekhan.cpp | 17 +- .../scripts/Northrend/Naxxramas/boss_faerlina.cpp | 20 +-- .../Northrend/Naxxramas/boss_four_horsemen.cpp | 40 ++--- .../scripts/Northrend/Naxxramas/boss_gothik.cpp | 16 +- .../scripts/Northrend/Naxxramas/boss_heigan.cpp | 25 +-- .../scripts/Northrend/Naxxramas/boss_kelthuzad.cpp | 59 +++---- .../scripts/Northrend/Naxxramas/boss_noth.cpp | 38 ++-- .../scripts/Northrend/Naxxramas/boss_patchwerk.cpp | 21 ++- .../scripts/Northrend/Naxxramas/boss_sapphiron.cpp | 2 +- .../scripts/Northrend/Naxxramas/boss_thaddius.cpp | 51 +++--- .../Northrend/Nexus/Nexus/boss_anomalus.cpp | 16 +- .../Northrend/Nexus/Nexus/boss_keristrasza.cpp | 20 +-- .../Northrend/Nexus/Nexus/boss_magus_telestra.cpp | 23 ++- .../Northrend/Nexus/Nexus/commander_stoutbeard.cpp | 26 +-- .../scripts/Northrend/Nexus/Oculus/boss_drakos.cpp | 25 +-- .../scripts/Northrend/Nexus/Oculus/boss_urom.cpp | 21 +-- .../Ulduar/HallsOfStone/boss_krystallus.cpp | 14 +- .../Ulduar/HallsOfStone/boss_maiden_of_grief.cpp | 19 +- .../Northrend/Ulduar/HallsOfStone/boss_sjonnir.cpp | 14 +- .../Ulduar/HallsOfStone/halls_of_stone.cpp | 196 ++++++++++----------- src/server/scripts/Northrend/sholazar_basin.cpp | 52 +++--- src/server/scripts/Northrend/storm_peaks.cpp | 14 +- 26 files changed, 371 insertions(+), 412 deletions(-) (limited to 'src') diff --git a/src/server/scripts/Northrend/Gundrak/boss_moorabi.cpp b/src/server/scripts/Northrend/Gundrak/boss_moorabi.cpp index 45c55f7ec9b..d5e10aedd70 100644 --- a/src/server/scripts/Northrend/Gundrak/boss_moorabi.cpp +++ b/src/server/scripts/Northrend/Gundrak/boss_moorabi.cpp @@ -34,14 +34,12 @@ enum eSpells enum eSays { - SAY_AGGRO = -1604010, - //SAY_SLAY_1 = -1604011, // not in db - SAY_SLAY_2 = -1604012, - SAY_SLAY_3 = -1604013, - SAY_DEATH = -1604014, - SAY_TRANSFORM = -1604015, - SAY_QUAKE = -1604016, - EMOTE_TRANSFORM = -1604017 + SAY_AGGRO = 0, + SAY_SLAY = 1, + SAY_DEATH = 2, + SAY_TRANSFORM = 3, + SAY_QUAKE = 4, + EMOTE_TRANSFORM = 5 }; #define DATA_LESS_RABI 1 @@ -86,7 +84,7 @@ public: void EnterCombat(Unit* /*who*/) { - DoScriptText(SAY_AGGRO, me); + Talk(SAY_AGGRO); DoCast(me, SPELL_MOJO_FRENZY, true); if (instance) @@ -107,7 +105,7 @@ public: if (uiGroundTremorTimer <= uiDiff) { - DoScriptText(SAY_QUAKE, me); + Talk(SAY_QUAKE); if (bPhase) DoCast(me->getVictim(), SPELL_QUAKE, true); else @@ -135,8 +133,8 @@ public: if (!bPhase && uiTransformationTImer <= uiDiff) { - DoScriptText(EMOTE_TRANSFORM, me); - DoScriptText(SAY_TRANSFORM, me); + Talk(EMOTE_TRANSFORM); + Talk(SAY_TRANSFORM); DoCast(me, SPELL_TRANSFORMATION, false); uiTransformationTImer = 10*IN_MILLISECONDS; } else uiTransformationTImer -= uiDiff; @@ -154,7 +152,7 @@ public: void JustDied(Unit* /*killer*/) { - DoScriptText(SAY_DEATH, me); + Talk(SAY_DEATH); if (instance) instance->SetData(DATA_MOORABI_EVENT, DONE); @@ -165,7 +163,7 @@ public: if (victim == me) return; - DoScriptText(RAND(SAY_SLAY_2, SAY_SLAY_3), me); + Talk(SAY_SLAY); } }; diff --git a/src/server/scripts/Northrend/Gundrak/boss_slad_ran.cpp b/src/server/scripts/Northrend/Gundrak/boss_slad_ran.cpp index f35228d44d9..39bb7a3699d 100644 --- a/src/server/scripts/Northrend/Gundrak/boss_slad_ran.cpp +++ b/src/server/scripts/Northrend/Gundrak/boss_slad_ran.cpp @@ -35,13 +35,11 @@ enum Spells //Yell enum Yells { - SAY_AGGRO = -1604017, - SAY_SLAY_1 = -1604018, - SAY_SLAY_2 = -1604019, - SAY_SLAY_3 = -1604020, - SAY_DEATH = -1604021, - SAY_SUMMON_SNAKES = -1604022, - SAY_SUMMON_CONSTRICTORS = -1604023 + SAY_AGGRO = 0, + SAY_SLAY = 1, + SAY_DEATH = 2, + SAY_SUMMON_SNAKES = 3, + SAY_SUMMON_CONSTRICTORS = 4 }; //Creatures @@ -117,7 +115,7 @@ public: void EnterCombat(Unit* /*who*/) { - DoScriptText(SAY_AGGRO, me); + Talk(SAY_AGGRO); if (instance) instance->SetData(DATA_SLAD_RAN_EVENT, IN_PROGRESS); @@ -163,13 +161,13 @@ public: if (uiPhase == 0 && HealthBelowPct(30)) { - DoScriptText(SAY_SUMMON_SNAKES, me); + Talk(SAY_SUMMON_SNAKES); uiPhase = 1; } if (uiPhase == 1 && HealthBelowPct(25)) { - DoScriptText(SAY_SUMMON_CONSTRICTORS, me); + Talk(SAY_SUMMON_CONSTRICTORS); uiPhase = 2; } @@ -178,7 +176,7 @@ public: void JustDied(Unit* /*killer*/) { - DoScriptText(SAY_DEATH, me); + Talk(SAY_DEATH); lSummons.DespawnAll(); if (instance) @@ -187,7 +185,7 @@ public: void KilledUnit(Unit* /*victim*/) { - DoScriptText(RAND(SAY_SLAY_1, SAY_SLAY_2, SAY_SLAY_3), me); + Talk(SAY_SLAY); } void JustSummoned(Creature* summoned) diff --git a/src/server/scripts/Northrend/IcecrownCitadel/boss_blood_queen_lana_thel.cpp b/src/server/scripts/Northrend/IcecrownCitadel/boss_blood_queen_lana_thel.cpp index 0d092ec86b2..2b240bc93d8 100644 --- a/src/server/scripts/Northrend/IcecrownCitadel/boss_blood_queen_lana_thel.cpp +++ b/src/server/scripts/Northrend/IcecrownCitadel/boss_blood_queen_lana_thel.cpp @@ -37,6 +37,7 @@ enum Texts SAY_WIPE = 9, SAY_BERSERK = 10, SAY_DEATH = 11, + EMOTE_BERSERK_RAID = 12 }; enum Spells @@ -336,7 +337,7 @@ class boss_blood_queen_lana_thel : public CreatureScript switch (eventId) { case EVENT_BERSERK: - DoScriptText(EMOTE_GENERIC_BERSERK_RAID, me); + Talk(EMOTE_BERSERK_RAID); Talk(SAY_BERSERK); DoCast(me, SPELL_BERSERK); break; diff --git a/src/server/scripts/Northrend/IcecrownCitadel/boss_sindragosa.cpp b/src/server/scripts/Northrend/IcecrownCitadel/boss_sindragosa.cpp index a12a38b2f62..96cabfed918 100644 --- a/src/server/scripts/Northrend/IcecrownCitadel/boss_sindragosa.cpp +++ b/src/server/scripts/Northrend/IcecrownCitadel/boss_sindragosa.cpp @@ -36,6 +36,7 @@ enum Texts // A flaw of mortality... SAY_BERSERK = 9, // Enough! I tire of these games! SAY_DEATH = 10, // Free...at last... + EMOTE_BERSERK_RAID = 11 }; enum Spells @@ -440,7 +441,7 @@ class boss_sindragosa : public CreatureScript switch (eventId) { case EVENT_BERSERK: - DoScriptText(EMOTE_GENERIC_BERSERK_RAID, me); + Talk(EMOTE_BERSERK_RAID); Talk(SAY_BERSERK); DoCast(me, SPELL_BERSERK); break; diff --git a/src/server/scripts/Northrend/Naxxramas/boss_anubrekhan.cpp b/src/server/scripts/Northrend/Naxxramas/boss_anubrekhan.cpp index 8901a61e79d..61ce8817b17 100644 --- a/src/server/scripts/Northrend/Naxxramas/boss_anubrekhan.cpp +++ b/src/server/scripts/Northrend/Naxxramas/boss_anubrekhan.cpp @@ -19,11 +19,14 @@ #include "ScriptedCreature.h" #include "naxxramas.h" -#define SAY_GREET RAND(-1533000, -1533004, -1533005, -1533006, -1533007) -#define SAY_AGGRO RAND(-1533001, -1533002, -1533003) -#define SAY_SLAY -1533008 +enum Anubrekhan +{ + SAY_AGGRO = 0, + SAY_GREET = 1, + SAY_SLAY = 2, -#define MOB_CRYPT_GUARD 16573 + MOB_CRYPT_GUARD = 16573 +}; const Position GuardSummonPos = {3333.72f, -3476.30f, 287.1f, 6.2801f}; @@ -97,7 +100,7 @@ public: if (victim->GetTypeId() == TYPEID_PLAYER) victim->CastSpell(victim, SPELL_SUMMON_CORPSE_SCARABS_PLR, true, NULL, NULL, me->GetGUID()); - DoScriptText(SAY_SLAY, me); + Talk(SAY_SLAY); } void JustDied(Unit* /*killer*/) @@ -111,7 +114,7 @@ public: void EnterCombat(Unit* /*who*/) { _EnterCombat(); - DoScriptText(SAY_AGGRO, me); + Talk(SAY_AGGRO); events.ScheduleEvent(EVENT_IMPALE, urand(10000, 20000)); events.ScheduleEvent(EVENT_LOCUST, 90000); events.ScheduleEvent(EVENT_BERSERK, 600000); @@ -124,7 +127,7 @@ public: { if (!hasTaunted && me->IsWithinDistInMap(who, 60.0f) && who->GetTypeId() == TYPEID_PLAYER) { - DoScriptText(SAY_GREET, me); + Talk(SAY_GREET); hasTaunted = true; } ScriptedAI::MoveInLineOfSight(who); diff --git a/src/server/scripts/Northrend/Naxxramas/boss_faerlina.cpp b/src/server/scripts/Northrend/Naxxramas/boss_faerlina.cpp index a75f87e91af..58db1d9caea 100644 --- a/src/server/scripts/Northrend/Naxxramas/boss_faerlina.cpp +++ b/src/server/scripts/Northrend/Naxxramas/boss_faerlina.cpp @@ -22,14 +22,10 @@ enum Yells { - SAY_GREET = -1533009, - SAY_AGGRO_1 = -1533010, - SAY_AGGRO_2 = -1533011, - SAY_AGGRO_3 = -1533012, - SAY_AGGRO_4 = -1533013, - SAY_SLAY_1 = -1533014, - SAY_SLAY_2 = -1533015, - SAY_DEATH = -1533016 + SAY_GREET = 0, + SAY_AGGRO = 1, + SAY_SLAY = 2, + SAY_DEATH = 3 }; enum Spells @@ -71,7 +67,7 @@ class boss_faerlina : public CreatureScript void EnterCombat(Unit* /*who*/) { _EnterCombat(); - DoScriptText(RAND(SAY_AGGRO_1, SAY_AGGRO_2, SAY_AGGRO_3, SAY_AGGRO_4), me); + Talk(SAY_AGGRO); events.ScheduleEvent(EVENT_POISON, urand(10000, 15000)); events.ScheduleEvent(EVENT_FIRE, urand(6000, 18000)); events.ScheduleEvent(EVENT_FRENZY, urand(60000, 80000)); @@ -88,7 +84,7 @@ class boss_faerlina : public CreatureScript { if (!_introDone && who->GetTypeId() == TYPEID_PLAYER) { - DoScriptText(SAY_GREET, me); + Talk(SAY_GREET); _introDone = true; } @@ -98,13 +94,13 @@ class boss_faerlina : public CreatureScript void KilledUnit(Unit* /*victim*/) { if (!urand(0, 2)) - DoScriptText(RAND(SAY_SLAY_1, SAY_SLAY_2), me); + Talk(SAY_SLAY); } void JustDied(Unit* /*killer*/) { _JustDied(); - DoScriptText(SAY_DEATH, me); + Talk(SAY_DEATH); } void SpellHit(Unit* caster, SpellInfo const* spell) diff --git a/src/server/scripts/Northrend/Naxxramas/boss_four_horsemen.cpp b/src/server/scripts/Northrend/Naxxramas/boss_four_horsemen.cpp index 29a0a11af9b..7785044e7d1 100644 --- a/src/server/scripts/Northrend/Naxxramas/boss_four_horsemen.cpp +++ b/src/server/scripts/Northrend/Naxxramas/boss_four_horsemen.cpp @@ -73,17 +73,14 @@ const uint32 SPELL_SECONDARY_H[]= {0, 57464, 0, 57465}; const uint32 SPELL_PUNISH[] = {0, 57381, 0, 57377}; #define SPELL_BERSERK 26662 -// used by 16063, 16064, 16065, 30549, but signed for 16063 -const int32 SAY_AGGRO[] = {-1533051, -1533044, -1533065, -1533058}; -const int32 SAY_TAUNT[3][4] ={ {-1533052, -1533045, -1533071, -1533059}, - {-1533053, -1533046, -1533072, -1533060}, - {-1533054, -1533047, -1533073, -1533061}, }; -const int32 SAY_SPECIAL[] = {-1533055, -1533048, -1533070, -1533062}; -const int32 SAY_SLAY[] = {-1533056, -1533049, -1533068, -1533063}; -const int32 SAY_DEATH[] = {-1533057, -1533050, -1533074, -1533064}; - -#define SAY_BARON_AGGRO RAND(-1533065, -1533066, -1533067) -#define SAY_BARON_SLAY RAND(-1533068, -1533069) +enum FourHorsemen +{ + SAY_AGGRO = 0, + SAY_TAUNT = 1, + SAY_SPECIAL = 2, + SAY_SLAY = 3, + SAY_DEATH = 4 +}; class boss_four_horsemen : public CreatureScript { @@ -295,12 +292,7 @@ public: void KilledUnit(Unit* /*victim*/) { if (!(rand()%5)) - { - if (id == HORSEMEN_BARON) - DoScriptText(SAY_BARON_SLAY, me); - else - DoScriptText(SAY_SLAY[id], me); - } + Talk(SAY_SLAY); } void JustDied(Unit* /*killer*/) @@ -321,17 +313,13 @@ public: instance->DoUpdateAchievementCriteria(ACHIEVEMENT_CRITERIA_TYPE_BE_SPELL_TARGET, 59450); } - DoScriptText(SAY_DEATH[id], me); + Talk(SAY_DEATH); } void EnterCombat(Unit* /*who*/) { _EnterCombat(); - - if (id == HORSEMEN_BARON) - DoScriptText(SAY_BARON_AGGRO, me); - else - DoScriptText(SAY_AGGRO[id], me); + Talk(SAY_AGGRO); events.ScheduleEvent(EVENT_MARK, 15000); events.ScheduleEvent(EVENT_CAST, 20000+rand()%5000); @@ -360,13 +348,13 @@ public: { case EVENT_MARK: if (!(rand()%5)) - DoScriptText(SAY_SPECIAL[id], me); + Talk(SAY_SPECIAL); DoCastAOE(SPELL_MARK[id]); events.ScheduleEvent(EVENT_MARK, 15000); break; case EVENT_CAST: if (!(rand()%5)) - DoScriptText(SAY_TAUNT[rand()%3][id], me); + Talk(SAY_TAUNT); if (caster) { @@ -379,7 +367,7 @@ public: events.ScheduleEvent(EVENT_CAST, 15000); break; case EVENT_BERSERK: - DoScriptText(SAY_SPECIAL[id], me); + Talk(SAY_SPECIAL); DoCast(me, EVENT_BERSERK); break; } diff --git a/src/server/scripts/Northrend/Naxxramas/boss_gothik.cpp b/src/server/scripts/Northrend/Naxxramas/boss_gothik.cpp index d335d36e112..14043f00939 100644 --- a/src/server/scripts/Northrend/Naxxramas/boss_gothik.cpp +++ b/src/server/scripts/Northrend/Naxxramas/boss_gothik.cpp @@ -24,10 +24,10 @@ enum Yells { - SAY_SPEECH = -1533040, - SAY_KILL = -1533041, - SAY_DEATH = -1533042, - SAY_TELEPORT = -1533043 + SAY_SPEECH = 0, + SAY_KILL = 1, + SAY_DEATH = 2, + SAY_TELEPORT = 3 }; //Gothik @@ -209,7 +209,7 @@ class boss_gothik : public CreatureScript waveCount = 0; events.ScheduleEvent(EVENT_SUMMON, 30000); DoTeleportTo(PosPlatform); - DoScriptText(SAY_SPEECH, me); + Talk(SAY_SPEECH); if (instance) instance->SetData(DATA_GOTHIK_GATE, GO_STATE_READY); } @@ -239,7 +239,7 @@ class boss_gothik : public CreatureScript void KilledUnit(Unit* /*victim*/) { if (!(rand()%5)) - DoScriptText(SAY_KILL, me); + Talk(SAY_KILL); } void JustDied(Unit* /*killer*/) @@ -247,7 +247,7 @@ class boss_gothik : public CreatureScript LiveTriggerGUID.clear(); DeadTriggerGUID.clear(); _JustDied(); - DoScriptText(SAY_DEATH, me); + Talk(SAY_DEATH); if (instance) instance->SetData(DATA_GOTHIK_GATE, GO_STATE_ACTIVE); } @@ -452,7 +452,7 @@ class boss_gothik : public CreatureScript else { phaseTwo = true; - DoScriptText(SAY_TELEPORT, me); + Talk(SAY_TELEPORT); DoTeleportTo(PosGroundLiveSide); me->SetReactState(REACT_AGGRESSIVE); DummyEntryCheckPredicate pred; diff --git a/src/server/scripts/Northrend/Naxxramas/boss_heigan.cpp b/src/server/scripts/Northrend/Naxxramas/boss_heigan.cpp index e7126ba7e33..0018c58f4cb 100644 --- a/src/server/scripts/Northrend/Naxxramas/boss_heigan.cpp +++ b/src/server/scripts/Northrend/Naxxramas/boss_heigan.cpp @@ -21,14 +21,17 @@ #include "naxxramas.h" #include "Player.h" -#define SAY_AGGRO RAND(-1533109, -1533110, -1533111) -#define SAY_SLAY -1533112 -#define SAY_TAUNT RAND(-1533113, -1533114, -1533115, -1533116, -1533117) -#define SAY_DEATH -1533118 - -#define SPELL_SPELL_DISRUPTION 29310 -#define SPELL_DECREPIT_FEVER RAID_MODE(29998, 55011) -#define SPELL_PLAGUE_CLOUD 29350 +enum Heigan +{ + SPELL_DECREPIT_FEVER = 29998, // 25-man: 55011 + SPELL_SPELL_DISRUPTION = 29310, + SPELL_PLAGUE_CLOUD = 29350, + + SAY_AGGRO = 0, + SAY_SLAY = 1, + SAY_TAUNT = 2, + SAY_DEATH = 3 +}; enum Events { @@ -70,7 +73,7 @@ public: void KilledUnit(Unit* who) { if (!(rand()%5)) - DoScriptText(SAY_SLAY, me); + Talk(SAY_SLAY); if (who->GetTypeId() == TYPEID_PLAYER) safetyDance = false; } @@ -92,13 +95,13 @@ public: void JustDied(Unit* /*killer*/) { _JustDied(); - DoScriptText(SAY_DEATH, me); + Talk(SAY_DEATH); } void EnterCombat(Unit* /*who*/) { _EnterCombat(); - DoScriptText(SAY_AGGRO, me); + Talk(SAY_AGGRO); EnterPhase(PHASE_FIGHT); safetyDance = true; } diff --git a/src/server/scripts/Northrend/Naxxramas/boss_kelthuzad.cpp b/src/server/scripts/Northrend/Naxxramas/boss_kelthuzad.cpp index 9167db45d20..183fb40e5a0 100644 --- a/src/server/scripts/Northrend/Naxxramas/boss_kelthuzad.cpp +++ b/src/server/scripts/Northrend/Naxxramas/boss_kelthuzad.cpp @@ -33,32 +33,23 @@ EndScriptData */ enum Yells { //when shappiron dies. dialog between kel and lich king (in this order) - SAY_SAPP_DIALOG1 = -1533084, //not used - SAY_SAPP_DIALOG2_LICH = -1533085, //not used - SAY_SAPP_DIALOG3 = -1533086, //not used - SAY_SAPP_DIALOG4_LICH = -1533087, //not used - SAY_SAPP_DIALOG5 = -1533088, //not used - SAY_CAT_DIED = -1533089, //when cat dies, not used + SAY_SAPP_DIALOG1 = 0, //not used + SAY_SAPP_DIALOG2_LICH = 1, //not used + SAY_SAPP_DIALOG3 = 2, //not used + SAY_SAPP_DIALOG4_LICH = 3, //not used + SAY_SAPP_DIALOG5 = 4, //not used + SAY_CAT_DIED = 5, //when cat dies, not used //when each of the 4 wing bosses dies - SAY_TAUNT1 = -1533090, //not used - SAY_TAUNT2 = -1533091, //not used - SAY_TAUNT3 = -1533092, //not used - SAY_TAUNT4 = -1533093, //not used - SAY_SUMMON_MINIONS = -1533105, //start of phase 1 - SAY_AGGRO_1 = -1533094, //start of phase 2 - SAY_AGGRO_2 = -1533095, - SAY_AGGRO_3 = -1533096, - SAY_SLAY_1 = -1533097, - SAY_SLAY_2 = -1533098, - SAY_DEATH = -1533099, - SAY_CHAIN_1 = -1533100, - SAY_CHAIN_2 = -1533101, - SAY_FROST_BLAST = -1533102, - SAY_SPECIAL_1 = -1533106, - SAY_SPECIAL_2 = -1533107, - SAY_SPECIAL_3 = -1533108, - SAY_REQUEST_AID = -1533103, //start of phase 3 - SAY_ANSWER_REQUEST = -1533104 //lich king answer + SAY_TAUNT = 6, + SAY_AGGRO = 7, + SAY_SLAY = 8, + SAY_DEATH = 9, + SAY_CHAIN = 10, + SAY_FROST_BLAST = 11, + SAY_REQUEST_AID = 12, //start of phase 3 + SAY_ANSWER_REQUEST = 13, //lich king answer + SAY_SUMMON_MINIONS = 14, //start of phase 1 + SAY_SPECIAL = 15 }; enum Events @@ -341,13 +332,13 @@ public: void KilledUnit(Unit* /*victim*/) { - DoScriptText(RAND(SAY_SLAY_1, SAY_SLAY_2), me); + Talk(SAY_SLAY); } void JustDied(Unit* /*killer*/) { _JustDied(); - DoScriptText(SAY_DEATH, me); + Talk(SAY_DEATH); std::map::const_iterator itr; for (itr = chained.begin(); itr != chained.end(); ++itr) @@ -370,7 +361,7 @@ public: pPortal->ResetDoorOrButton(); } DoCast(me, SPELL_KELTHUZAD_CHANNEL, false); - DoScriptText(SAY_SUMMON_MINIONS, me); + Talk(SAY_SUMMON_MINIONS); Phase = 1; me->SetFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_NON_ATTACKABLE | UNIT_FLAG_DISABLE_MOVE | UNIT_FLAG_NOT_SELECTABLE); me->SetFloatValue(UNIT_FIELD_COMBATREACH, 4); @@ -435,7 +426,7 @@ public: break; case EVENT_PHASE: events.Reset(); - DoScriptText(RAND(SAY_AGGRO_1, SAY_AGGRO_2, SAY_AGGRO_3), me); + Talk(SAY_AGGRO); spawns.DespawnAll(); me->RemoveFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_NON_ATTACKABLE | UNIT_FLAG_DISABLE_MOVE | UNIT_FLAG_NOT_SELECTABLE); me->CastStop(); @@ -464,10 +455,10 @@ public: if (HealthBelowPct(45)) { Phase = 3; - DoScriptText(SAY_REQUEST_AID, me); + Talk(SAY_REQUEST_AID); //here Lich King should respond to KelThuzad but I don't know which Creature to make talk //so for now just make Kelthuzad says it. - DoScriptText(SAY_ANSWER_REQUEST, me); + Talk(SAY_ANSWER_REQUEST); for (uint8 i = 0; i <= 3; ++i) { @@ -523,7 +514,7 @@ public: } } if (!chained.empty()) - DoScriptText(RAND(SAY_CHAIN_1, SAY_CHAIN_2), me); + Talk(SAY_CHAIN); events.RepeatEvent(urand(100000, 180000)); break; } @@ -627,7 +618,7 @@ public: std::vector::const_iterator itr = unitList.begin(); advance(itr, rand()%unitList.size()); DoCast(*itr, SPELL_MANA_DETONATION); - DoScriptText(RAND(SAY_SPECIAL_1, SAY_SPECIAL_2, SAY_SPECIAL_3), me); + Talk(SAY_SPECIAL); } events.RepeatEvent(urand(20000, 50000)); @@ -642,7 +633,7 @@ public: if (Unit* target = SelectTarget(SELECT_TARGET_RANDOM, RAID_MODE(1, 0), 0, true)) DoCast(target, SPELL_FROST_BLAST); if (rand()%2) - DoScriptText(SAY_FROST_BLAST, me); + Talk(SAY_FROST_BLAST); events.RepeatEvent(urand(30000, 90000)); break; default: diff --git a/src/server/scripts/Northrend/Naxxramas/boss_noth.cpp b/src/server/scripts/Northrend/Naxxramas/boss_noth.cpp index d106b99ace0..b670e36fa96 100644 --- a/src/server/scripts/Northrend/Naxxramas/boss_noth.cpp +++ b/src/server/scripts/Northrend/Naxxramas/boss_noth.cpp @@ -19,21 +19,25 @@ #include "ScriptedCreature.h" #include "naxxramas.h" -#define SAY_AGGRO RAND(-1533075, -1533076, -1533077) -#define SAY_SUMMON -1533078 -#define SAY_SLAY RAND(-1533079, -1533080) -#define SAY_DEATH -1533081 +enum Noth +{ + SAY_AGGRO = 0, + SAY_SUMMON = 1, + SAY_SLAY = 2, + SAY_DEATH = 3, -#define SOUND_DEATH 8848 + SOUND_DEATH = 8848, -#define SPELL_CURSE_PLAGUEBRINGER RAID_MODE(29213, 54835) -#define SPELL_BLINK RAND(29208, 29209, 29210, 29211) -#define SPELL_CRIPPLE RAID_MODE(29212, 54814) -#define SPELL_TELEPORT 29216 + SPELL_CURSE_PLAGUEBRINGER = 29213, // 25-man: 54835 + SPELL_CRIPPLE = 29212, // 25-man: 54814 + SPELL_TELEPORT = 29216, -#define MOB_WARRIOR 16984 -#define MOB_CHAMPION 16983 -#define MOB_GUARDIAN 16981 + MOB_WARRIOR = 16984, + MOB_CHAMPION = 16983, + MOB_GUARDIAN = 16981 +}; + +#define SPELL_BLINK RAND(29208, 29209, 29210, 29211) // Teleport position of Noth on his balcony #define TELE_X 2631.370f @@ -90,7 +94,7 @@ public: void EnterCombat(Unit* /*who*/) { _EnterCombat(); - DoScriptText(SAY_AGGRO, me); + Talk(SAY_AGGRO); balconyCount = 0; EnterPhaseGround(); } @@ -115,7 +119,7 @@ public: void KilledUnit(Unit* /*victim*/) { if (!(rand()%5)) - DoScriptText(SAY_SLAY, me); + Talk(SAY_SLAY); } void JustSummoned(Creature* summon) @@ -128,7 +132,7 @@ public: void JustDied(Unit* /*killer*/) { _JustDied(); - DoScriptText(SAY_DEATH, me); + Talk(SAY_DEATH); } void SummonUndead(uint32 entry, uint32 num) @@ -157,7 +161,7 @@ public: events.ScheduleEvent(EVENT_CURSE, urand(50000, 60000)); return; case EVENT_WARRIOR: - DoScriptText(SAY_SUMMON, me); + Talk(SAY_SUMMON); SummonUndead(MOB_WARRIOR, RAID_MODE(2, 3)); events.ScheduleEvent(EVENT_WARRIOR, 30000); return; @@ -178,7 +182,7 @@ public: waveCount = 0; return; case EVENT_WAVE: - DoScriptText(SAY_SUMMON, me); + Talk(SAY_SUMMON); switch (balconyCount) { case 0: SummonUndead(MOB_CHAMPION, RAID_MODE(2, 4)); break; diff --git a/src/server/scripts/Northrend/Naxxramas/boss_patchwerk.cpp b/src/server/scripts/Northrend/Naxxramas/boss_patchwerk.cpp index b1b57836a89..d4b3f5ddce0 100644 --- a/src/server/scripts/Northrend/Naxxramas/boss_patchwerk.cpp +++ b/src/server/scripts/Northrend/Naxxramas/boss_patchwerk.cpp @@ -30,12 +30,11 @@ enum Spells enum Yells { - SAY_AGGRO_1 = -1533017, - SAY_AGGRO_2 = -1533018, - SAY_SLAY = -1533019, - SAY_DEATH = -1533020, - EMOTE_BERSERK = -1533021, - EMOTE_ENRAGE = -1533022, + SAY_AGGRO = 0, + SAY_SLAY = 1, + SAY_DEATH = 2, + EMOTE_BERSERK = 3, + EMOTE_ENRAGE = 4 }; enum Events @@ -78,20 +77,20 @@ public: void KilledUnit(Unit* /*Victim*/) { if (!(rand()%5)) - DoScriptText(SAY_SLAY, me); + Talk(SAY_SLAY); } void JustDied(Unit* /*killer*/) { _JustDied(); - DoScriptText(SAY_DEATH, me); + Talk(SAY_DEATH); } void EnterCombat(Unit* /*who*/) { _EnterCombat(); Enraged = false; - DoScriptText(RAND(SAY_AGGRO_1, SAY_AGGRO_2), me); + Talk(SAY_AGGRO); events.ScheduleEvent(EVENT_HATEFUL, 1000); events.ScheduleEvent(EVENT_BERSERK, 360000); @@ -137,7 +136,7 @@ public: } case EVENT_BERSERK: DoCast(me, SPELL_BERSERK, true); - DoScriptText(EMOTE_BERSERK, me); + Talk(EMOTE_BERSERK); events.ScheduleEvent(EVENT_SLIME, 2000); break; case EVENT_SLIME: @@ -150,7 +149,7 @@ public: if (!Enraged && HealthBelowPct(5)) { DoCast(me, SPELL_FRENZY, true); - DoScriptText(EMOTE_ENRAGE, me); + Talk(EMOTE_ENRAGE); Enraged = true; } diff --git a/src/server/scripts/Northrend/Naxxramas/boss_sapphiron.cpp b/src/server/scripts/Northrend/Naxxramas/boss_sapphiron.cpp index 4dd7cbf6a66..aebd7fdc19c 100644 --- a/src/server/scripts/Northrend/Naxxramas/boss_sapphiron.cpp +++ b/src/server/scripts/Northrend/Naxxramas/boss_sapphiron.cpp @@ -245,7 +245,7 @@ class boss_sapphiron : public CreatureScript switch (eventId) { case EVENT_BERSERK: - DoScriptText(EMOTE_ENRAGE, me); + Talk(EMOTE_ENRAGE); DoCast(me, SPELL_BERSERK); return; case EVENT_CLEAVE: diff --git a/src/server/scripts/Northrend/Naxxramas/boss_thaddius.cpp b/src/server/scripts/Northrend/Naxxramas/boss_thaddius.cpp index 482f8a1200d..c86cf1e9f28 100644 --- a/src/server/scripts/Northrend/Naxxramas/boss_thaddius.cpp +++ b/src/server/scripts/Northrend/Naxxramas/boss_thaddius.cpp @@ -24,9 +24,9 @@ //Stalagg enum StalaggYells { - SAY_STAL_AGGRO = -1533023, //not used - SAY_STAL_SLAY = -1533024, //not used - SAY_STAL_DEATH = -1533025 //not used + SAY_STAL_AGGRO = 0, + SAY_STAL_SLAY = 1, + SAY_STAL_DEATH = 2 }; enum StalagSpells @@ -40,9 +40,9 @@ enum StalagSpells //Feugen enum FeugenYells { - SAY_FEUG_AGGRO = -1533026, //not used - SAY_FEUG_SLAY = -1533027, //not used - SAY_FEUG_DEATH = -1533028 //not used + SAY_FEUG_AGGRO = 0, + SAY_FEUG_SLAY = 1, + SAY_FEUG_DEATH = 2 }; enum FeugenSpells @@ -67,17 +67,12 @@ enum ThaddiusActions //Thaddius enum ThaddiusYells { - SAY_GREET = -1533029, //not used - SAY_AGGRO_1 = -1533030, - SAY_AGGRO_2 = -1533031, - SAY_AGGRO_3 = -1533032, - SAY_SLAY = -1533033, - SAY_ELECT = -1533034, //not used - SAY_DEATH = -1533035, - SAY_SCREAM1 = -1533036, //not used - SAY_SCREAM2 = -1533037, //not used - SAY_SCREAM3 = -1533038, //not used - SAY_SCREAM4 = -1533039 //not used + SAY_GREET = 0, + SAY_AGGRO = 1, + SAY_SLAY = 2, + SAY_ELECT = 3, + SAY_DEATH = 4, + SAY_SCREAM = 5 }; enum ThaddiusSpells @@ -155,13 +150,13 @@ public: void KilledUnit(Unit* /*victim*/) { if (!(rand()%5)) - DoScriptText(SAY_SLAY, me); + Talk(SAY_SLAY); } void JustDied(Unit* /*killer*/) { _JustDied(); - DoScriptText(SAY_DEATH, me); + Talk(SAY_DEATH); } void DoAction(const int32 action) @@ -198,7 +193,7 @@ public: void EnterCombat(Unit* /*who*/) { _EnterCombat(); - DoScriptText(RAND(SAY_AGGRO_1, SAY_AGGRO_2, SAY_AGGRO_3), me); + Talk(SAY_AGGRO); events.ScheduleEvent(EVENT_SHIFT, 30000); events.ScheduleEvent(EVENT_CHAIN, urand(10000, 20000)); events.ScheduleEvent(EVENT_BERSERK, 360000); @@ -315,13 +310,21 @@ public: magneticPullTimer = 20000; } + void KilledUnit(Unit* /*victim*/) + { + if (!(rand()%5)) + Talk(SAY_STAL_SLAY); + } + void EnterCombat(Unit* /*who*/) { + Talk(SAY_STAL_AGGRO); DoCast(SPELL_STALAGG_TESLA); } void JustDied(Unit* /*killer*/) { + Talk(SAY_STAL_DEATH); if (instance) if (Creature* pThaddius = me->GetCreature(*me, instance->GetData64(DATA_THADDIUS))) if (pThaddius->AI()) @@ -399,13 +402,21 @@ public: staticFieldTimer = 5000; } + void KilledUnit(Unit* /*victim*/) + { + if (!(rand()%5)) + Talk(SAY_FEUG_SLAY); + } + void EnterCombat(Unit* /*who*/) { + Talk(SAY_FEUG_AGGRO); DoCast(SPELL_FEUGEN_TESLA); } void JustDied(Unit* /*killer*/) { + Talk(SAY_FEUG_DEATH); if (instance) if (Creature* pThaddius = me->GetCreature(*me, instance->GetData64(DATA_THADDIUS))) if (pThaddius->AI()) diff --git a/src/server/scripts/Northrend/Nexus/Nexus/boss_anomalus.cpp b/src/server/scripts/Northrend/Nexus/Nexus/boss_anomalus.cpp index 80a5336a30c..2d89e5db0f0 100644 --- a/src/server/scripts/Northrend/Nexus/Nexus/boss_anomalus.cpp +++ b/src/server/scripts/Northrend/Nexus/Nexus/boss_anomalus.cpp @@ -38,10 +38,10 @@ enum Adds enum Yells { - SAY_AGGRO = -1576010, - SAY_DEATH = -1576011, - SAY_RIFT = -1576012, - SAY_SHIELD = -1576013 + SAY_AGGRO = 0, + SAY_DEATH = 1, + SAY_RIFT = 2, + SAY_SHIELD = 3 }; enum RiftSpells @@ -96,7 +96,7 @@ class boss_anomalus : public CreatureScript void EnterCombat(Unit* /*who*/) { - DoScriptText(SAY_AGGRO, me); + Talk(SAY_AGGRO); if (instance) instance->SetData(DATA_ANOMALUS_EVENT, IN_PROGRESS); @@ -104,7 +104,7 @@ class boss_anomalus : public CreatureScript void JustDied(Unit* /*killer*/) { - DoScriptText(SAY_DEATH, me); + Talk(SAY_DEATH); if (instance) instance->SetData(DATA_ANOMALUS_EVENT, DONE); @@ -155,7 +155,7 @@ class boss_anomalus : public CreatureScript if ((Phase == 0) && HealthBelowPct(50)) { Phase = 1; - DoScriptText(SAY_SHIELD, me); + Talk(SAY_SHIELD); DoCast(me, SPELL_RIFT_SHIELD); if (Creature* Rift = me->SummonCreature(MOB_CHAOTIC_RIFT, RiftLocation[urand(0, 5)], TEMPSUMMON_TIMED_DESPAWN_OUT_OF_COMBAT, 1000)) { @@ -163,7 +163,7 @@ class boss_anomalus : public CreatureScript if (Unit* target = SelectTarget(SELECT_TARGET_RANDOM, 0)) Rift->AI()->AttackStart(target); uiChaoticRiftGUID = Rift->GetGUID(); - DoScriptText(SAY_RIFT, me); + Talk(SAY_RIFT); } } diff --git a/src/server/scripts/Northrend/Nexus/Nexus/boss_keristrasza.cpp b/src/server/scripts/Northrend/Nexus/Nexus/boss_keristrasza.cpp index bbd86ec6a9f..c110a4a3e85 100644 --- a/src/server/scripts/Northrend/Nexus/Nexus/boss_keristrasza.cpp +++ b/src/server/scripts/Northrend/Nexus/Nexus/boss_keristrasza.cpp @@ -40,11 +40,11 @@ enum Spells enum Yells { //Yell - SAY_AGGRO = -1576040, - SAY_SLAY = -1576041, - SAY_ENRAGE = -1576042, - SAY_DEATH = -1576043, - SAY_CRYSTAL_NOVA = -1576044 + SAY_AGGRO = 0, + SAY_SLAY = 1, + SAY_ENRAGE = 2, + SAY_DEATH = 3, + SAY_CRYSTAL_NOVA = 4 }; enum Misc @@ -100,7 +100,7 @@ public: void EnterCombat(Unit* /*who*/) { - DoScriptText(SAY_AGGRO, me); + Talk(SAY_AGGRO); DoCastAOE(SPELL_INTENSE_COLD); if (instance) @@ -109,7 +109,7 @@ public: void JustDied(Unit* /*killer*/) { - DoScriptText(SAY_DEATH, me); + Talk(SAY_DEATH); if (instance) instance->SetData(DATA_KERISTRASZA_EVENT, DONE); @@ -117,7 +117,7 @@ public: void KilledUnit(Unit* /*victim*/) { - DoScriptText(SAY_SLAY, me); + Talk(SAY_SLAY); } bool CheckContainmentSpheres(bool remove_prison = false) @@ -174,7 +174,7 @@ public: if (!bEnrage && HealthBelowPct(25)) { - DoScriptText(SAY_ENRAGE, me); + Talk(SAY_ENRAGE); DoCast(me, SPELL_ENRAGE); bEnrage = true; } @@ -193,7 +193,7 @@ public: if (uiCrystalChainsCrystalizeTimer <= diff) { - DoScriptText(SAY_CRYSTAL_NOVA, me); + Talk(SAY_CRYSTAL_NOVA); if (IsHeroic()) DoCast(me, SPELL_CRYSTALIZE); else if (Unit* target = SelectTarget(SELECT_TARGET_RANDOM, 0, 100, true)) diff --git a/src/server/scripts/Northrend/Nexus/Nexus/boss_magus_telestra.cpp b/src/server/scripts/Northrend/Nexus/Nexus/boss_magus_telestra.cpp index 317a9845e87..c8d3cc6416c 100644 --- a/src/server/scripts/Northrend/Nexus/Nexus/boss_magus_telestra.cpp +++ b/src/server/scripts/Northrend/Nexus/Nexus/boss_magus_telestra.cpp @@ -43,12 +43,11 @@ enum Creatures enum Yells { - SAY_AGGRO = -1576000, - SAY_KILL = -1576001, - SAY_DEATH = -1576002, - SAY_MERGE = -1576003, - SAY_SPLIT_1 = -1576004, - SAY_SPLIT_2 = -1576005, + SAY_AGGRO = 0, + SAY_KILL = 1, + SAY_DEATH = 2, + SAY_MERGE = 3, + SAY_SPLIT = 4 }; #define ACTION_MAGUS_DEAD 1 @@ -122,7 +121,7 @@ public: void EnterCombat(Unit* /*who*/) { - DoScriptText(SAY_AGGRO, me); + Talk(SAY_AGGRO); if (instance) instance->SetData(DATA_MAGUS_TELESTRA_EVENT, IN_PROGRESS); @@ -130,7 +129,7 @@ public: void JustDied(Unit* /*killer*/) { - DoScriptText(SAY_DEATH, me); + Talk(SAY_DEATH); if (instance) instance->SetData(DATA_MAGUS_TELESTRA_EVENT, DONE); @@ -138,7 +137,7 @@ public: void KilledUnit(Unit* /*victim*/) { - DoScriptText(SAY_KILL, me); + Talk(SAY_KILL); } void DoAction(int32 const action) @@ -251,7 +250,7 @@ public: uiArcaneMagusGUID = 0; bIsWaitingToAppear = true; uiIsWaitingToAppearTimer = 4*IN_MILLISECONDS; - DoScriptText(SAY_MERGE, me); + Talk(SAY_MERGE); } else return; @@ -270,7 +269,7 @@ public: bFireMagusDead = false; bFrostMagusDead = false; bArcaneMagusDead = false; - DoScriptText(RAND(SAY_SPLIT_1, SAY_SPLIT_2), me); + Talk(SAY_SPLIT); return; } @@ -287,7 +286,7 @@ public: bFireMagusDead = false; bFrostMagusDead = false; bArcaneMagusDead = false; - DoScriptText(RAND(SAY_SPLIT_1, SAY_SPLIT_2), me); + Talk(SAY_SPLIT); return; } diff --git a/src/server/scripts/Northrend/Nexus/Nexus/commander_stoutbeard.cpp b/src/server/scripts/Northrend/Nexus/Nexus/commander_stoutbeard.cpp index 38808bc718d..1af1edcdf71 100644 --- a/src/server/scripts/Northrend/Nexus/Nexus/commander_stoutbeard.cpp +++ b/src/server/scripts/Northrend/Nexus/Nexus/commander_stoutbeard.cpp @@ -26,17 +26,15 @@ Script Data End */ #include "ScriptMgr.h" #include "ScriptedCreature.h" -#define SPELL_BATTLE_SHOUT 31403 -#define SPELL_CHARGE 60067 -#define SPELL_FRIGHTENING_SHOUT 19134 -#define SPELL_WHIRLWIND_1 38619 -#define SPELL_WHIRLWIND_2 38618 +enum CommanderStoutbeard +{ + SPELL_BATTLE_SHOUT = 31403, + SPELL_CHARGE = 60067, + SPELL_FRIGHTENING_SHOUT = 19134, + SPELL_WHIRLWIND_1 = 38619, + SPELL_WHIRLWIND_2 = 38618 +}; -//not used -//Yell -#define SAY_AGGRO -1576021 -#define SAY_KILL -1576022 -#define SAY_DEATH -1576023 class boss_commander_stoutbeard : public CreatureScript { @@ -53,10 +51,6 @@ public: boss_commander_stoutbeardAI(Creature* creature) : ScriptedAI(creature) {} void Reset() {} - void EnterCombat(Unit* /*who*/) - { - DoScriptText(SAY_AGGRO, me); - } void AttackStart(Unit* /*who*/) {} void MoveInLineOfSight(Unit* /*who*/) {} void UpdateAI(const uint32 /*diff*/) @@ -67,10 +61,6 @@ public: DoMeleeAttackIfReady(); } - void JustDied(Unit* /*killer*/) - { - DoScriptText(SAY_DEATH, me); - } }; }; diff --git a/src/server/scripts/Northrend/Nexus/Oculus/boss_drakos.cpp b/src/server/scripts/Northrend/Nexus/Oculus/boss_drakos.cpp index 035e1a9a6df..60f9a3ddc9a 100644 --- a/src/server/scripts/Northrend/Nexus/Oculus/boss_drakos.cpp +++ b/src/server/scripts/Northrend/Nexus/Oculus/boss_drakos.cpp @@ -31,18 +31,11 @@ enum Spells enum Yells { - SAY_AGGRO = -1578005, - SAY_KILL_1 = -1578006, - SAY_KILL_2 = -1578007, - SAY_KILL_3 = -1578008, - SAY_DEATH = -1578009, - SAY_PULL_1 = -1578010, - SAY_PULL_2 = -1578011, - SAY_PULL_3 = -1578012, - SAY_PULL_4 = -1578013, - SAY_STOMP_1 = -1578014, - SAY_STOMP_2 = -1578015, - SAY_STOMP_3 = -1578016 + SAY_AGGRO = 0, + SAY_KILL = 1, + SAY_DEATH = 2, + SAY_PULL = 3, + SAY_STOMP = 4 }; enum DrakosAchievement @@ -85,7 +78,7 @@ public: void EnterCombat(Unit* /*who*/) { _EnterCombat(); - DoScriptText(SAY_AGGRO, me); + Talk(SAY_AGGRO); } void UpdateAI(const uint32 diff) @@ -122,7 +115,7 @@ public: events.ScheduleEvent(EVENT_MAGIC_PULL, 15000); break; case EVENT_STOMP: - DoScriptText(RAND(SAY_STOMP_1, SAY_STOMP_2, SAY_STOMP_3), me); + Talk(SAY_STOMP); DoCast(SPELL_THUNDERING_STOMP); events.ScheduleEvent(EVENT_STOMP, 17000); break; @@ -136,7 +129,7 @@ public: { _JustDied(); - DoScriptText(SAY_DEATH, me); + Talk(SAY_DEATH); // start achievement timer (kill Eregos within 20 min) instance->DoStartTimedAchievement(ACHIEVEMENT_TIMED_TYPE_EVENT, ACHIEV_TIMED_START_EVENT); @@ -144,7 +137,7 @@ public: void KilledUnit(Unit* /*victim*/) { - DoScriptText(RAND(SAY_KILL_1, SAY_KILL_2, SAY_KILL_3), me); + Talk(SAY_KILL); } private: bool postPull; diff --git a/src/server/scripts/Northrend/Nexus/Oculus/boss_urom.cpp b/src/server/scripts/Northrend/Nexus/Oculus/boss_urom.cpp index 51e476785ff..44e2628e778 100644 --- a/src/server/scripts/Northrend/Nexus/Oculus/boss_urom.cpp +++ b/src/server/scripts/Northrend/Nexus/Oculus/boss_urom.cpp @@ -45,11 +45,11 @@ enum Spells enum Yells { - SAY_AGGRO_1 = -1578000, - SAY_AGGRO_2 = -1578001, - SAY_AGGRO_3 = -1578002, - SAY_AGGRO_4 = -1578003, - SAY_TELEPORT = -1578004, + SAY_AGGRO_1 = 0, + SAY_AGGRO_2 = 1, + SAY_AGGRO_3 = 2, + SAY_AGGRO_4 = 3, + SAY_TELEPORT = 1 }; enum eCreature @@ -84,11 +84,6 @@ static uint32 TeleportSpells[]= SPELL_SUMMON_MENAGERIE, SPELL_SUMMON_MENAGERIE_2, SPELL_SUMMON_MENAGERIE_3 }; -static int32 SayAggro[]= -{ - SAY_AGGRO_1, SAY_AGGRO_2, SAY_AGGRO_3, SAY_AGGRO_4 -}; - class boss_urom : public CreatureScript { public: @@ -153,7 +148,7 @@ public: { if (me->Attack(who, true)) { - DoScriptText(SayAggro[3], me); + Talk(RAND(SAY_AGGRO_1, SAY_AGGRO_2, SAY_AGGRO_3, SAY_AGGRO_4)); me->SetInCombatWith(who); who->SetInCombatWith(me); @@ -217,7 +212,7 @@ public: if (!instance || instance->GetData(DATA_UROM_PLATAFORM) > 2) return; - DoScriptText(SayAggro[instance->GetData(DATA_UROM_PLATAFORM)], me); + Talk(instance->GetData(DATA_UROM_PLATAFORM) < 5 ? instance->GetData(DATA_UROM_PLATAFORM) : 0); DoCast(TeleportSpells[instance->GetData(DATA_UROM_PLATAFORM)]); } @@ -233,7 +228,7 @@ public: if (teleportTimer <= uiDiff) { me->InterruptNonMeleeSpells(false); - DoScriptText(SAY_TELEPORT, me); + Talk(SAY_TELEPORT); me->GetMotionMaster()->MoveIdle(); DoCast(SPELL_TELEPORT); teleportTimer = urand(30000, 35000); diff --git a/src/server/scripts/Northrend/Ulduar/HallsOfStone/boss_krystallus.cpp b/src/server/scripts/Northrend/Ulduar/HallsOfStone/boss_krystallus.cpp index 93bea92503c..747bd699c81 100644 --- a/src/server/scripts/Northrend/Ulduar/HallsOfStone/boss_krystallus.cpp +++ b/src/server/scripts/Northrend/Ulduar/HallsOfStone/boss_krystallus.cpp @@ -45,10 +45,10 @@ enum Spells enum Yells { - SAY_AGGRO = -1599007, - SAY_KILL = -1599008, - SAY_DEATH = -1599009, - SAY_SHATTER = -1599010 + SAY_AGGRO = 0, + SAY_KILL = 1, + SAY_DEATH = 2, + SAY_SHATTER = 3 }; class boss_krystallus : public CreatureScript @@ -93,7 +93,7 @@ public: } void EnterCombat(Unit* /*who*/) { - DoScriptText(SAY_AGGRO, me); + Talk(SAY_AGGRO); if (instance) instance->SetData(DATA_KRYSTALLUS_EVENT, IN_PROGRESS); @@ -146,7 +146,7 @@ public: void JustDied(Unit* /*killer*/) { - DoScriptText(SAY_DEATH, me); + Talk(SAY_DEATH); if (instance) instance->SetData(DATA_KRYSTALLUS_EVENT, DONE); @@ -156,7 +156,7 @@ public: { if (victim == me) return; - DoScriptText(SAY_KILL, me); + Talk(SAY_KILL); } void SpellHitTarget(Unit* /*target*/, const SpellInfo* pSpell) diff --git a/src/server/scripts/Northrend/Ulduar/HallsOfStone/boss_maiden_of_grief.cpp b/src/server/scripts/Northrend/Ulduar/HallsOfStone/boss_maiden_of_grief.cpp index 8d113bce226..4511b8b0f1e 100644 --- a/src/server/scripts/Northrend/Ulduar/HallsOfStone/boss_maiden_of_grief.cpp +++ b/src/server/scripts/Northrend/Ulduar/HallsOfStone/boss_maiden_of_grief.cpp @@ -40,13 +40,10 @@ enum Spells enum Yells { - SAY_AGGRO = -1599000, - SAY_SLAY_1 = -1599001, - SAY_SLAY_2 = -1599002, - SAY_SLAY_3 = -1599003, - SAY_SLAY_4 = -1599004, - SAY_DEATH = -1599005, - SAY_STUN = -1599006 + SAY_AGGRO = 0, + SAY_SLAY = 1, + SAY_DEATH = 2, + SAY_STUN = 3 }; enum Achievements @@ -94,7 +91,7 @@ public: void EnterCombat(Unit* /*who*/) { - DoScriptText(SAY_AGGRO, me); + Talk(SAY_AGGRO); if (instance) { @@ -138,7 +135,7 @@ public: if (ShockOfSorrowTimer <= diff) { DoResetThreat(); - DoScriptText(SAY_STUN, me); + Talk(SAY_STUN); DoCast(me, SPELL_SHOCK_OF_SORROW_N); ShockOfSorrowTimer = urand(20000, 30000); } else ShockOfSorrowTimer -= diff; @@ -160,7 +157,7 @@ public: void JustDied(Unit* /*killer*/) { - DoScriptText(SAY_DEATH, me); + Talk(SAY_DEATH); if (instance) instance->SetData(DATA_MAIDEN_OF_GRIEF_EVENT, DONE); @@ -171,7 +168,7 @@ public: if (victim == me) return; - DoScriptText(RAND(SAY_SLAY_1, SAY_SLAY_2, SAY_SLAY_3, SAY_SLAY_4), me); + Talk(SAY_SLAY); } }; diff --git a/src/server/scripts/Northrend/Ulduar/HallsOfStone/boss_sjonnir.cpp b/src/server/scripts/Northrend/Ulduar/HallsOfStone/boss_sjonnir.cpp index c3e815f57dd..326779661cc 100644 --- a/src/server/scripts/Northrend/Ulduar/HallsOfStone/boss_sjonnir.cpp +++ b/src/server/scripts/Northrend/Ulduar/HallsOfStone/boss_sjonnir.cpp @@ -44,11 +44,9 @@ enum Spells enum Yells { - SAY_AGGRO = -1599011, - SAY_SLAY_1 = -1599012, - SAY_SLAY_2 = -1599013, - SAY_SLAY_3 = -1599014, - SAY_DEATH = -1599015 + SAY_AGGRO = 0, + SAY_SLAY = 1, + SAY_DEATH = 2 }; #define EMOTE_GENERIC_FRENZY -1000002 @@ -132,7 +130,7 @@ public: void EnterCombat(Unit* /*who*/) { - DoScriptText(SAY_AGGRO, me); + Talk(SAY_AGGRO); uiEncounterTimer = 0; @@ -217,7 +215,7 @@ public: void JustDied(Unit* /*killer*/) { - DoScriptText(SAY_DEATH, me); + Talk(SAY_DEATH); lSummons.DespawnAll(); if (instance) @@ -227,7 +225,7 @@ public: { if (victim == me) return; - DoScriptText(RAND(SAY_SLAY_1, SAY_SLAY_2, SAY_SLAY_3), me); + Talk(SAY_SLAY); } void DoAction(int32 const action) diff --git a/src/server/scripts/Northrend/Ulduar/HallsOfStone/halls_of_stone.cpp b/src/server/scripts/Northrend/Ulduar/HallsOfStone/halls_of_stone.cpp index 3c03508a14c..677541b2dfd 100644 --- a/src/server/scripts/Northrend/Ulduar/HallsOfStone/halls_of_stone.cpp +++ b/src/server/scripts/Northrend/Ulduar/HallsOfStone/halls_of_stone.cpp @@ -24,68 +24,62 @@ enum Texts { - SAY_KILL_1 = -1599016, - SAY_KILL_2 = -1599017, - SAY_KILL_3 = -1599018, - SAY_LOW_HEALTH = -1599019, - SAY_DEATH = -1599020, - SAY_PLAYER_DEATH_1 = -1599021, - SAY_PLAYER_DEATH_2 = -1599022, - SAY_PLAYER_DEATH_3 = -1599023, - SAY_ESCORT_START = -1599024, - - SAY_SPAWN_DWARF = -1599025, - SAY_SPAWN_TROGG = -1599026, - SAY_SPAWN_OOZE = -1599027, - SAY_SPAWN_EARTHEN = -1599028, - - SAY_EVENT_INTRO_1 = -1599029, - SAY_EVENT_INTRO_2 = -1599030, - SAY_EVENT_INTRO_3_ABED = -1599031, - - SAY_EVENT_A_1 = -1599032, - SAY_EVENT_A_2_KADD = -1599033, - SAY_EVENT_A_3 = -1599034, - - SAY_EVENT_B_1 = -1599035, - SAY_EVENT_B_2_MARN = -1599036, - SAY_EVENT_B_3 = -1599037, - - SAY_EVENT_C_1 = -1599038, - SAY_EVENT_C_2_ABED = -1599039, - SAY_EVENT_C_3 = -1599040, - - SAY_EVENT_D_1 = -1599041, - SAY_EVENT_D_2_ABED = -1599042, - SAY_EVENT_D_3 = -1599043, - SAY_EVENT_D_4_ABED = -1599044, - - SAY_EVENT_END_01 = -1599045, - SAY_EVENT_END_02 = -1599046, - SAY_EVENT_END_03_ABED = -1599047, - SAY_EVENT_END_04 = -1599048, - SAY_EVENT_END_05_ABED = -1599049, - SAY_EVENT_END_06 = -1599050, - SAY_EVENT_END_07_ABED = -1599051, - SAY_EVENT_END_08 = -1599052, - SAY_EVENT_END_09_KADD = -1599053, - SAY_EVENT_END_10 = -1599054, - SAY_EVENT_END_11_KADD = -1599055, - SAY_EVENT_END_12 = -1599056, - SAY_EVENT_END_13_KADD = -1599057, - SAY_EVENT_END_14 = -1599058, - SAY_EVENT_END_15_MARN = -1599059, - SAY_EVENT_END_16 = -1599060, - SAY_EVENT_END_17_MARN = -1599061, - SAY_EVENT_END_18 = -1599062, - SAY_EVENT_END_19_MARN = -1599063, - SAY_EVENT_END_20 = -1599064, - SAY_EVENT_END_21_ABED = -1599065, - - SAY_VICTORY_SJONNIR_1 = -1599066, - SAY_VICTORY_SJONNIR_2 = -1599067, - - SAY_ENTRANCE_MEET = -1599068, + SAY_KILL = 0, + SAY_LOW_HEALTH = 1, + SAY_DEATH = 2, + SAY_PLAYER_DEATH = 3, + SAY_ESCORT_START = 4, + + SAY_SPAWN_DWARF = 5, + SAY_SPAWN_TROGG = 6, + SAY_SPAWN_OOZE = 7, + SAY_SPAWN_EARTHEN = 8, + + SAY_EVENT_INTRO_1 = 9, + SAY_EVENT_INTRO_2 = 10, + SAY_EVENT_A_1 = 11, + SAY_EVENT_A_3 = 12, + SAY_EVENT_B_1 = 13, + SAY_EVENT_B_3 = 14, + SAY_EVENT_C_1 = 15, + SAY_EVENT_C_3 = 16, + SAY_EVENT_D_1 = 17, + SAY_EVENT_D_3 = 18, + + SAY_EVENT_END_01 = 19, + SAY_EVENT_END_02 = 20, + SAY_EVENT_END_04 = 21, + SAY_EVENT_END_06 = 22, + SAY_EVENT_END_08 = 23, + SAY_EVENT_END_10 = 24, + SAY_EVENT_END_12 = 25, + SAY_EVENT_END_14 = 26, + SAY_EVENT_END_16 = 27, + SAY_EVENT_END_18 = 28, + SAY_EVENT_END_20 = 29, + + SAY_VICTORY_SJONNIR_1 = 30, + SAY_VICTORY_SJONNIR_2 = 31, + SAY_ENTRANCE_MEET = 32, + + SAY_EVENT_INTRO_3_ABED = 0, + SAY_EVENT_C_2_ABED = 1, + SAY_EVENT_D_2_ABED = 2, + SAY_EVENT_D_4_ABED = 3, + SAY_EVENT_END_03_ABED = 4, + SAY_EVENT_END_05_ABED = 5, + SAY_EVENT_END_07_ABED = 6, + SAY_EVENT_END_21_ABED = 7, + + SAY_EVENT_A_2_KADD = 0, + SAY_EVENT_END_09_KADD = 1, + SAY_EVENT_END_11_KADD = 2, + SAY_EVENT_END_13_KADD = 3, + + SAY_EVENT_B_2_MARN = 0, + SAY_EVENT_END_15_MARN = 1, + SAY_EVENT_END_17_MARN = 2, + SAY_EVENT_END_19_MARN = 3, TEXT_ID_START = 13100, TEXT_ID_PROGRESS = 13101 @@ -363,12 +357,12 @@ public: } break; case 13: - DoScriptText(SAY_EVENT_INTRO_1, me); + Talk(SAY_EVENT_INTRO_1); SetEscortPaused(true); JumpToNextStep(20000); break; case 17: - DoScriptText(SAY_EVENT_INTRO_2, me); + Talk(SAY_EVENT_INTRO_2); if (instance) instance->HandleGameObject(instance->GetData64(DATA_GO_TRIBUNAL_CONSOLE), true); me->SetStandState(UNIT_STAND_STATE_KNEEL); @@ -452,7 +446,7 @@ public: instance->SetData(DATA_BRANN_EVENT, IN_PROGRESS); } bIsBattle = false; - DoScriptText(SAY_ESCORT_START, me); + Talk(SAY_ESCORT_START); SetRun(true); JumpToNextStep(0); break; @@ -463,21 +457,21 @@ public: case 5: if (instance) if (Creature* temp = (Unit::GetCreature(*me, instance->GetData64(DATA_ABEDNEUM)))) - DoScriptText(SAY_EVENT_INTRO_3_ABED, temp); + temp->AI()->Talk(SAY_EVENT_INTRO_3_ABED); JumpToNextStep(8500); break; case 6: - DoScriptText(SAY_EVENT_A_1, me); + Talk(SAY_EVENT_A_1); JumpToNextStep(6500); break; case 7: if (instance) if (Creature* temp = Unit::GetCreature(*me, instance->GetData64(DATA_KADDRAK))) - DoScriptText(SAY_EVENT_A_2_KADD, temp); + temp->AI()->Talk(SAY_EVENT_A_2_KADD); JumpToNextStep(12500); break; case 8: - DoScriptText(SAY_EVENT_A_3, me); + Talk(SAY_EVENT_A_3); if (instance) instance->HandleGameObject(instance->GetData64(DATA_GO_KADDRAK), true); if (Creature* temp = Unit::GetCreature(*me, uiControllerGUID)) @@ -490,18 +484,18 @@ public: JumpToNextStep(20000); break; case 10: - DoScriptText(SAY_EVENT_B_1, me); + Talk(SAY_EVENT_B_1); JumpToNextStep(6000); break; case 11: if (instance) if (Creature* temp = Unit::GetCreature(*me, instance->GetData64(DATA_MARNAK))) - DoScriptText(SAY_EVENT_B_2_MARN, temp); + temp->AI()->Talk(SAY_EVENT_B_2_MARN); SpawnDwarf(1); JumpToNextStep(20000); break; case 12: - DoScriptText(SAY_EVENT_B_3, me); + Talk(SAY_EVENT_B_3); if (instance) instance->HandleGameObject(instance->GetData64(DATA_GO_MARNAK), true); if (Creature* temp = Unit::GetCreature(*me, uiControllerGUID)) @@ -517,7 +511,7 @@ public: JumpToNextStep(20000); break; case 15: - DoScriptText(SAY_EVENT_C_1, me); + Talk(SAY_EVENT_C_1); SpawnDwarf(1); JumpToNextStep(10000); break; @@ -528,12 +522,12 @@ public: case 17: if (instance) if (Creature* temp = Unit::GetCreature(*me, instance->GetData64(DATA_ABEDNEUM))) - DoScriptText(SAY_EVENT_C_2_ABED, temp); + temp->AI()->Talk(SAY_EVENT_C_2_ABED); SpawnDwarf(1); JumpToNextStep(20000); break; case 18: - DoScriptText(SAY_EVENT_C_3, me); + Talk(SAY_EVENT_C_3); if (instance) instance->HandleGameObject(instance->GetData64(DATA_GO_ABEDNEUM), true); if (Creature* temp = Unit::GetCreature(*me, uiControllerGUID)) @@ -549,14 +543,14 @@ public: JumpToNextStep(15000); break; case 21: - DoScriptText(SAY_EVENT_D_1, me); + Talk(SAY_EVENT_D_1); SpawnDwarf(3); JumpToNextStep(20000); break; case 22: if (instance) if (Creature* temp = Unit::GetCreature(*me, instance->GetData64(DATA_ABEDNEUM))) - DoScriptText(SAY_EVENT_D_2_ABED, temp); + Talk(SAY_EVENT_D_2_ABED); SpawnDwarf(1); JumpToNextStep(5000); break; @@ -565,7 +559,7 @@ public: JumpToNextStep(15000); break; case 24: - DoScriptText(SAY_EVENT_D_3, me); + Talk(SAY_EVENT_D_3); SpawnDwarf(3); JumpToNextStep(5000); break; @@ -580,13 +574,13 @@ public: case 27: if (instance) if (Creature* temp = Unit::GetCreature(*me, instance->GetData64(DATA_ABEDNEUM))) - DoScriptText(SAY_EVENT_D_4_ABED, temp); + temp->AI()->Talk(SAY_EVENT_D_4_ABED); SpawnDwarf(1); JumpToNextStep(10000); break; case 28: me->SetReactState(REACT_DEFENSIVE); - DoScriptText(SAY_EVENT_END_01, me); + Talk(SAY_EVENT_END_01); me->SetStandState(UNIT_STAND_STATE_STAND); if (instance) instance->HandleGameObject(instance->GetData64(DATA_GO_SKY_FLOOR), true); @@ -597,7 +591,7 @@ public: JumpToNextStep(6500); break; case 29: - DoScriptText(SAY_EVENT_END_02, me); + Talk(SAY_EVENT_END_02); if (instance) instance->SetData(DATA_BRANN_EVENT, DONE); me->CastSpell(me, SPELL_REWARD_ACHIEVEMENT, true); @@ -606,97 +600,97 @@ public: case 30: if (instance) if (Creature* temp = Unit::GetCreature(*me, instance->GetData64(DATA_ABEDNEUM))) - DoScriptText(SAY_EVENT_END_03_ABED, temp); + temp->AI()->Talk(SAY_EVENT_END_03_ABED); JumpToNextStep(8500); break; case 31: - DoScriptText(SAY_EVENT_END_04, me); + Talk(SAY_EVENT_END_04); JumpToNextStep(11500); break; case 32: if (instance) if (Creature* temp = Unit::GetCreature(*me, instance->GetData64(DATA_ABEDNEUM))) - DoScriptText(SAY_EVENT_END_05_ABED, temp); + temp->AI()->Talk(SAY_EVENT_END_05_ABED); JumpToNextStep(11500); break; case 33: - DoScriptText(SAY_EVENT_END_06, me); + Talk(SAY_EVENT_END_06); JumpToNextStep(4500); break; case 34: if (instance) if (Creature* temp = Unit::GetCreature(*me, instance->GetData64(DATA_ABEDNEUM))) - DoScriptText(SAY_EVENT_END_07_ABED, temp); + temp->AI()->Talk(SAY_EVENT_END_07_ABED); JumpToNextStep(22500); break; case 35: - DoScriptText(SAY_EVENT_END_08, me); + Talk(SAY_EVENT_END_08); JumpToNextStep(7500); break; case 36: if (instance) if (Creature* temp = Unit::GetCreature(*me, instance->GetData64(DATA_KADDRAK))) - DoScriptText(SAY_EVENT_END_09_KADD, temp); + temp->AI()->Talk(SAY_EVENT_END_09_KADD); JumpToNextStep(18500); break; case 37: - DoScriptText(SAY_EVENT_END_10, me); + Talk(SAY_EVENT_END_10); JumpToNextStep(5500); break; case 38: if (instance) if (Creature* temp = Unit::GetCreature(*me, instance->GetData64(DATA_KADDRAK))) - DoScriptText(SAY_EVENT_END_11_KADD, temp); + temp->AI()->Talk(SAY_EVENT_END_11_KADD); JumpToNextStep(20500); break; case 39: - DoScriptText(SAY_EVENT_END_12, me); + Talk(SAY_EVENT_END_12); JumpToNextStep(2500); break; case 40: if (instance) if (Creature* temp = Unit::GetCreature(*me, instance->GetData64(DATA_KADDRAK))) - DoScriptText(SAY_EVENT_END_13_KADD, temp); + temp->AI()->Talk(SAY_EVENT_END_13_KADD); JumpToNextStep(19500); break; case 41: - DoScriptText(SAY_EVENT_END_14, me); + Talk(SAY_EVENT_END_14); JumpToNextStep(10500); break; case 42: if (instance) if (Creature* temp = Unit::GetCreature(*me, instance->GetData64(DATA_MARNAK))) - DoScriptText(SAY_EVENT_END_15_MARN, temp); + temp->AI()->Talk(SAY_EVENT_END_15_MARN); JumpToNextStep(6500); break; case 43: - DoScriptText(SAY_EVENT_END_16, me); + Talk(SAY_EVENT_END_16); JumpToNextStep(6500); break; case 44: if (instance) if (Creature* temp = Unit::GetCreature(*me, instance->GetData64(DATA_MARNAK))) - DoScriptText(SAY_EVENT_END_17_MARN, temp); + temp->AI()->Talk(SAY_EVENT_END_17_MARN); JumpToNextStep(25500); break; case 45: - DoScriptText(SAY_EVENT_END_18, me); + Talk(SAY_EVENT_END_18); JumpToNextStep(23500); break; case 46: if (instance) if (Creature* temp = Unit::GetCreature(*me, instance->GetData64(DATA_MARNAK))) - DoScriptText(SAY_EVENT_END_19_MARN, temp); + temp->AI()->Talk(SAY_EVENT_END_19_MARN); JumpToNextStep(3500); break; case 47: - DoScriptText(SAY_EVENT_END_20, me); + Talk(SAY_EVENT_END_20); JumpToNextStep(8500); break; case 48: if (instance) if (Creature* temp = Unit::GetCreature(*me, instance->GetData64(DATA_ABEDNEUM))) - DoScriptText(SAY_EVENT_END_21_ABED, temp); + temp->AI()->Talk(SAY_EVENT_END_21_ABED); JumpToNextStep(5500); break; case 49: @@ -723,7 +717,7 @@ public: if (!bIsLowHP && HealthBelowPct(30)) { - DoScriptText(SAY_LOW_HEALTH, me); + Talk(SAY_LOW_HEALTH); bIsLowHP = true; } else if (bIsLowHP && !HealthBelowPct(30)) diff --git a/src/server/scripts/Northrend/sholazar_basin.cpp b/src/server/scripts/Northrend/sholazar_basin.cpp index 8404413ad9d..a6d6cda11b1 100644 --- a/src/server/scripts/Northrend/sholazar_basin.cpp +++ b/src/server/scripts/Northrend/sholazar_basin.cpp @@ -44,9 +44,9 @@ EndContentData */ enum eRainspeaker { - SAY_START_IRO = -1571000, - SAY_QUEST_ACCEPT_IRO = -1571001, - SAY_END_IRO = -1571002, + SAY_START_IRO = 0, + SAY_QUEST_ACCEPT_IRO = 1, + SAY_END_IRO = 2, QUEST_FORTUNATE_MISUNDERSTANDINGS = 12570, FACTION_ESCORTEE_A = 774, @@ -106,7 +106,7 @@ public: case 28: player->GroupEventHappens(QUEST_FORTUNATE_MISUNDERSTANDINGS, me); // me->RestoreFaction(); - DoScriptText(SAY_END_IRO, me); + Talk(SAY_END_IRO); SetRun(false); break; } @@ -146,7 +146,7 @@ public: CAST_AI(npc_escortAI, (creature->AI()))->Start(true, false, player->GetGUID()); CAST_AI(npc_escortAI, (creature->AI()))->SetMaxPlayerDistance(35.0f); creature->SetUnitMovementFlags(MOVEMENTFLAG_FALLING); - DoScriptText(SAY_START_IRO, creature); + creature->AI()->Talk(SAY_START_IRO); switch (player->GetTeam()){ case ALLIANCE: @@ -162,7 +162,7 @@ public: bool OnQuestAccept(Player* /*player*/, Creature* creature, Quest const* /*_Quest*/) { - DoScriptText(SAY_QUEST_ACCEPT_IRO, creature); + creature->AI()->Talk(SAY_QUEST_ACCEPT_IRO); return false; } @@ -184,7 +184,7 @@ enum eVekjik GOSSIP_TEXTID_VEKJIK1 = 13137, GOSSIP_TEXTID_VEKJIK2 = 13138, - SAY_TEXTID_VEKJIK1 = -1000208, + SAY_TEXTID_VEKJIK1 = 0, SPELL_FREANZYHEARTS_FURY = 51469, @@ -223,7 +223,7 @@ public: break; case GOSSIP_ACTION_INFO_DEF+2: player->CLOSE_GOSSIP_MENU(); - DoScriptText(SAY_TEXTID_VEKJIK1, creature, player); + creature->AI()->Talk(SAY_TEXTID_VEKJIK1, player->GetGUID()); player->AreaExploredOrEventHappens(QUEST_MAKING_PEACE); creature->CastSpell(player, SPELL_FREANZYHEARTS_FURY, false); break; @@ -342,13 +342,13 @@ enum eEnums SPELL_EXPLODE_CRYSTAL = 62487, SPELL_FLAMES = 64561, - SAY_WP_7 = -1800047, - SAY_WP_6 = -1800048, - SAY_WP_5 = -1800049, - SAY_WP_4 = -1800050, - SAY_WP_3 = -1800051, - SAY_WP_2 = -1800052, - SAY_WP_1 = -1800053, + SAY_WP_1 = 0, + SAY_WP_2 = 1, + SAY_WP_3 = 2, + SAY_WP_4 = 3, + SAY_WP_5 = 4, + SAY_WP_6 = 5, + SAY_WP_7 = 6, QUEST_DISASTER = 12688 }; @@ -371,19 +371,19 @@ public: switch (waypointId) { case 0: - DoScriptText(SAY_WP_2, me); + Talk(SAY_WP_2); break; case 1: - DoScriptText(SAY_WP_3, me); + Talk(SAY_WP_3); me->CastSpell(5918.33f, 5372.91f, -98.770f, SPELL_EXPLODE_CRYSTAL, true); me->SummonGameObject(184743, 5918.33f, 5372.91f, -98.770f, 0, 0, 0, 0, 0, TEMPSUMMON_MANUAL_DESPAWN); //approx 3 to 4 seconds me->HandleEmoteCommand(EMOTE_ONESHOT_LAUGH); break; case 2: - DoScriptText(SAY_WP_4, me); + Talk(SAY_WP_4); break; case 7: - DoScriptText(SAY_WP_5, me); + Talk(SAY_WP_5); break; case 8: me->CastSpell(5887.37f, 5379.39f, -91.289f, SPELL_EXPLODE_CRYSTAL, true); @@ -391,13 +391,13 @@ public: me->HandleEmoteCommand(EMOTE_ONESHOT_LAUGH); break; case 9: - DoScriptText(SAY_WP_6, me); + Talk(SAY_WP_6); break; case 13: if (player) { player->GroupEventHappens(QUEST_DISASTER, me); - DoScriptText(SAY_WP_7, me); + Talk(SAY_WP_7); } break; } @@ -448,7 +448,7 @@ public: creature->setFaction(113); pEscortAI->Start(false, false, player->GetGUID()); - DoScriptText(SAY_WP_1, creature); + creature->AI()->Talk(SAY_WP_1); } } return true; @@ -713,8 +713,8 @@ enum eAdventurousDwarf GOSSIP_MENU_DWARF = 13307, - SAY_DWARF_OUCH = -1571042, - SAY_DWARF_HELP = -1571043 + SAY_DWARF_OUCH = 0, + SAY_DWARF_HELP = 1 }; class npc_adventurous_dwarf : public CreatureScript @@ -724,7 +724,7 @@ public: CreatureAI* GetAI(Creature* creature) const { - DoScriptText(SAY_DWARF_OUCH, creature); + creature->AI()->Talk(SAY_DWARF_OUCH); return NULL; } @@ -758,7 +758,7 @@ public: } if (spellId) player->CastSpell(player, spellId, true); - DoScriptText(SAY_DWARF_HELP, creature); + creature->AI()->Talk(SAY_DWARF_HELP); creature->DespawnOrUnsummon(); return true; } diff --git a/src/server/scripts/Northrend/storm_peaks.cpp b/src/server/scripts/Northrend/storm_peaks.cpp index b3a379d903d..f87b24ce639 100644 --- a/src/server/scripts/Northrend/storm_peaks.cpp +++ b/src/server/scripts/Northrend/storm_peaks.cpp @@ -30,13 +30,13 @@ ## npc_agnetta_tyrsdottar ######*/ -#define SAY_AGGRO -1571003 #define GOSSIP_AGNETTA "Skip the warmup, sister... or are you too scared to face soemeone your own size?" enum eAgnetta { QUEST_ITS_THAT_YOUR_GOBLIN = 12969, - FACTION_HOSTILE_AT1 = 45 + FACTION_HOSTILE_AT1 = 45, + SAY_AGGRO = 0 }; class npc_agnetta_tyrsdottar : public CreatureScript @@ -73,7 +73,7 @@ public: player->PlayerTalkClass->ClearMenus(); if (action == GOSSIP_ACTION_INFO_DEF+1) { - DoScriptText(SAY_AGGRO, creature); + creature->AI()->Talk(SAY_AGGRO); player->CLOSE_GOSSIP_MENU(); creature->setFaction(FACTION_HOSTILE_AT1); creature->AI()->AttackStart(player); @@ -143,8 +143,8 @@ public: enum eInjuredGoblin { QUEST_BITTER_DEPARTURE = 12832, - SAY_QUEST_ACCEPT = -1800042, - SAY_END_WP_REACHED = -1800043 + SAY_QUEST_ACCEPT = 0, + SAY_END_WP_REACHED = 1 }; #define GOSSIP_ITEM_1 "I am ready, lets get you out of here" @@ -167,7 +167,7 @@ public: switch (waypointId) { case 26: - DoScriptText(SAY_END_WP_REACHED, me, player); + Talk(SAY_END_WP_REACHED, player->GetGUID()); break; case 27: player->GroupEventHappens(QUEST_BITTER_DEPARTURE, me); @@ -218,7 +218,7 @@ public: bool OnQuestAccept(Player* /*player*/, Creature* creature, Quest const* quest) { if (quest->GetQuestId() == QUEST_BITTER_DEPARTURE) - DoScriptText(SAY_QUEST_ACCEPT, creature); + creature->AI()->Talk(SAY_QUEST_ACCEPT); return false; } -- cgit v1.2.3