diff --git a/ACID/acid_classic.sql b/ACID/acid_classic.sql
index 2ae55c2bd..b00fce9b3 100644
--- a/ACID/acid_classic.sql
+++ b/ACID/acid_classic.sql
@@ -13587,115 +13587,127 @@ INSERT INTO `creature_ai_scripts` (`id`,`creature_id`,`event_type`,`event_invers
 -- =================
 -- Blackfathom Deeps
 -- =================
--- Argent Guard Thaelrid (4787) - NSR
+-- Argent Guard Thaelrid 4787 - NSR
 -- Fallenroot Shadowstalker 4798
 ('479801','4798','1','0','100','1','1000','1000','5000','5000','0','0','11','7939','0','34','11','22766','0','34','0','0','0','0','Fallenroot Shadowstalker - Cast Sneak OOC'),
-('479802','4798','0','0','100','1025','5000','7000','20000','35000','0','0','11','6205','1','32','0','0','0','0','0','0','0','0','Fallenroot Shadowstalker - Cast Curse of Weakness'),
+('479802','4798','0','0','100','1025','0','10000','12000','24000','0','0','11','6205','1','32','0','0','0','0','0','0','0','0','Fallenroot Shadowstalker - Cast Curse of Weakness'),
 -- Fallenroot Hellcaller 4799
-('479901','4799','4','0','100','0','0','0','0','0','0','0','57','2','35','0','0','0','0','0','0','0','0','0','Fallenroot Hellcaller - Enable Range Mode on Aggro'),
-('479902','4799','0','0','100','1025','12000','15000','15000','19000','0','0','11','8129','16','512','0','0','0','0','0','0','0','0','Fallenroot Hellcaller - Cast Mana Burn on Random Player Mana User'),
-('479903','4799','9','0','100','1025','0','40','2400','3800','0','0','11','9613','1','256','0','0','0','0','0','0','0','0','Fallenroot Hellcaller - Cast Shadow Bolt'),
+('479901','4799','1','0','100','0','0','0','0','0','0','0','57','2','35','0','0','0','0','0','0','0','0','0','Fallenroot Hellcaller - Enable Range Mode on Spawn'),
+('479902','4799','0','0','100','1025','0','20000','9000','18000','0','0','11','8129','16','512','0','0','0','0','0','0','0','0','Fallenroot Hellcaller - Cast Mana Burn on Random Player Mana User'),
+('479903','4799','0','0','100','1281','0','1000','3000','4000','0','0','11','9613','1','256','0','0','0','0','0','0','0','0','Fallenroot Hellcaller - Cast Shadow Bolt (Range Mode)'),
+('479904','4799','0','0','100','1537','0','1000','5000','20000','0','0','11','9613','1','256','0','0','0','0','0','0','0','0','Fallenroot Hellcaller - Cast Shadow Bolt (Melee Mode)'),
 -- Blackfathom Sea Witch 4805
-('480501','4805','1','0','100','1','1000','1000','1800000','1800000','0','0','11','12544','0','0','0','0','0','0','0','0','0','0','Blackfathom Sea Witch - Cast Frost Armor on Spawn'),
-('480502','4805','9','0','100','1025','0','8','16000','20000','0','0','11','122','0','0','0','0','0','0','0','0','0','0','Blackfathom Sea Witch - Cast Frost Nova'),
-('480503','4805','0','0','100','1024','3000','6000','0','0','0','0','11','6143','0','0','0','0','0','0','0','0','0','0','Blackfathom Sea Witch - Cast Frost Ward'),
-('480504','4805','27','0','100','1','12544','1','15000','30000','0','0','11','12544','0','0','0','0','0','0','0','0','0','0','Blackfathom Sea Witch - Cast Frost Armor on Missing Buff'),
-('480505','4805','2','0','100','0','15','0','0','0','0','0','25','0','0','0','1','1150','0','0','0','0','0','0','Blackfathom Sea Witch - Flee at 15% HP'),
--- Blackfathom Myrmidon
-('480701','4807','0','0','100','1025','5000','9000','16000','20000','0','0','11','8379','1','0','0','0','0','0','0','0','0','0','Blackfathom Myrmidon - Cast Disarm'),
--- Twilight Acolyte
-('480901','4809','14','0','100','1025','750','40','18000','22000','0','0','11','2055','12','0','0','0','0','0','0','0','0','0','Twilight Acolyte - Cast Heal on Friendlies'),
-('480902','4809','2','0','100','1025','50','0','22000','25000','0','0','11','8362','0','0','0','0','0','0','0','0','0','0','Twilight Acolyte - Cast Renew at 50% HP'),
--- Twilight Reaver
-('481001','4810','0','0','100','1025','5000','9000','8000','12000','0','0','11','8374','1','0','0','0','0','0','0','0','0','0','Twilight Reaver - Cast Arcing Smash'),
+('480501','4805','0','0','100','1025','2000','20000','15000','30000','0','0','11','122','17','0','0','0','0','0','0','0','0','0','Blackfathom Sea Witch - Cast Frost Nova'),
+('480502','4805','0','0','100','1025','0','10000','0','20000','0','0','11','6143','0','32','0','0','0','0','0','0','0','0','Blackfathom Sea Witch - Cast Frost Ward'),
+('480503','4805','27','0','100','1','12544','1','15000','30000','0','0','11','12544','0','0','0','0','0','0','0','0','0','0','Blackfathom Sea Witch - Cast Frost Armor on Missing Buff'),
+('480504','4805','2','0','100','0','15','0','0','0','0','0','25','0','0','0','1','1150','0','0','0','0','0','0','Blackfathom Sea Witch - Flee at 15% HP'),
+-- Blackfathom Myrmidon 4807
+('480701','4807','0','0','100','1025','3000','15000','16000','25000','0','0','11','8379','1','0','0','0','0','0','0','0','0','0','Blackfathom Myrmidon - Cast Disarm'),
+('480702','4807','2','0','100','0','15','0','0','0','0','0','25','0','0','0','1','1150','0','0','0','0','0','0','Blackfathom Myrmidon - Flee at 15% HP'),
+-- Twilight Acolyte 4809 - creature_spell_list
+('480901','4809','4','0','15','0','0','0','0','0','0','0','54','0','0','910','0','0','0','0','0','0','0','0','Twilight Acolyte - Random Say on Aggro'),
+('480902','4809','2','0','100','0','15','0','0','0','0','0','25','0','0','0','1','1150','0','0','0','0','0','0','Twilight Acolyte - Flee at 15% HP'),
+-- Twilight Reaver 4810
+('481001','4810','0','0','100','1025','0','10000','2000','15000','0','0','11','8374','1','0','0','0','0','0','0','0','0','0','Twilight Reaver - Cast Arcing Smash'),
 ('481002','4810','2','0','100','0','15','0','0','0','0','0','25','0','0','0','1','1150','0','0','0','0','0','0','Twilight Reaver - Flee at 15% HP'),
+('481003','4810','4','0','15','0','0','0','0','0','0','0','54','0','0','910','0','0','0','0','0','0','0','0','Twilight Reaver - Random Say on Aggro'),
 -- Twilight Aquamancer 4811
 ('481101','4811','1','0','100','0','1000','1000','0','0','0','0','56','0','0','0','0','0','0','0','0','0','0','0','Twilight Aquamancer - Despawn Guardians on OOC'),
 ('481102','4811','1','0','100','0','2000','2000','0','0','0','0','11','8372','0','0','0','0','0','0','0','0','0','0','Twilight Aquamancer - Cast Summon Aqua Guardian on OOC'),
-('481103','4811','4','0','100','0','0','0','0','0','0','0','57','2','35','0','0','0','0','0','0','0','0','0','Twilight Aquamancer - Enable Range Mode on Aggro'),
+('481103','4811','11','0','100','0','0','0','0','0','0','0','57','2','35','0','0','0','0','0','0','0','0','0','Twilight Aquamancer - Enable Range Mode on Spawn'),
 ('481104','4811','2','0','100','1024','15','0','0','0','0','0','25','0','0','0','1','1150','0','0','0','0','0','0','Twilight Aquamancer - Flee at 15% HP'),
-('481105','4811','9','0','100','1025','0','40','2400','3800','0','0','11','9672','1','256','0','0','0','0','0','0','0','0','Twilight Aquamancer - Cast Frostbolt'),
+('481105','4811','0','0','100','1281','0','1000','3000','4000','0','0','11','9672','1','256','0','0','0','0','0','0','0','0','Twilight Aquamancer - Cast Frostbolt (Range Mode)'),
+('481106','4811','0','0','100','1537','0','1000','5000','20000','0','0','11','9672','1','256','0','0','0','0','0','0','0','0','Twilight Aquamancer - Cast Frostbolt (Melee Mode)'),
+('481107','4811','4','0','15','0','0','0','0','0','0','0','54','0','0','910','0','0','0','0','0','0','0','0','Twilight Aquamancer - Random Say on Aggro'),
 -- Twilight Loreseeker 4812
-('481201','4812','0','0','100','1025','5000','9000','12000','20000','0','0','11','18972','4','32','0','0','0','0','0','0','0','0','Twilight Loreseeker - Cast Slow'),
-('481202','4812','16','0','100','1025','8365','30','30000','46000','0','0','11','8365','12','0','0','0','0','0','0','0','0','0','Twilight Loreseeker - Cast Enlarge on Friendly Missing Buff'),
+('481201','4812','0','0','100','1025','5000','20000','12000','20000','0','0','11','18972','4','32','0','0','0','0','0','0','0','0','Twilight Loreseeker - Cast Slow'),
+('481202','4812','16','0','100','1025','8365','30','10000','20000','0','0','11','8365','12','0','0','0','0','0','0','0','0','0','Twilight Loreseeker - Cast Enlarge on Friendly Missing Buff'),
+('481203','4812','4','0','15','0','0','0','0','0','0','0','54','0','0','910','0','0','0','0','0','0','0','0','Twilight Loreseeker - Random Say on Aggro'),
+('481204','4812','2','0','100','1024','15','0','0','0','0','0','25','0','0','0','1','1150','0','0','0','0','0','0','Twilight Loreseeker - Flee at 15% HP'),
 -- Twilight Shadowmage 4813
 ('481301','4813','1','0','100','0','1000','1000','0','0','0','0','56','0','0','0','0','0','0','0','0','0','0','0','Twilight Shadowmage - Despawn Guardians on OOC'),
 ('481302','4813','1','0','100','0','2000','2000','0','0','0','0','11','12746','0','0','0','0','0','0','0','0','0','0','Twilight Shadowmage - Cast Summon Voidwalker on OOC'),
-('481303','4813','4','0','100','0','0','0','0','0','0','0','57','2','35','0','0','0','0','0','0','0','0','0','Twilight Shadowmage - Enable Range Mode on Aggro'),
+('481303','4813','11','0','100','0','0','0','0','0','0','0','57','2','35','0','0','0','0','0','0','0','0','0','Twilight Shadowmage - Enable Range Mode on Spawn'),
 ('481304','4813','2','0','100','1024','15','0','0','0','0','0','25','0','0','0','1','1150','0','0','0','0','0','0','Twilight Shadowmage - Flee at 15% HP'),
-('481305','4813','0','0','100','1025','18000','26000','24000','30000','0','0','11','7645','5','512','0','0','0','0','0','0','0','0','Twilight Shadowmage - Cast Dominate Mind'),
-('481306','4813','9','0','100','1025','0','40','2400','3800','0','0','11','9613','1','256','0','0','0','0','0','0','0','0','Twilight Shadowmage - Cast Shadow Bolt'),
+('481305','4813','0','0','100','1025','8000','26000','24000','30000','0','0','11','7645','5','512','0','0','0','0','0','0','0','0','Twilight Shadowmage - Cast Dominate Mind'),
+('481306','4813','0','0','100','1281','0','1000','3000','4000','0','0','11','9613','1','256','0','0','0','0','0','0','0','0','Twilight Shadowmage - Cast Shadow Bolt (Range Mode)'),
+('481307','4813','0','0','100','1537','0','1000','5000','20000','0','0','11','9613','1','256','0','0','0','0','0','0','0','0','Twilight Shadowmage - Cast Shadow Bolt (Melee Mode)'),
+('481308','4813','4','0','15','0','0','0','0','0','0','0','54','0','0','910','0','0','0','0','0','0','0','0','Twilight Shadowmage - Random Say on Aggro'),
 -- Twilight Elementalist 4814
-('481401','4814','4','0','15','0','0','0','0','0','0','0','1','2407','2409','0','0','0','0','0','0','0','0','0','Twilight Elementalist - Say on Aggro'),
-('481402','4814','0','0','100','1025','4000','7000','9000','12000','0','0','11','13728','4','0','0','0','0','0','0','0','0','0','Twilight Elementalist - Cast Earth Shock'),
-('481403','4814','0','0','100','1025','5000','9000','13000','17000','0','0','11','15039','4','0','0','0','0','0','0','0','0','0','Twilight Elementalist - Cast Flame Shock'),
-('481404','4814','0','0','100','1025','1000','2500','11000','15000','0','0','11','12548','1','0','0','0','0','0','0','0','0','0','Twilight Elementalist - Cast Frost Shock'),
-('481405','4814','0','0','100','1025','3000','6000','7000','12000','0','0','11','11824','1','0','0','0','0','0','0','0','0','0','Twilight Elementalist - Cast Shock'),
--- Murkshallow Snapclaw
-('481501','4815','0','0','100','1025','5000','9000','16000','20000','0','0','11','8379','1','0','0','0','0','0','0','0','0','0','Murkshallow Snapclaw - Cast Disarm'),
+('481401','4814','4','0','15','0','0','0','0','0','0','0','54','0','0','910','0','0','0','0','0','0','0','0','Twilight Elementalist - Random Say on Aggro'),
+('481402','4814','0','0','100','1025','7000','21000','9000','18000','0','0','11','8046','4','2048','0','0','0','0','0','0','0','0','Twilight Elementalist - Cast Earth Shock on Casting'),
+('481403','4814','0','0','100','1025','5000','20000','13000','19000','0','0','11','8052','4','0','0','0','0','0','0','0','0','0','Twilight Elementalist - Cast Flame Shock'),
+('481404','4814','0','0','100','1025','5000','20000','11000','15000','0','0','11','8056','1','0','0','0','0','0','0','0','0','0','Twilight Elementalist - Cast Frost Shock'),
+('481405','4814','0','0','100','1025','5000','20000','7000','21000','0','0','11','2609','1','0','0','0','0','0','0','0','0','0','Twilight Elementalist - Cast Shock'),
+('481406','4814','2','0','100','1024','15','0','0','0','0','0','25','0','0','0','1','1150','0','0','0','0','0','0','Twilight Elementalist - Flee at 15% HP'),
+-- Murkshallow Snapclaw 4815
+('481501','4815','0','0','100','1025','10000','25000','16000','20000','0','0','11','8379','1','0','0','0','0','0','0','0','0','0','Murkshallow Snapclaw - Cast Disarm'),
+('481502','4815','2','0','100','1024','15','0','0','0','0','0','25','0','0','0','1','1150','0','0','0','0','0','0','Murkshallow Snapclaw - Flee at 15% HP'),
 -- Blindlight Murloc 4818
-('481801','4818','0','0','100','1025','1000','3000','180000','190000','0','0','11','7164','0','0','0','0','0','0','0','0','0','0','Blindlight Murloc - Cast Defensive Stance'),
+('481801','4818','0','0','100','1025','1000','10000','180000','190000','0','0','11','7164','0','0','0','0','0','0','0','0','0','0','Blindlight Murloc - Cast Defensive Stance'),
 ('481802','4818','0','0','100','1025','0','10000','8000','14000','0','0','11','7405','1','0','0','0','0','0','0','0','0','0','Blindlight Murloc - Cast Sunder Armor'),
--- Blindlight Muckdweller
-('481901','4819','2','0','100','1025','50','0','50000','60000','0','0','11','8382','1','0','0','0','0','0','0','0','0','0','Blindlight Muckdweller - Cast Leech Poison at 50% HP'),
--- Blindlight Oracle 4820
-('482001','4820','4','0','100','0','0','0','0','0','0','0','57','2','35','0','0','0','0','0','0','0','0','0','Blindlight Oracle - Enable Range Mode on Aggro'),
+('481803','4818','2','0','100','1024','15','0','0','0','0','0','25','0','0','0','1','1150','0','0','0','0','0','0','Blindlight Murloc - Flee at 15% HP'),
+-- Blindlight Muckdweller 4819
+('481901','4819','0','0','100','1025','5000','20000','20000','30000','0','0','11','8382','1','32','0','0','0','0','0','0','0','0','Blindlight Muckdweller - Cast Leech Poison'),
+('481902','4819','2','0','100','1024','15','0','0','0','0','0','25','0','0','0','1','1150','0','0','0','0','0','0','Blindlight Muckdweller - Flee at 15% HP'),
+-- Blindlight Oracle 4820 - creature_spell_list
+('482001','4820','11','0','100','0','0','0','0','0','0','0','57','2','35','0','0','0','0','0','0','0','0','0','Blindlight Oracle - Enable Range Mode on Spawn'),
 ('482002','4820','2','0','100','1024','15','0','0','0','0','0','25','0','0','0','1','1150','0','0','0','0','0','0','Blindlight Oracle - Flee at 15% HP'),
-('482003','4820','14','0','100','1025','800','0','0','0','0','0','11','6063','12','0','0','0','0','0','0','0','0','0','Blindlight Oracle - Cast Heal on Friendly Missing HP'),
-('482004','4820','14','0','100','1025','1000','40','30000','40000','0','0','11','8362','12','0','0','0','0','0','0','0','0','0','Blindlight Oracle - Cast Renew on Friendly Missing HP'),
-('482005','4820','9','0','100','1025','0','40','2400','3800','0','0','11','9532','1','256','0','0','0','0','0','0','0','0','Blindlight Oracle - Cast Lightning Bolt'),
--- Skittering Crustacean
-('482101','4821','2','0','100','0','15','0','0','0','0','0','25','0','0','0','1','1150','0','0','0','0','0','0','Skittering Crustacean - Flee at 15% HP'),
+-- Skittering Crustacean 4821
+('482101','4821','2','0','100','1024','30','0','0','0','0','0','11','8392','15','0','25','0','0','0','1','1150','0','0','Skittering Crustacean - Cast Hyper Coward, Flee at 30% HP'),
 -- Snapping Crustacean 4822
 ('482201','4822','2','0','100','0','15','0','0','0','0','0','25','0','0','0','1','1150','0','0','0','0','0','0','Snapping Crustacean - Flee at 15% HP'),
 ('482202','4822','11','0','100','0','0','0','0','0','0','0','11','4161','0','34','0','0','0','0','0','0','0','0','Snapping Crustacean - Cast Quick Snap on Spawn'),
 -- Barbed Crustacean 4823
-('482301','4823','2','0','100','0','15','0','0','0','0','0','25','0','0','0','1','1150','0','0','0','0','0','0','Barbed Crustacean - Flee at 15% HP'),
 ('482302','4823','11','0','100','0','0','0','0','0','0','0','11','8393','0','34','0','0','0','0','0','0','0','0','Barbed Crustacean - Cast Barbs on Spawn'),
--- Aku'mai Fisher (4824) - NSR
--- Aku'mai Snapjaw
-('482501','4825','0','0','100','1025','5000','8000','9000','14000','0','0','11','8391','1','0','0','0','0','0','0','0','0','0','Aku''mai Snapjaw - Cast Ravage'),
--- Deep Pool Threshfin
-('482701','4827','0','0','100','1025','3000','6000','20000','25000','0','0','11','3604','1','0','0','0','0','0','0','0','0','0','Deep Pool Threshfin - Cast Tendon Rip'),
--- Aku'mai
-('482901','4829','0','0','100','1025','5000','9000','25000','50000','0','0','11','3815','0','0','0','0','0','0','0','0','0','0','Aku''mai - Cast Poison Cloud'),
-('482902','4829','2','0','100','1025','30','0','15000','20000','0','0','11','3490','0','0','1','1191','0','0','0','0','0','0','Aku''mai - Cast Frenzied Rage at 30% HP'),
+-- Aku'mai Fisher 4824 - NSR
+-- Aku'mai Snapjaw 4825
+('482501','4825','0','0','100','1025','3000','15000','8000','16000','0','0','11','8391','1','0','0','0','0','0','0','0','0','0','Aku''mai Snapjaw - Cast Ravage'),
+-- Deep Pool Threshfin 4827
+('482701','4827','0','0','100','1025','3000','15000','20000','25000','0','0','11','3604','1','0','0','0','0','0','0','0','0','0','Deep Pool Threshfin - Cast Tendon Rip'),
+-- Aku'mai 4829
+('482901','4829','0','0','100','1025','5000','20000','25000','30000','0','0','11','3815','17','0','0','0','0','0','0','0','0','0','Aku''mai - Cast Poison Cloud'),
+('482902','4829','0','0','100','1025','5000','20000','6000','30000','0','0','11','3490','15','0','0','0','0','0','0','0','0','0','Aku''mai - Cast Frenzied Rage'),
 -- Old Serra'kis 4830
 ('483001','4830','11','0','100','0','0','0','0','0','0','0','11','8434','0','34','0','0','0','0','0','0','0','0','Old Serra\'kis - Cast Leech Pulse on Spawn'),
 -- Lady Sarevess 4831
-('483101','4831','4','0','100','0','0','0','0','0','0','0','57','2','25','0','1','6169','0','0','0','0','0','0','Lady Sarevess - Enable Range Mode and Yell on Aggro'),
-('483102','4831','6','0','100','0','0','0','0','0','0','0','1','6170','0','0','0','0','0','0','0','0','0','0','Lady Sarevess - Yell on Death'),
-('483103','4831','0','0','100','1025','7000','9000','9000','13000','0','0','11','246','5','544','0','0','0','0','0','0','0','0','Lady Sarevess - Cast Slow'),
-('483104','4831','9','0','100','1025','0','5','9000','13000','0','0','11','865','17','1024','0','0','0','0','0','0','0','0','Lady Sarevess - Cast Frost Nova'),
-('483105','4831','0','0','100','1025','9000','12000','12000','15000','0','0','11','8435','1','0','0','0','0','0','0','0','0','0','Lady Sarevess - Cast Forked Lightning'),
-('483106','4831','9','0','100','1025','5','30','2300','3900','0','0','11','6660','1','256','0','0','0','0','0','0','0','0','Lady Sarevess - Cast Shoot'),
--- Twilight Lord Kelris
-('483201','4832','4','0','100','0','0','0','0','0','0','0','1','6171','0','0','0','0','0','0','0','0','0','0','Twilight Lord Kelris - Yell on Aggro'),
-('483202','4832','0','0','100','1025','2000','5000','7000','9000','0','0','11','15587','1','0','0','0','0','0','0','0','0','0','Twilight Lord Kelris - Cast Mind Blast'),
-('483203','4832','0','0','100','1025','9000','12000','15000','20000','0','0','11','8399','5','0','4','5804','0','0','0','0','0','0','Twilight Lord Kelris - Cast Sleep and Play Sound'),
-('483204','4832','6','0','100','0','0','0','0','0','0','0','1','6172','0','0','34','1','3','0','0','0','0','0','Twilight Lord Kelris - Yell and Set Instance Data on Death'),
--- Ghamoo-ra
-('488701','4887','0','0','100','1025','5000','8000','9000','13000','0','0','11','5568','0','0','0','0','0','0','0','0','0','0','Ghamoo-ra - Cast Trample'),
--- Murkshallow Softshell
-('497701','4977','2','0','100','0','15','0','0','0','0','0','25','0','0','0','1','1150','0','0','0','0','0','0','Murkshallow Softshell - Flee at 15% HP'),
--- Aku'mai Servant
-('497801','4978','0','0','100','1025','2000','4000','5000','8000','0','0','11','8398','4','0','0','0','0','0','0','0','0','0','Aku''mai Servant - Cast Frostbolt Volley'),
-('497802','4978','0','0','100','1025','9000','12000','12000','16000','0','0','11','865','0','0','0','0','0','0','0','0','0','0','Aku''mai Servant - Cast Frost Nova'),
--- Aqua Guardian
-('604701','6047','0','0','100','1025','5000','9000','14000','18000','0','0','11','865','0','0','0','0','0','0','0','0','0','0','Aqua Guardian - Cast Frost Nova'),
+('483101','4831','11','0','100','0','0','0','0','0','0','0','57','2','25','0','0','0','0','0','0','0','0','0','Lady Sarevess - Enable Range Mode on Spawn'),
+('483102','4831','4','0','100','0','0','0','0','0','0','0','1','6169','0','0','0','0','0','0','0','0','0','0','Lady Sarevess - Yell on Aggro'),
+('483103','4831','5','0','100','1025','5000','5000','1','0','0','0','1','6170','0','0','0','0','0','0','0','0','0','0','Lady Sarevess - Yell on Player Kill'),
+('483104','4831','0','0','100','1025','10000','24000','15000','30000','0','0','11','865','17','1024','0','0','0','0','0','0','0','0','Lady Sarevess - Cast Frost Nova'),
+('483105','4831','0','0','100','1025','7000','9000','9000','13000','0','0','11','246','5','544','0','0','0','0','0','0','0','0','Lady Sarevess - Cast Slow'),
+('483106','4831','0','0','100','1281','3000','3000','5000','20000','0','0','11','8435','1','0','0','0','0','0','0','0','0','0','Lady Sarevess - Cast Forked Lightning (Range Mode)'),
+('483107','4831','0','0','100','1537','3000','3000','2000','8000','0','0','11','8435','1','0','0','0','0','0','0','0','0','0','Lady Sarevess - Cast Forked Lightning (Melee Mode)'),
+('483108','4831','9','0','100','1025','5','30','2000','3000','0','0','11','6660','1','256','0','0','0','0','0','0','0','0','Lady Sarevess - Cast Shoot'),
+-- Twilight Lord Kelris 4832
+('483201','4832','4','0','100','0','0','0','0','0','0','0','1','6171','0','0','39','60','0','0','0','0','0','0','Twilight Lord Kelris - Yell, Call For Help on Aggro'),
+('483202','4832','0','0','100','1025','0','10000','7000','21000','0','0','11','15587','1','0','0','0','0','0','0','0','0','0','Twilight Lord Kelris - Cast Mind Blast'),
+('483203','4832','0','0','100','1025','5000','15000','15000','30000','0','0','11','8399','17','0','4','5804','0','0','0','0','0','0','Twilight Lord Kelris - Cast Sleep and Play Sound'),
+('483204','4832','6','0','100','0','0','0','0','0','0','0','34','1','3','0','0','0','0','0','0','0','0','0','Twilight Lord Kelris - Set Instance Data on Death'),
+('483205','4832','5','0','100','1025','5000','5000','1','0','0','0','1','6172','0','0','0','0','0','0','0','0','0','0','Twilight Lord Kelris - Yell on Player Kill'),
+-- Ghamoo-ra 4887
+('488701','4887','0','0','100','1025','5000','15000','9000','15000','0','0','11','5568','17','0','0','0','0','0','0','0','0','0','Ghamoo-ra - Cast Trample'),
+-- Murkshallow Softshell 4977 - NSR
+-- Aku'mai Servant 4978
+('497801','4978','0','0','100','1025','2000','12000','15000','30000','0','0','11','8398','17','0','0','0','0','0','0','0','0','0','Aku''mai Servant - Cast Frostbolt Volley'),
+('497802','4978','0','0','100','1025','7000','21000','15000','30000','0','0','11','865','17','0','0','0','0','0','0','0','0','0','Aku''mai Servant - Cast Frost Nova'),
+-- Aqua Guardian 6047
+('604701','6047','0','0','100','1025','8000','16000','15000','30000','0','0','11','865','17','0','0','0','0','0','0','0','0','0','Aqua Guardian - Cast Frost Nova'),
 -- Gelihast 6243
 ('624301','6243','11','0','100','0','0','0','0','0','0','0','11','7165','0','34','0','0','0','0','0','0','0','0','Gelihast - Cast Battle Stance on Spawn'),
 ('624302','6243','0','0','100','1025','0','10000','7000','13000','0','0','11','6533','1','0','0','0','0','0','0','0','0','0','Gelihast - Cast Net'),
--- Morridune
+-- Morridune 6729
 ('672901','6729','1','0','100','0','1000','1000','0','0','0','0','1','2848','0','0','0','0','0','0','0','0','0','0','Morridune - Yell on Spawn'),
 -- Baron Aquanis 12876
-('1287601','12876','4','0','100','0','0','0','0','0','0','0','57','2','35','0','0','0','0','0','0','0','0','0','Baron Aquanis - Enable Range Mode on Aggro'),
-('1287602','12876','0','0','100','1025','7000','12000','14000','19000','0','0','11','14907','17','1024','0','0','0','0','0','0','0','0','Baron Aquanis - Cast Frost Nova'),
-('1287603','12876','9','0','100','1025','0','40','2400','3800','0','0','11','15043','1','256','0','0','0','0','0','0','0','0','Baron Aquanis - Cast Frostbolt'),
+('1287601','12876','11','0','100','0','0','0','0','0','0','0','57','2','35','0','0','0','0','0','0','0','0','0','Baron Aquanis - Enable Range Mode on Spawn'),
+('1287602','12876','0','0','100','1025','7000','15000','14000','19000','0','0','11','15531','17','1024','0','0','0','0','0','0','0','0','Baron Aquanis - Cast Frost Nova'),
+('1287603','12876','0','0','100','1281','0','1000','3000','4000','0','0','11','15043','1','256','0','0','0','0','0','0','0','0','Baron Aquanis - Cast Frostbolt (Range Mode)'),
+('1287604','12876','0','0','100','1537','0','1000','5000','20000','0','0','11','15043','1','256','0','0','0','0','0','0','0','0','Baron Aquanis - Cast Frostbolt (Melee Mode)'),
 -- Lorgus Jett 12902
-('1290201','12902','4','0','100','0','0','0','0','0','0','0','57','2','35','0','0','0','0','0','0','0','0','0','Lorgus Jett - Enable Range Mode on Aggro'),
+('1290201','12902','11','0','100','0','0','0','0','0','0','0','57','2','35','0','0','0','0','0','0','0','0','0','Lorgus Jett - Enable Range Mode on Spawn'),
 ('1290202','12902','27','0','100','1','12550','1','15000','30000','0','0','11','12550','0','0','0','0','0','0','0','0','0','0','Lorgus Jett - Cast Lightning Shield on Missing Buff'),
-('1290203','12902','9','0','100','1025','0','40','2400','3800','0','0','11','12167','1','256','0','0','0','0','0','0','0','0','Lorgus Jett - Cast Lightning Bolt'),
+('1290203','12902','0','0','100','1281','0','1000','3000','4000','0','0','11','12167','1','256','0','0','0','0','0','0','0','0','Lorgus Jett - Cast Lightning Bolt (Range Mode)'),
+('1290204','12902','0','0','100','1537','0','1000','5000','20000','0','0','11','12167','1','256','0','0','0','0','0','0','0','0','Lorgus Jett - Cast Lightning Bolt (Melee Mode)'),
 
 
 
diff --git a/Updates/4690_MC_BFD.sql b/Updates/4690_MC_BFD.sql
new file mode 100644
index 000000000..0d70dc69a
--- /dev/null
+++ b/Updates/4690_MC_BFD.sql
@@ -0,0 +1,84 @@
+-- Blackfathom Deeps
+UPDATE `creature_template` SET `CharmedSpellList`='481405', `MechanicImmuneMask` = `MechanicImmuneMask`&~1 WHERE `entry`='4814'; -- https://www.wowhead.com/classic/npc=4814/twilight-elementalist
+UPDATE `creature_template` SET `CharmedSpellList`='481305', `MechanicImmuneMask` = `MechanicImmuneMask`&~1 WHERE `entry`='4813'; -- https://www.wowhead.com/classic/npc=4813/twilight-shadowmage
+UPDATE `creature_template` SET `CharmedSpellList`='481105', `MechanicImmuneMask` = `MechanicImmuneMask`&~1 WHERE `entry`='4811'; -- https://www.wowhead.com/classic/npc=4811/twilight-aquamancer
+UPDATE `creature_template` SET `CharmedSpellList`='481205', `MechanicImmuneMask` = `MechanicImmuneMask`&~1 WHERE `entry`='4812'; -- https://www.wowhead.com/classic/npc=4812/twilight-loreseeker
+UPDATE `creature_template` SET `SpellList` = '480901', `CharmedSpellList`='480905', `MechanicImmuneMask` = `MechanicImmuneMask`&~1 WHERE `entry`='4809'; -- https://www.wowhead.com/classic/npc=4809/twilight-acolyte
+UPDATE `creature_template` SET `CharmedSpellList`='481005', `MechanicImmuneMask` = `MechanicImmuneMask`&~1 WHERE `entry`='4810'; -- https://www.wowhead.com/classic/npc=4810/twilight-reaver
+UPDATE `creature_template` SET `CharmedSpellList`='1290205', `MechanicImmuneMask` = `MechanicImmuneMask`&~1 WHERE `entry`='12902'; -- https://www.wowhead.com/classic/npc=12902/lorgus-jett
+UPDATE `creature_template` SET `CharmedSpellList`='624305', `MechanicImmuneMask` = `MechanicImmuneMask`&~1 WHERE `entry`='6243'; -- https://www.wowhead.com/classic/npc=6243/gelihast
+UPDATE `creature_template` SET `SpellList` = '482001', `CharmedSpellList`='482005', `MechanicImmuneMask` = `MechanicImmuneMask`&~1 WHERE `entry`='4820'; -- https://www.wowhead.com/classic/npc=4820/blindlight-oracle
+UPDATE `creature_template` SET `CharmedSpellList`='481905', `MechanicImmuneMask` = `MechanicImmuneMask`&~1 WHERE `entry`='4819'; -- https://www.wowhead.com/classic/npc=4819/blindlight-muckdweller
+UPDATE `creature_template` SET `CharmedSpellList`='483105', `MechanicImmuneMask` = `MechanicImmuneMask`&~1 WHERE `entry`='4831'; -- https://www.wowhead.com/classic/npc=4831/lady-sarevess
+UPDATE `creature_template` SET `CharmedSpellList`='481505', `MechanicImmuneMask` = `MechanicImmuneMask`&~1 WHERE `entry`='4815'; -- https://www.wowhead.com/classic/npc=4815/murkshallow-snapclaw
+UPDATE `creature_template` SET `CharmedSpellList`='481805', `MechanicImmuneMask` = `MechanicImmuneMask`&~1 WHERE `entry`='4818'; -- https://www.wowhead.com/classic/npc=4818/blindlight-murloc
+
+DELETE FROM `creature_spell_list_entry` WHERE `Id` IN (481405,481305,481105,481205,480905,481005,1290205,624305,482005,481905,483105,481505,481805,480901,482001);
+INSERT INTO `creature_spell_list_entry` (`Id`, `Name`, `ChanceSupportAction`, `ChanceRangedAttack`) VALUES
+(481405, 'Vanilla - Twilight Elementalist', 0, 0),
+(481305, 'Vanilla - Twilight Shadowmage', 0, 0),
+(481105, 'Vanilla - Twilight Aquamancer', 0, 0),
+(481205, 'Vanilla - Twilight Loreseeker', 0, 0),
+(480905, 'Vanilla - Twilight Acolyte', 0, 0),
+(481005, 'Vanilla - Twilight Reaver', 0, 0),
+(1290205, 'Vanilla - Lorgus Jett', 0, 0),
+(624305, 'Vanilla - Gelihast', 0, 0),
+(482005, 'Vanilla - Blindlight Oracle', 0, 0),
+(481905, 'Vanilla - Blindlight Muckdweller', 0, 0),
+(483105, 'Vanilla - Lady Sarevess', 0, 0),
+(481505, 'Vanilla - Murkshallow Snapclaw', 0, 0),
+(481805, 'Vanilla - Blindlight Murloc', 0, 0),
+
+(480901, 'Blackfathom Deeps - Twilight Acolyte', 0, 0),
+(482001, 'Blackfathom Deeps - Blindlight Oracle', 0, 0);
+
+DELETE FROM `creature_spell_list` WHERE `Id` IN (481405,481305,481105,481205,480905,481005,1290205,624305,482005,481905,483105,481505,481805,480901,482001);
+INSERT INTO `creature_spell_list` (`Id`, `Position`, `SpellId`, `Flags`, `CombatCondition`, `TargetId`, `ScriptId`, `Availability`, `Probability`, `InitialMin`, `InitialMax`, `RepeatMin`, `RepeatMax`, `Comments`) VALUES
+(481405, 6, 11824, 0, -1, 0, 0, 100, 1, 0, 0, 14438, 23894, 'Twilight Elementalist - Shock'),
+(481405, 5, 12548, 0, -1, 0, 0, 100, 1, 0, 0, 5994, 14117, 'Twilight Elementalist - Frost Shock'),
+(481405, 4, 15039, 0, -1, 0, 0, 100, 1, 0, 0, 11647, 19706, 'Twilight Elementalist - Flame Shock'),
+(481405, 3, 13281, 0, -1, 0, 0, 100, 1, 0, 0, 5632, 13512, 'Twilight Elementalist - Earth Shock'),
+(481405, 0, 2, 0, -1, 0, 0, 100, 1, 0, 0, 0, 0, 'Twilight Elementalist - Attack'),
+(481305, 3, 9613, 0, -1, 0, 0, 100, 1, 0, 0, 0, 0, 'Twilight Shadowmage - Shadow Bolt'),
+(481305, 0, 2, 0, -1, 0, 0, 100, 1, 0, 0, 0, 0, 'Twilight Shadowmage - Attack'),
+(481105, 3, 9672, 0, -1, 0, 0, 100, 1, 0, 0, 0, 0, 'Twilight Aquamancer - Frostbolt'),
+(481105, 0, 2, 0, -1, 0, 0, 100, 1, 0, 0, 0, 0, 'Twilight Aquamancer - Attack'),
+(481205, 4, 8365, 0, -1, 0, 0, 100, 1, 0, 0, 10006, 13510, 'Twilight Loreseeker - Enlarge'),
+(481205, 3, 25603, 0, -1, 0, 0, 100, 1, 0, 0, 11647, 16577, 'Twilight Loreseeker - Slow'),
+(481205, 0, 2, 0, -1, 0, 0, 100, 1, 0, 0, 0, 0, 'Twilight Loreseeker - Attack'),
+(480905, 4, 8362, 0, -1, 0, 0, 100, 1, 0, 0, 16315, 19958, 'Twilight Acolyte - Renew'),
+(480905, 0, 2, 0, -1, 0, 0, 100, 1, 0, 0, 0, 0, 'Twilight Acolyte - Attack'),
+(481005, 3, 8374, 0, -1, 0, 0, 100, 1, 0, 0, 0, 0, 'Twilight Reaver - Arcing Smash'),
+(481005, 0, 2, 0, -1, 0, 0, 100, 1, 0, 0, 0, 0, 'Twilight Reaver - Attack'),
+(1290205, 4, 12550, 0, -1, 0, 0, 100, 1, 0, 0, 18607, 20155, 'Lorgus Jett - Lightning Shield'),
+(1290205, 3, 12167, 0, -1, 0, 0, 100, 1, 0, 0, 0, 0, 'Lorgus Jett - Lightning Bolt'),
+(1290205, 0, 2, 0, -1, 0, 0, 100, 1, 0, 0, 0, 0, 'Lorgus Jett - Attack'),
+(624305, 4, 6533, 0, -1, 0, 0, 100, 1, 0, 0, 5740, 7930, 'Gelihast - Net'),
+(624305, 0, 2, 0, -1, 0, 0, 100, 1, 0, 0, 0, 0, 'Gelihast - Attack'),
+(482005, 4, 8362, 0, -1, 0, 0, 100, 1, 0, 0, 20000, 20000, 'Blindlight Oracle - Renew'),
+(482005, 3, 12167, 0, -1, 0, 0, 100, 1, 0, 0, 0, 0, 'Blindlight Oracle - Lightning Bolt'),
+(482005, 0, 2, 0, -1, 0, 0, 100, 1, 0, 0, 0, 0, 'Blindlight Oracle - Attack'),
+(481905, 3, 8382, 0, -1, 0, 0, 100, 1, 0, 0, 15034, 25015, 'Blindlight Muckdweller - Leech Poison'),
+(481905, 0, 2, 0, -1, 0, 0, 100, 1, 0, 0, 0, 0, 'Blindlight Muckdweller - Attack'),
+(483105, 6, 6660, 0, -1, 0, 0, 100, 1, 0, 0, 0, 0, 'Lady Sarevess - Shoot'),
+(483105, 5, 246, 0, -1, 0, 0, 100, 1, 0, 0, 8098, 9560, 'Lady Sarevess - Slow'),
+(483105, 3, 8435, 0, -1, 0, 0, 100, 1, 0, 0, 0, 0, 'Lady Sarevess - Forked Lightning'),
+(483105, 0, 2, 0, -1, 0, 0, 100, 1, 0, 0, 0, 0, 'Lady Sarevess - Attack'),
+(481505, 3, 6713, 0, -1, 0, 0, 100, 1, 0, 0, 31335, 44679, 'Murkshallow Snapclaw - Disarm'),
+(481505, 0, 2, 0, -1, 0, 0, 100, 1, 0, 0, 0, 0, 'Murkshallow Snapclaw - Attack'),
+(481805, 3, 11971, 0, -1, 0, 0, 100, 1, 0, 0, 6721, 9291, 'Blindlight Murloc - Sunder Armor'),
+(481805, 0, 2, 0, -1, 0, 0, 100, 1, 0, 0, 0, 0, 'Blindlight Murloc - Attack'),
+
+(480901, 3, 2055, 0, -1, 201, 0, 100, 1, 5000, 10000, 3000, 20000, 'Blackfathom Deeps - Twilight Acolyte - Heal on Friendly Missing 50% including self'),
+(480901, 4, 8362, 0, -1, 201, 0, 100, 1, 5000, 10000, 10000, 30000, 'Blackfathom Deeps - Twilight Acolyte - Renew on Friendly Missing 50% including self'),
+(482001, 0, 9532, 2, -1, 1, 0, 100, 1, 0, 0, 0, 0, 'Blackfathom Deeps - Blindlight Oracle - Lightning Bolt'),
+(482001, 3, 6063, 0, -1, 201, 0, 100, 1, 5000, 20000, 20000, 30000, 'Blackfathom Deeps - Blindlight Oracle - Heal on Friendly Missing 50% including self'),
+(482001, 4, 8362, 0, -1, 201, 0, 100, 1, 10000, 30000, 20000, 30000, 'Blackfathom Deeps - Blindlight Oracle - Renew on Friendly Missing 50% including self');
+
+DELETE FROM `dbscript_random_templates` WHERE `id` = 910;
+INSERT INTO `dbscript_random_templates` (`id`, `type`, `target_id`, `chance`, `comments`) VALUES
+(910, 0, 2406, 0, 'Blackfathom Deeps - Random Aggro Texts'), -- Aku'mai demands more sacrifices, now you must die!
+(910, 0, 2407, 0, 'Blackfathom Deeps - Random Aggro Texts'), -- Intruders!  The Hammer shall fall upon you.
+(910, 0, 2408, 0, 'Blackfathom Deeps - Random Aggro Texts'), -- The Old Gods will be restored.  You will not be allowed to interfere!
+(910, 0, 2409, 0, 'Blackfathom Deeps - Random Aggro Texts'); -- Your blood shall be the catalyst for the Old Gods' return!
+