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

Conflicts:
	src/server/scripts/EasternKingdoms/ZulGurub/boss_jeklik.cpp

17 files changed, 61 insertions, 0 deletions

diff --git a/sql/updates/world/2014_01_17_00_trinity_string.sql b/sql/updates/world/2014_01_17_00_world_trinity_string.sql
index 698af0f56cb..698af0f56cb 100644
--- a/sql/updates/world/2014_01_17_00_trinity_string.sql
+++ b/sql/updates/world/2014_01_17_00_world_trinity_string.sql
diff --git a/sql/updates/world/2014_01_21_world_sai.sql b/sql/updates/world/2014_01_21_00_world_sai.sql
index 6ea92fc1aef..6ea92fc1aef 100644
--- a/sql/updates/world/2014_01_21_world_sai.sql
+++ b/sql/updates/world/2014_01_21_00_world_sai.sql
diff --git a/sql/updates/world/2014_01_22_01_world_creature_template.sql b/sql/updates/world/2014_01_22_01_world_creature_template.sql
new file mode 100644
index 00000000000..376a6c007c8
--- /dev/null
+++ b/sql/updates/world/2014_01_22_01_world_creature_template.sql
@@ -0,0 +1 @@
+UPDATE `creature_template` SET `InhabitType`=5 WHERE `entry` IN (11368,14965);
diff --git a/sql/updates/world/2014_01_23_00_world_quest_template.sql b/sql/updates/world/2014_01_23_00_world_quest_template.sql
new file mode 100644
index 00000000000..4c6f5e55841
--- /dev/null
+++ b/sql/updates/world/2014_01_23_00_world_quest_template.sql
@@ -0,0 +1,2 @@
+-- Fix Karuk quests - Remove Karuk's Oath as NextQuestId in A Diplomatic Mission, as this blocks Horde from doing Karuk's Oath after turning in Seek Out Karuk!
+UPDATE quest_template SET NextQuestId=0 WHERE Id=12141;
diff --git a/sql/updates/world/2014_01_23_01_world_conditions.sql b/sql/updates/world/2014_01_23_01_world_conditions.sql
new file mode 100644
index 00000000000..4afa30ee13d
--- /dev/null
+++ b/sql/updates/world/2014_01_23_01_world_conditions.sql
@@ -0,0 +1,5 @@
+--
+DELETE FROM `conditions` WHERE `SourceEntry` = 40817;
+INSERT INTO `conditions` (`SourceTypeOrReferenceId`, `SourceGroup`, `SourceEntry`, `SourceId`, `ElseGroup`, `ConditionTypeOrReference`, `ConditionTarget`, `ConditionValue1`, `ConditionValue2`, `ConditionValue3`, `NegativeCondition`, `ErrorType`, `ErrorTextId`, `Comment`) VALUES
+(17,0,40817,0,0,23,0,3785,0,0,0,0,0,'Banishing Crystal requires Forge Camp: Wrath'),
+(17,0,40817,0,1,23,0,3784,0,0,0,0,0,'Banishing Crystal requires Forge Camp: Terror');
diff --git a/sql/updates/world/2014_01_23_02_world_sai.sql b/sql/updates/world/2014_01_23_02_world_sai.sql
new file mode 100644
index 00000000000..f55db997a4c
--- /dev/null
+++ b/sql/updates/world/2014_01_23_02_world_sai.sql
@@ -0,0 +1,2 @@
+--
+UPDATE `smart_scripts` SET `event_phase_mask`=1 WHERE  `entryorguid`=2103 AND `event_phase_mask`=2;
diff --git a/sql/updates/world/2014_01_23_03_world_conditions.sql b/sql/updates/world/2014_01_23_03_world_conditions.sql
new file mode 100644
index 00000000000..df83d50fd51
--- /dev/null
+++ b/sql/updates/world/2014_01_23_03_world_conditions.sql
@@ -0,0 +1,3 @@
+--
+UPDATE `conditions` SET `ElseGroup`=1 WHERE  `SourceTypeOrReferenceId`=15 AND `SourceGroup`=3186 AND `SourceEntry`=0 AND `SourceId`=0 AND `ElseGroup`=0 AND `ConditionTypeOrReference`=5 AND `ConditionTarget`=0 AND `ConditionValue1`=54 AND `ConditionValue2`=128 AND `ConditionValue3`=0;
+UPDATE `conditions` SET `ConditionValue1`=64 WHERE  `SourceTypeOrReferenceId`=15 AND `SourceGroup`=3186 AND `SourceEntry`=0 AND `SourceId`=0 AND `ElseGroup`=0 AND `ConditionTypeOrReference`=16 AND `ConditionTarget`=0 AND `ConditionValue1`=8 AND `ConditionValue2`=0 AND `ConditionValue3`=0;
diff --git a/sql/updates/world/2014_01_23_04_world_game_event_creature.sql b/sql/updates/world/2014_01_23_04_world_game_event_creature.sql
new file mode 100644
index 00000000000..5d350803f82
--- /dev/null
+++ b/sql/updates/world/2014_01_23_04_world_game_event_creature.sql
@@ -0,0 +1,6 @@
+-- Boxi (brewfest)
+SET @GUID := '200002';
+
+-- game event creature boxi
+DELETE FROM `game_event_creature` WHERE `guid`=@GUID;
+INSERT INTO `game_event_creature`(`eventEntry`,`guid`) values (24,@GUID);
diff --git a/sql/updates/world/2014_01_23_05_world_creature_template.sql b/sql/updates/world/2014_01_23_05_world_creature_template.sql
new file mode 100644
index 00000000000..a35a6191ea4
--- /dev/null
+++ b/sql/updates/world/2014_01_23_05_world_creature_template.sql
@@ -0,0 +1,2 @@
+--
+UPDATE `creature_template` SET `flags_extra`=`flags_extra`|128|2  WHERE `entry` IN (31138,31550);
diff --git a/sql/updates/world/2014_01_23_06_world_creature.sql b/sql/updates/world/2014_01_23_06_world_creature.sql
new file mode 100644
index 00000000000..356db4fceb4
--- /dev/null
+++ b/sql/updates/world/2014_01_23_06_world_creature.sql
@@ -0,0 +1,4 @@
+-- Update creature (Voidspawner L) force to use modelid 18684
+UPDATE `creature` SET `modelid`=18684 WHERE `guid` IN (70169, 70170, 70171, 70172, 70173, 70174);
+-- Update creature (Voidspawner XL) force to use modelid 18685
+UPDATE `creature` SET `modelid`=18685 WHERE `guid` IN (68919, 68918, 68917, 68920, 68921);
diff --git a/sql/updates/world/2014_01_23_07_world_spell_bonus_data.sql b/sql/updates/world/2014_01_23_07_world_spell_bonus_data.sql
new file mode 100644
index 00000000000..1dfd35eac5a
--- /dev/null
+++ b/sql/updates/world/2014_01_23_07_world_spell_bonus_data.sql
@@ -0,0 +1,3 @@
+-- Living Ruby Pendant (item 24110) shouldn't get SP bonuses
+DELETE FROM `spell_bonus_data` WHERE `entry`=31024;
+INSERT INTO `spell_bonus_data` (`entry`, `direct_bonus`, `dot_bonus`, `ap_bonus`, `ap_dot_bonus`, `comments`) VALUES (31024,0,0,0,0,'Living ruby pendant should not get bonuses');
diff --git a/sql/updates/world/2014_01_23_08_world_graveyard.sql b/sql/updates/world/2014_01_23_08_world_graveyard.sql
new file mode 100644
index 00000000000..27cfc39647d
--- /dev/null
+++ b/sql/updates/world/2014_01_23_08_world_graveyard.sql
@@ -0,0 +1,4 @@
+--
+DELETE FROM `game_graveyard_zone` WHERE `id`=589;
+INSERT INTO `game_graveyard_zone` (`id`, `ghost_zone`, `faction`) VALUES
+(589, 876, 0);
diff --git a/sql/updates/world/2014_01_23_09_world_npc_trainer.sql b/sql/updates/world/2014_01_23_09_world_npc_trainer.sql
new file mode 100644
index 00000000000..3b44463b3da
--- /dev/null
+++ b/sql/updates/world/2014_01_23_09_world_npc_trainer.sql
@@ -0,0 +1,4 @@
+--
+DELETE FROM `npc_trainer` WHERE `entry`=201009 AND `spell`=63746;
+INSERT INTO `npc_trainer` (`entry`, `spell`, `spellcost`, `reqskill`, `reqskillvalue`, `reqlevel`) VALUES 
+(201009, 63746, 5000, 333, 225, 0);
diff --git a/sql/updates/world/2014_01_23_10_world_creature_loot_template.sql b/sql/updates/world/2014_01_23_10_world_creature_loot_template.sql
new file mode 100644
index 00000000000..f15bf25e5a8
--- /dev/null
+++ b/sql/updates/world/2014_01_23_10_world_creature_loot_template.sql
@@ -0,0 +1,2 @@
+-- Delete mote of earth from loot of Icetouched Earthrager
+DELETE FROM `creature_loot_template` WHERE  `entry`=29436 AND `item`=22573;
diff --git a/sql/updates/world/2014_01_23_11_world_creature_template.sql b/sql/updates/world/2014_01_23_11_world_creature_template.sql
new file mode 100644
index 00000000000..efb5c7871af
--- /dev/null
+++ b/sql/updates/world/2014_01_23_11_world_creature_template.sql
@@ -0,0 +1,2 @@
+-- Rubble Stalker Kologarn
+UPDATE `creature_template` SET `flags_extra`=`flags_extra`|128 WHERE `entry`=33809;
diff --git a/sql/updates/world/2014_01_23_12_world_sai.sql b/sql/updates/world/2014_01_23_12_world_sai.sql
new file mode 100644
index 00000000000..a9935fd0c97
--- /dev/null
+++ b/sql/updates/world/2014_01_23_12_world_sai.sql
@@ -0,0 +1,8 @@
+-- The Torch of Retribution (3454)
+SET @KALARAN := 8479; -- Kalaran Windblade
+SET @QUEST   := 3454; -- Quest: The Torch of Retribution
+
+DELETE FROM `smart_scripts` WHERE `entryorguid`=@KALARAN AND `id` IN (5,6);
+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
+(@KALARAN,0,5,6,19,0,100,0,@QUEST,0,0,0,70,0,0,0,0,0,0,14,24166,149410,0,0,0,0,0,"Kalaran Windblade - On Quest Accept (4354) - Respawn Light of Retribution"),
+(@KALARAN,0,6,0,61,0,100,0,0,0,0,0,70,0,0,0,0,0,0,14,16762,149047,0,0,0,0,0,"Kalaran Windblade - Linked with Previous Event - Respawn Torch of Retribution");
diff --git a/sql/updates/world/2014_01_23_13_world_misc.sql b/sql/updates/world/2014_01_23_13_world_misc.sql
new file mode 100644
index 00000000000..627aa99d56b
--- /dev/null
+++ b/sql/updates/world/2014_01_23_13_world_misc.sql
@@ -0,0 +1,13 @@
+UPDATE `creature_template` SET `ScriptName`='boss_prince_taldaram' WHERE `entry`=29308;
+
+UPDATE `creature_template` SET `scale`=1, `speed_walk`=2, `InhabitType`=4, `flags_extra`=128 WHERE `entry` IN (30106,31458,31686,31687);
+UPDATE `creature_template` SET `ScriptName`='npc_prince_taldaram_flame_sphere' WHERE `entry` IN (30106,31686,31687);
+
+UPDATE `gameobject_template` SET `flags`=32, `ScriptName`='go_prince_taldaram_sphere' WHERE `entry` IN (193093,193094);
+
+DELETE FROM `spell_script_names` WHERE `spell_id` IN (55931, 55895, 59511, 59512);
+INSERT INTO `spell_script_names` (`spell_id` ,`ScriptName`) VALUES
+(55931, 'spell_prince_taldaram_conjure_flame_sphere'),
+(55895, 'spell_prince_taldaram_flame_sphere_summon'),
+(59511, 'spell_prince_taldaram_flame_sphere_summon'),
+(59512, 'spell_prince_taldaram_flame_sphere_summon');