diff options
Diffstat (limited to 'src/server/scripts/Kalimdor')
18 files changed, 348 insertions, 373 deletions
diff --git a/src/server/scripts/Kalimdor/BlackfathomDeeps/blackfathom_deeps.cpp b/src/server/scripts/Kalimdor/BlackfathomDeeps/blackfathom_deeps.cpp index 9cc515c1b0d..959f8a3f690 100644 --- a/src/server/scripts/Kalimdor/BlackfathomDeeps/blackfathom_deeps.cpp +++ b/src/server/scripts/Kalimdor/BlackfathomDeeps/blackfathom_deeps.cpp @@ -192,8 +192,8 @@ public: enum Morridune { - SAY_MORRIDUNE_1 = -1048003, - SAY_MORRIDUNE_2 = -1048004 + SAY_MORRIDUNE_1 = 0, + SAY_MORRIDUNE_2 = 1 }; class npc_morridune : public CreatureScript @@ -231,7 +231,7 @@ public: { npc_morriduneAI(Creature* creature) : npc_escortAI(creature) { - DoScriptText(SAY_MORRIDUNE_1, creature); + creature->AI()->Talk(SAY_MORRIDUNE_1); me->RemoveFlag(UNIT_NPC_FLAGS, UNIT_NPC_FLAG_GOSSIP); Start(false, false, 0); } @@ -245,7 +245,7 @@ public: me->SetOrientation(1.775791f); me->SendMovementFlagUpdate(); me->SetFlag(UNIT_NPC_FLAGS, UNIT_NPC_FLAG_GOSSIP); - DoScriptText(SAY_MORRIDUNE_2, me); + Talk(SAY_MORRIDUNE_2); break; } } diff --git a/src/server/scripts/Kalimdor/BlackfathomDeeps/boss_kelris.cpp b/src/server/scripts/Kalimdor/BlackfathomDeeps/boss_kelris.cpp index 1c754b78672..0a4779508e9 100644 --- a/src/server/scripts/Kalimdor/BlackfathomDeeps/boss_kelris.cpp +++ b/src/server/scripts/Kalimdor/BlackfathomDeeps/boss_kelris.cpp @@ -21,16 +21,12 @@ enum Spells { - SPELL_MIND_BLAST = 15587, - SPELL_SLEEP = 8399, -}; + SPELL_MIND_BLAST = 15587, + SPELL_SLEEP = 8399, -//Id's from ACID -enum Yells -{ - SAY_AGGRO = -1048002, - SAY_SLEEP = -1048001, - SAY_DEATH = -1048000 + SAY_AGGRO = 0, + SAY_SLEEP = 1, + SAY_DEATH = 2 }; class boss_kelris : public CreatureScript @@ -65,14 +61,14 @@ public: void EnterCombat(Unit* /*who*/) { - DoScriptText(SAY_AGGRO, me); + Talk(SAY_AGGRO); if (instance) instance->SetData(TYPE_KELRIS, IN_PROGRESS); } void JustDied(Unit* /*killer*/) { - DoScriptText(SAY_DEATH, me); + Talk(SAY_DEATH); if (instance) instance->SetData(TYPE_KELRIS, DONE); } @@ -92,7 +88,7 @@ public: { if (Unit* target = SelectTarget(SELECT_TARGET_RANDOM, 0, 100, true)) { - DoScriptText(SAY_SLEEP, me); + Talk(SAY_SLEEP); DoCast(target, SPELL_SLEEP); } sleepTimer = urand(15000, 20000); diff --git a/src/server/scripts/Kalimdor/RazorfenKraul/razorfen_kraul.cpp b/src/server/scripts/Kalimdor/RazorfenKraul/razorfen_kraul.cpp index 7b3cd9f9900..b0953c73e57 100644 --- a/src/server/scripts/Kalimdor/RazorfenKraul/razorfen_kraul.cpp +++ b/src/server/scripts/Kalimdor/RazorfenKraul/razorfen_kraul.cpp @@ -33,20 +33,23 @@ EndContentData */ #include "razorfen_kraul.h" #include "Player.h" -#define SAY_READY -1047000 -#define SAY_POINT -1047001 -#define SAY_AGGRO1 -1047002 -#define SAY_BLUELEAF -1047003 -#define SAY_DANGER -1047004 -#define SAY_BAD -1047005 -#define SAY_THINK -1047006 -#define SAY_SOON -1047007 -#define SAY_FINALY -1047008 -#define SAY_WIN -1047009 -#define SAY_END -1047010 - -#define QUEST_WILLIX_THE_IMPORTER 1144 -#define ENTRY_BOAR 4514 +enum Willix +{ + SAY_READY = 0, + SAY_POINT = 1, + SAY_AGGRO1 = 2, + SAY_BLUELEAF = 3, + SAY_DANGER = 4, + SAY_BAD = 5, + SAY_THINK = 6, + SAY_SOON = 7, + SAY_FINALY = 8, + SAY_WIN = 9, + SAY_END = 10, + + QUEST_WILLIX_THE_IMPORTER = 1144, + ENTRY_BOAR = 4514 +}; class npc_willix : public CreatureScript { @@ -58,7 +61,7 @@ public: if (quest->GetQuestId() == QUEST_WILLIX_THE_IMPORTER) { CAST_AI(npc_escortAI, (creature->AI()))->Start(true, false, player->GetGUID()); - DoScriptText(SAY_READY, creature, player); + creature->AI()->Talk(SAY_READY, player->GetGUID()); creature->setFaction(113); } @@ -84,43 +87,43 @@ public: { case 3: me->HandleEmoteCommand(EMOTE_STATE_POINT); - DoScriptText(SAY_POINT, me, player); + Talk(SAY_POINT, player->GetGUID()); break; case 4: me->SummonCreature(ENTRY_BOAR, 2137.66f, 1843.98f, 48.08f, 1.54f, TEMPSUMMON_TIMED_DESPAWN_OUT_OF_COMBAT, 25000); break; case 8: - DoScriptText(SAY_BLUELEAF, me, player); + Talk(SAY_BLUELEAF, player->GetGUID()); break; case 9: - DoScriptText(SAY_DANGER, me, player); + Talk(SAY_DANGER, player->GetGUID()); break; case 13: - DoScriptText(SAY_BAD, me, player); + Talk(SAY_BAD, player->GetGUID()); break; case 14: me->SummonCreature(ENTRY_BOAR, 2078.91f, 1704.54f, 56.77f, 1.54f, TEMPSUMMON_TIMED_DESPAWN_OUT_OF_COMBAT, 25000); break; case 25: - DoScriptText(SAY_THINK, me, player); + Talk(SAY_THINK, player->GetGUID()); break; case 31: - DoScriptText(SAY_SOON, me, player); + Talk(SAY_SOON, player->GetGUID()); break; case 42: - DoScriptText(SAY_FINALY, me, player); + Talk(SAY_FINALY, player->GetGUID()); break; case 43: me->SummonCreature(ENTRY_BOAR, 1956.43f, 1596.97f, 81.75f, 1.54f, TEMPSUMMON_TIMED_DESPAWN_OUT_OF_COMBAT, 25000); break; case 45: - DoScriptText(SAY_WIN, me, player); + Talk(SAY_WIN, player->GetGUID()); me->SetFlag(UNIT_NPC_FLAGS, UNIT_NPC_FLAG_QUESTGIVER); if (player->GetTypeId() == TYPEID_PLAYER) CAST_PLR(player)->GroupEventHappens(QUEST_WILLIX_THE_IMPORTER, me); break; case 46: - DoScriptText(SAY_END, me, player); + Talk(SAY_END, player->GetGUID()); break; } } @@ -129,7 +132,7 @@ public: void EnterCombat(Unit* /*who*/) { - DoScriptText(SAY_AGGRO1, me, NULL); + Talk(SAY_AGGRO1); } void JustSummoned(Creature* summoned) diff --git a/src/server/scripts/Kalimdor/TempleOfAhnQiraj/boss_cthun.cpp b/src/server/scripts/Kalimdor/TempleOfAhnQiraj/boss_cthun.cpp index 6b569bbd3e5..1cb69689b67 100644 --- a/src/server/scripts/Kalimdor/TempleOfAhnQiraj/boss_cthun.cpp +++ b/src/server/scripts/Kalimdor/TempleOfAhnQiraj/boss_cthun.cpp @@ -142,7 +142,7 @@ enum Actions enum Yells { //Text emote - EMOTE_WEAKENED = -1531011, + EMOTE_WEAKENED = 0, // ****** Out of Combat ****** // Random Wispers - No txt only sound @@ -712,7 +712,7 @@ public: { instance->SetData(DATA_CTHUN_PHASE, PHASE_CTHUN_WEAK); - DoScriptText(EMOTE_WEAKENED, me); + Talk(EMOTE_WEAKENED); PhaseTimer = 45000; DoCast(me, SPELL_PURPLE_COLORATION, true); diff --git a/src/server/scripts/Kalimdor/TempleOfAhnQiraj/boss_huhuran.cpp b/src/server/scripts/Kalimdor/TempleOfAhnQiraj/boss_huhuran.cpp index 83af40c57f2..ab4968e3bf7 100644 --- a/src/server/scripts/Kalimdor/TempleOfAhnQiraj/boss_huhuran.cpp +++ b/src/server/scripts/Kalimdor/TempleOfAhnQiraj/boss_huhuran.cpp @@ -26,15 +26,18 @@ EndScriptData */ #include "ScriptMgr.h" #include "ScriptedCreature.h" -#define EMOTE_GENERIC_FRENZY_KILL -1000001 -#define EMOTE_GENERIC_BERSERK -1000004 - -#define SPELL_FRENZY 26051 -#define SPELL_BERSERK 26068 -#define SPELL_POISONBOLT 26052 -#define SPELL_NOXIOUSPOISON 26053 -#define SPELL_WYVERNSTING 26180 -#define SPELL_ACIDSPIT 26050 +enum Huhuran +{ + EMOTE_FRENZY_KILL = 0, + EMOTE_BERSERK = 1, + + SPELL_FRENZY = 26051, + SPELL_BERSERK = 26068, + SPELL_POISONBOLT = 26052, + SPELL_NOXIOUSPOISON = 26053, + SPELL_WYVERNSTING = 26180, + SPELL_ACIDSPIT = 26050 +}; class boss_huhuran : public CreatureScript { @@ -87,7 +90,7 @@ public: if (!Frenzy && Frenzy_Timer <= diff) { DoCast(me, SPELL_FRENZY); - DoScriptText(EMOTE_GENERIC_FRENZY_KILL, me); + Talk(EMOTE_FRENZY_KILL); Frenzy = true; PoisonBolt_Timer = 3000; Frenzy_Timer = urand(25000, 35000); @@ -136,7 +139,7 @@ public: if (!Berserk && HealthBelowPct(31)) { me->InterruptNonMeleeSpells(false); - DoScriptText(EMOTE_GENERIC_BERSERK, me); + Talk(EMOTE_BERSERK); DoCast(me, SPELL_BERSERK); Berserk = true; } diff --git a/src/server/scripts/Kalimdor/TempleOfAhnQiraj/boss_sartura.cpp b/src/server/scripts/Kalimdor/TempleOfAhnQiraj/boss_sartura.cpp index 02554bbe6b3..2ac9358b976 100644 --- a/src/server/scripts/Kalimdor/TempleOfAhnQiraj/boss_sartura.cpp +++ b/src/server/scripts/Kalimdor/TempleOfAhnQiraj/boss_sartura.cpp @@ -26,17 +26,20 @@ EndScriptData */ #include "ScriptMgr.h" #include "ScriptedCreature.h" -#define SAY_AGGRO -1531008 -#define SAY_SLAY -1531009 -#define SAY_DEATH -1531010 +enum Sartura +{ + SAY_AGGRO = 0, + SAY_SLAY = 1, + SAY_DEATH = 2, -#define SPELL_WHIRLWIND 26083 -#define SPELL_ENRAGE 28747 //Not sure if right ID. -#define SPELL_ENRAGEHARD 28798 + SPELL_WHIRLWIND = 26083, + SPELL_ENRAGE = 28747, //Not sure if right ID. + SPELL_ENRAGEHARD = 28798, //Guard Spell -#define SPELL_WHIRLWINDADD 26038 -#define SPELL_KNOCKBACK 26027 + SPELL_WHIRLWINDADD = 26038, + SPELL_KNOCKBACK = 26027 +}; class boss_sartura : public CreatureScript { @@ -82,17 +85,17 @@ public: void EnterCombat(Unit* /*who*/) { - DoScriptText(SAY_AGGRO, me); + Talk(SAY_AGGRO); } void JustDied(Unit* /*killer*/) { - DoScriptText(SAY_DEATH, me); + Talk(SAY_DEATH); } void KilledUnit(Unit* /*victim*/) { - DoScriptText(SAY_SLAY, me); + Talk(SAY_SLAY); } void UpdateAI(const uint32 diff) diff --git a/src/server/scripts/Kalimdor/TempleOfAhnQiraj/boss_skeram.cpp b/src/server/scripts/Kalimdor/TempleOfAhnQiraj/boss_skeram.cpp index 917c790f42b..4ebdc408963 100644 --- a/src/server/scripts/Kalimdor/TempleOfAhnQiraj/boss_skeram.cpp +++ b/src/server/scripts/Kalimdor/TempleOfAhnQiraj/boss_skeram.cpp @@ -29,19 +29,18 @@ EndScriptData */ #include "Group.h" #include "Player.h" -#define SAY_AGGRO1 -1531000 -#define SAY_AGGRO2 -1531001 -#define SAY_AGGRO3 -1531002 -#define SAY_SLAY1 -1531003 -#define SAY_SLAY2 -1531004 -#define SAY_SLAY3 -1531005 -#define SAY_SPLIT -1531006 -#define SAY_DEATH -1531007 - -#define SPELL_ARCANE_EXPLOSION 25679 -#define SPELL_EARTH_SHOCK 26194 -#define SPELL_TRUE_FULFILLMENT 785 -#define SPELL_BLINK 28391 +enum Skeram +{ + SAY_AGGRO = 0, + SAY_SLAY = 1, + SAY_SPLIT = 2, + SAY_DEATH = 3, + + SPELL_ARCANE_EXPLOSION = 25679, + SPELL_EARTH_SHOCK = 26194, + SPELL_TRUE_FULFILLMENT = 785, + SPELL_BLINK = 28391 +}; class ov_mycoordinates { @@ -104,20 +103,20 @@ public: void KilledUnit(Unit* /*victim*/) { - DoScriptText(RAND(SAY_SLAY1, SAY_SLAY2, SAY_SLAY3), me); + Talk(SAY_SLAY); } void JustDied(Unit* /*killer*/) { if (!IsImage) - DoScriptText(SAY_DEATH, me); + Talk(SAY_DEATH); } void EnterCombat(Unit* /*who*/) { if (IsImage || Images75) return; - DoScriptText(RAND(SAY_AGGRO1, SAY_AGGRO2, SAY_AGGRO3), me); + Talk(SAY_AGGRO); } void UpdateAI(const uint32 diff) @@ -209,7 +208,7 @@ public: void DoSplit(int atPercent /* 75 50 25 */) { - DoScriptText(SAY_SPLIT, me); + Talk(SAY_SPLIT); ov_mycoordinates *place1 = new ov_mycoordinates(-8340.782227f, 2083.814453f, 125.648788f, 0); ov_mycoordinates *place2 = new ov_mycoordinates(-8341.546875f, 2118.504639f, 133.058151f, 0); diff --git a/src/server/scripts/Kalimdor/WailingCaverns/wailing_caverns.cpp b/src/server/scripts/Kalimdor/WailingCaverns/wailing_caverns.cpp index 45f73f72b54..6cc8d5931d3 100644 --- a/src/server/scripts/Kalimdor/WailingCaverns/wailing_caverns.cpp +++ b/src/server/scripts/Kalimdor/WailingCaverns/wailing_caverns.cpp @@ -39,33 +39,30 @@ EndContentData */ enum Enums { - //say - SAY_MAKE_PREPARATIONS = -1043001, - SAY_TEMPLE_OF_PROMISE = -1043002, - SAY_MUST_CONTINUE = -1043003, - SAY_BANISH_THE_SPIRITS = -1043004, - SAY_CAVERNS_PURIFIED = -1043005, - SAY_BEYOND_THIS_CORRIDOR = -1043006, - SAY_EMERALD_DREAM = -1043007, - SAY_MUTANUS_THE_DEVOURER = -1043012, - SAY_NARALEX_AWAKES = -1043014, - SAY_THANK_YOU = -1043015, - SAY_FAREWELL = -1043016, - SAY_ATTACKED = -1043017, - //yell - SAY_AT_LAST = -1043000, - SAY_I_AM_AWAKE = -1043013, - //emote - EMOTE_AWAKENING_RITUAL = -1043008, - EMOTE_TROUBLED_SLEEP = -1043009, - EMOTE_WRITHE_IN_AGONY = -1043010, - EMOTE_HORRENDOUS_VISION = -1043011, - //spell + SAY_AT_LAST = 0, + SAY_MAKE_PREPARATIONS = 1, + SAY_TEMPLE_OF_PROMISE = 2, + SAY_MUST_CONTINUE = 3, + SAY_BANISH_THE_SPIRITS = 4, + SAY_CAVERNS_PURIFIED = 5, + SAY_BEYOND_THIS_CORRIDOR = 6, + SAY_EMERALD_DREAM = 7, + EMOTE_AWAKENING_RITUAL = 8, + EMOTE_TROUBLED_SLEEP = 0, + EMOTE_WRITHE_IN_AGONY = 1, + EMOTE_HORRENDOUS_VISION = 2, + SAY_MUTANUS_THE_DEVOURER = 9, + SAY_I_AM_AWAKE = 3, + SAY_NARALEX_AWAKES = 10, + SAY_THANK_YOU = 4, + SAY_FAREWELL = 5, + SAY_ATTACKED = 11, + SPELL_MARK_OF_THE_WILD_RANK_2 = 5232, SPELL_SERPENTINE_CLEANSING = 6270, SPELL_NARALEXS_AWAKENING = 6271, SPELL_FLIGHT_FORM = 33943, - //npc entry + NPC_DEVIATE_RAVAGER = 3636, NPC_DEVIATE_VIPER = 5755, NPC_DEVIATE_MOCCASIN = 5762, @@ -97,7 +94,7 @@ public: if (instance) instance->SetData(TYPE_NARALEX_EVENT, IN_PROGRESS); - DoScriptText(SAY_MAKE_PREPARATIONS, creature); + creature->AI()->Talk(SAY_MAKE_PREPARATIONS); creature->setFaction(250); creature->RemoveFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_IMMUNE_TO_PC); @@ -124,7 +121,7 @@ public: if (!instance->GetData(TYPE_NARALEX_YELLED)) { - DoScriptText(SAY_AT_LAST, creature); + creature->AI()->Talk(SAY_AT_LAST); instance->SetData(TYPE_NARALEX_YELLED, 1); } } @@ -166,7 +163,7 @@ public: instance->SetData(TYPE_NARALEX_PART1, IN_PROGRESS); break; case 5: - DoScriptText(SAY_MUST_CONTINUE, me); + Talk(SAY_MUST_CONTINUE); instance->SetData(TYPE_NARALEX_PART1, DONE); break; case 11: @@ -175,7 +172,7 @@ public: instance->SetData(TYPE_NARALEX_PART2, IN_PROGRESS); break; case 19: - DoScriptText(SAY_BEYOND_THIS_CORRIDOR, me); + Talk(SAY_BEYOND_THIS_CORRIDOR); break; case 24: eventProgress = 1; @@ -192,7 +189,7 @@ public: void EnterCombat(Unit* who) { - DoScriptText(SAY_ATTACKED, me, who); + Talk(SAY_ATTACKED, who->GetGUID()); } void JustDied(Unit* /*slayer*/) @@ -229,7 +226,7 @@ public: if (eventProgress == 1) { ++eventProgress; - DoScriptText(SAY_TEMPLE_OF_PROMISE, me); + Talk(SAY_TEMPLE_OF_PROMISE); me->SummonCreature(NPC_DEVIATE_RAVAGER, -82.1763f, 227.874f, -93.3233f, 0, TEMPSUMMON_CORPSE_TIMED_DESPAWN, 5000); me->SummonCreature(NPC_DEVIATE_RAVAGER, -72.9506f, 216.645f, -93.6756f, 0, TEMPSUMMON_CORPSE_TIMED_DESPAWN, 5000); } @@ -238,7 +235,7 @@ public: if (eventProgress == 1) { ++eventProgress; - DoScriptText(SAY_BANISH_THE_SPIRITS, me); + Talk(SAY_BANISH_THE_SPIRITS); DoCast(me, SPELL_SERPENTINE_CLEANSING); //CAST_AI(npc_escort::npc_escortAI, me->AI())->SetCanDefend(false); eventTimer = 30000; @@ -250,7 +247,7 @@ public: if (eventProgress == 2) { //CAST_AI(npc_escort::npc_escortAI, me->AI())->SetCanDefend(true); - DoScriptText(SAY_CAVERNS_PURIFIED, me); + Talk(SAY_CAVERNS_PURIFIED); instance->SetData(TYPE_NARALEX_PART2, DONE); if (me->HasAura(SPELL_SERPENTINE_CLEANSING)) me->RemoveAura(SPELL_SERPENTINE_CLEANSING); @@ -262,7 +259,7 @@ public: ++eventProgress; eventTimer = 4000; me->SetStandState(UNIT_STAND_STATE_KNEEL); - DoScriptText(SAY_EMERALD_DREAM, me); + Talk(SAY_EMERALD_DREAM); } else if (eventProgress == 2) @@ -272,7 +269,7 @@ public: //CAST_AI(npc_escort::npc_escortAI, me->AI())->SetCanDefend(false); if (Creature* naralex = instance->instance->GetCreature(instance->GetData64(DATA_NARALEX))) DoCast(naralex, SPELL_NARALEXS_AWAKENING, true); - DoScriptText(EMOTE_AWAKENING_RITUAL, me); + Talk(EMOTE_AWAKENING_RITUAL); } else if (eventProgress == 3) @@ -280,7 +277,7 @@ public: ++eventProgress; eventTimer = 15000; if (Creature* naralex = instance->instance->GetCreature(instance->GetData64(DATA_NARALEX))) - DoScriptText(EMOTE_TROUBLED_SLEEP, naralex); + naralex->AI()->Talk(EMOTE_TROUBLED_SLEEP); me->SummonCreature(NPC_DEVIATE_MOCCASIN, 135.943f, 199.701f, -103.529f, 0, TEMPSUMMON_CORPSE_TIMED_DESPAWN, 15000); me->SummonCreature(NPC_DEVIATE_MOCCASIN, 151.08f, 221.13f, -103.609f, 0, TEMPSUMMON_CORPSE_TIMED_DESPAWN, 15000); me->SummonCreature(NPC_DEVIATE_MOCCASIN, 128.007f, 227.428f, -97.421f, 0, TEMPSUMMON_CORPSE_TIMED_DESPAWN, 15000); @@ -291,7 +288,7 @@ public: ++eventProgress; eventTimer = 30000; if (Creature* naralex = instance->instance->GetCreature(instance->GetData64(DATA_NARALEX))) - DoScriptText(EMOTE_WRITHE_IN_AGONY, naralex); + naralex->AI()->Talk(EMOTE_WRITHE_IN_AGONY); me->SummonCreature(NPC_NIGHTMARE_ECTOPLASM, 133.413f, 207.188f, -102.469f, 0, TEMPSUMMON_CORPSE_TIMED_DESPAWN, 15000); me->SummonCreature(NPC_NIGHTMARE_ECTOPLASM, 142.857f, 218.645f, -102.905f, 0, TEMPSUMMON_CORPSE_TIMED_DESPAWN, 15000); me->SummonCreature(NPC_NIGHTMARE_ECTOPLASM, 105.102f, 227.211f, -102.752f, 0, TEMPSUMMON_CORPSE_TIMED_DESPAWN, 15000); @@ -305,9 +302,9 @@ public: { ++eventProgress; if (Creature* naralex = instance->instance->GetCreature(instance->GetData64(DATA_NARALEX))) - DoScriptText(EMOTE_HORRENDOUS_VISION, naralex); + naralex->AI()->Talk(EMOTE_HORRENDOUS_VISION); me->SummonCreature(NPC_MUTANUS_THE_DEVOURER, 150.872f, 262.905f, -103.503f, 0, TEMPSUMMON_CORPSE_TIMED_DESPAWN, 300000); - DoScriptText(SAY_MUTANUS_THE_DEVOURER, me); + Talk(SAY_MUTANUS_THE_DEVOURER); instance->SetData(TYPE_MUTANUS_THE_DEVOURER, IN_PROGRESS); } else @@ -320,9 +317,9 @@ public: if (me->HasAura(SPELL_NARALEXS_AWAKENING)) me->RemoveAura(SPELL_NARALEXS_AWAKENING); naralex->SetStandState(UNIT_STAND_STATE_STAND); - DoScriptText(SAY_I_AM_AWAKE, naralex); + naralex->AI()->Talk(SAY_I_AM_AWAKE); } - DoScriptText(SAY_NARALEX_AWAKES, me); + Talk(SAY_NARALEX_AWAKES); } else if (eventProgress == 7) @@ -330,7 +327,7 @@ public: ++eventProgress; eventTimer = 6000; if (Creature* naralex = instance->instance->GetCreature(instance->GetData64(DATA_NARALEX))) - DoScriptText(SAY_THANK_YOU, naralex); + naralex->AI()->Talk(SAY_THANK_YOU); } else if (eventProgress == 8) @@ -339,7 +336,7 @@ public: eventTimer = 8000; if (Creature* naralex = instance->instance->GetCreature(instance->GetData64(DATA_NARALEX))) { - DoScriptText(SAY_FAREWELL, naralex); + naralex->AI()->Talk(SAY_FAREWELL); naralex->AddAura(SPELL_FLIGHT_FORM, naralex); } SetRun(); diff --git a/src/server/scripts/Kalimdor/ZulFarrak/zulfarrak.cpp b/src/server/scripts/Kalimdor/ZulFarrak/zulfarrak.cpp index f288db920f4..0a948e4a5f0 100644 --- a/src/server/scripts/Kalimdor/ZulFarrak/zulfarrak.cpp +++ b/src/server/scripts/Kalimdor/ZulFarrak/zulfarrak.cpp @@ -242,16 +242,16 @@ private: enum weegliSpells { - SPELL_BOMB = 8858, - SPELL_GOBLIN_LAND_MINE = 21688, - SPELL_SHOOT = 6660, - SPELL_WEEGLIS_BARREL = 10772 + SPELL_BOMB = 8858, + SPELL_GOBLIN_LAND_MINE = 21688, + SPELL_SHOOT = 6660, + SPELL_WEEGLIS_BARREL = 10772 }; enum weegliSays { - SAY_WEEGLI_OHNO = -1209000, - SAY_WEEGLI_OK_I_GO = -1209001 + SAY_WEEGLI_OHNO = 0, + SAY_WEEGLI_OK_I_GO = 1 }; #define GOSSIP_WEEGLI "[PH] Please blow up the door." @@ -363,7 +363,7 @@ public: if (instance->GetData(EVENT_PYRAMID) == PYRAMID_CAGES_OPEN) { instance->SetData(EVENT_PYRAMID, PYRAMID_ARRIVED_AT_STAIR); - DoScriptText(SAY_WEEGLI_OHNO, me); + Talk(SAY_WEEGLI_OHNO); me->SetHomePosition(1882.69f, 1272.28f, 41.87f, 0); } else @@ -388,7 +388,7 @@ public: me->setFaction(FACTION_FRIENDLY); me->GetMotionMaster()->MovePoint(0, 1858.57f, 1146.35f, 14.745f); me->SetHomePosition(1858.57f, 1146.35f, 14.745f, 3.85f); // in case he gets interrupted - DoScriptText(SAY_WEEGLI_OK_I_GO, me); + Talk(SAY_WEEGLI_OK_I_GO); destroyingDoor=true; } } diff --git a/src/server/scripts/Kalimdor/azuremyst_isle.cpp b/src/server/scripts/Kalimdor/azuremyst_isle.cpp index 96e67c8de47..e7c34e591fc 100644 --- a/src/server/scripts/Kalimdor/azuremyst_isle.cpp +++ b/src/server/scripts/Kalimdor/azuremyst_isle.cpp @@ -47,15 +47,9 @@ EndContentData */ enum draeneiSurvivor { - SAY_HEAL1 = -1000176, - SAY_HEAL2 = -1000177, - SAY_HEAL3 = -1000178, - SAY_HEAL4 = -1000179, + SAY_HEAL = 0, - SAY_HELP1 = -1000180, - SAY_HELP2 = -1000181, - SAY_HELP3 = -1000182, - SAY_HELP4 = -1000183, + SAY_HELP = 1, SPELL_IRRIDATION = 35046, SPELL_STUNNED = 28630 @@ -108,7 +102,7 @@ public: if (CanSayHelp && who->GetTypeId() == TYPEID_PLAYER && me->IsFriendlyTo(who) && me->IsWithinDistInMap(who, 25.0f)) { //Random switch between 4 texts - DoScriptText(RAND(SAY_HELP1, SAY_HELP2, SAY_HELP3, SAY_HELP4), me, who); + Talk(SAY_HELP, who->GetGUID()); SayHelpTimer = 20000; CanSayHelp = false; @@ -140,7 +134,7 @@ public: if (Player* player = Unit::GetPlayer(*me, pCaster)) { - DoScriptText(RAND(SAY_HEAL1, SAY_HEAL2, SAY_HEAL3, SAY_HEAL4), me, player); + Talk(SAY_HEAL, player->GetGUID()); player->TalkedToCreature(me->GetEntry(), me->GetGUID()); } @@ -181,9 +175,9 @@ public: enum Overgrind { - SAY_TEXT = -1000184, - SAY_EMOTE = -1000185, - ATTACK_YELL = -1000186, + SAY_TEXT = 0, + SAY_EMOTE = 1, + ATTACK_YELL = 2, AREA_COVE = 3579, AREA_ISLE = 3639, @@ -257,7 +251,7 @@ public: void EnterCombat(Unit* who) { - DoScriptText(ATTACK_YELL, me, who); + Talk(ATTACK_YELL, who->GetGUID()); } void UpdateAI(const uint32 diff) @@ -266,8 +260,8 @@ public: { if (EmoteTimer <= diff) { - DoScriptText(SAY_TEXT, me); - DoScriptText(SAY_EMOTE, me); + Talk(SAY_TEXT); + Talk(SAY_EMOTE); EmoteTimer = urand(120000, 150000); } else EmoteTimer -= diff; } @@ -338,12 +332,12 @@ public: enum Magwin { - SAY_START = -1000111, - SAY_AGGRO = -1000112, - SAY_PROGRESS = -1000113, - SAY_END1 = -1000114, - SAY_END2 = -1000115, - EMOTE_HUG = -1000116, + SAY_START = 0, + SAY_AGGRO = 1, + SAY_PROGRESS = 2, + SAY_END1 = 3, + SAY_END2 = 4, + EMOTE_HUG = 5, QUEST_A_CRY_FOR_SAY_HELP = 9528 }; @@ -380,17 +374,17 @@ public: switch (waypointId) { case 0: - DoScriptText(SAY_START, me, player); + Talk(SAY_START, player->GetGUID()); break; case 17: - DoScriptText(SAY_PROGRESS, me, player); + Talk(SAY_PROGRESS, player->GetGUID()); break; case 28: - DoScriptText(SAY_END1, me, player); + Talk(SAY_END1, player->GetGUID()); break; case 29: - DoScriptText(EMOTE_HUG, me, player); - DoScriptText(SAY_END2, me, player); + Talk(EMOTE_HUG, player->GetGUID()); + Talk(SAY_END2, player->GetGUID()); player->GroupEventHappens(QUEST_A_CRY_FOR_SAY_HELP, me); break; } @@ -399,7 +393,7 @@ public: void EnterCombat(Unit* who) { - DoScriptText(SAY_AGGRO, me, who); + Talk(SAY_AGGRO, who->GetGUID()); } void Reset() {} @@ -417,15 +411,15 @@ enum Geezle SPELL_TREE_DISGUISE = 30298, - GEEZLE_SAY_1 = -1000629, - SPARK_SAY_2 = -1000630, - SPARK_SAY_3 = -1000631, - GEEZLE_SAY_4 = -1000632, - SPARK_SAY_5 = -1000633, - SPARK_SAY_6 = -1000634, - GEEZLE_SAY_7 = -1000635, + GEEZLE_SAY_1 = 0, + SPARK_SAY_2 = 0, + SPARK_SAY_3 = 1, + GEEZLE_SAY_4 = 1, + SPARK_SAY_5 = 2, + SPARK_SAY_6 = 3, + GEEZLE_SAY_7 = 2, - EMOTE_SPARK = -1000636, + EMOTE_SPARK = 4, MOB_SPARK = 17243, GO_NAGA_FLAG = 181694 @@ -479,41 +473,49 @@ public: uint32 NextStep(uint8 Step) { Creature* Spark = Unit::GetCreature(*me, SparkGUID); + if (!Spark) + return 99999999; switch (Step) { case 0: - if (Spark) - Spark->GetMotionMaster()->MovePoint(0, -5080.70f, -11253.61f, 0.56f); + Spark->GetMotionMaster()->MovePoint(0, -5080.70f, -11253.61f, 0.56f); me->GetMotionMaster()->MovePoint(0, -5092.26f, -11252, 0.71f); - return 9000; // NPCs are walking up to fire + return 9000; case 1: DespawnNagaFlag(true); - DoScriptText(EMOTE_SPARK, Spark); + Spark->AI()->Talk(EMOTE_SPARK); return 1000; case 2: - DoScriptText(GEEZLE_SAY_1, me, Spark); - if (Spark) - { - Spark->SetInFront(me); - me->SetInFront(Spark); - } + Talk(GEEZLE_SAY_1, SparkGUID); + Spark->SetInFront(me); + me->SetInFront(Spark); return 5000; - case 3: DoScriptText(SPARK_SAY_2, Spark); return 7000; - case 4: DoScriptText(SPARK_SAY_3, Spark); return 8000; - case 5: DoScriptText(GEEZLE_SAY_4, me, Spark); return 8000; - case 6: DoScriptText(SPARK_SAY_5, Spark); return 9000; - case 7: DoScriptText(SPARK_SAY_6, Spark); return 8000; - case 8: DoScriptText(GEEZLE_SAY_7, me, Spark); return 2000; + case 3: + Spark->AI()->Talk(SPARK_SAY_2); + return 7000; + case 4: + Spark->AI()->Talk(SPARK_SAY_3); + return 8000; + case 5: + Talk(GEEZLE_SAY_4, SparkGUID); + return 8000; + case 6: + Spark->AI()->Talk(SPARK_SAY_5); + return 9000; + case 7: + Spark->AI()->Talk(SPARK_SAY_6); + return 8000; + case 8: + Talk(GEEZLE_SAY_7, SparkGUID); + return 2000; case 9: me->GetMotionMaster()->MoveTargetedHome(); - if (Spark) - Spark->GetMotionMaster()->MovePoint(0, SparkPos); + Spark->GetMotionMaster()->MovePoint(0, SparkPos); CompleteQuest(); return 9000; case 10: - if (Spark) - Spark->DisappearAndDie(); + Spark->DisappearAndDie(); DespawnNagaFlag(false); me->DisappearAndDie(); default: return 99999999; @@ -658,9 +660,7 @@ enum BristlelimbCage NPC_STILLPINE_CAPITIVE = 17375, GO_BRISTELIMB_CAGE = 181714, - CAPITIVE_SAY_1 = -1000474, - CAPITIVE_SAY_2 = -1000475, - CAPITIVE_SAY_3 = -1000476, + CAPITIVE_SAY = 0, POINT_INIT = 1, EVENT_DESPAWN = 1, @@ -673,9 +673,7 @@ class npc_stillpine_capitive : public CreatureScript struct npc_stillpine_capitiveAI : public ScriptedAI { - npc_stillpine_capitiveAI(Creature* creature) : ScriptedAI(creature) - { - } + npc_stillpine_capitiveAI(Creature* creature) : ScriptedAI(creature) {} void Reset() { @@ -693,7 +691,7 @@ class npc_stillpine_capitive : public CreatureScript { if (owner) { - DoScriptText(RAND(CAPITIVE_SAY_1, CAPITIVE_SAY_2, CAPITIVE_SAY_3), me, owner); + Talk(CAPITIVE_SAY, owner->GetGUID()); _player = owner; } Position pos; diff --git a/src/server/scripts/Kalimdor/bloodmyst_isle.cpp b/src/server/scripts/Kalimdor/bloodmyst_isle.cpp index 339cd02c2e3..3b77ee34275 100644 --- a/src/server/scripts/Kalimdor/bloodmyst_isle.cpp +++ b/src/server/scripts/Kalimdor/bloodmyst_isle.cpp @@ -158,7 +158,7 @@ enum Stillpine NPC_PRINCESS_STILLPINE = 17682, GO_PRINCESS_STILLPINES_CAGE = 181928, SPELL_OPENING_PRINCESS_STILLPINE_CREDIT = 31003, - SAY_DIRECTION = -1800074 + SAY_DIRECTION = 0 }; class go_princess_stillpines_cage : public GameObjectScript @@ -191,7 +191,7 @@ public: { if (type == POINT_MOTION_TYPE && id == 1) { - DoScriptText(SAY_DIRECTION, me); + Talk(SAY_DIRECTION); me->DespawnOrUnsummon(); } } diff --git a/src/server/scripts/Kalimdor/darkshore.cpp b/src/server/scripts/Kalimdor/darkshore.cpp index 5d10076c114..921cc6aaf97 100644 --- a/src/server/scripts/Kalimdor/darkshore.cpp +++ b/src/server/scripts/Kalimdor/darkshore.cpp @@ -43,23 +43,12 @@ EndContentData */ enum Kerlonian { - SAY_KER_START = -1000434, - - EMOTE_KER_SLEEP_1 = -1000435, - EMOTE_KER_SLEEP_2 = -1000436, - EMOTE_KER_SLEEP_3 = -1000437, - - SAY_KER_SLEEP_1 = -1000438, - SAY_KER_SLEEP_2 = -1000439, - SAY_KER_SLEEP_3 = -1000440, - SAY_KER_SLEEP_4 = -1000441, - - EMOTE_KER_AWAKEN = -1000445, - - SAY_KER_ALERT_1 = -1000442, - SAY_KER_ALERT_2 = -1000443, - - SAY_KER_END = -1000444, + SAY_KER_START = 0, + EMOTE_KER_SLEEP = 1, + SAY_KER_SLEEP = 2, + SAY_KER_ALERT_1 = 3, + SAY_KER_END = 4, + EMOTE_KER_AWAKEN = 5, SPELL_SLEEP_VISUAL = 25148, SPELL_AWAKEN = 17536, @@ -81,7 +70,7 @@ public: if (npc_kerlonianAI* pKerlonianAI = CAST_AI(npc_kerlonian::npc_kerlonianAI, creature->AI())) { creature->SetStandState(UNIT_STAND_STATE_STAND); - DoScriptText(SAY_KER_START, creature, player); + creature->AI()->Talk(SAY_KER_START, player->GetGUID()); pKerlonianAI->StartFollow(player, FACTION_KER_ESCORTEE, quest); } } @@ -118,7 +107,7 @@ public: if (player->GetQuestStatus(QUEST_SLEEPER_AWAKENED) == QUEST_STATUS_INCOMPLETE) player->GroupEventHappens(QUEST_SLEEPER_AWAKENED, me); - DoScriptText(SAY_KER_END, me); + Talk(SAY_KER_END); } SetFollowComplete(); @@ -136,9 +125,9 @@ public: { SetFollowPaused(true); - DoScriptText(RAND(EMOTE_KER_SLEEP_1, EMOTE_KER_SLEEP_2, EMOTE_KER_SLEEP_3), me); + Talk(EMOTE_KER_SLEEP); - DoScriptText(RAND(SAY_KER_SLEEP_1, SAY_KER_SLEEP_2, SAY_KER_SLEEP_3, SAY_KER_SLEEP_4), me); + Talk(SAY_KER_SLEEP); me->SetStandState(UNIT_STAND_STATE_SLEEP); DoCast(me, SPELL_SLEEP_VISUAL, false); @@ -149,7 +138,7 @@ public: me->RemoveAurasDueToSpell(SPELL_SLEEP_VISUAL); me->SetStandState(UNIT_STAND_STATE_STAND); - DoScriptText(EMOTE_KER_AWAKEN, me); + Talk(EMOTE_KER_AWAKEN); SetFollowPaused(false); } @@ -187,19 +176,19 @@ public: enum Remtravel { - SAY_REM_START = -1000327, - SAY_REM_AGGRO = -1000328, - SAY_REM_RAMP1_1 = -1000329, - SAY_REM_RAMP1_2 = -1000330, - SAY_REM_BOOK = -1000331, - SAY_REM_TENT1_1 = -1000332, - SAY_REM_TENT1_2 = -1000333, - SAY_REM_MOSS = -1000334, - EMOTE_REM_MOSS = -1000335, - SAY_REM_MOSS_PROGRESS = -1000336, - SAY_REM_PROGRESS = -1000337, - SAY_REM_REMEMBER = -1000338, - EMOTE_REM_END = -1000339, + SAY_REM_START = 0, + SAY_REM_AGGRO = 1, + SAY_REM_RAMP1_1 = 2, + SAY_REM_RAMP1_2 = 3, + SAY_REM_BOOK = 4, + SAY_REM_TENT1_1 = 5, + SAY_REM_TENT1_2 = 6, + SAY_REM_MOSS = 7, + EMOTE_REM_MOSS = 8, + SAY_REM_MOSS_PROGRESS = 9, + SAY_REM_PROGRESS = 10, + SAY_REM_REMEMBER = 11, + EMOTE_REM_END = 12, FACTION_ESCORTEE = 10, QUEST_ABSENT_MINDED_PT2 = 731, @@ -242,40 +231,40 @@ public: switch (waypointId) { case 0: - DoScriptText(SAY_REM_START, me, player); + Talk(SAY_REM_START, player->GetGUID()); break; case 5: - DoScriptText(SAY_REM_RAMP1_1, me, player); + Talk(SAY_REM_RAMP1_1, player->GetGUID()); break; case 6: DoSpawnCreature(NPC_GRAVEL_SCOUT, -10.0f, 5.0f, 0.0f, 0.0f, TEMPSUMMON_TIMED_DESPAWN_OUT_OF_COMBAT, 30000); DoSpawnCreature(NPC_GRAVEL_BONE, -10.0f, 7.0f, 0.0f, 0.0f, TEMPSUMMON_TIMED_DESPAWN_OUT_OF_COMBAT, 30000); break; case 9: - DoScriptText(SAY_REM_RAMP1_2, me, player); + Talk(SAY_REM_RAMP1_2, player->GetGUID()); break; case 14: //depend quest rewarded? - DoScriptText(SAY_REM_BOOK, me, player); + Talk(SAY_REM_BOOK, player->GetGUID()); break; case 15: - DoScriptText(SAY_REM_TENT1_1, me, player); + Talk(SAY_REM_TENT1_1, player->GetGUID()); break; case 16: DoSpawnCreature(NPC_GRAVEL_SCOUT, -10.0f, 5.0f, 0.0f, 0.0f, TEMPSUMMON_TIMED_DESPAWN_OUT_OF_COMBAT, 30000); DoSpawnCreature(NPC_GRAVEL_BONE, -10.0f, 7.0f, 0.0f, 0.0f, TEMPSUMMON_TIMED_DESPAWN_OUT_OF_COMBAT, 30000); break; case 17: - DoScriptText(SAY_REM_TENT1_2, me, player); + Talk(SAY_REM_TENT1_2, player->GetGUID()); break; case 26: - DoScriptText(SAY_REM_MOSS, me, player); + Talk(SAY_REM_MOSS, player->GetGUID()); break; case 27: - DoScriptText(EMOTE_REM_MOSS, me, player); + Talk(EMOTE_REM_MOSS, player->GetGUID()); break; case 28: - DoScriptText(SAY_REM_MOSS_PROGRESS, me, player); + Talk(SAY_REM_MOSS_PROGRESS, player->GetGUID()); break; case 29: DoSpawnCreature(NPC_GRAVEL_SCOUT, -15.0f, 3.0f, 0.0f, 0.0f, TEMPSUMMON_TIMED_DESPAWN_OUT_OF_COMBAT, 30000); @@ -283,13 +272,13 @@ public: DoSpawnCreature(NPC_GRAVEL_GEO, -15.0f, 7.0f, 0.0f, 0.0f, TEMPSUMMON_TIMED_DESPAWN_OUT_OF_COMBAT, 30000); break; case 31: - DoScriptText(SAY_REM_PROGRESS, me, player); + Talk(SAY_REM_PROGRESS, player->GetGUID()); break; case 41: - DoScriptText(SAY_REM_REMEMBER, me, player); + Talk(SAY_REM_REMEMBER, player->GetGUID()); break; case 42: - DoScriptText(EMOTE_REM_END, me, player); + Talk(EMOTE_REM_END, player->GetGUID()); player->GroupEventHappens(QUEST_ABSENT_MINDED_PT2, me); break; } @@ -301,7 +290,7 @@ public: void EnterCombat(Unit* who) { if (urand(0, 1)) - DoScriptText(SAY_REM_AGGRO, me, who); + Talk(SAY_REM_AGGRO, who->GetGUID()); } void JustSummoned(Creature* /*pSummoned*/) @@ -319,8 +308,8 @@ public: enum Threshwackonator { - EMOTE_START = -1000325, //signed for 4966 - SAY_AT_CLOSE = -1000326, //signed for 4966 + EMOTE_START = 0, + SAY_AT_CLOSE = 1, QUEST_GYROMAST_REV = 2078, NPC_GELKAK = 6667, FACTION_HOSTILE = 14 @@ -342,7 +331,7 @@ public: if (npc_threshwackonatorAI* pThreshAI = CAST_AI(npc_threshwackonator::npc_threshwackonatorAI, creature->AI())) { - DoScriptText(EMOTE_START, creature); + creature->AI()->Talk(EMOTE_START); pThreshAI->StartFollow(player); } } @@ -378,7 +367,7 @@ public: { if (me->IsWithinDistInMap(who, 10.0f)) { - DoScriptText(SAY_AT_CLOSE, who); + Talk(SAY_AT_CLOSE, who->GetGUID()); DoAtEnd(); } } diff --git a/src/server/scripts/Kalimdor/dustwallow_marsh.cpp b/src/server/scripts/Kalimdor/dustwallow_marsh.cpp index 6ab9b653c5d..018b39c58e8 100644 --- a/src/server/scripts/Kalimdor/dustwallow_marsh.cpp +++ b/src/server/scripts/Kalimdor/dustwallow_marsh.cpp @@ -138,22 +138,16 @@ class mobs_risen_husk_spirit : public CreatureScript enum TheramoreGuard { - SAY_QUEST1 = -1000641, - SAY_QUEST2 = -1000642, - SAY_QUEST3 = -1000643, - SAY_QUEST4 = -1000644, - SAY_QUEST5 = -1000645, - SAY_QUEST6 = -1000646, - SAY_QUEST7 = -1000647, - SAY_QUEST8 = -1000648, - SAY_QUEST9 = -1000649, - - QUEST_DISCREDITING_THE_DESERTERS = 11133, - - NPC_THERAMORE_GUARD = 4979, - - SPELL_DOCTORED_LEAFLET = 42725, - SPELL_PROPAGANDIZED = 42246, + QUEST_DISCREDITING_THE_DESERTERS = 11133, + + NPC_THERAMORE_GUARD = 4979, + + SPELL_DOCTORED_LEAFLET = 42725, + SPELL_PROPAGANDIZED = 42246, + + SAY_QUEST1 = 0, + SAY_QUEST2 = 1, + SAY_QUEST3 = 2 }; #define GOSSIP_ITEM_THERAMORE_GUARD "You look like an intelligent person. Why don't you read one of these leaflets and give it some thought?" @@ -181,7 +175,7 @@ public: { player->CLOSE_GOSSIP_MENU(); player->KilledMonsterCredit(NPC_THERAMORE_GUARD, 0); - DoScriptText(SAY_QUEST1, creature); + creature->AI()->Talk(SAY_QUEST1); creature->CastSpell(creature, SPELL_DOCTORED_LEAFLET, false); creature->RemoveFlag(UNIT_NPC_FLAGS, UNIT_NPC_FLAG_GOSSIP); CAST_AI(npc_theramore_guard::npc_theramore_guardAI, creature->AI())->YellTimer = 4000; @@ -220,12 +214,12 @@ public: switch (Step) { case 0: - DoScriptText(RAND(SAY_QUEST2, SAY_QUEST3, SAY_QUEST4, SAY_QUEST5, SAY_QUEST6), me); + Talk(SAY_QUEST2); YellTimer = 3000; ++Step; break; case 1: - DoScriptText(RAND(SAY_QUEST7, SAY_QUEST8, SAY_QUEST9), me); + Talk(SAY_QUEST3); me->HandleEmoteCommand(EMOTE_ONESHOT_LAUGH); Step = 0; bYellTimer = false; @@ -328,12 +322,11 @@ public: enum Hendel { - // looks like all this text ids are wrong. - SAY_PROGRESS_1_TER = -1000411, // signed for 3568 - SAY_PROGRESS_2_HEN = -1000412, // signed for 3568 - SAY_PROGRESS_3_TER = -1000413, - SAY_PROGRESS_4_TER = -1000414, - EMOTE_SURRENDER = -1000415, + SAY_PROGRESS_1_TER = 0, + SAY_PROGRESS_2_HEN = 1, + SAY_PROGRESS_3_TER = 2, + SAY_PROGRESS_4_TER = 3, + EMOTE_SURRENDER = 4, QUEST_MISSING_DIPLO_PT16 = 1324, FACTION_HOSTILE = 168, //guessed, may be different @@ -391,7 +384,7 @@ public: if (Player* player = pDoneBy->GetCharmerOrOwnerPlayerOrPlayerItself()) player->GroupEventHappens(QUEST_MISSING_DIPLO_PT16, me); - DoScriptText(EMOTE_SURRENDER, me); + Talk(EMOTE_SURRENDER); EnterEvadeMode(); } } @@ -407,8 +400,8 @@ Position const MovePosition = {-2967.030f, -3872.1799f, 35.620f, 0.0f}; enum Zelfrax { - SAY_ZELFRAX = -1000472, - SAY_ZELFRAX_2 = -1000473 + SAY_ZELFRAX1 = 0, + SAY_ZELFRAX2 = 1 }; class npc_zelfrax : public CreatureScript @@ -461,8 +454,8 @@ public: { SetCombatMovement(false); me->GetMotionMaster()->MovePoint(0, MovePosition); - DoScriptText(SAY_ZELFRAX, me); - DoScriptText(SAY_ZELFRAX_2, me); + Talk(SAY_ZELFRAX1); + Talk(SAY_ZELFRAX2); } void UpdateAI(uint32 const /*Diff*/) @@ -484,16 +477,16 @@ enum Stinky { QUEST_STINKYS_ESCAPE_H = 1270, QUEST_STINKYS_ESCAPE_A = 1222, - SAY_QUEST_ACCEPTED = -1000507, - SAY_STAY_1 = -1000508, - SAY_STAY_2 = -1000509, - SAY_STAY_3 = -1000510, - SAY_STAY_4 = -1000511, - SAY_STAY_5 = -1000512, - SAY_STAY_6 = -1000513, - SAY_QUEST_COMPLETE = -1000514, - SAY_ATTACKED_1 = -1000515, - EMOTE_DISAPPEAR = -1000516 + SAY_QUEST_ACCEPTED = 0, + SAY_STAY_1 = 1, + SAY_STAY_2 = 2, + SAY_STAY_3 = 3, + SAY_STAY_4 = 4, + SAY_STAY_5 = 5, + SAY_STAY_6 = 6, + SAY_QUEST_COMPLETE = 7, + SAY_ATTACKED_1 = 8, + EMOTE_DISAPPEAR = 9 }; class npc_stinky : public CreatureScript @@ -514,7 +507,7 @@ public: { creature->setFaction(FACTION_ESCORT_N_NEUTRAL_ACTIVE); creature->SetStandState(UNIT_STAND_STATE_STAND); - DoScriptText(SAY_QUEST_ACCEPTED, creature); + creature->AI()->Talk(SAY_QUEST_ACCEPTED); pEscortAI->Start(false, false, player->GetGUID()); } } @@ -534,29 +527,29 @@ public: switch (waypointId) { case 7: - DoScriptText(SAY_STAY_1, me, player); + Talk(SAY_STAY_1, player->GetGUID()); break; case 11: - DoScriptText(SAY_STAY_2, me, player); + Talk(SAY_STAY_2, player->GetGUID()); break; case 25: - DoScriptText(SAY_STAY_3, me, player); + Talk(SAY_STAY_3, player->GetGUID()); break; case 26: - DoScriptText(SAY_STAY_4, me, player); + Talk(SAY_STAY_4, player->GetGUID()); break; case 27: - DoScriptText(SAY_STAY_5, me, player); + Talk(SAY_STAY_5, player->GetGUID()); break; case 28: - DoScriptText(SAY_STAY_6, me, player); + Talk(SAY_STAY_6, player->GetGUID()); me->SetStandState(UNIT_STAND_STATE_KNEEL); break; case 29: me->SetStandState(UNIT_STAND_STATE_STAND); break; case 37: - DoScriptText(SAY_QUEST_COMPLETE, me, player); + Talk(SAY_QUEST_COMPLETE, player->GetGUID()); me->SetSpeed(MOVE_RUN, 1.2f, true); me->SetWalk(false); if (player->GetQuestStatus(QUEST_STINKYS_ESCAPE_H)) @@ -565,14 +558,14 @@ public: player->GroupEventHappens(QUEST_STINKYS_ESCAPE_A, me); break; case 39: - DoScriptText(EMOTE_DISAPPEAR, me); + Talk(EMOTE_DISAPPEAR); break; } } void EnterCombat(Unit* who) { - DoScriptText(SAY_ATTACKED_1, me, who); + Talk(SAY_ATTACKED_1, who->GetGUID()); } void Reset() {} diff --git a/src/server/scripts/Kalimdor/feralas.cpp b/src/server/scripts/Kalimdor/feralas.cpp index df4345b3aae..148f53c9e57 100644 --- a/src/server/scripts/Kalimdor/feralas.cpp +++ b/src/server/scripts/Kalimdor/feralas.cpp @@ -75,12 +75,10 @@ public: enum OOX { - //signed for 7806 - SAY_OOX_START = -1000287, - SAY_OOX_AGGRO1 = -1000288, - SAY_OOX_AGGRO2 = -1000289, - SAY_OOX_AMBUSH = -1000290, - SAY_OOX_END = -1000292, + SAY_OOX_START = 0, + SAY_OOX_AGGRO = 1, + SAY_OOX_AMBUSH = 2, + SAY_OOX_END = 3, NPC_YETI = 7848, NPC_GORILLA = 5260, @@ -103,7 +101,7 @@ public: { if (quest->GetQuestId() == QUEST_RESCUE_OOX22FE) { - DoScriptText(SAY_OOX_START, creature); + creature->AI()->Talk(SAY_OOX_START); //change that the npc is not lying dead on the ground creature->SetStandState(UNIT_STAND_STATE_STAND); @@ -135,28 +133,28 @@ public: { // First Ambush(3 Yetis) case 11: - DoScriptText(SAY_OOX_AMBUSH, me); + Talk(SAY_OOX_AMBUSH); me->SummonCreature(NPC_YETI, -4841.01f, 1593.91f, 73.42f, 3.98f, TEMPSUMMON_CORPSE_TIMED_DESPAWN, 10000); me->SummonCreature(NPC_YETI, -4837.61f, 1568.58f, 78.21f, 3.13f, TEMPSUMMON_CORPSE_TIMED_DESPAWN, 10000); me->SummonCreature(NPC_YETI, -4841.89f, 1569.95f, 76.53f, 0.68f, TEMPSUMMON_CORPSE_TIMED_DESPAWN, 10000); break; //Second Ambush(3 Gorillas) case 21: - DoScriptText(SAY_OOX_AMBUSH, me); + Talk(SAY_OOX_AMBUSH); me->SummonCreature(NPC_GORILLA, -4595.81f, 2005.99f, 53.08f, 3.74f, TEMPSUMMON_CORPSE_TIMED_DESPAWN, 10000); me->SummonCreature(NPC_GORILLA, -4597.53f, 2008.31f, 52.70f, 3.78f, TEMPSUMMON_CORPSE_TIMED_DESPAWN, 10000); me->SummonCreature(NPC_GORILLA, -4599.37f, 2010.59f, 52.77f, 3.84f, TEMPSUMMON_CORPSE_TIMED_DESPAWN, 10000); break; //Third Ambush(4 Gnolls) case 30: - DoScriptText(SAY_OOX_AMBUSH, me); + Talk(SAY_OOX_AMBUSH); me->SummonCreature(NPC_WOODPAW_REAVER, -4425.14f, 2075.87f, 47.77f, 3.77f, TEMPSUMMON_CORPSE_TIMED_DESPAWN, 10000); me->SummonCreature(NPC_WOODPAW_BRUTE, -4426.68f, 2077.98f, 47.57f, 3.77f, TEMPSUMMON_CORPSE_TIMED_DESPAWN, 10000); me->SummonCreature(NPC_WOODPAW_MYSTIC, -4428.33f, 2080.24f, 47.43f, 3.87f, TEMPSUMMON_CORPSE_TIMED_DESPAWN, 10000); me->SummonCreature(NPC_WOODPAW_ALPHA, -4430.04f, 2075.54f, 46.83f, 3.81f, TEMPSUMMON_CORPSE_TIMED_DESPAWN, 10000); break; case 37: - DoScriptText(SAY_OOX_END, me); + Talk(SAY_OOX_END); // Award quest credit if (Player* player = GetPlayerForEscort()) player->GroupEventHappens(QUEST_RESCUE_OOX22FE, me); @@ -174,7 +172,7 @@ public: { //For an small probability the npc says something when he get aggro if (urand(0, 9) > 7) - DoScriptText(RAND(SAY_OOX_AGGRO1, SAY_OOX_AGGRO2), me); + Talk(SAY_OOX_AGGRO); } void JustSummoned(Creature* summoned) diff --git a/src/server/scripts/Kalimdor/mulgore.cpp b/src/server/scripts/Kalimdor/mulgore.cpp index 8ed26b8cf38..a86f891c6c0 100644 --- a/src/server/scripts/Kalimdor/mulgore.cpp +++ b/src/server/scripts/Kalimdor/mulgore.cpp @@ -76,10 +76,9 @@ public: enum KyleFrenzied { - //emote signed for 7780 but propably thats wrong id. - EMOTE_SEE_LUNCH = -1000340, - EMOTE_EAT_LUNCH = -1000341, - EMOTE_DANCE = -1000342, + EMOTE_SEE_LUNCH = 0, + EMOTE_EAT_LUNCH = 1, + EMOTE_DANCE = 2, SPELL_LUNCH = 42222, NPC_KYLE_FRENZIED = 23616, @@ -134,7 +133,7 @@ public: } EventActive = true; - DoScriptText(EMOTE_SEE_LUNCH, me); + Talk(EMOTE_SEE_LUNCH); me->SetUInt32Value(UNIT_NPC_EMOTESTATE, EMOTE_ONESHOT_CREATURE_SPECIAL); } } @@ -173,7 +172,7 @@ public: } break; case 2: - DoScriptText(EMOTE_EAT_LUNCH, me); + Talk(EMOTE_EAT_LUNCH); me->SetUInt32Value(UNIT_NPC_EMOTESTATE, EMOTE_STATE_USE_STANDING); break; case 3: @@ -184,7 +183,7 @@ public: break; case 4: EventTimer = 30000; - DoScriptText(EMOTE_DANCE, me); + Talk(EMOTE_DANCE); me->SetUInt32Value(UNIT_NPC_EMOTESTATE, EMOTE_STATE_DANCESPECIAL); break; case 5: diff --git a/src/server/scripts/Kalimdor/stonetalon_mountains.cpp b/src/server/scripts/Kalimdor/stonetalon_mountains.cpp index 5cf6d141805..033274f8561 100644 --- a/src/server/scripts/Kalimdor/stonetalon_mountains.cpp +++ b/src/server/scripts/Kalimdor/stonetalon_mountains.cpp @@ -101,9 +101,9 @@ enum Kaya NPC_GRIMTOTEM_BRUTE = 11912, NPC_GRIMTOTEM_SORCERER = 11913, - SAY_START = -1000357, - SAY_AMBUSH = -1000358, - SAY_END = -1000359, + SAY_START = 0, + SAY_AMBUSH = 1, + SAY_END = 2, QUEST_PROTECT_KAYA = 6523 }; @@ -126,14 +126,14 @@ public: switch (waypointId) { case 16: - DoScriptText(SAY_AMBUSH, me); + Talk(SAY_AMBUSH); me->SummonCreature(NPC_GRIMTOTEM_BRUTE, -48.53f, -503.34f, -46.31f, 0.0f, TEMPSUMMON_TIMED_DESPAWN_OUT_OF_COMBAT, 30000); me->SummonCreature(NPC_GRIMTOTEM_RUFFIAN, -38.85f, -503.77f, -45.90f, 0.0f, TEMPSUMMON_TIMED_DESPAWN_OUT_OF_COMBAT, 30000); me->SummonCreature(NPC_GRIMTOTEM_SORCERER, -36.37f, -496.23f, -45.71f, 0.0f, TEMPSUMMON_TIMED_DESPAWN_OUT_OF_COMBAT, 30000); break; case 18: me->SetInFront(player); - DoScriptText(SAY_END, me, player); + Talk(SAY_END); player->GroupEventHappens(QUEST_PROTECT_KAYA, me); break; } @@ -154,7 +154,7 @@ public: if (npc_escortAI* pEscortAI = CAST_AI(npc_kaya_flathoof::npc_kaya_flathoofAI, creature->AI())) pEscortAI->Start(true, false, player->GetGUID()); - DoScriptText(SAY_START, creature); + creature->AI()->Talk(SAY_START); creature->setFaction(113); creature->RemoveFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_IMMUNE_TO_PC); } diff --git a/src/server/scripts/Kalimdor/tanaris.cpp b/src/server/scripts/Kalimdor/tanaris.cpp index 7341ccb1e2c..b7644395571 100644 --- a/src/server/scripts/Kalimdor/tanaris.cpp +++ b/src/server/scripts/Kalimdor/tanaris.cpp @@ -47,7 +47,7 @@ EndContentData */ enum Aquementas { - AGGRO_YELL_AQUE = -1000350, + AGGRO_YELL_AQUE = 0, SPELL_AQUA_JET = 13586, SPELL_FROST_SHOCK = 15089 @@ -101,7 +101,7 @@ public: void EnterCombat(Unit* who) { - DoScriptText(AGGRO_YELL_AQUE, me, who); + Talk(AGGRO_YELL_AQUE, who->GetGUID()); } void UpdateAI(const uint32 diff) @@ -427,13 +427,11 @@ public: enum Npc00X17 { - //texts are signed for 7806 - SAY_OOX_START = -1000287, - SAY_OOX_AGGRO1 = -1000288, - SAY_OOX_AGGRO2 = -1000289, - SAY_OOX_AMBUSH = -1000290, - SAY_OOX17_AMBUSH_REPLY = -1000291, - SAY_OOX_END = -1000292, + SAY_OOX_START = 0, + SAY_OOX_AGGRO = 1, + SAY_OOX_AMBUSH = 2, + SAY_OOX17_AMBUSH_REPLY = 0, + SAY_OOX_END = 3, Q_OOX17 = 648, SPAWN_FIRST = 7803, @@ -454,7 +452,7 @@ public: creature->SetFullHealth(); creature->SetUInt32Value(UNIT_FIELD_BYTES_1, 0); creature->RemoveFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_IMMUNE_TO_PC); - DoScriptText(SAY_OOX_START, creature); + creature->AI()->Talk(SAY_OOX_START); if (npc_escortAI* pEscortAI = CAST_AI(npc_OOX17::npc_OOX17AI, creature->AI())) pEscortAI->Start(true, false, player->GetGUID()); @@ -481,18 +479,18 @@ public: me->SummonCreature(SPAWN_FIRST, -8350.96f, -4445.79f, 10.10f, 6.20f, TEMPSUMMON_TIMED_DESPAWN_OUT_OF_COMBAT, 25000); me->SummonCreature(SPAWN_FIRST, -8355.96f, -4447.79f, 10.10f, 6.27f, TEMPSUMMON_TIMED_DESPAWN_OUT_OF_COMBAT, 25000); me->SummonCreature(SPAWN_FIRST, -8353.96f, -4442.79f, 10.10f, 6.08f, TEMPSUMMON_TIMED_DESPAWN_OUT_OF_COMBAT, 25000); - DoScriptText(SAY_OOX_AMBUSH, me); + Talk(SAY_OOX_AMBUSH); break; case 56: me->SummonCreature(SPAWN_SECOND_1, -7510.07f, -4795.50f, 9.35f, 6.06f, TEMPSUMMON_TIMED_DESPAWN_OUT_OF_COMBAT, 25000); me->SummonCreature(SPAWN_SECOND_2, -7515.07f, -4797.50f, 9.35f, 6.22f, TEMPSUMMON_TIMED_DESPAWN_OUT_OF_COMBAT, 25000); me->SummonCreature(SPAWN_SECOND_2, -7518.07f, -4792.50f, 9.35f, 6.22f, TEMPSUMMON_TIMED_DESPAWN_OUT_OF_COMBAT, 25000); - DoScriptText(SAY_OOX_AMBUSH, me); - if (Unit* scoff = me->FindNearestCreature(SPAWN_SECOND_2, 30)) - DoScriptText(SAY_OOX17_AMBUSH_REPLY, scoff); + Talk(SAY_OOX_AMBUSH); + if (Creature* scoff = me->FindNearestCreature(SPAWN_SECOND_2, 30)) + scoff->AI()->Talk(SAY_OOX17_AMBUSH_REPLY); break; case 86: - DoScriptText(SAY_OOX_END, me); + Talk(SAY_OOX_END); player->GroupEventHappens(Q_OOX17, me); break; } @@ -503,7 +501,7 @@ public: void EnterCombat(Unit* /*who*/) { - DoScriptText(RAND(SAY_OOX_AGGRO1, SAY_OOX_AGGRO2), me); + Talk(SAY_OOX_AGGRO); } void JustSummoned(Creature* summoned) @@ -519,14 +517,13 @@ public: enum Tooga { - SAY_TOOG_THIRST = -1000391, - SAY_TOOG_WORRIED = -1000392, - SAY_TOOG_POST_1 = -1000393, - SAY_TORT_POST_2 = -1000394, - SAY_TOOG_POST_3 = -1000395, - SAY_TORT_POST_4 = -1000396, - SAY_TOOG_POST_5 = -1000397, - SAY_TORT_POST_6 = -1000398, + SAY_TOOG_WORRIED = 0, + SAY_TOOG_POST_1 = 1, + SAY_TORT_POST_2 = 0, + SAY_TOOG_POST_3 = 2, + SAY_TORT_POST_4 = 1, + SAY_TOOG_POST_5 = 3, + SAY_TORT_POST_6 = 2, QUEST_TOOGA = 1560, NPC_TORTA = 6015, @@ -617,8 +614,8 @@ public: { PostEventTimer = 5000; - Unit* pTorta = Unit::GetUnit(*me, TortaGUID); - if (!pTorta || !pTorta->isAlive()) + Creature* torta = Creature::GetCreature(*me, TortaGUID); + if (!torta || !torta->isAlive()) { //something happened, so just complete SetFollowComplete(); @@ -628,22 +625,22 @@ public: switch (PhasePostEvent) { case 1: - DoScriptText(SAY_TOOG_POST_1, me); + Talk(SAY_TOOG_POST_1); break; case 2: - DoScriptText(SAY_TORT_POST_2, pTorta); + torta->AI()->Talk(SAY_TORT_POST_2); break; case 3: - DoScriptText(SAY_TOOG_POST_3, me); + Talk(SAY_TOOG_POST_3); break; case 4: - DoScriptText(SAY_TORT_POST_4, pTorta); + torta->AI()->Talk(SAY_TORT_POST_4); break; case 5: - DoScriptText(SAY_TOOG_POST_5, me); + Talk(SAY_TOOG_POST_5); break; case 6: - DoScriptText(SAY_TORT_POST_6, pTorta); + torta->AI()->Talk(SAY_TORT_POST_6); me->GetMotionMaster()->MovePoint(POINT_ID_TO_WATER, ToWaterLoc); break; } @@ -661,7 +658,7 @@ public: CheckSpeechTimer = 5000; if (urand(0, 9) > 8) - DoScriptText(RAND(SAY_TOOG_THIRST, SAY_TOOG_WORRIED), me); + Talk(SAY_TOOG_WORRIED); } else CheckSpeechTimer -= Diff; diff --git a/src/server/scripts/Kalimdor/thousand_needles.cpp b/src/server/scripts/Kalimdor/thousand_needles.cpp index 7667a8b312c..53751cb8278 100644 --- a/src/server/scripts/Kalimdor/thousand_needles.cpp +++ b/src/server/scripts/Kalimdor/thousand_needles.cpp @@ -44,7 +44,7 @@ EndContentData */ enum Kanati { - SAY_KAN_START = -1000410, + SAY_KAN_START = 0, QUEST_PROTECT_KANATI = 4966, NPC_GALAK_ASS = 10720 @@ -82,7 +82,7 @@ public: switch (waypointId) { case 0: - DoScriptText(SAY_KAN_START, me); + Talk(SAY_KAN_START); DoSpawnGalak(); break; case 1: @@ -112,11 +112,11 @@ public: enum Lakota { - SAY_LAKO_START = -1000365, - SAY_LAKO_LOOK_OUT = -1000366, - SAY_LAKO_HERE_COME = -1000367, - SAY_LAKO_MORE = -1000368, - SAY_LAKO_END = -1000369, + SAY_LAKO_START = 0, + SAY_LAKO_LOOK_OUT = 1, + SAY_LAKO_HERE_COME = 2, + SAY_LAKO_MORE = 3, + SAY_LAKO_END = 4, QUEST_FREE_AT_LAST = 4904, NPC_GRIM_BANDIT = 10758, @@ -146,7 +146,7 @@ public: { if (quest->GetQuestId() == QUEST_FREE_AT_LAST) { - DoScriptText(SAY_LAKO_START, creature, player); + creature->AI()->Talk(SAY_LAKO_START, player->GetGUID()); creature->setFaction(FACTION_ESCORTEE_LAKO); if (npc_lakota_windsongAI* pEscortAI = CAST_AI(npc_lakota_windsong::npc_lakota_windsongAI, creature->AI())) @@ -171,15 +171,15 @@ public: switch (waypointId) { case 8: - DoScriptText(SAY_LAKO_LOOK_OUT, me); + Talk(SAY_LAKO_LOOK_OUT); DoSpawnBandits(ID_AMBUSH_1); break; case 14: - DoScriptText(SAY_LAKO_HERE_COME, me); + Talk(SAY_LAKO_HERE_COME); DoSpawnBandits(ID_AMBUSH_2); break; case 21: - DoScriptText(SAY_LAKO_MORE, me); + Talk(SAY_LAKO_MORE); DoSpawnBandits(ID_AMBUSH_3); break; case 45: @@ -204,9 +204,9 @@ public: enum Packa { - SAY_START = -1000362, - SAY_WYVERN = -1000363, - SAY_COMPLETE = -1000364, + SAY_START = 0, + SAY_WYVERN = 1, + SAY_COMPLETE = 2, QUEST_HOMEWARD = 4770, NPC_WYVERN = 4107, @@ -229,7 +229,7 @@ public: { if (quest->GetQuestId() == QUEST_HOMEWARD) { - DoScriptText(SAY_START, creature, player); + creature->AI()->Talk(SAY_START, player->GetGUID()); creature->setFaction(FACTION_ESCORTEE); if (npc_paoka_swiftmountainAI* pEscortAI = CAST_AI(npc_paoka_swiftmountain::npc_paoka_swiftmountainAI, creature->AI())) @@ -254,11 +254,11 @@ public: switch (waypointId) { case 15: - DoScriptText(SAY_WYVERN, me); + Talk(SAY_WYVERN); DoSpawnWyvern(); break; case 26: - DoScriptText(SAY_COMPLETE, me); + Talk(SAY_COMPLETE); break; case 27: if (Player* player = GetPlayerForEscort()) |