diff options
| -rw-r--r-- | sql/updates/world/2012_01_13_01_world_creature_texts.sql | 12 | ||||
| -rw-r--r-- | src/server/scripts/Outland/TempestKeep/arcatraz/arcatraz.cpp | 16 |
2 files changed, 13 insertions, 15 deletions
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*/) |