[11036] Update some data in spell_threat, making use of the new parameters

NOTE: Most lower rank data more or less guessed due to lack of reliable data!

sql/mangos.sql

@@ -24,7 +24,7 @@ CREATE TABLE `db_version` (
   `version` varchar(120) default NULL,
   `creature_ai_version` varchar(120) default NULL,
   `cache_id` int(10) default '0',
-  `required_11023_01_mangos_spell_threat` bit(1) default NULL
+  `required_11036_01_mangos_spell_threat` bit(1) default NULL
 ) ENGINE=MyISAM DEFAULT CHARSET=utf8 ROW_FORMAT=FIXED COMMENT='Used DB version notes';
 
 --
@@ -17643,44 +17643,43 @@ LOCK TABLES `spell_threat` WRITE;
 INSERT INTO `spell_threat` VALUES
 (   72, 293, 1, 0),
 (   78,  20, 1, 0),
-(   99,  42, 1, 0),
+(   99,  15, 1, 0),
 (  284,  39, 1, 0),
 (  285,  59, 1, 0),
 (  469,  40, 1, 0),
 (  676, 104, 1, 0),
 (  770, 108, 1, 0),
+(  779,   0, 1.50, 0),
 (  845,  10, 1, 0),
 ( 1160,  16, 1, 0),
 ( 1608,  78, 1, 0),
 ( 1672, 180, 1, 0),
 ( 1715,  61, 1, 0),
-( 1735,  42, 1, 0),
+( 1735,  25, 1, 0),
 ( 2048,  70, 1, 0),
 ( 2139, 300, 1, 0),
 ( 5242,  26, 1, 0),
+( 5676,   0, 2, 0),
 ( 6190,  26, 1, 0),
 ( 6192,  32, 1, 0),
-( 6343,  17, 1, 0),
+( 6343,   0, 1.75, 0),
 ( 6572, 155, 1, 0),
 ( 6673,  18, 1, 0),
 ( 6574, 195, 1, 0),
-( 6807, 322, 1, 0),
+( 6807,  13, 1, 0),
-( 6808, 322, 1, 0),
+( 6808,  20, 1, 0),
-( 6809, 322, 1, 0),
+( 6809,  27, 1, 0),
 ( 7369,  40, 1, 0),
 ( 7372, 101, 1, 0),
 ( 7373, 141, 1, 0),
 ( 7379, 235, 1, 0),
 ( 7386, 100, 1, 0),
-( 8198,  40, 1, 0),
+( 8972,  47, 1, 0),
-( 8204,  64, 1, 0),
+( 9490,  29, 1, 0),
-( 8205,  96, 1, 0),
+( 9745,  75, 1, 0),
-( 8972, 322, 1, 0),
+( 9747,  36, 1, 0),
-( 9490,  42, 1, 0),
+( 9880, 106, 1, 0),
-( 9745, 322, 1, 0),
+( 9881, 140, 1, 0),
-( 9747,  42, 1, 0),
-( 9880, 322, 1, 0),
-( 9881, 322, 1, 0),
 ( 9898,  42, 1, 0),
 (11549,  40, 1, 0),
 (11550,  48, 1, 0),
@@ -17692,19 +17691,16 @@ INSERT INTO `spell_threat` VALUES
 (11565, 118, 1, 0),
 (11566, 137, 1, 0),
 (11567, 145, 1, 0),
-(11580, 143, 1, 0),
-(11581, 180, 1, 0),
 (11600, 275, 1, 0),
 (11601, 315, 1, 0),
 (11608,  60, 1, 0),
 (11609,  70, 1, 0),
-(11775, 395, 1, 0),
-(14921, 415, 1, 0),
 (16857, 108, 1, 0),
 (17735, 200, 1, 0),
 (17750, 300, 1, 0),
 (17751, 450, 1, 0),
 (17752, 600, 1, 0),
+(20243,   0, 1, 0.05),
 (20569, 100, 1, 0),
 (20736, 100, 1, 0),
 (20925,  20, 1, 0),
@@ -17715,25 +17711,23 @@ INSERT INTO `spell_threat` VALUES
 (23924, 220, 1, 0),
 (23925, 250, 1, 0),
 (24394, 580, 1, 0),
-(24583,   5, 1, 0),
 (25202,  50, 1, 0),
 (25203,  55, 1, 0),
 (25231, 130, 1, 0),
 (25258, 286, 1, 0),
-(25264, 215, 1, 0),
 (25269, 400, 1, 0),
 (25286, 175, 1, 0),
 (25288, 355, 1, 0),
 (25289,  62, 1, 0),
-(26996, 322, 1, 0),
+(26996, 212, 1, 0),
-(26998,  42, 1, 0),
+(26998,  49, 1, 0),
 (27179,  54, 1, 0),
 (29704, 230, 1, 0),
 (29707, 196, 1, 0),
 (30324, 220, 1, 0),
 (30356, 323, 1, 0),
 (30357, 483, 1, 0),
-(33745, 285, 1, 0),
+(33745, 182, 0.5, 0),
 (33878, 129, 1, 0),
 (33986, 180, 1, 0),
 (33987, 232, 1, 0),
@@ -17745,18 +17739,17 @@ INSERT INTO `spell_threat` VALUES
 (47450, 259, 1, 0),
 (47487, 520, 1, 0),
 (47488, 770, 1, 0),
-(47497, 101, 1, 0),
-(47498, 101, 1, 0),
-(47501, 235, 1, 0),
-(47502, 260, 1, 0),
 (47519, 180, 1, 0),
 (47520, 225, 1, 0),
-(48479, 322, 1, 0),
+(48479, 345, 1, 0),
-(48480, 322, 1, 0),
+(48480, 422, 1, 0),
-(48559,  42, 1, 0),
+(48559,  54, 1, 0),
-(48560,  42, 1, 0),
+(48560,  62, 1, 0),
-(48567, 285, 1, 0),
+(48567, 409, 0.5, 0),
-(48568, 285, 1, 0),
+(48568, 515, 0.5, 0),
+(52212,   0, 1.90, 0),
+(56815,   0, 1.75, 0),
+(57755,   0, 1.50, 0),
 (57823, 500, 1, 0);
 /*!40000 ALTER TABLE `spell_threat` ENABLE KEYS */;
 UNLOCK TABLES;

sql/updates/11036_01_mangos_spell_threat.sql

@@ -0,0 +1,52 @@
+ALTER TABLE db_version CHANGE COLUMN required_11023_01_mangos_spell_threat required_11036_01_mangos_spell_threat bit;
+
+-- wrong pet spells, have EFFECT_THREAT
+DELETE FROM spell_threat WHERE entry IN (11775,14921,24583);
+-- Thunder Clap, x1.75 for all ranks
+DELETE FROM spell_threat WHERE entry IN (6343,8198,8204,8205,11580,11581,25264,47501,47502);
+-- Devastate, 5% AP for all ranks
+DELETE FROM spell_threat WHERE entry IN (20243,30016,30022,47497,47498);
+-- new: Swipe (Bear), Searing Pain, Death and Decay, Rune Strike, Heroic Throw
+DELETE FROM spell_threat WHERE entry IN (779,5676,52212,56815,57755);
+
+INSERT INTO spell_threat VALUES
+(  779,   0, 1.50, 0.0), -- Swipe (Bear)
+( 5676,   0, 2.00, 0.0), -- Searing Pain
+( 6343,   0, 1.75, 0.0), -- Thunder Clap
+(20243,   0, 1.00, 0.05), -- Devastate (Rank1)
+(52212,   0, 1.90, 0.0), -- Death and Decay
+(56815,   0, 1.75, 0.0), -- Rune Strike
+(57755,   0, 1.50, 0.0); -- Heroic Throw
+
+-- Lacerate
+DELETE FROM spell_threat WHERE entry IN (33745,48567,48568);
+INSERT INTO spell_threat VALUES
+(33745, 182, 0.50, 0.0),
+(48567, 409, 0.50, 0.0),
+(48568, 515, 0.50, 0.0);
+
+-- Maul
+DELETE FROM spell_threat WHERE entry IN (6807,6808,6809,8972,9745,9880,9881,26996,48479,48480);
+INSERT INTO spell_threat VALUES
+( 6807,  13, 1.00, 0.0),
+( 6808,  20, 1.00, 0.0),
+( 6809,  27, 1.00, 0.0),
+( 8972,  47, 1.00, 0.0),
+( 9745,  75, 1.00, 0.0),
+( 9880, 106, 1.00, 0.0),
+( 9881, 140, 1.00, 0.0),
+(26996, 212, 1.00, 0.0),
+(48479, 345, 1.00, 0.0),
+(48480, 422, 1.00, 0.0);
+
+-- Demoralizing Roar
+DELETE FROM spell_threat WHERE entry IN (99,1735,9490,9747,9898,26998,48559,48560);
+INSERT INTO spell_threat VALUES
+(   99, 15, 1.00, 0.0),
+( 1735, 25, 1.00, 0.0),
+( 9490, 29, 1.00, 0.0),
+( 9747, 36, 1.00, 0.0),
+( 9898, 42, 1.00, 0.0),
+(26998, 49, 1.00, 0.0),
+(48559, 54, 1.00, 0.0),
+(48560, 62, 1.00, 0.0);

sql/updates/Makefile.am

@@ -154,6 +154,7 @@ pkgdata_DATA = \
 	11002_01_mangos_spell_proc_event.sql \
 	11018_01_mangos_command.sql \
 	11023_01_mangos_spell_threat.sql \
+	11036_01_mangos_spell_threat.sql \
 	README
 
 ## Additional files to include when running 'make dist'
@@ -288,4 +289,5 @@ EXTRA_DIST = \
 	11002_01_mangos_spell_proc_event.sql \
 	11018_01_mangos_command.sql \
 	11023_01_mangos_spell_threat.sql \
+	11036_01_mangos_spell_threat.sql \
 	README

src/shared/revision_nr.h

@@ -1,4 +1,4 @@
 #ifndef __REVISION_NR_H__
 #define __REVISION_NR_H__
- #define REVISION_NR "11035"
+ #define REVISION_NR "11036"
 #endif // __REVISION_NR_H__

src/shared/revision_sql.h

@@ -1,6 +1,6 @@
 #ifndef __REVISION_SQL_H__
 #define __REVISION_SQL_H__
  #define REVISION_DB_CHARACTERS "required_10973_01_characters_game_event_status"
- #define REVISION_DB_MANGOS "required_11023_01_mangos_spell_threat"
+ #define REVISION_DB_MANGOS "required_11036_01_mangos_spell_threat"
  #define REVISION_DB_REALMD "required_10008_01_realmd_realmd_db_version"
 #endif // __REVISION_SQL_H__