Changeset 164

Timestamp:

11/19/08 13:42:11 (17 years ago)

Author:

yumileroy

Message:

[svn] * Updated Serpentshrine Cavern scripts to use script_texts
* Added script_texts for (nearly) all scripts
* Added documentation for script_texts
* Fixed tabs in chat.cpp

Original author: slg
Date: 2008-11-04 15:21:02-06:00

Location:

trunk

Files:

• sql/trinityscript_script_texts.sql (modified) (8 diffs)
• sql/updates/172_world_scripts.sql (added)
• src/bindings/scripts/docs/Text-tables.txt (added)
• src/bindings/scripts/scripts/zone/coilfang_resevoir/serpent_shrine/boss_fathomlord_karathress.cpp (modified) (32 diffs)
• src/bindings/scripts/scripts/zone/coilfang_resevoir/serpent_shrine/boss_hydross_the_unstable.cpp (modified) (16 diffs)
• src/bindings/scripts/scripts/zone/coilfang_resevoir/serpent_shrine/boss_lady_vashj.cpp (modified) (9 diffs)
• src/bindings/scripts/scripts/zone/coilfang_resevoir/serpent_shrine/boss_leotheras_the_blind.cpp (modified) (12 diffs)
• src/bindings/scripts/scripts/zone/coilfang_resevoir/serpent_shrine/boss_morogrim_tidewalker.cpp (modified) (16 diffs)
• src/game/Chat.cpp (modified) (1 diff)

trunk/sql/trinityscript_script_texts.sql

@@ -18 +18 @@
 
 -- -1 000 100 GENERAL MAPS (not typical instance maps)
+INSERT INTO `script_texts` (`entry`,`content_default`,`sound`,`type`,`language`,`comment`) VALUES
+(-1000100,'Come, little ones. Face me!',0,1,0,'azuregos SAY_TELEPORT'),
+
+(-1000101,'Follow me, $N. I\'ll take you to the Defias hideout. But you better protect me or I am as good as dead',0,0,7,'defias traitor SAY_START'),
+(-1000102,'The entrance is hidden here in Moonbrook. Keep your eyes peeled for thieves. They want me dead.',0,0,7,'defias traitor SAY_PROGRESS'),
+(-1000103,'You can go tell Stoutmantle this is where the Defias Gang is holed up, $N.',0,0,7,'defias traitor SAY_END'),
+(-1000104,'%s coming in fast! Prepare to fight!',0,0,7,'defias traitor SAY_AGGRO_1'),
+(-1000105,'Help!',0,0,7,'defias traitor SAY_AGGRO_2');
 
 -- -1 033 000 SHADOWFANG KEEP
+INSERT INTO `script_texts` (`entry`,`content_default`,`sound`,`type`,`language`,`comment`) VALUES
+(-1033000,'Thanks for freeing me, I\'ll open this door for you, then I will get out of here.',0,0,0,'shadowfang_prisoner SAY_FREE');
 
 -- -1 034 000 STOCKADES
@@ -48 +58 @@
 
 -- -1 249 000 ONYXIA'S LAIR
+INSERT INTO `script_texts` (`entry`,`content_default`,`sound`,`type`,`language`,`comment`) VALUES
+(-1249000,'How fortuitous. Usually, I must leave my lair to feed.',0,1,0,'onyxia SAY_AGGRO'),
+(-1249001,'Learn your place mortal!',0,1,0,'onyxia SAY_KILL'),
+(-1249002,'This meaningless exertion bores me. I\'ll incinerate you all from above!',0,1,0,'onyxia SAY_PHASE_2_TRANS'),
+(-1249003,'It seems you\'ll need another lesson, mortals!',0,1,0,'onyxia SAY_PHASE_3_TRANS'),
+(-1249004,'takes in a deep breath...',0,1,0,'onyxia EMOTE_BREATH');
 
 -- -1 269 000 OPENING OF THE DARK PORTAL (BLACK MORASS)
@@ -75 +91 @@
 
 -- -1 309 000 ZUL'GURUB
+INSERT INTO `script_texts` (`entry`,`content_default`,`sound`,`type`,`language`,`comment`) VALUES
+(-1309000,'Let the coils of hate unfurl!',8421,1,0,'venoxis SAY_TRANSFORM'),
+(-1309001,'Ssserenity..at lassst!',0,1,0,'venoxis SAY_DEATH'),
+
+(-1309002,'Lord Hir\'eek, grant me wings of vengance!',8417,1,0,'jeklik SAY_AGGRO'),
+(-1309003,'I command you to rain fire down upon these invaders!',0,1,0,'jeklik SAY_RAIN_FIRE'),
+(-1309004,'Finally ...death. Curse you Hakkar! Curse you!',8422,1,0,'jeklik SAY_DEATH'),
+
+(-1309005,'Draw me to your web mistress Shadra. Unleash your venom!',8418,1,0,'marli SAY_AGGRO'),
+(-1309006,'Shadra, make of me your avatar!',0,1,0,'marli SAY_TRANSFORM'),
+(-1309007,'Aid me my brood!',0,1,0,'marli SAY_SPIDER_SPAWN'),
+(-1309008,'Bless you mortal for this release. Hakkar controls me no longer...',8423,1,0,'marli SAY_DEATH'),
+
+(-1309009,'Shirvallah, fill me with your RAGE!',8419,1,0,'thekal SAY_AGGRO'),
+(-1309010,'Hakkar binds me no more! Peace at last!',8424,1,0,'thekal SAY_DEATH'),
+
+(-1309011,'Bethekk, your priestess calls upon your might!',8416,1,0,'arlokk SAY_AGGRO'),
+(-1309012,'Feast on $n, my pretties!',0,1,0,'arlokk SAY_FEAST_PANTHER'),
+(-1309013,'At last, I am free of the Soulflayer!',8412,1,0,'arlokk SAY_DEATH'),
+
+(-1309014,'Welcome to da great show friends! Step right up to die!',8425,1,0,'jindo SAY_AGGRO'),
+
+(-1309015,'I\'ll feed your souls to Hakkar himself!',8413,1,0,'mandokir SAY_AGGRO'),
+(-1309016,'DING!',0,1,0,'mandokir SAY_DING_KILL'),
+(-1309017,'GRATS!',0,1,0,'mandokir SAY_GRATS_JINDO'),
+(-1309018,'I\'m keeping my eye on you, $N!',0,1,0,'mandokir SAY_WATCH'),
+(-1309019,'Don\'t make me angry. You won\'t like it when I\'m angry.',0,1,0,'mandokir SAY_WATCH_WHISPER'),
+
+(-1309020,'PRIDE HERALDS THE END OF YOUR WORLD. COME, MORTALS! FACE THE WRATH OF THE SOULFLAYER!',8414,1,0,'hakkar SAY_AGGRO'),
+(-1309021,'Fleeing will do you no good, mortals!',0,1,0,'hakkar SAY_FLEEING'),
+(-1309022,'You dare set foot upon Hakkari holy ground? Minions of Hakkar, destroy the infidels!',0,1,0,'hakkar SAY_MINION_DESTROY'),
+(-1309023,'Minions of Hakkar, hear your God. The sanctity of this temple has been compromised. Invaders encroach upon holy ground! The Altar of Blood must be protected. Kill them all!',0,1,0,'hakkar SAY_PROTECT_ALTAR');
 
 -- -1 329 000 STRATHOLME
@@ -83 +131 @@
 
 -- -1 409 000 MOLTEN CORE
+INSERT INTO `script_texts` (`entry`,`content_default`,`sound`,`type`,`language`,`comment`) VALUES
+(-1409000,'performs one last service for Ragnaros.',0,2,0,'geddon EMOTE_SERVICE'),
+(-1409001,'goes into a killing frenzy!',0,2,0,'magmadar EMOTE_FRENZY'),
+(-1409002,'refuses to die while its master is in trouble.',0,2,0,'core rager EMOTE_AEGIS'),
+
+(-1409003,'Reckless mortals, none may challenge the sons of the living flame!',8035,1,0,'majordomo SAY_AGGRO'),
+(-1409004,'The runes of warding have been destroyed! Hunt down the infedels my bretheren.',8039,1,0,'majordomo SAY_SPAWN'),
+(-1409005,'Ashes to Ashes!',8037,1,0,'majordomo SAY_SLAY'),
+(-1409006,'Burn mortals! Burn for this transgression!',8036,1,0,'majordomo SAY_SPECIAL'),
+(-1409007,'Impossible! Stay your attack mortals! I submitt! I submitt! Brashly you have come to rest the secrets of the living flame. You will soon regret the recklessness of your quest. I go now to summon the lord whos house this is. Should you seek an audiance with him your paltry lives will surly be forfit. Nevertheless seek out his lair if you dare!',8038,1,0,'majordomo SAY_DEFEAT'),
+
+(-1409008,'Behold Ragnaros, the Firelord! He who was ancient when this world was young! Bow before him, mortals! Bow before your ending!',8040,1,0,'ragnaros SAY_SUMMON_MAJ'),
+(-1409009,'TOO SOON! YOU HAVE AWAKENED ME TOO SOON, EXECUTUS! WHAT IS THE MEANING OF THIS INTRUSION?',8043,1,0,'ragnaros SAY_ARRIVAL1_RAG'),
+(-1409010,'These mortal infidels, my lord! They have invaded your sanctum, and seek to steal your secrets!',8041,1,0,'ragnaros SAY_ARRIVAL2_MAJ'),
+(-1409011,'FOOL! YOU ALLOWED THESE INSECTS TO RUN RAMPANT THROUGH THE HALLOWED CORE, AND NOW YOU LEAD THEM TO MY VERY LAIR? YOU HAVE FAILED ME, EXECUTUS! JUSTICE SHALL BE MET, INDEED!',8044,1,0,'ragnaros SAY_ARRIVAL3_RAG'),
+(-1409012,'NOW FOR YOU, INSECTS. BOLDLY YOU SAUGHT THE POWER OF RAGNAROS NOW YOU SHALL SEE IT FIRST HAND.',8045,1,0,'ragnaros SAY_ARRIVAL5_RAG'),
+
+(-1409013,'COME FORTH, MY SERVANTS! DEFEND YOUR MASTER!',8049,1,0,'ragnaros SAY_REINFORCEMENTS1'),
+(-1409014,'YOU CANNOT DEFEAT THE LIVING FLAME! COME YOU MINIONS OF FIRE! COME FORTH YOU CREATURES OF HATE! YOUR MASTER CALLS!',8050,1,0,'ragnaros SAY_REINFORCEMENTS2'),
+(-1409015,'BY FIRE BE PURGED!',8046,1,0,'ragnaros SAY_HAND'),
+(-1409016,'TASTE THE FLAMES OF SULFURON!',8047,1,0,'ragnaros SAY_WRATH'),
+(-1409017,'DIE INSECT!',8051,1,0,'ragnaros SAY_KILL'),
+(-1409018,'MY PATIENCE IS DWINDILING! COME NATS TO YOUR DEATH!',8048,1,0,'ragnaros SAY_MAGMABURST');
 
 -- -1 429 000 DIRE MAUL
@@ -123 +194 @@
 (-1469028,'FLAME! DEATH! DESTRUCTION! COWER MORTALS BEFORE THE WRATH OF LORD....NO! I MUST FIGHT THIS!',8283,1,0,'vaelastrasz SAY_LINE3'),
 (-1469029,'Nefarius\' hate has made me stronger than ever before. You should have fled, while you could, mortals! The fury of Blackrock courses through my veins!',8285,1,0,'vaelastrasz SAY_HALFLIFE'),
-(-1469030,'Forgive me $N, your death only adds to my failure.',8284,1,0,'vaelastrasz SAY_KILLTARGET');
+(-1469030,'Forgive me $N, your death only adds to my failure.',8284,1,0,'vaelastrasz SAY_KILLTARGET'),
+
+(-1469031,'goes into a frenzy!',0,2,0,'flamegor EMOTE_FRENZY');
 
 -- -1 509 000 RUINS OF AHN'QIRAJ
+INSERT INTO `script_texts` (`entry`,`content_default`,`sound`,`type`,`language`,`comment`) VALUES
+(-1509000,'senses your fear.',0,2,0,'moam EMOTE_AGGRO'),
+(-1509001,'bristles with energy!',0,2,0,'moan EMOTE_MANA_FULL'),
+
+(-1509002,'sets eyes on $N!',0,2,0,'buru EMOTE_TARGET'),
+
+(-1509003,'They come now. Try not to get yourself killed, young blood.',0,1,0,'andorov SAY_ANDOROV_INTRO'),
+(-1509004,'Remember, Rajaxx, when I said I\'d kill you last? I lied...',0,1,0,'andorov SAY_ANDOROV_ATTACK'),
+
+(-1509005,'The time of our retribution is at hand! Let darkness reign in the hearts of our enemies!',8612,1,0,'rajaxx SAY_WAVE3'),
+(-1509006,'No longer will we wait behind barred doors and walls of stone! No longer will our vengeance be denied! The dragons themselves will tremble before our wrath!',8610,1,0,'rajaxx SAY_WAVE4'),
+(-1509007,'Fear is for the enemy! Fear and death!',8608,1,0,'rajaxx SAY_WAVE5'),
+(-1509008,'Staghelm will whimper and beg for his life, just as his whelp of a son did! One thousand years of injustice will end this day!',8611,1,0,'rajaxx SAY_WAVE6'),
+(-1509009,'Fandral! Your time has come! Go and hide in the Emerald Dream and pray we never find you!',8607,1,0,'rajaxx SAY_WAVE7'),
+(-1509010,'Impudent fool! I will kill you myself!',8609,1,0,'rajaxx SAY_INTRO'),
+(-1509011,'Attack and make them pay dearly!',8603,1,0,'rajaxx SAY_UNK1'),
+(-1509012,'Crush them! Drive them out!',8605,1,0,'rajaxx SAY_UNK2'),
+(-1509013,'Do not hesitate! Destroy them!',8606,1,0,'rajaxx SAY_UNK3'),
+(-1509014,'Warriors! Captains! Continue the fight!',8613,1,0,'rajaxx SAY_UNK4'),
+(-1509015,'You are not worth my time $N!',8614,1,0,'rajaxx SAY_DEAGGRO'),
+(-1509016,'Breath your last!',8604,1,0,'rajaxx SAY_KILLS_ANDOROV'),
+(-1509017,'Soon you will know the price of your meddling, mortals... The master is nearly whole... And when he rises, your world will be cease!',0,1,0,'rajaxx SAY_COMPLETE_QUEST'),
+
+(-1509018,'I am rejuvinated!',8593,1,0,'ossirian SAY_SURPREME1'),
+(-1509019,'My powers are renewed!',8595,1,0,'ossirian SAY_SURPREME2'),
+(-1509020,'My powers return!',8596,1,0,'ossirian SAY_SURPREME3'),
+(-1509021,'Protect the city at all costs!',8597,1,0,'ossirian SAY_RAND_INTRO1'),
+(-1509022,'The walls have been breached!',8599,1,0,'ossirian SAY_RAND_INTRO2'),
+(-1509023,'To your posts. Defend the city.',8600,1,0,'ossirian SAY_RAND_INTRO3'),
+(-1509024,'Tresspassers will be terminated.',8601,1,0,'ossirian SAY_RAND_INTRO4'),
+(-1509025,'Sands of the desert rise and block out the sun!',8598,1,0,'ossirian SAY_AGGRO'),
+(-1509026,'You are terminated.',8602,1,0,'ossirian SAY_SLAY'),
+(-1509027,'I...have...failed.',8594,1,0,'ossirian SAY_DEATH');
 
 -- -1 531 000 TEMPLE OF AHN'QIRAJ
+INSERT INTO `script_texts` (`entry`,`content_default`,`sound`,`type`,`language`,`comment`) VALUES
+(-1531000,'Are you so eager to die? I would be happy to accomodate you.',8615,1,0,'skeram SAY_AGGRO1'),
+(-1531001,'Cower mortals! The age of darkness is at hand.',8616,1,0,'skeram SAY_AGGRO2'),
+(-1531002,'Tremble! The end is upon you.',8621,1,0,'skeram SAY_AGGRO3'),
+(-1531003,'Let your death serve as an example!',8617,1,0,'skeram SAY_SLAY1'),
+(-1531004,'Spineless wretches! You will drown in rivers of blood!',8619,1,0,'skeram SAY_SLAY2'),
+(-1531005,'The screams of the dying will fill the air. A symphony of terror is about to begin!',8620,1,0,'skeram SAY_SLAY3'),
+(-1531006,'Prepare for the return of the ancient ones!',8618,1,0,'skeram SAY_SPLIT'),
+(-1531007,'You only delay... the inevetable.',8622,1,0,'skeram SAY_DEATH'),
+
+(-1531008,'You will be judged for defiling these sacred grounds! The laws of the Ancients will not be challenged! Trespassers will be annihilated!',8646,1,0,'sartura SAY_AGGRO'),
+(-1531009,'I sentence you to death!',8647,1,0,'sartura SAY_SLAY'),
+(-1531010,'I serve to the last!',8648,1,0,'sartura SAY_DEATH'),
+
+(-1531011,'is weakened!',0,2,0,'cthun EMOTE_WEAKENED');
 
 -- -1 532 000 KARAZHAN
+INSERT INTO `script_texts` (`entry`,`content_default`,`sound`,`type`,`language`,`comment`) VALUES
+(-1532000,'Well done Midnight!',9173,1,0,'attumen SAY_MIDNIGHT_KILL'),
+(-1532001,'Cowards! Wretches!',9167,1,0,'attumen SAY_APPEAR1'),
+(-1532002,'Who dares attack the steed of the Huntsman?',9298,1,0,'attumen SAY_APPEAR2'),
+(-1532003,'Perhaps you would rather test yourselves against a more formidable opponent?!',9299,1,0,'attumen SAY_APPEAR3'),
+(-1532004,'Come, Midnight, let\'s disperse this petty rabble!',9168,1,0,'attumen SAY_MOUNT'),
+(-1532005,'It was... inevitable.',9169,1,0,'attumen SAY_KILL1'),
+(-1532006,'Another trophy to add to my collection!',9300,1,0,'attumen SAY_KILL2'),
+(-1532007,'Weapons are merely a convenience for a warrior of my skill!',9166,1,0,'attumen SAY_DISARMED'),
+(-1532008,'I always knew... someday I would become... the hunted.',9165,1,0,'attumen SAY_DEATH'),
+(-1532009,'Such easy sport.',9170,1,0,'attumen SAY_RANDOM1'),
+(-1532010,'Amateurs! Do not think you can best me! I kill for a living.',9304,1,0,'attumen SAY_RANDOM2'),
+
+(-1532011,'Hmm, unannounced visitors? Preparations must be made.',9211,1,0,'moroes SAY_AGGRO'),
+(-1532012,'Now, where was I? Oh yes...',9215,1,0,'moroes SAY_SPECIAL_1'),
+(-1532013,'You rang?',9316,1,0,'moroes SAY_SPECIAL_2'),
+(-1532014,'One more for dinner this evening.',9214,1,0,'moroes SAY_KILL_1'),
+(-1532015,'Time... Never enough time.',9314,1,0,'moroes SAY_KILL_2'),
+(-1532016,'I\'ve gone and made a mess.',9315,1,0,'moroes SAY_KILL_3'),
+(-1532017,'How terribly clumsy of me...',9213,1,0,'moroes SAY_DEATH'),
+
+(-1532018,'Your behavior will not be tolerated!',9204,1,0,'maiden SAY_AGGRO'),
+(-1532019,'Ah ah ah...',9207,1,0,'maiden SAY_SLAY1'),
+(-1532020,'This is for the best.',9312,1,0,'maiden SAY_SLAY2'),
+(-1532021,'Impure thoughts lead to profane actions.',9311,1,0,'maiden SAY_SLAY3'),
+(-1532022,'Cast out your corrupt thoughts.',9313,1,0,'maiden SAY_REPENTANCE1'),
+(-1532023,'Your impurity must be cleansed.',9208,1,0,'maiden SAY_REPENTANCE2'),
+(-1532024,'Death comes. Will your conscience be clear?',9206,1,0,'maiden SAY_DEATH'),
+
+(-1532025,'Oh at last, at last. I can go home.',9190,1,0,'dorothee SAY_DOROTHEE_DEATH'),
+(-1532026,'Don\'t let them hurt us, Tito! Oh, you won\'t, will you?',9191,1,0,'dorothee SAY_DOROTHEE_SUMMON'),
+(-1532027,'Tito, oh Tito, no!',9192,1,0,'dorothee SAY_DOROTHEE_TITO_DEATH'),
+(-1532028,'Oh dear, we simply must find a way home! The old wizard could be our only hope! Strawman, Roar, Tinhead, will you... wait! Oh golly, look! We have visitors!',9195,1,0,'dorothee SAY_DOROTHEE_AGGRO'),
+
+(-1532029,'Wanna fight? Huh? Do ya? C\'mon, I\'ll fight you with both claws behind my back!',9227,1,0,'roar SAY_ROAR_AGGRO'),
+(-1532030,'You didn\'t have to go and do that.',9229,1,0,'roar SAY_ROAR_DEATH'),
+(-1532031,'I think I\'m going to go take fourty winks.',9230,1,0,'roar SAY_ROAR_SLAY'),
+
+(-1532032,'Now what should I do with you? I simply can\'t make up my mind.',9254,1,0,'strawman SAY_STRAWMAN_AGGRO'),
+(-1532033,'Don\'t let them make a mattress... out of me.',9256,1,0,'strawman SAY_STRAWMAN_DEATH'),
+(-1532034,'I guess I\'m not a failure after all.',9257,1,0,'strawman SAY_STRAWMAN_SLAY'),
+
+(-1532035,'I could really use a heart. Say, can I have yours?',9268,1,0,'tinhead SAY_TINHEAD_AGGRO'),
+(-1532036,'Back to being an old rustbucket.',9270,1,0,'tinhead SAY_TINHEAD_DEATH'),
+(-1532037,'Guess I\'m not so rusty, after all.',9271,1,0,'tinhead SAY_TINHEAD_SLAY'),
+(-1532038,'begins to rust.',0,2,0,'tinhead EMOTE_RUST'),
+
+(-1532039,'Woe to each and every one of you my pretties! <cackles>',9179,1,0,'crone SAY_CRONE_AGGRO'),
+(-1532040,'It will all be over soon! <cackles>',9307,1,0,'crone SAY_CRONE_AGGRO2'),
+(-1532041,'How could you? What a cruel, cruel world!',9178,1,0,'crone SAY_CRONE_DEATH'),
+(-1532042,'Fixed you, didn\'t I? <cackles>',9180,1,0,'crone SAY_CRONE_SLAY'),
+
+(-1532043,'All the better to own you with!',9276,1,0,'wolf SAY_WOLF_AGGRO'),
+(-1532044,'Mmmm... delicious.',9277,1,0,'wolf SAY_WOLF_SLAY'),
+(-1532045,'Run away little girl, run away!',9278,1,0,'wolf SAY_WOLF_HOOD'),
+
+(-1532046,'What devil art thou, that dost torment me thus?',9196,1,0,'julianne SAY_JULIANNE_AGGRO'),
+(-1532047,'Where is my lord? Where is my Romulo?',9199,1,0,'julianne SAY_JULIANNE_ENTER'),
+(-1532048,'Romulo, I come! Oh... this do I drink to thee!',9198,1,0,'julianne SAY_JULIANNE_DEATH01'),
+(-1532049,'Where is my Lord? Where is my Romulo? Ohh, happy dagger! This is thy sheath! There rust, and let me die!',9310,1,0,'julianne SAY_JULIANNE_DEATH02'),
+(-1532050,'Come, gentle night; and give me back my Romulo!',9200,1,0,'julianne SAY_JULIANNE_RESURRECT'),
+(-1532051,'Parting is such sweet sorrow.',9201,1,0,'julianne SAY_JULIANNE_SLAY'),
+
+(-1532052,'Wilt thou provoke me? Then have at thee, boy!',9233,1,0,'romulo SAY_ROMULO_AGGRO'),
+(-1532053,'Thou smilest... upon the stroke that... murders me.',9235,1,0,'romulo SAY_ROMULO_DEATH'),
+(-1532054,'This day\'s black fate on more days doth depend. This but begins the woe. Others must end.',9236,1,0,'romulo SAY_ROMULO_ENTER'),
+(-1532055,'Thou detestable maw, thou womb of death; I enforce thy rotten jaws to open!',9237,1,0,'romulo SAY_ROMULO_RESURRECT'),
+(-1532056,'How well my comfort is revived by this!',9238,1,0,'romulo SAY_ROMULO_SLAY'),
+
+(-1532057,'The Menagerie is for guests only.',9183,1,0,'curator SAY_AGGRO'),
+(-1532058,'Gallery rules will be strictly enforced.',9188,1,0,'curator SAY_SUMMON1'),
+(-1532059,'This curator is equipped for gallery protection.',9309,1,0,'curator SAY_SUMMON2'),
+(-1532060,'Your request cannot be processed.',9186,1,0,'curator SAY_EVOCATE'),
+(-1532061,'Failure to comply will result in offensive action.',9185,1,0,'curator SAY_ENRAGE'),
+(-1532062,'Do not touch the displays.',9187,1,0,'curator SAY_KILL1'),
+(-1532063,'You are not a guest.',9308,1,0,'curator SAY_KILL2'),
+(-1532064,'This Curator is no longer op... er... ation... al.',9184,1,0,'curator SAY_DEATH'),
+
+(-1532065,'Your blood will anoint my circle.',9264,1,0,'terestian SAY_SLAY1'),
+(-1532066,'The great one will be pleased.',9329,1,0,'terestian SAY_SLAY2'),
+(-1532067,'My life, is yours. Oh great one.',9262,1,0,'terestian SAY_DEATH'),
+(-1532068,'Ah, you\'re just in time. The rituals are about to begin.',9260,1,0,'terestian SAY_AGGRO'),
+(-1532069,'Please, accept this humble offering, oh great one.',9263,1,0,'terestian SAY_SACRIFICE1'),
+(-1532070,'Let the sacrifice serve his testament to my fealty.',9330,1,0,'terestian SAY_SACRIFICE2'),
+(-1532071,'Come, you dwellers in the dark. Rally to my call!',9265,1,0,'terestian SAY_SUMMON1'),
+(-1532072,'Gather, my pets. There is plenty for all.',9331,1,0,'terestian SAY_SUMMON2'),
+
+(-1532073,'Please, no more. My son... he\'s gone mad!',9241,1,0,'aran SAY_AGGRO1'),
+(-1532074,'I\'ll not be tortured again!',9323,1,0,'aran SAY_AGGRO2'),
+(-1532075,'Who are you? What do you want? Stay away from me!',9324,1,0,'aran SAY_AGGRO3'),
+(-1532076,'I\'ll show you this beaten dog still has some teeth!',9245,1,0,'aran SAY_FLAMEWREATH1'),
+(-1532077,'Burn you hellish fiends!',9326,1,0,'aran SAY_FLAMEWREATH2'),
+(-1532078,'I\'ll freeze you all!',9246,1,0,'aran SAY_BLIZZARD1'),
+(-1532079,'Back to the cold dark with you!',9327,1,0,'aran SAY_BLIZZARD2'),
+(-1532080,'Yes, yes, my son is quite powerful... but I have powers of my own!',9242,1,0,'aran SAY_EXPLOSION1'),
+(-1532081,'I am not some simple jester! I am Nielas Aran!',9325,1,0,'aran SAY_EXPLOSION2'),
+(-1532082,'Surely you would not deny an old man a replenishing drink? No, no I thought not.',9248,1,0,'aran SAY_DRINK'),
+(-1532083,'I\'m not finished yet! No, I have a few more tricks up me sleeve.',9251,1,0,'aran SAY_ELEMENTALS'),
+(-1532084,'I want this nightmare to be over!',9250,1,0,'aran SAY_KILL1'),
+(-1532085,'Torment me no more!',9328,1,0,'aran SAY_KILL2'),
+(-1532086,'You\'ve wasted enough of my time. Let these games be finished!',9247,1,0,'aran SAY_TIMEOVER'),
+(-1532087,'At last... The nightmare is.. over...',9244,1,0,'aran SAY_DEATH'),
+(-1532088,'Where did you get that?! Did HE send you?!',9249,1,0,'aran SAY_ATIESH'),
+
+(-1532089,'cries out in withdrawal, opening gates to the warp.',0,2,0,'netherspite EMOTE_PHASE_PORTAL'),
+(-1532090,'goes into a nether-fed rage!',0,2,0,'netherspite EMOTE_PHASE_BANISH'),
+
+(-1532091,'Madness has brought you here to me. I shall be your undoing!',9218,1,0,'malchezaar SAY_AGGRO'),
+(-1532092,'Simple fools! Time is the fire in which you\'ll burn!',9220,1,0,'malchezaar SAY_AXE_TOSS1'),
+(-1532093,'I see the subtlety of conception is beyond primitives such as you.',9317,1,0,'malchezaar SAY_AXE_TOSS2'),
+(-1532094,'Who knows what secrets hide in the dark.',9223,1,0,'malchezaar SAY_SPECIAL1'),
+(-1532095,'The cerestial forces are mine to manipulate.',9320,1,0,'malchezaar SAY_SPECIAL2'),
+(-1532096,'How can you hope to withstand against such overwhelming power?',9321,1,0,'malchezaar SAY_SPECIAL3'),
+(-1532097,'Surely you did not think you could win.',9222,1,0,'malchezaar SAY_SLAY1'),
+(-1532098,'Your greed, your foolishness has brought you to this end.',9318,1,0,'malchezaar SAY_SLAY2'),
+(-1532099,'You are, but a plaything, unfit even to amuse.',9319,1,0,'malchezaar SAY_SLAY3'),
+(-1532100,'All realities, all dimensions are open to me!',9224,1,0,'malchezaar SAY_SUMMON1'),
+(-1532101,'You face not Malchezaar alone, but the legions I command!',9322,1,0,'malchezaar SAY_SUMMON2'),
+(-1532102,'I refuse to concede defeat. I am a prince of the Eredar! I am...',9221,1,0,'malchezaar SAY_DEATH');
 
 -- -1 533 000 NAXXRAMAS
@@ -136 +376 @@
 
 -- -1 540 000 SHATTERED HALLS
+INSERT INTO `script_texts` (`entry`,`content_default`,`sound`,`type`,`language`,`comment`) VALUES
+(-1540000,'You wish to fight us all at once? This should be amusing!',10262,1,0,'nethekurse SAY_INTRO'),
+(-1540001,'You can have that one. I no longer need him.',10263,1,0,'nethekurse PEON_ATTACK_1'),
+(-1540002,'Yes, beat him mercilessly. His skull is a thick as an ogres.',10264,1,0,'nethekurse PEON_ATTACK_2'),
+(-1540003,'Don\'t waste your time on that one. He\'s weak!',10265,1,0,'nethekurse PEON_ATTACK_3'),
+(-1540004,'You want him? Very well, take him!',10266,1,0,'nethekurse PEON_ATTACK_4'),
+(-1540005,'One pitiful wretch down. Go on, take another one.',10267,1,0,'nethekurse PEON_DIE_1'),
+(-1540006,'Ahh, what a waste... Next!',10268,1,0,'nethekurse PEON_DIE_2'),
+(-1540007,'I was going to kill him anyway!',10269,1,0,'nethekurse PEON_DIE_3'),
+(-1540008,'Thank you for saving me the trouble! Now it\'s my turn to have some fun...',10270,1,0,'nethekurse PEON_DIE_4'),
+(-1540009,'Beg for your pittyfull life!',10259,1,0,'nethekurse SAY_TAUNT_1'),
+(-1540010,'Run covad, ruun!',10260,1,0,'nethekurse SAY_TAUNT_2'),
+(-1540011,'Your pain amuses me.',10261,1,0,'nethekurse SAY_TAUNT_3'),
+(-1540012,'I\'m already bored.',10271,1,0,'nethekurse SAY_AGGRO_1'),
+(-1540013,'Come on! ... Show me a real fight.',10272,1,0,'nethekurse SAY_AGGRO_2'),
+(-1540014,'I had more fun torturing the peons.',10273,1,0,'nethekurse SAY_AGGRO_3'),
+(-1540015,'You Loose.',10274,1,0,'nethekurse SAY_SLAY_1'),
+(-1540016,'Ohh! Just die.',10275,1,0,'nethekurse SAY_SLAY_2'),
+(-1540017,'What a ... a shame.',10276,1,0,'nethekurse SAY_DIE'),
+
+(-1540018,'Smash!',10306,1,0,'omrogg GoCombat_1'),
+(-1540019,'If you nice me let you live.',10308,1,0,'omrogg GoCombat_2'),
+(-1540020,'Me hungry!',10309,1,0,'omrogg GoCombat_3'),
+(-1540021,'Why don\'t you let me do the talking?',10317,1,0,'omrogg GoCombatDelay_1'),
+(-1540022,'No, we will NOT let you live!',10318,1,0,'omrogg GoCombatDelay_2'),
+(-1540023,'You always hungry. That why we so fat!',10319,1,0,'omrogg GoCombatDelay_3'),
+(-1540024,'You stay here. Me go kill someone else!',10303,1,0,'omrogg Threat_1'),
+(-1540025,'What are you doing!',10315,1,0,'omrogg Threat_2'),
+(-1540026,'Me kill someone else...',10302,1,0,'omrogg Threat_3'),
+(-1540027,'Me not like this one...',10300,1,0,'omrogg Threat_4'),
+(-1540028,'That\'s not funny!',10314,1,0,'omrogg ThreatDelay1_1'),
+(-1540029,'Me get bored...',10305,1,0,'omrogg ThreatDelay1_2'),
+(-1540030,'I\'m not done yet, idiot!',10313,1,0,'omrogg ThreatDelay1_3'),
+(-1540031,'Hey you numbskull!',10312,1,0,'omrogg ThreatDelay1_4'),
+(-1540032,'Ha ha ha.',10304,1,0,'omrogg ThreatDelay2_1'),
+(-1540033,'Whhy! He almost dead!',10316,1,0,'omrogg ThreatDelay2_2'),
+(-1540034,'H\'ey...',10307,1,0,'omrogg ThreatDelay2_3'),
+(-1540035,'We kill his friend!',10301,1,0,'omrogg ThreatDelay2_4'),
+(-1540036,'This one die easy!',10310,1,0,'omrogg Killing_1'),
+(-1540037,'I\'m tired. You kill next one!',10320,1,0,'omrogg Killing_2'),
+(-1540038,'That\'s because I do all the hard work!',10321,1,0,'omrogg KillingDelay_1'),
+(-1540039,'This all...your fault!',10311,1,0,'omrogg YELL_DIE_L'),
+(-1540040,'I...hate...you...',10322,1,0,'omrogg YELL_DIE_R'),
+(-1540041,'enrages',0,2,0,'omrogg EMOTE_ENRAGE');
 
 -- -1 542 000 BLOOD FURNACE
+INSERT INTO `script_texts` (`entry`,`content_default`,`sound`,`type`,`language`,`comment`) VALUES
+(-1542000,'Who dares interrupt... What is this? What have you done? You ruin everything!',10164,1,0,'kelidan SAY_WAKE'),
+(-1542001,'You mustn\'t let him loose!',10166,1,0,'kelidan SAY_ADD_AGGRO_1'),
+(-1542002,'Ignorant whelps!',10167,1,0,'kelidan SAY_ADD_AGGRO_2'),
+(-1542003,'You fools! He\'ll kill us all!',10168,1,0,'kelidan SAY_ADD_AGGRO_3'),
+(-1542004,'Just as you deserve!',10169,1,0,'kelidan SAY_KILL_1'),
+(-1542005,'Your friends will soon be joining you.',10170,1,0,'kelidan SAY_KILL_2'),
+(-1542006,'Closer... Come closer.. and burn!',10165,1,0,'kelidan SAY_NOVA'),
+(-1542007,'Good luck... you\'ll need it..',10171,1,0,'kelidan SAY_DIE'),
+
+(-1542008,'Come intruders....',0,1,0,'broggok SAY_AGGRO'),
+
+(-1542009,'My work must not be interrupted.',10286,1,0,'the_maker SAY_AGGRO_1'),
+(-1542010,'Perhaps I can find a use for you.',10287,1,0,'the_maker SAY_AGGRO_2'),
+(-1542011,'Anger... Hate... These are tools I can use.',10288,1,0,'the_maker SAY_AGGRO_3'),
+(-1542012,'Let\'s see what I can make of you.',10289,1,0,'the_maker SAY_KILL_1'),
+(-1542013,'It is pointless to resist.',10290,1,0,'the_maker SAY_KILL_2'),
+(-1542014,'Stay away from... me.',10291,1,0,'the_maker SAY_DIE');
 
 -- -1 543 000 HELLFIRE RAMPARTS
+INSERT INTO `script_texts` (`entry`,`content_default`,`sound`,`type`,`language`,`comment`) VALUES
+(-1543000,'Do you smell that? Fresh meat has somehow breached our citadel. Be wary of any intruders.',0,1,0,'gargolmar SAY_TAUNT'),
+(-1543001,'Heal me! QUICKLY!',10329,1,0,'gargolmar SAY_HEAL'),
+(-1543002,'Back off, pup!',10330,1,0,'gargolmar SAY_SURGE'),
+(-1543003,'What have we here...?',10331,1,0,'gargolmar SAY_AGGRO_1'),
+(-1543004,'Heh... this may hurt a little.',10332,1,0,'gargolmar SAY_AGGRO_2'),
+(-1543005,'I\'m gonna enjoy this.',10333,1,0,'gargolmar SAY_AGGRO_3'),
+(-1543006,'Say farewell!',10334,1,0,'gargolmar SAY_KILL_1'),
+(-1543007,'Much too easy...',10335,1,0,'gargolmar SAY_KILL_2'),
+(-1543008,'Hahah.. <cough> ..argh!',10336,1,0,'gargolmar SAY_DIE'),
+
+(-1543009,'You dare stand against me?!',10280,1,0,'omor SAY_AGGRO_1'),
+(-1543010,'I will not be defeated!',10279,1,0,'omor SAY_AGGRO_2'),
+(-1543011,'Your insolence will be your death.',10281,1,0,'omor SAY_AGGRO_3'),
+(-1543012,'Achor-she-ki! Feast my pet! Eat your fill!',10277,1,0,'omor SAY_SUMMON'),
+(-1543013,'A-Kreesh!',10278,1,0,'omor SAY_CURSE'),
+(-1543014,'Die, weakling!',10282,1,0,'omor SAY_KILL_1'),
+(-1543015,'It is... not over.',10284,1,0,'omor SAY_DIE'),
+(-1543016,'I am victorious!',10283,1,0,'omor SAY_WIPE');
 
 -- -1 544 000 MAGTHERIDON'S LAIR
+INSERT INTO `script_texts` (`entry`,`content_default`,`sound`,`type`,`language`,`comment`) VALUES
+(-1544000,'Wretched, meddling insects. Release me and perhaps i will grant you a merciful death!',10247,1,0,'magtheridon SAY_TAUNT1'),
+(-1544001,'Vermin! Leeches! Take my blood and choke on it!',10248,1,0,'magtheridon SAY_TAUNT2'),
+(-1544002,'Illidan is an arrogant fool. I will crush him and reclaim Outland as my own.',10249,1,0,'magtheridon SAY_TAUNT3'),
+(-1544003,'Away, you mindless parasites. My blood is my own!',10250,1,0,'magtheridon SAY_TAUNT4'),
+(-1544004,'How long do you believe your pathetic sorcery can hold me?',10251,1,0,'magtheridon SAY_TAUNT5'),
+(-1544005,'My blood will be the end of you!',10252,1,0,'magtheridon SAY_TAUNT6'),
+(-1544006,'I...am...UNLEASHED!!!',10253,1,0,'magtheridon SAY_FREED'),
+(-1544007,'Thank you for releasing me. Now...die!',10254,1,0,'magtheridon SAY_AGGRO'),
+(-1544008,'Not again...NOT AGAIN!',10256,1,0,'magtheridon SAY_BANISH'),
+(-1544009,'I will not be taken so easily. Let the walls of this prison tremble...and FALL!!!',10257,1,0,'magtheridon SAY_CHAMBER_DESTROY'),
+(-1544010,'Did you think me weak? Soft? Who is the weak one now?!',10255,1,0,'magtheridon SAY_PLAYER_KILLED'),
+(-1544011,'The Legion...will consume you...all...',10258,1,0,'magtheridon SAY_DEATH'),
+(-1544012,'becomes enraged!',0,2,0,'magtheridon EMOTE_BERSERK'),
+(-1544013,'begins to cast Blast Nova!',0,2,0,'magtheridon EMOTE_BLASTNOVA'),
+(-1544014,'bonds begin to weaken!',0,2,0,'magtheridon EMOTE_BEGIN');
 
 -- -1 545 000 THE STEAMVAULT
+INSERT INTO `script_texts` (`entry`,`content_default`,`sound`,`type`,`language`,`comment`) VALUES
+(-1545000,'Surge forth my pets!',10360,1,0,'thespia SAY_SUMMON'),
+(-1545001,'The depths will consume you!',10361,1,0,'thespia SAY_AGGRO_1'),
+(-1545002,'Meet your doom, surface dwellers!',10362,1,0,'thespia SAY_AGGRO_2'),
+(-1545003,'You will drown in blood!',10363,1,0,'thespia SAY_AGGRO_3'),
+(-1545004,'To the depths of oblivion with you!',10364,1,0,'thespia SAY_SLAY_1'),
+(-1545005,'For my lady and master!',10365,1,0,'thespia SAY_SLAY_2'),
+(-1545006,'Our matron will be.. the end of.. you..',10366,1,0,'thespia SAY_DEAD'),
+
+(-1545007,'I\'m bringin\' the pain!',10367,1,0,'mekgineer SAY_MECHANICS'),
+(-1545008,'You\'re in for a world of hurt!',10368,1,0,'mekgineer SAY_AGGRO_1'),
+(-1545009,'Eat hot metal, scumbag!',10369,1,0,'mekgineer SAY_AGGRO_2'),
+(-1545010,'I\'ll come over there!',10370,1,0,'mekgineer SAY_AGGRO_3'),
+(-1545011,'I\'m bringin\' the pain!',10371,1,0,'mekgineer SAY_AGGRO_4'),
+(-1545012,'You just got served, punk!',10372,1,0,'mekgineer SOUND_SLAY_1'),
+(-1545013,'I own you!',10373,1,0,'mekgineer SOUND_SLAY_2'),
+(-1545014,'Have fun dyin\', cupcake!',10374,1,0,'mekgineer SOUND_SLAY_3'),
+(-1545015,'Mommy!',10375,1,0,'mekgineer SAY_DEATH'),
+
+(-1545016,'You deem yourselves worthy simply because you bested my guards? Our work here will not be compromised!',10390,1,0,'kalithresh SAY_INTRO'),
+(-1545017,'This is not nearly over...',10391,1,0,'kalithresh SAY_REGEN'),
+(-1545018,'Your head will roll!',10392,1,0,'kalithresh SAY_AGGRO1'),
+(-1545019,'I despise all of your kind!',10393,1,0,'kalithresh SAY_AGGRO2'),
+(-1545020,'Ba\'ahntha sol\'dorei!',10394,1,0,'kalithresh SAY_AGGRO3'),
+(-1545021,'Scram, surface filth!',10395,1,0,'kalithresh SAY_SLAY1'),
+(-1545022,'Ah ha ha ha ha ha ha!',10396,1,0,'kalithresh SAY_SLAY2'),
+(-1545023,'For her Excellency... for... Vashj!',10397,1,0,'kalithresh SAY_DEATH');
 
 -- -1 546 000 THE UNDERBOG
@@ -150 +514 @@
 
 -- -1 548 000 SERPENTSHRINE CAVERN
+INSERT INTO `script_texts` (`entry`,`content_default`,`sound`,`type`,`language`,`comment`) VALUES
+(-1548000,'I cannot allow you to interfere!',11289,1,0,'hydross SAY_AGGRO'),
+(-1548001,'Better, much better.',11290,1,0,'hydross SAY_SWITCH_TO_CLEAN'),
+(-1548002,'They have forced me to this...',11291,1,0,'hydross SAY_CLEAN_SLAY1'),
+(-1548003,'I have no choice.',11292,1,0,'hydross SAY_CLEAN_SLAY2'),
+(-1548004,'I am... released...',11293,1,0,'hydross SAY_CLEAN_DEATH'),
+(-1548005,'Aaghh, the poison...',11297,1,0,'hydross SAY_SWITCH_TO_CORRUPT'),
+(-1548006,'I will purge you from this place.',11298,1,0,'hydross SAY_CORRUPT_SLAY1'),
+(-1548007,'You are no better than they!',11299,1,0,'hydross SAY_CORRUPT_SLAY2'),
+(-1548008,'You are the disease, not I',11300,1,0,'hydross SAY_CORRUPT_DEATH'),
+
+(-1548009,'Finally my banishment ends!',11312,1,0,'leotheras SAY_AGGRO'),
+(-1548010,'Be gone trifling elf. I\'m in control now.',11304,1,0,'leotheras SAY_SWITCH_TO_DEMON'),
+(-1548011,'We all have our demons...',11305,1,0,'leotheras SAY_INNER_DEMONS'),
+(-1548012,'I have no equal.',11306,1,0,'leotheras SAY_DEMON_SLAY1'),
+(-1548013,'Perish, mortal.',11307,1,0,'leotheras SAY_DEMON_SLAY2'),
+(-1548014,'Yes, YES! Ahahah!',11308,1,0,'leotheras SAY_DEMON_SLAY3'),
+(-1548015,'Kill! KILL!',11314,1,0,'leotheras SAY_NIGHTELF_SLAY1'),
+(-1548016,'That\'s right! Yes!',11315,1,0,'leotheras SAY_NIGHTELF_SLAY2'),
+(-1548017,'Who\'s the master now?',11316,1,0,'leotheras SAY_NIGHTELF_SLAY3'),
+(-1548018,'No! NO! What have you done?! I am the master, do you hear me? I... aaghh... Can\'t... contain him...',11313,1,0,'leotheras SAY_FINAL_FORM'),
+(-1548019,'At last I am liberated. It has been too long since I have tasted true freedom!',11309,1,0,'leotheras SAY_FREE'),
+(-1548020,'You cannot kill me! Fools, I\'ll be back! I\'ll... aarghh...',11317,1,0,'leotheras SAY_DEATH'),
+
+(-1548021,'Guards, attention! We have visitors...',11277,1,0,'karathress SAY_AGGRO'),
+(-1548022,'Your overconfidence will be your undoing! Guards, lend me your strength!',11278,1,0,'karathress SAY_GAIN_BLESSING'),
+(-1548023,'Go on, kill them! I\'ll be the better for it!',11279,1,0,'karathress SAY_GAIN_ABILITY1'),
+(-1548024,'I am more powerful than ever!',11280,1,0,'karathress SAY_GAIN_ABILITY2'),
+(-1548025,'More knowledge, more power!',11281,1,0,'karathress SAY_GAIN_ABILITY3'),
+(-1548026,'Land-dwelling scum!',11282,1,0,'karathress SAY_SLAY1'),
+(-1548027,'Alana be\'lendor!',11283,1,0,'karathress SAY_SLAY2'),
+(-1548028,'I am rid of you.',11284,1,0,'karathress SAY_SLAY3'),
+(-1548029,'Her ... excellency ... awaits!',11285,1,0,'karathress SAY_DEATH'),
+
+(-1548030,'Flood of the deep, take you!',11321,1,0,'morogrim SAY_AGGRO'),
+(-1548031,'By the Tides, kill them at once!',11322,1,0,'morogrim SAY_SUMMON1'),
+(-1548032,'Destroy them my subjects!',11323,1,0,'morogrim SAY_SUMMON2'),
+(-1548033,'There is nowhere to hide!',11324,1,0,'morogrim SAY_SUMMON_BUBL1'),
+(-1548034,'Soon it will be finished!',11325,1,0,'morogrim SAY_SUMMON_BUBL2'),
+(-1548035,'It is done!',11326,1,0,'morogrim SAY_SLAY1'),
+(-1548036,'Strugging only makes it worse.',11327,1,0,'morogrim SAY_SLAY2'),
+(-1548037,'Only the strong survive.',11328,1,0,'morogrim SAY_SLAY3'),
+(-1548038,'Great... currents of... Ageon.',11329,1,0,'morogrim SAY_DEATH'),
+(-1548039,'sends his enemies to their watery graves!',0,2,0,'morogrim EMOTE_WATERY_GRAVE'),
+(-1548040,'The violent earthquake has alerted nearby murlocs!',0,3,0,'morogrim EMOTE_EARTHQUAKE'),
+(-1548041,'summons Watery Globules!',0,2,0,'morogrim EMOTE_WATERY_GLOBULES'),
+
+(-1548042,'Water is life. It has become a rare commodity here in Outland. A commodity that we alone shall control. We are the Highborne, and the time has come at last for us to retake our rightful place in the world!',11531,1,0,'vashj SAY_INTRO'),
+(-1548043,'I\'ll split you from stem to stern!',11532,1,0,'vashj SAY_AGGRO1'),
+(-1548044,'Victory to Lord Illidan!',11533,1,0,'vashj SAY_AGGRO2'),
+(-1548045,'I spit on you, surface filth!',11534,1,0,'vashj SAY_AGGRO3'),
+(-1548046,'Death to the outsiders!',11535,1,0,'vashj SAY_AGGRO4'),
+(-1548047,'I did not wish to lower myself by engaging your kind, but you leave me little choice!',11538,1,0,'vashj SAY_PHASE1'),
+(-1548048,'The time is now! Leave none standing!',11539,1,0,'vashj SAY_PHASE2'),
+(-1548049,'You may want to take cover.',11540,1,0,'vashj SAY_PHASE3'),
+(-1548050,'Straight to the heart!',11536,1,0,'vashj SAY_BOWSHOT1'),
+(-1548051,'Seek your mark!',11537,1,0,'vashj SAY_BOWSHOT2'),
+(-1548052,'Your time ends now!',11541,1,0,'vashj SAY_SLAY1'),
+(-1548053,'You have failed!',11542,1,0,'vashj SAY_SLAY2'),
+(-1548054,'Be\'lamere an\'delay',11543,1,0,'vashj SAY_SLAY3'),
+(-1548055,'Lord Illidan, I... I am... sorry.',11544,1,0,'vashj SAY_DEATH');
 
 -- -1 550 000 THE EYE
+INSERT INTO `script_texts` (`entry`,`content_default`,`sound`,`type`,`language`,`comment`) VALUES
+(-1550000,'Alert, you are marked for extermination!',11213,1,0,'voidreaver SAY_AGGRO'),
+(-1550001,'Extermination, successful.',11215,1,0,'voidreaver SAY_SLAY1'),
+(-1550002,'Imbecile life form, no longer functional.',11216,1,0,'voidreaver SAY_SLAY2'),
+(-1550003,'Threat neutralized.',11217,1,0,'voidreaver SAY_SLAY3'),
+(-1550004,'Systems... shutting... down...',11214,1,0,'voidreaver SAY_DEATH'),
+(-1550005,'Alternative measure commencing...',11218,1,0,'voidreaver SAY_POUNDING1'),
+(-1550006,'Calculating force parameters...',11219,1,0,'voidreaver SAY_POUNDING2'),
+
+(-1550007,'Tal anu\'men no Sin\'dorei!',11134,1,0,'solarian SAY_AGGRO'),
+(-1550008,'Ha ha ha! You are hopelessly outmatched!',11139,1,0,'solarian SAY_SUMMON1'),
+(-1550009,'I will crush your delusions of grandeur!',11140,1,0,'solarian SAY_SUMMON2'),
+(-1550010,'Your soul belongs to the Abyss!',11136,1,0,'solarian SAY_KILL1'),
+(-1550011,'By the blood of the Highborne!',11137,1,0,'solarian SAY_KILL2'),
+(-1550012,'For the Sunwell!',11138,1,0,'solarian SAY_KILL3'),
+(-1550013,'The warmth of the sun... awaits.',11135,1,0,'solarian SAY_DEATH'),
+(-1550014,'Enough of this! Now I call upon the fury of the cosmos itself.',0,1,0,'solarian SAY_VOIDA'),
+(-1550015,'I become ONE... with the VOID!',0,1,0,'solarian SAY_VOIDB'),
+
+(-1550016,'Energy. Power. My people are addicted to it... a dependence made manifest after the Sunwell was destroyed. Welcome... to the future. A pity you are too late to stop it. No one can stop me now! Selama ashal\'anore!',11256,1,0,'kaelthas SAY_INTRO'),
+(-1550017,'Capernian will see to it that your stay here is a short one.',11257,1,0,'kaelthas SAY_INTRO_CAPERNIAN'),
+(-1550018,'Well done, you have proven worthy to test your skills against my master engineer, Telonicus.',11258,1,0,'kaelthas SAY_INTRO_TELONICUS'),
+(-1550019,'Let us see how your nerves hold up against the Darkener, Thaladred.',11259,1,0,'kaelthas SAY_INTRO_THALADRED'),
+(-1550020,'You have persevered against some of my best advisors... but none can withstand the might of the Blood Hammer. Behold, Lord Sanguinar!',11260,1,0,'kaelthas SAY_INTRO_SANGUINAR'),
+(-1550021,'As you see, I have many weapons in my arsenal...',11261,1,0,'kaelthas SAY_PHASE2_WEAPON'),
+(-1550022,'Perhaps I underestimated you. It would be unfair to make you fight all four advisors at once, but... fair treatment was never shown to my people. I\'m just returning the favor.',11262,1,0,'kaelthas SAY_PHASE3_ADVANCE'),
+(-1550023,'Alas, sometimes one must take matters into one\'s own hands. Balamore shanal!',11263,1,0,'kaelthas SAY_PHASE4_INTRO2'),
+(-1550024,'I have not come this far to be stopped! The future I have planned will not be jeopardized! Now you will taste true power!!',11273,1,0,'kaelthas SAY_PHASE5_NUTS'),
+(-1550025,'You will not prevail.',11270,1,0,'kaelthas SAY_SLAY1'),
+(-1550026,'You gambled...and lost.',11271,1,0,'kaelthas SAY_SLAY2'),
+(-1550027,'This was Child\'s play.',11272,1,0,'kaelthas SAY_SLAY3'),
+(-1550028,'Obey me.',11268,1,0,'kaelthas SAY_MINDCONTROL1'),
+(-1550029,'Bow to my will.',11269,1,0,'kaelthas SAY_MINDCONTROL2'),
+(-1550030,'Let us see how you fare when your world is turned upside down.',11264,1,0,'kaelthas SAY_GRAVITYLAPSE1'),
+(-1550031,'Having trouble staying grounded?',11265,1,0,'kaelthas SAY_GRAVITYLAPSE2'),
+(-1550032,'Anara\'nel belore!',11267,1,0,'kaelthas SAY_SUMMON_PHOENIX1'),
+(-1550033,'By the power of the sun!',11266,1,0,'kaelthas SAY_SUMMON_PHOENIX2'),
+(-1550034,'For...Quel...thalas!',11274,1,0,'kaelthas SAY_DEATH'),
+
+(-1550035,'Prepare yourselves!',11203,1,0,'thaladred SAY_THALADRED_AGGRO'),
+(-1550036,'Forgive me, my prince! I have... failed.',11204,1,0,'thaladred SAY_THALADRED_DEATH'),
+(-1550037,'sets his gaze on $N!',0,2,0,'thaladred EMOTE_THALADRED_GAZE'),
+
+(-1550038,'Blood for blood!',11152,1,0,'sanguinar SAY_SANGUINAR_AGGRO'),
+(-1550039,'NO! I ...will... not...',11153,1,0,'sanguinar SAY_SANGUINAR_DEATH'),
+
+(-1550040,'The sin\'dore reign supreme!',11117,1,0,'capernian SAY_CAPERNIAN_AGGRO'),
+(-1550041,'This is not over!',11118,1,0,'capernian SAY_CAPERNIAN_DEATH'),
+
+(-1550042,'Anar\'alah belore!',11157,1,0,'telonicus SAY_TELONICUS_AGGRO'),
+(-1550043,'More perils... await',11158,1,0,'telonicus SAY_TELONICUS_DEATH');
 
 -- -1 552 000 THE ARCATRAZ
+INSERT INTO `script_texts` (`entry`,`content_default`,`sound`,`type`,`language`,`comment`) VALUES
+(-1552000,'It is a small matter to control the mind of the weak... for I bear allegiance to powers untouched by time, unmoved by fate. No force on this world or beyond harbors the strength to bend our knee... not even the mighty Legion!',11122,1,0,'skyriss SAY_INTRO'),
+(-1552001,'Bear witness to the agent of your demise!',11123,1,0,'skyriss SAY_AGGRO'),
+(-1552002,'Your fate is written!',11124,1,0,'skyriss SAY_KILL_1'),
+(-1552003,'The chaos I have sown here is but a taste...',11125,1,0,'skyriss SAY_KILL_2'),
+(-1552004,'You will do my bidding, weakling.',11127,1,0,'skyriss SAY_MIND_1'),
+(-1552005,'Your will is no longer your own.',11128,1,0,'skyriss SAY_MIND_2'),
+(-1552006,'Flee in terror!',11129,1,0,'skyriss SAY_FEAR_1'),
+(-1552007,'I will show you horrors undreamed of!',11130,1,0,'skyriss SAY_FEAR_2'),
+(-1552008,'We span the universe, as countless as the stars!',11131,1,0,'skyriss SAY_IMAGE'),
+(-1552009,'I am merely one of... infinite multitudes.',11126,1,0,'skyriss SAY_DEATH'),
+
+(-1552010,'Where in Bonzo\'s brass buttons am I? And who are-- yaaghh, that\'s one mother of a headache!',11171,1,0,'millhouse SAY_INTRO_1'),
+(-1552011,'\"Lowly\"? I don\'t care who you are friend, no one refers to the mighty Millhouse Manastorm as \"Lowly\"! I have no idea what goes on here, but I will gladly join your fight against this impudent imbecile! Prepare to defend yourself, cretin!',11172,1,0,'millhouse SAY_INTRO_2'),
+(-1552012,'I just need to get some things ready first. You guys go ahead and get started. I need to summon up some water...',11173,1,0,'millhouse SAY_WATER'),
+(-1552013,'Fantastic! Next, some protective spells. Yes! Now we\'re cookin\'',11174,1,0,'millhouse SAY_BUFFS'),
+(-1552014,'And of course i\'ll need some mana. You guys are gonna love this, just wait.',11175,1,0,'millhouse SAY_DRINK'),
+(-1552015,'Aaalllriiiight!! Who ordered up an extra large can of whoop-ass?',11176,1,0,'millhouse SAY_READY'),
+(-1552016,'I didn\'t even break a sweat on that one.',11177,1,0,'millhouse SAY_KILL_1'),
+(-1552017,'You guys, feel free to jump in anytime.',11178,1,0,'millhouse SAY_KILL_2'),
+(-1552018,'I\'m gonna light you up, sweet cheeks!',11179,1,0,'millhouse SAY_PYRO'),
+(-1552019,'Ice, ice, baby!',11180,1,0,'millhouse SAY_ICEBLOCK'),
+(-1552020,'Heal me! Oh, for the love of all that is holy, HEAL me! I\'m dying!',11181,1,0,'millhouse SAY_LOWHP'),
+(-1552021,'You\'ll be hearing from my lawyer...',11182,1,0,'millhouse SAY_DEATH'),
+(-1552022,'Who\'s bad? Who\'s bad? That\'s right: we bad!',11183,1,0,'millhouse SAY_COMPLETE'),
+
+(-1552023,'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!',11222,1,0,'mellichar YELL_INTRO1'),
+(-1552024,'The naaru kept some of the most dangerous beings in existence here in these cells. Let me introduce you to another...',11223,1,0,'mellichar YELL_INTRO2'),
+(-1552025,'Yes, yes... another! Your will is mine!',11224,1,0,'mellichar YELL_RELEASE1'),
+(-1552026,'Behold another terrifying creature of incomprehensible power!',11225,1,0,'mellichar YELL_RELEASE2A'),
+(-1552027,'What is this? A lowly gnome? I will do better, O\'great one.',11226,1,0,'mellichar YELL_RELEASE2B'),
+(-1552028,'Anarchy! Bedlam! Oh, you are so wise! Yes, I see it now, of course!',11227,1,0,'mellichar YELL_RELEASE3'),
+(-1552029,'One final cell remains. Yes, O\'great one, right away!',11228,1,0,'mellichar YELL_RELEASE4'),
+(-1552030,'Welcome, O\'great one. I am your humble servant.',11229,1,0,'mellichar YELL_WELCOME');
 
 -- -1 553 000 THE BOTANICA
+INSERT INTO `script_texts` (`entry`,`content_default`,`sound`,`type`,`language`,`comment`) VALUES
+(-1553000,'What are you doing? These specimens are very delicate!',11144,1,0,'freywinn SAY_AGGRO'),
+(-1553001,'Your life cycle is now concluded!',11145,1,0,'freywinn SAY_KILL_1'),
+(-1553002,'You will feed the worms.',11146,1,0,'freywinn SAY_KILL_2'),
+(-1553003,'Endorel aluminor!',11147,1,0,'freywinn SAY_TREE_1'),
+(-1553004,'Nature bends to my will!',11148,1,0,'freywinn SAY_TREE_2'),
+(-1553005,'The specimens...must be preserved.',11149,1,0,'freywinn SAY_DEATH'),
+
+(-1553006,'emits a strange noise.',0,2,0,'laj EMOTE_SUMMON'),
+
+(-1553007,'Who disturbs this sanctuary?',11230,1,0,'warp SAY_AGGRO'),
+(-1553008,'You must die! But wait: this does not--No, no... you must die!',11231,1,0,'warp SAY_SLAY_1'),
+(-1553009,'What am I doing? Why do I...',11232,1,0,'warp SAY_SLAY_2'),
+(-1553010,'Children, come to me!',11233,1,0,'warp SAY_SUMMON_1'),
+(-1553011,'Maybe this is not--No, we fight! Come to my aid.',11234,1,0,'warp SAY_SUMMON_2'),
+(-1553012,'So... confused. Do not... belong here!',11235,1,0,'warp SAY_DEATH');
 
 -- -1 554 000 THE MECHANAR
+INSERT INTO `script_texts` (`entry`,`content_default`,`sound`,`type`,`language`,`comment`) VALUES
+(-1554000,'I predict a painful death.',11101,1,0,'gyro SAY_AGGRO'),
+(-1554001,'Measure twice; cut once!',11104,1,0,'gyro SAY_SAW_ATTACK1'),
+(-1554002,'If my division is correct, you should be quite dead.',11105,1,0,'gyro SAY_SAW_ATTACK2'),
+(-1554003,'Your strategy was flawed!',11102,1,0,'gyro SAY_SLAY1'),
+(-1554004,'Yes, the only logical outcome.',11103,1,0,'gyro SAY_SLAY2'),
+(-1554005,'An unforseen... contingency',11106,1,0,'gyro SAY_DEATH'),
+
+(-1554006,'You have approximately five seconds to live.',11109,1,0,'ironhand SAY_AGGRO_1'),
+(-1554007,'With the precise angle and velocity...',11112,1,0,'ironhand SAY_HAMMER_1'),
+(-1554008,'Low tech yet quiet effective!',11113,1,0,'ironhand SAY_HAMMER_2'),
+(-1554009,'A foregone conclusion.',11110,1,0,'ironhand SAY_SLAY_1'),
+(-1554010,'The processing will continue a schedule!',11111,1,0,'ironhand SAY_SLAY_2'),
+(-1554011,'My calculations did not...',11114,1,0,'ironhand SAY_DEATH_1'),
+(-1554012,'raises his hammer menacingly...',0,3,0,'ironhand EMOTE_HAMMER'),
+
+(-1554013,'Don\'t value your life very much, do you?',11186,1,0,'sepethrea SAY_AGGRO'),
+(-1554014,'I am not alone.',11191,1,0,'sepethrea SAY_SUMMON'),
+(-1554015,'Think you can take the heat?',11189,1,0,'sepethrea SAY_DRAGONS_BREATH_1'),
+(-1554016,'Anar\'endal dracon!',11190,1,0,'sepethrea SAY_DRAGONS_BREATH_2'),
+(-1554017,'And don\'t come back!',11187,1,0,'sepethrea SAY_SLAY1'),
+(-1554018,'En\'dala finel el\'dal',11188,1,0,'sepethrea SAY_SLAY2'),
+(-1554019,'Anu... bala belore...alon.',11192,1,0,'sepethrea SAY_DEATH'),
+
+(-1554020,'We are on a strict timetable. You will not interfere!',11193,1,0,'pathaleon SAY_AGGRO'),
+(-1554021,'I\'m looking for a team player...',11197,1,0,'pathaleon SAY_DOMINATION_1'),
+(-1554022,'You work for me now!',11198,1,0,'pathaleon SAY_DOMINATION_2'),
+(-1554023,'Time to supplement my work force.',11196,1,0,'pathaleon SAY_SUMMON'),
+(-1554024,'I prefeer to be hands-on...',11199,1,0,'pathaleon SAY_ENRAGE'),
+(-1554025,'A minor inconvenience.',11194,1,0,'pathaleon SAY_SLAY_1'),
+(-1554026,'Looks like you lose.',11195,1,0,'pathaleon SAY_SLAY_2'),
+(-1554027,'The project will... continue.',11200,1,0,'pathaleon SAY_DEATH');
 
 -- -1 555 000 SHADOW LABYRINTH
@@ -283 +841 @@
 
 -- -1 564 000 BLACK TEMPLE
+INSERT INTO `script_texts` (`entry`,`content_default`,`sound`,`type`,`language`,`comment`) VALUES
+(-1564000,'You will die in the name of Lady Vashj!',11450,1,0,'SAY_AGGRO'),
+(-1564001,'Stick around!',11451,1,0,'SAY_NEEDLE1'),
+(-1564002,'I\'ll deal with you later!',11452,1,0,'SAY_NEEDLE2'),
+(-1564003,'Your success was short lived!',11455,1,0,'SAY_SLAY1'),
+(-1564004,'Time for you to go!',11456,1,0,'SAY_SLAY2'),
+(-1564005,'Bel\'anen dal\'lorei!',11453,1,0,'SAY_SPECIAL1'),
+(-1564006,'Blood will flow!',11454,1,0,'SAY_SPECIAL2'),
+(-1564007,'Bal\'amer ch\'itah!',11457,1,0,'SAY_ENRAGE1'),
+(-1564008,'My patience has ran out! Die, DIE!',11458,1,0,'SAY_ENRAGE2'),
+(-1564009,'Lord Illidan will... crush you.',11459,1,0,'SAY_DEATH'),
+
+(-1564010,'%s acquires a new target!',0,3,0,'supremus EMOTE_NEW_TARGET'),
+(-1564011,'%s punches the ground in anger!',0,3,0,'supremus EMOTE_PUNCH_GROUND'),
+(-1564012,'The ground begins to crack open!',0,3,0,'supremus EMOTE_GROUND_CRACK'),
+
+(-1564013,'No! Not yet...',11385,1,0,'akama shade SAY_LOW_HEALTH'),
+(-1564014,'I will not last much longer...',11386,1,0,'akama shade SAY_DEATH'),
+(-1564015,'Come out from the shadows! I\'ve returned to lead you against our true enemy! Shed your chains and raise your weapons against your Illidari masters!',0,1,0,'akama shade SAY_FREE'),
+(-1564016,'Hail our leader! Hail Akama!',0,1,0,'akama shade broken SAY_BROKEN_FREE_01'),
+(-1564017,'Hail Akama!',0,1,0,'akama shade broken SAY_BROKEN_FREE_02'),
+
+(-1564018,'You play, you pay.',11501,1,0,'shahraz SAY_TAUNT1'),
+(-1564019,'I\'m not impressed.',11502,1,0,'shahraz SAY_TAUNT2'),
+(-1564020,'Enjoying yourselves?',11503,1,0,'shahraz SAY_TAUNT3'),
+(-1564021,'So... business or pleasure?',11504,1,0,'shahraz SAY_AGGRO'),
+(-1564022,'You seem a little tense.',11505,1,0,'shahraz SAY_SPELL1'),
+(-1564023,'Don\'t be shy.',11506,1,0,'shahraz SAY_SPELL2'),
+(-1564024,'I\'m all... yours.',11507,1,0,'shahraz SAY_SPELL3'),
+(-1564025,'Easy come, easy go.',11508,1,0,'shahraz SAY_SLAY1'),
+(-1564026,'So much for a happy ending.',11509,1,0,'shahraz SAY_SLAY2'),
+(-1564027,'Stop toying with my emotions!',11510,1,0,'shahraz SAY_ENRAGE'),
+(-1564028,'I wasn\'t... finished.',11511,1,0,'shahraz SAY_DEATH'),
+
+(-1564029,'Horde will... crush you.',11432,1,0,'bloodboil SOUND_AGGRO'),
+(-1564030,'Time to feast!',11433,1,0,'bloodboil SAY_SLAY1'),
+(-1564031,'More! I want more!',11434,1,0,'bloodboil SAY_SLAY2'),
+(-1564032,'Drink your blood! Eat your flesh!',11435,1,0,'bloodboil SAY_SPECIAL1'),
+(-1564033,'I hunger!',11436,1,0,'bloodboil SAY_SPECIAL2'),
+(-1564034,'<babbling>',11437,1,0,'bloodboil SAY_ENRAGE1'),
+(-1564035,'I\'ll rip the meat from your bones!',11438,1,0,'bloodboil SAY_ENRAGE2'),
+(-1564036,'Aaaahrg...',11439,1,0,'bloodboil SAY_DEATH'),
+
+(-1564037,'I was the first, you know. For me, the wheel of death has spun many times. <laughs> So much time has passed. I have a lot of catching up to do...',11512,1,0,'teron SAY_INTRO'),
+(-1564038,'Vengeance is mine!',11513,1,0,'teron SAY_AGGRO'),
+(-1564039,'I have use for you!',11514,1,0,'teron SAY_SLAY1'),
+(-1564040,'It gets worse...',11515,1,0,'teron SAY_SLAY2'),
+(-1564041,'What are you afraid of?',11517,1,0,'teron SAY_SPELL1'),
+(-1564042,'Death... really isn\'t so bad.',11516,1,0,'teron SAY_SPELL2'),
+(-1564043,'Give in!',11518,1,0,'teron SAY_SPECIAL1'),
+(-1564044,'I have something for you...',11519,1,0,'teron SAY_SPECIAL2'),
+(-1564045,'YOU WILL SHOW THE PROPER RESPECT!',11520,1,0,'teron SAY_ENRAGE'),
+(-1564046,'The wheel...spins...again....',11521,1,0,'teron SAY_DEATH'),
+
+(-1564047,'Pain and suffering are all that await you!',11415,1,0,'essence SUFF_SAY_FREED'),
+(-1564048,'Don\'t leave me alone!',11416,1,0,'essence SUFF_SAY_AGGRO'),
+(-1564049,'Look at what you make me do!',11417,1,0,'essence SUFF_SAY_SLAY1'),
+(-1564050,'I didn\'t ask for this!',11418,1,0,'essence SUFF_SAY_SLAY2'),
+(-1564051,'The pain is only beginning!',11419,1,0,'essence SUFF_SAY_SLAY3'),
+(-1564052,'I don\'t want to go back!',11420,1,0,'essence SUFF_SAY_RECAP'),
+(-1564053,'Now what do I do?',11421,1,0,'essence SUFF_SAY_AFTER'),
+(-1564054,'%s becomes enraged!',0,3,0,'essence SUFF_EMOTE_ENRAGE'),
+
+(-1564055,'You can have anything you desire... for a price.',11408,1,0,'essence DESI_SAY_FREED'),
+(-1564056,'Fulfilment is at hand!',11409,1,0,'essence DESI_SAY_SLAY1'),
+(-1564057,'Yes... you\'ll stay with us now...',11410,1,0,'essence DESI_SAY_SLAY2'),
+(-1564058,'Your reach exceeds your grasp.',11412,1,0,'essence DESI_SAY_SLAY3'),
+(-1564059,'Be careful what you wish for...',11411,1,0,'essence DESI_SAY_SPEC'),
+(-1564060,'I\'ll be waiting...',11413,1,0,'essence DESI_SAY_RECAP'),
+(-1564061,'I won\'t be far...',11414,1,0,'essence DESI_SAY_AFTER'),
+
+(-1564062,'Beware: I live!',11399,1,0,'essence ANGER_SAY_FREED'),
+(-1564063,'So... foolish.',11400,1,0,'essence ANGER_SAY_FREED2'),
+(-1564064,'<maniacal cackle>',11401,1,0,'essence ANGER_SAY_SLAY1'),
+(-1564065,'Enough. No more.',11402,1,0,'essence ANGER_SAY_SLAY2'),
+(-1564066,'On your knees!',11403,1,0,'essence ANGER_SAY_SPEC'),
+(-1564067,'Beware, coward.',11405,1,0,'essence ANGER_SAY_BEFORE'),
+(-1564068,'I won\'t... be... ignored.',11404,1,0,'essence ANGER_SAY_DEATH'),
+
+(-1564069,'You wish to test me?',11524,1,0,'council vera AGGRO'),
+(-1564070,'I have better things to do...',11422,1,0,'council gath AGGRO'),
+(-1564071,'Flee or die!',11482,1,0,'council mala AGGRO'),
+(-1564072,'Common... such a crude language. Bandal!',11440,1,0,'council zere AGGRO'),
+
+(-1564073,'Enough games!',11428,1,0,'council gath ENRAGE'),
+(-1564074,'You wish to kill me? Hahaha, you first!',11530,1,0,'council vera ENRAGE'),
+(-1564075,'For Quel\'Thalas! For the Sunwell!',11488,1,0,'council mala ENRAGE'),
+(-1564076,'Sha\'amoor sine menoor!',11446,1,0,'council zere ENRAGE'),
+
+(-1564077,'Enjoy your final moments!',11426,1,0,'council gath SPECIAL1'),
+(-1564078,'You\'re not caught up for this!',11528,1,0,'council vera SPECIAL1'),
+(-1564079,'No second chances!',11486,1,0,'council mala SPECIAL1'),
+(-1564080,'Diel fin\'al',11444,1,0,'council zere SPECIAL1'),
+
+(-1564081,'You are mine!',11427,1,0,'council gath SPECIAL2'),
+(-1564082,'Anar\'alah belore!',11529,1,0,'council vera SPECIAL2'),
+(-1564083,'I\'m full of surprises!',11487,1,0,'council mala SPECIAL2'),
+(-1564084,'Sha\'amoor ara mashal?',11445,1,0,'council zere SPECIAL2'),
+
+(-1564085,'Selama am\'oronor!',11423,1,0,'council gath SLAY'),
+(-1564086,'Valiant effort!',11525,1,0,'council vera SLAY'),
+(-1564087,'My work is done.',11483,1,0,'council mala SLAY'),
+(-1564088,'Shorel\'aran.',11441,1,0,'council zere SLAY'),
+
+(-1564089,'Well done!',11424,1,0,'council gath SLAY_COMT'),
+(-1564090,'A glorious kill!',11526,1,0,'council vera SLAY_COMT'),
+(-1564091,'As it should be!',11484,1,0,'council mala SLAY_COMT'),
+(-1564092,'Belesa menoor!',11442,1,0,'council zere SLAY_COMT'),
+
+(-1564093,'Lord Illidan... I...',11425,1,0,'council gath DEATH'),
+(-1564094,'You got lucky!',11527,1,0,'council vera DEATH'),
+(-1564095,'Destiny... awaits.',11485,1,0,'council mala DEATH'),
+(-1564096,'Diel ma\'ahn... oreindel\'o',11443,1,0,'council zere DEATH');
 
 -- -1 565 000 GRUUL'S LAIR
+INSERT INTO `script_texts` (`entry`,`content_default`,`sound`,`type`,`language`,`comment`) VALUES
+(-1565000,'Gronn are the real power in outland.',11367,1,0,'maulgar SAY_AGGRO'),
+(-1565001,'You will not defeat the hand of Gruul!',11368,1,0,'maulgar SAY_ENRAGE'),
+(-1565002,'You won\'t kill next one so easy!',11369,1,0,'maulgar SAY_OGRE_DEATH1'),
+(-1565003,'Pah! Does not prove anything!',11370,1,0,'maulgar SAY_OGRE_DEATH2'),
+(-1565004,'I\'m not afraid of you.',11371,1,0,'maulgar SAY_OGRE_DEATH3'),
+(-1565005,'Good, now you fight me!',11372,1,0,'maulgar SAY_OGRE_DEATH4'),
+(-1565006,'You not so tough afterall!',11373,1,0,'maulgar SAY_SLAY1'),
+(-1565007,'Aha-ha ha ha!',11374,1,0,'maulgar SAY_SLAY2'),
+(-1565008,'Mulgar is king!',11375,1,0,'maulgar SAY_SLAY3'),
+(-1565009,'Gruul... will crush you...',11376,1,0,'maulgar SAY_DEATH'),
+
+(-1565010,'Come... and die.',11355,1,0,'gruul SAY_AGGRO'),
+(-1565011,'Scurry',11356,1,0,'gruul SAY_SLAM1'),
+(-1565012,'No escape',11357,1,0,'gruul SAY_SLAM2'),
+(-1565013,'Stay',11358,1,0,'gruul SAY_SHATTER1'),
+(-1565014,'Beg... for life',11359,1,0,'gruul SAY_SHATTER2'),
+(-1565015,'No more',11360,1,0,'gruul SAY_SLAY1'),
+(-1565016,'Unworthy',11361,1,0,'gruul SAY_SLAY2'),
+(-1565017,'Die',11362,1,0,'gruul SAY_SLAY3'),
+(-1565018,'Aaargh...',11363,1,0,'gruul SAY_DEATH'),
+(-1565019,'grows in size!',0,2,0,'gruul EMOTE_GROW');
 
 -- -1 568 000 ZUL'AMAN
+INSERT INTO `script_texts` (`entry`,`content_default`,`sound`,`type`,`language`,`comment`) VALUES
+(-1568000,'Spirits of da wind be your doom!',12031,1,0,'janalai SAY_AGGRO'),
+(-1568001,'I burn ya now!',12032,1,0,'janalai SAY_FIRE_BOMBS'),
+(-1568002,'Where ma hatcha? Get to work on dem eggs!',12033,1,0,'janalai SAY_SUMMON_HATCHER'),
+(-1568003,'I show you strength... in numbers.',12034,1,0,'janalai SAY_ALL_EGGS'),
+(-1568004,'You done run outta time!',12035,1,0,'janalai SAY_BERSERK'),
+(-1568005,'It all be over now, mon!',12036,1,0,'janalai SAY_SLAY_1'),
+(-1568006,'Tazaga-choo!',12037,1,0,'janalai SAY_SLAY_2'),
+(-1568007,'Zul\'jin... got a surprise for you...',12038,1,0,'janalai SAY_DEATH'),
+(-1568008,'Come, strangers. The spirit of the dragonhawk hot be hungry for worthy souls.',12039,1,0,'janalai SAY_EVENT_STRANGERS'),
+(-1568009,'Come, friends. Your bodies gonna feed ma hatchlings, and your souls are going to feed me with power!',12040,1,0,'janalai SAY_EVENT_FRIENDS'),
+
+(-1568010,'Get da move on, guards! It be killin\' time!',12066,1,0,'nalorakk SAY_WAVE1_AGGRO'),
+(-1568011,'Guards, go already! Who you more afraid of, dem... or me?',12067,1,0,'nalorakk SAY_WAVE2_STAIR1'),
+(-1568012,'Ride now! Ride out dere and bring me back some heads!',12068,1,0,'nalorakk SAY_WAVE3_STAIR2'),
+(-1568013,'I be losin\' me patience! Go on: make dem wish dey was never born!',12069,1,0,'nalorakk SAY_WAVE4_PLATFORM'),
+(-1568014,'What could be better than servin\' da bear spirit for eternity? Come closer now. Bring your souls to me!',12078,1,0,'nalorakk SAY_EVENT1_SACRIFICE'),
+(-1568015,'Don\'t be delayin\' your fate. Come to me now. I make your sacrifice quick.',12079,1,0,'nalorakk SAY_EVENT2_SACRIFICE'),
+(-1568016,'You be dead soon enough!',12070,1,0,'nalorakk SAY_AGGRO'),
+(-1568017,'I bring da pain!',12071,1,0,'nalorakk SAY_SURGE'),
+(-1568018,'You call on da beast, you gonna get more dan you bargain for!',12072,1,0,'nalorakk SAY_TOBEAR'),
+(-1568019,'Make way for Nalorakk!',12073,1,0,'nalorakk SAY_TOTROLL'),
+(-1568020,'You had your chance, now it be too late!',12074,1,0,'nalorakk SAY_BERSERK'),
+(-1568021,'Mua-ha-ha! Now whatchoo got to say?',12075,1,0,'nalorakk SAY_SLAY1'),
+(-1568022,'Da Amani gonna rule again!',12076,1,0,'nalorakk SAY_SLAY2'),
+(-1568023,'I... be waitin\' on da udda side....',12077,1,0,'nalorakk SAY_DEATH');
 
 -- -1 580 000 SUNWELL PLATEAU
+INSERT INTO `script_texts` (`entry`,`content_default`,`sound`,`type`,`language`,`comment`) VALUES
+(-1580000,'Aggh! No longer will I be a slave to Malygos! Challenge me and you will be destroyed!',12422,1,0,'kalecgos SAY_EVIL_AGGRO'),
+(-1580001,'I will purge you!',12423,1,0,'kalecgos SAY_EVIL_SPELL1'),
+(-1580002,'Your pain has only begun!',12424,1,0,'kalecgos SAY_EVIL_SPELL2'),
+(-1580003,'In the name of Kil\'jaeden!',12425,1,0,'kalecgos SAY_EVIL_SLAY1'),
+(-1580004,'You were warned!',12426,1,0,'kalecgos SAY_EVIL_SLAY2'),
+(-1580005,'My awakening is complete! You shall all perish!',12427,1,0,'kalecgos SAY_EVIL_ENRAGE'),
+(-1580006,'I need... your help... Cannot... resist him... much longer...',12428,1,0,'kalecgos humanoid SAY_GOOD_AGGRO'),
+(-1580007,'Aaahhh! Help me, before I lose my mind!',12429,1,0,'kalecgos humanoid SAY_GOOD_NEAR_DEATH'),
+(-1580008,'Hurry! There is not much of me left!',12430,1,0,'kalecgos humanoid SAY_GOOD_NEAR_DEATH2'),
+(-1580009,'I am forever in your debt. Once we have triumphed over Kil\'jaeden, this entire world will be in your debt as well.',12431,1,0,'kalecgos humanoid SAY_GOOD_PLRWIN'),
+(-1580010,'There will be no reprieve. My work here is nearly finished.',12451,1,0,'sathrovarr SAY_SATH_AGGRO'),
+(-1580011,'I\'m... never on... the losing... side...',12452,1,0,'sathrovarr SAY_SATH_DEATH'),
+(-1580012,'Your misery is my delight!',12453,1,0,'sathrovarr SAY_SATH_SPELL1'),
+(-1580013,'I will watch you bleed!',12454,1,0,'sathrovarr SAY_SATH_SPELL2'),
+(-1580014,'Pitious mortal!',12455,1,0,'sathrovarr SAY_SATH_SLAY1'),
+(-1580015,'Haven\'t you heard? I always win!',12456,1,0,'sathrovarr SAY_SATH_SLAY2'),
+(-1580016,'I have toyed with you long enough!',12457,1,0,'sathrovarr SAY_SATH_ENRAGE'),
+
+(-1580017,'Puny lizard! Death is the only answer you\'ll find here!',12458,1,0,'brutallus YELL_INTRO'),
+(-1580018,'Grah! Your magic is weak!',12459,1,0,'brutallus YELL_INTRO_BREAK_ICE'),
+(-1580019,'I will crush you!',12460,1,0,'brutallus YELL_INTRO_CHARGE'),
+(-1580020,'That was fun.',12461,1,0,'brutallus YELL_INTRO_KILL_MADRIGOSA'),
+(-1580021,'Come, try your luck!',12462,1,0,'brutallus YELL_INTRO_TAUNT'),
+(-1580022,'Ahh! More lambs to the slaughter!',12463,1,0,'brutallus YELL_AGGRO'),
+(-1580023,'Perish, insect!',12464,1,0,'brutallus YELL_KILL1'),
+(-1580024,'You are meat!',12465,1,0,'brutallus YELL_KILL2'),
+(-1580025,'Too easy!',12466,1,0,'brutallus YELL_KILL3'),
+(-1580026,'Bring the fight to me!',12467,1,0,'brutallus YELL_LOVE1'),
+(-1580027,'Another day, another glorious battle!',12468,1,0,'brutallus YELL_LOVE2'),
+(-1580028,'I live for this!',12469,1,0,'brutallus YELL_LOVE3'),
+(-1580029,'So much for a real challenge... Die!',12470,1,0,'brutallus YELL_BERSERK'),
+(-1580030,'Gah! Well done... Now... this gets... interesting...',12471,1,0,'brutallus YELL_DEATH'),
+
+(-1580031,'Hold, friends! There is information to be had before this devil meets his fate!',12472,1,0,'madrigosa YELL_MADR_ICE_BARRIER'),
+(-1580032,'Where is Anveena, demon? What has become of Kalec?',12473,1,0,'madrigosa YELL_MADR_INTRO'),
+(-1580033,'You will tell me where they are!',12474,1,0,'madrigosa YELL_MADR_ICE_BLOCK'),
+(-1580034,'Speak, I grow weary of asking!',12475,1,0,'madrigosa YELL_MADR_TRAP'),
+(-1580035,'Malygos, my lord! I did my best!',12476,1,0,'madrigosa YELL_MADR_DEATH');
 
 -- -1 585 000 MAGISTER'S TERRACE
-
+INSERT INTO `script_texts` (`entry`,`content_default`,`sound`,`type`,`language`,`comment`) VALUES
+(-1585000,'You only waste my time!',12378,1,0,'selin SAY_AGGRO'),
+(-1585001,'My hunger knows no bounds!',12381,1,0,'selin SAY_ENERGY'),
+(-1585002,'Yes! I am a god!',12382,1,0,'selin SAY_EMPOWERED'),
+(-1585003,'Enough distractions!',12388,1,0,'selin SAY_KILL_1'),
+(-1585004,'I am invincible!',12385,1,0,'selin SAY_KILL_2'),
+(-1585005,'No! More... I must have more!',12383,1,0,'selin SAY_DEATH'),
+(-1585006,'begins to channel from the nearby Fel Crystal...',0,3,0,'selin EMOTE_CRYSTAL'),
+
+(-1585007,'Drain...life!',12389,1,0,'vexallus SAY_AGGRO'),
+(-1585008,'Un...con...tainable.',12392,1,0,'vexallus SAY_ENERGY'),
+(-1585009,'Un...leash...',12390,1,0,'vexallus SAY_OVERLOAD'),
+(-1585010,'Con...sume.',12393,1,0,'vexallus SAY_KILL'),
+(-1585011,'discharges pure energy!',0,3,0,'vexallus EMOTE_DISCHARGE_ENERGY'),
+
+(-1585012,'Annihilate them!',12395,1,0,'delrissa SAY_AGGRO'),
+(-1585013,'Oh, the horror.',12398,1,0,'delrissa LackeyDeath1'),
+(-1585014,'Well, aren\'t you lucky?',12400,1,0,'delrissa LackeyDeath2'),
+(-1585015,'Now I\'m getting annoyed.',12401,1,0,'delrissa LackeyDeath3'),
+(-1585016,'Lackies be damned! I\'ll finish you myself!',12403,1,0,'delrissa LackeyDeath4'),
+(-1585017,'I call that a good start.',12405,1,0,'delrissa PlayerDeath1'),
+(-1585018,'I could have sworn there were more of you.',12407,1,0,'delrissa PlayerDeath2'),
+(-1585019,'Not really much of a group, anymore, is it?',12409,1,0,'delrissa PlayerDeath3'),
+(-1585020,'One is such a lonely number.',12410,1,0,'delrissa PlayerDeath4'),
+(-1585021,'It\'s been a kick, really.',12411,1,0,'delrissa PlayerDeath5'),
+(-1585022,'Not what I had... planned...',12397,1,0,'delrissa SAY_DEATH'),
+
+(-1585023,'Don\'t look so smug! I know what you\'re thinking, but Tempest Keep was merely a set back. Did you honestly believe I would trust the future to some blind, half-night elf mongrel? Oh no, he was merely an instrument, a stepping stone to a much larger plan! It has all led to this, and this time, you will not interfere!',12413,1,0,'kaelthas MT SAY_AGGRO'),
+(-1585024,'Vengeance burns!',12415,1,0,'kaelthas MT SAY_PHOENIX'),
+(-1585025,'Felomin ashal!',12417,1,0,'kaelthas MT SAY_FLAMESTRIKE'),
+(-1585026,'I\'ll turn your world... upside... down...',12418,1,0,'kaelthas MT SAY_GRAVITY_LAPSE'),
+(-1585027,'Master... grant me strength.',12419,1,0,'kaelthas MT SAY_TIRED'),
+(-1585028,'Do not... get too comfortable.',12420,1,0,'kaelthas MT SAY_RECAST_GRAVITY'),
+(-1585029,'My demise accomplishes nothing! The Master will have you! You will drown in your own blood! This world shall burn! Aaaghh!',12421,1,0,'kaelthas MT SAY_DEATH');
 
 -- 

trunk/src/bindings/scripts/scripts/zone/coilfang_resevoir/serpent_shrine/boss_fathomlord_karathress.cpp

@@ -26 +26 @@
 #include "../../../npc/npc_escortAI.h"
 
+#define SAY_AGGRO                   -1548021
+#define SAY_GAIN_BLESSING           -1548022
+#define SAY_GAIN_ABILITY1           -1548023
+#define SAY_GAIN_ABILITY2           -1548024
+#define SAY_GAIN_ABILITY3           -1548025
+#define SAY_SLAY1                   -1548026
+#define SAY_SLAY2                   -1548027
+#define SAY_SLAY3                   -1548028
+#define SAY_DEATH                   -1548029
+
 //Karathress spells
-#define SPELL_CATACLYSMIC_BOLT                  38441
-#define SPELL_POWER_OF_SHARKKIS                 38455
-#define SPELL_POWER_OF_TIDALVESS                38452
-#define SPELL_POWER_OF_CARIBDIS                 38451
-#define SPELL_ENRAGE                                    45078
-#define SPELL_SEAR_NOVA                                 38445
+#define SPELL_CATACLYSMIC_BOLT          38441
+#define SPELL_POWER_OF_SHARKKIS         38455
+#define SPELL_POWER_OF_TIDALVESS        38452
+#define SPELL_POWER_OF_CARIBDIS         38451
+#define SPELL_ENRAGE                    24318
+#define SPELL_SEAR_NOVA                 38445
 #define SPELL_BLESSING_OF_THE_TIDES             38449
 
 //Sharkkis spells
-#define SPELL_LEECHING_THROW                    29436
-#define SPELL_THE_BEAST_WITHIN                  38373
-#define SPELL_LEECHING_THROW                    29436
+#define SPELL_LEECHING_THROW            29436
+#define SPELL_THE_BEAST_WITHIN          38373
 #define SPELL_MULTISHOT                                 38366
-#define SPELL_THE_BEAST_WITHIN                  38373
 #define SPELL_SUMMON_FATHOM_LURKER              38433
 #define SPELL_SUMMON_FATHOM_SPOREBAT    38431
@@ -63 +71 @@
 
 //Yells and Quotes
-#define SAY_AGGRO                                               "Guards, attention! We have visitors..."
-#define SOUND_AGGRO                                             11277
-#define SAY_SLAY1                                               "I am rid of you."
-#define SOUND_SLAY1                                             11282
-#define SAY_SLAY2                                               "Land-dwelling scum!"
-#define SOUND_SLAY2                                             11284
-#define SAY_GAIN_ABILITY1                               "I am more powerful than ever!"
-#define SOUND_GAIN_ABILITY1                             11279
-#define SAY_GAIN_ABILITY2                               "Go on, kill them! I'll be the better for it!"
-#define SOUND_GAIN_ABILITY2                             11280
-#define SAY_GAIN_ABILITY3                               "More knowledge, more power!"
-#define SOUND_GAIN_ABILITY3                             11281
-#define SAY_DEATH                                               "Her ... excellency ... awaits!"
-#define SOUND_DEATH                                             11285
 #define SAY_GAIN_BLESSING_OF_TIDES              "Your overconfidence will be your undoing! Guards, lend me your strength!"
 #define SOUND_GAIN_BLESSING_OF_TIDES    11278
@@ -158 +152 @@
     void EventSharkkisDeath()
     {
-        DoPlaySoundToSet(m_creature, SOUND_GAIN_ABILITY1);
-        DoYell(SAY_GAIN_ABILITY1, LANG_UNIVERSAL, NULL);
+        DoScriptText(SAY_GAIN_ABILITY1, m_creature);
         DoCast(m_creature, SPELL_POWER_OF_SHARKKIS);
     }
@@ -165 +158 @@
     void EventTidalvessDeath()
     {
-        DoPlaySoundToSet(m_creature, SOUND_GAIN_ABILITY2);
-        DoYell(SAY_GAIN_ABILITY2, LANG_UNIVERSAL, NULL);
+        DoScriptText(SAY_GAIN_ABILITY2, m_creature);
         DoCast(m_creature, SPELL_POWER_OF_TIDALVESS);
     }
@@ -172 +164 @@
     void EventCaribdisDeath()
     {
-        DoPlaySoundToSet(m_creature, SOUND_GAIN_ABILITY3);
-        DoYell(SAY_GAIN_ABILITY3, LANG_UNIVERSAL, NULL);
+        DoScriptText(SAY_GAIN_ABILITY3, m_creature);
         DoCast(m_creature, SPELL_POWER_OF_CARIBDIS);
     }
@@ -179 +170 @@
     void GetAdvisors()
     {
-        if(!pInstance)
+        if (!pInstance)
             return;
 
@@ -189 +180 @@
     void StartEvent(Unit *who)
     {
-        if(!pInstance)
+        if (!pInstance)
             return;
 
         GetAdvisors();
 
-        DoPlaySoundToSet(m_creature, SOUND_AGGRO);
-        DoYell(SAY_AGGRO, LANG_UNIVERSAL, NULL);
+        DoScriptText(SAY_AGGRO, m_creature);
                 DoZoneInCombat();
 
@@ -206 +196 @@
         switch(rand()%3)
         {
-            case 0:
-                DoPlaySoundToSet(m_creature, SOUND_SLAY1);
-                DoYell(SAY_SLAY1, LANG_UNIVERSAL, NULL);
-                break;
-            case 1:
-                DoPlaySoundToSet(m_creature, SOUND_SLAY2);
-                                DoYell(SAY_SLAY2, LANG_UNIVERSAL, NULL);
-                break;
+            case 0: DoScriptText(SAY_SLAY1, m_creature); break;
+            case 1: DoScriptText(SAY_SLAY2, m_creature); break;
+            case 2: DoScriptText(SAY_SLAY3, m_creature); break;
         }
     }
@@ -219 +204 @@
     void JustDied(Unit *killer)
     {
-        DoPlaySoundToSet(m_creature, SOUND_DEATH);
-        DoYell(SAY_DEATH, LANG_UNIVERSAL, NULL);
-
-        if( pInstance )
-            pInstance->SetData(DATA_FATHOMLORDKARATHRESSEVENT, DONE);
+        DoScriptText(SAY_DEATH, m_creature);
+
+        if (pInstance)
+            pInstance->SetData(DATA_FATHOMLORDKARATHRESSEVENT, NOT_STARTED);
 
         //support for quest 10944
@@ -237 +221 @@
     {
         //Only if not incombat check if the event is started
-        if(!InCombat && pInstance && pInstance->GetData(DATA_KARATHRESSEVENT))
+        if (!InCombat && pInstance && pInstance->GetData(DATA_KARATHRESSEVENT))
         {
             Unit* target = Unit::GetUnit((*m_creature), pInstance->GetData64(DATA_KARATHRESSEVENT_STARTER));
 
-            if(target)
+            if (target)
             {
                 AttackStart(target);
@@ -253 +237 @@
 
         //someone evaded!
-        if(pInstance && !pInstance->GetData(DATA_KARATHRESSEVENT))
+        if (pInstance && !pInstance->GetData(DATA_KARATHRESSEVENT))
                 {
             EnterEvadeMode();
@@ -260 +244 @@
 
         //CataclysmicBolt_Timer
-        if(CataclysmicBolt_Timer < diff)
+        if (CataclysmicBolt_Timer < diff)
         {
             //select a random unit other than the main tank
@@ -266 +250 @@
 
             //if there aren't other units, cast on the tank
-            if(!target)
+            if (!target)
                 target = m_creature->getVictim();
 
@@ -283 +267 @@
 
         //Enrage_Timer
-        if(Enrage_Timer < diff)
+        if (Enrage_Timer < diff)
         {
             DoCast(m_creature, SPELL_ENRAGE);
@@ -364 +348 @@
     void JustDied(Unit *victim)
     {
-        if(pInstance)
+        if (pInstance)
         {
             Creature *Karathress = NULL;
             Karathress = (Creature*)(Unit::GetUnit((*m_creature), pInstance->GetData64(DATA_KARATHRESS)));
 
-            if(Karathress)
-                                if(!m_creature->isAlive() && Karathress)
+            if (Karathress)
+                ((boss_fathomlord_karathressAI*)Karathress->AI())->EventSharkkisDeath();
                                         ((boss_fathomlord_karathressAI*)Karathress->AI())->EventSharkkisDeath();
         }
@@ -377 +361 @@
     void Aggro(Unit *who)
     {
-        if(pInstance)
+        if (pInstance)
         {
             pInstance->SetData64(DATA_KARATHRESSEVENT_STARTER, who->GetGUID());
@@ -387 +371 @@
     {
         //Only if not incombat check if the event is started
-        if(!InCombat && pInstance && pInstance->GetData(DATA_KARATHRESSEVENT))
+        if (!InCombat && pInstance && pInstance->GetData(DATA_KARATHRESSEVENT))
         {
             Unit* target = Unit::GetUnit((*m_creature), pInstance->GetData64(DATA_KARATHRESSEVENT_STARTER));
 
-            if(target)
+            if (target)
             {
                 AttackStart(target);
@@ -402 +386 @@
 
         //someone evaded!
-        if(pInstance && !pInstance->GetData(DATA_KARATHRESSEVENT))
+        if (pInstance && !pInstance->GetData(DATA_KARATHRESSEVENT))
                 {
                         EnterEvadeMode();
@@ -488 +472 @@
                 Earthbind_Timer = 45000;
 
-        if( pInstance )
+        if (pInstance)
             pInstance->SetData(DATA_KARATHRESSEVENT, NOT_STARTED);
     }
@@ -494 +478 @@
     void JustDied(Unit *victim)
     {
-        if(pInstance)
+        if (pInstance)
         {
             Creature *Karathress = NULL;
             Karathress = (Creature*)(Unit::GetUnit((*m_creature), pInstance->GetData64(DATA_KARATHRESS)));
 
-            if(Karathress)
+            if (Karathress)
                                 if(!m_creature->isAlive() && Karathress)
                                         ((boss_fathomlord_karathressAI*)Karathress->AI())->EventTidalvessDeath();
@@ -507 +491 @@
     void Aggro(Unit *who)
     {
-        if(pInstance)
+        if (pInstance)
         {
             pInstance->SetData64(DATA_KARATHRESSEVENT_STARTER, who->GetGUID());
@@ -518 +502 @@
     {
         //Only if not incombat check if the event is started
-        if(!InCombat && pInstance && pInstance->GetData(DATA_KARATHRESSEVENT))
+        if (!InCombat && pInstance && pInstance->GetData(DATA_KARATHRESSEVENT))
         {
             Unit* target = Unit::GetUnit((*m_creature), pInstance->GetData64(DATA_KARATHRESSEVENT_STARTER));
 
-            if(target)
+            if (target)
             {
                 AttackStart(target);
@@ -533 +517 @@
 
         //someone evaded!
-        if(pInstance && !pInstance->GetData(DATA_KARATHRESSEVENT))
+        if (pInstance && !pInstance->GetData(DATA_KARATHRESSEVENT))
                 {
             EnterEvadeMode();
@@ -545 +529 @@
 
         //FrostShock_Timer
-        if(FrostShock_Timer < diff)
+        if (FrostShock_Timer < diff)
         {
             DoCast(m_creature->getVictim(), SPELL_FROST_SHOCK);
@@ -604 +588 @@
                 Cyclone_Timer = 30000+rand()%10000;
 
-        if(pInstance)
+        if (pInstance)
             pInstance->SetData(DATA_KARATHRESSEVENT, NOT_STARTED);
     }
@@ -610 +594 @@
     void JustDied(Unit *victim)
     {
-        if(pInstance)
+        if (pInstance)
         {
             Creature *Karathress = NULL;
             Karathress = (Creature*)(Unit::GetUnit((*m_creature), pInstance->GetData64(DATA_KARATHRESS)));
 
-            if(Karathress)
+            if (Karathress)
                                 if(!m_creature->isAlive() && Karathress)
                                         ((boss_fathomlord_karathressAI*)Karathress->AI())->EventCaribdisDeath();
@@ -623 +607 @@
     void Aggro(Unit *who)
     {
-        if(pInstance)
+        if (pInstance)
         {
             pInstance->SetData64(DATA_KARATHRESSEVENT_STARTER, who->GetGUID());
@@ -633 +617 @@
     {
         //Only if not incombat check if the event is started
-        if(!InCombat && pInstance && pInstance->GetData(DATA_KARATHRESSEVENT))
+        if (!InCombat && pInstance && pInstance->GetData(DATA_KARATHRESSEVENT))
         {
             Unit* target = Unit::GetUnit((*m_creature), pInstance->GetData64(DATA_KARATHRESSEVENT_STARTER));
 
-            if(target)
+            if (target)
             {
                 AttackStart(target);
@@ -648 +632 @@
 
         //someone evaded!
-        if(pInstance && !pInstance->GetData(DATA_KARATHRESSEVENT))
+        if (pInstance && !pInstance->GetData(DATA_KARATHRESSEVENT))
                 {
             EnterEvadeMode();
@@ -655 +639 @@
 
         //WaterBoltVolley_Timer
-        if(WaterBoltVolley_Timer < diff)
+        if (WaterBoltVolley_Timer < diff)
         {
             DoCast(m_creature->getVictim(), SPELL_WATER_BOLT_VOLLEY);
@@ -662 +646 @@
 
         //TidalSurge_Timer
-        if(TidalSurge_Timer < diff)
+        if (TidalSurge_Timer < diff)
         {
             DoCast(m_creature->getVictim(), SPELL_TIDAL_SURGE);
@@ -706 +690 @@
                 }else Heal_Timer -= diff;
 
-                DoMeleeAttackIfReady();
-        }
+        DoMeleeAttackIfReady();
+    }
 
         Unit* selectAdvisorUnit()

trunk/src/bindings/scripts/scripts/zone/coilfang_resevoir/serpent_shrine/boss_hydross_the_unstable.cpp

@@ -24 +24 @@
 #include "precompiled.h"
 #include "def_serpent_shrine.h"
+
+#define SAY_AGGRO                   -1548000
+#define SAY_SWITCH_TO_CLEAN         -1548001
+#define SAY_CLEAN_SLAY1             -1548002
+#define SAY_CLEAN_SLAY2             -1548003
+#define SAY_CLEAN_DEATH             -1548004
+#define SAY_SWITCH_TO_CORRUPT       -1548005
+#define SAY_CORRUPT_SLAY1           -1548006
+#define SAY_CORRUPT_SLAY2           -1548007
+#define SAY_CORRUPT_DEATH           -1548008
 
 #define SWITCH_RADIUS               18
@@ -52 +62 @@
 #define ENTRY_TAINTED_SPAWN         22036
 
-#define SAY_AGGRO                   "I cannot allow you to interfere!"
-#define SAY_SWITCH_TO_CLEAN         "Better, much better."
-#define SAY_CLEAN_SLAY1             "They have forced me to this..."
-#define SAY_CLEAN_SLAY2             "I have no choice."
-#define SAY_CLEAN_DEATH             "I am... released..."
-#define SAY_SWITCH_TO_CORRUPT       "Aaghh, the poison..."
-#define SAY_CORRUPT_SLAY1           "I will purge you from this place."
-#define SAY_CORRUPT_SLAY2           "You are no better than they!"
-#define SAY_CORRUPT_DEATH           "You are the disease, not I"
-
-#define SOUND_AGGRO                 11289
-#define SOUND_SWITCH_TO_CLEAN       11290
-#define SOUND_CLEAN_SLAY1           11291
-#define SOUND_CLEAN_SLAY2           11292
-#define SOUND_CLEAN_DEATH           11293
-#define SOUND_SWITCH_TO_CORRUPT     11297
-#define SOUND_CORRUPT_SLAY1         11298
-#define SOUND_CORRUPT_SLAY2         11299
-#define SOUND_CORRUPT_DEATH         11300
-
 #define HYDROSS_X                   -239.439
 #define HYDROSS_Y                   -363.481
@@ -122 +112 @@
         m_creature->SetUInt32Value(UNIT_FIELD_DISPLAYID, MODEL_CLEAN);
 
-        if( pInstance )
+        if (pInstance)
             pInstance->SetData(DATA_HYDROSSTHEUNSTABLEEVENT, NOT_STARTED);
     }
@@ -128 +118 @@
     void Aggro(Unit *who)
     {
-        DoYell(SAY_AGGRO, LANG_UNIVERSAL, NULL);
-        DoPlaySoundToSet(m_creature, SOUND_AGGRO);
-
-        if( pInstance )
+        DoScriptText(SAY_AGGRO, m_creature);
+
+        if (pInstance)
             pInstance->SetData(DATA_HYDROSSTHEUNSTABLEEVENT, IN_PROGRESS);
     }
@@ -137 +126 @@
     void KilledUnit(Unit *victim)
     {
-        if(CorruptedForm)
+        if (CorruptedForm)
+        {
             switch(rand()%2)
             {
-                case 0:
-                    DoYell(SAY_CORRUPT_SLAY1, LANG_UNIVERSAL, NULL);
-                    DoPlaySoundToSet(m_creature, SOUND_CORRUPT_SLAY1);
-                    break;
-                case 1:
-                    DoYell(SAY_CORRUPT_SLAY2, LANG_UNIVERSAL, NULL);
-                    DoPlaySoundToSet(m_creature, SOUND_CORRUPT_SLAY2);
-                    break;
+                case 0: DoScriptText(SAY_CORRUPT_SLAY1, m_creature); break;
+                case 1: DoScriptText(SAY_CORRUPT_SLAY2, m_creature); break;
             }
-            else
-            {
-                switch(rand()%2)
-                {
-                    case 0:
-                        DoYell(SAY_CLEAN_SLAY1, LANG_UNIVERSAL, NULL);
-                        DoPlaySoundToSet(m_creature, SOUND_CLEAN_SLAY1);
-                        break;
-                    case 1:
-                        DoYell(SAY_CLEAN_SLAY2, LANG_UNIVERSAL, NULL);
-                        DoPlaySoundToSet(m_creature, SOUND_CLEAN_SLAY2);
-                        break;
-                }
-            }
-    }
-
-    void JustSummoned(Creature* summoned)
-    {
-        if( summoned->GetEntry() == ENTRY_PURE_SPAWN )
-            summoned->ApplySpellImmune(0, IMMUNITY_SCHOOL, SPELL_SCHOOL_MASK_FROST, true);
-        if( summoned->GetEntry() == ENTRY_TAINTED_SPAWN )
-            summoned->ApplySpellImmune(0, IMMUNITY_SCHOOL, SPELL_SCHOOL_MASK_NATURE, true);
-
-        summoned->CastSpell(summoned,SPELL_ELEMENTAL_SPAWNIN,true);
-    }
-
-    void JustDied(Unit *victim)
-    {
-        if( CorruptedForm )
-        {
-            DoYell(SAY_CORRUPT_DEATH, LANG_UNIVERSAL, NULL);
-            DoPlaySoundToSet(m_creature, SOUND_CORRUPT_DEATH);
         }
         else
         {
-            DoYell(SAY_CLEAN_DEATH, LANG_UNIVERSAL, NULL);
-            DoPlaySoundToSet(m_creature, SOUND_CLEAN_DEATH);
+            switch(rand()%2)
+            {
+                case 0: DoScriptText(SAY_CLEAN_SLAY1, m_creature); break;
+                case 1: DoScriptText(SAY_CLEAN_SLAY2, m_creature); break;
+            }
         }
-
-        if( pInstance )
+    }
+
+    void JustSummoned(Creature* summoned)
+    {
+        if (summoned->GetEntry() == ENTRY_PURE_SPAWN)
+            summoned->ApplySpellImmune(0, IMMUNITY_SCHOOL, SPELL_SCHOOL_MASK_FROST, true);
+        if (summoned->GetEntry() == ENTRY_TAINTED_SPAWN)
+            summoned->ApplySpellImmune(0, IMMUNITY_SCHOOL, SPELL_SCHOOL_MASK_NATURE, true);
+
+        summoned->CastSpell(summoned,SPELL_ELEMENTAL_SPAWNIN,true);
+    }
+
+    void JustDied(Unit *victim)
+    {
+        if (CorruptedForm)
+            DoScriptText(SAY_CORRUPT_DEATH, m_creature);
+        else
+            DoScriptText(SAY_CLEAN_DEATH, m_creature);
+
+        if (pInstance)
             pInstance->SetData(DATA_HYDROSSTHEUNSTABLEEVENT, NOT_STARTED);
     }
@@ -199 +172 @@
 
         // corrupted form
-        if( CorruptedForm )
+        if (CorruptedForm)
         {
             //MarkOfCorruption_Timer
-            if( MarkOfCorruption_Timer < diff )
-            {
-                if( MarkOfCorruption_Count <= 5 )
+            if (MarkOfCorruption_Timer < diff)
+            {
+                if (MarkOfCorruption_Count <= 5)
                 {
                     uint32 mark_spell;
@@ -220 +193 @@
                     DoCast(m_creature->getVictim(), mark_spell);
 
-                    if( MarkOfCorruption_Count < 5 )
+                    if (MarkOfCorruption_Count < 5)
                         MarkOfCorruption_Count++;
                 }
@@ -228 +201 @@
 
             //VileSludge_Timer
-            if( VileSludge_Timer < diff )
+            if (VileSludge_Timer < diff)
             {
                 Unit *target = SelectUnit(SELECT_TARGET_RANDOM, 0);
-                if( target )
+                if (target)
                     DoCast(target, SPELL_VILE_SLUDGE);
 
@@ -238 +211 @@
 
             //PosCheck_Timer
-            if( PosCheck_Timer < diff )
-            {
-                if( m_creature->GetDistance2d(HYDROSS_X, HYDROSS_Y) < SWITCH_RADIUS )
+            if (PosCheck_Timer < diff)
+            {
+                if (m_creature->GetDistance2d(HYDROSS_X, HYDROSS_Y) < SWITCH_RADIUS)
                 {
                     // switch to clean form
@@ -247 +220 @@
                     MarkOfHydross_Count = 0;
 
-                    DoYell(SAY_SWITCH_TO_CLEAN, LANG_UNIVERSAL, NULL);
-                    DoPlaySoundToSet(m_creature, SOUND_SWITCH_TO_CLEAN);
+                    DoScriptText(SAY_SWITCH_TO_CLEAN, m_creature);
                     DoResetThreat();
 
@@ -269 +241 @@
         {
             //MarkOfHydross_Timer
-            if( MarkOfHydross_Timer < diff )
-            {
-                if( MarkOfHydross_Count <= 5 )
+            if (MarkOfHydross_Timer < diff)
+            {
+                if (MarkOfHydross_Count <= 5)
                 {
                     uint32 mark_spell;
@@ -287 +259 @@
                     DoCast(m_creature->getVictim(), mark_spell);
 
-                    if( MarkOfHydross_Count < 5 )
+                    if (MarkOfHydross_Count < 5)
                         MarkOfHydross_Count++;
                 }
@@ -295 +267 @@
 
             //WaterTomb_Timer
-            if( WaterTomb_Timer < diff )
+            if (WaterTomb_Timer < diff)
             {
                 Unit *target = SelectUnit(SELECT_TARGET_RANDOM, 0);
-                if( target )
+                if (target)
                     DoCast(target, SPELL_WATER_TOMB);
 
@@ -305 +277 @@
 
             //PosCheck_Timer
-            if( PosCheck_Timer < diff )
-            {
-                if( m_creature->GetDistance2d(HYDROSS_X, HYDROSS_Y) >= SWITCH_RADIUS )
+            if (PosCheck_Timer < diff)
+            {
+                if (m_creature->GetDistance2d(HYDROSS_X, HYDROSS_Y) >= SWITCH_RADIUS)
                 {
                     // switch to corrupted form
@@ -314 +286 @@
                     CorruptedForm = true;
 
-                    DoYell(SAY_SWITCH_TO_CORRUPT, LANG_UNIVERSAL, NULL);
-                    DoPlaySoundToSet(m_creature, SOUND_SWITCH_TO_CORRUPT);
+                    DoScriptText(SAY_SWITCH_TO_CORRUPT, m_creature);
                     DoResetThreat();
 
@@ -334 +305 @@
 
         //EnrageTimer
-        if( EnrageTimer < diff )
+        if (EnrageTimer < diff)
         {
             DoCast(m_creature, SPELL_ENRAGE);

trunk/src/bindings/scripts/scripts/zone/coilfang_resevoir/serpent_shrine/boss_lady_vashj.cpp

@@ -28 +28 @@
 #include "Spell.h"
 
-#define SPELL_MULTI_SHOT              38310
-#define SPELL_SHOCK_BLAST             38509
-#define SPELL_ENTANGLE                38316
-#define SPELL_STATIC_CHARGE_TRIGGER   38280
-#define SPELL_FORKED_LIGHTNING        40088
-#define SPELL_SHOOT                   40873
-#define SPELL_POISON_BOLT             40095
-#define SPELL_TOXIC_SPORES            38575
-#define SPELL_MAGIC_BARRIER           38112
-
-#define SAY_INTRO                     "Water is life. It has become a rare commodity here in Outland. A commodity that we alone shall control. We are the Highborne, and the time has come at last for us to retake our rightful place in the world!"
-#define SAY_AGGRO1                    "I'll split you from stem to stern! "
-#define SAY_AGGRO2                    "Victory to Lord Illidan!"
-#define SAY_AGGRO3                    "I spit on you, surface filth!"
-#define SAY_AGGRO4                    "Death to the outsiders!"
-#define SAY_PHASE1                    "I did not wish to lower myself by engaging your kind, but you leave me little choice!"
-#define SAY_PHASE2                    "The time is now! Leave none standing!"
-#define SAY_PHASE3                    "You may want to take cover."
-#define SAY_BOWSHOT1                  "Straight to the heart!"
-#define SAY_BOWSHOT2                  "Seek your mark!"
-#define SAY_SLAY1                     "Your time ends now!"
-#define SAY_SLAY2                     "You have failed!"
-#define SAY_DEATH                     "Lord Illidan, I... I am... sorry."
-
-#define SOUND_INTRO                   11531
-#define SOUND_AGGRO1                  11532
-#define SOUND_AGGRO2                  11533
-#define SOUND_AGGRO3                  11534
-#define SOUND_AGGRO4                  11535
-#define SOUND_PHASE1                  11538
-#define SOUND_PHASE2                  11539
-#define SOUND_PHASE3                  11540
-#define SOUND_BOWSHOT1                11536
-#define SOUND_BOWSHOT2                11537
-#define SOUND_SLAY1                   11541
-#define SOUND_SLAY2                   11542
-#define SOUND_DEATH                   11544
-
-#define MIDDLE_X                      30.134
-#define MIDDLE_Y                      -923.65
-#define MIDDLE_Z                      42.9
-
-#define SPOREBAT_X                    30.977156
-#define SPOREBAT_Y                    -925.297761
-#define SPOREBAT_Z                    77.176567
-#define SPOREBAT_O                    5.223932
-
-#define SHIED_GENERATOR_CHANNEL       19870
-#define ENCHANTED_ELEMENTAL           21958
-#define TAINTED_ELEMENTAL             22009
-#define COILFANG_STRIDER              22056
-#define COILFANG_ELITE                22055
-#define TOXIC_SPOREBAT               22140
+#define SAY_INTRO                   -1548042
+#define SAY_AGGRO1                  -1548043
+#define SAY_AGGRO2                  -1548044
+#define SAY_AGGRO3                  -1548045
+#define SAY_AGGRO4                  -1548046
+#define SAY_PHASE1                  -1548047
+#define SAY_PHASE2                  -1548048
+#define SAY_PHASE3                  -1548049
+#define SAY_BOWSHOT1                -1548050
+#define SAY_BOWSHOT2                -1548051
+#define SAY_SLAY1                   -1548052
+#define SAY_SLAY2                   -1548053
+#define SAY_SLAY3                   -1548054
+#define SAY_DEATH                   -1548055
+
+#define SPELL_MULTI_SHOT            38310
+#define SPELL_SHOCK_BLAST           38509
+#define SPELL_ENTANGLE              38316
+#define SPELL_STATIC_CHARGE_TRIGGER 38280
+#define SPELL_FORKED_LIGHTNING      40088
+#define SPELL_SHOOT                 40873
+#define SPELL_POISON_BOLT           40095
+#define SPELL_TOXIC_SPORES          38575
+#define SPELL_MAGIC_BARRIER         38112
+
+#define MIDDLE_X                    30.134
+#define MIDDLE_Y                    -923.65
+#define MIDDLE_Z                    42.9
+
+#define SPOREBAT_X                  30.977156
+#define SPOREBAT_Y                  -925.297761
+#define SPOREBAT_Z                  77.176567
+#define SPOREBAT_O                  5.223932
+
+#define SHIED_GENERATOR_CHANNEL     19870
+#define ENCHANTED_ELEMENTAL         21958
+#define TAINTED_ELEMENTAL           22009
+#define COILFANG_STRIDER            22056
+#define COILFANG_ELITE              22055
+#define TOXIC_SPOREBAT             22140
 
 float ElementPos[8][4] =
@@ -214 +201 @@
                 m_creature->GetMotionMaster()->Clear(false);
                 m_creature->SetFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_NOT_SELECTABLE);
-                DoYell(SAY_INTRO,LANG_UNIVERSAL,NULL);
-                DoPlaySoundToSet(m_creature, SOUND_INTRO);
+                DoScriptText(SAY_INTRO, m_creature);
                 m_creature->SetUInt32Value(UNIT_NPC_EMOTESTATE, EMOTE_STATE_TALK);
                 AggroTargetGUID = who->GetGUID();
@@ -225 +211 @@
     void KilledUnit(Unit *victim)
     {
-        switch(rand()%2)
-        {
-            case 0:
-                DoYell(SAY_SLAY1, LANG_UNIVERSAL, NULL);
-                DoPlaySoundToSet(m_creature, SOUND_SLAY1);
-                break;
-
-            case 1:
-                DoPlaySoundToSet(m_creature, SOUND_SLAY1);
-                DoYell(SAY_SLAY2, LANG_UNIVERSAL, NULL);
-                break;
+        switch(rand()%3)
+        {
+            case 0: DoScriptText(SAY_SLAY1, m_creature); break;
+            case 1: DoScriptText(SAY_SLAY2, m_creature); break;
+            case 2: DoScriptText(SAY_SLAY3, m_creature); break;
         }
     }
@@ -241 +221 @@
     void JustDied(Unit *victim)
     {
-        DoPlaySoundToSet(m_creature, SOUND_DEATH);
-        DoYell(SAY_DEATH, LANG_UNIVERSAL, NULL);
+        DoScriptText(SAY_DEATH, m_creature);
 
         if(pInstance)
@@ -252 +231 @@
         switch(rand()%4)
         {
-            case 0:
-                DoPlaySoundToSet(m_creature, SOUND_AGGRO1);
-                DoYell(SAY_AGGRO1, LANG_UNIVERSAL, NULL);
-                break;
-            case 1:
-                DoPlaySoundToSet(m_creature, SOUND_AGGRO2);
-                DoYell(SAY_AGGRO2, LANG_UNIVERSAL, NULL);
-                break;
-            case 2:
-                DoPlaySoundToSet(m_creature, SOUND_AGGRO3);
-                DoYell(SAY_AGGRO3, LANG_UNIVERSAL, NULL);
-                break;
-            case 3:
-                DoPlaySoundToSet(m_creature, SOUND_AGGRO4);
-                DoYell(SAY_AGGRO4, LANG_UNIVERSAL, NULL);
-                break;
+            case 0: DoScriptText(SAY_AGGRO1, m_creature); break;
+            case 1: DoScriptText(SAY_AGGRO2, m_creature); break;
+            case 2: DoScriptText(SAY_AGGRO3, m_creature); break;
+            case 3: DoScriptText(SAY_AGGRO4, m_creature); break;
         }
 
@@ -298 +265 @@
             switch(rand()%2)
             {
-                case 0:
-                    DoPlaySoundToSet(m_creature, SOUND_BOWSHOT1);
-                    DoYell(SAY_BOWSHOT1, LANG_UNIVERSAL, NULL);
-                    break;
-                case 1:
-                    DoPlaySoundToSet(m_creature, SOUND_BOWSHOT2);
-                    DoYell(SAY_BOWSHOT2, LANG_UNIVERSAL, NULL);
-                    break;
+                case 0: DoScriptText(SAY_BOWSHOT1, m_creature); break;
+                case 1: DoScriptText(SAY_BOWSHOT2, m_creature); break;
             }
         }
@@ -332 +293 @@
                                 switch(rand()%4)
                                 {
-                                case 0:
-                                        DoPlaySoundToSet(m_creature, SOUND_AGGRO1);
-                                        DoYell(SAY_AGGRO1, LANG_UNIVERSAL, NULL);
-                                        break;
-                                case 1:
-                                        DoPlaySoundToSet(m_creature, SOUND_AGGRO2);
-                                        DoYell(SAY_AGGRO2, LANG_UNIVERSAL, NULL);
-                                        break;
-                                case 2:
-                                        DoPlaySoundToSet(m_creature, SOUND_AGGRO3);
-                                        DoYell(SAY_AGGRO3, LANG_UNIVERSAL, NULL);
-                                        break;
-                                case 3:
-                                        DoPlaySoundToSet(m_creature, SOUND_AGGRO4);
-                                        DoYell(SAY_AGGRO4, LANG_UNIVERSAL, NULL);
-                                        break;
+                    case 0: DoScriptText(SAY_AGGRO1, m_creature); break;
+                    case 1: DoScriptText(SAY_AGGRO2, m_creature); break;
+                    case 2: DoScriptText(SAY_AGGRO3, m_creature); break;
+                    case 3: DoScriptText(SAY_AGGRO4, m_creature); break;
                                 }
                                 Phase = 1;
@@ -439 +388 @@
                     }
 
-                    DoPlaySoundToSet(m_creature, SOUND_PHASE2);
-                    DoYell(SAY_PHASE2, LANG_UNIVERSAL, NULL);
+                    DoScriptText(SAY_PHASE2, m_creature);
                 }
             }
@@ -591 +539 @@
                     m_creature->RemoveAurasDueToSpell(SPELL_MAGIC_BARRIER);
 
-                    DoPlaySoundToSet(m_creature, SOUND_PHASE3);
-                    DoYell(SAY_PHASE3, LANG_UNIVERSAL, NULL);
+                    DoScriptText(SAY_PHASE3, m_creature);
 
                     Phase = 3;

trunk/src/bindings/scripts/scripts/zone/coilfang_resevoir/serpent_shrine/boss_leotheras_the_blind.cpp

@@ -25 +25 @@
 #include "def_serpent_shrine.h"
 
+#define SAY_AGGRO               -1548009
+#define SAY_SWITCH_TO_DEMON     -1548010
+#define SAY_INNER_DEMONS        -1548011
+#define SAY_DEMON_SLAY1         -1548012
+#define SAY_DEMON_SLAY2         -1548013
+#define SAY_DEMON_SLAY3         -1548014
+#define SAY_NIGHTELF_SLAY1      -1548015
+#define SAY_NIGHTELF_SLAY2      -1548016
+#define SAY_NIGHTELF_SLAY3      -1548017
+#define SAY_FINAL_FORM          -1548018
+#define SAY_FREE                -1548019
+#define SAY_DEATH               -1548020
+
 #define SPELL_WHIRLWIND         40653
 #define SPELL_CHAOS_BLAST       37675
 //#define SPELL_INSIDIOUS_WHISPER 37676                       // useless - dummy effect that can't be implemented
 
-#define SAY_AGGRO               "Finally my banishment ends!"
-#define SAY_SWITCH_TO_DEMON     "Be gone trifling elf. I'm in control now."
-#define SAY_INNER_DEMONS        "We all have our demons..."
-#define SAY_DEMON_SLAY1         "I have no equal."
-#define SAY_DEMON_SLAY2         "Perish, mortal."
-#define SAY_DEMON_SLAY3         "Yes, YES! Ahahah!"
-#define SAY_NIGHTELF_SLAY1      "Kill! KILL!"
-#define SAY_NIGHTELF_SLAY2      "That's right! Yes!"
-#define SAY_NIGHTELF_SLAY3      "Who's the master now?"
-#define SAY_FINAL_FORM          "No! NO! What have you done?! I am the master, do you hear me? I... aaghh... Can't... contain him..."
-#define SAY_FREE                "At last I am liberated. It has been too long since I have tasted true freedom!"
-#define SAY_DEATH               "You cannot kill me! Fools, I'll be back! I'll... aarghh..."
-
-#define SOUND_AGGRO             11312
-#define SOUND_SWITCH_TO_DEMON   11304
-#define SOUND_INNER_DEMONS      11305
-#define SOUND_DEMON_SLAY1       11306
-#define SOUND_DEMON_SLAY2       11307
-#define SOUND_DEMON_SLAY3       11308
-#define SOUND_NIGHTELF_SLAY1    11314
-#define SOUND_NIGHTELF_SLAY2    11315
-#define SOUND_NIGHTELF_SLAY3    11316
-#define SOUND_FINAL_FORM        11313
-#define SOUND_FREE              11309
-#define SOUND_DEATH             11317
-
 #define MODEL_DEMON             14555
 #define MODEL_NIGHTELF          20514
@@ -65 +52 @@
     boss_leotheras_the_blindAI(Creature *c) : ScriptedAI(c)
     {
-        pInstance = (c->GetInstanceData()) ? ((ScriptedInstance*)c->GetInstanceData()) : NULL;
+        pInstance = ((ScriptedInstance*)c->GetInstanceData());
         Demon = 0;
         Reset();
@@ -92 +79 @@
         m_creature->SetUInt32Value(UNIT_FIELD_DISPLAYID, MODEL_NIGHTELF);
 
-        if(pInstance)
-            pInstance->SetData(DATA_LEOTHERASTHEBLINDEVENT, 0);
+        if (pInstance)
+            pInstance->SetData(DATA_LEOTHERASTHEBLINDEVENT, NOT_STARTED);
     }
 
     void StartEvent()
     {
-        DoYell(SAY_AGGRO, LANG_UNIVERSAL, NULL);
-        DoPlaySoundToSet(m_creature, SOUND_AGGRO);
-
-        if(pInstance)
-            pInstance->SetData(DATA_LEOTHERASTHEBLINDEVENT, 1);
+        DoScriptText(SAY_AGGRO, m_creature);
+
+        if (pInstance)
+            pInstance->SetData(DATA_LEOTHERASTHEBLINDEVENT, IN_PROGRESS);
     }
 
     void KilledUnit(Unit *victim)
     {
-        if(victim->GetTypeId() != TYPEID_PLAYER)
-            return;
-
-        if(DemonForm)
+        if (victim->GetTypeId() != TYPEID_PLAYER)
+            return;
+
+        if (DemonForm)
+        {
             switch(rand()%3)
             {
-                case 0:
-                    DoYell(SAY_DEMON_SLAY1, LANG_UNIVERSAL, NULL);
-                    DoPlaySoundToSet(m_creature, SOUND_DEMON_SLAY1);
-                    break;
-                case 1:
-                    DoYell(SAY_DEMON_SLAY2, LANG_UNIVERSAL, NULL);
-                    DoPlaySoundToSet(m_creature, SOUND_DEMON_SLAY2);
-                    break;
-                case 2:
-                    DoYell(SAY_DEMON_SLAY3, LANG_UNIVERSAL, NULL);
-                    DoPlaySoundToSet(m_creature, SOUND_DEMON_SLAY3);
-                    break;
-            }
-            else
-                switch(rand()%3)
-                {
-                    case 0:
-                        DoYell(SAY_NIGHTELF_SLAY1, LANG_UNIVERSAL, NULL);
-                        DoPlaySoundToSet(m_creature, SOUND_NIGHTELF_SLAY1);
-                        break;
-                    case 1:
-                        DoYell(SAY_NIGHTELF_SLAY2, LANG_UNIVERSAL, NULL);
-                        DoPlaySoundToSet(m_creature, SOUND_NIGHTELF_SLAY2);
-                        break;
-                    case 2:
-                        DoYell(SAY_NIGHTELF_SLAY3, LANG_UNIVERSAL, NULL);
-                        DoPlaySoundToSet(m_creature, SOUND_NIGHTELF_SLAY3);
-                        break;
-                }
+                case 0: DoScriptText(SAY_DEMON_SLAY1, m_creature); break;
+                case 1: DoScriptText(SAY_DEMON_SLAY2, m_creature); break;
+                case 2: DoScriptText(SAY_DEMON_SLAY3, m_creature); break;
+            }
+        }
+        else
+        {
+            switch(rand()%3)
+            {
+                case 0: DoScriptText(SAY_NIGHTELF_SLAY1, m_creature); break;
+                case 1: DoScriptText(SAY_NIGHTELF_SLAY2, m_creature); break;
+                case 2: DoScriptText(SAY_NIGHTELF_SLAY3, m_creature); break;
+            }
+        }
     }
 
     void JustDied(Unit *victim)
     {
-        DoYell(SAY_DEATH, LANG_UNIVERSAL, NULL);
-        DoPlaySoundToSet(m_creature, SOUND_DEATH);
+        DoScriptText(SAY_DEATH, m_creature);
 
         //despawn copy
-        if(Demon)
+        if (Demon)
         {
             Unit *pUnit = NULL;
             pUnit = Unit::GetUnit((*m_creature), Demon);
 
-            if(pUnit)
+            if (pUnit)
                 pUnit->DealDamage(pUnit, pUnit->GetHealth(), NULL, DIRECT_DAMAGE, SPELL_SCHOOL_MASK_NORMAL, NULL, false);
         }
 
-        if(pInstance)
-            pInstance->SetData(DATA_LEOTHERASTHEBLINDEVENT, 0);
+        if (pInstance)
+            pInstance->SetData(DATA_LEOTHERASTHEBLINDEVENT, DONE);
     }
 
@@ -174 +145 @@
             return;
 
-        if(!DemonForm)
+        if (!DemonForm)
         {
             //Whirlwind_Timer
-            if(Whirlwind_Timer < diff)
+            if (Whirlwind_Timer < diff)
             {
                 DoCast(m_creature, SPELL_WHIRLWIND);
@@ -184 +155 @@
 
             //Switch_Timer
-            if(!IsFinalForm)
-                if(Switch_Timer < diff)
-            {
-                //switch to demon form
-                m_creature->SetUInt32Value(UNIT_FIELD_DISPLAYID, MODEL_DEMON);
-                DoYell(SAY_SWITCH_TO_DEMON, LANG_UNIVERSAL, NULL);
-                DoPlaySoundToSet(m_creature, SOUND_SWITCH_TO_DEMON);
-                DemonForm = true;
-
-                Switch_Timer = 60000;
-            }else Switch_Timer -= diff;
+            if (!IsFinalForm)
+            {
+                if (Switch_Timer < diff)
+                {
+                    //switch to demon form
+                    m_creature->SetUInt32Value(UNIT_FIELD_DISPLAYID, MODEL_DEMON);
+                    DoScriptText(SAY_SWITCH_TO_DEMON, m_creature);
+                    DemonForm = true;
+                    Switch_Timer = 60000;
+                }else Switch_Timer -= diff;
+            }
 
             DoMeleeAttackIfReady();
@@ -201 +172 @@
         {
             //ChaosBlast_Timer
-            if(ChaosBlast_Timer < diff)
+            if (ChaosBlast_Timer < diff)
             {
                 DoCast(m_creature->getVictim(), SPELL_CHAOS_BLAST);
@@ -208 +179 @@
 
             //Switch_Timer
-            if(Switch_Timer < diff)
+            if (Switch_Timer < diff)
             {
                 //switch to nightelf form
@@ -218 +189 @@
         }
 
-        if(!IsFinalForm && (m_creature->GetHealth()*100 / m_creature->GetMaxHealth()) < 15)
+        if (!IsFinalForm && (m_creature->GetHealth()*100 / m_creature->GetMaxHealth()) < 15)
         {
             //at this point he divides himself in two parts
@@ -224 +195 @@
             Copy = DoSpawnCreature(DEMON_FORM, 0, 0, 0, 0, TEMPSUMMON_TIMED_DESPAWN_OUT_OF_COMBAT, 5000);
 
-            if(Copy)
+            if (Copy)
             {
                 Demon = Copy->GetGUID();
@@ -234 +205 @@
             DemonForm = false;
 
-            DoYell(SAY_FINAL_FORM, LANG_UNIVERSAL, NULL);
-            DoPlaySoundToSet(m_creature, SOUND_FINAL_FORM);
-
+            DoScriptText(SAY_FINAL_FORM, m_creature);
             m_creature->SetUInt32Value(UNIT_FIELD_DISPLAYID, MODEL_NIGHTELF);
         }
@@ -259 +228 @@
     void StartEvent()
     {
-        DoYell(SAY_FREE, LANG_UNIVERSAL, NULL);
-        DoPlaySoundToSet(m_creature, SOUND_FREE);
+        DoScriptText(SAY_FREE, m_creature);
     }
 
     void KilledUnit(Unit *victim)
     {
-        if(victim->GetTypeId() != TYPEID_PLAYER)
+        if (victim->GetTypeId() != TYPEID_PLAYER)
             return;
 
         switch(rand()%3)
         {
-            case 0:
-                DoYell(SAY_DEMON_SLAY1, LANG_UNIVERSAL, NULL);
-                DoPlaySoundToSet(m_creature, SOUND_DEMON_SLAY1);
-                break;
-            case 1:
-                DoYell(SAY_DEMON_SLAY2, LANG_UNIVERSAL, NULL);
-                DoPlaySoundToSet(m_creature, SOUND_DEMON_SLAY2);
-                break;
-            case 2:
-                DoYell(SAY_DEMON_SLAY3, LANG_UNIVERSAL, NULL);
-                DoPlaySoundToSet(m_creature, SOUND_DEMON_SLAY3);
-                break;
+            case 0: DoScriptText(SAY_DEMON_SLAY1, m_creature); break;
+            case 1: DoScriptText(SAY_DEMON_SLAY2, m_creature); break;
+            case 2: DoScriptText(SAY_DEMON_SLAY3, m_creature); break;
         }
     }
@@ -303 +262 @@
 
         //ChaosBlast_Timer
-        if(ChaosBlast_Timer < diff)
+        if (ChaosBlast_Timer < diff)
         {
             DoCast(m_creature->getVictim(), SPELL_CHAOS_BLAST);

trunk/src/bindings/scripts/scripts/zone/coilfang_resevoir/serpent_shrine/boss_morogrim_tidewalker.cpp

@@ -25 +25 @@
 #include "def_serpent_shrine.h"
 
-#define SPELL_TIDAL_WAVE             37730
-#define SPELL_WATERY_GRAVE           38049
-#define SPELL_EARTHQUAKE             37764
+#define SAY_AGGRO                   -1548030
+#define SAY_SUMMON1                 -1548031
+#define SAY_SUMMON2                 -1548032
+#define SAY_SUMMON_BUBL1            -1548033
+#define SAY_SUMMON_BUBL2            -1548034
+#define SAY_SLAY1                   -1548035
+#define SAY_SLAY2                   -1548036
+#define SAY_SLAY3                   -1548037
+#define SAY_DEATH                   -1548038
+#define EMOTE_WATERY_GRAVE          -1548039
+#define EMOTE_EARTHQUAKE            -1548040
+#define EMOTE_WATERY_GLOBULES       -1548041
+
+#define SPELL_TIDAL_WAVE            37730
+#define SPELL_WATERY_GRAVE          38049
+#define SPELL_EARTHQUAKE            37764
 #define SPELL_WATERY_GRAVE_EXPLOSION 37852
 
-#define SAY_AGGRO                    "Flood of the deep, take you!"
-#define SAY_SUMMON1                  "By the Tides, kill them at once!"
-#define SAY_SUMMON2                  "Destroy them my subjects!"
-#define SAY_SLAY1                    "It is done!"
-#define SAY_SLAY2                    "Strugging only makes it worse."
-#define SAY_SLAY3                    "Only the strong survive."
-#define SAY_SUMMON_BUBL1             "There is nowhere to hide!"
-#define SAY_SUMMON_BUBL2             "Soon it will be finished!"
-#define SAY_DEATH                    "Great... currents of... Ageon."
-
-#define SOUND_AGGRO                  11321
-#define SOUND_SUMMON1                11322
-#define SOUND_SUMMON2                11323
-#define SOUND_SLAY1                  11326
-#define SOUND_SLAY2                  11327
-#define SOUND_SLAY3                  11328
-#define SOUND_SUMMON_BUBL1           11324
-#define SOUND_SUMMON_BUBL2           11325
-#define SOUND_DEATH                  11329
-
-#define WATERY_GRAVE_X1              334.64
-#define WATERY_GRAVE_Y1              -728.89
-#define WATERY_GRAVE_Z1              -14.42
-#define WATERY_GRAVE_X2              365.51
-#define WATERY_GRAVE_Y2              -737.14
-#define WATERY_GRAVE_Z2              -14.44
-#define WATERY_GRAVE_X3              366.19
-#define WATERY_GRAVE_Y3              -709.59
-#define WATERY_GRAVE_Z3              -14.36
-#define WATERY_GRAVE_X4              372.93
-#define WATERY_GRAVE_Y4              -690.96
-#define WATERY_GRAVE_Z4              -14.44
-
-#define EMOTE_WATERY_GRAVE         "sends his enemies to their watery graves!"
-#define EMOTE_EARTHQUAKE           "The violent earthquake has alerted nearby murlocs!"
-#define EMOTE_WATERY_GLOBULES      "summons Watery Globules!"
-
-#define WATER_GLOBULE              21913
-#define TIDEWALKER_LURKER          21920
+#define WATERY_GRAVE_X1             334.64
+#define WATERY_GRAVE_Y1             -728.89
+#define WATERY_GRAVE_Z1             -14.42
+#define WATERY_GRAVE_X2             365.51
+#define WATERY_GRAVE_Y2             -737.14
+#define WATERY_GRAVE_Z2             -14.44
+#define WATERY_GRAVE_X3             366.19
+#define WATERY_GRAVE_Y3             -709.59
+#define WATERY_GRAVE_Z3             -14.36
+#define WATERY_GRAVE_X4             372.93
+#define WATERY_GRAVE_Y4             -690.96
+#define WATERY_GRAVE_Z4             -14.44
+
+#define WATER_GLOBULE               21913
+#define TIDEWALKER_LURKER           21920
 
 //Morogrim Tidewalker AI
@@ -99 +88 @@
         Phase2 = false;
 
-        if(pInstance)
+        if (pInstance)
             pInstance->SetData(DATA_MOROGRIMTIDEWALKEREVENT, NOT_STARTED);
     }
@@ -105 +94 @@
     void StartEvent()
     {
-        DoPlaySoundToSet(m_creature, SOUND_AGGRO);
-        DoYell(SAY_AGGRO, LANG_UNIVERSAL, NULL);
-
-        if(pInstance)
+        DoScriptText(SAY_AGGRO, m_creature);
+
+        if (pInstance)
             pInstance->SetData(DATA_MOROGRIMTIDEWALKEREVENT, IN_PROGRESS); 
     }
@@ -116 +104 @@
         switch(rand()%3)
         {
+            case 0: DoScriptText(SAY_SLAY1, m_creature); break;
+            case 1: DoScriptText(SAY_SLAY2, m_creature); break;
+            case 2: DoScriptText(SAY_SLAY3, m_creature); break;
+        }
+    }
+
+    void JustDied(Unit *victim)
+    {
+        DoScriptText(SAY_DEATH, m_creature);
+
+        if (pInstance)
+            pInstance->SetData(DATA_MOROGRIMTIDEWALKEREVENT, NOT_STARTED);
+    }
+
+    void Aggro(Unit *who) { StartEvent(); }
+
+    void ApplyWateryGrave(Unit *player, uint8 pos)
+    {
+        float x, y, z;
+
+        switch(pos)
+        {
             case 0:
-                DoPlaySoundToSet(m_creature, SOUND_SLAY1);
-                DoYell(SAY_SLAY1, LANG_UNIVERSAL, NULL);
+                x = WATERY_GRAVE_X1;
+                y = WATERY_GRAVE_Y1;
+                z = WATERY_GRAVE_Z1;
                 break;
-
             case 1:
-                DoPlaySoundToSet(m_creature, SOUND_SLAY2);
-                DoYell(SAY_SLAY2, LANG_UNIVERSAL, NULL);
+                x = WATERY_GRAVE_X2;
+                y = WATERY_GRAVE_Y2;
+                z = WATERY_GRAVE_Z2;
                 break;
-
             case 2:
-                DoPlaySoundToSet(m_creature, SOUND_SLAY3);
-                DoYell(SAY_SLAY3, LANG_UNIVERSAL, NULL);
+                x = WATERY_GRAVE_X3;
+                y = WATERY_GRAVE_Y3;
+                z = WATERY_GRAVE_Z3;
                 break;
-        }
-    }
-
-    void JustDied(Unit *victim)
-    {
-        DoPlaySoundToSet(m_creature, SOUND_DEATH);
-        DoYell(SAY_DEATH, LANG_UNIVERSAL, NULL);
-
-        if(pInstance)
-            pInstance->SetData(DATA_MOROGRIMTIDEWALKEREVENT, NOT_STARTED);
-    }
-
-    void Aggro(Unit *who) { StartEvent(); }
-
-    void ApplyWateryGrave(Unit *player, uint8 pos)
-    {
-        float x, y, z;
-
-        switch(pos)
-        {
-            case 0:
-            x = WATERY_GRAVE_X1;
-            y = WATERY_GRAVE_Y1;
-            z = WATERY_GRAVE_Z1;
-            break;
-
-            case 1:
-            x = WATERY_GRAVE_X2;
-            y = WATERY_GRAVE_Y2;
-            z = WATERY_GRAVE_Z2;
-            break;
-            
-            case 2:
-            x = WATERY_GRAVE_X3;
-            y = WATERY_GRAVE_Y3;
-            z = WATERY_GRAVE_Z3;
-            break;
-
             case 3:
-            x = WATERY_GRAVE_X4;
-            y = WATERY_GRAVE_Y4;
-            z = WATERY_GRAVE_Z4;
-            break;
+                x = WATERY_GRAVE_X4;
+                y = WATERY_GRAVE_Y4;
+                z = WATERY_GRAVE_Z4;
+                break;
         }
 
@@ -184 +157 @@
 
         Summoned = m_creature->SummonCreature(TIDEWALKER_LURKER, x, y, z, 0, TEMPSUMMON_TIMED_DESPAWN_OUT_OF_COMBAT, 5000);
-        if(Summoned)
+        if (Summoned)
         {
             Unit *target = NULL;
             target = SelectUnit(SELECT_TARGET_RANDOM, 0);
-            if(target)
+            if (target)
                 Summoned->AI()->AttackStart(target);
         }
@@ -198 +171 @@
 
         Globule = m_creature->SummonCreature(WATER_GLOBULE, x, y, z, 0, TEMPSUMMON_TIMED_DESPAWN, 30000); //they despawn after 30 seconds
-        if(Globule)
+        if (Globule)
         {
             Unit *target = NULL;
             target = SelectUnit(SELECT_TARGET_RANDOM, 0);
-            if(target)
+            if (target)
                 Globule->AI()->AttackStart(target);
         }
@@ -214 +187 @@
 
         //Earthquake_Timer
-        if(Earthquake_Timer < diff)
-        {
-            if(!Earthquake)
+        if (Earthquake_Timer < diff)
+        {
+            if (!Earthquake)
             {
                 DoCast(m_creature->getVictim(), SPELL_EARTHQUAKE);
@@ -226 +199 @@
                 switch(rand()%2)
                 {
-                    case 0:
-                    DoPlaySoundToSet(m_creature, SOUND_SUMMON1);
-                    DoYell(SAY_SUMMON1, LANG_UNIVERSAL, NULL);
-                    break;
-
-                    case 1:
-                    DoPlaySoundToSet(m_creature, SOUND_SUMMON2);
-                    DoYell(SAY_SUMMON2, LANG_UNIVERSAL, NULL);
-                    break;
+                    case 0: DoScriptText(SAY_SUMMON1, m_creature); break;
+                    case 1: DoScriptText(SAY_SUMMON2, m_creature); break;
                 }
 
@@ -253 +219 @@
                 SummonMurloc(293.64, -726.64, -9.81);
 
-                DoTextEmote(EMOTE_EARTHQUAKE, NULL);
+                DoScriptText(EMOTE_EARTHQUAKE, m_creature);
 
                 Earthquake = false;
@@ -261 +227 @@
 
         //TidalWave_Timer
-        if(TidalWave_Timer < diff)
+        if (TidalWave_Timer < diff)
         {
             DoCast(m_creature->getVictim(), SPELL_TIDAL_WAVE);
@@ -267 +233 @@
         }else TidalWave_Timer -= diff;
 
-        if(!Phase2)
+        if (!Phase2)
         {
             //WateryGrave_Timer
-            if(WateryGrave_Timer < diff)
+            if (WateryGrave_Timer < diff)
             {
                 //Teleport 4 players under the waterfalls
@@ -277 +243 @@
                 {
                     target = SelectUnit(SELECT_TARGET_RANDOM, 1);
-                    if(target && (target->GetTypeId() == TYPEID_PLAYER) && !target->HasAura(SPELL_WATERY_GRAVE, 0) && target->IsWithinDistInMap(m_creature, 50))
+                    if (target && (target->GetTypeId() == TYPEID_PLAYER) && !target->HasAura(SPELL_WATERY_GRAVE, 0) && target->IsWithinDistInMap(m_creature, 50))
                         ApplyWateryGrave(target, i);
                 }
@@ -283 +249 @@
                 switch(rand()%2)
                 {
-                case 0:
-                    DoPlaySoundToSet(m_creature, SOUND_SUMMON_BUBL1);
-                    DoYell(SAY_SUMMON_BUBL1, LANG_UNIVERSAL, NULL);
-                    break;
-
-                case 1:
-                    DoPlaySoundToSet(m_creature, SOUND_SUMMON_BUBL2);
-                    DoYell(SAY_SUMMON_BUBL2, LANG_UNIVERSAL, NULL);
-                    break;
-
-                case 2:
-                    break;
+                    case 0: DoScriptText(SAY_SUMMON_BUBL1, m_creature); break;
+                    case 1: DoScriptText(SAY_SUMMON_BUBL2, m_creature); break;
                 }
 
-                DoTextEmote(EMOTE_WATERY_GRAVE, NULL);
-
+                DoScriptText(EMOTE_WATERY_GRAVE, m_creature);
                 WateryGrave_Timer = 30000;
             }else WateryGrave_Timer -= diff;
 
             //Start Phase2
-            if((m_creature->GetHealth()*100 / m_creature->GetMaxHealth()) < 25)
+            if ((m_creature->GetHealth()*100 / m_creature->GetMaxHealth()) < 25)
                 Phase2 = true;
         }
@@ -309 +264 @@
         {
             //WateryGlobules_Timer
-            if(WateryGlobules_Timer < diff)
+            if (WateryGlobules_Timer < diff)
             {
                 SummonWaterGlobule(WATERY_GRAVE_X1, WATERY_GRAVE_Y1, WATERY_GRAVE_Z1);
@@ -316 +271 @@
                 SummonWaterGlobule(WATERY_GRAVE_X4, WATERY_GRAVE_Y4, WATERY_GRAVE_Z4);
 
-                DoTextEmote(EMOTE_WATERY_GLOBULES, NULL);
+                DoScriptText(EMOTE_WATERY_GLOBULES, m_creature);
 
                 WateryGlobules_Timer = 25000;
@@ -363 +318 @@
             return;
 
-        if(Check_Timer < diff)
-        {
-            if(m_creature->IsWithinDistInMap(m_creature->getVictim(), 5))
+        if (Check_Timer < diff)
+        {
+            if (m_creature->IsWithinDistInMap(m_creature->getVictim(), 5))
             {
                 uint32 damage = 4000+rand()%2000;

trunk/src/game/Chat.cpp

@@ -526 +526 @@
                 { "explorecheat",   SEC_ADMINISTRATOR,  false, &ChatHandler::HandleExploreCheatCommand,        "", NULL },
                 { "hover",          SEC_ADMINISTRATOR,  false, &ChatHandler::HandleHoverCommand,               "", NULL },
-        { "waterwalk",          SEC_ADMINISTRATOR,  false, &ChatHandler::HandleWaterwalkCommand,               "", NULL },
+                { "waterwalk",      SEC_ADMINISTRATOR,  false, &ChatHandler::HandleWaterwalkCommand,           "", NULL },
                 { "levelup",        SEC_ADMINISTRATOR,  false, &ChatHandler::HandleLevelUpCommand,             "", NULL },
                 { "showarea",       SEC_ADMINISTRATOR,  false, &ChatHandler::HandleShowAreaCommand,            "", NULL },