*Merge

--HG--
branch : trunk

3 files changed, 32 insertions, 7 deletions

diff --git a/sql/updates/4081_world.sql b/sql/updates/4081_world.sql
new file mode 100644
index 00000000000..4eb5898681a
--- /dev/null
+++ b/sql/updates/4081_world.sql
@@ -0,0 +1,15 @@
+DELETE FROM `spell_pet_auras` WHERE `spell` IN(56314, 56315, 56316, 56317, 56318);
+INSERT INTO `spell_pet_auras` VALUES
+(56314,0,57447),
+(56315,0,57482),
+(56316,0,57453),
+(56317,0,57457),
+(56318,0,57458);
+
+DELETE FROM `spell_linked_spell` WHERE `spell_trigger` IN(57447, 57482, 57453, 57457, 57458);
+INSERT INTO `spell_linked_spell` (`spell_trigger`, `spell_effect`, `type`, `comment`) VALUES
+(57447,57485,2,'Kindred Spirits'),
+(57482,57484,2,'Kindred Spirits'),
+(57453,57483,2,'Kindred Spirits'),
+(57457,57482,2,'Kindred Spirits'),
+(57458,57475,2,'Kindred Spirits');
\ No newline at end of file
diff --git a/sql/world.sql b/sql/world.sql
index 9915e83dc2a..5af5d424e8d 100644
--- a/sql/world.sql
+++ b/sql/world.sql
@@ -14318,7 +14318,12 @@ INSERT INTO `spell_pet_auras` VALUES
 (23822,17252,35703),
 (23823,17252,35704),
 (23824,17252,35705),
-(23825,17252,35706);
+(23825,17252,35706),
+(56314,0,57447),
+(56315,0,57482),
+(56316,0,57453),
+(56317,0,57457),
+(56318,0,57458);
 /*!40000 ALTER TABLE `spell_pet_auras` ENABLE KEYS */;
 UNLOCK TABLES;
 
diff --git a/sql/world_spell_full.sql b/sql/world_spell_full.sql
index e0483161553..20d3b6a9df0 100644
--- a/sql/world_spell_full.sql
+++ b/sql/world_spell_full.sql
@@ -33,7 +33,7 @@ INSERT INTO `spell_linked_spell` (`spell_trigger`, `spell_effect`, `type`, `comm
 (-49011, 49009, 0, 'Wyvern Sting'),
 (-49012, 49010, 0, 'Wyvern Sting'),
 ( 47585, 60069, 0, 'Dispersion (transform/regen)'),
-(-47953, 60406, 0, 'Divine hymn buff to enemies'),
+# (-47953, 60406, 0, 'Divine hymn buff to enemies'), removed in 313
 ( 48265, 49772, 2, 'Unholy Presence'),
 ( 49772, 55222, 2, 'Unholy Presence'),
 ( 48263, 61261, 2, 'Frost Presence'),
@@ -50,11 +50,11 @@ INSERT INTO `spell_linked_spell` (`spell_trigger`, `spell_effect`, `type`, `comm
 ( 17767, 54501, 2, 'Consume Shadows - Rank 1'),
 ( 53563, 53651, 2, 'Beacon of Light'),
 ( 16857, 60089, 0, 'Faerie Fire (Feral) Rank 1'),
-( 17390, 60089, 0, 'Faerie Fire (Feral) Rank 2'),
-( 17391, 60089, 0, 'Faerie Fire (Feral) Rank 3'),
-( 17392, 60089, 0, 'Faerie Fire (Feral) Rank 4'),
-( 27011, 60089, 0, 'Faerie Fire (Feral) Rank 5'),
-( 48475, 60089, 0, 'Faerie Fire (Feral) Rank 6'),
+# ( 17390, 60089, 0, 'Faerie Fire (Feral) Rank 2'), removed in 313
+# ( 17391, 60089, 0, 'Faerie Fire (Feral) Rank 3'),
+# ( 17392, 60089, 0, 'Faerie Fire (Feral) Rank 4'),
+# ( 27011, 60089, 0, 'Faerie Fire (Feral) Rank 5'),
+# ( 48475, 60089, 0, 'Faerie Fire (Feral) Rank 6'),
 (   781, 56446, 0, 'Disengage'),
 ( 57635, 57636, 0, 'Disengage'),
 ( 60932, 60934, 0, 'Disengage'),
@@ -74,6 +74,11 @@ INSERT INTO `spell_linked_spell` (`spell_trigger`, `spell_effect`, `type`, `comm
 ( -52610, -62071, 0, 'Savage Roar'),
 (51209, 55095, 1, 'Hungering cold - frost fever'),
 (50334, 58923, 2, 'Berserk - modify target number aura'),
+(57447,57485,2,'Kindred Spirits'),
+(57482,57484,2,'Kindred Spirits'),
+(57453,57483,2,'Kindred Spirits'),
+(57457,57482,2,'Kindred Spirits'),
+(57458,57475,2,'Kindred Spirits'),
 
 -- Creature
 ( 36574, 36650, 0, 'Apply Phase Slip Vulnerability'),