diff --git a/sql/updates/12335_01_creature_template_spells-patch.sql b/sql/updates/12335_01_creature_template_spells-patch.sql
new file mode 100644
index 000000000..8fd450f63
--- /dev/null
+++ b/sql/updates/12335_01_creature_template_spells-patch.sql
@@ -0,0 +1,738 @@
+ALTER TABLE `db_version` CHANGE `required_12335_01_creature_template_spells` `required_12378_14_mangos_gossip_menu_option` BIT(1) NULL; 
+DELETE FROM mangos_string WHERE entry = 175; 
+INSERT INTO mangos_string (`entry`,`content_default`) VALUES (175, 'Liquid level: %f, ground: %f, type flags %u, status: %d.');
+delete from mangos_string where entry in(1194, 1195);
+INSERT INTO mangos_string VALUES
+(1194,'Current State Information: GOState %u, LootState %u. Collision %s',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL),
+(1195,'Current State Information: GOState %u, LootState %u. Collision %s, (door %s by default)',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL);
+DELETE FROM mangos_string WHERE entry IN (1509, 1510);
+INSERT INTO mangos_string VALUES
+(1509,'Pool %u not found (Maximal pool entry is %u)',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL),
+(1700,'Can\'t add item %u to vendor with unknown item type %u',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL),
+(1701,'Currency %u has maxCount = 0, but for currencies maxCount = buyCount, so it can\'t be 0 or less than that\'s currency precision (%u).',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL);
+
+DELETE FROM `instance_encounters` WHERE entry IN ('161',
+'162',
+'163',
+'164',
+'165',
+'166',
+'167',
+'201',
+'202',
+'203',
+'204',
+'205',
+'206',
+'207',
+'208',
+'209',
+'210',
+'211',
+'212',
+'213',
+'214',
+'215',
+'216',
+'217',
+'218',
+'219',
+'220',
+'221',
+'222',
+'224',
+'225',
+'226',
+'227',
+'228',
+'229',
+'230',
+'231',
+'232',
+'233',
+'234',
+'235',
+'236',
+'237',
+'238',
+'239',
+'240',
+'241',
+'242',
+'243',
+'244',
+'245',
+'246',
+'247',
+'248',
+'249',
+'250',
+'251',
+'252',
+'253',
+'254',
+'255',
+'256',
+'257',
+'258',
+'259',
+'260',
+'261',
+'262',
+'263',
+'264',
+'265',
+'266',
+'267',
+'268',
+'269',
+'270',
+'271',
+'272',
+'273',
+'274',
+'275',
+'276',
+'277',
+'278',
+'279',
+'280',
+'281',
+'282',
+'283',
+'284',
+'285',
+'286',
+'287',
+'288',
+'289',
+'290',
+'291',
+'292',
+'293',
+'294',
+'295',
+'296',
+'297',
+'298',
+'299',
+'300',
+'301',
+'302',
+'303',
+'304',
+'305',
+'306',
+'314',
+'315',
+'316',
+'317',
+'318',
+'319',
+'320',
+'321',
+'322',
+'323',
+'329',
+'330',
+'331',
+'332',
+'334',
+'336',
+'338',
+'339',
+'340',
+'341',
+'343',
+'344',
+'345',
+'346',
+'347',
+'348',
+'349',
+'350',
+'361',
+'362',
+'363',
+'364',
+'365',
+'366',
+'367',
+'368',
+'369',
+'370',
+'371',
+'372',
+'373',
+'374',
+'375',
+'376',
+'378',
+'379',
+'380',
+'381',
+'382',
+'383',
+'384',
+'385',
+'386',
+'387',
+'388',
+'389',
+'390',
+'391',
+'392',
+'393',
+'394',
+'395',
+'396',
+'397',
+'401',
+'402',
+'403',
+'404',
+'405',
+'406',
+'407',
+'408',
+'409',
+'410',
+'411',
+'412',
+'413',
+'414',
+'415',
+'416',
+'417',
+'418',
+'419',
+'420',
+'421',
+'422',
+'423',
+'424',
+'425',
+'426',
+'427',
+'428',
+'429',
+'430',
+'431',
+'432',
+'433',
+'434',
+'435',
+'436',
+'437',
+'438',
+'439',
+'440',
+'441',
+'443',
+'444',
+'445',
+'446',
+'447',
+'448',
+'449',
+'450',
+'451',
+'452',
+'453',
+'454',
+'455',
+'456',
+'457',
+'458',
+'459',
+'460',
+'461',
+'462',
+'463',
+'464',
+'465',
+'466',
+'467',
+'468',
+'469',
+'470',
+'471',
+'472',
+'473',
+'474',
+'475',
+'476',
+'477',
+'478',
+'479',
+'480',
+'481',
+'482',
+'483',
+'484',
+'485',
+'486',
+'487',
+'488',
+'490',
+'491',
+'492',
+'493',
+'494',
+'495',
+'496',
+'497',
+'498',
+'499',
+'500',
+'501',
+'502',
+'504',
+'505',
+'506',
+'507',
+'508',
+'509',
+'510',
+'511',
+'512',
+'513',
+'514',
+'515',
+'516',
+'517',
+'518',
+'519',
+'520',
+'521',
+'522',
+'523',
+'524',
+'525',
+'526',
+'527',
+'528',
+'529',
+'530',
+'531',
+'532',
+'533',
+'534',
+'535',
+'536',
+'537',
+'538',
+'539',
+'540',
+'541',
+'542',
+'543',
+'544',
+'545',
+'546',
+'547',
+'548',
+'549',
+'551',
+'552',
+'553',
+'554',
+'555',
+'556',
+'557',
+'558',
+'559',
+'560',
+'561',
+'562',
+'563',
+'564',
+'565',
+'566',
+'567',
+'568',
+'569',
+'570',
+'571',
+'572',
+'573',
+'574',
+'575',
+'576',
+'577',
+'578',
+'579',
+'580',
+'581',
+'582',
+'583',
+'584',
+'585',
+'586',
+'587',
+'588',
+'589',
+'590',
+'591',
+'592',
+'593',
+'594',
+'595',
+'596',
+'597',
+'598',
+'599',
+'600',
+'601',
+'602',
+'603',
+'604',
+'605',
+'606',
+'607',
+'608',
+'609',
+'610',
+'611',
+'612',
+'613',
+'614',
+'615',
+'616',
+'617',
+'618',
+'619',
+'620',
+'621',
+'622',
+'623',
+'624',
+'625',
+'626',
+'627',
+'628',
+'629',
+'630',
+'631',
+'632',
+'633',
+'634',
+'635',
+'636',
+'637',
+'638',
+'639',
+'640',
+'641',
+'642',
+'643',
+'644',
+'645',
+'646',
+'647',
+'648',
+'649',
+'650',
+'651',
+'652',
+'653',
+'654',
+'655',
+'656',
+'657',
+'658',
+'659',
+'660',
+'661',
+'662',
+'663',
+'664',
+'665',
+'666',
+'667',
+'668',
+'669',
+'670',
+'671',
+'672',
+'673',
+'674',
+'677',
+'678',
+'679',
+'680',
+'681',
+'682',
+'683',
+'684',
+'685',
+'686',
+'687',
+'689',
+'690',
+'691',
+'692',
+'693',
+'694',
+'695',
+'696',
+'697',
+'698',
+'699',
+'700',
+'701',
+'702',
+'703',
+'704',
+'706',
+'707',
+'708',
+'709',
+'710',
+'711',
+'712',
+'713',
+'714',
+'715',
+'716',
+'717',
+'718',
+'719',
+'720',
+'721',
+'722',
+'723',
+'724',
+'725',
+'726',
+'727',
+'728',
+'729',
+'730',
+'731',
+'732',
+'733',
+'734',
+'735',
+'736',
+'737',
+'738',
+'739',
+'740',
+'741',
+'742',
+'743',
+'744',
+'745',
+'746',
+'747',
+'748',
+'749',
+'750',
+'751',
+'752',
+'753',
+'754',
+'755',
+'756',
+'757',
+'758',
+'759',
+'760',
+'761',
+'762',
+'763',
+'764',
+'765',
+'766',
+'767',
+'768',
+'769',
+'770',
+'771',
+'772',
+'773',
+'774',
+'775',
+'776',
+'777',
+'778',
+'779',
+'780',
+'781',
+'782',
+'783',
+'784',
+'785',
+'786',
+'787',
+'788',
+'789',
+'790',
+'791',
+'792',
+'793',
+'829',
+'830',
+'831',
+'832',
+'833',
+'834',
+'835',
+'836',
+'837',
+'838',
+'839',
+'840',
+'841',
+'842',
+'843',
+'844',
+'845',
+'846',
+'847',
+'848',
+'849',
+'850',
+'851',
+'852',
+'853',
+'854',
+'855',
+'856',
+'857',
+'858',
+'859',
+'860',
+'861',
+'862',
+'863',
+'864',
+'865',
+'866',
+'867',
+'868',
+'883',
+'885',
+'886',
+'887',
+'888',
+'889',
+'890',
+'891',
+'892',
+'893',
+'894');
+
+DELETE FROM `battleground_events` WHERE map IN ('30',
+'489',
+'529',
+'559',
+'562',
+'566',
+'572');
+
+delete from creature_model_info where modelid in(6894, 6895, 29422, 29423);
+INSERT INTO creature_model_info (modelid, bounding_radius, combat_reach, gender, modelid_other_gender, modelid_alternative) VALUES
+(6894,0.389,1.5,0,6895,0),
+(6895,0.389,1.5,1,6894,0),
+(29422,0.389,1.5,0,29423,0),
+(29423,0.389,1.5,1,29422,0);
+
+DROP TABLE IF EXISTS dbscripts_on_creature_movement;
+RENAME TABLE creature_movement_scripts TO dbscripts_on_creature_movement;
+DROP TABLE IF EXISTS dbscripts_on_event;
+RENAME TABLE event_scripts TO dbscripts_on_event;
+DROP TABLE IF EXISTS dbscripts_on_go_use;
+RENAME TABLE gameobject_scripts TO dbscripts_on_go_use;
+DROP TABLE IF EXISTS dbscripts_on_go_template_use;
+RENAME TABLE gameobject_template_scripts TO dbscripts_on_go_template_use;
+DROP TABLE IF EXISTS dbscripts_on_gossip;
+RENAME TABLE gossip_scripts TO dbscripts_on_gossip;
+DROP TABLE IF EXISTS dbscripts_on_quest_end;
+RENAME TABLE quest_end_scripts TO dbscripts_on_quest_end;
+DROP TABLE IF EXISTS dbscripts_on_quest_start;
+RENAME TABLE quest_start_scripts TO dbscripts_on_quest_start;
+DROP TABLE IF EXISTS dbscripts_on_spell;
+RENAME TABLE spell_scripts TO dbscripts_on_spell;
+
+DELETE FROM command WHERE name LIKE 'reload all_scripts';
+INSERT INTO command VALUES
+('reload all_scripts',3,'Syntax: .reload all_scripts\r\n\r\nReload `dbscripts_on_*` tables.');
+
+ALTER TABLE creature_loot_template DROP COLUMN lootcondition, DROP COLUMN condition_value1, DROP COLUMN condition_value2;
+ALTER TABLE gameobject_loot_template DROP COLUMN lootcondition, DROP COLUMN condition_value1, DROP COLUMN condition_value2;
+ALTER TABLE fishing_loot_template DROP COLUMN lootcondition, DROP COLUMN condition_value1, DROP COLUMN condition_value2;
+ALTER TABLE reference_loot_template DROP COLUMN lootcondition, DROP COLUMN condition_value1, DROP COLUMN condition_value2;
+ALTER TABLE skinning_loot_template DROP COLUMN lootcondition, DROP COLUMN condition_value1, DROP COLUMN condition_value2;
+ALTER TABLE item_loot_template DROP COLUMN lootcondition, DROP COLUMN condition_value1, DROP COLUMN condition_value2;
+ALTER TABLE disenchant_loot_template DROP COLUMN lootcondition, DROP COLUMN condition_value1, DROP COLUMN condition_value2;
+ALTER TABLE milling_loot_template DROP COLUMN lootcondition, DROP COLUMN condition_value1, DROP COLUMN condition_value2;
+ALTER TABLE spell_loot_template DROP COLUMN lootcondition, DROP COLUMN condition_value1, DROP COLUMN condition_value2;
+ALTER TABLE prospecting_loot_template DROP COLUMN lootcondition, DROP COLUMN condition_value1, DROP COLUMN condition_value2;
+ALTER TABLE pickpocketing_loot_template DROP COLUMN lootcondition, DROP COLUMN condition_value1, DROP COLUMN condition_value2;
+ALTER TABLE mail_loot_template DROP COLUMN lootcondition, DROP COLUMN condition_value1, DROP COLUMN condition_value2;
+ALTER TABLE gossip_menu DROP COLUMN cond_2_val_2, DROP COLUMN cond_2_val_1, DROP COLUMN cond_2,
+                        DROP COLUMN cond_1_val_2, DROP COLUMN cond_1_val_1, DROP COLUMN cond_1;
+ALTER TABLE gossip_menu_option DROP COLUMN cond_3_val_2, DROP COLUMN cond_3_val_1, DROP COLUMN cond_3,
+                               DROP COLUMN cond_2_val_2, DROP COLUMN cond_2_val_1, DROP COLUMN cond_2,
+                               DROP COLUMN cond_1_val_2, DROP COLUMN cond_1_val_1, DROP COLUMN cond_1;
+
+-- this was missing at all
+DROP TABLE IF EXISTS `spell_template`;
+CREATE TABLE `spell_template` (
+  `id` int(11) unsigned NOT NULL DEFAULT '0',
+  `attr` int(11) unsigned NOT NULL DEFAULT '0',
+  `attr_ex` int(11) unsigned NOT NULL DEFAULT '0',
+  `attr_ex2` int(11) unsigned NOT NULL DEFAULT '0',
+  `proc_flags` int(11) unsigned NOT NULL DEFAULT '0',
+  `proc_chance` int(11) unsigned NOT NULL DEFAULT '0',
+  `duration_index` int(11) unsigned NOT NULL DEFAULT '0',
+  `effect0` int(11) unsigned NOT NULL DEFAULT '0',
+  `effect0_implicit_target_a` int(11) unsigned NOT NULL DEFAULT '0',
+  `effect0_implicit_target_b` int(11) unsigned NOT NULL DEFAULT '0',
+  `effect0_radius_idx` int(11) unsigned NOT NULL DEFAULT '0',
+  `effect0_apply_aura_name` int(11) unsigned NOT NULL DEFAULT '0',
+  `effect0_misc_value` int(11) unsigned NOT NULL DEFAULT '0',
+  `effect0_misc_value_b` int(11) unsigned NOT NULL DEFAULT '0',
+  `effect0_trigger_spell` int(11) unsigned NOT NULL DEFAULT '0',
+  `comments` varchar(255) NOT NULL,
+  PRIMARY KEY (`id`)
+) ENGINE=MyISAM DEFAULT CHARSET=utf8 ROW_FORMAT=FIXED COMMENT='MaNGOS server side spells';
+
+
+INSERT INTO `spell_template` VALUES
+-- id          attr    attr_ex    attr_ex2  proc_flags chnce dur  ef0 tarA0 tarB0 rad  aur  misc    miscB, trigger
+(21387, 0x00000140, 0x10000000, 0x00000000, 0x00000028,  15,  21,   6,   1,    0,   0,  42, 0,       0,    21388, 'Melt-Weapon trigger aura related used by Ragnaros'),
+(23363, 0x00000100, 0x00000000, 0x00000000, 0x00000000, 101,  21,  76,  18,    0,   0,   0, 179804,  0,    0,     'Summon Drakonid Corpse Trigger'),
+(25192, 0x00000100, 0x00000000, 0x00000004, 0x00000000, 101,  21,  76,  18,    0,   0,   0, 180619,  0,    0,     'Summon Ossirian Crystal'),
+(26133, 0x00000100, 0x00000000, 0x00000000, 0x00000000, 101,  21,  76,  18,    0,   0,   0, 180795,  0,    0,     'Summon Sandworm Base'),
+(34810, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 101,  21,  28,  42,    0,   8,   0, 20083,  64,    0,     'Summon Summoned Bloodwarder Mender behind of the caster'),
+(34817, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 101,  21,  28,  44,    0,   8,   0, 20078,  64,    0,     'Summon Summoned Bloodwarder Reservist right of the caster'),
+(34818, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 101,  21,  28,  43,    0,   8,   0, 20078,  64,    0,     'Summon Summoned Bloodwarder Reservist left of the caster'),
+(34819, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 101,  21,  28,  41,    0,   8,   0, 20078,  64,    0,     'Summon Summoned Bloodwarder Reservist front of the caster'),
+(35153, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 101,  21,  28,  42,    0,   8,   0, 20405,  64,    0,     'Summon Nether Charge behind of the caster'),
+(35904, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 101,  21,  28,  44,    0,   8,   0, 20405,  64,    0,     'Summon Nether Charge right of the caster'),
+(35905, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 101,  21,  28,  43,    0,   8,   0, 20405,  64,    0,     'Summon Nether Charge left of the caster'),
+(35906, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 101,  21,  28,  41,    0,   8,   0, 20405,  64,    0,     'Summon Nether Charge front of the caster'),
+(37264, 0x00000180, 0x00000000, 0x00000004, 0x00000000, 101,  21,  28,  18,    0,   7,   0, 21729,  64,    0,     'Power Converters: Summon Electromental (from cata)'),
+(37278, 0x00000180, 0x00000000, 0x00000004, 0x00000000, 101,  21,  28,  18,    0,   1,   0, 21737,  64,    0,     'Power Converters: Summon Mini-Electromental (from cata)'),
+(37365, 0x00000180, 0x00000000, 0x00000004, 0x00000000, 101,  21,  28,  18,    0,   1,   0, 21757,  64,    0,     'Power Converters: Summon Big Flavor Electromental (from cata)'),
+(44920, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 101,  21,   6,   1,    0,   0,  56, 24941,   0,    0,     'Model - Shattered Sun Marksman - BE Male Tier 4'),
+(44924, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 101,  21,   6,   1,    0,   0,  56, 24945,   0,    0,     'Model - Shattered Sun Marksman - BE Female Tier 4'),
+(44928, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 101,  21,   6,   1,    0,   0,  56, 24949,   0,    0,     'Model - Shattered Sun Marksman - Draenei Male Tier 4'),
+(44932, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 101,  21,   6,   1,    0,   0,  56, 24953,   0,    0,     'Model - Shattered Sun Marksman - Draenei Female Tier 4'),
+(45158, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 101,  21,   6,   1,    0,   0,  56, 25119,   0,    0,     'Model - Shattered Sun Warrior - BE Female Tier 4'),
+(45162, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 101,  21,   6,   1,    0,   0,  56, 25123,   0,    0,     'Model - Shattered Sun Warrior - BE Male Tier 4'),
+(45166, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 101,  21,   6,   1,    0,   0,  56, 25127,   0,    0,     'Model - Shattered Sun Warrior - Draenei Female Tier 4'),
+(45170, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 101,  21,   6,   1,    0,   0,  56, 25131,   0,    0,     'Model - Shattered Sun Warrior - Draenei Male Tier 4'),
+(58630, 0x00800180, 0x00000000, 0x00000005, 0x00000000, 101,  37,   6,  22,    7,  28,   4, 0,       0,    0,     'Achievement check - Mal\'Ganis'),
+(59046, 0x00800180, 0x00000000, 0x00000005, 0x00000000, 101,  37,   6,  22,    7,  28,   4, 0,       0,    0,     'Achievement check - Tribunal of Ages'),
+(59450, 0x00800180, 0x00000000, 0x00000005, 0x00000000, 101,  37,   6,  22,    7,  28,   4, 0,       0,    0,     'Achievement check - The Four Horsemen'),
+(62388, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 101,  21,   6,   1,    0,   0,   4, 0,       0,    0,     'Aura required for Demonic Circle 48020'),
+(64899, 0x00800180, 0x00000000, 0x00000005, 0x00000000, 101,  37,   6,  22,    7,  28,   4, 0,       0,    0,     'Achievement check - Hodir'),
+(64985, 0x00800180, 0x00000000, 0x00000005, 0x00000000, 101,  37,   6,  22,    7,  28,   4, 0,       0,    0,     'Achievement check - Thorim'),
+(65074, 0x00800180, 0x00000000, 0x00000005, 0x00000000, 101,  37,   6,  22,    7,  28,   4, 0,       0,    0,     'Achievement check - Freya'),
+(65195, 0x00800180, 0x00000000, 0x00000005, 0x00000000, 101,  37,   6,  22,    7,  28,   4, 0,       0,    0,     'Achievement check - Assembly of Iron'),
+(68184, 0x00800180, 0x00000000, 0x00000005, 0x00000000, 101,  37,   6,  22,    7,  28,   4, 0,       0,    0,     'Achievement check - Faction Champions'),
+(72845, 0x00800180, 0x00000000, 0x00000005, 0x00000000, 101,  37,   6,  22,    7,  28,   4, 0,       0,    0,     'Achievement check - Pit of Saron - Don\'t Look Up');