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

Conflicts:
	src/server/game/Entities/Object/Object.cpp
	src/server/game/Entities/Object/Object.h
	src/server/game/Server/WorldSession.cpp

8 files changed, 256 insertions, 0 deletions

diff --git a/sql/updates/world/2013_09_01_00_world_spell_script_names.sql b/sql/updates/world/2013_09_01_00_world_spell_script_names.sql
new file mode 100644
index 00000000000..7d8dda4dba9
--- /dev/null
+++ b/sql/updates/world/2013_09_01_00_world_spell_script_names.sql
@@ -0,0 +1,4 @@
+DELETE FROM `spell_script_names` WHERE `spell_id` IN (63276,63278);
+INSERT INTO `spell_script_names` (`spell_id`, `ScriptName`) VALUES
+(63276,'spell_general_vezax_mark_of_the_faceless'),
+(63278,'spell_general_vezax_mark_of_the_faceless_leech');
diff --git a/sql/updates/world/2013_09_01_01_world_trinity_string.sql b/sql/updates/world/2013_09_01_01_world_trinity_string.sql
new file mode 100644
index 00000000000..541a2674f96
--- /dev/null
+++ b/sql/updates/world/2013_09_01_01_world_trinity_string.sql
@@ -0,0 +1,23 @@
+DELETE FROM `trinity_string` WHERE `entry` IN (453, 548, 549, 550, 714, 716, 749, 752, 843, 844, 845, 846, 847, 848, 849, 850, 851, 852, 853, 854, 871); 
+INSERT INTO `trinity_string` (`entry`, `content_default`) VALUES
+(453,'│Player %s %s (guid: %u)'),
+(548,'│ GM Mode active, Phase: -1'),
+(549,'├─ Banned: (Type: %s, Reason: %s, Time: %s, By: %s)'),
+(550,'├─ Muted: (Reason: %s, Time: %s, By: %s)'),
+(714,'│ Account: %s (ID: %u), GMLevel: %u'),
+(716,'│ Last Login: %s (Failed Logins: %u)'),
+(749,'│ OS: %s - Latency: %u ms - Mail: %s'),
+(752,'│ Last IP: %s (Locked: %s)'),
+(843,'│ Level: %u (%u/%u XP (%u XP left))'),
+(844,'│ Race: %s %s, %s'),
+(845,'│ Alive ?: %s'),
+(846,'│ Phase: %u'),
+(847,'│ Money: %ug%us%uc'),
+(848,'│ Map: %s, Area: %s, Zone: %s'),
+(849,'│ Guild: %s (ID: %u)'),
+(850,'├─ Rank: %s'),
+(851,'├─ Note: %s'),
+(852,'├─ O. Note: %s'),
+(853,'│ Played time: %s'),
+(854,'└ Mails: %d Read/%u Total'),
+(871,'│ Level: %u');
diff --git a/sql/updates/world/2013_09_01_02_world_smart_scripts.sql b/sql/updates/world/2013_09_01_02_world_smart_scripts.sql
new file mode 100644
index 00000000000..ef165c6f96e
--- /dev/null
+++ b/sql/updates/world/2013_09_01_02_world_smart_scripts.sql
@@ -0,0 +1,8 @@
+UPDATE `creature_template` SET `AIName`='SmartAI' WHERE `entry` IN (25510,25511,25512,25513);
+
+DELETE FROM `smart_scripts` WHERE `entryorguid` IN (25510,25511,25512,25513) 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
+(25510, 0, 0, 0, 8, 0, 100, 1, 45692, 0, 0, 0, 33, 25510, 0, 0, 0, 0, 0, 7, 0, 0, 0, 0, 0, 0, 0, '1st Kvaldir Vessel (The Serpent''s Maw) - On Spellhit "Use Tuskarr Torch" - Give Quest Credit'),
+(25511, 0, 0, 0, 8, 0, 100, 1, 45692, 0, 0, 0, 33, 25511, 0, 0, 0, 0, 0, 7, 0, 0, 0, 0, 0, 0, 0, '2nd Kvaldir Vessel (The Kur Drakkar) - On Spellhit "Use Tuskarr Torch" - Give Quest Credit'),
+(25512, 0, 0, 0, 8, 0, 100, 1, 45692, 0, 0, 0, 33, 25512, 0, 0, 0, 0, 0, 7, 0, 0, 0, 0, 0, 0, 0, '3rd Kvaldir Vessel (Bor''s Hammer) - On Spellhit "Use Tuskarr Torch" - Give Quest Credit'),
+(25513, 0, 0, 0, 8, 0, 100, 1, 45692, 0, 0, 0, 33, 25513, 0, 0, 0, 0, 0, 7, 0, 0, 0, 0, 0, 0, 0, '4th Kvaldir Vessel (Bor''s Anvil) - On Spellhit "Use Tuskarr Torch" - Give Quest Credit');
diff --git a/sql/updates/world/2013_09_01_03_world_smart_scripts.sql b/sql/updates/world/2013_09_01_03_world_smart_scripts.sql
new file mode 100644
index 00000000000..3e99f43aa33
--- /dev/null
+++ b/sql/updates/world/2013_09_01_03_world_smart_scripts.sql
@@ -0,0 +1,7 @@
+UPDATE `creature_template` SET `AIName`='SmartAI' WHERE `entry` IN (19866,19867,19868);
+
+DELETE FROM `smart_scripts` WHERE `entryorguid` IN (19866,19867,19868) 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
+(19866, 0, 0, 0, 8, 0, 100, 1, 34646, 0, 0, 0, 33, 19866, 0, 0, 0, 0, 0, 7, 0, 0, 0, 0, 0, 0, 0, 'Invis East KV Rune - On Spellhit "Activate Kirin''Var Rune" - Give Quest Credit'),
+(19867, 0, 0, 0, 8, 0, 100, 1, 34646, 0, 0, 0, 33, 19867, 0, 0, 0, 0, 0, 7, 0, 0, 0, 0, 0, 0, 0, 'Invis NE KV Rune - On Spellhit "Activate Kirin''Var Rune" - Give Quest Credit'),
+(19868, 0, 0, 0, 8, 0, 100, 1, 34646, 0, 0, 0, 33, 19868, 0, 0, 0, 0, 0, 7, 0, 0, 0, 0, 0, 0, 0, 'Invis West KV Rune - On Spellhit "Activate Kirin''Var Rune" - Give Quest Credit');
diff --git a/sql/updates/world/2013_09_01_04_world_smart_scripts.sql b/sql/updates/world/2013_09_01_04_world_smart_scripts.sql
new file mode 100644
index 00000000000..9966f9d7812
--- /dev/null
+++ b/sql/updates/world/2013_09_01_04_world_smart_scripts.sql
@@ -0,0 +1,6 @@
+DELETE FROM `smart_scripts` WHERE `entryorguid` IN (19723,19724) 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
+(19723, 0, 0, 1, 8, 0, 100, 1, 34526, 0, 0, 0, 80, 1972300, 2, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 'Invis BE Ballista - On Spellhit - Run Script'),
+(19723, 0, 1, 0, 61, 0, 100, 0, 0, 0, 0, 0, 33, 19723, 0, 0, 0, 0, 0, 7, 0, 0, 0, 0, 0, 0, 0, 'Invis BE Ballista - On Spellhit (Link) - Quest Credit'),
+(19724, 0, 0, 1, 8, 0, 100, 1, 34526, 0, 0, 0, 80, 1972400, 2, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 'Invis BE Tent - On Spellhit - Run Script'),
+(19724, 0, 1, 0, 61, 0, 100, 0, 0, 0, 0, 0, 33, 19724, 0, 0, 0, 0, 0, 7, 0, 0, 0, 0, 0, 0, 0, 'Invis BE Tent - On Spellhit (Link) - Quest Credit');
diff --git a/sql/updates/world/2013_09_01_05_world_skinning_loot_template.sql b/sql/updates/world/2013_09_01_05_world_skinning_loot_template.sql
new file mode 100644
index 00000000000..b9d4810bedb
--- /dev/null
+++ b/sql/updates/world/2013_09_01_05_world_skinning_loot_template.sql
@@ -0,0 +1,201 @@
+-- --------------------------------------------------------------------------------------
+-- -- Skinning Loot Revamp by ZxBiohazardZx
+-- --------------------------------------------------------------------------------------
+SET @var := 100000; -- Set this to the reference value, gap is 10 minimum, more ofc later (10<00X>)?
+-- Delete old junk that isnt needed & assign new template to those creatures:
+UPDATE `creature_template` SET `skinloot`=0 WHERE `entry`=534;
+DELETE FROM `skinning_loot_template` WHERE `entry`=534;
+UPDATE `creature_template` SET `skinloot`=@var WHERE `skinloot` IN (721,883,890,2098,2442,2620,4166,5951,17467,10780,12296,12297,12298);
+DELETE FROM `skinning_loot_template` WHERE `entry` IN(721,883,890,2098,2442,2620,4166,5951,17467,10780,12296,12297,12298);
+-- Var+1
+UPDATE `creature_template` SET `skinloot`=@var+1 WHERE `skinloot`=100007;
+DELETE FROM `skinning_loot_template` WHERE `entry`=100007;
+-- Var+2
+-- --------------------------------------------------------------------------------------
+UPDATE `creature_template` SET `skinloot`=@var+2 WHERE `skinloot` IN (
+ 113, 118, 119, 330, 390, 524, 525, 822, 834,1125,1126,1127,1128,1131,1132,1133,1134,1135,
+1137,1138,1190,1196,1199,1201,1547,1548,1549,1553,1554,1689,1765,1922,2033,2034,2042,2043,
+2070,2175,2956,2957,2958,2959,2960,2972,2973,3035,3068,3099,3100,3110,3121,3122,3123,3125,
+3126,3127,3130,3131,3225,3226,3227,3566,5807,6789,10105,10356,14430,15650,15651,15652,
+16347,16353,17199,17200,17202,17203,17345,17372,17373);
+DELETE FROM `skinning_loot_template` WHERE `entry` IN (
+ 113, 118, 119, 330, 390, 524, 525, 822, 834,1125,1126,1127,1128,1131,1132,1133,1134,1135,
+1137,1138,1190,1196,1199,1201,1547,1548,1549,1553,1554,1689,1765,1922,2033,2034,2042,2043,
+2070,2175,2956,2957,2958,2959,2960,2972,2973,3035,3068,3099,3100,3110,3121,3122,3123,3125,
+3126,3127,3130,3131,3225,3226,3227,3566,5807,6789,10105,10356,14430,15650,15651,15652,
+16347,16353,17199,17200,17202,17203,17345,17372,17373);
+-- Var+3
+-- --------------------------------------------------------------------------------------
+UPDATE `creature_template` SET `skinloot`=@var+3 WHERE `skinloot` IN (
+ 157, 454, 833,1130,1186,1188,1191,1271,1388,1693,1766,1769,1770,1778,1779,1782,1797,1892,
+1893,1896,1924,1961,1972,2069,2163,2164,2185,2321,2322,2974,3056,3058,3231,3234,3241,3242,
+3243,3244,3246,3248,3254,3255,3415,3425,3461,3531,4127,4316,5829,5865,12431,12432,16348,
+16354,17347,17525,17556);
+DELETE FROM `skinning_loot_template` WHERE `entry` IN (
+ 157, 454, 833,1130,1186,1188,1191,1271,1388,1693,1766,1769,1770,1778,1779,1782,1797,1892,
+1893,1896,1924,1961,1972,2069,2163,2164,2185,2321,2322,2974,3056,3058,3231,3234,3241,3242,
+3243,3244,3246,3248,3254,3255,3415,3425,3461,3531,4127,4316,5829,5865,12431,12432,16348,
+16354,17347,17525,17556);
+-- Var+4 
+-- --------------------------------------------------------------------------------------
+UPDATE `creature_template` SET `skinloot`=@var+4 WHERE `skinloot` IN (
+ 213, 547, 565,1189,1192,1224,2071,2165,2172,2187,2237,2323,3236,3240,3245,3247,3256,3257,
+3398,3416,3424,3426,3463,3466,3475,3721,3816,3823,4008,4009,4011,4129,5053,6788,10644,16349,
+16355,17348,17527,17588,17589);
+DELETE FROM `skinning_loot_template` WHERE `entry` IN (
+ 213, 547, 565,1189,1192,1224,2071,2165,2172,2187,2237,2323,3236,3240,3245,3247,3256,3257,
+3398,3416,3424,3426,3463,3466,3475,3721,3816,3823,4008,4009,4011,4129,5053,6788,10644,16349,
+16355,17348,17527,17588,17589);
+-- Var+5 
+-- --------------------------------------------------------------------------------------
+UPDATE `creature_template` SET `skinloot`=@var+5 WHERE `skinloot` IN (
+ 335, 345, 521, 628, 819, 923,1015,1016,1017,1020,1021,1022,1258,1400,1417,1923,2089,2275,
+2351,2354,2356,2384,2476,2529,3235,3237,3238,3239,3249,3250,3252,3472,3473,3474,3774,3809,
+3810,3817,3824,4012,4013,4014,4015,4016,4018,4019,4031,4032,4042,4044,4067,4117,4126,4126,
+4128,4250,5835,12678,12723,12940);
+DELETE FROM `skinning_loot_template` WHERE `entry` IN (
+ 335, 345, 521, 628, 819, 923,1015,1016,1017,1020,1021,1022,1258,1400,1417,1923,2089,2275,
+2351,2354,2356,2384,2476,2529,3235,3237,3238,3239,3249,3250,3252,3472,3473,3474,3774,3809,
+3810,3817,3824,4012,4013,4014,4015,4016,4018,4019,4031,4032,4042,4044,4067,4117,4126,4126,
+4128,4250,5835,12678,12723,12940);
+-- Var+6 
+-- --------------------------------------------------------------------------------------
+UPDATE `creature_template` SET `skinloot`=@var+6 WHERE `skinloot` IN (1225,3653,3851,3853,3854,3855,3861,3862,3864,3865,3914,5058);
+DELETE FROM `skinning_loot_template` WHERE `entry` IN (1225,3653,3851,3853,3854,3855,3861,3862,3864,3865,3914,5058);
+-- Var+7 
+-- --------------------------------------------------------------------------------------
+UPDATE `creature_template` SET `skinloot`=@var+7 WHERE `skinloot` IN (3857,3859,3866,3868,3886,4279,4511,4514,4824,4827,4887,14357);
+DELETE FROM `skinning_loot_template` WHERE `entry` IN (3857,3859,3866,3868,3886,4279,4511,4514,4824,4827,4887,14357);
+-- Var+8
+-- --------------------------------------------------------------------------------------
+UPDATE `creature_template` SET `skinloot`=@var+8 WHERE `skinloot` IN (1042,1043,1069);
+DELETE FROM `skinning_loot_template` WHERE `entry` IN (1042,1043,1069);
+-- Var+9
+-- --------------------------------------------------------------------------------------
+UPDATE `creature_template` SET `skinloot`=@var+9 WHERE `skinloot` IN (3630,3631,3632,3633,3634,3636,3637,3641,5048,5056,5755,5756,5762,8886,20797);
+DELETE FROM `skinning_loot_template` WHERE `entry` IN (3630,3631,3632,3633,3634,3636,3637,3641,5048,5056,5755,5756,5762,8886,20797);
+-- Var+10
+-- --------------------------------------------------------------------------------------
+UPDATE `creature_template` SET `skinloot`=@var+10 WHERE `skinloot` IN (
+ 205, 206, 533, 681, 683, 855, 898, 920,1018,1019,1023,1150,1353,2248,2385,2408,2559,3476,
+3789,3791,3811,3815,3818,3825,4017,4041,4107,4109,4110,4118,4119,4124,4142,4147,4248,4249,4548,
+4688,5827,6071,6167,10116,10882,12677);
+DELETE FROM `skinning_loot_template` WHERE `entry` IN (
+ 205, 206, 533, 681, 683, 855, 898, 920,1018,1019,1023,1150,1353,2248,2385,2408,2559,3476,
+3789,3791,3811,3815,3818,3825,4017,4041,4107,4109,4110,4118,4119,4124,4142,4147,4248,4249,4548,
+4688,5827,6071,6167,10116,10882,12677);
+-- Var+11
+-- --------------------------------------------------------------------------------------
+UPDATE `creature_template` SET `skinloot`=@var+11 WHERE `skinloot` IN (
+ 507, 682, 685, 686, 688, 689, 736, 856,1084,1085,1108,1151,1152,2249,2250,2251,2406,
+2407,2560,2727,4139,4140,4143,4144,4150,4151,4304,4341,4351,4689,4696,4697,4700,4726,
+4728,10131,10992,12676);
+DELETE FROM `skinning_loot_template` WHERE `entry` IN (
+ 507, 682, 685, 686, 688, 689, 736, 856,1084,1085,1108,1151,1152,2249,2250,2251,2406,
+2407,2560,2727,4139,4140,4143,4144,4150,4151,4304,4341,4351,4689,4696,4697,4700,4726,
+4728,10131,10992,12676);
+-- Var+12
+-- --------------------------------------------------------------------------------------
+UPDATE `creature_template` SET `skinloot`=@var+12 WHERE `skinloot` IN (
+3927,4274,4515,4538,4825,4829);
+DELETE FROM `skinning_loot_template` WHERE `entry` IN (
+3927,4274,4515,4538,4825,4829);
+-- Var+13
+UPDATE `creature_template` SET `skinloot`=@var+13 WHERE `skinloot` IN 
+(687, 690, 728, 767, 772, 854, 874,1082,1114,1557,2473,2561,2728,2729,2731,2732,4342,4343,
+4344,4345,4347,4348,4352,4355,4356,4357,4388,4662,4678,4681,4685,4690,4699,4701,4702,4727,
+4729,10136,11785,13602,14227,14232,14233);
+DELETE FROM `skinning_loot_template` WHERE `entry` IN
+(687, 690, 728, 767, 772, 854, 874,1082,1114,1557,2473,2561,2728,2729,2731,2732,4342,4343,
+4344,4345,4347,4348,4352,4355,4356,4357,4388,4662,4678,4681,4685,4690,4699,4701,4702,4727,
+4729,10136,11785,13602,14227,14232,14233);
+
+-- Var+14
+UPDATE `creature_template` SET `skinloot`=@var+14 WHERE `skinloot` IN 
+( 730,1087,1511,1514,1516,1550,1551,1558,2657,2658,2734,4389,4841,5224,5260,5268,5272,5300,
+5304,5305,5307,5308,5419,5420,5425,5426,7268,11786,12741);
+DELETE FROM `skinning_loot_template` WHERE `entry` IN
+( 730,1087,1511,1514,1516,1550,1551,1558,2657,2658,2734,4389,4841,5224,5260,5268,5272,5300,
+5304,5305,5307,5308,5419,5420,5425,5426,7268,11786,12741);
+
+-- --------------------------------------------------------------------------------------
+-- -- Add the new profiles
+-- --------------------------------------------------------------------------------------
+DELETE FROM `skinning_loot_template` WHERE `entry` BETWEEN @var AND @var+15;
+INSERT INTO `skinning_loot_template` (`entry`,`item`,`ChanceOrQuestChance`,`lootmode`,`groupid`,`mincountOrRef`,`maxcount`) VALUES
+-- Var (Light Leather)
+(@var,2318,90,1,1,1,1), -- Ruined Leather Scraps
+(@var,2934,10,1,1,1,1), -- Light Leather
+-- Var+1 (Light Leather) -- 
+(@var+1,2934,80,1,1,1,1), -- Light Leather
+(@var+1, 783,20,1,1,1,1), -- Light Hide
+-- Var+2 (Light Leather
+(@var+2,2934,60,1,1,1,1), -- Ruined Leather Scraps
+(@var+2,2318,40,1,1,1,1), -- Light Leather
+-- Var+3 (Light Leather)
+(@var+3,2318,60,1,1,1,1), -- Light Leather
+(@var+3,2934,35,1,1,1,1), --  Ruined Leather Scraps
+(@var+3, 783, 5,1,1,1,1), --  Light Hide
+-- Var+4 (Light/Medium Leather
+(@var+4,2318,72,1,1,1,2), -- Light Leather
+(@var+4,2319,20,1,1,1,1), -- Medium Leather
+(@var+4, 783, 5,1,1,1,1), -- Light Hide
+(@var+4,4232, 3,1,1,1,1), -- Medium Hide
+-- Var+5 (Light/Medium Leather
+(@var+5,2319,50,1,1,1,1), -- Medium Leather
+(@var+5,2318,42,1,1,1,2), -- Light Leather
+(@var+5, 783, 5,1,1,1,1), -- Light Hide
+(@var+5,4232, 3,1,1,1,1), -- Medium Hide
+-- Var+6 (Light/Medium Leather2)
+(@var+6,2318,65,1,1,1,2), -- Light Leather
+(@var+6,2319,25,1,1,1,2), -- Medium Leather
+(@var+6, 783, 7,1,1,1,1), -- Light Hide
+(@var+6,4232, 3,1,1,1,1), -- Medium Hide
+-- Var+7 (Light/Medium Leather2)
+(@var+7,2318,55,1,1,1,2), -- Light Leather
+(@var+7,2319,35,1,1,1,2), -- Medium Leather
+(@var+7, 783, 7,1,1,1,1), -- Light Hide
+(@var+7,4232, 3,1,1,1,1), -- Medium Hide
+-- Var+8 (Red Whelp Scale Dragons)
+(@var+8,2318,37,1,1,1,2), -- Light Leather
+(@var+8,2319,45,1,1,1,1), -- Medium Leather
+(@var+8, 783, 3,1,1,1,1), -- Light Hide
+(@var+8,4232, 5,1,1,1,1), -- Medium Hide
+(@var+8,7287,10,1,1,1,1), -- Red Whelp Scale
+-- Var+9 (Deviate Scales)
+(@var+9,2318,50,1,1,1,2), -- Light Leather
+(@var+9,2319,25,1,1,1,2), -- Medium Leather
+(@var+9,6470,10,1,1,1,1), -- Deviate Scale
+(@var+9, 783, 7,1,1,1,1), -- Light Hide
+(@var+9,6471, 5,1,1,1,1), -- Perfect Deviate Scale
+(@var+9,4232, 3,1,1,1,1), -- Medium Hide
+-- Var+10 (Medium Leather)
+(@var+10,2319,73,1,1,1,1), -- Medium Leather
+(@var+10,4234,20,1,1,1,1), -- Heavy Leather
+(@var+10,4232, 5,1,1,1,1), -- Medium Hide
+(@var+10,4235, 2,1,1,1,1), -- Heavy Hide
+-- Var+11 (Medium Leather)
+(@var+11,4234,51,1,1,1,1), -- Heavy Leather
+(@var+11,2319,42,1,1,1,1), -- Medium Leather
+(@var+11,4232, 4,1,1,1,1), -- Medium Hide
+(@var+11,4235, 3,1,1,1,1), -- Heavy Hide
+-- Var+12 (Medium Leather)
+(@var+12,2319,64,1,1,1,2), -- Medium Leather
+(@var+12,4234,27,1,1,1,2), -- Heavy Leather
+(@var+12,4232, 6,1,1,1,1), -- Medium Hide
+(@var+12,4235, 3,1,1,1,1), -- Heavy Hide
+-- Var+13 (Heavy Leather)
+(@var+13,4234,77,1,1,1,1), -- Heavy Leather
+(@var+13,4304,20,1,1,1,1), -- Thick Leather
+(@var+13,4235, 3,1,1,1,1), -- Heavy Hide
+-- Var+14 (Heavy Leather)
+(@var+14,4304,50,1,1,1,1), -- Thick Leather
+(@var+14,4234,45,1,1,1,1), -- Heavy Leather
+(@var+14,8169, 3,1,1,1,1), -- Thick Hide
+(@var+14,4235, 2,1,1,1,1), -- Heavy Hide
+-- Var+15 (Green Whelp Scale)
+(@var+15,4234,40,1,1,1,1), -- Heavy Leather
+(@var+15,2319,33,1,1,1,1), -- Medium Leather
+(@var+15,7392,20,1,1,1,1), -- Green Whelp Scale
+(@var+15,4232, 4,1,1,1,1), -- Medium Hide
+(@var+15,4235, 3,1,1,1,1); -- Heavy Hide
diff --git a/sql/updates/world/2013_09_01_06_world_misc.sql b/sql/updates/world/2013_09_01_06_world_misc.sql
new file mode 100644
index 00000000000..3d7516ca573
--- /dev/null
+++ b/sql/updates/world/2013_09_01_06_world_misc.sql
@@ -0,0 +1,6 @@
+DELETE FROM `creature_addon` WHERE `auras` LIKE '%46598%'; -- no need to specify GUID, these are unique
+DELETE FROM `creature_addon` WHERE `auras` LIKE '%43671%'; -- no need to specify GUID, these are unique
+DELETE FROM `creature_addon` WHERE `guid`=85236;
+INSERT INTO `creature_addon` (`guid`,`path_id`,`mount`,`bytes1`,`bytes2`,`emote`,`auras`) VALUES 
+(85236,0,22471,0,1,0,'63500 64718');
+DELETE FROM `creature_addon` WHERE `guid` IN (132681,128620);
diff --git a/sql/updates/world/2013_09_02_00_world_smart_scripts.sql b/sql/updates/world/2013_09_02_00_world_smart_scripts.sql
new file mode 100644
index 00000000000..2c443f19d88
--- /dev/null
+++ b/sql/updates/world/2013_09_02_00_world_smart_scripts.sql
@@ -0,0 +1 @@
+UPDATE `smart_scripts` SET `target_type`=7 WHERE `entryorguid` IN (18818,21237,19009,21236) AND `source_type`=0 AND `id`=1;