josh/TCPlayerbotCore
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Update code for 44394 and ranks. by Vladimir.

Browse Source 
--HG--
branch : trunk
This commit is contained in:
n0n4m3
2010-04-11 13:24:12 +04:00
parent ab6e30b9c8
commit 98e0da92ca
1 changed files with 16 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/game/Unit.cpp
+16 -5
View File
@@ -1701,6 +1701,10 @@ void Unit::CalcAbsorbResist(Unit *pVictim, SpellSchoolMask schoolMask, DamageEff
// Need remove expired auras after // Need remove expired auras after
bool existExpired = false; bool existExpired = false;
TriggeredSpellInfoVct triggeredSpells; TriggeredSpellInfoVct triggeredSpells;
// Incanter's Absorption, for converting to spell power
int32 incanterAbsorption = 0;
// absorb without mana cost // absorb without mana cost
AuraEffectList const& vSchoolAbsorb = pVictim->GetAuraEffectsByType(SPELL_AURA_SCHOOL_ABSORB); AuraEffectList const& vSchoolAbsorb = pVictim->GetAuraEffectsByType(SPELL_AURA_SCHOOL_ABSORB);
for (AuraEffectList::const_iterator i = vSchoolAbsorb.begin(); i != vSchoolAbsorb.end() && RemainingDamage > 0; ++i) for (AuraEffectList::const_iterator i = vSchoolAbsorb.begin(); i != vSchoolAbsorb.end() && RemainingDamage > 0; ++i)
@@ -1950,6 +1954,11 @@ void Unit::CalcAbsorbResist(Unit *pVictim, SpellSchoolMask schoolMask, DamageEff
RemainingDamage -= currentAbsorb; RemainingDamage -= currentAbsorb;
// Fire Ward or Frost Ward or Ice Barrier (or Mana Shield)
// for Incanter's Absorption converting to spell power
if (spellProto->SpellFamilyName == SPELLFAMILY_MAGE && spellProto->SpellFamilyFlags[2] & 0x000008)
incanterAbsorption += currentAbsorb;
// Reduce shield amount // Reduce shield amount
(*i)->SetAmount((*i)->GetAmount() -currentAbsorb); (*i)->SetAmount((*i)->GetAmount() -currentAbsorb);
// Need remove it later // Need remove it later
@@ -2015,6 +2024,11 @@ void Unit::CalcAbsorbResist(Unit *pVictim, SpellSchoolMask schoolMask, DamageEff
pVictim->ApplyPowerMod(POWER_MANA, manaReduction, false); pVictim->ApplyPowerMod(POWER_MANA, manaReduction, false);
} }
// Mana Shield (or Fire Ward or Frost Ward or Ice Barrier)
// for Incanter's Absorption converting to spell power
if ((*i)->GetSpellProto()->SpellFamilyName == SPELLFAMILY_MAGE && (*i)->GetSpellProto()->SpellFamilyFlags[2] & 0x000008)
incanterAbsorption += currentAbsorb;
(*i)->SetAmount((*i)->GetAmount()-currentAbsorb); (*i)->SetAmount((*i)->GetAmount()-currentAbsorb);
if ((*i)->GetAmount() <= 0) if ((*i)->GetAmount() <= 0)
{ {
@@ -2137,7 +2151,8 @@ void Unit::CalcAbsorbResist(Unit *pVictim, SpellSchoolMask schoolMask, DamageEff
*absorb = RemainingDamage > 0 ? (damage - RemainingDamage - *resist) : (damage - *resist); *absorb = RemainingDamage > 0 ? (damage - RemainingDamage - *resist) : (damage - *resist);
if (*absorb) // Incanter's Absorption, if have affective absorbing
if (incanterAbsorption)
{ {
// Incanter's Absorption // Incanter's Absorption
// TODO: move this code to procflag // TODO: move this code to procflag
@@ -2151,10 +2166,6 @@ void Unit::CalcAbsorbResist(Unit *pVictim, SpellSchoolMask schoolMask, DamageEff
current_dmg += bonusEff->GetAmount(); current_dmg += bonusEff->GetAmount();
int32 new_dmg = (int32)*absorb * aurEff->GetAmount() / 100; int32 new_dmg = (int32)*absorb * aurEff->GetAmount() / 100;
int32 max_dmg = (int32)pVictim->GetMaxHealth() * 5 / 100;
// Do not apply more auras if more than 5% hp
if (current_dmg + new_dmg > max_dmg)
new_dmg = max_dmg - current_dmg;
if (new_dmg > 0) if (new_dmg > 0)
pVictim->CastCustomSpell(pVictim, 44413, &new_dmg, NULL, NULL, true); pVictim->CastCustomSpell(pVictim, 44413, &new_dmg, NULL, NULL, true);
} }