Core/Script/Spells: Trial of the Crusader

* Keep in mind that this is a WIP although is extremely playable as it is.
* Known bugs are writen at the header of each file.
* If u know how to correctly solve any of those bugs or found a new bug, please report and, if you may, provide a fix for us to review.
* I'd like to thank all Trinity Community (in special, Shauren, QAston, Bio, Josh), rsa from SD2 for providing the base, all the ppl that helped me test and review so many many times.
* I personally have been working on this code since TC was near rev 8000 so i will take a break from it to work on other stuff (specially cause most of the bugs i was unable to solve alone).
* I'd like to strongly encourage others to provide the improvements that this instance need to become perfect.
* FInally, this commit might have something missing... i'll recheck as soon as i wake up tomorrow morning.

--HG--
branch : trunk

6 files changed, 225 insertions, 0 deletions

diff --git a/sql/base/world_database.sql b/sql/base/world_database.sql
index 228ce3c9be3..da199bceffc 100644
--- a/sql/base/world_database.sql
+++ b/sql/base/world_database.sql
@@ -6309,6 +6309,13 @@ INSERT INTO `spell_linked_spell` (`spell_trigger`,`spell_effect`,`type`,`comment
 -- Trial of the Champion
 ( 66680, 66547, 0, 'Confess - Confess'),
 ( 66889,-66865, 0, 'Remove Vengeance'),
+-- Trial of the Crusader
+( 66870,-66823, 1, 'Remove Paralytic Toxin when hit by Burning Bite'),
+( 67621,-67618, 1, 'Remove Paralytic Toxin when hit by Burning Bite'),
+( 67622,-67619, 1, 'Remove Paralytic Toxin when hit by Burning Bite'),
+( 67623,-67620, 1, 'Remove Paralytic Toxin when hit by Burning Bite');
+(-66683, 68667, 0, 'Icehowl - Surge of Adrenaline'),
+(-67661, 68667, 0, 'Icehowl - Surge of Adrenaline'),
 -- Warsong Gulch
 ( 54861,-23335, 0, 'Drop Flag on Nitro Boost WSG'),
 ( 54861,-23333, 0, 'Drop Flag on Nitro Boost WSG'),
diff --git a/sql/scripts/world_scripts_full.sql b/sql/scripts/world_scripts_full.sql
index b564bc16b04..f4dfddc6152 100644
--- a/sql/scripts/world_scripts_full.sql
+++ b/sql/scripts/world_scripts_full.sql
@@ -1400,6 +1400,54 @@ UPDATE `creature_template` SET `ScriptName`='npc_argent_soldier'  WHERE `entry`
 UPDATE `creature_template` SET `ScriptName`='npc_black_knight_skeletal_gryphon' WHERE `entry`=35491;
 UPDATE `creature_template` SET `AIName`='PassiveAI' WHERE `entry` IN (35332,35330,35328,35327,35331,35329,35325,35314,35326,35323);
 
+/* TRIAL OF THE CRUSADER */
+UPDATE `instance_template` SET `script`='instance_trial_of_the_crusader' WHERE `map`=649;
+UPDATE `creature_template` SET `scriptname`='npc_announcer_toc10' WHERE `entry`=34816;
+UPDATE `creature_template` SET `scriptname`='boss_lich_king_toc' WHERE `entry`=35877;
+UPDATE `creature_template` SET `scriptname`='npc_fizzlebang_toc' WHERE `entry`=35458;
+UPDATE `creature_template` SET `scriptname`='npc_tirion_toc' WHERE `entry`=34996;
+UPDATE `creature_template` SET `scriptname`='npc_garrosh_toc' WHERE `entry`=34995;
+UPDATE `creature_template` SET `scriptname`='npc_varian_toc' WHERE `entry`=34990;
+UPDATE `creature_template` SET `scriptname`='boss_gormok' WHERE `entry`=34796;
+UPDATE `creature_template` SET `scriptname`='mob_snobold_vassal' WHERE `entry`=34800;
+UPDATE `creature_template` SET `scriptname`='boss_dreadscale' WHERE `entry`=34799;
+UPDATE `creature_template` SET `scriptname`='boss_acidmaw' WHERE `entry`=35144;
+UPDATE `creature_template` SET `scriptname`='mob_slime_pool' WHERE `entry`=35176;
+UPDATE `creature_template` SET `scriptname`='boss_icehowl' WHERE `entry`=34797;
+UPDATE `creature_template` SET `scriptname`='boss_jaraxxus' WHERE `entry`= 34780;
+UPDATE `creature_template` SET `scriptname`='mob_legion_flame' WHERE `entry`=34784;
+UPDATE `creature_template` SET `scriptname`='mob_infernal_volcano' WHERE `entry`=34813;
+UPDATE `creature_template` SET `scriptname`='mob_nether_portal' WHERE `entry`=34825;
+UPDATE `creature_template` SET `scriptname`='mob_fel_infernal' WHERE `entry`=34815;
+UPDATE `creature_template` SET `scriptname`='mob_mistress_of_pain' WHERE `entry`=34826;
+UPDATE `creature_template` SET `scriptname`='boss_toc_champion_controller' WHERE `entry`=34781;
+UPDATE `creature_template` SET `scriptname`='mob_toc_warrior' WHERE `entry` IN (34475,34453);
+UPDATE `creature_template` SET `scriptname`='mob_toc_mage' WHERE `entry` IN (34468,34449);
+UPDATE `creature_template` SET `scriptname`='mob_toc_shaman' WHERE `entry` IN (34470,34444);
+UPDATE `creature_template` SET `scriptname`='mob_toc_enh_shaman' WHERE `entry` IN (34463,34455);
+UPDATE `creature_template` SET `scriptname`='mob_toc_hunter' WHERE `entry` IN (34467,34448);
+UPDATE `creature_template` SET `scriptname`='mob_toc_rogue' WHERE `entry` IN (34472,34454);
+UPDATE `creature_template` SET `scriptname`='mob_toc_priest' WHERE `entry` IN (34466,34447);
+UPDATE `creature_template` SET `scriptname`='mob_toc_shadow_priest' WHERE `entry` IN (34473,34441);
+UPDATE `creature_template` SET `scriptname`='mob_toc_dk' WHERE `entry` IN (34461,34458);
+UPDATE `creature_template` SET `scriptname`='mob_toc_paladin' WHERE `entry` IN (34465,34445);
+UPDATE `creature_template` SET `scriptname`='mob_toc_retro_paladin' WHERE `entry` IN (34471,34456);
+UPDATE `creature_template` SET `scriptname`='mob_toc_druid' WHERE `entry` IN (34469,34459);
+UPDATE `creature_template` SET `scriptname`='mob_toc_boomkin' WHERE `entry` IN (34460,34451);
+UPDATE `creature_template` SET `scriptname`='mob_toc_warlock' WHERE `entry` IN (34474,34450);
+UPDATE `creature_template` SET `scriptname`='mob_toc_pet_warlock' WHERE `entry`=35465;
+UPDATE `creature_template` SET `scriptname`='mob_toc_pet_hunter' WHERE `entry`=35610;
+UPDATE `creature_template` SET `scriptname`='boss_fjola' WHERE `entry`=34497;
+UPDATE `creature_template` SET `scriptname`='boss_eydis' WHERE `entry`=34496;
+UPDATE `creature_template` SET `scriptname`='mob_essence_of_twin' WHERE `entry` IN (34567,34568);
+UPDATE `creature_template` SET `scriptname`='mob_unleashed_dark' WHERE entry=34628;
+UPDATE `creature_template` SET `scriptname`='mob_unleashed_light' WHERE entry=34630;
+UPDATE `creature_template` SET `scriptname`='boss_anubarak_trial' WHERE `entry`=34564;
+UPDATE `creature_template` SET `ScriptName`='mob_frost_sphere' WHERE `entry`=34606;
+UPDATE `creature_template` SET `scriptname`='mob_swarm_scarab' WHERE `entry`=34605;
+UPDATE `creature_template` SET `scriptname`='mob_nerubian_burrower' WHERE `entry`=34607;
+UPDATE `creature_template` SET `scriptname`='mob_anubarak_spike' WHERE `entry`=34660;
+
 /* TIRISFAL GLADES */
 UPDATE `creature_template` SET `ScriptName`='npc_calvin_montague' WHERE `entry`=6784;
 
diff --git a/sql/updates/9521_character_achievement.sql b/sql/updates/9521_character_achievement.sql
new file mode 100644
index 00000000000..e8262aed4ad
--- /dev/null
+++ b/sql/updates/9521_character_achievement.sql
@@ -0,0 +1,2 @@
+DELETE FROM character_achievement WHERE `achievement` IN (3812,3916,3917,3918,3799,3797,3813,3814,3798,3815,3996,3997,3800,3816,3937,3936,3817,3818,3819,3808,3809,3810,4078,4079,4156,4080);
+DELETE FROM character_achievement_progress WHERE `criteria` IN (11542,11546,11547,11549,11678,11679,11680,11681,11682,11683,11684,11685,11686,11687,11688,11689,11690,11691,11692,11693,11778,11779,11780,11799,11800,11801,11802,11803,11804,11818,11838,11839,11860,11861,11862,12116,12198,12258,12278,12279,12280,12281,12338,12339,12340,12341,12342,12343,12344,12345,12346,12347,12348,12349,12350,12358,12359,12360);
diff --git a/sql/updates/9521_world_script_texts.sql b/sql/updates/9521_world_script_texts.sql
new file mode 100644
index 00000000000..419fa3b6d39
--- /dev/null
+++ b/sql/updates/9521_world_script_texts.sql
@@ -0,0 +1,105 @@
+-- TOC original texts/sounds (thanks to griffonheart)
+-- english translation by Cristy
+-- reworked by rsa
+-- reworked by JohnHoliver
+DELETE FROM `script_texts` WHERE `entry` BETWEEN -1649999 AND -1649000;
+INSERT INTO `script_texts`
+(`comment`,`sound`, `entry`,`type`,`language`,`emote`,`content_default`) VALUES
+-- Northrend Beasts
+-- Gormok
+('34796','0','-1649000','3','0','0','My slaves! Destroy the enemy!'),
+-- Acidmaw & Dreadscale
+('34564','0','-1649010','3','0','0','%s buries itself in the earth!'),
+('34564','0','-1649011','3','0','0','%s getting out of the ground!'),
+('34799','0','-1649012','3','0','0','After the death of sister %s goes berserk!'),
+-- Icehowl
+('34797','0','-1649020','3','0','0','%s looks at |3-3($n) and emits a guttural howl!'),
+('34797','0','-1649021','3','0','0','%s crashes into a wall of the Colosseum and lose focus!'),
+('34797','0','-1649022','3','0','0','|3-3(%s) covers boiling rage, and he tramples all in its path!'),
+-- Jaraxxus
+('34780','16143','-1649030','1','0','0','Trifling gnome, your arrogance will be your undoing!'),
+('34780','16144','-1649031','1','0','0','You face Jaraxxus, eredar lord of the Burning Legion!'),
+('34780','16147','-1649032','1','0','0','Another will take my place. Your world is doomed.'),
+('34780','0','-1649033','3','0','0','$n has |cFF00FFFFIncinerate flesh!|R Heal $ghim:her;!'),
+('34780','16149','-1649034','1','0','0','FLESH FROM BONE!'),
+('34780','0','-1649035','3','0','0','|cFFFF0000Legion Flame|R on $n'),
+('34780','0','-1649036','3','0','0','%s creates the gates of the Void!'),
+('34780','16150','-1649037','1','0','0','Come forth, sister! Your master calls!'),
+('34780','0','-1649038','3','0','0','%s creates an |cFF00FF00Infernal Volcano!|R'),
+('34780','16151','-1649039','1','0','0','INFERNO!'),
+-- Faction Champions
+('34995','0','-1649115','1','0','0','Weakling!'),
+('34995','0','-1649116','1','0','0','Pathetic!'),
+('34995','0','-1649117','1','0','0','Overpowered.'),
+('34995','0','-1649118','1','0','0','Lok\'tar!'),
+('34990','0','-1649120','1','0','0','HAH!'),
+('34990','0','-1649121','1','0','0','Hardly a challenge!'),
+('34990','0','-1649122','1','0','0','Worthless scrub.'),
+('34990','0','-1649123','1','0','0','Is this the best the Horde has to offer?'),
+-- Twin Valkyrs
+('34497','16272','-1649040','1','0','0','In the name of our dark master. For the Lich King. You. Will. Die.'),
+('34496','16275','-1649041','1','0','0','The Scourge cannot be stopped...'),
+('34497','16273','-1649042','1','0','0','YOU ARE FINISHED!'),
+('34497','0','-1649043','3','0','0','%s begins to read the spell Treaty twins!'),
+('34497','16274','-1649044','3','0','0','CHAOS!'),
+('34496','16277','-1649045','1','0','0','UNWORTHY!'),
+('34497','16276','-1649046','1','0','0','You appreciated and acknowledged nothing.'),
+('34497','0','-1649047','3','0','0','%s begins to read a spell |cFFFFFFFFLight Vortex!|R switch to |cFFFFFFFFLight|r essence!'),
+('34496','16279','-1649048','1','0','0','Let the light consume you!'),
+('34496','0','-1649049','3','0','0','%s begins to read a spell |cFF9932CDBlack Vortex!|R switch to |cFF9932CDBlack|r essence!'),
+('34496','16278','-1649050','1','0','0','Let the dark consume you!'),
+-- Anub'arak
+('34564','16235','-1649055','1','0','0','Ahhh... Our guests arrived, just as the master promised.'),
+('34564','16234','-1649056','1','0','0','This place will serve as your tomb!'),
+('34564','16236','-1649057','1','0','0','F-lakkh shir!'),
+('34564','16237','-1649058','1','0','0','Another soul to sate the host.'),
+('34564','16238','-1649059','1','0','0','I have failed you, master...'),
+('34564','0','-1649060','3','0','0','%s spikes  pursuing $n!'),
+('34564','16240','-1649061','1','0','0','Auum na-l ak-k-k-k, isshhh. Rise, minions. Devour...'),
+('34564','0','-1649062','3','0','0','%s produces a swarm of beetles Peon to restore your health!'),
+('34564','16241','-1649063','1','0','0','The swarm shall overtake you!'),
+-- Event
+-- Northrend Beasts
+('34996','16036','-1649070','1','0','0','Welcome champions, you have heard the call of the Argent Crusade and you have boldly answered. It is here in the crusaders coliseum that you will face your greatest challenges. Those of you who survive the rigors of the coliseum will join the Argent Crusade on its marsh to ice crown citadel.'),
+('34996','16038','-1649071','1','0','0','Hailing from the deepest, darkest carverns of the storm peaks, Gormok the Impaler! Battle on, heroes!'),
+('34990','16069','-1649072','1','0','0','Your beast will be no match for my champions Tirion!'),
+('34995','16026','-1649073','1','0','0','I have seen  more  worthy  challenges in the ring of blood, you waste our time paladin.'),
+('34996','16039','-1649074','1','0','0','Steel yourselves, heroes, for the twin terrors Acidmaw and Dreadscale. Enter the arena!'),
+('34996','16040','-1649075','1','0','0','The air freezes with the introduction of our next combatant, Icehowl! Kill or be killed, champions!'),
+('34996','16041','-1649076','1','0','0','The monstrous menagerie has been vanquished!'),
+('34996','16042','-1649077','1','0','0','Tragic... They fought valiantly, but the beasts of Northrend triumphed. Let us observe a moment of silence for our fallen heroes.'),
+-- Jaraxxus
+('34996','16043','-1649080','1','0','0','Grand Warlock Wilfred Fizzlebang will summon forth your next challenge. Stand by for his entry!'),
+('35458','16268','-1649081','1','0','0','Thank you, Highlord! Now challengers, I will begin the ritual of summoning! When I am done, a fearsome Doomguard will appear!'),
+('35458','16269','-1649082','1','0','0','Prepare for oblivion!'),
+('35458','16270','-1649083','1','0','0','Ah ha! Behold the absolute power of Wilfred Fizzlebang, master summoner! You are bound to ME, demon!'),
+('35458','16271','-1649084','1','0','0','But I am in charge here-'),
+('35458','0','-1649085','1','0','0','...'),
+('34996','16044','-1649086','1','0','0','Quickly, heroes! Destroy the demon lord before it can open a portal to its twisted demonic realm!'),
+('34996','16045','-1649087','1','0','0','The loss of Wilfred Fizzlebang, while unfortunate, should be a lesson to those that dare dabble in dark magic. Alas, you are victorious and must now face the next challenge.'),
+('34995','16021','-1649088','1','0','0','Treacherous Alliance dogs! You summon a demon lord against warriors of the Horde!? Your deaths will be swift!'),
+('34990','16064','-1649089','1','0','0','The Alliance doesnt need the help of a demon lord to deal with Horde filth. Come, pig!'),
+('34996','16046','-1649090','1','0','0','Everyone, calm down! Compose yourselves! There is no conspiracy at play here. The warlock acted on his own volition - outside of influences from the Alliance. The tournament must go on!'),
+-- Faction Champions
+('34996','16047','-1649091','1','0','0','The next battle will be against the Argent Crusades most powerful knights! Only by defeating them will you be deemed worthy...'),
+('34990','16066','-1649092','1','0','0','Our honor has been besmirched! They make wild claims and false accusations against us. I demand justice! Allow my champions to fight in place of your knights, Tirion. We challenge the Horde!'),
+('34995','16023','-1649093','1','0','0','The Horde demands justice! We challenge the Alliance. Allow us to battle in place of your knights, paladin. We will show these dogs what it means to insult the Horde!'),
+('34996','16048','-1649094','1','0','0','Very well, I will allow it. Fight with honor!'),
+('34990','16065','-1649095','1','0','0','Fight for the glory of the Alliance, heroes! Honor your king and your people!'),
+('34995','16022','-1649096','1','0','0','Show them no mercy, Horde champions! LOK-TAR OGAR!'),
+('34990','16067','-1649097','1','0','0','GLORY OF THE ALLIANCE!'),
+('34995','16024','-1649098','1','0','0','LOK-TAR OGAR!'),
+('34996','16049','-1649099','1','0','0','A shallow and tragic victory. We are weaker as a whole from the losses suffered today. Who but the Lich King could benefit from such foolishness? Great warriors have lost their lives. And for what? The true threat looms ahead - the Lich King awaits us all in death.'),
+-- Twin Valkyrs
+('34996','16050','-1649100','1','0','0','Only by working together will you overcome the final challenge. From the depths of Icecrown come two of the Scourges most powerful lieutenants: fearsome valkyr, winged harbingers of the Lich King!'),
+('34996','16037','-1649101','1','0','0','Let the games begin!'),
+('34990','16068','-1649102','1','0','0','Not even the Lich King most powerful minions can stand against the Alliance! All hail our victors!'),
+('34995','16025','-1649103','1','0','0','Do you still question the might of the horde paladin? We will take on all comers.'),
+-- Anub'arak
+('34996','16051','-1649104','1','0','0','A mighty blow has been dealt to the Lich King! You have proven yourselves able bodied champions of the Argent Crusade. Together we will strike at Icecrown Citadel and destroy what remains of the Scourge! There is no challenge that we cannot face united!'),
+('35877','16321','-1649105','1','0','0','You will have your challenge, Fordring.'),
+('34996','16052','-1649106','1','0','0','Arthas! You are hopelessly outnumbered! Lay down Frostmourne and I will grant you a just death.'),
+('35877','16322','-1649107','1','0','0','The Nerubians built an empire beneath the frozen wastes of Northrend. An empire that you so foolishly built your structures upon. MY EMPIRE.'),
+('35877','16323','-1649108','1','0','0','The souls of your fallen champions will be mine, Fordring.'),
+('36095','0','-1649109','1','0','0','Champions, you are alive! Not only have you defeated every challenge of the Trial of the Crusader, but thwarted Arthas directly! Your skill and cunning will prove to be a powerful weapon against the Scourge. Well done! Allow one of my mages to transport you back to the surface!'),
+('36095','0','-1649110','1','0','0','Let me hand you the chests as a reward, and let its contents will serve you faithfully in the campaign against Arthas in the heart of the Icecrown Citadel!');
\ No newline at end of file
diff --git a/sql/updates/9521_world_scriptname.sql b/sql/updates/9521_world_scriptname.sql
new file mode 100644
index 00000000000..c39b7d3c3a8
--- /dev/null
+++ b/sql/updates/9521_world_scriptname.sql
@@ -0,0 +1,54 @@
+-- Scriptnames
+-- NonAgressive NPCs
+UPDATE `creature_template` SET `scriptname`='npc_announcer_toc10' WHERE `entry` in (34816);
+UPDATE `creature_template` SET `scriptname`='boss_lich_king_toc' WHERE `entry`=35877;
+UPDATE `creature_template` SET `scriptname`='npc_fizzlebang_toc' WHERE `entry`=35458;
+UPDATE `creature_template` SET `scriptname`='npc_tirion_toc' WHERE `entry`=34996;
+UPDATE `creature_template` SET `scriptname`='npc_garrosh_toc' WHERE `entry`=34995;
+UPDATE `creature_template` SET `scriptname`='npc_varian_toc' WHERE `entry`=34990;
+-- Northrend Beasts
+UPDATE `creature_template` SET `scriptname`='boss_gormok', `AIName` ='' WHERE `entry`=34796;
+UPDATE `creature_template` SET `scriptname`='mob_snobold_vassal', `AIName` ='' WHERE `entry`=34800;
+UPDATE `creature_template` SET `scriptname`='boss_dreadscale', `AIName` ='' WHERE `entry`=34799;
+UPDATE `creature_template` SET `scriptname`='boss_acidmaw', `AIName` ='' WHERE `entry`=35144;
+UPDATE `creature_template` SET `scriptname`='mob_slime_pool', `AIName` ='' WHERE `entry` = 35176;
+UPDATE `creature_template` SET `scriptname`='boss_icehowl', `AIName` ='' WHERE `entry`=34797;
+-- Lord Jaraxxus
+UPDATE `creature_template` SET `scriptname`='boss_jaraxxus', `AIName` ='' WHERE `entry`= 34780;
+UPDATE `creature_template` SET `scriptname`='mob_legion_flame', `AIName` ='' WHERE `entry` = 34784;
+UPDATE `creature_template` SET `scriptname`='mob_infernal_volcano', `AIName` ='' WHERE `entry` = 34813;
+UPDATE `creature_template` SET `scriptname`='mob_nether_portal', `AIName` ='' WHERE `entry` = 34825;
+UPDATE `creature_template` SET `scriptname`='mob_fel_infernal', `AIName` ='' WHERE `entry` = 34815;
+UPDATE `creature_template` SET `scriptname`='mob_mistress_of_pain', `AIName` ='' WHERE `entry` = 34826;
+-- Faction Champions
+UPDATE `creature_template` SET `scriptname`='boss_toc_champion_controller', `AIName` ='' WHERE `entry` IN (34781);
+UPDATE `creature_template` SET `scriptname`='mob_toc_warrior', `AIName` ='' WHERE `entry` IN (34475,34453);
+UPDATE `creature_template` SET `scriptname`='mob_toc_mage', `AIName` ='' WHERE `entry` IN (34468,34449);
+UPDATE `creature_template` SET `scriptname`='mob_toc_shaman', `AIName` ='' WHERE `entry` IN (34470,34444);
+UPDATE `creature_template` SET `scriptname`='mob_toc_enh_shaman', `AIName` ='' WHERE `entry` IN (34463,34455);
+UPDATE `creature_template` SET `scriptname`='mob_toc_hunter', `AIName` ='' WHERE `entry` IN (34467,34448);
+UPDATE `creature_template` SET `scriptname`='mob_toc_rogue', `AIName` ='' WHERE `entry` IN (34472,34454);
+UPDATE `creature_template` SET `scriptname`='mob_toc_priest', `AIName` ='' WHERE `entry` IN (34466,34447);
+UPDATE `creature_template` SET `scriptname`='mob_toc_shadow_priest', `AIName` ='' WHERE `entry` IN (34473,34441);
+UPDATE `creature_template` SET `scriptname`='mob_toc_dk', `AIName` ='' WHERE `entry` IN (34461,34458);
+UPDATE `creature_template` SET `scriptname`='mob_toc_paladin', `AIName` ='' WHERE `entry` IN (34465,34445);
+UPDATE `creature_template` SET `scriptname`='mob_toc_retro_paladin', `AIName` ='' WHERE `entry` IN (34471,34456);
+UPDATE `creature_template` SET `scriptname`='mob_toc_druid', `AIName` ='' WHERE `entry` IN (34469,34459);
+UPDATE `creature_template` SET `scriptname`='mob_toc_boomkin', `AIName` ='' WHERE `entry` IN (34460,34451);
+UPDATE `creature_template` SET `scriptname`='mob_toc_warlock' WHERE `entry` IN (34474,34450);
+UPDATE `creature_template` SET `scriptname`='mob_toc_pet_warlock', `AIName` ='' WHERE `entry` IN (35465);
+UPDATE `creature_template` SET `scriptname`='mob_toc_pet_hunter', `AIName` ='' WHERE `entry` IN (35610);
+-- Valkiries
+UPDATE `creature_template` SET `scriptname`='boss_fjola', `AIName` ='' WHERE `entry`=34497;
+UPDATE `creature_template` SET `scriptname`='boss_eydis', `AIName` ='' WHERE `entry`=34496;
+UPDATE `creature_template` SET `scriptname`='mob_essence_of_twin', `AIName` ='' WHERE `entry` IN (34567,34568);
+UPDATE `creature_template` SET `scriptname`='mob_unleashed_dark', `AIName` ='' WHERE entry = 34628;
+UPDATE `creature_template` SET `scriptname`='mob_unleashed_light', `AIName` ='' WHERE entry = 34630;
+-- Anub'arak
+UPDATE `creature_template` SET `scriptname`='boss_anubarak_trial', `AIName` ='' WHERE `entry`=34564;
+UPDATE `creature_template` SET `ScriptName`='mob_frost_sphere', `AIName` = '' WHERE `entry` = 34606;
+UPDATE `creature_template` SET `scriptname`='mob_swarm_scarab', `AIName` ='' WHERE `entry`=34605;
+UPDATE `creature_template` SET `scriptname`='mob_nerubian_burrower', `AIName` ='' WHERE `entry`=34607;
+UPDATE `creature_template` SET `scriptname`='mob_anubarak_spike', `AIName` ='' WHERE `entry`=34660;
+-- Instance
+UPDATE `instance_template` SET `script`='instance_trial_of_the_crusader' WHERE `map`=649;
diff --git a/sql/updates/9521_world_spell_linked_spell.sql b/sql/updates/9521_world_spell_linked_spell.sql
new file mode 100644
index 00000000000..c1b0115f038
--- /dev/null
+++ b/sql/updates/9521_world_spell_linked_spell.sql
@@ -0,0 +1,9 @@
+-- spell_linked_spell
+DELETE FROM `spell_linked_spell` WHERE `spell_trigger` IN (66870,67621,67622,67623,-66683,-67661);
+INSERT INTO `spell_linked_spell` (`spell_trigger`,`spell_effect`,`type`,`comment`) VALUES
+(66870,-66823,1, 'Remove Paralytic Toxin when hit by Burning Bite'),
+(67621,-67618,1, 'Remove Paralytic Toxin when hit by Burning Bite'),
+(67622,-67619,1, 'Remove Paralytic Toxin when hit by Burning Bite'),
+(67623,-67620,1, 'Remove Paralytic Toxin when hit by Burning Bite');
+(-66683,68667,0, 'Icehowl - Surge of Adrenaline'),
+(-67661,68667,0, 'Icehowl - Surge of Adrenaline');
\ No newline at end of file