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

*Allow healing mod auras to affect SPELL_DAMAGE_CLASS_NONE spells

Browse Source 
--HG--
branch : trunk
This commit is contained in:
QAston
2009-05-23 11:12:13 +02:00
parent 9af492483e
commit 4d9bce3270
1 changed files with 15 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/game/Unit.cpp
+15 -12
View File
@@ -9264,10 +9264,6 @@ uint32 Unit::SpellCriticalHealingBonus(SpellEntry const *spellProto, uint32 dama
uint32 Unit::SpellHealingBonus(Unit *pVictim, SpellEntry const *spellProto, uint32 healamount, DamageEffectType damagetype, uint32 stack) uint32 Unit::SpellHealingBonus(Unit *pVictim, SpellEntry const *spellProto, uint32 healamount, DamageEffectType damagetype, uint32 stack)
{ {
// No heal amount for this class spells
if (spellProto->DmgClass == SPELL_DAMAGE_CLASS_NONE)
return healamount;
// For totems get healing bonus from owner (statue isn't totem in fact) // For totems get healing bonus from owner (statue isn't totem in fact)
if( GetTypeId()==TYPEID_UNIT && ((Creature*)this)->isTotem()) if( GetTypeId()==TYPEID_UNIT && ((Creature*)this)->isTotem())
if(Unit* owner = GetOwner()) if(Unit* owner = GetOwner())
@@ -9351,15 +9347,22 @@ uint32 Unit::SpellHealingBonus(Unit *pVictim, SpellEntry const *spellProto, uint
int32 TakenAdvertisedBenefit = SpellBaseHealingBonusForVictim(GetSpellSchoolMask(spellProto), pVictim); int32 TakenAdvertisedBenefit = SpellBaseHealingBonusForVictim(GetSpellSchoolMask(spellProto), pVictim);
bool scripted = false; bool scripted = false;
for (uint8 i=0;i<3;++i)
// No heal coeff for this class spells
if (spellProto->DmgClass == SPELL_DAMAGE_CLASS_NONE)
scripted = true;
else
{ {
switch (spellProto->EffectApplyAuraName[i]) for (uint8 i=0;i<3;++i)
{ {
// These auras do not use healing coeff switch (spellProto->EffectApplyAuraName[i])
case SPELL_AURA_PERIODIC_LEECH: {
case SPELL_AURA_PERIODIC_HEALTH_FUNNEL: // These auras do not use healing coeff
scripted = true; case SPELL_AURA_PERIODIC_LEECH:
break; case SPELL_AURA_PERIODIC_HEALTH_FUNNEL:
scripted = true;
break;
}
} }
} }
@@ -12063,7 +12066,7 @@ void Unit::ProcDamageAndSpellFor( bool isVictim, Unit * pTarget, uint32 procFlag
bool useCharges= i->aura->GetAuraCharges()>0; bool useCharges= i->aura->GetAuraCharges()>0;
bool takeCharges = false; bool takeCharges = false;
SpellEntry const *spellInfo = i->aura->GetSpellProto(); SpellEntry const *spellInfo = i->aura->GetSpellProto();
uint32 Id=i->aura->GetId(); uint32 Id = i->aura->GetId();
// For players set spell cooldown if need // For players set spell cooldown if need
uint32 cooldown = 0; uint32 cooldown = 0;