Nico/Viano-Core
1
0 Fork 0
Code Issues Pull Requests Actions 8 Packages Projects Releases Wiki Activity

Core/Units: generating rage from damage taken will now use the full unmitigated damage amount instead of the final instead

Browse Source
This commit is contained in:
Ovahlord committed 2023-12-10 04:37:44 +01:00
1 parent df646fbe6a
commit 8c3d501524
1 file changed
+3 -12
Download Patch File Download Diff File Expand all files Collapse all files
src/server/game/Entities/Unit/Unit.cpp
+3 -12
View File
@@ -828,15 +828,6 @@ bool Unit::HasBreakableByDamageCrowdControlAura(Unit* excludeCasterChannel) cons
} }
} }
if (!damage)
{
// Rage from absorbed damage
if (cleanDamage && cleanDamage->absorbed_damage && victim->GetPowerType() == POWER_RAGE)
victim->RewardRage(cleanDamage->absorbed_damage, false);
return 0;
}
uint32 health = victim->GetHealth(); uint32 health = victim->GetHealth();
// duel ends when player has 1 or less hp // duel ends when player has 1 or less hp
@@ -939,8 +930,8 @@ bool Unit::HasBreakableByDamageCrowdControlAura(Unit* excludeCasterChannel) cons
// Rage from damage received // Rage from damage received
if (attacker != victim && victim->GetPowerType() == POWER_RAGE) if (attacker != victim && victim->GetPowerType() == POWER_RAGE)
{ {
uint32 rage_damage = damage + (cleanDamage ? cleanDamage->absorbed_damage : 0); uint32 rageBaseReward = damage + (cleanDamage ? cleanDamage->absorbed_damage + cleanDamage->mitigated_damage : 0);
victim->RewardRage(rage_damage, false); victim->RewardRage(rageBaseReward, false);
} }
if (attacker && attacker->GetTypeId() == TYPEID_PLAYER) if (attacker && attacker->GetTypeId() == TYPEID_PLAYER)
@@ -13459,7 +13450,7 @@ void Unit::RewardRage(uint32 baseRage, bool attacker)
else else
{ {
// Calculate rage from health and damage taken (formular taken from SimulationCraft) // Calculate rage from health and damage taken (formular taken from SimulationCraft)
addRage = std::floor(0.5f + (baseRage * 18.92f / GetMaxHealth())); addRage = baseRage * 18.92f / GetMaxHealth();
// Berserker Rage // Berserker Rage
if (HasAura(18499)) if (HasAura(18499))