From 114db3b9a47b0f91aab2c61aae430a3a023a7255 Mon Sep 17 00:00:00 2001 From: Aokromes Date: Fri, 21 Oct 2016 07:27:15 +0200 Subject: [PATCH] Revert "Core/Spells: Calculate hitMask and store it in DamageInfo/HealInfo structures" This reverts commit a3e5afc027e1a83401016e2aed9f0c6346d4c3e4. --- src/server/game/Entities/Unit/Unit.cpp | 99 ++++---------------------- src/server/game/Entities/Unit/Unit.h | 23 +++--- 2 files changed, 25 insertions(+), 97 deletions(-) diff --git a/src/server/game/Entities/Unit/Unit.cpp b/src/server/game/Entities/Unit/Unit.cpp index 9f6144b03b..8e0fee9ab4 100644 --- a/src/server/game/Entities/Unit/Unit.cpp +++ b/src/server/game/Entities/Unit/Unit.cpp @@ -103,63 +103,21 @@ static bool isAlwaysTriggeredAura[TOTAL_AURAS]; // Prepare lists static bool procPrepared = InitTriggerAuraData(); -DamageInfo::DamageInfo(Unit* attacker, Unit* victim, uint32 damage, SpellInfo const* spellInfo, SpellSchoolMask schoolMask, DamageEffectType damageType, WeaponAttackType attackType) - : m_attacker(attacker), m_victim(victim), m_damage(damage), m_spellInfo(spellInfo), m_schoolMask(schoolMask), m_damageType(damageType), m_attackType(attackType), - m_absorb(0), m_resist(0), m_block(0), m_hitMask(0) +DamageInfo::DamageInfo(Unit* _attacker, Unit* _victim, uint32 _damage, SpellInfo const* _spellInfo, SpellSchoolMask _schoolMask, DamageEffectType _damageType) +: m_attacker(_attacker), m_victim(_victim), m_damage(_damage), m_spellInfo(_spellInfo), m_schoolMask(_schoolMask), +m_damageType(_damageType), m_attackType(BASE_ATTACK) { + m_absorb = 0; + m_resist = 0; + m_block = 0; } - -DamageInfo::DamageInfo(CalcDamageInfo const& dmgInfo) - : m_attacker(dmgInfo.attacker), m_victim(dmgInfo.target), m_damage(dmgInfo.damage), m_spellInfo(nullptr), m_schoolMask(SpellSchoolMask(dmgInfo.damageSchoolMask)), - m_damageType(DIRECT_DAMAGE), m_attackType(dmgInfo.attackType), m_absorb(dmgInfo.absorb), m_resist(dmgInfo.resist), m_block(dmgInfo.blocked_amount), m_hitMask(0) +DamageInfo::DamageInfo(CalcDamageInfo& dmgInfo) +: m_attacker(dmgInfo.attacker), m_victim(dmgInfo.target), m_damage(dmgInfo.damage), m_spellInfo(NULL), m_schoolMask(SpellSchoolMask(dmgInfo.damageSchoolMask)), +m_damageType(DIRECT_DAMAGE), m_attackType(dmgInfo.attackType) { - switch (dmgInfo.TargetState) - { - case VICTIMSTATE_IS_IMMUNE: - m_hitMask |= PROC_HIT_IMMUNE; - break; - case VICTIMSTATE_BLOCKS: - m_hitMask |= PROC_HIT_FULL_BLOCK; - break; - } - - if (m_absorb) - m_hitMask |= PROC_HIT_ABSORB; - - if (dmgInfo.HitInfo & HITINFO_FULL_RESIST) - m_hitMask |= PROC_HIT_FULL_RESIST; - - if (m_block) - m_hitMask |= PROC_HIT_BLOCK; - - switch (dmgInfo.hitOutCome) - { - case MELEE_HIT_MISS: - m_hitMask |= PROC_HIT_MISS; - break; - case MELEE_HIT_DODGE: - m_hitMask |= PROC_HIT_DODGE; - break; - case MELEE_HIT_PARRY: - m_hitMask |= PROC_HIT_PARRY; - break; - case MELEE_HIT_EVADE: - m_hitMask |= PROC_HIT_EVADE; - break; - default: - break; - } -} - -DamageInfo::DamageInfo(SpellNonMeleeDamage const& spellNonMeleeDamage, DamageEffectType damageType, WeaponAttackType attackType) - : m_attacker(spellNonMeleeDamage.attacker), m_victim(spellNonMeleeDamage.target), m_damage(spellNonMeleeDamage.damage), - m_spellInfo(sSpellMgr->GetSpellInfo(spellNonMeleeDamage.SpellID)), m_schoolMask(SpellSchoolMask(spellNonMeleeDamage.schoolMask)), m_damageType(damageType), - m_attackType(attackType), m_absorb(spellNonMeleeDamage.absorb), m_resist(spellNonMeleeDamage.resist), m_block(spellNonMeleeDamage.blocked), m_hitMask(0) -{ - if (spellNonMeleeDamage.blocked) - m_hitMask |= PROC_HIT_BLOCK; - if (spellNonMeleeDamage.absorb) - m_hitMask |= PROC_HIT_ABSORB; + m_absorb = 0; + m_resist = 0; + m_block = 0; } void DamageInfo::ModifyDamage(int32 amount) @@ -173,7 +131,6 @@ void DamageInfo::AbsorbDamage(uint32 amount) amount = std::min(amount, GetDamage()); m_absorb += amount; m_damage -= amount; - m_hitMask |= PROC_HIT_ABSORB; } void DamageInfo::ResistDamage(uint32 amount) @@ -181,8 +138,6 @@ void DamageInfo::ResistDamage(uint32 amount) amount = std::min(amount, GetDamage()); m_resist += amount; m_damage -= amount; - if (!m_damage) - m_hitMask |= PROC_HIT_FULL_RESIST; } void DamageInfo::BlockDamage(uint32 amount) @@ -190,32 +145,6 @@ void DamageInfo::BlockDamage(uint32 amount) amount = std::min(amount, GetDamage()); m_block += amount; m_damage -= amount; - m_hitMask |= PROC_HIT_BLOCK; - if (!m_damage) - m_hitMask |= PROC_HIT_FULL_BLOCK; -} - -uint32 DamageInfo::GetHitMask() const -{ - return m_hitMask; -} - -HealInfo::HealInfo(Unit* healer, Unit* target, uint32 heal, SpellInfo const* spellInfo, SpellSchoolMask schoolMask) - : _healer(healer), _target(target), _heal(heal), _absorb(0), _spellInfo(spellInfo), _schoolMask(schoolMask), _hitMask(0) -{ -} - -void HealInfo::AbsorbHeal(uint32 amount) -{ - amount = std::min(amount, GetHeal()); - _absorb += amount; - _heal -= amount; - _hitMask |= PROC_HIT_ABSORB; -} - -uint32 HealInfo::GetHitMask() const -{ - return _hitMask; } ProcEventInfo::ProcEventInfo(Unit* actor, Unit* actionTarget, Unit* procTarget, @@ -1682,7 +1611,7 @@ void Unit::CalcAbsorbResist(Unit* victim, SpellSchoolMask schoolMask, DamageEffe if (!victim || !victim->IsAlive() || !damage) return; - DamageInfo dmgInfo = DamageInfo(this, victim, damage, spellInfo, schoolMask, damagetype, BASE_ATTACK); + DamageInfo dmgInfo = DamageInfo(this, victim, damage, spellInfo, schoolMask, damagetype); uint32 spellResistance = CalcSpellResistance(victim, schoolMask, spellInfo); dmgInfo.ResistDamage(CalculatePct(damage, spellResistance)); @@ -12827,7 +12756,7 @@ void Unit::ProcDamageAndSpellFor(bool isVictim, Unit* target, uint32 procFlag, u Unit* actor = isVictim ? target : this; Unit* actionTarget = !isVictim ? target : this; - DamageInfo damageInfo = DamageInfo(actor, actionTarget, damage, procSpell, procSpell ? SpellSchoolMask(procSpell->SchoolMask) : SPELL_SCHOOL_MASK_NORMAL, SPELL_DIRECT_DAMAGE, attType); + DamageInfo damageInfo = DamageInfo(actor, actionTarget, damage, procSpell, procSpell ? SpellSchoolMask(procSpell->SchoolMask) : SPELL_SCHOOL_MASK_NORMAL, SPELL_DIRECT_DAMAGE); HealInfo healInfo = HealInfo(actor, actionTarget, damage, procSpell, procSpell ? SpellSchoolMask(procSpell->SchoolMask) : SPELL_SCHOOL_MASK_NORMAL); ProcEventInfo eventInfo = ProcEventInfo(actor, actionTarget, target, procFlag, 0, 0, procExtra, nullptr, &damageInfo, &healInfo); diff --git a/src/server/game/Entities/Unit/Unit.h b/src/server/game/Entities/Unit/Unit.h index 686dd62c1e..cfceaffe8c 100644 --- a/src/server/game/Entities/Unit/Unit.h +++ b/src/server/game/Entities/Unit/Unit.h @@ -881,11 +881,9 @@ private: uint32 m_absorb; uint32 m_resist; uint32 m_block; - uint32 m_hitMask; public: - DamageInfo(Unit* attacker, Unit* victim, uint32 damage, SpellInfo const* spellInfo, SpellSchoolMask schoolMask, DamageEffectType damageType, WeaponAttackType attackType); - explicit DamageInfo(CalcDamageInfo const& dmgInfo); - DamageInfo(SpellNonMeleeDamage const& spellNonMeleeDamage, DamageEffectType damageType, WeaponAttackType attackType); + explicit DamageInfo(Unit* _attacker, Unit* _victim, uint32 _damage, SpellInfo const* _spellInfo, SpellSchoolMask _schoolMask, DamageEffectType _damageType); + explicit DamageInfo(CalcDamageInfo& dmgInfo); void ModifyDamage(int32 amount); void AbsorbDamage(uint32 amount); @@ -902,11 +900,9 @@ public: uint32 GetAbsorb() const { return m_absorb; } uint32 GetResist() const { return m_resist; } uint32 GetBlock() const { return m_block; } - - uint32 GetHitMask() const; }; -class TC_GAME_API HealInfo +class HealInfo { private: Unit* const _healer; @@ -915,12 +911,17 @@ private: uint32 _absorb; SpellInfo const* const _spellInfo; SpellSchoolMask const _schoolMask; - uint32 _hitMask; public: - explicit HealInfo(Unit* healer, Unit* target, uint32 heal, SpellInfo const* spellInfo, SpellSchoolMask schoolMask); + explicit HealInfo(Unit* healer, Unit* target, uint32 heal, SpellInfo const* spellInfo, SpellSchoolMask schoolMask) + : _healer(healer), _target(target), _heal(heal), _absorb(0), _spellInfo(spellInfo), _schoolMask(schoolMask) { } - void AbsorbHeal(uint32 amount); + void AbsorbHeal(uint32 amount) + { + amount = std::min(amount, GetHeal()); + _absorb += amount; + _heal -= amount; + } Unit* GetHealer() const { return _healer; } Unit* GetTarget() const { return _target; } @@ -928,8 +929,6 @@ public: uint32 GetAbsorb() const { return _absorb; } SpellInfo const* GetSpellInfo() const { return _spellInfo; }; SpellSchoolMask GetSchoolMask() const { return _schoolMask; }; - - uint32 GetHitMask() const; }; class TC_GAME_API ProcEventInfo