diff --git a/sql/migrations/20190809211357_world.sql b/sql/migrations/20190809211357_world.sql new file mode 100644 index 000000000..e572a1109 --- /dev/null +++ b/sql/migrations/20190809211357_world.sql @@ -0,0 +1,23 @@ +DROP PROCEDURE IF EXISTS add_migration; +delimiter ?? +CREATE PROCEDURE `add_migration`() +BEGIN +DECLARE v INT DEFAULT 1; +SET v = (SELECT COUNT(*) FROM `migrations` WHERE `id`='20190809211357'); +IF v=0 THEN +INSERT INTO `migrations` VALUES ('20190809211357'); +-- Add your query below. + + +-- Fix unit class of all creatures. +UPDATE `creature_template` SET `unit_class`=1 WHERE `unit_class`=0; +UPDATE `creature_template` SET `unit_class`=2 WHERE `entry` IN (60, 127, 417, 429, 453, 456, 486, 503, 517, 533, 545, 548, 572, 660, 670, 672, 676, 679, 697, 701, 711, 743, 752, 761, 764, 765, 766, 780, 785, 787, 808, 814, 818, 819, 868, 873, 875, 920, 928, 940, 941, 942, 943, 946, 978, 1013, 1029, 1036, 1043, 1044, 1046, 1049, 1060, 1062, 1065, 1069, 1096, 1106, 1121, 1144, 1166, 1179, 1181, 1183, 1197, 1260, 1364, 1397, 1399, 1410, 1425, 1490, 1523, 1538, 1539, 1544, 1574, 1575, 1679, 1717, 1748, 1749, 1768, 1769, 1773, 1784, 1789, 1794, 1795, 1834, 1835, 1837, 1839, 1840, 1842, 1845, 1846, 1848, 1852, 1853, 1854, 1855, 1860, 1863, 1868, 1895, 1896, 1908, 1909, 1910, 1911, 1940, 1954, 1958, 1993, 2002, 2003, 2009, 2011, 2012, 2014, 2021, 2030, 2038, 2054, 2055, 2108, 2167, 2169, 2170, 2171, 2180, 2203, 2207, 2208, 2276, 2283, 2305, 2338, 2344, 2346, 2370, 2371, 2376, 2377, 2417, 2423, 2425, 2433, 2447, 2534, 2550, 2555, 2557, 2570, 2575, 2583, 2598, 2600, 2601, 2602, 2605, 2607, 2612, 2640, 2645, 2647, 2694, 2713, 2718, 2725, 2742, 2745, 2755, 2761, 2762, 2764, 2793, 2880, 2881, 2887, 2892, 2894, 2907, 2921, 2949, 2950, 2953, 2963, 2965, 3101, 3113, 3118, 3120, 3183, 3196, 3197, 3205, 3206, 3207, 3247, 3249, 3260, 3261, 3262, 3268, 3270, 3271, 3273, 3280, 3386, 3392, 3397, 3424, 3434, 3458, 3516, 3573, 3579, 3669, 3670, 3671, 3672, 3673, 3678, 3698, 3712, 3715, 3732, 3742, 3748, 3750, 3755, 3757, 3762, 3770, 3771, 3772, 3773, 3781, 3783, 3794, 3795, 3797, 3799, 3801, 3803, 3833, 3840, 3851, 3853, 3855, 3860, 3900, 3904, 3906, 3907, 3908, 3909, 3911, 3912, 3913, 3916, 3917, 3922, 3924, 3940, 3941, 3942, 3944, 3974, 3976, 3977, 3983, 4016, 4017, 4024, 4025, 4026, 4027, 4028, 4032, 4036, 4038, 4050, 4051, 4052, 4053, 4066, 4069, 4096, 4097, 4098, 4117, 4119, 4151, 4207, 4273, 4275, 4277, 4278, 4280, 4284, 4285, 4287, 4291, 4292, 4293, 4296, 4299, 4302, 4303, 4324, 4328, 4331, 4334, 4344, 4363, 4370, 4371, 4404, 4421, 4424, 4427, 4428, 4440, 4459, 4469, 4472, 4485, 4489, 4498, 4515, 4517, 4518, 4519, 4520, 4522, 4523, 4525, 4542, 4543, 4619, 4635, 4637, 4641, 4642, 4649, 4657, 4675, 4678, 4679, 4681, 4682, 4683, 4685, 4716, 4717, 4718, 4719, 4723, 4798, 4799, 4802, 4803, 4805, 4809, 4811, 4812, 4820, 4831, 4832, 4842, 4844, 4847, 4848, 4852, 4853, 4854, 4949, 4971, 4978, 4980, 5236, 5237, 5254, 5259, 5269, 5271, 5273, 5276, 5278, 5280, 5291, 5305, 5307, 5317, 5328, 5333, 5335, 5337, 5343, 5360, 5362, 5363, 5364, 5366, 5401, 5429, 5473, 5475, 5485, 5643, 5647, 5650, 5677, 5682, 5683, 5710, 5711, 5712, 5717, 5726, 5761, 5769, 5771, 5785, 5822, 5826, 5830, 5834, 5860, 5861, 5863, 5893, 5894, 5899, 5902, 5915, 5916, 5930, 5979, 6000, 6006, 6012, 6047, 6070, 6072, 6110, 6111, 6112, 6131, 6138, 6168, 6170, 6171, 6172, 6177, 6178, 6179, 6186, 6194, 6195, 6198, 6200, 6213, 6220, 6221, 6227, 6228, 6293, 6329, 6351, 6366, 6378, 6380, 6392, 6490, 6519, 6520, 6527, 6550, 6649, 6887, 6910, 6912, 7007, 7016, 7030, 7034, 7047, 7049, 7068, 7070, 7071, 7075, 7104, 7107, 7109, 7118, 7120, 7154, 7158, 7235, 7246, 7247, 7271, 7275, 7291, 7317, 7318, 7319, 7337, 7352, 7353, 7358, 7366, 7367, 7368, 7370, 7398, 7399, 7400, 7402, 7403, 7411, 7412, 7413, 7414, 7415, 7416, 7423, 7424, 7425, 7429, 7439, 7441, 7453, 7464, 7465, 7466, 7467, 7468, 7469, 7483, 7486, 7487, 7523, 7524, 7584, 7608, 7666, 7667, 7726, 7727, 7734, 7735, 7740, 7767, 7772, 7773, 7780, 7843, 7845, 7872, 7874, 7878, 7879, 7886, 7895, 7997, 7999, 8075, 8127, 8136, 8200, 8217, 8282, 8298, 8336, 8382, 8394, 8405, 8409, 8419, 8438, 8440, 8442, 8444, 8497, 8516, 8525, 8547, 8548, 8562, 8579, 8656, 8657, 8716, 8763, 8764, 8776, 8856, 8876, 8879, 8895, 8896, 8898, 8902, 8908, 8909, 8910, 8912, 8914, 8915, 8916, 8917, 8929, 8977, 8980, 8983, 9018, 9026, 9029, 9030, 9031, 9034, 9036, 9038, 9039, 9041, 9045, 9056, 9078, 9079, 9081, 9084, 9085, 9098, 9197, 9198, 9201, 9217, 9236, 9238, 9239, 9240, 9257, 9261, 9262, 9263, 9264, 9265, 9266, 9269, 9397, 9437, 9438, 9439, 9441, 9442, 9443, 9447, 9448, 9449, 9450, 9476, 9499, 9516, 9518, 9523, 9528, 9529, 9562, 9604, 9619, 9637, 9678, 9681, 9687, 9688, 9689, 9693, 9717, 9778, 9817, 9818, 9861, 9877, 10000, 10076, 10078, 10083, 10119, 10157, 10162, 10181, 10199, 10201, 10296, 10340, 10358, 10373, 10389, 10390, 10394, 10420, 10421, 10424, 10426, 10432, 10433, 10436, 10440, 10442, 10469, 10471, 10472, 10476, 10477, 10487, 10491, 10498, 10499, 10500, 10502, 10503, 10505, 10506, 10508, 10540, 10559, 10584, 10602, 10605, 10618, 10640, 10642, 10647, 10648, 10660, 10680, 10684, 10717, 10738, 10739, 10759, 10811, 10812, 10828, 10838, 10917, 10920, 10921, 10922, 10923, 10928, 10929, 10939, 10944, 10945, 10949, 11019, 11020, 11032, 11040, 11053, 11055, 11077, 11141, 11143, 11256, 11257, 11319, 11322, 11338, 11339, 11340, 11346, 11347, 11380, 11388, 11443, 11445, 11453, 11457, 11461, 11464, 11466, 11470, 11471, 11473, 11480, 11483, 11484, 11487, 11488, 11492, 11497, 11548, 11562, 11577, 11582, 11598, 11600, 11604, 11608, 11609, 11611, 11622, 11657, 11661, 11663, 11664, 11675, 11677, 11680, 11697, 11713, 11714, 11788, 11793, 11795, 11796, 11797, 11798, 11799, 11800, 11801, 11802, 11804, 11805, 11807, 11822, 11830, 11831, 11832, 11837, 11838, 11859, 11873, 11878, 11882, 11883, 11898, 11915, 11949, 12118, 12119, 12126, 12128, 12140, 12178, 12204, 12224, 12225, 12238, 12259, 12264, 12321, 12322, 12337, 12352, 12379, 12380, 12387, 12396, 12420, 12433, 12457, 12458, 12459, 12465, 12468, 12476, 12478, 12557, 12759, 12791, 12856, 12862, 12863, 12864, 12865, 12866, 12876, 12902, 12976, 13096, 13097, 13098, 13099, 13116, 13117, 13157, 13158, 13197, 13220, 13236, 13256, 13280, 13284, 13442, 13443, 13496, 13537, 13538, 13540, 13546, 13547, 13555, 13556, 13697, 13698, 13716, 13718, 13737, 14026, 14027, 14028, 14029, 14030, 14031, 14182, 14183, 14225, 14230, 14275, 14324, 14327, 14349, 14354, 14364, 14368, 14369, 14371, 14381, 14382, 14383, 14387, 14393, 14394, 14397, 14398, 14399, 14400, 14432, 14436, 14460, 14470, 14478, 14479, 14506, 14507, 14509, 14510, 14511, 14512, 14514, 14515, 14516, 14517, 14518, 14519, 14521, 14522, 14523, 14527, 14536, 14621, 14688, 14822, 14823, 14825, 14834, 14861, 14862, 14876, 14883, 14911, 15083, 15085, 15105, 15111, 15169, 15183, 15192, 15193, 15202, 15206, 15211, 15213, 15215, 15250, 15260, 15262, 15263, 15273, 15274, 15276, 15280, 15292, 15293, 15294, 15298, 15301, 15312, 15328, 15338, 15340, 15362, 15367, 15370, 15371, 15378, 15379, 15380, 15381, 15382, 15399, 15407, 15408, 15410, 15411, 15412, 15413, 15443, 15449, 15471, 15495, 15501, 15513, 15527, 15551, 15613, 15614, 15620, 15623, 15633, 15634, 15638, 15642, 15644, 15645, 15647, 15648, 15649, 15650, 15669, 15689, 15691, 15693, 15937, 15942, 15949, 15950, 15953, 15954, 15966, 15967, 15990, 16020, 16022, 16042, 16048, 16052, 16053, 16054, 16060, 16073, 16080, 16093, 16097, 16101, 16102, 16103, 16104, 16113, 16114, 16115, 16116, 16118, 16120, 16126, 16127, 16128, 16132, 16133, 16134, 16135, 16144, 16162, 16163, 16248, 16254, 16257, 16258, 16259, 16264, 16270, 16271, 16272, 16275, 16277, 16280, 16284, 16292, 16294, 16304, 16307, 16308, 16310, 16311, 16313, 16315, 16317, 16320, 16323, 16329, 16331, 16337, 16341, 16343, 16345, 16346, 16357, 16358, 16368, 16387, 16406, 16409, 16440, 16457, 16460, 16469, 16470, 16471, 16482, 16492, 16499, 16501, 16521, 16526, 16529, 16539, 16540, 16543, 16545, 16574, 16575, 16577, 16578, 16579, 16586, 16587, 16588, 16602, 16629, 16633, 16634, 16639, 16640, 16642, 16643, 16644, 16655, 16662, 16663, 16667, 16668, 16671, 16672, 16673, 16674, 16676, 16679, 16680, 16681, 16687, 16688, 16692, 16696, 16703, 16709, 16712, 16719, 16721, 16723, 16724, 16725, 16726, 16727, 16728, 16729, 16731, 16736, 16738, 16740, 16741, 16742, 16743, 16745, 16746, 16748, 16752, 16761, 16763, 16767, 16769, 16774, 16780, 16796, 16799, 16800, 16801, 16802, 16807, 16810, 16819, 16821, 16824, 16825, 16829, 16830, 16833, 16834, 16836, 16839, 16840, 16841, 16850, 16851, 16852, 16854, 16856, 16858, 16862, 16873, 16885, 16888, 16896, 16905, 16906, 16911, 16916, 16923, 16924, 16950, 16951, 16959, 16960, 16966, 16974, 16975, 16977, 16991, 16993, 16994, 16996, 17000, 17002, 17007, 17015, 17052, 17062, 17076, 17084, 17088, 17089, 17093, 17094, 17095, 17097, 17099, 17103, 17104, 17106, 17110, 17115, 17119, 17121, 17122, 17135, 17137, 17141, 17143, 17146, 17147, 17149, 17150, 17151, 17153, 17155, 17158, 17159, 17160, 17187, 17192, 17204, 17205, 17206, 17207, 17212, 17214, 17218, 17219, 17220, 17223, 17228, 17232, 17233, 17235, 17241, 17243, 17252, 17256, 17263, 17270, 17275, 17277, 17279, 17282, 17291, 17300, 17303, 17308, 17312, 17314, 17320, 17328, 17342, 17355, 17358, 17397, 17399, 17401, 17403, 17404, 17406, 17409, 17412, 17423, 17424, 17425, 17431, 17433, 17434, 17435, 17440, 17441, 17443, 17444, 17445, 17446, 17468, 17477, 17483, 17487, 17499, 17500, 17505, 17509, 17512, 17519, 17520, 17534, 17535, 17538, 17540, 17542, 17553, 17554, 17555, 17589, 17599, 17600, 17608, 17609, 17614, 17628, 17635, 17642, 17647, 17651, 17652, 17664, 17678, 17682, 17684, 17716, 17717, 17722, 17729, 17730, 17767, 17768, 17769, 17771, 17772, 17797, 17801, 17803, 17807, 17808, 17809, 17810, 17811, 17812, 17825, 17826, 17831, 17832, 17833, 17834, 17841, 17842, 17843, 17844, 17852, 17853, 17855, 17856, 17862, 17864, 17865, 17866, 17870, 17871, 17874, 17875, 17877, 17879, 17882, 17884, 17885, 17887, 17888, 17890, 17892, 17893, 17899, 17903, 17905, 17909, 17910, 17911, 17912, 17913, 17914, 17917, 17926, 17927, 17935, 17936, 17938, 17940, 17941, 17944, 17948, 17951, 17956, 17961, 17968, 17969, 17975, 17978, 17981, 17982, 17986, 17993, 17995, 17996); +UPDATE `creature_template` SET `unit_class`=8 WHERE `entry` IN (203, 314, 335, 397, 416, 430, 436, 441, 450, 474, 476, 507, 510, 589, 596, 599, 619, 677, 710, 740, 741, 762, 815, 881, 891, 910, 1009, 1028, 1038, 1057, 1124, 1165, 1174, 1200, 1251, 1284, 1507, 1522, 1562, 1564, 1653, 1726, 1729, 1732, 1826, 1832, 1867, 1888, 1889, 1914, 1915, 1920, 1947, 2018, 2044, 2060, 2120, 2160, 2182, 2191, 2192, 2244, 2255, 2272, 2306, 2318, 2319, 2335, 2337, 2358, 2373, 2387, 2415, 2453, 2543, 2553, 2567, 2573, 2577, 2590, 2591, 2596, 2609, 2624, 2638, 2642, 2654, 2720, 2740, 2964, 2990, 3198, 3199, 3203, 3204, 3263, 3269, 3380, 3436, 3510, 3569, 3662, 3664, 3717, 3725, 3728, 3735, 3802, 3850, 3899, 3986, 3991, 4003, 4063, 4090, 4091, 4092, 4116, 4138, 4146, 4165, 4198, 4205, 4217, 4218, 4219, 4282, 4289, 4294, 4297, 4300, 4418, 4460, 4463, 4467, 4494, 4516, 4651, 4658, 4663, 4665, 4667, 4668, 4684, 4705, 4712, 4813, 4814, 4968, 5239, 5240, 5336, 5520, 5617, 5648, 5679, 5694, 5715, 5744, 5747, 5749, 5750, 5753, 5815, 5839, 5862, 5975, 5978, 6002, 6008, 6009, 6027, 6117, 6119, 6120, 6121, 6122, 6127, 6129, 6188, 6199, 6202, 6244, 6247, 6251, 6252, 6253, 6254, 6267, 6294, 6328, 6370, 6373, 6374, 6376, 6382, 6487, 6546, 6575, 6826, 6868, 7010, 7012, 7026, 7028, 7041, 7043, 7048, 7077, 7111, 7112, 7115, 7313, 7316, 7321, 7335, 7340, 7341, 7342, 7354, 7357, 7372, 7379, 7397, 7437, 7461, 7505, 7583, 7606, 7774, 7789, 7795, 7957, 7995, 7996, 8115, 8138, 8202, 8296, 8378, 8379, 8381, 8390, 8439, 8503, 8507, 8524, 8526, 8528, 8550, 8551, 8553, 8578, 8588, 8636, 8658, 8894, 8900, 8904, 8913, 9024, 9451, 9452, 9517, 9547, 9561, 9565, 9616, 9997, 10136, 10307, 10393, 10398, 10400, 10419, 10422, 10423, 10425, 10438, 10470, 10608, 10698, 10699, 10760, 10802, 10823, 10827, 10876, 11056, 11057, 11076, 11324, 11383, 11397, 11401, 11406, 11407, 11444, 11448, 11455, 11518, 11559, 11615, 11616, 11662, 11683, 11685, 11754, 11756, 11808, 11811, 11863, 11913, 11917, 12205, 12319, 12339, 12378, 12722, 12736, 12779, 12790, 12922, 13019, 14272, 14277, 14487, 14497, 15007, 15187, 15188, 15191, 15200, 15278, 15279, 15281, 15283, 15284, 15291, 15295, 15296, 15297, 15308, 15398, 15400, 15401, 15402, 15403, 15404, 15405, 15406, 15416, 15417, 15418, 15433, 15444, 15494, 15498, 15502, 15503, 15504, 15549, 15552, 15556, 15557, 15558, 15560, 15561, 15562, 15563, 15564, 15565, 15566, 15567, 15568, 15569, 15570, 15572, 15573, 15574, 15575, 15576, 15577, 15578, 15579, 15580, 15581, 15582, 15583, 15584, 15585, 15586, 15587, 15588, 15592, 15593, 15594, 15595, 15596, 15597, 15598, 15599, 15600, 15601, 15602, 15603, 15604, 15605, 15606, 15607, 15615, 15656, 15657, 15871, 15895, 15898, 15909, 15938, 15939, 15940, 15941, 15945, 15946, 15951, 15958, 15965, 15970, 15971, 15980, 15981, 16013, 16033, 16051, 16055, 16058, 16109, 16160, 16161, 16165, 16185, 16186, 16197, 16204, 16205, 16237, 16240, 16249, 16253, 16260, 16261, 16262, 16266, 16267, 16269, 16276, 16287, 16288, 16291, 16293, 16318, 16362, 16366, 16367, 16397, 16435, 16436, 16464, 16480, 16488, 16500, 16502, 16506, 16522, 16524, 16542, 16594, 16601, 16610, 16611, 16612, 16613, 16615, 16616, 16617, 16618, 16619, 16620, 16621, 16623, 16624, 16625, 16626, 16627, 16628, 16631, 16632, 16635, 16636, 16637, 16638, 16641, 16646, 16647, 16648, 16649, 16650, 16651, 16652, 16653, 16654, 16656, 16657, 16658, 16659, 16660, 16666, 16669, 16675, 16677, 16683, 16689, 16690, 16691, 16693, 16694, 16705, 16706, 16707, 16710, 16714, 16716, 16718, 16722, 16732, 16735, 16739, 16747, 16749, 16750, 16751, 16753, 16755, 16756, 16757, 16762, 16765, 16766, 16768, 16782, 16791, 16792, 16793, 16795, 16797, 16798, 16860, 16918, 16920, 16937, 16981, 17005, 17056, 17086, 17092, 17098, 17100, 17105, 17109, 17127, 17184, 17191, 17195, 17226, 17229, 17238, 17267, 17269, 17309, 17327, 17330, 17333, 17336, 17339, 17359, 17371, 17377, 17380, 17395, 17402, 17414, 17416, 17478, 17481, 17482, 17494, 17510, 17511, 17513, 17514, 17606, 17610, 17612, 17613, 17627, 17629, 17630, 17631, 17632, 17633, 17636, 17653, 17694, 17713, 17718, 17773, 17845, 17849, 17886, 17922, 17928, 17960, 17963); + + +-- End of migration. +END IF; +END?? +delimiter ; +CALL add_migration(); +DROP PROCEDURE IF EXISTS add_migration; diff --git a/src/game/Objects/Creature.cpp b/src/game/Objects/Creature.cpp index 51b80975f..9ee3a1fbb 100644 --- a/src/game/Objects/Creature.cpp +++ b/src/game/Objects/Creature.cpp @@ -916,10 +916,9 @@ void Creature::RegenerateHealth() else { float HealthIncreaseRate = sWorld.getConfig(CONFIG_FLOAT_RATE_HEALTH); - float Spirit = GetStat(STAT_SPIRIT); - addvalue = uint32(Spirit * 0.25 * HealthIncreaseRate); - addvalue *= 4; // Le timer tick toutes les 4 secondes. + addvalue = uint32(GetRegenHPPerSpirit() * HealthIncreaseRate); + addvalue *= 4; // The timer ticks every 4 seconds. } } else @@ -927,6 +926,9 @@ void Creature::RegenerateHealth() addvalue = maxValue / 3; } + if (addvalue < 0) + addvalue = 0; + ModifyHealth(addvalue); } diff --git a/src/game/Objects/Pet.cpp b/src/game/Objects/Pet.cpp index 9ca805048..fbd5f5e19 100644 --- a/src/game/Objects/Pet.cpp +++ b/src/game/Objects/Pet.cpp @@ -1352,7 +1352,6 @@ bool Pet::InitStatsForLevel(uint32 petlevel, Unit* owner) switch (getPetType()) { case SUMMON_PET: - SetByteValue(UNIT_FIELD_BYTES_0, 1, CLASS_MAGE); SetUInt32Value(UNIT_FIELD_FLAGS, UNIT_FLAG_NONE); break; case HUNTER_PET: diff --git a/src/game/Objects/Player.cpp b/src/game/Objects/Player.cpp index d751933c4..7b5896481 100644 --- a/src/game/Objects/Player.cpp +++ b/src/game/Objects/Player.cpp @@ -5110,82 +5110,6 @@ float Player::GetSpellCritFromIntellect() const return crit_chance; } -float Player::GetRegenHPPerSpirit() const -{ - float regen = 0.0f; - - float Spirit = GetStat(STAT_SPIRIT); - uint8 Class = getClass(); - - switch (Class) - { - case CLASS_DRUID: - regen = (Spirit * 0.11 + 1); - break; - case CLASS_HUNTER: - regen = (Spirit * 0.43 - 5.5); - break; - case CLASS_MAGE: - regen = (Spirit * 0.11 + 1); - break; - case CLASS_PALADIN: - regen = (Spirit * 0.25); - break; - case CLASS_PRIEST: - regen = (Spirit * 0.15 + 1.4); - break; - case CLASS_ROGUE: - regen = (Spirit * 0.84 - 13); - break; - case CLASS_SHAMAN: - regen = (Spirit * 0.28 - 3.6); - break; - case CLASS_WARLOCK: - regen = (Spirit * 0.12 + 1.5); - break; - case CLASS_WARRIOR: - regen = (Spirit * 1.26 - 22.6); - break; - } - - return regen; -} - -float Player::GetRegenMPPerSpirit() const -{ - float addvalue = 0.0; - - float Spirit = GetStat(STAT_SPIRIT); - uint8 Class = getClass(); - - switch (Class) - { - case CLASS_DRUID: - addvalue = (Spirit / 5 + 15); - break; - case CLASS_HUNTER: - addvalue = (Spirit / 5 + 15); - break; - case CLASS_MAGE: - addvalue = (Spirit / 4 + 12.5); - break; - case CLASS_PALADIN: - addvalue = (Spirit / 5 + 15); - break; - case CLASS_PRIEST: - addvalue = (Spirit / 4 + 12.5); - break; - case CLASS_SHAMAN: - addvalue = (Spirit / 5 + 17); - break; - case CLASS_WARLOCK: - addvalue = (Spirit / 5 + 15); - break; - } - - return addvalue; -} - void Player::SetRegularAttackTime(bool resetTimer) { for (int i = 0; i < MAX_ATTACK; ++i) diff --git a/src/game/Objects/Player.h b/src/game/Objects/Player.h index 31371fd15..b02123f4e 100644 --- a/src/game/Objects/Player.h +++ b/src/game/Objects/Player.h @@ -1503,8 +1503,6 @@ class MANGOS_DLL_SPEC Player final: public Unit float GetMeleeCritFromAgility() const; float GetDodgeFromAgility() const; float GetSpellCritFromIntellect() const; - float GetRegenHPPerSpirit() const; - float GetRegenMPPerSpirit() const; void InitStatBuffMods() { for (int i = STAT_STRENGTH; i < MAX_STATS; ++i) SetFloatValue(PLAYER_FIELD_POSSTAT0 + i, 0); diff --git a/src/game/Objects/Unit.cpp b/src/game/Objects/Unit.cpp index 782aa6e2c..430a52e7e 100644 --- a/src/game/Objects/Unit.cpp +++ b/src/game/Objects/Unit.cpp @@ -7874,11 +7874,10 @@ bool Unit::IsValidAttackTarget(Unit const* target) const int32 Unit::ModifyHealth(int32 dVal) { - int32 gain = 0; - if (dVal == 0) return 0; + int32 gain = 0; int32 curHealth = (int32)GetHealth(); int32 val = dVal + curHealth; @@ -7906,11 +7905,10 @@ int32 Unit::ModifyHealth(int32 dVal) int32 Unit::ModifyPower(Powers power, int32 dVal) { - int32 gain = 0; - if (dVal == 0) return 0; + int32 gain = 0; int32 curPower = (int32)GetPower(power); int32 val = dVal + curPower; @@ -7936,6 +7934,84 @@ int32 Unit::ModifyPower(Powers power, int32 dVal) return gain; } +float Unit::GetRegenHPPerSpirit() const +{ + float regen = 0.0f; + + float Spirit = GetStat(STAT_SPIRIT); + uint8 Class = getClass(); + + switch (Class) + { + case CLASS_DRUID: + regen = (Spirit * 0.11 + 1); + break; + case CLASS_HUNTER: + regen = (Spirit * 0.43 - 5.5); + break; + case CLASS_MAGE: + regen = (Spirit * 0.11 + 1); + break; + case CLASS_PALADIN: + regen = (Spirit * 0.25); + break; + case CLASS_PRIEST: + regen = (Spirit * 0.15 + 1.4); + break; + case CLASS_ROGUE: + regen = (Spirit * 0.84 - 13); + break; + case CLASS_SHAMAN: + regen = (Spirit * 0.28 - 3.6); + break; + case CLASS_WARLOCK: + regen = (Spirit * 0.12 + 1.5); + break; + case CLASS_WARRIOR: + regen = (Spirit * 1.26 - 22.6); + break; + } + + return std::max(0.0f, regen); +} + +float Unit::GetRegenMPPerSpirit() const +{ + float addvalue = 0.0; + + float Spirit = GetStat(STAT_SPIRIT); + uint8 Class = getClass(); + + switch (Class) + { + case CLASS_DRUID: + addvalue = (Spirit / 5 + 15); + break; + case CLASS_HUNTER: + addvalue = (Spirit / 5 + 15); + break; + case CLASS_MAGE: + addvalue = (Spirit / 4 + 12.5); + break; + case CLASS_PALADIN: + addvalue = (Spirit / 5 + 15); + break; + case CLASS_PRIEST: + addvalue = (Spirit / 4 + 12.5); + break; + case CLASS_SHAMAN: + addvalue = (Spirit / 5 + 17); + break; + case CLASS_WARLOCK: + addvalue = (Spirit / 5 + 15); + break; + } + + addvalue /= 2.0f; // the above addvalue are given per tick which occurs every 2 seconds, hence this divide by 2 + + return addvalue; +} + bool Unit::isVisibleForOrDetect(Unit const* u, WorldObject const* viewPoint, bool detect, bool /*inVisibleList*/, bool* alert) const { if (!u || !IsInMap(u)) diff --git a/src/game/Objects/Unit.h b/src/game/Objects/Unit.h index 9ffe1e935..81ac7fb02 100644 --- a/src/game/Objects/Unit.h +++ b/src/game/Objects/Unit.h @@ -1829,6 +1829,8 @@ class MANGOS_DLL_SPEC Unit : public WorldObject virtual void UpdateMaxHealth() = 0; virtual void UpdateMaxPower(Powers power) = 0; virtual void UpdateManaRegen() = 0; + float GetRegenHPPerSpirit() const; + float GetRegenMPPerSpirit() const; virtual void UpdateAttackPowerAndDamage(bool ranged = false) = 0; virtual void UpdateDamagePhysical(WeaponAttackType attType) = 0; float GetTotalAttackPowerValue(WeaponAttackType attType) const; diff --git a/src/game/StatSystem.cpp b/src/game/StatSystem.cpp index de594fbb5..62f1108d6 100644 --- a/src/game/StatSystem.cpp +++ b/src/game/StatSystem.cpp @@ -634,8 +634,8 @@ void Player::UpdateAllSpellCritChances() void Player::UpdateManaRegen() { // Mana regen from spirit - // Nostalrius - Fix mana regen (diviser par 2) - float power_regen = GetRegenMPPerSpirit() / 2.0f; + float power_regen = GetRegenMPPerSpirit(); + // Apply PCT bonus from SPELL_AURA_MOD_POWER_REGEN_PERCENT aura on spirit base regen power_regen *= GetTotalAuraMultiplierByMiscValue(SPELL_AURA_MOD_POWER_REGEN_PERCENT, POWER_MANA); @@ -738,13 +738,13 @@ void Creature::UpdateMaxPower(Powers power) void Creature::UpdateManaRegen() { float ManaIncreaseRate = sWorld.getConfig(CONFIG_FLOAT_RATE_POWER_MANA); - float Spirit = GetStat(STAT_SPIRIT); + float intellect = std::max(1.0f, GetStat(STAT_INTELLECT)); // Apply PCT bonus from SPELL_AURA_MOD_POWER_REGEN_PERCENT aura on spirit base regen float power_regen = GetTotalAuraMultiplierByMiscValue(SPELL_AURA_MOD_POWER_REGEN_PERCENT, POWER_MANA); // Mana regen from SPELL_AURA_MOD_POWER_REGEN aura float power_regen_mp5 = GetTotalAuraModifierByMiscValue(SPELL_AURA_MOD_POWER_REGEN, POWER_MANA) / 5.0f; - m_manaRegen = uint32(((Spirit / 5.0f + 17.0f) * power_regen + power_regen_mp5) * ManaIncreaseRate); + m_manaRegen = uint32((sqrt(intellect) * GetRegenMPPerSpirit() * power_regen + power_regen_mp5) * ManaIncreaseRate); } void Creature::UpdateAttackPowerAndDamage(bool ranged)