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

[7008] Remove not used in 303 aura states from code

Browse source 
Signed-off-by: DiSlord <dislord@nomail.com>
This commit is contained in:
DiSlord 2009-01-02 23:19:41 +03:00
parent 48d6043eed
commit dc8649a86a
6 changed files with 14 additions and 88 deletions
Download patch file Download diff file Expand all files Collapse all files

14
src/game/SharedDefines.h
View file

@ -691,20 +691,22 @@ enum AuraState
//AURA_STATE_UNKNOWN6 = 6, // | not used
AURA_STATE_HUNTER_PARRY = 7, // C |
AURA_STATE_ROGUE_ATTACK_FROM_STEALTH = 7, // C | FIX ME: not implemented yet!
//AURA_STATE_UNKNOWN7c = 7, // c | random/focused bursts spells (?)
//AURA_STATE_UNKNOWN7 = 7, // c | random/focused bursts spells (?)
//AURA_STATE_UNKNOWN8 = 8, // | not used
//AURA_STATE_UNKNOWN9 = 9, // | not used
AURA_STATE_WARRIOR_VICTORY_RUSH = 10, // C | warrior victory rush
AURA_STATE_HUNTER_CRIT_STRIKE = 10, // C | hunter crit strike
AURA_STATE_CRIT = 11, // C |
//AURA_STATE_UNKNOWN11 = 11, // t|
AURA_STATE_FAERIE_FIRE = 12, // c t|
AURA_STATE_HEALTHLESS_35_PERCENT = 13, // C T |
AURA_STATE_IMMOLATE = 14, // T |
AURA_STATE_SWIFTMEND = 15, // T |
AURA_STATE_DEADLY_POISON = 16, // T |
AURA_STATE_FORBEARANCE = 17, // c t|
AURA_STATE_WEAKENED_SOUL = 18, // t|
AURA_STATE_HYPOTHERMIA = 19, // c |
//AURA_STATE_UNKNOWN17 = 17, // C |
//AURA_STATE_UNKNOWN18 = 18, // C t|
//AURA_STATE_UNKNOWN19 = 19, // | not used
//AURA_STATE_UNKNOWN20 = 20, // c | only (45317 Suicide)
//AURA_STATE_UNKNOWN21 = 21, // | not used
//AURA_STATE_UNKNOWN22 = 22, // C | not implemented yet (Requires Evasive Charges to use)
AURA_STATE_HEALTH_ABOVE_75_PERCENT = 23, // C | not implemented yet
};

17
src/game/SpellAuras.cpp
View file

@ -2196,12 +2196,6 @@ void Aura::HandleAuraDummy(bool apply, bool Real)
}
case SPELLFAMILY_MAGE:
{
// Hypothermia
if( GetId()==41425 )
{
m_target->ModifyAuraState(AURA_STATE_HYPOTHERMIA,apply);
return;
}
break;
}
case SPELLFAMILY_DRUID:
@ -3843,17 +3837,6 @@ void Aura::HandleModMechanicImmunity(bool apply, bool Real)
m_target->ApplySpellImmune(GetId(),IMMUNITY_MECHANIC,m_modifier.m_miscvalue,apply);
// special cases
switch(m_modifier.m_miscvalue)
{
case MECHANIC_INVULNERABILITY:
m_target->ModifyAuraState(AURA_STATE_FORBEARANCE,apply);
break;
case MECHANIC_SHIELD:
m_target->ModifyAuraState(AURA_STATE_WEAKENED_SOUL,apply);
break;
}
// Bestial Wrath
if ( GetSpellProto()->SpellFamilyName == SPELLFAMILY_HUNTER && GetSpellProto()->SpellIconID == 1680)
{

34
src/game/SpellEffects.cpp
View file

@ -1459,32 +1459,6 @@ void Spell::EffectDummy(uint32 i)
m_damage+= damage;
return;
}
// Kill command
if(m_spellInfo->SpellFamilyFlags & 0x00080000000000LL)
{
if(m_caster->getClass()!=CLASS_HUNTER)
return;
// clear hunter crit aura state
m_caster->ModifyAuraState(AURA_STATE_HUNTER_CRIT_STRIKE,false);
// additional damage from pet to pet target
Pet* pet = m_caster->GetPet();
if(!pet || !pet->getVictim())
return;
uint32 spell_id = 0;
switch (m_spellInfo->Id)
{
case 34026: spell_id = 34027; break; // rank 1
default:
sLog.outError("Spell::EffectDummy: Spell %u not handled in KC",m_spellInfo->Id);
return;
}
pet->CastSpell(pet->getVictim(), spell_id, true);
return;
}
switch(m_spellInfo->Id)
{
@ -2225,13 +2199,7 @@ void Spell::EffectApplyAura(uint32 i)
if(unitTarget->GetTypeId()==TYPEID_PLAYER) // Negative buff should only be applied on players
{
uint32 spellId = 0;
if(m_spellInfo->CasterAuraStateNot==AURA_STATE_WEAKENED_SOUL || m_spellInfo->TargetAuraStateNot==AURA_STATE_WEAKENED_SOUL)
spellId = 6788; // Weakened Soul
else if(m_spellInfo->CasterAuraStateNot==AURA_STATE_FORBEARANCE || m_spellInfo->TargetAuraStateNot==AURA_STATE_FORBEARANCE)
spellId = 25771; // Forbearance
else if(m_spellInfo->CasterAuraStateNot==AURA_STATE_HYPOTHERMIA)
spellId = 41425; // Hypothermia
else if (m_spellInfo->Mechanic == MECHANIC_BANDAGE) // Bandages
if (m_spellInfo->Mechanic == MECHANIC_BANDAGE) // Bandages
spellId = 11196; // Recently Bandaged
else if( (m_spellInfo->AttributesEx & 0x20) && (m_spellInfo->AttributesEx2 & 0x20000) )
spellId = 23230; // Blood Fury - Healing Reduction

25
src/game/Unit.cpp
View file

@ -9721,17 +9721,6 @@ void Unit::ProcDamageAndSpellFor( bool isVictim, Unit * pTarget, uint32 procFlag
((Player*)this)->AddComboPoints(pTarget, 1);
StartReactiveTimer( REACTIVE_OVERPOWER );
}
// Enable AURA_STATE_CRIT on crit
if (procExtra & PROC_EX_CRITICAL_HIT)
{
ModifyAuraState(AURA_STATE_CRIT, true);
StartReactiveTimer( REACTIVE_CRIT );
if(getClass()==CLASS_HUNTER)
{
ModifyAuraState(AURA_STATE_HUNTER_CRIT_STRIKE, true);
StartReactiveTimer( REACTIVE_HUNTER_CRIT );
}
}
}
}
}
@ -10172,7 +10161,6 @@ void Unit::ClearComboPointHolders()
void Unit::ClearAllReactives()
{
for(int i=0; i < MAX_REACTIVE; ++i)
m_reactiveTimer[i] = 0;
@ -10180,11 +10168,6 @@ void Unit::ClearAllReactives()
ModifyAuraState(AURA_STATE_DEFENSE, false);
if (getClass() == CLASS_HUNTER && HasAuraState( AURA_STATE_HUNTER_PARRY))
ModifyAuraState(AURA_STATE_HUNTER_PARRY, false);
if (HasAuraState( AURA_STATE_CRIT))
ModifyAuraState(AURA_STATE_CRIT, false);
if (getClass() == CLASS_HUNTER && HasAuraState( AURA_STATE_HUNTER_CRIT_STRIKE) )
ModifyAuraState(AURA_STATE_HUNTER_CRIT_STRIKE, false);
if(getClass() == CLASS_WARRIOR && GetTypeId() == TYPEID_PLAYER)
((Player*)this)->ClearComboPoints();
}
@ -10212,14 +10195,6 @@ void Unit::UpdateReactives( uint32 p_time )
if ( getClass() == CLASS_HUNTER && HasAuraState(AURA_STATE_HUNTER_PARRY))
ModifyAuraState(AURA_STATE_HUNTER_PARRY, false);
break;
case REACTIVE_CRIT:
if (HasAuraState(AURA_STATE_CRIT))
ModifyAuraState(AURA_STATE_CRIT, false);
break;
case REACTIVE_HUNTER_CRIT:
if ( getClass() == CLASS_HUNTER && HasAuraState(AURA_STATE_HUNTER_CRIT_STRIKE) )
ModifyAuraState(AURA_STATE_HUNTER_CRIT_STRIKE, false);
break;
case REACTIVE_OVERPOWER:
if(getClass() == CLASS_WARRIOR && GetTypeId() == TYPEID_PLAYER)
((Player*)this)->ClearComboPoints();

10
src/game/Unit.h
View file

@ -743,14 +743,12 @@ struct CharmInfo
enum ReactiveType
{
REACTIVE_DEFENSE = 1,
REACTIVE_HUNTER_PARRY = 2,
REACTIVE_CRIT = 3,
REACTIVE_HUNTER_CRIT = 4,
REACTIVE_OVERPOWER = 5
REACTIVE_DEFENSE = 0,
REACTIVE_HUNTER_PARRY = 1,
REACTIVE_OVERPOWER = 2
};
#define MAX_REACTIVE 6
#define MAX_REACTIVE 3
#define MAX_TOTEM 4
// delay time next attack to prevent client attack animation problems

2
src/shared/revision_nr.h
View file

@ -1,4 +1,4 @@
#ifndef __REVISION_NR_H__
#define __REVISION_NR_H__
#define REVISION_NR "7007"
#define REVISION_NR "7008"
#endif // __REVISION_NR_H__