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

Core/Spells: removed more unused parameters for 4.x since SPELL_AURA_MOD_CRIT_PERCENT_VERSUS is not used at all

Browse Source
This commit is contained in:
Ovahlord committed 2020-08-28 12:20:35 +02:00
1 parent dccd460088
commit 677990a1b8
4 files changed
+9 -9
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

src/server/game/Entities/Unit/Unit.cpp
+3 -3
View File
@@ -1282,7 +1282,7 @@ void Unit::CalculateSpellDamageTaken(SpellNonMeleeDamage* damageInfo, int32 dama
if (crit)
{
damageInfo->HitInfo |= SPELL_HIT_TYPE_CRIT;
damage = Unit::SpellCriticalDamageBonus(this, spellInfo, damage, victim);
damage = Unit::SpellCriticalDamageBonus(this, spellInfo, damage);
}
ApplyResilience(victim, &damage);
@@ -7267,7 +7267,7 @@ float Unit::SpellCritChanceTaken(Unit const* caster, SpellInfo const* spellInfo,
return std::max(crit_chance, 0.0f);
}
/*static*/ uint32 Unit::SpellCriticalDamageBonus(Unit const* caster, SpellInfo const* spellProto, uint32 damage, Unit* victim)
/*static*/ uint32 Unit::SpellCriticalDamageBonus(Unit const* caster, SpellInfo const* spellProto, uint32 damage)
{
// Calculate critical bonus
int32 crit_bonus = damage;
@@ -7307,7 +7307,7 @@ float Unit::SpellCritChanceTaken(Unit const* caster, SpellInfo const* spellInfo,
return crit_bonus;
}
/*static*/ uint32 Unit::SpellCriticalHealingBonus(Unit const* caster, SpellInfo const* spellProto, uint32 damage, Unit* victim)
/*static*/ uint32 Unit::SpellCriticalHealingBonus(Unit const* caster, SpellInfo const* spellProto, uint32 damage)
{
// Calculate critical bonus
int32 crit_bonus;
src/server/game/Entities/Unit/Unit.h
+2 -2
View File
@@ -1742,8 +1742,8 @@ class TC_GAME_API Unit : public WorldObject
bool isBlockCritical();
float SpellCritChanceDone(SpellInfo const* spellInfo, SpellSchoolMask schoolMask, WeaponAttackType attackType = BASE_ATTACK) const;
float SpellCritChanceTaken(Unit const* caster, SpellInfo const* spellInfo, SpellSchoolMask schoolMask, float doneChance, WeaponAttackType attackType = BASE_ATTACK) const;
static uint32 SpellCriticalDamageBonus(Unit const* caster, SpellInfo const* spellProto, uint32 damage, Unit* victim);
static uint32 SpellCriticalHealingBonus(Unit const* caster, SpellInfo const* spellProto, uint32 damage, Unit* victim);
static uint32 SpellCriticalDamageBonus(Unit const* caster, SpellInfo const* spellProto, uint32 damage);
static uint32 SpellCriticalHealingBonus(Unit const* caster, SpellInfo const* spellProto, uint32 damage);
uint32 GetCastingTimeForBonus(SpellInfo const* spellProto, DamageEffectType damagetype, uint32 CastingTime) const;
float CalculateDefaultCoefficient(SpellInfo const* spellInfo, DamageEffectType damagetype) const;
src/server/game/Spells/Auras/SpellAuraEffects.cpp
+3 -3
View File
@@ -5629,7 +5629,7 @@ void AuraEffect::HandlePeriodicDamageAurasTick(Unit* target, Unit* caster) const
bool crit = roll_chance_f(GetCritChanceFor(caster, target));
if (crit)
damage = Unit::SpellCriticalDamageBonus(caster, m_spellInfo, damage, target);
damage = Unit::SpellCriticalDamageBonus(caster, m_spellInfo, damage);
// Calculate armor mitigation
if (Unit::IsDamageReducedByArmor(GetSpellInfo()->GetSchoolMask(), GetSpellInfo(), GetEffIndex()))
@@ -5718,7 +5718,7 @@ void AuraEffect::HandlePeriodicHealthLeechAuraTick(Unit* target, Unit* caster) c
bool crit = roll_chance_f(GetCritChanceFor(caster, target));
if (crit)
damage = Unit::SpellCriticalDamageBonus(caster, m_spellInfo, damage, target);
damage = Unit::SpellCriticalDamageBonus(caster, m_spellInfo, damage);
// Calculate armor mitigation
if (Unit::IsDamageReducedByArmor(GetSpellInfo()->GetSchoolMask(), GetSpellInfo(), GetEffIndex()))
@@ -5887,7 +5887,7 @@ void AuraEffect::HandlePeriodicHealAurasTick(Unit* target, Unit* caster) const
bool crit = roll_chance_f(GetCritChanceFor(caster, target));
if (crit)
damage = Unit::SpellCriticalHealingBonus(caster, m_spellInfo, damage, target);
damage = Unit::SpellCriticalHealingBonus(caster, m_spellInfo, damage);
TC_LOG_DEBUG("spells.periodic", "PeriodicTick: %s heal of %s for %u health inflicted by %u",
GetCasterGUID().ToString().c_str(), target->GetGUID().ToString().c_str(), damage, GetId());
src/server/game/Spells/Spell.cpp
+1 -1
View File
@@ -2615,7 +2615,7 @@ void Spell::DoAllEffectOnTarget(TargetInfo* target)
if (crit)
{
hitMask |= PROC_HIT_CRITICAL;
addhealth = Unit::SpellCriticalHealingBonus(caster, m_spellInfo, addhealth, nullptr);
addhealth = Unit::SpellCriticalHealingBonus(caster, m_spellInfo, addhealth);
}
else
hitMask |= PROC_HIT_NORMAL;