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

Conflicts:
	src/server/game/Entities/Corpse/Corpse.cpp
	src/server/game/Globals/ObjectMgr.cpp

6 files changed, 39 insertions, 1 deletions

diff --git a/sql/base/characters_database.sql b/sql/base/characters_database.sql
index 7d8ba894b5d..424d6fbcd0b 100644
--- a/sql/base/characters_database.sql
+++ b/sql/base/characters_database.sql
@@ -1424,7 +1424,7 @@ CREATE TABLE `corpse` (
   `posZ` float NOT NULL DEFAULT '0',
   `orientation` float NOT NULL DEFAULT '0',
   `mapId` smallint(5) unsigned NOT NULL DEFAULT '0' COMMENT 'Map Identifier',
-  `phaseMask` smallint(5) unsigned NOT NULL DEFAULT '1',
+  `phaseMask` int(10) unsigned NOT NULL DEFAULT '1',
   `displayId` int(10) unsigned NOT NULL DEFAULT '0',
   `itemCache` text NOT NULL,
   `bytes1` int(10) unsigned NOT NULL DEFAULT '0',
diff --git a/sql/updates/characters/2013_07_19_00_characters_corpse.sql b/sql/updates/characters/2013_07_19_00_characters_corpse.sql
new file mode 100644
index 00000000000..da52c91e875
--- /dev/null
+++ b/sql/updates/characters/2013_07_19_00_characters_corpse.sql
@@ -0,0 +1 @@
+ALTER TABLE `corpse` CHANGE `phaseMask` `phaseMask` int(10) unsigned NOT NULL DEFAULT '1';
diff --git a/sql/updates/world/2013_07_18_02_world_spell_script_names.sql b/sql/updates/world/2013_07_18_02_world_spell_script_names.sql
new file mode 100644
index 00000000000..89463a861aa
--- /dev/null
+++ b/sql/updates/world/2013_07_18_02_world_spell_script_names.sql
@@ -0,0 +1,5 @@
+DELETE FROM `spell_script_names` WHERE `spell_id` IN (69051,69023,69048);
+INSERT INTO `spell_script_names` (`spell_id` ,`ScriptName`) VALUES
+(69051, 'spell_devourer_of_souls_mirrored_soul'),
+(69023, 'spell_devourer_of_souls_mirrored_soul_proc'),
+(69048, 'spell_devourer_of_souls_mirrored_soul_target_selector');
diff --git a/sql/updates/world/2013_07_18_02_world_the_flesh_giant_slayer.sql b/sql/updates/world/2013_07_18_02_world_the_flesh_giant_slayer.sql
new file mode 100644
index 00000000000..c8d7773c461
--- /dev/null
+++ b/sql/updates/world/2013_07_18_02_world_the_flesh_giant_slayer.sql
@@ -0,0 +1,26 @@
+-- TEXT INSERTS
+DELETE FROM `creature_text` WHERE `entry` IN (31301, 31428, 31306);
+INSERT INTO `creature_text` (`entry`, `groupid`, `id`, `text`, `type`, `language`, `probability`, `emote`, `duration`, `sound`, `comment`) VALUES
+(31301, 0, 0, "You dare to think you have thwarted my will? That you have broken my plans?", 12, 0, 100, 25, 0, 0, "LK SAY 1"),
+(31301, 1, 0, "You have accomplished nothing!", 12, 0, 100, 22, 0, 0, "LK SAY 2"),
+(31301, 2, 0, "Your feeble resistance has only hastened your doom.", 12, 0, 100, 25, 0, 0, "LK SAY 3"),
+(31301, 3, 0, "So spout your platitudes and flail until you are spent. In the end, you will be mine, and Morbidus will be the harbinger of your death!", 12, 0, 100, 22, 0, 0, "LK SAY 4"),
+(31301, 4, 0, "Morbidus, show them what happens to those who defy the will of their king!", 12, 0, 100, 25, 0, 0, "LK SAY 5"),
+(31428, 0, 0, "You will pay for what you've done! For the Argent Crusade!", 12, 0, 100, 0, 0, 0, "OLAKIN SAY 1"),
+(31306, 0, 0, "Knights of the Ebon Blade, prepare for battle!", 12, 0, 100, 1, 0, 0, 'DHAKAR SAY 1');
+
+-- ScriptName Updates
+UPDATE `creature_template` SET `ScriptName`='npc_margrave_dhakar' WHERE `entry`=31306;
+UPDATE `creature_template` SET `ScriptName`='npc_morbidus' WHERE `entry`=30698;
+
+-- Template updates
+UPDATE `creature_template` SET `faction_A`=2102, `faction_H`=2102, `exp`=2, `minlevel`=80, `maxlevel`=80, `unit_flags`=`unit_flags`|832, `speed_run`=0.99206, `VehicleId`=271 WHERE `entry`=30698; -- Morbidus
+UPDATE `creature_template` SET `faction_A`=1770, `faction_H`=1770, `npcflag`=`npcflag`|1, `gossip_menu_id`=10060 WHERE `entry`=31306; -- Margrave Dhakar
+
+UPDATE `creature_model_info` SET `bounding_radius`=0.465,`combat_reach`=7.5,`gender`=0 WHERE `modelid`=31176; -- Morbidus
+UPDATE `creature_model_info` SET `bounding_radius`=0.3825,`combat_reach`=1.875,`gender`=0 WHERE `modelid`=27558; -- Margrave Dhakar
+
+DELETE FROM `creature_template_addon` WHERE `entry` IN (30698, 31306);
+INSERT INTO `creature_template_addon` (`entry`,`mount`,`bytes1`,`bytes2`,`emote`,`auras`) VALUES
+(30698,0,0,1,0, NULL), -- Morbidus
+(31306,0,0,1,0, NULL); -- Margrave Dhakar
diff --git a/sql/updates/world/2013_07_18_03_world_equipment.sql b/sql/updates/world/2013_07_18_03_world_equipment.sql
new file mode 100644
index 00000000000..4097327637b
--- /dev/null
+++ b/sql/updates/world/2013_07_18_03_world_equipment.sql
@@ -0,0 +1,4 @@
+-- equipment for Margrave Dhakar
+DELETE FROM `creature_equip_template` WHERE `entry` = 31306;
+INSERT INTO `creature_equip_template` (`entry`, `id`, `itemEntry1`, `itemEntry2`, `itemEntry3`) VALUES 
+(31306, 1, 41371, 0, 0);
diff --git a/sql/updates/world/2013_07_19_00_world_misc.sql b/sql/updates/world/2013_07_19_00_world_misc.sql
new file mode 100644
index 00000000000..b5f08a058e6
--- /dev/null
+++ b/sql/updates/world/2013_07_19_00_world_misc.sql
@@ -0,0 +1,2 @@
+ALTER TABLE `gameobject` CHANGE `phaseMask` `phaseMask` int(10) unsigned NOT NULL DEFAULT '1';
+ALTER TABLE `creature` CHANGE `phaseMask` `phaseMask` int(10) unsigned NOT NULL DEFAULT '1';