Skip to content

Commit 3ff1d34

Browse files
say1981rsa
say1981
authored and
rsa
committed
[mr1204] pets_rewrite: correct stats and scaling of DK Ghoul pet. Also merge Garghoyle data
1 parent bd98b34 commit 3ff1d34

File tree

4 files changed

+36
-97
lines changed

4 files changed

+36
-97
lines changed

‎sql_mr/mr00983_mangos_pet_scaling_data.sql

Lines changed: 0 additions & 8 deletions
This file was deleted.

‎sql_mr/mr00020_mangos_pet_levelstats.sql renamed to ‎sql_mr/mr01204_mangos_pet_levelstats.sql

Lines changed: 29 additions & 82 deletions
Original file line numberDiff line numberDiff line change
@@ -507,88 +507,35 @@ INSERT INTO pet_levelstats (creature_entry, level, hp, mana, armor, mindmg, maxd
507507
(17252, 80, 6872, 5266, 14033, 329, 495, 608, 314, 129, 428, 280, 209);
508508

509509
-- DK Ghoul
510-
DELETE FROM pet_levelstats WHERE creature_entry = 26125;
511-
INSERT INTO pet_levelstats (creature_entry, level, hp, mana, armor, mindmg, maxdmg, attackpower, str, agi, sta, inte, spi) VALUES
512-
(26125, 1, 48, 80, 10, 1, 3, 10, 20, 16, 13, 20, 8),
513-
(26125, 2, 105, 106, 67, 0, 0, 0, 22, 17, 14, 21, 9),
514-
(26125, 3, 162, 132, 124, 0, 0, 0, 24, 18, 15, 22, 10),
515-
(26125, 4, 219, 158, 181, 0, 0, 0, 26, 19, 16, 23, 11),
516-
(26125, 5, 276, 184, 238, 0, 0, 0, 28, 20, 17, 24, 12),
517-
(26125, 6, 333, 210, 295, 0, 0, 0, 30, 21, 18, 25, 13),
518-
(26125, 7, 390, 236, 352, 0, 0, 0, 32, 22, 19, 26, 14),
519-
(26125, 8, 447, 262, 409, 0, 0, 0, 34, 23, 20, 27, 15),
520-
(26125, 9, 504, 288, 466, 0, 0, 0, 36, 24, 21, 28, 16),
521-
(26125, 10, 561, 314, 523, 0, 0, 0, 38, 25, 22, 29, 17),
522-
(26125, 11, 618, 340, 580, 0, 0, 0, 40, 26, 23, 30, 18),
523-
(26125, 12, 675, 366, 637, 0, 0, 0, 42, 27, 24, 31, 19),
524-
(26125, 13, 732, 392, 694, 0, 0, 0, 44, 28, 25, 32, 20),
525-
(26125, 14, 789, 418, 751, 0, 0, 0, 46, 29, 26, 33, 21),
526-
(26125, 15, 846, 444, 808, 0, 0, 0, 48, 30, 27, 34, 22),
527-
(26125, 16, 903, 470, 865, 0, 0, 0, 50, 31, 28, 35, 23),
528-
(26125, 17, 960, 496, 922, 0, 0, 0, 52, 32, 29, 36, 24),
529-
(26125, 18, 1017, 522, 979, 0, 0, 0, 54, 33, 30, 37, 25),
530-
(26125, 19, 1074, 548, 1036, 0, 0, 0, 56, 34, 31, 38, 26),
531-
(26125, 20, 1131, 574, 1093, 0, 0, 0, 58, 35, 32, 39, 27),
532-
(26125, 21, 1188, 600, 1150, 0, 0, 0, 60, 36, 33, 40, 28),
533-
(26125, 22, 1245, 626, 1207, 0, 0, 0, 62, 37, 34, 41, 29),
534-
(26125, 23, 1302, 652, 1264, 0, 0, 0, 64, 38, 35, 42, 30),
535-
(26125, 24, 1359, 678, 1321, 0, 0, 0, 66, 39, 36, 43, 31),
536-
(26125, 25, 1416, 704, 1378, 0, 0, 0, 68, 40, 37, 44, 32),
537-
(26125, 26, 1473, 730, 1435, 0, 0, 0, 70, 41, 38, 45, 33),
538-
(26125, 27, 1530, 756, 1492, 0, 0, 0, 72, 42, 39, 46, 34),
539-
(26125, 28, 1587, 782, 1549, 0, 0, 0, 74, 43, 40, 47, 35),
540-
(26125, 29, 1644, 808, 1606, 0, 0, 0, 76, 44, 41, 48, 36),
541-
(26125, 30, 1701, 834, 1663, 0, 0, 0, 78, 45, 42, 49, 37),
542-
(26125, 31, 1758, 860, 1720, 0, 0, 0, 80, 46, 43, 50, 38),
543-
(26125, 32, 1815, 886, 1777, 0, 0, 0, 82, 47, 44, 51, 39),
544-
(26125, 33, 1872, 912, 1834, 0, 0, 0, 84, 48, 45, 52, 40),
545-
(26125, 34, 1929, 938, 1891, 0, 0, 0, 86, 49, 46, 53, 41),
546-
(26125, 35, 1986, 964, 1948, 0, 0, 0, 88, 50, 47, 54, 42),
547-
(26125, 36, 2043, 990, 2005, 0, 0, 0, 90, 51, 48, 55, 43),
548-
(26125, 37, 2100, 1016, 2062, 0, 0, 0, 92, 52, 49, 56, 44),
549-
(26125, 38, 2157, 1042, 2119, 0, 0, 0, 94, 53, 50, 57, 45),
550-
(26125, 39, 2214, 1068, 2176, 0, 0, 0, 96, 54, 51, 58, 46),
551-
(26125, 40, 2271, 1094, 2233, 0, 0, 0, 98, 55, 52, 59, 47),
552-
(26125, 41, 2328, 1120, 2290, 0, 0, 0, 100, 56, 53, 60, 48),
553-
(26125, 42, 2385, 1146, 2347, 0, 0, 0, 102, 57, 54, 61, 49),
554-
(26125, 43, 2442, 1172, 2404, 0, 0, 0, 104, 58, 55, 62, 50),
555-
(26125, 44, 2499, 1198, 2461, 0, 0, 0, 106, 59, 56, 63, 51),
556-
(26125, 45, 2556, 1224, 2518, 0, 0, 0, 108, 60, 57, 64, 52),
557-
(26125, 46, 2613, 1250, 2575, 0, 0, 0, 110, 61, 58, 65, 53),
558-
(26125, 47, 2670, 1276, 2632, 0, 0, 0, 112, 62, 59, 66, 54),
559-
(26125, 48, 2727, 1302, 2689, 0, 0, 0, 114, 63, 60, 67, 55),
560-
(26125, 49, 2784, 1328, 2746, 0, 0, 0, 116, 64, 61, 68, 56),
561-
(26125, 50, 2841, 1354, 2803, 0, 0, 0, 118, 65, 62, 69, 57),
562-
(26125, 51, 2898, 1380, 2860, 0, 0, 0, 120, 66, 63, 70, 58),
563-
(26125, 52, 2955, 1406, 2917, 0, 0, 0, 122, 67, 64, 71, 59),
564-
(26125, 53, 3012, 1432, 2974, 0, 0, 0, 124, 68, 65, 72, 60),
565-
(26125, 54, 3069, 1458, 3031, 0, 0, 0, 126, 69, 66, 73, 61),
566-
(26125, 55, 3126, 1484, 3088, 0, 0, 0, 128, 70, 67, 74, 62),
567-
(26125, 56, 3183, 1510, 3145, 0, 0, 0, 130, 71, 68, 75, 63),
568-
(26125, 57, 3240, 1536, 3202, 0, 0, 0, 132, 72, 69, 76, 64),
569-
(26125, 58, 3297, 1562, 3259, 0, 0, 0, 134, 73, 70, 77, 65),
570-
(26125, 59, 3354, 1588, 3316, 0, 0, 0, 136, 74, 71, 78, 66),
571-
(26125, 60, 3411, 1614, 3373, 0, 0, 0, 138, 75, 72, 79, 67),
572-
(26125, 61, 3468, 1640, 3430, 0, 0, 0, 140, 76, 73, 80, 68),
573-
(26125, 62, 3525, 1666, 3487, 0, 0, 0, 142, 77, 74, 81, 69),
574-
(26125, 63, 3582, 1692, 3544, 0, 0, 0, 144, 78, 75, 82, 70),
575-
(26125, 64, 3639, 1718, 3601, 0, 0, 0, 146, 79, 76, 83, 71),
576-
(26125, 65, 3696, 1744, 3658, 0, 0, 0, 148, 80, 77, 84, 72),
577-
(26125, 66, 3753, 1770, 3715, 0, 0, 0, 150, 81, 78, 85, 73),
578-
(26125, 67, 3810, 1796, 3772, 0, 0, 0, 152, 82, 79, 86, 74),
579-
(26125, 68, 3867, 1822, 3829, 0, 0, 0, 154, 83, 80, 87, 75),
580-
(26125, 69, 3924, 1848, 3886, 0, 0, 0, 156, 84, 81, 88, 76),
581-
(26125, 70, 3981, 1874, 3943, 0, 0, 0, 158, 85, 82, 89, 77),
582-
(26125, 71, 4038, 1900, 4000, 0, 0, 0, 160, 86, 83, 90, 78),
583-
(26125, 72, 4095, 1926, 4057, 0, 0, 0, 162, 87, 84, 91, 79),
584-
(26125, 73, 4152, 1952, 4114, 0, 0, 0, 164, 88, 85, 92, 80),
585-
(26125, 74, 4209, 1978, 4171, 0, 0, 0, 166, 89, 86, 93, 81),
586-
(26125, 75, 4266, 2004, 4228, 0, 0, 0, 168, 90, 87, 94, 82),
587-
(26125, 76, 4323, 2030, 4285, 0, 0, 0, 170, 91, 88, 95, 83),
588-
(26125, 77, 4380, 2056, 4342, 0, 0, 0, 172, 92, 89, 96, 84),
589-
(26125, 78, 4437, 2082, 4399, 0, 0, 0, 174, 93, 90, 97, 85),
590-
(26125, 79, 4494, 2108, 4456, 0, 0, 0, 176, 94, 91, 98, 86),
591-
(26125, 80, 4551, 2134, 4513, 310, 504, 622, 178, 95, 92, 99, 87);
510+
DELETE FROM `pet_levelstats` WHERE `creature_entry` = 26125;
511+
INSERT INTO `pet_levelstats` (`creature_entry`, `level`, `hp`, `mana`, `armor`, `mindmg`, `maxdmg`, `attackpower`, `str`, `agi`, `sta`, `inte`, `spi`) VALUES
512+
(26125, 1, 48, 80, 10, 1, 3, 10, 20, 16, 13, 20, 8),
513+
(26125, 55, 3126, 1484, 5994, 0, 0, 0, 239, 263, 67, 49, 78),
514+
(26125, 56, 3183, 1510, 6105, 0, 0, 0, 242, 267, 68, 49, 79),
515+
(26125, 57, 3240, 1536, 6215, 0, 0, 0, 246, 271, 69, 50, 80),
516+
(26125, 58, 3297, 1562, 6326, 0, 0, 0, 249, 275, 70, 51, 81),
517+
(26125, 59, 3354, 1588, 6437, 0, 0, 0, 252, 279, 71, 51, 83),
518+
(26125, 60, 3411, 1614, 6547, 0, 0, 0, 256, 283, 72, 52, 84),
519+
(26125, 61, 3468, 1640, 6658, 0, 0, 0, 259, 286, 73, 53, 85),
520+
(26125, 62, 3525, 1666, 6768, 0, 0, 0, 263, 290, 74, 53, 86),
521+
(26125, 63, 3582, 1692, 6879, 0, 0, 0, 266, 294, 75, 54, 88),
522+
(26125, 64, 3639, 1718, 6990, 0, 0, 0, 273, 298, 76, 54, 89),
523+
(26125, 65, 3696, 1744, 7100, 0, 0, 0, 277, 302, 77, 55, 90),
524+
(26125, 66, 3753, 1770, 7211, 0, 0, 0, 280, 306, 78, 56, 91),
525+
(26125, 67, 3810, 1796, 7322, 0, 0, 0, 284, 310, 79, 56, 93),
526+
(26125, 68, 3867, 1822, 7432, 0, 0, 0, 287, 314, 80, 57, 94),
527+
(26125, 69, 3924, 1848, 7543, 0, 0, 0, 290, 318, 81, 58, 95),
528+
(26125, 70, 3981, 1874, 7654, 0, 0, 0, 294, 322, 82, 58, 96),
529+
(26125, 71, 4038, 1900, 7764, 0, 0, 0, 297, 326, 83, 59, 98),
530+
(26125, 72, 4095, 1926, 7875, 0, 0, 0, 301, 330, 84, 60, 99),
531+
(26125, 73, 4152, 1952, 7986, 0, 0, 0, 304, 334, 85, 60, 100),
532+
(26125, 74, 4209, 1978, 8096, 0, 0, 0, 308, 337, 86, 61, 101),
533+
(26125, 75, 4266, 2004, 8207, 0, 0, 0, 311, 341, 87, 62, 103),
534+
(26125, 76, 4323, 2030, 8317, 0, 0, 0, 315, 345, 88, 62, 104),
535+
(26125, 77, 4380, 2056, 8428, 0, 0, 0, 318, 349, 89, 63, 105),
536+
(26125, 78, 4437, 2082, 8539, 0, 0, 0, 325, 353, 90, 64, 106),
537+
(26125, 79, 4494, 2108, 8649, 0, 0, 0, 329, 357, 91, 64, 108),
538+
(26125, 80, 4551, 2134, 8760, 310, 504, 1167, 332, 361, 92, 65, 109);
592539

593540
-- DK Gargoyle
594541
DELETE FROM pet_levelstats WHERE creature_entry = 27829;

‎sql_mr/mr00023_mangos_pet_scaling.sql renamed to ‎sql_mr/mr01204_mangos_pet_scaling.sql

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -21,11 +21,11 @@ INSERT INTO `pet_scaling_data` (`creature_entry`, `aura`, `healthbase`, `health`
2121
-- Pet 26125 - DK ghoul
2222
DELETE FROM `pet_scaling_data` WHERE `creature_entry` = 26125;
2323
INSERT INTO `pet_scaling_data` (`creature_entry`, `aura`, `healthbase`, `health`, `powerbase`, `power`, `str`, `agi`, `sta`, `inte`, `spi`, `armor`, `resistance1`, `resistance2`, `resistance3`, `resistance4`, `resistance5`, `resistance6`, `apbase`, `apbasescale`, `attackpower`, `damage`, `spelldamage`, `spellhit`, `hit`, `expertize`, `attackspeed`, `crit`, `regen`) VALUES
24-
(26125, 0, 0, 1000, 0, 0, 70, 0, 30, 0, 0, 0, 0, 0, 0, 0, 0, 0, 10, 200, 0, 0, 0, 0, 100, 100, 100, 0, 0),
25-
(26125, 48965, 0, 0, 0, 0, 14, 0, 6, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0),
26-
(26125, 49571, 0, 0, 0, 0, 28, 0, 12, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0),
27-
(26125, 49572, 0, 0, 0, 0, 42, 0, 18, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0),
28-
(26125, 58686, 0, 0, 0, 0, 40, 0, 40, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0);
24+
(26125, 0, 0, 1000, 0, 0, 70, 0, 30, 0, 0, 0, 0, 0, 0, 0, 0, 0, 20, 100, 0, 83, 0, 0, 100, 100, 100, 0, 0),
25+
(26125, 48965, 0, 0, 0, 0, 14, 0, 6, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0),
26+
(26125, 49571, 0, 0, 0, 0, 28, 0, 12, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0),
27+
(26125, 49572, 0, 0, 0, 0, 42, 0, 18, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0),
28+
(26125, 58686, 0, 0, 0, 0, 40, 0, 40, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0);
2929

3030
-- Pet 416 - warlock imp
3131
DELETE FROM `pet_scaling_data` WHERE `creature_entry` = 416;
@@ -73,7 +73,7 @@ INSERT INTO `pet_scaling_data` (`creature_entry`, `aura`, `healthbase`, `health`
7373
-- Guardian 27829 - DK Gargoyle
7474
DELETE FROM `pet_scaling_data` WHERE `creature_entry` = 27829;
7575
INSERT INTO `pet_scaling_data` (`creature_entry`, `aura`, `healthbase`, `health`, `powerbase`, `power`, `str`, `agi`, `sta`, `inte`, `spi`, `armor`, `resistance1`, `resistance2`, `resistance3`, `resistance4`, `resistance5`, `resistance6`, `apbase`, `apbasescale`, `attackpower`, `damage`, `spelldamage`, `spellhit`, `hit`, `expertize`, `attackspeed`, `crit`, `regen`) VALUES
76-
(27829, 0, 0, 1000, 0, 1500, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 20, 200, 0, 0, 50, 100, 100, 100, 100, 0, 0);
76+
(27829, 0, 0, 1000, 0, 1500, 100, 0, 100, 0, 0, 35, 0, 0, 0, 0, 0, 0, 20, 200, 0, 0, 50, 100, 100, 100, 100, 0, 0);
7777

7878
-- Guardian 15352 - Greater Earth Elemental
7979
DELETE FROM `pet_scaling_data` WHERE `creature_entry` = 15352;

‎src/shared/revision_R2.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
11
#ifndef __REVISION_R2_H__
22
#define __REVISION_R2_H__
3-
#define REVISION_R2 "1203"
3+
#define REVISION_R2 "1204"
44
#endif // __REVISION_R2_H__

0 commit comments

Comments
 (0)