From 6929fff8d63cc613008260ea65ffaf89401d6bac Mon Sep 17 00:00:00 2001 From: Venugh Date: Fri, 13 Jan 2012 21:13:18 +0100 Subject: Core/Scripts: Convert MillHouse Manastorm texts to creature_texts. --- .../Outland/TempestKeep/arcatraz/arcatraz.cpp | 50 +++++++++++----------- 1 file changed, 26 insertions(+), 24 deletions(-) (limited to 'src') diff --git a/src/server/scripts/Outland/TempestKeep/arcatraz/arcatraz.cpp b/src/server/scripts/Outland/TempestKeep/arcatraz/arcatraz.cpp index 78acd88c894..50558d76ffc 100644 --- a/src/server/scripts/Outland/TempestKeep/arcatraz/arcatraz.cpp +++ b/src/server/scripts/Outland/TempestKeep/arcatraz/arcatraz.cpp @@ -38,19 +38,19 @@ EndContentData */ enum eMillhouseSays { - SAY_INTRO_1 = -1552010, - SAY_INTRO_2 = -1552011, - SAY_WATER = -1552012, - SAY_BUFFS = -1552013, - SAY_DRINK = -1552014, - SAY_READY = -1552015, - SAY_KILL_1 = -1552016, - SAY_KILL_2 = -1552017, - SAY_PYRO = -1552018, - SAY_ICEBLOCK = -1552019, - SAY_LOWHP = -1552020, - SAY_DEATH = -1552021, - SAY_COMPLETE = -1552022, + SAY_INTRO_1 = 0, + SAY_INTRO_2 = 1, + SAY_WATER = 2, + SAY_BUFFS = 3, + SAY_DRINK = 4, + SAY_READY = 5, + SAY_KILL_1 = 6, + SAY_KILL_2 = 7, + SAY_PYRO = 8, + SAY_ICEBLOCK = 9, + SAY_LOWHP = 10, + SAY_DEATH = 11, + SAY_COMPLETE = 12, }; enum eMillhouseSpells @@ -107,7 +107,7 @@ class npc_millhouse_manastorm : public CreatureScript Init = true; if (instance->GetData(TYPE_HARBINGERSKYRISS) == DONE) - DoScriptText(SAY_COMPLETE, me); + Talk(SAY_COMPLETE); } } @@ -126,12 +126,13 @@ class npc_millhouse_manastorm : public CreatureScript void KilledUnit(Unit* /*victim*/) { - DoScriptText(RAND(SAY_KILL_1, SAY_KILL_2), me); + Talk(SAY_KILL_1); + Talk(SAY_KILL_2); } void JustDied(Unit* /*victim*/) { - DoScriptText(SAY_DEATH, me); + Talk(SAY_DEATH); /*for questId 10886 (heroic mode only) if (instance && instance->GetData(TYPE_HARBINGERSKYRISS) != DONE) @@ -149,30 +150,30 @@ class npc_millhouse_manastorm : public CreatureScript switch (Phase) { case 1: - DoScriptText(SAY_INTRO_1, me); + Talk(SAY_INTRO_1); EventProgress_Timer = 18000; break; case 2: - DoScriptText(SAY_INTRO_2, me); + Talk(SAY_INTRO_2); EventProgress_Timer = 18000; break; case 3: - DoScriptText(SAY_WATER, me); + Talk(SAY_WATER); DoCast(me, SPELL_CONJURE_WATER); EventProgress_Timer = 7000; break; case 4: - DoScriptText(SAY_BUFFS, me); + Talk(SAY_BUFFS); DoCast(me, SPELL_ICE_ARMOR); EventProgress_Timer = 7000; break; case 5: - DoScriptText(SAY_DRINK, me); + Talk(SAY_DRINK); DoCast(me, SPELL_ARCANE_INTELLECT); EventProgress_Timer = 7000; break; case 6: - DoScriptText(SAY_READY, me); + Talk(SAY_READY); EventProgress_Timer = 6000; break; case 7: @@ -192,7 +193,7 @@ class npc_millhouse_manastorm : public CreatureScript return; if (!LowHp && HealthBelowPct(20)) { - DoScriptText(SAY_LOWHP, me); + Talk(SAY_LOWHP); LowHp = true; } @@ -201,7 +202,7 @@ class npc_millhouse_manastorm : public CreatureScript if (me->IsNonMeleeSpellCasted(false)) return; - DoScriptText(SAY_PYRO, me); + Talk(SAY_PYRO); DoCast(me->getVictim(), SPELL_PYROBLAST); Pyroblast_Timer = 40000; @@ -555,6 +556,7 @@ class mob_zerekethvoidzone : public CreatureScript return new mob_zerekethvoidzoneAI(creature); } }; + void AddSC_arcatraz() { new npc_millhouse_manastorm(); -- cgit v1.2.3 From e6b159f7ea13bed5054af4d370ed126b4622ccc4 Mon Sep 17 00:00:00 2001 From: Venugh Date: Fri, 13 Jan 2012 21:41:45 +0100 Subject: Core/Scripts: Correct rand change. thanks to Nayd for explain. --- sql/updates/world/2012_01_13_01_world_creature_texts.sql | 12 ++++++------ .../scripts/Outland/TempestKeep/arcatraz/arcatraz.cpp | 16 +++++++--------- 2 files changed, 13 insertions(+), 15 deletions(-) (limited to 'src') diff --git a/sql/updates/world/2012_01_13_01_world_creature_texts.sql b/sql/updates/world/2012_01_13_01_world_creature_texts.sql index f3edf965888..317f4c862b3 100644 --- a/sql/updates/world/2012_01_13_01_world_creature_texts.sql +++ b/sql/updates/world/2012_01_13_01_world_creature_texts.sql @@ -10,9 +10,9 @@ INSERT INTO `creature_text` (`entry`,`groupid`,`id`,`text`,`type`,`language`,`pr (20977, 4, 0, 'And of course i\'\'ll need some mana. You guys are gonna love this, just wait.', 0, 0, 100, 0, 0, 0, 'Millhouse Manastorm'), (20977, 5, 0, 'Aaalllriiiight!! Who ordered up an extra large can of whoop-ass?', 0, 0, 100, 0, 0, 0, 'Millhouse Manastorm'), (20977, 6, 0, 'I didn\'\'t even break a sweat on that one.', 0, 0, 100, 0, 0, 0, 'Millhouse Manastorm'), -(20977, 7, 0, 'You guys, feel free to jump in anytime.', 0, 0, 100, 0, 0, 0, 'Millhouse Manastorm'), -(20977, 8, 0, 'I\'\'m gonna light you up, sweet cheeks!', 0, 0, 100, 0, 0, 0, 'Millhouse Manastorm'), -(20977, 9, 0, 'Ice, ice, baby!', 0, 0, 100, 0, 0, 0, 'Millhouse Manastorm'), -(20977, 10, 0, 'Heal me! Oh, for the love of all that is holy, HEAL me! I\'\'m dying!', 0, 0, 100, 0, 0, 0, 'Millhouse Manastorm'), -(20977, 11, 0, 'You\'\'ll be hearing from my lawyer...', 0, 0, 100, 0, 0, 0, 'Millhouse Manastorm'), -(20977, 12, 0, 'Who\'\'s bad? Who\'\'s bad? That\'\'s right: we bad!', 0, 0, 100, 0, 0, 0, 'Millhouse Manastorm'); \ No newline at end of file +(20977, 6, 1, 'You guys, feel free to jump in anytime.', 0, 0, 100, 0, 0, 0, 'Millhouse Manastorm'), +(20977, 7, 0, 'I\'\'m gonna light you up, sweet cheeks!', 0, 0, 100, 0, 0, 0, 'Millhouse Manastorm'), +(20977, 8, 0, 'Ice, ice, baby!', 0, 0, 100, 0, 0, 0, 'Millhouse Manastorm'), +(20977, 9, 0, 'Heal me! Oh, for the love of all that is holy, HEAL me! I\'\'m dying!', 0, 0, 100, 0, 0, 0, 'Millhouse Manastorm'), +(20977, 10, 0, 'You\'\'ll be hearing from my lawyer...', 0, 0, 100, 0, 0, 0, 'Millhouse Manastorm'), +(20977, 11, 0, 'Who\'\'s bad? Who\'\'s bad? That\'\'s right: we bad!', 0, 0, 100, 0, 0, 0, 'Millhouse Manastorm'); diff --git a/src/server/scripts/Outland/TempestKeep/arcatraz/arcatraz.cpp b/src/server/scripts/Outland/TempestKeep/arcatraz/arcatraz.cpp index 50558d76ffc..0e1619ce723 100644 --- a/src/server/scripts/Outland/TempestKeep/arcatraz/arcatraz.cpp +++ b/src/server/scripts/Outland/TempestKeep/arcatraz/arcatraz.cpp @@ -44,13 +44,12 @@ enum eMillhouseSays SAY_BUFFS = 3, SAY_DRINK = 4, SAY_READY = 5, - SAY_KILL_1 = 6, - SAY_KILL_2 = 7, - SAY_PYRO = 8, - SAY_ICEBLOCK = 9, - SAY_LOWHP = 10, - SAY_DEATH = 11, - SAY_COMPLETE = 12, + SAY_KILL = 6, + SAY_PYRO = 7, + SAY_ICEBLOCK = 8, + SAY_LOWHP = 9, + SAY_DEATH = 10, + SAY_COMPLETE = 11, }; enum eMillhouseSpells @@ -126,8 +125,7 @@ class npc_millhouse_manastorm : public CreatureScript void KilledUnit(Unit* /*victim*/) { - Talk(SAY_KILL_1); - Talk(SAY_KILL_2); + Talk(SAY_KILL); } void JustDied(Unit* /*victim*/) -- cgit v1.2.3 From d359c87908303590354a3bd78b36316bf554e9f2 Mon Sep 17 00:00:00 2001 From: Venugh Date: Fri, 13 Jan 2012 21:59:21 +0100 Subject: Core/Scripts: Convert Warden Mellichar texts to creature_texts. --- .../world/2012_01_13_25_world_creature_texts.sql | 12 ++++++++ .../Outland/TempestKeep/arcatraz/arcatraz.cpp | 36 +++++++++++----------- 2 files changed, 30 insertions(+), 18 deletions(-) create mode 100644 sql/updates/world/2012_01_13_25_world_creature_texts.sql (limited to 'src') diff --git a/sql/updates/world/2012_01_13_25_world_creature_texts.sql b/sql/updates/world/2012_01_13_25_world_creature_texts.sql new file mode 100644 index 00000000000..252a6c75da3 --- /dev/null +++ b/sql/updates/world/2012_01_13_25_world_creature_texts.sql @@ -0,0 +1,12 @@ +-- Remove old script text for npc_warden_mellichar +DELETE FROM `script_texts` WHERE `entry` IN (-1552023, -1552030); + +-- Add new creature_text for Warden Mellichar +(20904, 0, 0, 'I knew the prince would be angry but, I... I have not been myself. I had to let them out! The great one speaks to me, you see. Wait--outsiders. Kael\'\'thas did not send you! Good... I\'\'ll just tell the prince you released the prisoners!', 0, 0, 100, 0, 0, 0, 'Warden Mellichar'), +(20904, 1, 0, 'The naaru kept some of the most dangerous beings in existence here in these cells. Let me introduce you to another...', 0, 0, 100, 0, 0, 0, 'Warden Mellichar'), +(20904, 2, 0, 'Yes, yes... another! Your will is mine!', 0, 0, 100, 0, 0, 0, 'Warden Mellichar'), +(20904, 3, 0, 'Behold another terrifying creature of incomprehensible power!', 0, 0, 100, 0, 0, 0, 'Warden Mellichar'), +(20904, 4, 0, 'What is this? A lowly gnome? I will do better, O\'\'great one.', 0, 0, 100, 0, 0, 0, 'Warden Mellichar'), +(20904, 5, 0, 'Anarchy! Bedlam! Oh, you are so wise! Yes, I see it now, of course!', 0, 0, 100, 0, 0, 0, 'Warden Mellichar'), +(20904, 6, 0, 'One final cell remains. Yes, O\'\'great one, right away!', 0, 0, 100, 0, 0, 0, 'Warden Mellichar'), +(20904, 7, 0, 'Welcome, O\'\'great one. I am your humble servant.', 0, 0, 100, 0, 0, 0, 'Warden Mellichar'); diff --git a/src/server/scripts/Outland/TempestKeep/arcatraz/arcatraz.cpp b/src/server/scripts/Outland/TempestKeep/arcatraz/arcatraz.cpp index 0e1619ce723..ce9bd57e829 100644 --- a/src/server/scripts/Outland/TempestKeep/arcatraz/arcatraz.cpp +++ b/src/server/scripts/Outland/TempestKeep/arcatraz/arcatraz.cpp @@ -231,14 +231,14 @@ class npc_millhouse_manastorm : public CreatureScript enum eWardenSays { - YELL_INTRO1 = -1552023, - YELL_INTRO2 = -1552024, - YELL_RELEASE1 = -1552025, - YELL_RELEASE2A = -1552026, - YELL_RELEASE2B = -1552027, - YELL_RELEASE3 = -1552028, - YELL_RELEASE4 = -1552029, - YELL_WELCOME = -1552030, + YELL_INTRO1 = 0, + YELL_INTRO2 = 1, + YELL_RELEASE1 = 2, + YELL_RELEASE2A = 3, + YELL_RELEASE2B = 4, + YELL_RELEASE3 = 5, + YELL_RELEASE4 = 6, + YELL_WELCOME = 7, }; enum eWardenUnits @@ -273,10 +273,10 @@ class npc_warden_mellichar : public CreatureScript { public: - npc_warden_mellichar() - : CreatureScript("npc_warden_mellichar") + npc_warden_mellichar() : CreatureScript("npc_warden_mellichar") { } + struct npc_warden_mellicharAI : public ScriptedAI { npc_warden_mellicharAI(Creature* creature) : ScriptedAI(creature) @@ -329,7 +329,7 @@ class npc_warden_mellichar : public CreatureScript void EnterCombat(Unit* /*who*/) { - DoScriptText(YELL_INTRO1, me); + Talk(YELL_INTRO1); DoCast(me, SPELL_BUBBLE_VISUAL); if (instance) @@ -436,7 +436,7 @@ class npc_warden_mellichar : public CreatureScript me->SummonCreature(ENTRY_MILLHOUSE, 413.292f, -148.378f, 42.56f, 6.27f, TEMPSUMMON_TIMED_OR_DEAD_DESPAWN, 600000); break; case 4: - DoScriptText(YELL_RELEASE2B, me); + Talk(YELL_RELEASE2B); break; case 5: switch (urand(0, 1)) @@ -462,7 +462,7 @@ class npc_warden_mellichar : public CreatureScript break; case 7: me->SummonCreature(ENTRY_SKYRISS, 445.763f, -191.639f, 44.64f, 1.60f, TEMPSUMMON_TIMED_OR_DEAD_DESPAWN, 600000); - DoScriptText(YELL_WELCOME, me); + Talk(YELL_WELCOME); break; } CanSpawn = false; @@ -473,17 +473,17 @@ class npc_warden_mellichar : public CreatureScript switch (Phase) { case 1: - DoScriptText(YELL_INTRO2, me); + Talk(YELL_INTRO2); EventProgress_Timer = 10000; ++Phase; break; case 2: - DoScriptText(YELL_RELEASE1, me); + Talk(YELL_RELEASE1); DoPrepareForPhase(); EventProgress_Timer = 7000; break; case 3: - DoScriptText(YELL_RELEASE2A, me); + Talk(YELL_RELEASE2A); DoPrepareForPhase(); EventProgress_Timer = 10000; break; @@ -492,12 +492,12 @@ class npc_warden_mellichar : public CreatureScript EventProgress_Timer = 15000; break; case 5: - DoScriptText(YELL_RELEASE3, me); + Talk(YELL_RELEASE3); DoPrepareForPhase(); EventProgress_Timer = 15000; break; case 6: - DoScriptText(YELL_RELEASE4, me); + Talk(YELL_RELEASE4); DoPrepareForPhase(); EventProgress_Timer = 15000; break; -- cgit v1.2.3 From b242a19ad5d4d560febde8a35f2cb183823869e4 Mon Sep 17 00:00:00 2001 From: Venugh Date: Fri, 13 Jan 2012 22:02:04 +0100 Subject: Core/Scripts: remove define from arcatraz. --- src/server/scripts/Outland/TempestKeep/arcatraz/arcatraz.cpp | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) (limited to 'src') diff --git a/src/server/scripts/Outland/TempestKeep/arcatraz/arcatraz.cpp b/src/server/scripts/Outland/TempestKeep/arcatraz/arcatraz.cpp index ce9bd57e829..db95f60f556 100644 --- a/src/server/scripts/Outland/TempestKeep/arcatraz/arcatraz.cpp +++ b/src/server/scripts/Outland/TempestKeep/arcatraz/arcatraz.cpp @@ -523,14 +523,16 @@ class npc_warden_mellichar : public CreatureScript # mob_zerekethvoidzone (this script probably not needed in future -> `creature_template_addon`.`auras`='36120 0') #####*/ -#define SPELL_VOID_ZONE_DAMAGE 36120 +enum ZerekethSpell +{ + SPELL_VOID_ZONE_DAMAGE = 36120, +}; class mob_zerekethvoidzone : public CreatureScript { public: - mob_zerekethvoidzone() - : CreatureScript("mob_zerekethvoidzone") + mob_zerekethvoidzone() : CreatureScript("mob_zerekethvoidzone") { } struct mob_zerekethvoidzoneAI : public ScriptedAI @@ -561,4 +563,3 @@ void AddSC_arcatraz() new npc_warden_mellichar(); new mob_zerekethvoidzone(); } - -- cgit v1.2.3