sindoring/moonwell-core
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fix(Core/Spells): fix PPM proc chance calculation for healing spells (#24761)

Browse Source 
Co-authored-by: blinkysc <blinkysc@users.noreply.github.com>
This commit is contained in:
blinkysc
2026-02-19 12:58:17 -06:00
committed by GitHub
parent 42ba48a9a9
commit ab29745d6a
4 changed files with 53 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/test/mocks/ProcChanceTestHelper.h
+5 -3
View File
@@ -79,6 +79,7 @@ public:
* @param chanceModifier Talent/aura modifier to chance
* @param ppmModifier Talent/aura modifier to PPM
* @param hasDamageInfo Whether a DamageInfo is present (enables PPM)
* @param hasHealInfo Whether a HealInfo is present (also enables PPM)
* @return Calculated proc chance
*/
static float SimulateCalcProcChance(
@@ -87,12 +88,13 @@ public:
uint32 weaponSpeed = 2500,
float chanceModifier = 0.0f,
float ppmModifier = 0.0f,
bool hasDamageInfo = true)
bool hasDamageInfo = true,
bool hasHealInfo = false)
{
float chance = procEntry.Chance;
// PPM calculation overrides base chance if PPM > 0 and we have DamageInfo
if (hasDamageInfo && procEntry.ProcsPerMinute > 0.0f)
// PPM calculation overrides base chance if PPM > 0 and we have DamageInfo or HealInfo
if ((hasDamageInfo || hasHealInfo) && procEntry.ProcsPerMinute > 0.0f)
{
chance = CalculatePPMChance(weaponSpeed, procEntry.ProcsPerMinute, ppmModifier);
}
src/test/server/game/Spells/SpellProcChanceTest.cpp
+34 -3
View File
@@ -91,19 +91,50 @@ TEST_F(SpellProcChanceTest, PPM_OverridesBaseChance_WithDamageInfo)
EXPECT_NEAR(result, 25.0f, 0.01f);
}
TEST_F(SpellProcChanceTest, PPM_NotApplied_WithoutDamageInfo)
TEST_F(SpellProcChanceTest, PPM_NotApplied_WithoutDamageOrHealInfo)
{
auto procEntry = SpellProcEntryBuilder()
.WithChance(50.0f)
.WithProcsPerMinute(6.0f)
.Build();
// Without DamageInfo, base chance is used
// Without DamageInfo or HealInfo, base chance is used
float result = ProcChanceTestHelper::SimulateCalcProcChance(
procEntry, 80, 2500, 0.0f, 0.0f, false);
procEntry, 80, 2500, 0.0f, 0.0f, false, false);
EXPECT_NEAR(result, 50.0f, 0.01f);
}
TEST_F(SpellProcChanceTest, PPM_Applied_WithHealInfo)
{
auto procEntry = SpellProcEntryBuilder()
.WithChance(0.0f)
.WithProcsPerMinute(3.5f)
.Build();
// With HealInfo (no DamageInfo), PPM should still calculate
// 3000ms cast time * 3.5 PPM / 600 = 17.5%
float result = ProcChanceTestHelper::SimulateCalcProcChance(
procEntry, 80, 3000, 0.0f, 0.0f, false, true);
EXPECT_NEAR(result, 17.5f, 0.01f);
}
TEST_F(SpellProcChanceTest, PPM_HealInfo_ZeroBaseChance_WouldBeZeroWithoutFix)
{
// Reproduces the Omen of Clarity healing bug:
// PPM=3.5, Chance=0, and only HealInfo present (no DamageInfo)
// Without the fix, chance would be 0% because PPM branch was skipped
auto procEntry = SpellProcEntryBuilder()
.WithChance(0.0f)
.WithProcsPerMinute(3.5f)
.Build();
// Instant cast uses 1500ms minimum
float result = ProcChanceTestHelper::SimulateCalcProcChance(
procEntry, 80, 1500, 0.0f, 0.0f, false, true);
EXPECT_NEAR(result, 8.75f, 0.01f);
EXPECT_GT(result, 0.0f) << "PPM with HealInfo must produce non-zero chance";
}
TEST_F(SpellProcChanceTest, PPM_WithWeaponSpeedVariation)
{
auto procEntry = SpellProcEntryBuilder()