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

Core/Spells:

Browse Source 
* fixed Kill Command
* fixed Improved Kill Command crit chance bonus
* fixed Frenzy not triggering Focus Fire's visual effect correctly

closes #78
This commit is contained in:
Ovahlord committed 2020-07-17 16:21:37 +02:00
1 parent fc4e2e4203
commit 405569dbff
3 files changed
+48 -4
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

src/server/game/Entities/Unit/Unit.cpp
+12 -1
View File
@@ -6714,6 +6714,10 @@ uint32 Unit::SpellDamageBonusDone(Unit* victim, SpellInfo const* spellProto, uin
// Hunter Pet basic attacks (RAP * 0.4 * 0.2)
if (spellProto->SpellFamilyFlags[0] & 0x00080000)
DoneTotal += (owner->GetTotalAttackPowerValue(RANGED_ATTACK) * 0.4f) * 0.2f;
// Kill Command
if (spellProto->SpellFamilyFlags[1] & 0x00000800)
DoneTotal += owner->GetTotalAttackPowerValue(RANGED_ATTACK) * 0.516f;
break;
case SPELLFAMILY_WARLOCK:
// Warlock Minions inherit 50% of their owner's spell power
@@ -7282,7 +7286,7 @@ float Unit::GetUnitSpellCriticalChance(Unit* victim, SpellInfo const* spellProto
&& spellProto->SpellIconID == 1680
&& victim->HasAuraState(AURA_STATE_BLEEDING))
{
if (AuraEffect const* rendAndTear = GetDummyAuraEffect(SPELLFAMILY_DRUID, 2859, 1))
if (AuraEffect const* rendAndTear = GetDummyAuraEffect(SPELLFAMILY_DRUID, 2859, EFFECT_1))
crit_chance += rendAndTear->GetAmount();
break;
}
@@ -7294,6 +7298,13 @@ float Unit::GetUnitSpellCriticalChance(Unit* victim, SpellInfo const* spellProto
if (victim->GetHealthPct() >= healthAuraEff->GetAmount())
crit_chance += critAuraEff->GetAmount();
break;
case SPELLFAMILY_HUNTER:
// Kill Command - Improved Kill Command
if (spellProto->SpellFamilyFlags[1] & 0x00000800)
if (Player* player = GetSpellModOwner())
if (AuraEffect const* improvedKillCommand = player->GetDummyAuraEffect(SPELLFAMILY_HUNTER, 2221, EFFECT_0))
crit_chance += improvedKillCommand->GetAmount();
break;
}
}
/* fallthrough - Calculate critical strike chance for both Ranged and Melee spells*/