mangos-mirror/server
0
0
Fork 0
mirror of https://github.com/mangosfour/server.git synced 2025-12-14 07:37:01 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

[7028] Code fix on client change

Browse source 
Remove not need code
Fix some SPELL_AURA_OVERRIDE_CLASS_SCRIPTS aura use

Signed-off-by: DiSlord <dislord@nomail.com>
This commit is contained in:
DiSlord 2009-01-05 02:43:30 +03:00
parent b64211c937
commit 791c54dd0b
2 changed files with 6 additions and 21 deletions
Download patch file Download diff file Expand all files Collapse all files

25
src/game/Unit.cpp
View file

@ -1665,7 +1665,7 @@ void Unit::CalcAbsorbResist(Unit *pVictim,SpellSchoolMask schoolMask, DamageEffe
{ {
if(Unit* caster = (*i)->GetCaster()) if(Unit* caster = (*i)->GetCaster())
{ {
AuraList const& vOverRideCS = caster->GetAurasByType(SPELL_AURA_OVERRIDE_CLASS_SCRIPTS); AuraList const& vOverRideCS = caster->GetAurasByType(SPELL_AURA_DUMMY);
for(AuraList::const_iterator k = vOverRideCS.begin(); k != vOverRideCS.end(); ++k) for(AuraList::const_iterator k = vOverRideCS.begin(); k != vOverRideCS.end(); ++k)
{ {
switch((*k)->GetModifier()->m_miscvalue) switch((*k)->GetModifier()->m_miscvalue)
@ -1673,8 +1673,6 @@ void Unit::CalcAbsorbResist(Unit *pVictim,SpellSchoolMask schoolMask, DamageEffe
case 5065: // Rank 1 case 5065: // Rank 1
case 5064: // Rank 2 case 5064: // Rank 2
case 5063: // Rank 3 case 5063: // Rank 3
case 5062: // Rank 4
case 5061: // Rank 5
{ {
if(RemainingDamage >= (*i)->GetModifier()->m_amount) if(RemainingDamage >= (*i)->GetModifier()->m_amount)
reflectDamage = (*i)->GetModifier()->m_amount * (*k)->GetModifier()->m_amount/100; reflectDamage = (*i)->GetModifier()->m_amount * (*k)->GetModifier()->m_amount/100;
@ -6866,7 +6864,7 @@ uint32 Unit::SpellDamageBonus(Unit *pVictim, SpellEntry const *spellProto, uint3
{ {
//Molten Fury //Molten Fury
case 4920: case 4919: case 4920: case 4919:
if(pVictim->HasAuraState(AURA_STATE_HEALTHLESS_20_PERCENT)) if(pVictim->HasAuraState(AURA_STATE_HEALTHLESS_35_PERCENT))
TakenTotalMod *= (100.0f+(*i)->GetModifier()->m_amount)/100.0f; break; TakenTotalMod *= (100.0f+(*i)->GetModifier()->m_amount)/100.0f; break;
} }
} }
@ -7253,11 +7251,9 @@ bool Unit::isSpellCrit(Unit *pVictim, SpellEntry const *spellProto, SpellSchoolM
{ {
switch((*i)->GetModifier()->m_miscvalue) switch((*i)->GetModifier()->m_miscvalue)
{ {
case 849: crit_chance+= 10.0f; break; //Shatter Rank 1 case 849: crit_chance+= 17.0f; break; //Shatter Rank 1
case 910: crit_chance+= 20.0f; break; //Shatter Rank 2 case 910: crit_chance+= 34.0f; break; //Shatter Rank 2
case 911: crit_chance+= 30.0f; break; //Shatter Rank 3 case 911: crit_chance+= 50.0f; break; //Shatter Rank 3
case 912: crit_chance+= 40.0f; break; //Shatter Rank 4
case 913: crit_chance+= 50.0f; break; //Shatter Rank 5
} }
} }
} }
@ -9849,17 +9845,6 @@ void Unit::ProcDamageAndSpellFor( bool isVictim, Unit * pTarget, uint32 procFlag
if (triggeredByAura->m_procCharges == 0) if (triggeredByAura->m_procCharges == 0)
removedSpells.push_back(triggeredByAura->GetId()); removedSpells.push_back(triggeredByAura->GetId());
break; break;
case SPELL_AURA_MELEE_ATTACK_POWER_ATTACKER_BONUS:
case SPELL_AURA_RANGED_ATTACK_POWER_ATTACKER_BONUS:
// Hunter's Mark (1-4 Rangs)
if (spellInfo->SpellFamilyName == SPELLFAMILY_HUNTER && (spellInfo->SpellFamilyFlags&0x0000000000000400LL))
{
uint32 basevalue = triggeredByAura->GetBasePoints();
auraModifier->m_amount += basevalue/10;
if (auraModifier->m_amount > basevalue*4)
auraModifier->m_amount = basevalue*4;
}
break;
case SPELL_AURA_MOD_CASTING_SPEED: case SPELL_AURA_MOD_CASTING_SPEED:
// Skip melee hits or instant cast spells // Skip melee hits or instant cast spells
if (procSpell == NULL || GetSpellCastTime(procSpell) == 0) if (procSpell == NULL || GetSpellCastTime(procSpell) == 0)

2
src/shared/revision_nr.h
View file

@ -1,4 +1,4 @@
#ifndef __REVISION_NR_H__ #ifndef __REVISION_NR_H__
#define __REVISION_NR_H__ #define __REVISION_NR_H__
#define REVISION_NR "7027" #define REVISION_NR "7028"
#endif // __REVISION_NR_H__ #endif // __REVISION_NR_H__