Merge pull request #3869 from Aokromes/master

DB: Fix orientation of triggers from AQ40 and few RFC items

2 files changed, 9 insertions, 0 deletions

diff --git a/sql/updates/world/2011_11_06_00_world_player_factionchange_items.sql b/sql/updates/world/2011_11_06_00_world_player_factionchange_items.sql
new file mode 100644
index 00000000000..e839a065dcc
--- /dev/null
+++ b/sql/updates/world/2011_11_06_00_world_player_factionchange_items.sql
@@ -0,0 +1,6 @@
+INSERT INTO `player_factionchange_items` (`race_A`, `alliance_id`, `commentA`, `race_H`, `horde_id`, `commentH`) VALUES 
+('0', '48076', 'Velen\'s Mantle of Conquest', '0', '48101', 'Zabra\'s Mantle of Conquest'),
+('0', '48075', 'Velen\'s Raiments of Conquest', '0', '48100', 'Zabra\'s Raiments of Conquest'),
+('0', '48074', 'Velen\'s Pants of Conquest', '0', '48099', 'Zabra\'s Pants of Conquest'),
+('0', '48072', 'Velen\'s Handwraps of Conquest', '0', '48097', 'Zabra\'s Handwraps of Conquest'),
+('0', '48073', 'Velen\'s Circlet of Conquest', '0', '48098', 'Zabra\'s Circlet of Conquest ');
diff --git a/sql/updates/world/2011_11_06_01_world_areatrigger_teleport.sql b/sql/updates/world/2011_11_06_01_world_areatrigger_teleport.sql
new file mode 100644
index 00000000000..7a0dd8200b4
--- /dev/null
+++ b/sql/updates/world/2011_11_06_01_world_areatrigger_teleport.sql
@@ -0,0 +1,3 @@
+-- Correct AQ40's areatrigger_teleport orientation
+UPDATE `areatrigger_teleport` SET `target_position_z`='129.330612', `target_orientation`='0.929912' WHERE `id`=4010;
+UPDATE `areatrigger_teleport` SET `target_orientation`='4.030663' WHERE `id`=4012;