Core/Units: ported base attack time refactors from master branch
This commit is contained in:
1 parent
ab866ca985
commit
4539f848ac
14 files changed
+69
-45
No files matched your search
@@ -419,7 +419,7 @@ public:
|
||||
//models
|
||||
SetEquipmentSlots(false, EQUIP_ID_AXE, EQUIP_ID_AXE, EQUIP_NO_CHANGE);
|
||||
|
||||
me->SetAttackTime(OFF_ATTACK, (me->GetAttackTime(BASE_ATTACK)*150)/100);
|
||||
me->SetBaseAttackTime(OFF_ATTACK, (me->GetBaseAttackTime(BASE_ATTACK)*150)/100);
|
||||
me->SetCanDualWield(true);
|
||||
}
|
||||
}
|
||||
|
||||
@@ -69,7 +69,7 @@ class npc_pet_hunter_snake_trap : public CreatureScript
|
||||
|
||||
me->SetMaxHealth(uint32(107 * (me->getLevel() - 40) * 0.025f));
|
||||
// Add delta to make them not all hit the same time
|
||||
me->SetAttackTime(BASE_ATTACK, me->GetAttackTime(BASE_ATTACK) + urandms(0,6));
|
||||
me->SetBaseAttackTime(BASE_ATTACK, me->GetBaseAttackTime(BASE_ATTACK) + urandms(0,6));
|
||||
|
||||
if (!_isViper && !me->HasAura(SPELL_HUNTER_DEADLY_POISON_PASSIVE))
|
||||
DoCast(me, SPELL_HUNTER_DEADLY_POISON_PASSIVE, true);
|
||||
|
||||
@@ -888,7 +888,7 @@ class spell_pal_seal_of_righteousness : public AuraScript
|
||||
|
||||
float ap = target->GetTotalAttackPowerValue(BASE_ATTACK);
|
||||
int32 holy = target->SpellBaseDamageBonusDone(SPELL_SCHOOL_MASK_HOLY);
|
||||
int32 bp = int32((ap * 0.011f + 0.022f * holy) * target->GetAttackTime(BASE_ATTACK) / 1000);
|
||||
int32 bp = int32((ap * 0.011f + 0.022f * holy) * target->GetBaseAttackTime(BASE_ATTACK) / 1000);
|
||||
|
||||
if (target->GetDummyAuraEffect(SPELLFAMILY_PALADIN, PALADIN_ICON_ID_SEALS_OF_COMMAND, EFFECT_1))
|
||||
target->CastSpell(target, SPELL_PALADIN_SEAL_OF_RIGHTEOUSNESS_DAMAGE_AOE, CastSpellExtraArgs(aurEff).AddSpellBP0(bp));
|
||||
|
||||
@@ -1423,7 +1423,7 @@ class spell_sha_flametongue_weapon : public AuraScript
|
||||
return;
|
||||
|
||||
float basePoints = spell->Effects[EFFECT_1].CalcValue(player);
|
||||
float attackSpeed = player->GetAttackTime(attType) / 1000.f;
|
||||
float attackSpeed = player->GetBaseAttackTime(attType) / 1000.f;
|
||||
float fireDamage = basePoints / 100.0f;
|
||||
fireDamage *= attackSpeed;
|
||||
|
||||
@@ -1497,7 +1497,7 @@ class spell_sha_windfury_weapon : public AuraScript
|
||||
return;
|
||||
|
||||
int32 attackPower = spell->Effects[EFFECT_1].CalcValue(player);
|
||||
int32 amount = static_cast<int32>(attackPower / 14.f * player->GetAttackTime(attType) / 1000.f);
|
||||
int32 amount = static_cast<int32>(attackPower / 14.f * player->GetBaseAttackTime(attType) / 1000.f);
|
||||
uint32 spellId = attType == BASE_ATTACK ? SPELL_SHAMAN_WINDFURY_ATTACK_MAINHAND : SPELL_SHAMAN_WINDFURY_ATTACK_OFFHAND;
|
||||
|
||||
for (uint8 i = 0; i < 3; i++)
|
||||
|
||||
@@ -435,7 +435,7 @@ class spell_warr_rend : public AuraScript
|
||||
|
||||
// $0.25 * (($MWB + $mwb) / 2 + $AP / 14 * $MWS) bonus per tick
|
||||
float ap = caster->GetTotalAttackPowerValue(BASE_ATTACK);
|
||||
int32 mws = caster->GetAttackTime(BASE_ATTACK);
|
||||
int32 mws = caster->GetBaseAttackTime(BASE_ATTACK);
|
||||
float mwbMin = caster->GetWeaponDamageRange(BASE_ATTACK, MINDAMAGE);
|
||||
float mwbMax = caster->GetWeaponDamageRange(BASE_ATTACK, MAXDAMAGE);
|
||||
float mwb = ((mwbMin + mwbMax) / 2 + ap * mws / 14000) * 0.25f;
|
||||
|
||||
@@ -34,7 +34,7 @@ public:
|
||||
trigger_periodicAI(Creature* creature) : NullCreatureAI(creature)
|
||||
{
|
||||
spell = me->m_spells[0] ? sSpellMgr->GetSpellInfo(me->m_spells[0]) : nullptr;
|
||||
interval = me->GetAttackTime(BASE_ATTACK);
|
||||
interval = me->GetBaseAttackTime(BASE_ATTACK);
|
||||
timer = interval;
|
||||
}
|
||||
|
||||
|
||||
Reference in new issue
Block a user