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

Core/Spells: fixed value calculation for combo points bonus damage

Browse Source
This commit is contained in:
Ovahlord committed 2023-02-20 20:08:49 +01:00
1 parent 198e05d108
commit 283d9cf84f
1 file changed
+4 -4
Download Patch File Download Diff File Expand all files Collapse all files
src/server/game/Spells/SpellInfo.cpp
+4 -4
View File
@@ -462,6 +462,9 @@ int32 SpellEffectInfo::CalcValue(WorldObject const* caster, int32 const* bp, Uni
value *= ((((1.0 - _spellInfo->Scaling.NerfFactor) * (level - 1)) / (_spellInfo->Scaling.NerfMaxLevel - 1)) + _spellInfo->Scaling.NerfFactor);
}
if (Scaling.ComboPointsCoefficient)
comboDamage = Scaling.ComboPointsCoefficient * value;
value *= Scaling.Coefficient;
if (value >= 0.0f && value < 1.0f)
value = 1.0f;
@@ -473,9 +476,6 @@ int32 SpellEffectInfo::CalcValue(WorldObject const* caster, int32 const* bp, Uni
}
basePoints = int32(round(value));
if (Scaling.ComboPointsCoefficient)
comboDamage = Scaling.ComboPointsCoefficient * value;
}
else
{
@@ -516,7 +516,7 @@ int32 SpellEffectInfo::CalcValue(WorldObject const* caster, int32 const* bp, Uni
if (casterUnit)
{
// bonus amount from combo points
if (_spellInfo->HasAttribute(SPELL_ATTR1_FINISHING_MOVE_DAMAGE) && casterUnit->IsMovedByClient() && comboDamage)
if (_spellInfo->HasAttribute(SPELL_ATTR1_FINISHING_MOVE_DAMAGE) && casterUnit->IsMovedByClient() && comboDamage != 0.f)
if (uint8 comboPoints = casterUnit->GetGameClientMovingMe()->GetBasePlayer()->GetComboPoints())
value += comboDamage * comboPoints;