Merge branch 'master' of git://github.com/TrinityCore/TrinityCore

19 files changed, 794 insertions, 1 deletions

diff --git a/sql/updates/characters/2012_01_23_00_characters_character_queststatus_rewarded.sql b/sql/updates/characters/2012_01_23_00_characters_character_queststatus_rewarded.sql
new file mode 100644
index 00000000000..d81cf3a6617
--- /dev/null
+++ b/sql/updates/characters/2012_01_23_00_characters_character_queststatus_rewarded.sql
@@ -0,0 +1 @@
+DELETE FROM `character_queststatus_rewarded` WHERE `quest` IN (8619,8635,8636,8642,8643,8644,8645,8646,8647,8648,8649,8650,8651,8652,8653,8654,8670,8671,8672,8673,8674,8675,8676,8677,8678,8679,8680,8681,8682,8683,8684,8685,8686,8688,8713,8714,8715,8716,8717,8718,8719,8720,8721,8722,8723,8724,8725,8726,8727,8862,8863,8864,8865,8866,8867,8870,8871,8872,8873,8874,8875,8876,8877,8878,8879,8880,8881,8882,8883,13012,13013,13014,13015,13016,13017,13018,13019,13020,13021,13022,13023,13024,13025,13026,13027,13028,13029,13030,13031,13032,13033,13065,13066,13067,11120,11431,11442,11409,11318,11117,11400,11419,11118,11122,11293,11294,11321,11407,11408,11412,11413,11441,11446,11454,11486,11487,12020,12022,12318,12193,12062,12491,11447,12191,12492,12194,12192,12278,12306,12420,12421,13932,13649,13931,11127,11320,11347,11437,11438,11444,11445,9319,9322,9323,9324,9325,9326,9330,9331,9332,9339,9365,9367,9368,9386,9388,9389,11657,11691,11731,11882,11883,11886,11891,11915,11917,11921,11922,11923,11924,11925,11926,11933,11935,11947,11948,11952,11953,11954,11955,11964,11966,11970,11971,11972,12012,14022,114023,114024,114028,114030,114033,114036,114037,114040,114041,114043,114044,114064,114065,114035,114047,114048,114051,114053,114054,114055,114058,114059,114060,114061,114062,114488,24597,24609,24656,24657,24745,24848,24849,24666,24792,24804,24611,24536,24612,24635,24636,24655,24610,24629,24614,24576,24613,24615,24638,24645,24647,24648,24649,24650,24651,24652,24658,24659,24660,24662,24663,24664,24665,24793,24805,24850,24851,24541,14483,24661,1657,1658,6961,6962,6963,6964,6983,6984,7021,7022,7023,7024,7025,7042,7043,7045,7061,7062,7063,8149,8150,8311,8312,8322,8353,8354,8355,8356,8357,8358,8359,8360,8373,8409,8744,8746,8762,8763,8767,8768,8769,8788,8799,8803,8827,8828,8860,8861,8868,8897,8898,8899,8900,8901,8902,8903,8904,8971,8972,8973,8974,8975,8976,8979,8980,8981,8982,8983,8984,8993,9024,9025,9026,9027,9028,11131,11135,11219,11220,11242,11356,11357,11360,11361,11392,11401,11403,11404,11405,11435,11439,11440,11449,11450,11528,11558,11580,11581,11583,11584,11696,11732,11734,11735,11736,11737,11738,11739,11740,11741,11742,11743,11744,11745,11746,11747,11748,11749,11750,11751,11752,11753,11754,11755,11756,11757,11758,11759,11760,11761,11762,11763,11764,11765,11766,11767,11768,11769,11770,11771,11772,11773,11774,11775,11776,11777,11778,11779,11780,11781,11782,11783,11784,11785,11786,11787,11799,11800,11801,11802,11803,11804,11805,11806,11807,11808,11809,11810,11811,11812,11813,11814,11815,11816,11817,11818,11819,11820,11821,11822,11823,11824,11825,11826,11827,11828,11829,11830,11831,11832,11833,11834,11835,11836,11837,11838,11839,11840,11841,11842,11843,11844,11845,11846,11847,11848,11849,11850,11851,11852,11853,11854,11855,11856,11857,11858,11859,11860,11861,11862,11863,11937,11976,12133,12135,12139,12155,12286,12313,12331,12332,12333,12334,12335,12336,12337,12338,12339,12340,12341,12342,12343,12344,12345,12346,12347,12348,12349,12350,12351,12352,12353,12354,12355,12356,12357,12358,12359,12360,12361,12362,12363,12364,12365,12366,12367,12368,12369,12370,12371,12373,12374,12375,12376,12377,12378,12379,12380,12381,12382,12383,12384,12385,12386,12387,12388,12389,12390,12391,12392,12393,12394,12395,12396,12397,12398,12399,12400,12401,12402,12403,12404,12405,12406,12407,12408,12409,12410,12940,12941,12944,12945,12946,12947,12950,13203,13433,13434,13435,13436,13437,13438,13439,13440,13441,13442,13443,13444,13445,13446,13447,13448,13449,13450,13451,13452,13453,13454,13455,13456,13457,13458,13459,13460,13461,13462,13463,13464,13465,13466,13467,13468,13469,13470,13471,13472,13473,13474,13485,13486,13487,13488,13489,13490,13491,13492,13493,13494,13495,13496,13497,13498,13499,13500,13501,13548,13966);
diff --git a/sql/updates/world/2012_01_13_03_gossip_menu.sql b/sql/updates/world/2012_01_13_03_world_gossip_menu.sql
index 98dda69bf1a..98dda69bf1a 100644
--- a/sql/updates/world/2012_01_13_03_gossip_menu.sql
+++ b/sql/updates/world/2012_01_13_03_world_gossip_menu.sql
diff --git a/sql/updates/world/2012_01_23_00_world_game_event_seasonal_questrelation.sql b/sql/updates/world/2012_01_23_00_world_game_event_seasonal_questrelation.sql
new file mode 100644
index 00000000000..40bf28a1ead
--- /dev/null
+++ b/sql/updates/world/2012_01_23_00_world_game_event_seasonal_questrelation.sql
@@ -0,0 +1,244 @@
+DELETE FROM `game_event_seasonal_questrelation` WHERE `questId` IN (9319,9322,9323,9324,9325,9326,9330,9331,9332,9339,9365,9367,9368,9386,9388,9389,11657,11691,11731,11882,11883,11886,11891,11915,11917,11921,11922,11923,11924,11925,11926,11933,11935,11947,11948,11952,11953,11954,11955,11964,11966,11970,11971,11972,12012) AND `eventEntry`=1;
+DELETE FROM `game_event_seasonal_questrelation` WHERE `questId` IN (8619,8635,8636,8642,8643,8644,8645,8646,8647,8648,8649,8650,8651,8652,8653,8654,8670,8671,8672,8673,8674,8675,8676,8677,8678,8679,8680,8681,8682,8683,8684,8685,8686,8688,8713,8714,8715,8716,8717,8718,8719,8720,8721,8722,8723,8724,8725,8726,8727,8862,8863,8864,8865,8866,8867,8870,8871,8872,8873,8874,8875,8876,8877,8878,8879,8880,8881,8882,8883,13012,13013,13014,13015,13016,13017,13018,13019,13020,13021,13022,13023,13024,13025,13026,13027,13028,13029,13030,13031,13032,13033,13065,13066,13067) AND `eventEntry`=7;
+DELETE FROM `game_event_seasonal_questrelation` WHERE `questId` IN (14488,24597,24609,24656,24657,24745,24848,24849,24666,24792,24804,24611,24536,24612,24635,24636,24655,24610,24629,24614,24576,24613,24615,24638,24645,24647,24648,24649,24650,24651,24652,24658,24659,24660,24662,24663,24664,24665,24793,24805,24850,24851,24541,14483,24661) AND `eventEntry`=8;
+DELETE FROM `game_event_seasonal_questrelation` WHERE `questId` IN (13479,13480,13483,13484,13502,13503) AND `eventEntry`=9;
+DELETE FROM `game_event_seasonal_questrelation` WHERE `questId` IN (11120,11431,11442,11409,11318,11117,11400,11419,11118,11122,11293,11294,11321,11407,11408,11412,11413,11441,11446,11454,11486,11487,12020,12022,12318,12193,12062,12491,11447,12191,12492,12194,12192,12278,12306,12420,12421,13932,13649,13931,11127,11320,11347,11437,11438,11444,11445) AND `eventEntry`=24;
+
+INSERT INTO `game_event_seasonal_questrelation` (`questId`,`eventEntry`) VALUES
+(8619,7),
+(8635,7),
+(8636,7),
+(8642,7),
+(8643,7),
+(8644,7),
+(8645,7),
+(8646,7),
+(8647,7),
+(8648,7),
+(8649,7),
+(8650,7),
+(8651,7),
+(8652,7),
+(8653,7),
+(8654,7),
+(8670,7),
+(8671,7),
+(8672,7),
+(8673,7),
+(8674,7),
+(8675,7),
+(8676,7),
+(8677,7),
+(8678,7),
+(8679,7),
+(8680,7),
+(8681,7),
+(8682,7),
+(8683,7),
+(8684,7),
+(8685,7),
+(8686,7),
+(8688,7),
+(8713,7),
+(8714,7),
+(8715,7),
+(8716,7),
+(8717,7),
+(8718,7),
+(8719,7),
+(8720,7),
+(8721,7),
+(8722,7),
+(8723,7),
+(8724,7),
+(8725,7),
+(8726,7),
+(8727,7),
+(8862,7),
+(8863,7),
+(8864,7),
+(8865,7),
+(8866,7),
+(8867,7),
+(8870,7),
+(8871,7),
+(8872,7),
+(8873,7),
+(8874,7),
+(8875,7),
+(8876,7),
+(8877,7),
+(8878,7),
+(8879,7),
+(8880,7),
+(8881,7),
+(8882,7),
+(8883,7),
+(13012,7),
+(13013,7),
+(13014,7),
+(13015,7),
+(13016,7),
+(13017,7),
+(13018,7),
+(13019,7),
+(13020,7),
+(13021,7),
+(13022,7),
+(13023,7),
+(13024,7),
+(13025,7),
+(13026,7),
+(13027,7),
+(13028,7),
+(13029,7),
+(13030,7),
+(13031,7),
+(13032,7),
+(13033,7),
+(13065,7),
+(13066,7),
+(13067,7),
+(11120,24),
+(11431,24),
+(11442,24),
+(11409,24),
+(11318,24),
+(11117,24),
+(11400,24),
+(11419,24),
+(11118,24),
+(11122,24),
+(11293,24),
+(11294,24),
+(11321,24),
+(11407,24),
+(11408,24),
+(11412,24),
+(11413,24),
+(11441,24),
+(11446,24),
+(11454,24),
+(11486,24),
+(11487,24),
+(12020,24),
+(12022,24),
+(12318,24),
+(12193,24),
+(12062,24),
+(12491,24),
+(11447,24),
+(12191,24),
+(12492,24),
+(12194,24),
+(12192,24),
+(12278,24),
+(12306,24),
+(12420,24),
+(12421,24),
+(13932,24),
+(13649,24),
+(13931,24),
+(11127,24),
+(11320,24),
+(11347,24),
+(11437,24),
+(11438,24),
+(11444,24),
+(11445,24),
+(9319,1),
+(9322,1),
+(9323,1),
+(9324,1),
+(9325,1),
+(9326,1),
+(9330,1),
+(9331,1),
+(9332,1),
+(9339,1),
+(9365,1),
+(9367,1),
+(9368,1),
+(9386,1),
+(9388,1),
+(9389,1),
+(11657,1),
+(11691,1),
+(11731,1),
+(11882,1),
+(11883,1),
+(11886,1),
+(11891,1),
+(11915,1),
+(11917,1),
+(11921,1),
+(11922,1),
+(11923,1),
+(11924,1),
+(11925,1),
+(11926,1),
+(11933,1),
+(11935,1),
+(11947,1),
+(11948,1),
+(11952,1),
+(11953,1),
+(11954,1),
+(11955,1),
+(11964,1),
+(11966,1),
+(11970,1),
+(11971,1),
+(11972,1),
+(12012,1),
+(13479,9),
+(13480,9),
+(13483,9),
+(13484,9),
+(13502,9),
+(13503,9),
+(14488,8),
+(24597,8),
+(24609,8),
+(24656,8),
+(24657,8),
+(24745,8),
+(24848,8),
+(24849,8),
+(24666,8),
+(24792,8),
+(24804,8),
+(24611,8),
+(24536,8),
+(24612,8),
+(24635,8),
+(24636,8),
+(24655,8),
+(24610,8),
+(24629,8),
+(24614,8),
+(24576,8),
+(24613,8),
+(24615,8),
+(24638,8),
+(24645,8),
+(24647,8),
+(24648,8),
+(24649,8),
+(24650,8),
+(24651,8),
+(24652,8),
+(24658,8),
+(24659,8),
+(24660,8),
+(24662,8),
+(24663,8),
+(24664,8),
+(24665,8),
+(24793,8),
+(24805,8),
+(24850,8),
+(24851,8),
+(24541,8),
+(14483,8),
+(24661,8);
diff --git a/sql/updates/world/2012_01_27_00_player_factionchange_items.sql b/sql/updates/world/2012_01_27_00_world_player_factionchange_items.sql
index 1dc2749807e..1dc2749807e 100644
--- a/sql/updates/world/2012_01_27_00_player_factionchange_items.sql
+++ b/sql/updates/world/2012_01_27_00_world_player_factionchange_items.sql
diff --git a/sql/updates/world/2012_01_28_world_conditions.sql b/sql/updates/world/2012_01_28_00_world_conditions.sql
index 8d087af7e88..e66d893db35 100644
--- a/sql/updates/world/2012_01_28_world_conditions.sql
+++ b/sql/updates/world/2012_01_28_00_world_conditions.sql
@@ -13,4 +13,4 @@ UPDATE `conditions` SET `ConditionValue1`=64 WHERE `SourceTypeOrReferenceId`=17
 UPDATE `conditions` SET `ConditionValue1`=4 WHERE `SourceTypeOrReferenceId`=17 AND `SourceEntry`=24107 AND `ConditionTypeOrReference`=16;
 UPDATE `conditions` SET `ConditionValue1`=8 WHERE `SourceTypeOrReferenceId`=17 AND `SourceEntry`=24108 AND `ConditionTypeOrReference`=16;
 UPDATE `conditions` SET `ConditionValue1`=512 WHERE `SourceTypeOrReferenceId`=17 AND `SourceEntry`=69530 AND `ConditionTypeOrReference`=16;
-UPDATE `conditions` SET `ConditionValue1`=1024 WHERE `SourceTypeOrReferenceId`=17 AND `SourceEntry`=69533 AND `ConditionTypeOrReference`=16;
\ No newline at end of file
+UPDATE `conditions` SET `ConditionValue1`=1024 WHERE `SourceTypeOrReferenceId`=17 AND `SourceEntry`=69533 AND `ConditionTypeOrReference`=16;
diff --git a/sql/updates/world/2012_01_29_00_world_conditions.sql b/sql/updates/world/2012_01_29_00_world_conditions.sql
new file mode 100644
index 00000000000..8a04993a03e
--- /dev/null
+++ b/sql/updates/world/2012_01_29_00_world_conditions.sql
@@ -0,0 +1 @@
+ALTER TABLE `conditions` ADD COLUMN `SourceId` INT(10) UNSIGNED NOT NULL DEFAULT '0' AFTER SourceEntry;
diff --git a/sql/updates/world/2012_01_29_03_world_misc.sql b/sql/updates/world/2012_01_29_03_world_misc.sql
new file mode 100644
index 00000000000..3253b5cd55b
--- /dev/null
+++ b/sql/updates/world/2012_01_29_03_world_misc.sql
@@ -0,0 +1,102 @@
+DELETE FROM `spell_script_names` WHERE `spell_id` IN (26374);
+INSERT INTO `spell_script_names`(`spell_id`,`ScriptName`) VALUES
+(26374,'spell_gen_elune_candle');
+
+-- Set Gigant Spotlight as not selectable
+UPDATE `creature_template` SET `unit_flags`=33554432 WHERE `entry`=15902;
+
+DELETE FROM `creature_template_addon` WHERE (`entry`IN(15902,15466));
+INSERT INTO `creature_template_addon`(`entry`,`path_id`,`mount`,`bytes1`,`bytes2`,`emote`,`auras`) VALUES
+(15466,0,0,0,0,0,17327), -- Add spirit particles to Omen minions
+(15902,0,0,0,0,0,50236); -- Add Spotlight aura to Gigant Spotlight (ummoned by 26392 on Omen's death)
+
+UPDATE `creature_template` SET `ScriptName`='npc_giant_spotlight' WHERE `entry`=15902;
+UPDATE `creature_template` SET `RegenHealth`=0,`ScriptName`='npc_omen' WHERE `entry`=15467;
+UPDATE `creature_template` SET `ScriptName`='npc_firework',`AIName`='',`faction_A`=35,`faction_H`=35,`unit_flags`=33555200 WHERE `entry` IN (15879,15880,15881,15882,15883,15884,15885,15886,15887,15888,15889,15890,15872,15873,15874,15875,15876,15877,15911,15912,15913,15914,15915,15916,15918);
+-- Cleanup EventAI and SmartAI
+DELETE FROM `creature_ai_scripts` WHERE `creature_id` IN (15879,15880,15881,15882,15883,15884,15885,15886,15887,15888,15889,15890,15872,15873,15874,15875,15876,15877,15911,15912,15913,15914,15915,15916,15918);
+DELETE FROM `smart_scripts` WHERE `source_type`=0 AND `entryorguid` IN (15879,15880,15881,15882,15883,15884,15885,15886,15887,15888,15889,15890,15872,15873,15874,15875,15876,15877,15911,15912,15913,15914,15915,15916,15918);
+
+-- Update al targeting stuff for Fireworks and Rocket clusters
+DELETE FROM `conditions` WHERE `SourceTypeOrReferenceId`=13 AND `SourceEntry` IN (26294,26295,26333,26334,26336,26337,26338,26488,26490,26517,26521,26344,26347,26345,26348,26349,26351,26352,26354,26355,26356);
+INSERT INTO `conditions`(`SourceTypeOrReferenceId`,`SourceGroup`,`SourceEntry`,`ElseGroup`,`ConditionTypeOrReference`,`ConditionValue1`,`ConditionValue2`,`ConditionValue3`,`ErrorTextId`,`ScriptName`,`Comment`) VALUES
+-- Targeting Firework Launcher
+(13,0,26294,0,18,0,180771,0,0,'',"Small White Rocket target Firework Launcher"),
+(13,0,26294,0,18,0,180850,0,0,'',"Small White Rocket target Firework Launcher"),
+(13,0,26294,0,18,0,180868,0,0,'',"Small White Rocket target Firework Launcher"),
+(13,0,26295,0,18,0,180771,0,0,'',"Small Yellow Rocket target Firework Launcher"),
+(13,0,26295,0,18,0,180850,0,0,'',"Small Yellow Rocket target Firework Launcher"),
+(13,0,26295,0,18,0,180868,0,0,'',"Small Yellow Rocket target Firework Launcher"),
+(13,0,26333,0,18,0,180771,0,0,'',"Large Blue Rocket target Firework Launcher"),
+(13,0,26333,0,18,0,180850,0,0,'',"Large Blue Rocket target Firework Launcher"),
+(13,0,26333,0,18,0,180868,0,0,'',"Large Blue Rocket target Firework Launcher"),
+(13,0,26334,0,18,0,180771,0,0,'',"Large Green Rocket target Firework Launcher"),
+(13,0,26334,0,18,0,180850,0,0,'',"Large Green Rocket target Firework Launcher"),
+(13,0,26334,0,18,0,180868,0,0,'',"Large Green Rocket target Firework Launcher"),
+(13,0,26336,0,18,0,180771,0,0,'',"Large Red Rocket target Firework Launcher"),
+(13,0,26336,0,18,0,180850,0,0,'',"Large Red Rocket target Firework Launcher"),
+(13,0,26336,0,18,0,180868,0,0,'',"Large Red Rocket target Firework Launcher"),
+(13,0,26337,0,18,0,180771,0,0,'',"Large White Rocket target Firework Launcher"),
+(13,0,26337,0,18,0,180850,0,0,'',"Large White Rocket target Firework Launcher"),
+(13,0,26337,0,18,0,180868,0,0,'',"Large White Rocket target Firework Launcher"),
+(13,0,26338,0,18,0,180771,0,0,'',"Large Yellow Rocket target Firework Launcher"),
+(13,0,26338,0,18,0,180850,0,0,'',"Large Yellow Rocket target Firework Launcher"),
+(13,0,26338,0,18,0,180868,0,0,'',"Large Yellow Rocket target Firework Launcher"),
+-- Targeting Cluster Launcher
+(13,0,26488,0,18,0,180772,0,0,'',"Large Blue Rocket Cluster target Cluster Launcher"),
+(13,0,26488,0,18,0,180859,0,0,'',"Large Blue Rocket Cluster target Cluster Launcher"),
+(13,0,26488,0,18,0,180869,0,0,'',"Large Blue Rocket Cluster target Cluster Launcher"),
+(13,0,26488,0,18,0,180874,0,0,'',"Large Blue Rocket Cluster target Cluster Launcher"),
+(13,0,26490,0,18,0,180772,0,0,'',"Large Green Rocket Cluster target Cluster Launcher"),
+(13,0,26490,0,18,0,180859,0,0,'',"Large Green Rocket Cluster target Cluster Launcher"),
+(13,0,26490,0,18,0,180869,0,0,'',"Large Green Rocket Cluster target Cluster Launcher"),
+(13,0,26490,0,18,0,180874,0,0,'',"Large Green Rocket Cluster target Cluster Launcher"),
+(13,0,26517,0,18,0,180772,0,0,'',"Large Red Rocket Cluster target Cluster Launcher"),
+(13,0,26517,0,18,0,180859,0,0,'',"Large Red Rocket Cluster target Cluster Launcher"),
+(13,0,26517,0,18,0,180869,0,0,'',"Large Red Rocket Cluster target Cluster Launcher"),
+(13,0,26517,0,18,0,180874,0,0,'',"Large Red Rocket Cluster target Cluster Launcher"),
+(13,0,26521,0,18,0,180772,0,0,'',"Lucky Lunar rocket Cluster target Cluster Launcher"),
+(13,0,26521,0,18,0,180859,0,0,'',"Lucky Lunar rocket Cluster target Cluster Launcher"),
+(13,0,26521,0,18,0,180869,0,0,'',"Lucky Lunar rocket Cluster target Cluster Launcher"),
+(13,0,26521,0,18,0,180874,0,0,'',"Lucky Lunar rocket Cluster target Cluster Launcher"),
+-- Targeting Firework Launcher (Again)
+(13,0,26347,0,18,0,180771,0,0,'',"Rocket, RED target Firework Launcher"),
+(13,0,26347,0,18,0,180850,0,0,'',"Rocket, RED target Firework Launcher"),
+(13,0,26347,0,18,0,180868,0,0,'',"Rocket, RED target Firework Launcher"),
+(13,0,26344,0,18,0,180771,0,0,'',"Rocket, BLUE target Firework Launcher"),
+(13,0,26344,0,18,0,180850,0,0,'',"Rocket, BLUE target Firework Launcher"),
+(13,0,26344,0,18,0,180868,0,0,'',"Rocket, BLUE target Firework Launcher"),
+(13,0,26345,0,18,0,180771,0,0,'',"Rocket, GREEEN target Firework Launcher"),
+(13,0,26345,0,18,0,180850,0,0,'',"Rocket, GREEEN target Firework Launcher"),
+(13,0,26345,0,18,0,180868,0,0,'',"Rocket, GREEEN target Firework Launcher"),
+(13,0,26348,0,18,0,180771,0,0,'',"Rocket, WHITE target Firework Launcher"),
+(13,0,26348,0,18,0,180850,0,0,'',"Rocket, WHITE target Firework Launcher"),
+(13,0,26348,0,18,0,180868,0,0,'',"Rocket, WHITE target Firework Launcher"),
+(13,0,26349,0,18,0,180771,0,0,'',"Rocket, YELLOW target Firework Launcher"),
+(13,0,26349,0,18,0,180850,0,0,'',"Rocket, YELLOW target Firework Launcher"),
+(13,0,26349,0,18,0,180868,0,0,'',"Rocket, YELLOW target Firework Launcher"),
+(13,0,26351,0,18,0,180771,0,0,'',"Rocket, BLUE BIG target Firework Launcher"),
+(13,0,26351,0,18,0,180850,0,0,'',"Rocket, BLUE BIG target Firework Launcher"),
+(13,0,26351,0,18,0,180868,0,0,'',"Rocket, BLUE BIG target Firework Launcher"),
+(13,0,26352,0,18,0,180771,0,0,'',"Rocket, GREEN BIG target Firework Launcher"),
+(13,0,26352,0,18,0,180850,0,0,'',"Rocket, GREEN BIG target Firework Launcher"),
+(13,0,26352,0,18,0,180868,0,0,'',"Rocket, GREEN BIG target Firework Launcher"),
+(13,0,26354,0,18,0,180771,0,0,'',"Rocket, RED BIG target Firework Launcher"),
+(13,0,26354,0,18,0,180850,0,0,'',"Rocket, RED BIG target Firework Launcher"),
+(13,0,26354,0,18,0,180868,0,0,'',"Rocket, RED BIG target Firework Launcher"),
+(13,0,26355,0,18,0,180771,0,0,'',"Rocket, WHITE BIG target Firework Launcher"),
+(13,0,26355,0,18,0,180850,0,0,'',"Rocket, WHITE BIG target Firework Launcher"),
+(13,0,26355,0,18,0,180868,0,0,'',"Rocket, WHITE BIG target Firework Launcher"),
+(13,0,26356,0,18,0,180771,0,0,'',"Rocket, YELLOW BIG target Firework Launcher"),
+(13,0,26356,0,18,0,180850,0,0,'',"Rocket, YELLOW BIG target Firework Launcher"),
+(13,0,26356,0,18,0,180868,0,0,'',"Rocket, YELLOW BIG target Firework Launcher");
+
+UPDATE `creature_template` SET `AIName`='SmartAI' WHERE `entry`=15466;
+DELETE FROM `smart_scripts` WHERE (`entryorguid`=15466 AND `source_type`=0);
+INSERT INTO `smart_scripts` (`entryorguid`,`source_type`,`id`,`link`,`event_type`,`event_phase_mask`,`event_chance`,`event_flags`,`event_param1`,`event_param2`,`event_param3`,`event_param4`,`action_type`,`action_param1`,`action_param2`,`action_param3`,`action_param4`,`action_param5`,`action_param6`,`target_type`,`target_param1`,`target_param2`,`target_param3`,`target_x`,`target_y`,`target_z`,`target_o`,`comment`) VALUES
+(15466,0,0,0,8,0,100,0,26636,0,8000,9000,11,25495,0,0,0,0,0,1,0,0,0,0,0,0,0,"Minion of Omen - Cast Firework Dazzled when hitted by Elune's Candle firework");
+
+-- Cast quest credit spell when getting Elune's Blessing buff
+DELETE FROM `spell_scripts` WHERE `id`=26393;
+INSERT INTO `spell_scripts`(`id`,`effIndex`,`delay`,`command`,`datalong`,`datalong2`,`dataint`,`x`,`y`,`z`,`o`) VALUES
+(26393,1,0,15,26394,2,0,0,0,0,0);
diff --git a/sql/updates/world/2012_01_29_04_world_misc.sql b/sql/updates/world/2012_01_29_04_world_misc.sql
new file mode 100644
index 00000000000..3686957e433
--- /dev/null
+++ b/sql/updates/world/2012_01_29_04_world_misc.sql
@@ -0,0 +1,116 @@
+-- remove aura_required for clickspells on tournament mounts and add more cases (Thanks to @Tassader)
+DELETE FROM `npc_spellclick_spells` WHERE npc_entry IN (33842,33796,33798,33791,33792,33799,33843,33800,33795,33790,33793,33794);
+INSERT INTO `npc_spellclick_spells`(`npc_entry`,`spell_id`,`quest_start`,`quest_start_active`,`quest_end`,`cast_flags`,`aura_required`,`aura_forbidden`,`user_type`) VALUES
+(33842,63791,13668,0,13687,1,0,0,0),-- Aspirant
+(33799,62783,13691,0,0,1,0,0,0),-- A Valiant Of Orgrimmar
+(33799,62783,13707,0,0,1,0,0,0),-- Valiant Of Orgrimmar
+(33796,62784,13693,0,0,1,0,0,0),-- A Valiant Of Sen'jin
+(33796,62784,13708,0,0,1,0,0,0),-- Valiant Of Sen'jin
+(33792,62785,13694,0,0,1,0,0,0),-- A Valiant Of Thunder Bluff
+(33792,62785,13709,0,0,1,0,0,0),-- Valiant Of Thunder Bluff
+(33791,62786,13696,0,0,1,0,0,0),-- A Valiant Of Silvermoon
+(33791,62786,13711,0,0,1,0,0,0),-- Valiant Of Silvermoon
+(33798,62787,13695,0,0,1,0,0,0),-- A Valiant Of Undercity
+(33798,62787,13710,0,0,1,0,0,0), -- Valiant Of Undercity
+(33843,63792,13667,0,13686,1,0,0,0),-- Aspirant
+(33800,62774,13593,0,0,1,0,0,0),-- A Valiant Of Stormwind
+(33800,62774,13684,0,0,1,0,0,0),-- Valiant Of Stormwind
+(33795,62779,13685,0,0,1,0,0,0),-- A Valiant Of Ironforge
+(33795,62779,13703,0,0,1,0,0,0),-- Valiant Of Ironforge
+(33793,62780,13688,0,0,1,0,0,0),-- A Valiant Of Gnomregan
+(33793,62780,13704,0,0,1,0,0,0),-- Valiant Of Gnomregan
+(33790,62781,13690,0,0,1,0,0,0),-- A Valiant Of Exodar
+(33790,62781,13705,0,0,1,0,0,0),-- Valiant Of Exodar
+(33794,62782,13689,0,0,1,0,0,0),-- A Valiant Of Darnassus
+(33794,62782,13706,0,0,1,0,0,0); -- Valiant Of Darnassus
+UPDATE `npc_spellclick_spells` SET `aura_required`=0 WHERE `aura_required`=62853;
+
+-- Break-Shield spells
+DELETE FROM `spell_script_names` WHERE `spell_id` IN (62575,62626,64342,64507,64590,64595,64686,65147,66480,68504);
+-- Charge spells
+DELETE FROM `spell_script_names` WHERE `spell_id` IN (62874,62960,63661,62563,63003,63010,64591,66481,68282,68284,68321,68498,68501);
+-- Defend spells
+DELETE FROM `spell_script_names` WHERE `spell_id` IN (62552,62719,66482);
+-- Pennant and summon spells
+DELETE FROM `spell_script_names` WHERE `spell_id` IN (62863,63034,62774,62779,62780,62781,62782,62783,62784,62785,62786,62787,63663,63791,63792,62595,62596,62594,63394,63395,63396,63397,63398,63401,63402,63403,63404,63405,63406,63421,63422,63423,63425,63426,63427,63428,63429,63430,63431,63432,63433,63434,63435,63436,63606,63500,63501,63607,63608,63609);
+INSERT INTO `spell_script_names`(`spell_id`,`ScriptName`) VALUES
+(62575,'spell_gen_break_shield'),
+(62626,'spell_gen_break_shield'),
+(64342,'spell_gen_break_shield'),
+(64507,'spell_gen_break_shield'),
+(64590,'spell_gen_break_shield'),
+(64595,'spell_gen_break_shield'),
+(64686,'spell_gen_break_shield'),
+(65147,'spell_gen_break_shield'),
+(66480,'spell_gen_break_shield'),
+(68504,'spell_gen_break_shield'),
+(62874,'spell_gen_mounted_charge'),
+(62960,'spell_gen_mounted_charge'),
+(63661,'spell_gen_mounted_charge'),
+(62563,'spell_gen_mounted_charge'),
+(63003,'spell_gen_mounted_charge'),
+(63010,'spell_gen_mounted_charge'),
+(64591,'spell_gen_mounted_charge'),
+(66481,'spell_gen_mounted_charge'),
+(68282,'spell_gen_mounted_charge'),
+(68284,'spell_gen_mounted_charge'),
+(68321,'spell_gen_mounted_charge'),
+(68498,'spell_gen_mounted_charge'),
+(68501,'spell_gen_mounted_charge'),
+(62552,'spell_gen_defend'),
+(62719,'spell_gen_defend'),
+(66482,'spell_gen_defend'),
+(62863 ,'spell_gen_tournament_duel'),
+(63034,'spell_gen_on_tournament_mount'),
+(62595,'spell_gen_tournament_pennant'),
+(62596,'spell_gen_tournament_pennant'),
+(62594,'spell_gen_tournament_pennant'),
+(63394,'spell_gen_tournament_pennant'),
+(63395,'spell_gen_tournament_pennant'),
+(63396,'spell_gen_tournament_pennant'),
+(63397,'spell_gen_tournament_pennant'),
+(63398,'spell_gen_tournament_pennant'),
+(63401,'spell_gen_tournament_pennant'),
+(63402,'spell_gen_tournament_pennant'),
+(63403,'spell_gen_tournament_pennant'),
+(63404,'spell_gen_tournament_pennant'),
+(63405,'spell_gen_tournament_pennant'),
+(63406,'spell_gen_tournament_pennant'),
+(63421,'spell_gen_tournament_pennant'),
+(63422,'spell_gen_tournament_pennant'),
+(63423,'spell_gen_tournament_pennant'),
+(63425,'spell_gen_tournament_pennant'),
+(63426,'spell_gen_tournament_pennant'),
+(63427,'spell_gen_tournament_pennant'),
+(63428,'spell_gen_tournament_pennant'),
+(63429,'spell_gen_tournament_pennant'),
+(63430,'spell_gen_tournament_pennant'),
+(63431,'spell_gen_tournament_pennant'),
+(63432,'spell_gen_tournament_pennant'),
+(63433,'spell_gen_tournament_pennant'),
+(63434,'spell_gen_tournament_pennant'),
+(63435,'spell_gen_tournament_pennant'),
+(63436,'spell_gen_tournament_pennant'),
+(63606,'spell_gen_tournament_pennant'),
+(63500,'spell_gen_tournament_pennant'),
+(63501,'spell_gen_tournament_pennant'),
+(63607,'spell_gen_tournament_pennant'),
+(63608,'spell_gen_tournament_pennant'),
+(63609,'spell_gen_tournament_pennant'),
+(62774,'spell_gen_summon_tournament_mount'),
+(62779,'spell_gen_summon_tournament_mount'),
+(62780,'spell_gen_summon_tournament_mount'),
+(62781,'spell_gen_summon_tournament_mount'),
+(62782,'spell_gen_summon_tournament_mount'),
+(62783,'spell_gen_summon_tournament_mount'),
+(62784,'spell_gen_summon_tournament_mount'),
+(62785,'spell_gen_summon_tournament_mount'),
+(62786,'spell_gen_summon_tournament_mount'),
+(62787,'spell_gen_summon_tournament_mount'),
+(63663,'spell_gen_summon_tournament_mount'),
+(63791,'spell_gen_summon_tournament_mount'),
+(63792,'spell_gen_summon_tournament_mount');
+
+DELETE FROM `achievement_criteria_data` WHERE `criteria_id`=9798 AND `type`=11;
+INSERT INTO `achievement_criteria_data` (`criteria_id`,`type`,`value1`,`value2`,`ScriptName`) VALUES
+(9798,11,0,0, 'achievement_tilted');
diff --git a/sql/updates/world/2012_01_30_00_world_conditions.sql b/sql/updates/world/2012_01_30_00_world_conditions.sql
new file mode 100644
index 00000000000..48b9c63b5cb
--- /dev/null
+++ b/sql/updates/world/2012_01_30_00_world_conditions.sql
@@ -0,0 +1,3 @@
+ALTER TABLE `conditions` CHANGE `SourceId` `SourceId` INT(10) NOT NULL DEFAULT '0';
+ALTER TABLE `conditions` DROP PRIMARY KEY,
+    ADD PRIMARY KEY (`SourceTypeOrReferenceId`, `SourceGroup`, `SourceEntry`, `SourceId`, `ElseGroup`, `ConditionTypeOrReference`, `ConditionValue1`, `ConditionValue2`, `ConditionValue3`);
diff --git a/sql/updates/world/2012_01_30_01_world_conditions.sql b/sql/updates/world/2012_01_30_01_world_conditions.sql
new file mode 100644
index 00000000000..bcaf0af435a
--- /dev/null
+++ b/sql/updates/world/2012_01_30_01_world_conditions.sql
@@ -0,0 +1,3 @@
+DELETE FROM `conditions` WHERE `SourceTypeOrReferenceId`=13 AND `SourceEntry`=72618;
+INSERT INTO `conditions` (`SourceTypeOrReferenceId`,`SourceGroup`,`SourceEntry`,`SourceId`,`ElseGroup`,`ConditionTypeOrReference`,`ConditionValue1`,`ConditionValue2`,`ConditionValue3`,`ErrorTextId`,`ScriptName`,`Comment`) VALUES
+(13,0,72618,0,0,18,1,0,0,0, '', 'Mutated Plague Clear - target players');
diff --git a/sql/updates/world/2012_01_30_01_world_spell_script_names.sql b/sql/updates/world/2012_01_30_01_world_spell_script_names.sql
new file mode 100644
index 00000000000..6e4b10094e5
--- /dev/null
+++ b/sql/updates/world/2012_01_30_01_world_spell_script_names.sql
@@ -0,0 +1,3 @@
+DELETE FROM `spell_script_names` WHERE `ScriptName`='spell_putricide_clear_mutated_plague';
+INSERT INTO `spell_script_names` (`spell_id`,`ScriptName`) VALUES
+(72618,'spell_putricide_clear_mutated_plague');
diff --git a/sql/updates/world/2012_01_30_02_world_creature_loot_template.sql b/sql/updates/world/2012_01_30_02_world_creature_loot_template.sql
new file mode 100644
index 00000000000..429d470a77f
--- /dev/null
+++ b/sql/updates/world/2012_01_30_02_world_creature_loot_template.sql
@@ -0,0 +1 @@
+UPDATE `creature_loot_template` SET `ChanceOrQuestChance`=-100 WHERE `entry`=15571 AND `item`=21137;
diff --git a/sql/updates/world/2012_01_30_03_world_creature_loot_template.sql b/sql/updates/world/2012_01_30_03_world_creature_loot_template.sql
new file mode 100644
index 00000000000..531c472c263
--- /dev/null
+++ b/sql/updates/world/2012_01_30_03_world_creature_loot_template.sql
@@ -0,0 +1,2 @@
+-- Set 25 Heroic loot to 68%
+UPDATE `creature_loot_template` SET `ChanceOrQuestChance`=68 WHERE `entry`=38586 AND `item`= 50274;
diff --git a/sql/updates/world/2012_01_30_04_world_gameobject_loot_template.sql b/sql/updates/world/2012_01_30_04_world_gameobject_loot_template.sql
new file mode 100644
index 00000000000..3ef39fe43d2
--- /dev/null
+++ b/sql/updates/world/2012_01_30_04_world_gameobject_loot_template.sql
@@ -0,0 +1,14 @@
+SET @ITEM :=50274;
+DELETE FROM `gameobject_loot_template` WHERE `entry` IN (28074,28088,28082,28096) AND `item`=@ITEM;
+INSERT INTO `gameobject_loot_template` (`entry`,`item`,`ChanceOrQuestChance`,`lootmode`,`groupid`,`mincountOrRef`,`maxcount`) VALUES
+(28074,@ITEM,-38,1,0,1,1), -- Deathbringer Cache 25 Normal
+(28088,@ITEM,-68,1,0,1,1), -- Deathbringer Cache 25 Heroic
+(28082,@ITEM,-38,1,0,1,1), -- Cache of the Dreamwalker 25 Normal
+(28096,@ITEM,-68,1,0,1,1); -- Cache of the Dreamwalker 25 Heroic
+-- only drop if someone is on the quest (negative ChanceOrQuestChance) 
+UPDATE `creature_loot_template` SET `ChanceOrQuestChance`= -(ABS(`ChanceOrQuestChance`)) WHERE `item`=50274;
+UPDATE `gameobject_loot_template` SET `ChanceOrQuestChance`= -(ABS(`ChanceOrQuestChance`)) WHERE `item`=50274;
+
+-- Dreamwalker and Council should drop 3 items
+UPDATE `gameobject_loot_template` SET `maxcount`=3 WHERE `entry`IN (28052,28082,28064,28096) AND `item`=1;
+UPDATE `creature_loot_template` SET `maxcount`=3 WHERE `entry` IN (37970,38401,38784,38785) AND `item`=1;
diff --git a/sql/updates/world/2012_01_30_05_world_gameobject_loot_template.sql b/sql/updates/world/2012_01_30_05_world_gameobject_loot_template.sql
new file mode 100644
index 00000000000..8196663eebe
--- /dev/null
+++ b/sql/updates/world/2012_01_30_05_world_gameobject_loot_template.sql
@@ -0,0 +1,94 @@
+SET @ThoriumGems = 12900;
+DELETE FROM `reference_loot_template` WHERE `entry` IN (@ThoriumGems,12901,12902,12903,12904,12905,12906,12907,12908);
+INSERT INTO `reference_loot_template` (`entry`,`item`,`ChanceOrQuestChance`,`lootmode`,`groupid`,`mincountOrRef`,`maxcount`) VALUES
+-- ThoriumGems
+(@ThoriumGems,12363,40,1,1,1,1), -- Arcane Crystal
+(@ThoriumGems, 7910,12,1,1,1,1), -- Star Ruby
+(@ThoriumGems,12800,12,1,1,1,1), -- Azerothian Diamond
+(@ThoriumGems,12361,12,1,1,1,1), -- Blue Sapphire
+(@ThoriumGems,12364,12,1,1,1,1), -- Huge Emerald
+(@ThoriumGems,12799,12,1,1,1,1); -- Large Opal
+
+SET @Copper := 1502;
+SET @Tin := 1503;
+SET @Silver := 1504;
+SET @Iron := 1505;
+SET @Gold :=1506;
+SET @Mithril :=1742;
+SET @Truesilver := 5045;
+SET @SmallThorium := 9597;
+SET @RichThorium := 12883;
+
+DELETE FROM `gameobject_loot_template` WHERE `entry` IN (@Copper,@Tin,@Silver,@Iron,@Gold,@Mithril,@Truesilver,@SmallThorium,@RichThorium,17938,13960,17241);
+INSERT INTO `gameobject_loot_template` (`entry`,`item`,`ChanceOrQuestChance`,`lootmode`,`groupid`,`mincountOrRef`,`maxcount`) VALUES
+-- Copper Vein
+(@Copper,2770,100,1,0,1,9), -- Copper Ore
+(@Copper,2835, 25,1,0,1,11), -- Rough Stone
+(@Copper,774 ,5,1,1,1,1), -- Malachite
+(@Copper,1210,5,1,1,1,1), -- Shadowgem
+(@Copper,818 ,5,1,1,1,1), -- Tigerseye
+(@Copper,22634,-100,1,0,1,2), -- Underlight Ore (only on quest)
+-- Tin Vein
+(@Tin,2771,100,1,0,1,9), -- Tin Ore
+(@Tin,2836,25,1,0,1,13), -- Coarse Stone
+(@Tin,1206,5,1,1,1,1), -- Moss Agate
+(@Tin,1705,5,1,1,1,1), -- Lesser Moonstone
+(@Tin,1210,5,1,1,1,1), -- Shadowgem
+(@Tin,1529,5,1,1,1,1), -- Jade
+(@Tin,2798,-100,1,0,1,2), -- Rethban Ore (only on quest)
+(@Tin,22634,-100,1,0,1,2), -- Underlight Ore (only on quest)
+-- Silver Vein
+(@Silver,2775,100,1,0,2,8), -- Silver Ore
+(@Silver,1206,5,1,1,1,1), -- Moss Agate
+(@Silver,1705,5,1,1,1,1), -- Lesser Moonstone
+(@Silver,1210,5,1,1,1,1), -- Shadowgem
+-- Iron Deposit
+(@Iron,2772,100,1,0,2,9), -- Iron Ore
+(@Iron,2838,100,1,0,2,10), -- Heavy Stone
+(@Iron,1529,5,1,1,1,1), -- Jade
+(@Iron,3864,5,1,1,1,1), -- Citrine
+(@Iron,1705,5,1,1,1,1), -- Lesser Moonstone
+(@Iron,7909,5,1,1,1,1), -- Aquamarine
+-- Gold Vein
+(@Gold,2776,100,1,0,2,8), -- Gold Ore
+(@Gold,3864,5,1,1,1,1), -- Citrine
+(@Gold,1705,5,1,1,1,1), -- Lesser Moonstone
+(@Gold,7909,5,1,1,1,1), -- Aquamarine
+-- Mithril Deposit
+(@Mithril,3858,100,1,0,1,9), -- Mithril Ore
+(@Mithril,7912,80,1,0,1,13), -- Solid Stone
+(@Mithril,7909,5,1,1,1,1), -- Aquamarine
+(@Mithril,3864,5,1,1,1,1), -- Citrine
+(@Mithril,7910,5,1,1,1,1), -- Star Ruby
+(@Mithril,9262,5,1,1,1,1), -- Black Vitriol
+-- Truesilver Deposit
+(@Truesilver,7911,100,1,0,2,8), -- Truesilver Ore
+(@Truesilver,7909,5,1,1,1,1), -- Aquamarine
+(@Truesilver,3864,5,1,1,1,1), -- Citrine
+(@Truesilver,7910,5,1,1,1,1), -- Star Ruby
+-- Small Thorium Vein
+(@SmallThorium,10620,100,1,0,1,8), -- Thorium Ore
+(@SmallThorium,12365,100,1,0,1,10), -- Dense Stone
+(@SmallThorium,1,15,1,0,-@ThoriumGems,1), -- One From Gems
+-- Rich Thorium Vein
+(@RichThorium,10620,100,1,0,3,10), -- Thorium Ore
+(@RichThorium,12365,100,1,0,4,12), -- Dense Stone
+(@RichThorium,1,25,1,0,-@ThoriumGems,1), -- One From Gems
+-- Special Cases:
+-- Truesilver Vein+Tainted Vitriol
+(17938,7911,100,1,0,2,8), -- Truesilver Ore
+(17938,7909,5,1,1,1,1), -- Aquamarine
+(17938,3864,5,1,1,1,1), -- Citrine
+(17938,7910,5,1,1,1,1), -- Star Ruby
+(17938,11513,50,1,0,1,1), -- Tainted Vitriol
+-- Small Thorium Vein+Tainted Vitriol
+(13960,10620,100,1,0,1,8), -- Thorium Ore
+(13960,12365,100,1,0,1,10), -- Dense Stone
+(13960,1,15,1,0,-@ThoriumGems,1), -- One From Gems
+(13960,11513,50,1,0,1,1), -- Tainted Vitriol
+-- Hakkari Thorium Vein
+(17241,10620,100,1,0,1,8), -- Thorium Ore
+(17241,12365,100,1,0,1,10), -- Dense Stone
+(17241,1,15,1,0,-@ThoriumGems,1), -- One From Gems
+(17241,19774,40,1,0,5,10); -- Souldarite
+
diff --git a/sql/updates/world/2012_01_31_00_world_gameobject_loot_template.sql b/sql/updates/world/2012_01_31_00_world_gameobject_loot_template.sql
new file mode 100644
index 00000000000..91f26990488
--- /dev/null
+++ b/sql/updates/world/2012_01_31_00_world_gameobject_loot_template.sql
@@ -0,0 +1,136 @@
+-- Change all Copper Ore Nodes in the Underlight Mines to be other id
+UPDATE `gameobject` SET `id`=181248 WHERE `guid` IN (75024,75051,75090,75099,75105) AND `id`=1731;
+-- Same for the Tin Nodes in the Underlight Mines
+UPDATE `gameobject` SET `id`=181249 WHERE `guid` IN (75025,75052,75091,75100,75106) AND `id`=1732;
+
+-- Change all Copper Ore Nodes in Beal Modan to match the other id
+UPDATE `gameobject` SET `id`=103713 WHERE `guid` IN (5096,13067,120336) AND `id` IN (1731,3763);
+
+-- fix wrongly increased counts (aka cata guildperk changed data)
+-- Copper
+UPDATE `gameobject_loot_template` SET `maxcount`=5 WHERE `entry`=1502 AND `item`=2770;
+UPDATE `gameobject_loot_template` SET `maxcount`=6 WHERE `entry`=1502 AND `item`=2835;
+-- Tin
+UPDATE `gameobject_loot_template` SET `maxcount`=5 WHERE `entry`=1503 AND `item`=2771;
+UPDATE `gameobject_loot_template` SET `maxcount`=7 WHERE `entry`=1503 AND `item`=2836;
+-- Silver
+UPDATE `gameobject_loot_template` SET `mincountOrRef`=1 WHERE `entry`=1504 AND `item`=2775;
+UPDATE `gameobject_loot_template` SET `maxcount`=4 WHERE `entry`=1504 AND `item`=2775;
+-- Iron
+UPDATE `gameobject_loot_template` SET `mincountOrRef`=1 WHERE `entry`=1505 AND `item`=2772;
+UPDATE `gameobject_loot_template` SET `maxcount`=4 WHERE `entry`=1505 AND `item`=2772;
+UPDATE `gameobject_loot_template` SET `mincountOrRef`=1 WHERE `entry`=1505 AND `item`=2838;
+UPDATE `gameobject_loot_template` SET `maxcount`=5 WHERE `entry`=1505 AND `item`=2838;
+-- Gold
+UPDATE `gameobject_loot_template` SET `mincountOrRef`=1 WHERE `entry`=1506 AND `item`=2776;
+UPDATE `gameobject_loot_template` SET `maxcount`=4 WHERE `entry`=1506 AND `item`=2776;
+-- Mithril
+UPDATE `gameobject_loot_template` SET `maxcount`=5 WHERE `entry`=1742 AND `item`=3858;
+UPDATE `gameobject_loot_template` SET `maxcount`=7 WHERE `entry`=1742 AND `item`=7912;
+-- Truesilver
+UPDATE `gameobject_loot_template` SET `mincountOrRef`=1 WHERE `entry`=5045 AND `item`=7911;
+UPDATE `gameobject_loot_template` SET `maxcount`=4 WHERE `entry`=5045 AND `item`=7911;
+-- Small Thorium
+UPDATE `gameobject_loot_template` SET `mincountOrRef`=1 WHERE `entry`=9597 AND `item`=10620;
+UPDATE `gameobject_loot_template` SET `maxcount`=4 WHERE `entry`=9597 AND `item`=10620;
+UPDATE `gameobject_loot_template` SET `maxcount`=4 WHERE `entry`=9597 AND `item`=12365;
+-- Rich Thorium
+UPDATE `gameobject_loot_template` SET `mincountOrRef`=2 WHERE `entry`=12883 AND `item`=10620;
+UPDATE `gameobject_loot_template` SET `maxcount`=5 WHERE `entry`=12883 AND `item`=10620;
+UPDATE `gameobject_loot_template` SET `mincountOrRef`=2 WHERE `entry`=12883 AND `item`=12365;
+UPDATE `gameobject_loot_template` SET `maxcount`=6 WHERE `entry`=12883 AND `item`=12365;
+
+-- Remove Underlight Ore from all other copper ore nodes:
+DELETE FROM `gameobject_loot_template` WHERE `item`=22634; -- Underlight Ore
+DELETE FROM `gameobject_loot_template` WHERE `item`=2798; -- Rethban Ore
+DELETE FROM `gameobject_loot_template` WHERE `item`=11513; -- Tainted Vitriol
+
+DELETE FROM `conditions` WHERE `SourceTypeOrReferenceId`=4 AND `SourceGroup`=17939 AND `SourceEntry`=11513;
+
+-- Set LootIDvariables for Special Nodes
+SET @CopperUM := 18092;
+SET @TinUM := 18093;
+SET @CopperRR := 1735;
+SET @TinRR := 1736;
+SET @CopperB := 2626;
+SET @TinB := 2627;
+SET @GoldOoze := 17939;
+SET @MithrilFW := 13961;
+SET @TruesilverFW := 17938;
+SET @ThoriumFW := 13960;
+SET @ThoriumGems = 12900;
+
+DELETE FROM `gameobject_loot_template` WHERE `entry` IN (@CopperUM,@CopperRR,@TinUM,@TinRR,@CopperB,@TinB,@GoldOoze,@MithrilFW,@TruesilverFW,@ThoriumFW);
+INSERT INTO `gameobject_loot_template` (`entry`,`item`,`ChanceOrQuestChance`,`lootmode`,`groupid`,`mincountOrRef`,`maxcount`) VALUES
+-- Underlight Mine Special Nodes
+(@CopperUM,2770,100,1,0,1,5), -- Copper Ore
+(@CopperUM,2835, 25,1,0,1,6), -- Rough Stone
+(@CopperUM,774 ,5,1,1,1,1), -- Malachite
+(@CopperUM,1210,5,1,1,1,1), -- Shadowgem
+(@CopperUM,818 ,5,1,1,1,1), -- Tigerseye
+(@CopperUM,22634,-100,1,0,1,2), -- Underlight Ore (only if on quest)
+-- Chanced Tin also have to drop it
+(@TinUM,2771,100,1,0,1,5), -- Tin Ore
+(@TinUM,2836,25,1,0,1,7), -- Coarse Stone
+(@TinUM,1206,5,1,1,1,1), -- Moss Agate
+(@TinUM,1705,5,1,1,1,1), -- Lesser Moonstone
+(@TinUM,1210,5,1,1,1,1), -- Shadowgem
+(@TinUM,1529,5,1,1,1,1), -- Jade
+(@TinUM,22634,-100,1,0,1,2), -- Underlight Ore (only on quest)
+-- Redridge Special Nodes
+(@CopperRR,2770,100,1,0,1,5), -- Copper Ore
+(@CopperRR,2835, 25,1,0,1,6), -- Rough Stone
+(@CopperRR,774 ,5,1,1,1,1), -- Malachite
+(@CopperRR,1210,5,1,1,1,1), -- Shadowgem
+(@CopperRR,818 ,5,1,1,1,1), -- Tigerseye
+(@CopperRR,2798,-100,1,0,1,4), -- Rethban Ore
+-- Chanced Tin also have to drop it
+(@TinRR,2771,100,1,0,1,5), -- Tin Ore
+(@TinRR,2836,25,1,0,1,7), -- Coarse Stone
+(@TinRR,1206,5,1,1,1,1), -- Moss Agate
+(@TinRR,1705,5,1,1,1,1), -- Lesser Moonstone
+(@TinRR,1210,5,1,1,1,1), -- Shadowgem
+(@TinRR,1529,5,1,1,1,1), -- Jade
+(@TinRR,2798,-100,1,0,1,2), -- Rethban Ore (only on quest)
+-- The Barrens Copper Vein contain Blood Shards
+(@CopperB,2770,100,1,0,1,5), -- Copper Ore
+(@CopperB,2835, 25,1,0,1,6), -- Rough Stone
+(@CopperB,774 ,5,1,1,1,1), -- Malachite
+(@CopperB,1210,5,1,1,1,1), -- Shadowgem
+(@CopperB,818 ,5,1,1,1,1), -- Tigerseye
+(@CopperB,5075,5,1,1,1,3), -- Blood Shard (only in barrens)
+-- Chanced Tin also have to drop it
+(@TinB,2771,100,1,0,1,5), -- Tin Ore
+(@TinB,2836,25,1,0,1,7), -- Coarse Stone
+(@TinB,1206,5,1,1,1,1), -- Moss Agate
+(@TinB,1705,5,1,1,1,1), -- Lesser Moonstone
+(@TinB,1210,5,1,1,1,1), -- Shadowgem
+(@TinB,1529,5,1,1,1,1), -- Jade
+(@TinB,5075,5,1,1,1,4), -- Blood Shard (only in barrens ?)
+-- Ooze Covered Gold Vein
+(@GoldOoze,2776,100,1,0,2,4), -- Gold Ore
+(@GoldOoze,3864,5,1,1,1,1), -- Citrine
+(@GoldOoze,1705,5,1,1,1,1), -- Lesser Moonstone
+(@GoldOoze,7909,5,1,1,1,1), -- Aquamarine
+-- Felwood Mithril Vein
+(@MithrilFW,3858,100,1,0,1,5), -- Mithril Ore
+(@MithrilFW,7912,80,1,0,1,7), -- Solid Stone
+(@MithrilFW,7909,5,1,1,1,1), -- Aquamarine
+(@MithrilFW,3864,5,1,1,1,1), -- Citrine
+(@MithrilFW,7910,5,1,1,1,1), -- Star Ruby
+(@MithrilFW,9262,5,1,1,1,1), -- Black Vitriol
+(@MithrilFW,11513,25,1,0,1,4), -- Tainted Vitriol
+-- Chanced Truesilver also needs it
+(@TruesilverFW,7911,100,1,0,1,4), -- Truesilver Ore
+(@TruesilverFW,7909,5,1,1,1,1), -- Aquamarine
+(@TruesilverFW,3864,5,1,1,1,1), -- Citrine
+(@TruesilverFW,7910,5,1,1,1,1), -- Star Ruby
+(@TruesilverFW,11513,25,1,0,1,4), -- Tainted Vitriol
+-- Chance Thoriuym also needs it
+-- Small Thorium Vein+Tainted Vitriol
+(@ThoriumFW,10620,100,1,0,1,8), -- Thorium Ore
+(@ThoriumFW,12365,100,1,0,1,10), -- Dense Stone
+(@ThoriumFW,1,15,1,0,-@ThoriumGems,1), -- One From Gems
+(@ThoriumFW,11513,50,1,0,1,1); -- Tainted Vitriol
+
+
diff --git a/sql/updates/world/2012_01_31_01_world_misc.sql b/sql/updates/world/2012_01_31_01_world_misc.sql
new file mode 100644
index 00000000000..c359f186431
--- /dev/null
+++ b/sql/updates/world/2012_01_31_01_world_misc.sql
@@ -0,0 +1,8 @@
+-- Delete the criteria from the disables table
+DELETE FROM `disables` WHERE `sourceType`=4 AND `entry`=3880;
+
+-- criteria data for achievement Not So Fast
+DELETE FROM `achievement_criteria_data` WHERE `criteria_id`=3880;
+INSERT INTO `achievement_criteria_data` (`criteria_id`, `TYPE`, `value1`, `value2`, `ScriptName`) VALUES
+(3880,6,3277,0, ''),
+(3880,7,23451,0, '');
diff --git a/sql/updates/world/2012_02_01_00_world_misc.sql b/sql/updates/world/2012_02_01_00_world_misc.sql
new file mode 100644
index 00000000000..e137f7a8238
--- /dev/null
+++ b/sql/updates/world/2012_02_01_00_world_misc.sql
@@ -0,0 +1,5 @@
+DELETE FROM `achievement_criteria_data` WHERE `criteria_id`=9798 AND `type`=6;
+
+DELETE FROM `spell_script_names` WHERE `spell_id`=63399;
+INSERT INTO `spell_script_names`(`spell_id`,`ScriptName`) VALUES
+(63399, 'spell_gen_tournament_pennant');
diff --git a/sql/updates/world/2012_02_02_00_world_item_loot_template.sql b/sql/updates/world/2012_02_02_00_world_item_loot_template.sql
new file mode 100644
index 00000000000..4223835bee3
--- /dev/null
+++ b/sql/updates/world/2012_02_02_00_world_item_loot_template.sql
@@ -0,0 +1,60 @@
+-- Update reference for hallowed end
+SET @Ref := 10020;
+DELETE FROM `reference_loot_template` WHERE `entry` IN (@Ref,10021);
+INSERT INTO `reference_loot_template` (`entry`,`item`,`ChanceOrQuestChance`,`lootmode`,`groupid`,`mincountOrRef`,`maxcount`) VALUES
+-- Masks
+(@Ref,20391,2,1,0,1,1), -- Flimsy Male Gnome Mask
+(@Ref,20392,2,1,0,1,1), -- Flimsy Female Gnome Mask
+(@Ref,20561,2,1,0,1,1), -- Flimsy Male Dwarf Mask
+(@Ref,20562,2,1,0,1,1), -- Flimsy Female Dwarf Mask
+(@Ref,20563,2,1,0,1,1), -- Flimsy Female Night Elf Mask
+(@Ref,20564,2,1,0,1,1), -- Flimsy Male Night Elf Mask
+(@Ref,20565,2,1,0,1,1), -- Flimsy Female Human Mask
+(@Ref,20566,2,1,0,1,1), -- Flimsy Male Human Mask
+(@Ref,20567,2,1,0,1,1), -- Flimsy Female Troll Mask
+(@Ref,20568,2,1,0,1,1), -- Flimsy Male Troll Mask
+(@Ref,20569,2,1,0,1,1), -- Flimsy Female Orc Mask
+(@Ref,20570,2,1,0,1,1), -- Flimsy Male Orc Mask
+(@Ref,20571,2,1,0,1,1), -- Flimsy Female Tauren Mask
+(@Ref,20572,2,1,0,1,1), -- Flimsy Male Tauren Mask
+(@Ref,20573,2,1,0,1,1), -- Flimsy Male Undead Mask
+(@Ref,20574,2,1,0,1,1), -- Flimsy Female Undead Mask
+(@Ref,34000,2,1,0,1,1), -- Flimsy Female Blood Elf Mask
+(@Ref,34001,2,1,0,1,1), -- Flimsy Female Draenei Mask
+(@Ref,34002,2,1,0,1,1), -- Flimsy Male Blood Elf Mask
+(@Ref,34003,2,1,0,1,1), -- Flimsy Male Draenei Mask
+-- Wands
+(@Ref,20397,2,1,0,1,1), -- Hallowed Wand - Pirate
+(@Ref,20398,2,1,0,1,1), -- Hallowed Wand - Ninja
+(@Ref,20399,2,1,0,1,1), -- Hallowed Wand - Leper Gnome
+(@Ref,20409,2,1,0,1,1), -- Hallowed Wand - Ghost
+(@Ref,20410,2,1,0,1,1), -- Hallowed Wand - Bat
+(@Ref,20411,2,1,0,1,1), -- Hallowed Wand - Skeleton
+(@Ref,20413,2,1,0,1,1), -- Hallowed Wand - Random
+(@Ref,20414,2,1,0,1,1), -- Hallowed Wand - Wisp
+-- Pets
+(@Ref,33154,5,1,0,1,1), -- Sinister Squashling
+(@Ref,33292,5,1,0,1,1), -- Hallowed Helm
+-- Candies
+(@Ref,20388,15,1,0,4,6), -- Lollipop
+(@Ref,20389,15,1,0,4,6), -- Candy Corn
+(@Ref,20390,15,1,0,4,6), -- Candy Bar
+(@Ref,37604,30,1,0,10,10), -- Tooth Pick
+(@Ref,37582,30,1,0,1,2), -- Pyroblast Cinnamon Ball
+(@Ref,37583,30,1,0,1,2), -- G.N.E.R.D.S.
+(@Ref,37584,30,1,0,1,2), -- Soothing Spearmint Candy
+(@Ref,37585,30,1,0,1,2), -- Chewy Fel Taffy
+(@Ref,37606,15,1,0,1,1); -- Penny Pouch
+
+-- Assign loot to the special bags
+DELETE FROM `item_loot_template` WHERE `entry` IN (54516,37586);
+INSERT INTO `item_loot_template` (`entry`,`item`,`ChanceOrQuestChance`,`lootmode`,`groupid`,`mincountOrRef`,`maxcount`) VALUES
+-- Loot Filled Pumpkin: 
+(54516,33226,100,1,0,2,3), -- Tricky Treat
+(54516,1,100,1,0,-@Ref,1), -- Referenced Specials
+(54516,33808,2,1,0,1,1), -- The Horseman's Helm
+(54516,38175,2,1,0,1,1), -- The Horseman's Blade
+(54516,37012,0.1,1,0,1,1), -- The Horseman's Reins
+-- Handfull of Treats:
+(37586,33226,100,1,0,2,3), -- Tricky Treat
+(37586,1,100,1,0,-@Ref,1); -- Referenced Specials