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

Core/Spells: fixed combo points damage calculation

Browse Source 
* added GameTable class to simplify access to game table values
This commit is contained in:
Ovahlord committed 2025-06-07 11:40:18 +02:00
1 parent 4524c29f2c
commit 96975fcd6b
6 files changed
+117 -45
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

src/server/scripts/Spells/spell_rogue.cpp
+10 -22
View File
@@ -875,30 +875,18 @@ class spell_rog_eviscerate : public SpellScript
return true;
}
void ChangeDamage(SpellEffIndex /*effIndex*/)
void CalculateDamage(Unit* victim, int32& /*damage*/, int32& flatMod, float& pctMod)
{
Unit* caster = GetCaster();
Unit* target = GetHitUnit();
if (!caster || !target)
return;
Player const* playerCaster = GetCaster()->ToPlayer();
uint8 comboPoints = playerCaster->GetComboPoints();
flatMod += static_cast<int32>(comboPoints * playerCaster->GetTotalAttackPowerValue(BASE_ATTACK) * 0.091f);
if (Player* player = caster->ToPlayer())
{
int32 damage = GetEffectValue();
damage += int32(player->GetComboPoints() * (player->GetTotalAttackPowerValue(BASE_ATTACK) * 0.091f));
// Eviscerate and Envenom Bonus Damage (item set effect)
if (AuraEffect* aurEff = playerCaster->GetAuraEffect(SPELL_ROGUE_EVISCERATE_AND_ENVENOM_BONUS_DAMAGE, EFFECT_0))
flatMod += comboPoints * aurEff->GetAmount();
// Eviscerate and Envenom Bonus Damage (item set effect)
if (AuraEffect* aurEff = caster->GetAuraEffect(SPELL_ROGUE_EVISCERATE_AND_ENVENOM_BONUS_DAMAGE, EFFECT_0))
damage += player->GetComboPoints() * aurEff->GetAmount();
if (AuraEffect* const revealingStrike = target->GetAuraEffect(SPELL_ROGUE_REVEALING_STRIKE, EFFECT_2, caster->GetGUID()))
{
damage += CalculatePct(damage, revealingStrike->GetAmount());
revealingStrike->GetBase()->Remove();
}
SetEffectValue(damage);
}
if (AuraEffect* const revealingStrike = victim->GetAuraEffect(SPELL_ROGUE_REVEALING_STRIKE, EFFECT_2, playerCaster->GetGUID()))
AddPct(pctMod, revealingStrike->GetAmount());
}
void HandleSerratedBlades(SpellEffIndex /*effIndex*/)
@@ -916,7 +904,7 @@ class spell_rog_eviscerate : public SpellScript
void Register() override
{
OnEffectLaunchTarget.Register(&spell_rog_eviscerate::ChangeDamage, EFFECT_0, SPELL_EFFECT_SCHOOL_DAMAGE);
CalcDamage.Register(&spell_rog_eviscerate::CalculateDamage);
OnEffectHitTarget.Register(&spell_rog_eviscerate::HandleSerratedBlades, EFFECT_0, SPELL_EFFECT_SCHOOL_DAMAGE);
}
};