diff options
4 files changed, 26 insertions, 6 deletions
diff --git a/sql/updates/world/2013_12_22_07_world_creature_text.sql b/sql/updates/world/2013_12_22_07_world_creature_text.sql new file mode 100644 index 00000000000..83e273b3a16 --- /dev/null +++ b/sql/updates/world/2013_12_22_07_world_creature_text.sql @@ -0,0 +1,14 @@ +-- NPC talk text insert from sniff +UPDATE `creature_text` SET `text`= 'What is this? Mok-thorin ka! Kill them!' WHERE `entry`=26798 AND `groupid`=0; +UPDATE `creature_text` SET `text`= 'Gaagh...' WHERE `entry`=26798 AND `groupid`=2; +UPDATE `creature_text` SET `text`= 'You know what they say about curiosity....' WHERE `entry`=26731 AND `groupid`=0; +DELETE FROM `creature_text` WHERE `entry`=26763 AND `groupid` IN (4,5); +DELETE FROM `creature_text` WHERE `entry`=26794 AND `groupid`=6; +DELETE FROM `creature_text` WHERE `entry`=26723 AND `groupid`=5; +DELETE FROM `creature_text` WHERE `entry`=34716 AND `id`=4; +INSERT INTO `creature_text` (`entry`,`groupid`,`id`,`text`,`type`,`language`,`probability`,`emote`,`duration`,`sound`,`comment`) VALUES +(26763,4,0, '%s opens a Chaotic Rift!',41,0,100,0,0,0, 'Anomalus'), +(26763,5,0, '%s shields himself and diverts his power to the rifts!',41,0,100,0,0,0, 'Anomalus'), +(26794,6,0, '%s goes into a frenzy!',41,0,100,0,0,0, 'Ormorok the Tree-Shaper'), +(26723,5,0, '%s goes into a frenzy!',16,0,100,0,0,0, 'Keristrasza'), +(34716,0,4, 'I thought I''d never make it out of here alive.',12,0,100,5,0,0, 'Captive Aspirant'); diff --git a/src/server/scripts/Northrend/Nexus/Nexus/boss_anomalus.cpp b/src/server/scripts/Northrend/Nexus/Nexus/boss_anomalus.cpp index fdc4927763e..f05d065ab34 100644 --- a/src/server/scripts/Northrend/Nexus/Nexus/boss_anomalus.cpp +++ b/src/server/scripts/Northrend/Nexus/Nexus/boss_anomalus.cpp @@ -25,9 +25,9 @@ enum Spells SPELL_SPARK = 47751, H_SPELL_SPARK = 57062, SPELL_RIFT_SHIELD = 47748, - SPELL_CHARGE_RIFT = 47747, //Works wrong (affect players, not rifts) - SPELL_CREATE_RIFT = 47743, //Don't work, using WA - SPELL_ARCANE_ATTRACTION = 57063, //No idea, when it's used + SPELL_CHARGE_RIFT = 47747, // Works wrong (affect players, not rifts) + SPELL_CREATE_RIFT = 47743, // Don't work, using WA + SPELL_ARCANE_ATTRACTION = 57063, // No idea, when it's used }; enum Adds @@ -41,14 +41,16 @@ enum Yells SAY_AGGRO = 0, SAY_DEATH = 1, SAY_RIFT = 2, - SAY_SHIELD = 3 + SAY_SHIELD = 3, + SAY_RIFT_EMOTE = 4, // Needs to be added to script + SAY_SHIELD_EMOTE = 5 // Needs to be added to script }; enum RiftSpells { SPELL_CHAOTIC_ENERGY_BURST = 47688, SPELL_CHARGED_CHAOTIC_ENERGY_BURST = 47737, - SPELL_ARCANEFORM = 48019, //Chaotic Rift visual + SPELL_ARCANEFORM = 48019, // Chaotic Rift visual }; Position const RiftLocation[6] = diff --git a/src/server/scripts/Northrend/Nexus/Nexus/boss_keristrasza.cpp b/src/server/scripts/Northrend/Nexus/Nexus/boss_keristrasza.cpp index ef8f5c2d3c4..455653a136e 100644 --- a/src/server/scripts/Northrend/Nexus/Nexus/boss_keristrasza.cpp +++ b/src/server/scripts/Northrend/Nexus/Nexus/boss_keristrasza.cpp @@ -44,7 +44,8 @@ enum Yells SAY_SLAY = 1, SAY_ENRAGE = 2, SAY_DEATH = 3, - SAY_CRYSTAL_NOVA = 4 + SAY_CRYSTAL_NOVA = 4, + SAY_FRENZY = 5 }; enum Misc @@ -175,6 +176,7 @@ public: if (!bEnrage && HealthBelowPct(25)) { Talk(SAY_ENRAGE); + Talk(SAY_FRENZY); DoCast(me, SPELL_ENRAGE); bEnrage = true; } diff --git a/src/server/scripts/Northrend/Nexus/Nexus/boss_ormorok.cpp b/src/server/scripts/Northrend/Nexus/Nexus/boss_ormorok.cpp index 423937303b5..e2789995ec7 100644 --- a/src/server/scripts/Northrend/Nexus/Nexus/boss_ormorok.cpp +++ b/src/server/scripts/Northrend/Nexus/Nexus/boss_ormorok.cpp @@ -36,6 +36,7 @@ enum Yells SAY_REFLECT = 3, SAY_CRYSTAL_SPIKES = 4, SAY_KILL = 5, + SAY_FRENZY = 6 }; enum Events @@ -89,6 +90,7 @@ public: { if (!frenzy && HealthBelowPct(25)) { + Talk(SAY_FRENZY); DoCast(me, SPELL_FRENZY); frenzy = true; } |