[8056] Move SMSG_CLEAR_COOLDOWN into function and use it. Other cleanups. Author:XTZGZoReX

[8060] Store spell_pet_auras for auraeffects instead of by whole aura Author:hunuza.

--HG--
branch : trunk

3 files changed, 63 insertions, 48 deletions

diff --git a/sql/FULL/world_spell_full.sql b/sql/FULL/world_spell_full.sql
index 20d3b6a9df0..a195dffd521 100644
--- a/sql/FULL/world_spell_full.sql
+++ b/sql/FULL/world_spell_full.sql
@@ -74,11 +74,6 @@ 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'),
diff --git a/sql/updates/4212_world.sql b/sql/updates/4212_world.sql
new file mode 100644
index 00000000000..2912d485aa2
--- /dev/null
+++ b/sql/updates/4212_world.sql
@@ -0,0 +1,17 @@
+ALTER TABLE spell_pet_auras ADD effectId TINYINT( 3 ) UNSIGNED NOT NULL AFTER spell;
+ 
+ALTER TABLE spell_pet_auras DROP PRIMARY KEY, ADD PRIMARY KEY(spell,effectId,pet);
+ 
+INSERT INTO spell_pet_auras VALUES
+(56314, 0, 0, 57447),
+(56314, 1, 0, 57485),
+(56315, 0, 0, 57452),
+(56315, 1, 0, 57484),
+(56316, 0, 0, 57453),
+(56316, 1, 0, 57483),
+(56317, 0, 0, 57457),
+(56317, 1, 0, 57482),
+(56318, 0, 0, 57458),
+(56318, 1, 0, 57475);
+
+DELETE FROM spell_linked_spell where `spell_trigger` in (57447,57482,57453, 57457, 57458);
diff --git a/sql/world.sql b/sql/world.sql
index b54b02a04f5..46fbfab5237 100644
--- a/sql/world.sql
+++ b/sql/world.sql
@@ -14270,9 +14270,10 @@ SET @saved_cs_client     = @@character_set_client;
 SET character_set_client = utf8;
 CREATE TABLE `spell_pet_auras` (
   `spell` mediumint(8) unsigned NOT NULL COMMENT 'dummy spell id',
+  `effectId` tinyint(3) unsigned NOT NULL default '0',
   `pet` mediumint(8) unsigned NOT NULL default '0' COMMENT 'pet id; 0 = all',
   `aura` mediumint(8) unsigned NOT NULL COMMENT 'pet aura id',
-  PRIMARY KEY  (`spell`,`pet`)
+  PRIMARY KEY  (`spell`,`effectId`,`pet`)
 ) ENGINE=MyISAM DEFAULT CHARSET=latin1;
 SET character_set_client = @saved_cs_client;
 
@@ -14283,48 +14284,50 @@ SET character_set_client = @saved_cs_client;
 LOCK TABLES `spell_pet_auras` WRITE;
 /*!40000 ALTER TABLE `spell_pet_auras` DISABLE KEYS */;
 INSERT INTO `spell_pet_auras` VALUES
-(18754,65536,18754),
-(18755,65536,18755),
-(18756,65536,18756),
-(19028,0,25228),
-(19578,0,19579),
-(20895,0,24529),
-(28757,0,28758),
-(35029,0,35060),
-(35030,0,35061),
-(35691,0,35696),
-(35692,0,35696),
-(35693,0,35696),
-(23785,416,23759),
-(23822,416,23826),
-(23823,416,23827),
-(23824,416,23828),
-(23825,416,23829),
-(23785,417,23762),
-(23822,417,23837),
-(23823,417,23838),
-(23824,417,23839),
-(23825,417,23840),
-(23785,1860,23760),
-(23822,1860,23841),
-(23823,1860,23842),
-(23824,1860,23843),
-(23825,1860,23844),
-(23785,1863,23761),
-(23822,1863,23833),
-(23823,1863,23834),
-(23824,1863,23835),
-(23825,1863,23836),
-(23785,17252,35702),
-(23822,17252,35703),
-(23823,17252,35704),
-(23824,17252,35705),
-(23825,17252,35706),
-(56314,0,57447),
-(56315,0,57482),
-(56316,0,57453),
-(56317,0,57457),
-(56318,0,57458);
+(19028, 0, 0, 25228),
+(19578, 0, 0, 19579),
+(20895, 0, 0, 24529),
+(28757, 0, 0, 28758),
+(35029, 0, 0, 35060),
+(35030, 0, 0, 35061),
+(35691, 0, 0, 35696),
+(35692, 0, 0, 35696),
+(35693, 0, 0, 35696),
+(56314, 0, 0, 57447),
+(56314, 1, 0, 57485),
+(56315, 0, 0, 57452),
+(56315, 1, 0, 57484),
+(56316, 0, 0, 57453),
+(56316, 1, 0, 57483),
+(56317, 0, 0, 57457),
+(56317, 1, 0, 57482),
+(56318, 0, 0, 57458),
+(56318, 1, 0, 57475),
+(23785, 0, 416, 23759),
+(23822, 0, 416, 23826),
+(23823, 0, 416, 23827),
+(23824, 0, 416, 23828),
+(23825, 0, 416, 23829),
+(23785, 0, 417, 23762),
+(23822, 0, 417, 23837),
+(23823, 0, 417, 23838),
+(23824, 0, 417, 23839),
+(23825, 0, 417, 23840),
+(23785, 0, 1860, 23760),
+(23822, 0, 1860, 23841),
+(23823, 0, 1860, 23842),
+(23824, 0, 1860, 23843),
+(23825, 0, 1860, 23844),
+(23785, 0, 1863, 23761),
+(23822, 0, 1863, 23833),
+(23823, 0, 1863, 23834),
+(23824, 0, 1863, 23835),
+(23825, 0, 1863, 23836),
+(23785, 0, 17252, 35702),
+(23822, 0, 17252, 35703),
+(23823, 0, 17252, 35704),
+(23824, 0, 17252, 35705),
+(23825, 0, 17252, 35706);
 /*!40000 ALTER TABLE `spell_pet_auras` ENABLE KEYS */;
 UNLOCK TABLES;