Merge branch 'master' of github.com:TrinityCore/TrinityCore into 4.3.4

16 files changed, 225 insertions, 0 deletions

diff --git a/sql/updates/world/2012_07_22_00_world_spelldifficulty_dbc.sql b/sql/updates/world/2012_07_22_00_world_spelldifficulty_dbc.sql
new file mode 100644
index 00000000000..c90c42692b9
--- /dev/null
+++ b/sql/updates/world/2012_07_22_00_world_spelldifficulty_dbc.sql
@@ -0,0 +1 @@
+UPDATE `spelldifficulty_dbc` SET `spellid0`= 61890 WHERE `id`= 3251 AND `spellid1`= 63498;
diff --git a/sql/updates/world/2012_07_22_01_world_conditions.sql b/sql/updates/world/2012_07_22_01_world_conditions.sql
new file mode 100644
index 00000000000..333ae7f997f
--- /dev/null
+++ b/sql/updates/world/2012_07_22_01_world_conditions.sql
@@ -0,0 +1,10 @@
+-- Saronite Mine Slave conditions
+SET @QUEST_A := 13300;
+SET @QUEST_H := 13302;
+SET @GOSSIP  := 10137;
+
+-- Only show gossip if player is on quest Slaves to Saronite
+DELETE FROM `conditions` WHERE `SourceGroup`=@GOSSIP AND `ConditionValue1` IN (@QUEST_A,@QUEST_H);
+INSERT INTO `conditions` (`SourceTypeOrReferenceId`, `SourceGroup`, `SourceEntry`, `SourceId`, `ElseGroup`, `ConditionTypeOrReference`, `ConditionTarget`, `ConditionValue1`, `ConditionValue2`, `ConditionValue3`, `NegativeCondition`, `ErrorTextId`, `ScriptName`, `Comment`) VALUES
+(15,@GOSSIP,0,0,0,9,0,@QUEST_A,0,0,0,0,'',"Only show first gossip if player is on quest Slaves to Saronite Alliance"),
+(15,@GOSSIP,0,0,1,9,0,@QUEST_H,0,0,0,0,'',"Only show first gossip if player is on quest Slaves to Saronite Horde");
diff --git a/sql/updates/world/2012_07_22_02_world_creature_loot_template.sql b/sql/updates/world/2012_07_22_02_world_creature_loot_template.sql
new file mode 100644
index 00000000000..e4bc61b6fa4
--- /dev/null
+++ b/sql/updates/world/2012_07_22_02_world_creature_loot_template.sql
@@ -0,0 +1,5 @@
+-- Item was added to the wrong NPC
+-- Source: http://old.wowhead.com/item=19364
+DELETE FROM `creature_loot_template` WHERE `entry` IN (1853, 11583) AND `item`=19364;
+INSERT INTO `creature_loot_template` (`entry`, `item`, `ChanceOrQuestChance`, `lootmode`, `groupid`, `mincountOrRef`, `maxcount`) VALUES
+(11583, 19364, 10, 1, 0, 1, 1);
diff --git a/sql/updates/world/2012_07_22_03_world_gossip.sql b/sql/updates/world/2012_07_22_03_world_gossip.sql
new file mode 100644
index 00000000000..d1aa7e50747
--- /dev/null
+++ b/sql/updates/world/2012_07_22_03_world_gossip.sql
@@ -0,0 +1,18 @@
+-- Keristrasza (26206)
+UPDATE `creature_template` SET `gossip_menu_id` = 9262 WHERE `entry` = 26206;
+
+DELETE FROM `gossip_menu` WHERE `entry`=9262 AND `text_id`=12576;
+INSERT INTO `gossip_menu` (`entry`, `text_id`) VALUES (9262, 12576);
+
+-- from sniff
+DELETE FROM `gossip_menu_option` WHERE `menu_id`=9262 AND `id`=0;
+DELETE FROM `gossip_menu_option` WHERE `menu_id`=9262 AND `id`=1;
+INSERT INTO `gossip_menu_option` (`menu_id`, `id`, `option_icon`, `option_text`, `option_id`, `npc_option_npcflag`, `action_menu_id`, `action_poi_id`, `box_coded`, `box_money`, `box_text`) VALUES
+(9262, 0, 0, 'I am prepared to face Saragosa!', 1, 3, 0, 0, 0, 0, NULL),
+(9262, 1, 0, 'Keristrasa, I am finished here. Please return me to the Transitus Shield.', 1, 3, 0, 0, 0, 0, NULL);
+
+DELETE FROM `conditions` WHERE `SourceTypeOrReferenceId`=15 AND `SourceGroup`=9262 AND `SourceEntry`=0;
+DELETE FROM `conditions` WHERE `SourceTypeOrReferenceId`=15 AND `SourceGroup`=9262 AND `SourceEntry`=1;
+INSERT INTO `conditions` (`SourceTypeOrReferenceId`, `SourceGroup`, `SourceEntry`, `SourceId`, `ElseGroup`, `ConditionTypeOrReference`, `ConditionTarget`, `ConditionValue1`, `ConditionValue2`, `ConditionValue3`, `NegativeCondition`, `ErrorTextId`, `ScriptName`, `Comment`) VALUES
+(15, 9262, 0, 0, 0, 9, 0, 11957, 0, 0, 0, 0, '', "Only show gossip if player has quest Saragosa's End"),
+(15, 9262, 1, 0, 0, 9, 0, 11967, 0, 0, 0, 0, '', "Only show gossip if player has quest Mustering the Reds");
diff --git a/sql/updates/world/2012_07_22_04_world_gossip.sql b/sql/updates/world/2012_07_22_04_world_gossip.sql
new file mode 100644
index 00000000000..0fbf2e7508f
--- /dev/null
+++ b/sql/updates/world/2012_07_22_04_world_gossip.sql
@@ -0,0 +1,20 @@
+-- NPC Cowlen - Missing Gossip Options
+SET @NPC := 17311;
+DELETE FROM `creature_addon` WHERE `guid`=84415;
+INSERT INTO `creature_addon` (`guid`,`path_id`,`mount`,`bytes1`,`bytes2`,`emote`,`auras`) VALUES
+(84415,0,0,1,0,0,NULL);
+UPDATE `creature_template` SET `gossip_menu_id`=7403, `AIName`='SmartAI' WHERE `entry`=@NPC;
+DELETE FROM `gossip_menu` WHERE `entry` IN (7403,7402,7401);
+INSERT INTO `gossip_menu` (`entry`,`text_id`) VALUES
+(7403,8870),
+(7402,8871),
+(7401,8872);
+DELETE FROM `gossip_menu_option` WHERE `menu_id` IN (7403,7402,7401) AND `id`=0;
+INSERT INTO `gossip_menu_option` (`menu_id`,`id`,`option_icon`,`option_text`,`option_id`,`npc_option_npcflag`,`action_menu_id`,`action_poi_id`,`box_coded`,`box_money`,`box_text`) VALUES
+(7403,0,0, 'I have not come to kill you, night elf. And the gods did not do this...',1,1,7402,0,0,0, ''),
+(7402,0,0, 'I fear that my people are somewhat responsible for this destruction. We are refugees, displaced from our homes by the Burning Legion. This tragedy is a result of our latest evacuation. Our vessel crashed - this debris is a part of that vessel.',1,1,7401,0,0,0, ''),
+(7401,0,0, 'We have much in common, night elf. I can''t help but feel that perhaps it was fate that brought us together. Let me help you, Cowlen. Let my people help. We will right the wrongs. This I vow.',1,1,0,0,0,0, '');
+DELETE FROM `smart_scripts` WHERE `entryorguid`=@NPC AND `source_type`=0 AND `id` IN (0,1);
+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
+(@NPC,0,0,1,62,0,100,0,7401,0,0,0,5,18,0,0,0,0,0,1,0,0,0,0,0,0,0, 'Cowlen - On gossip option play emote'),
+(@NPC,0,1,0,61,0,100,0,7401,0,0,0,72,0,0,0,0,0,0,7,0,0,0,0,0,0,0, 'Cowlen - On gossip option Close Gossip');
diff --git a/sql/updates/world/2012_07_22_05_world_script_texts.sql b/sql/updates/world/2012_07_22_05_world_script_texts.sql
new file mode 100644
index 00000000000..2ecb1b8f130
--- /dev/null
+++ b/sql/updates/world/2012_07_22_05_world_script_texts.sql
@@ -0,0 +1,2 @@
+-- Fixing wrong text in Trial of the Crusader, Twin Valkyrs
+UPDATE `script_texts` SET `content_default`='%s begins to read the spell Twin''s Pact!' WHERE `entry`=-1649043;
diff --git a/sql/updates/world/2012_07_22_06_world_gossip.sql b/sql/updates/world/2012_07_22_06_world_gossip.sql
new file mode 100644
index 00000000000..0cb41937d3c
--- /dev/null
+++ b/sql/updates/world/2012_07_22_06_world_gossip.sql
@@ -0,0 +1,85 @@
+-- gossip assignation from sniff
+UPDATE `creature_template` SET `gossip_menu_id`=4182 WHERE `entry`=1466; -- Gretta Finespindle <Apprentice Leatherworker>
+UPDATE `creature_template` SET `gossip_menu_id`=201 WHERE `entry`=3678; -- Muyoh <Disciple of Naralex>
+UPDATE `creature_template` SET `gossip_menu_id`=7406 WHERE `entry`=3848; -- Kayneth Stillwind
+UPDATE `creature_template` SET `gossip_menu_id`=8851 WHERE `entry`=4979; -- Theramore Guard
+UPDATE `creature_template` SET `gossip_menu_id`=4862 WHERE `entry`=6771; -- Ravenholdt Assassin <Assassin's League>
+UPDATE `creature_template` SET `gossip_menu_id`=3130 WHERE `entry`=10618; -- Rivern Frostwind <Wintersaber Trainer>
+UPDATE `creature_template` SET `gossip_menu_id`=3441 WHERE `entry`=10857; -- Argent Quartermaster Lightspark <The Argent Crusade>
+UPDATE `creature_template` SET `gossip_menu_id`=3074 WHERE `entry`=10922; -- Greta Mosshoof <Emerald Circle>
+UPDATE `creature_template` SET `gossip_menu_id`=3128 WHERE `entry`=11019; -- Jessir Moonbow
+UPDATE `creature_template` SET `gossip_menu_id`=3622 WHERE `entry`=11554; -- Grazle
+UPDATE `creature_template` SET `gossip_menu_id`=3602 WHERE `entry`=11609; -- Alexia Ironknife
+UPDATE `creature_template` SET `gossip_menu_id`=3963 WHERE `entry`=11626; -- Rigger Gizelton
+UPDATE `creature_template` SET `gossip_menu_id`=4003 WHERE `entry`=12245; -- Vendor-Tron 1000
+UPDATE `creature_template` SET `gossip_menu_id`=4002 WHERE `entry`=12246; -- Super-Seller 680
+UPDATE `creature_template` SET `gossip_menu_id`=4922 WHERE `entry`=13085; -- Myrokos Silentform
+UPDATE `creature_template` SET `gossip_menu_id`=6531 WHERE `entry`=15182; -- Vish Kozus <Captain of the Guard>
+UPDATE `creature_template` SET `gossip_menu_id`=7326 WHERE `entry`=16817; -- Festival Loremaster
+UPDATE `creature_template` SET `gossip_menu_id`=7405 WHERE `entry`=17287; -- Sentinel Luciel Starwhisper <Silverwing Sentinels>
+UPDATE `creature_template` SET `gossip_menu_id`=7404 WHERE `entry`=17291; -- Architect Nemos
+UPDATE `creature_template` SET `gossip_menu_id`=7407 WHERE `entry`=17303; -- Vindicator Vedaar <Hand of Argus>
+UPDATE `creature_template` SET `gossip_menu_id`=8080 WHERE `entry`=17310; -- Gnarl <Ancient of War>
+UPDATE `creature_template` SET `gossip_menu_id`=7382 WHERE `entry`=17406; -- Artificer
+UPDATE `creature_template` SET `gossip_menu_id`=7735 WHERE `entry`=18538; -- Ishanah <High Priestess of the Aldor>
+UPDATE `creature_template` SET `gossip_menu_id`=7734 WHERE `entry`=18596; -- Arcanist Adyria <The Scryers>
+UPDATE `creature_template` SET `gossip_menu_id`=7747 WHERE `entry`=18653; -- Seth
+UPDATE `creature_template` SET `gossip_menu_id`=10459 WHERE `entry`=33746; -- Silvermoon Champion
+UPDATE `creature_template` SET `gossip_menu_id`=10461 WHERE `entry`=33748; -- Thunder Bluff Champion
+UPDATE `creature_template` SET `gossip_menu_id`=10462 WHERE `entry`=33749; -- Undercity Champion
+
+-- gossip from sniff
+DELETE FROM `gossip_menu` WHERE (`entry`=201 AND `text_id`=698) OR (`entry`=3074 AND `text_id`=3807) OR (`entry`=3128 AND `text_id`=3864) OR (`entry`=3130 AND `text_id`=3854) OR (`entry`=3441 AND `text_id`=4193) OR (`entry`=3602 AND `text_id`=4354) OR (`entry`=3621 AND `text_id`=4394) OR (`entry`=3622 AND `text_id`=4393) OR (`entry`=3961 AND `text_id`=4813) OR (`entry`=3963 AND `text_id`=4815) OR (`entry`=4002 AND `text_id`=4856) OR (`entry`=4003 AND `text_id`=4857) OR (`entry`=4182 AND `text_id`=5276) OR (`entry`=4862 AND `text_id`=5938) OR (`entry`=4922 AND `text_id`=5981) OR (`entry`=6531 AND `text_id`=7733) OR (`entry`=6588 AND `text_id`=7801) OR (`entry`=6587 AND `text_id`=7802) OR (`entry`=6586 AND `text_id`=7803) OR (`entry`=6585 AND `text_id`=7804) OR (`entry`=7326 AND `text_id`=8703) OR (`entry`=7382 AND `text_id`=8838) OR (`entry`=7404 AND `text_id`=8873) OR (`entry`=7405 AND `text_id`=8874) OR (`entry`=7406 AND `text_id`=8875) OR (`entry`=7407 AND `text_id`=8876) OR (`entry`=7735 AND `text_id`=9457) OR (`entry`=7734 AND `text_id`=9452) OR (`entry`=7747 AND `text_id`=9486) OR (`entry`=8080 AND `text_id`=9986) OR (`entry`=8464 AND `text_id`=10573) OR (`entry`=8851 AND `text_id`=11492) OR (`entry`=10933 AND `text_id`=15194);
+INSERT INTO `gossip_menu` (`entry`, `text_id`) VALUES
+(201, 698), -- 3678
+(3074, 3807), -- 10922
+(3128, 3864), -- 11019
+(3130, 3854), -- 10618
+(3441, 4193), -- 10857
+(3602, 4354), -- 11609
+(3621, 4394), -- 11554
+(3622, 4393), -- 11554
+(3961, 4813), -- 11625
+(3963, 4815), -- 11626
+(4002, 4856), -- 12246
+(4003, 4857), -- 12245
+(4182, 5276), -- 1466
+(4862, 5938), -- 6771
+(4922, 5981), -- 13085
+(6531, 7733), -- 15182
+(6588, 7801), -- 15169
+(6587, 7802), -- 15169
+(6586, 7803), -- 15169
+(6585, 7804), -- 15169
+(7326, 8703), -- 16817
+(7382, 8838), -- 17406
+(7404, 8873), -- 17291
+(7405, 8874), -- 17287
+(7406, 8875), -- 3848
+(7407, 8876), -- 17303
+(7735, 9457), -- 18538
+(7734, 9452), -- 18596
+(7747, 9486), -- 18653
+(8080, 9986), -- 17310
+(8464, 10573), -- 185126
+(8851, 11492), -- 4979
+(10933, 15194); -- 37200
+
+-- correct npc_flags for npc from sniff
+UPDATE `creature_template` SET `npcflag`=0 WHERE `entry`=8151; -- Nijel's Point Guard
+UPDATE `creature_template` SET `npcflag`=2 WHERE `entry`=24393; -- The Rokk <Master of Cooking>
+UPDATE `creature_template` SET `npcflag`=1 WHERE `entry`=37119; -- Highlord Tirion Fordring
+
+-- missing gossip from sniff
+DELETE FROM `gossip_menu_option` WHERE (`menu_id`=3622 AND `id`=0) OR (`menu_id`=4002 AND `id`=0) OR (`menu_id`=4003 AND `id`=0) OR (`menu_id`=6586 AND `id`=0) OR (`menu_id`=6587 AND `id`=0) OR (`menu_id`=6588 AND `id`=0) OR (`menu_id`=10456 AND `id`=0) OR (`menu_id`=10457 AND `id`=0) OR (`menu_id`=10461 AND `id`=0) OR (`menu_id`=10462 AND `id`=0);
+INSERT INTO `gossip_menu_option` (`menu_id`, `id`, `option_icon`, `option_text`, `option_id`, `npc_option_npcflag`, `action_menu_id`, `action_poi_id`, `box_coded`, `box_money`, `box_text`) VALUES
+(3622, 0, 0, 'How can I prove myself to the Timbermaw furbolg?', 1, 3, 3621, 0, 0, 0, ''), -- 11554
+(4002, 0, 1, 'Let me take a look at what you have to offer.', 3, 387, 0, 0, 0, 0, ''), -- 12246
+(4003, 0, 1, 'I am curious to see what a bucket of bolts has to offer.', 3, 131, 0, 0, 0, 0, ''), -- 12245
+(6586, 0, 0, 'And what do you say?', 1, 1, 6585, 0, 0, 0, ''), -- 15169
+(6587, 0, 0, 'What do they say?', 1, 1, 6586, 0, 0, 0, ''), -- 15169
+(6588, 0, 0, 'How do you know?', 1, 1, 6587, 0, 0, 0, ''), -- 15169
+(10456, 0, 0, 'I am ready to fight!', 1, 1, 0, 0, 0, 0, ''), -- 33743
+(10457, 0, 0, 'I am ready to fight!', 1, 1, 0, 0, 0, 0, ''), -- 33744
+(10461, 0, 0, 'I am ready to fight!', 1, 1, 0, 0, 0, 0, ''), -- 33748
+(10462, 0, 0, 'I am ready to fight!', 1, 1, 0, 0, 0, 0, ''); -- 33749
diff --git a/sql/updates/world/2012_07_22_07_world_sai.sql b/sql/updates/world/2012_07_22_07_world_sai.sql
new file mode 100644
index 00000000000..f8f42ef07da
--- /dev/null
+++ b/sql/updates/world/2012_07_22_07_world_sai.sql
@@ -0,0 +1,7 @@
+-- Add SAI for Liquid Pyrite ID: 33189 - remove auras to prevent exploit after used, also despawn
+SET @Pyrite := 33189;
+UPDATE `creature_template` SET `AIName`='SmartAI' WHERE `entry`=@Pyrite;
+DELETE FROM `smart_scripts` WHERE `entryorguid`=@Pyrite;
+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
+(@Pyrite,0,0,1,8,0,100,0,67390,0,0,0,28,62494,0,0,0,0,0,1,0,0,0,0,0,0,0,'Pyrite - On hit by spell Ride Vehicle - Remove auras from Liquid Pyrite'),
+(@Pyrite,0,1,0,61,0,100,0,0,0,0,0,41,15000,0,0,0,0,0,1,0,0,0,0,0,0,0,'Pyrite - Linked with previous event - Despawn in 15 sec');
diff --git a/sql/updates/world/2012_07_22_08_world_sai.sql b/sql/updates/world/2012_07_22_08_world_sai.sql
new file mode 100644
index 00000000000..62b5a95f532
--- /dev/null
+++ b/sql/updates/world/2012_07_22_08_world_sai.sql
@@ -0,0 +1,16 @@
+-- Remove disables (instances scripts) for 10 and 25 version of achievement Dwarfageddon
+DELETE FROM `achievement_criteria_data` WHERE  `criteria_id`=10858 AND `type`=18;
+DELETE FROM `achievement_criteria_data` WHERE  `criteria_id`=10860 AND `type`=18;
+-- Insert the required spell credit markers for Dwarfageddon (10/25 player) achievements
+DELETE FROM `spell_dbc` WHERE `Id`=65387;
+INSERT INTO `spell_dbc` (`Id`, `Dispel`, `Mechanic`, `Attributes`, `AttributesEx`, `AttributesEx2`, `AttributesEx3`, `AttributesEx4`, `AttributesEx5`, `AttributesEx6`, `AttributesEx7`, `Stances`, `StancesNot`, `Targets`, `CastingTimeIndex`, `AuraInterruptFlags`, `ProcFlags`, `ProcChance`, `ProcCharges`, `MaxLevel`, `BaseLevel`, `SpellLevel`, `DurationIndex`, `RangeIndex`, `StackAmount`, `EquippedItemClass`, `EquippedItemSubClassMask`, `EquippedItemInventoryTypeMask`, `Effect1`, `Effect2`, `Effect3`, `EffectDieSides1`, `EffectDieSides2`, `EffectDieSides3`, `EffectRealPointsPerLevel1`, `EffectRealPointsPerLevel2`, `EffectRealPointsPerLevel3`, `EffectBasePoints1`, `EffectBasePoints2`, `EffectBasePoints3`, `EffectMechanic1`, `EffectMechanic2`, `EffectMechanic3`, `EffectImplicitTargetA1`, `EffectImplicitTargetA2`, `EffectImplicitTargetA3`, `EffectImplicitTargetB1`, `EffectImplicitTargetB2`, `EffectImplicitTargetB3`, `EffectRadiusIndex1`, `EffectRadiusIndex2`, `EffectRadiusIndex3`, `EffectApplyAuraName1`, `EffectApplyAuraName2`, `EffectApplyAuraName3`, `EffectAmplitude1`, `EffectAmplitude2`, `EffectAmplitude3`, `EffectMultipleValue1`, `EffectMultipleValue2`, `EffectMultipleValue3`, `EffectMiscValue1`, `EffectMiscValue2`, `EffectMiscValue3`, `EffectMiscValueB1`, `EffectMiscValueB2`, `EffectMiscValueB3`, `EffectTriggerSpell1`, `EffectTriggerSpell2`, `EffectTriggerSpell3`, `EffectSpellClassMaskA1`, `EffectSpellClassMaskA2`, `EffectSpellClassMaskA3`, `EffectSpellClassMaskB1`, `EffectSpellClassMaskB2`, `EffectSpellClassMaskB3`, `EffectSpellClassMaskC1`, `EffectSpellClassMaskC2`, `EffectSpellClassMaskC3`, `MaxTargetLevel`, `SpellFamilyName`, `SpellFamilyFlags1`, `SpellFamilyFlags2`, `SpellFamilyFlags3`, `MaxAffectedTargets`, `DmgClass`, `PreventionType`, `DmgMultiplier1`, `DmgMultiplier2`, `DmgMultiplier3`, `AreaGroupId`, `SchoolMask`, `Comment`) VALUES
+(65387, 0, 0, 545259776, 0, 5, 268697600, 128, 0, 16777216, 0, 0, 0, 0, 1, 0, 0, 101, 0, 0, 0, 0, 0, 13, 0, -1, 0, 0, 3, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 22, 0, 0, 7, 0, 0, 28, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 1, 1, 0, 0, 'Steelforged Defender - Credit marker');
+-- Add SAI support for Dwarfageddon (10 and 25 player) achievement/also SAI for the NPC connected
+SET @Defender := 33236;
+UPDATE `creature_template` SET `AIName`='SmartAI' WHERE `entry`=@Defender;
+DELETE FROM `smart_scripts` WHERE `entryorguid`=@Defender;
+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
+(@Defender,0,0,0,6,0,100,0,0,0,0,0,11,65387,0,0,0,0,0,16,0,0,0,0,0,0,0,'Steelforged Defender - On death - Cast achievement credit'),
+(@Defender,0,1,0,0,0,100,0,0,2500,9000,12000,11,62845,0,0,0,0,0,2,0,0,0,0,0,0,0,'Steelforged Defender - IC - Hamstring'),
+(@Defender,0,2,0,0,0,100,0,0,2600,13000,14000,11,50370,0,0,0,0,0,2,0,0,0,0,0,0,0,'Steelforged Defender - IC - Cast Sunder armor'),
+(@Defender,0,3,0,0,0,100,0,500,4000,4500,9000,11,57780,0,0,0,0,0,2,0,0,0,0,0,0,0,'Steelforged Defender - IC - Cast Lightening Bolt');
diff --git a/sql/updates/world/2012_07_22_09_world_creature_template.sql b/sql/updates/world/2012_07_22_09_world_creature_template.sql
new file mode 100644
index 00000000000..909b4cc238b
--- /dev/null
+++ b/sql/updates/world/2012_07_22_09_world_creature_template.sql
@@ -0,0 +1,2 @@
+-- Add spells to Salvaged Chopper - 25 version
+UPDATE `creature_template` SET `spell1`=62974,`spell2`=62286,`spell3`=62299,`spell4`=64660, `mechanic_immune_mask`=344276858 WHERE `entry`=34045;
diff --git a/sql/updates/world/2012_07_22_10_world_creature_onkill_rep.sql b/sql/updates/world/2012_07_22_10_world_creature_onkill_rep.sql
new file mode 100644
index 00000000000..22d81bca548
--- /dev/null
+++ b/sql/updates/world/2012_07_22_10_world_creature_onkill_rep.sql
@@ -0,0 +1,2 @@
+-- Critter Fire Beetle should not give reputation with Honor Hold when killed
+DELETE FROM `creature_onkill_reputation` WHERE `creature_id` = 9699;
diff --git a/sql/updates/world/2012_07_22_11_world_conditions.sql b/sql/updates/world/2012_07_22_11_world_conditions.sql
new file mode 100644
index 00000000000..9ecb28307ba
--- /dev/null
+++ b/sql/updates/world/2012_07_22_11_world_conditions.sql
@@ -0,0 +1,4 @@
+-- Exarch Menelaous - Missing condition for gossip 7370
+DELETE FROM `conditions` WHERE `SourceTypeOrReferenceId`=15 AND `SourceGroup`=7370 AND `SourceEntry`=0;
+INSERT INTO `conditions` (`SourceTypeOrReferenceId`,`SourceGroup`,`SourceEntry`,`SourceId`,`ElseGroup`,`ConditionTypeOrReference`,`ConditionValue1`,`ConditionValue2`,`ConditionValue3`,`NegativeCondition`,`ErrorTextId`,`ScriptName`,`Comment`) VALUES
+(15,7370,0,0,0,9,9456,0,0,0,0,'','Exarch Menelaous - Show gossip option if player has quest 9456');
diff --git a/sql/updates/world/2012_07_22_12_world_creature_template.sql b/sql/updates/world/2012_07_22_12_world_creature_template.sql
new file mode 100644
index 00000000000..51e2b36d15d
--- /dev/null
+++ b/sql/updates/world/2012_07_22_12_world_creature_template.sql
@@ -0,0 +1,2 @@
+-- Fix Night Elf Corpse (16804) so it can't be attacked
+UPDATE `creature_template` SET `unit_flags`=768, `dynamicflags`=40 WHERE `entry` = 16804;
diff --git a/sql/updates/world/2012_07_22_13_world_conditions.sql b/sql/updates/world/2012_07_22_13_world_conditions.sql
new file mode 100644
index 00000000000..896257d3f92
--- /dev/null
+++ b/sql/updates/world/2012_07_22_13_world_conditions.sql
@@ -0,0 +1,3 @@
+DELETE FROM conditions WHERE SourceTypeOrReferenceId=22 AND SourceEntry=160445;
+INSERT INTO conditions (SourceTypeOrReferenceId, SourceGroup, SourceEntry, SourceId, ElseGroup, ConditionTypeOrReference, ConditionTarget, ConditionValue1, ConditionValue2, ConditionValue3, NegativeCondition, ErrorTextId, ScriptName, Comment) VALUES
+(22, 1, 160445, 1, 0, 28, 0, 3821, 0, 0, 0, 0, '', 'Execute SmartAI for gameobject 160445 only if player has complete quest 3821');
diff --git a/sql/updates/world/2012_07_22_14_world_gameobject.sql b/sql/updates/world/2012_07_22_14_world_gameobject.sql
new file mode 100644
index 00000000000..bf77d1a625f
--- /dev/null
+++ b/sql/updates/world/2012_07_22_14_world_gameobject.sql
@@ -0,0 +1,21 @@
+-- GO missing spawn
+-- Zone: Tanaris, Area: Land's End Beach or Finisterrae Beach
+SET @GO_ENTRY := 142189; -- GO Inconspicuous Landmark entry
+SET @GO_GUID := 329; -- Need one guid
+SET @POOL := 355; -- Need one entry
+
+DELETE FROM `gameobject` WHERE `id`=@GO_ENTRY;
+INSERT INTO `gameobject` (`guid`,`id`,`map`,`spawnMask`,`phaseMask`,`position_x`,`position_y`,`position_z`,`orientation`,`rotation0`,`rotation1`,`rotation2`,`rotation3`,`spawntimesecs`,`animprogress`,`state`) VALUES
+(17499,@GO_ENTRY,1,1,1,-10249.2,-3981.8,1.66783,-0.750491,0,0,0.366501,-0.930418,900,100,1), -- Already in TDB
+(17498,@GO_ENTRY,1,1,1,-10119.7,-4052.46,5.33005,-0.366519,0,0,0.182236,-0.983255,900,100,1), -- Already in TDB
+(@GO_GUID,@GO_ENTRY,1,1,1,-10154.2,-3948.635,7.744733,2.652894,0,0,0.970295,0.241925,900,100,1);
+
+DELETE FROM `pool_template` WHERE `entry`=@POOL;
+INSERT INTO `pool_template` (`entry`,`max_limit`,`description`) VALUES
+(@POOL,1 , 'GO Inconspicuous Landmark (142189)');
+
+DELETE FROM `pool_gameobject` WHERE `guid` IN (17498,17499,@GO_GUID);
+INSERT INTO `pool_gameobject` (`guid`,`pool_entry`,`chance`,`description`) VALUES
+(17498,@POOL,0, 'Inconspicuous Landmark'),
+(17499,@POOL,0, 'Inconspicuous Landmark'),
+(@GO_GUID,@POOL,0, 'Inconspicuous Landmark');
diff --git a/sql/updates/world/2012_07_22_15_world_sai.sql b/sql/updates/world/2012_07_22_15_world_sai.sql
new file mode 100644
index 00000000000..218eb9a3399
--- /dev/null
+++ b/sql/updates/world/2012_07_22_15_world_sai.sql
@@ -0,0 +1,27 @@
+-- SAI for quest 12150 "Reclusive Runemaster"
+SET @Dregmar := 27003;
+DELETE FROM `creature_ai_scripts` WHERE `creature_id`=@Dregmar;
+UPDATE `creature_template` SET `AIName`= 'SmartAI' WHERE `entry`=@Dregmar;
+DELETE FROM `smart_scripts` WHERE `entryorguid`=@Dregmar AND `source_type`=0 AND `id` BETWEEN 0 AND 2;
+DELETE FROM `smart_scripts` WHERE `entryorguid`=@Dregmar*100 AND `source_type`=9 AND `id` BETWEEN 0 AND 8;
+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
+(@Dregmar,0,0,0,4,0,100,1,0,0,0,0,1,0,0,0,0,0,0,1,0,0,0,0,0,0,0, 'Dregmar Runebrand - on aggro - yell text 0'),
+(@Dregmar,0,1,0,2,0,100,1,0,50,0,0,1,1,0,0,0,0,0,1,0,0,0,0,0,0,0, 'Dregmar Runebrand - at 50% HP - yell text 1'),
+(@Dregmar,0,2,0,2,0,100,0,0,20,0,0,80,@Dregmar*100,2,0,0,0,0,1,0,0,0,0,0,0,0, 'Dregmar Runebrand - at 20% HP - run script'),
+(@Dregmar*100,9,0,0,0,0,100,0,0,0,0,0,23,1,0,0,0,0,0,1,0,0,0,0,0,0,0, 'Dregmar Runebrand - set phase 1'),
+(@Dregmar*100,9,1,0,0,0,100,0,0,0,0,0,24,1,0,0,0,0,0,1,0,0,0,0,0,0,0, 'Dregmar Runebrand - evade'),
+(@Dregmar*100,9,2,0,0,0,100,0,0,0,0,0,21,0,0,0,0,0,0,1,0,0,0,0,0,0,0, 'Dregmar Runebrand - Stop combat'),
+(@Dregmar*100,9,3,0,0,0,100,0,0,0,0,0,18,33346,0,0,0,0,0,1,0,0,0,0,0,0,0, 'Dregmar Runebrand - unitflags OutOfCombat'),
+(@Dregmar*100,9,4,0,0,0,100,0,0,0,0,0,75,48325,0,0,0,0,0,1,0,0,0,0,0,0,0, 'Dregmar Runebrand - apply aura RUNE SHIELD'),
+(@Dregmar*100,9,5,0,0,0,100,0,0,0,0,0,1,2,0,0,0,0,0,1,0,0,0,0,0,0,0, 'Dregmar Runebrand - yell text 2'),
+(@Dregmar*100,9,6,0,0,0,100,0,0,14000,0,0,11,48028,0,0,0,0,0,1,0,0,0,0,0,0,0, 'Dregmar Runebrand - Complete quest on player range'),
+(@Dregmar*100,9,7,0,0,0,100,0,0,14000,0,0,19,514,0,0,0,0,0,1,0,0,0,0,0,0,0, 'Dregmar Runebrand - unitflags reseted'),
+(@Dregmar*100,9,8,0,0,0,100,0,0,0,0,0,41,0,0,0,0,0,0,1,0,0,0,0,0,0,0, 'Dregmar Runebrand - force despawn');
+
+-- creature_text
+DELETE FROM `creature_ai_texts` WHERE `entry` BETWEEN -894 AND -892;
+DELETE FROM `creature_text` WHERE `entry`=@Dregmar AND `groupid` BETWEEN 0 AND 2;
+INSERT INTO `creature_text` (`entry`,`groupid`,`id`,`text`,`type`,`language`,`probability`,`emote`,`duration`,`sound`,`comment`) VALUES
+(@Dregmar,0,0, 'I know why you''ve come - one of those foolish Magnataur on the plains meddled and managed to get the dragons involved. Do you enjoy serving them like a dog?',14,0,100,0,0,0, 'Dregmar Runebrand - yell'),
+(@Dregmar,1,0, 'You seek their leader... little thing, you wage war against the clans of Grom''thar the Thunderbringer himself. Don''t be so eager to rush to your death.',14,0,100,0,0,0, 'Dregmar Runebrand yell'),
+(@Dregmar,2,0, 'Hah! So be it. Blow the horn of a magnataur leader at the ring of torches south of the Azure Dragonshrine. Make peace with your gods... Grom''thar will come.',14,0,100,0,0,0, 'Dregmar Runebrand yell');