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

[11105] Melee attacks distance

Browse source 
Inspired by patch provided by Feanordev.

Signed-off-by: VladimirMangos <vladimir@getmangos.com>
This commit is contained in:
Schmoozerd 2011-02-03 00:35:53 +03:00 • committed by VladimirMangos
parent aa4c1be8cf
commit 8e68d1bcaf
13 changed files with 77 additions and 43 deletions
Download patch file Download diff file Expand all files Collapse all files

2
src/game/AggressorAI.cpp
View file

@ -129,7 +129,7 @@ AggressorAI::UpdateAI(const uint32 /*diff*/)
if( m_creature->isAttackReady() )
{
if( m_creature->IsWithinDistInMap(m_creature->getVictim(), ATTACK_DISTANCE))
if (m_creature->CanReachWithMeleeAttack(m_creature->getVictim()))
{
m_creature->AttackerStateUpdate(m_creature->getVictim());
m_creature->resetAttackTimer();

2
src/game/CreatureEventAI.cpp
View file

@ -1370,7 +1370,7 @@ void CreatureEventAI::DoMeleeAttackIfReady()
if (m_creature->isAttackReady())
{
//If we are within range melee the target
if (m_creature->IsWithinDistInMap(m_creature->getVictim(), ATTACK_DISTANCE))
if (m_creature->CanReachWithMeleeAttack(m_creature->getVictim()))
{
m_creature->AttackerStateUpdate(m_creature->getVictim());
m_creature->resetAttackTimer();

2
src/game/GuardAI.cpp
View file

@ -115,7 +115,7 @@ void GuardAI::UpdateAI(const uint32 /*diff*/)
if (m_creature->isAttackReady())
{
if (m_creature->IsWithinDistInMap(m_creature->getVictim(), ATTACK_DISTANCE))
if (m_creature->CanReachWithMeleeAttack(m_creature->getVictim()))
{
m_creature->AttackerStateUpdate(m_creature->getVictim());
m_creature->resetAttackTimer();

11
src/game/PetAI.cpp
View file

@ -145,7 +145,10 @@ void PetAI::UpdateAI(const uint32 diff)
_stopAttack();
return;
}
else if (m_creature->IsStopped() || m_creature->IsWithinDistInMap(m_creature->getVictim(), ATTACK_DISTANCE))
bool meleeReach = m_creature->CanReachWithMeleeAttack(m_creature->getVictim());
if (m_creature->IsStopped() || meleeReach)
{
// required to be stopped cases
if (m_creature->IsStopped() && m_creature->IsNonMeleeSpellCasted(false))
@ -156,7 +159,7 @@ void PetAI::UpdateAI(const uint32 diff)
return;
}
// not required to be stopped case
else if (m_creature->isAttackReady() && m_creature->canReachWithAttack(m_creature->getVictim()))
else if (m_creature->isAttackReady() && meleeReach)
{
m_creature->AttackerStateUpdate(m_creature->getVictim());
@ -168,7 +171,7 @@ void PetAI::UpdateAI(const uint32 diff)
//if pet misses its target, it will also be the first in threat list
m_creature->getVictim()->AddThreat(m_creature);
if( _needToStop() )
if (_needToStop())
_stopAttack();
}
}
@ -350,6 +353,6 @@ void PetAI::AttackedBy(Unit *attacker)
{
//when attacked, fight back in case 1)no victim already AND 2)not set to passive AND 3)not set to stay, unless can it can reach attacker with melee attack anyway
if(!m_creature->getVictim() && m_creature->GetCharmInfo() && !m_creature->GetCharmInfo()->HasReactState(REACT_PASSIVE) &&
(!m_creature->GetCharmInfo()->HasCommandState(COMMAND_STAY) || m_creature->canReachWithAttack(attacker)))
(!m_creature->GetCharmInfo()->HasCommandState(COMMAND_STAY) || m_creature->CanReachWithMeleeAttack(attacker)))
AttackStart(attacker);
}

24
src/game/Player.cpp
View file

@ -1269,24 +1269,22 @@ void Player::Update( uint32 update_diff, uint32 p_time )
// default combat reach 10
// TODO add weapon,skill check
float pldistance = ATTACK_DISTANCE;
if (isAttackReady(BASE_ATTACK))
{
if(!IsWithinDistInMap(pVictim, pldistance))
if (!CanReachWithMeleeAttack(pVictim))
{
setAttackTimer(BASE_ATTACK,100);
if(m_swingErrorMsg != 1) // send single time (client auto repeat)
if (m_swingErrorMsg != 1) // send single time (client auto repeat)
{
SendAttackSwingNotInRange();
m_swingErrorMsg = 1;
}
}
//120 degrees of radiant range
else if( !HasInArc( 2*M_PI_F/3, pVictim ))
else if (!HasInArc(2*M_PI_F/3, pVictim))
{
setAttackTimer(BASE_ATTACK,100);
if(m_swingErrorMsg != 2) // send single time (client auto repeat)
if (m_swingErrorMsg != 2) // send single time (client auto repeat)
{
SendAttackSwingBadFacingAttack();
m_swingErrorMsg = 2;
@ -1297,7 +1295,7 @@ void Player::Update( uint32 update_diff, uint32 p_time )
m_swingErrorMsg = 0; // reset swing error state
// prevent base and off attack in same time, delay attack at 0.2 sec
if(haveOffhandWeapon())
if (haveOffhandWeapon())
{
uint32 off_att = getAttackTimer(OFF_ATTACK);
if(off_att < ATTACK_DISPLAY_DELAY)
@ -1308,13 +1306,13 @@ void Player::Update( uint32 update_diff, uint32 p_time )
}
}
if ( haveOffhandWeapon() && isAttackReady(OFF_ATTACK))
if (haveOffhandWeapon() && isAttackReady(OFF_ATTACK))
{
if(!IsWithinDistInMap(pVictim, pldistance))
if (!CanReachWithMeleeAttack(pVictim))
{
setAttackTimer(OFF_ATTACK,100);
}
else if( !HasInArc( 2*M_PI_F/3, pVictim ))
else if (!HasInArc(2*M_PI_F/3, pVictim))
{
setAttackTimer(OFF_ATTACK,100);
}
@ -1332,7 +1330,7 @@ void Player::Update( uint32 update_diff, uint32 p_time )
Unit *owner = pVictim->GetOwner();
Unit *u = owner ? owner : pVictim;
if(u->IsPvP() && (!duel || duel->opponent != u))
if (u->IsPvP() && (!duel || duel->opponent != u))
{
UpdatePvP(true);
RemoveAurasWithInterruptFlags(AURA_INTERRUPT_FLAG_ENTER_PVP_COMBAT);
@ -1340,9 +1338,9 @@ void Player::Update( uint32 update_diff, uint32 p_time )
}
}
if(HasFlag(PLAYER_FLAGS, PLAYER_FLAGS_RESTING))
if (HasFlag(PLAYER_FLAGS, PLAYER_FLAGS_RESTING))
{
if(roll_chance_i(3) && GetTimeInnEnter() > 0) //freeze update
if (roll_chance_i(3) && GetTimeInnEnter() > 0) //freeze update
{
time_t time_inn = time(NULL)-GetTimeInnEnter();
if (time_inn >= 10) //freeze update

6
src/game/ReactorAI.cpp
View file

@ -68,14 +68,14 @@ void
ReactorAI::UpdateAI(const uint32 /*time_diff*/)
{
// update i_victimGuid if i_creature.getVictim() !=0 and changed
if(!m_creature->SelectHostileTarget() || !m_creature->getVictim())
if (!m_creature->SelectHostileTarget() || !m_creature->getVictim())
return;
i_victimGuid = m_creature->getVictim()->GetGUID();
if( m_creature->isAttackReady() )
if (m_creature->isAttackReady())
{
if( m_creature->IsWithinDistInMap(m_creature->getVictim(), ATTACK_DISTANCE))
if (m_creature->CanReachWithMeleeAttack(m_creature->getVictim()))
{
m_creature->AttackerStateUpdate(m_creature->getVictim());
m_creature->resetAttackTimer();

7
src/game/SharedDefines.h
View file

@ -1157,6 +1157,13 @@ enum SpellPreventionType
SPELL_PREVENTION_TYPE_PACIFY = 2
};
// indexes from SpellRange.dbc, listed only special and used in code
enum SpellRangeIndex
{
SPELL_RANGE_IDX_SELF_ONLY = 1, // 0.0
SPELL_RANGE_IDX_COMBAT = 2, // 5.5 (but dynamic)
};
enum DamageEffectType
{
DIRECT_DAMAGE = 0, // used for normal weapon damage (not for class abilities or spells)

33
src/game/Spell.cpp
View file

@ -5711,19 +5711,33 @@ bool Spell::CanAutoCast(Unit* target)
SpellCastResult Spell::CheckRange(bool strict)
{
float range_mod;
Unit *target = m_targets.getUnitTarget();
// self cast doesn't need range checking -- also for Starshards fix
if (m_spellInfo->rangeIndex == 1)
return SPELL_CAST_OK;
// special range cases
switch(m_spellInfo->rangeIndex)
{
// self cast doesn't need range checking -- also for Starshards fix
case SPELL_RANGE_IDX_SELF_ONLY:
return SPELL_CAST_OK;
// combat range spells are treated differently
case SPELL_RANGE_IDX_COMBAT:
{
if (target)
{
if (target == m_caster)
return SPELL_CAST_OK;
if (strict) //add radius of caster
range_mod = 1.25;
else //add radius of caster and ~5 yds "give"
range_mod = 6.25;
// with additional 5 dist for non stricted case (some melee spells have delay in apply
return m_caster->CanReachWithMeleeAttack(target, strict ? 0.0f : 5.0f) ? SPELL_CAST_OK : SPELL_FAILED_OUT_OF_RANGE;
}
break; // let continue in generic way for no target
}
}
//add radius of caster and ~5 yds "give" for non stricred (landing) check
float range_mod = strict ? 1.25f : 6.25;
SpellRangeEntry const* srange = sSpellRangeStore.LookupEntry(m_spellInfo->rangeIndex);
Unit *target = m_targets.getUnitTarget();
bool friendly = target ? target->IsFriendlyTo(m_caster) : false;
float max_range = GetSpellMaxRange(srange, friendly) + range_mod;
float min_range = GetSpellMinRange(srange, friendly);
@ -5745,6 +5759,7 @@ SpellCastResult Spell::CheckRange(bool strict)
return SPELL_FAILED_UNIT_NOT_INFRONT;
}
// TODO verify that such spells really use bounding radius
if(m_targets.m_targetMask == TARGET_FLAG_DEST_LOCATION && m_targets.m_destX != 0 && m_targets.m_destY != 0 && m_targets.m_destZ != 0)
{
if(!m_caster->IsWithinDist3d(m_targets.m_destX, m_targets.m_destY, m_targets.m_destZ, max_range))

2
src/game/TargetedMovementGenerator.cpp
View file

@ -193,7 +193,7 @@ bool TargetedMovementGeneratorMedium<T,D>::Update(T &owner, const uint32 & time_
template<class T>
void ChaseMovementGenerator<T>::_reachTarget(T &owner)
{
if(owner.canReachWithAttack(this->i_target.getTarget()))
if (owner.CanReachWithMeleeAttack(this->i_target.getTarget()))
owner.Attack(this->i_target.getTarget(),true);
}

6
src/game/ThreatManager.cpp
View file

@ -316,9 +316,9 @@ HostileReference* ThreatContainer::selectNextVictim(Creature* pAttacker, Hostile
}
}
if(!pAttacker->IsOutOfThreatArea(target)) // skip non attackable currently targets
if (!pAttacker->IsOutOfThreatArea(target)) // skip non attackable currently targets
{
if(pCurrentVictim) // select 1.3/1.1 better target in comparison current target
if (pCurrentVictim) // select 1.3/1.1 better target in comparison current target
{
// list sorted and and we check current target, then this is best case
if(pCurrentVictim == currentRef || currentRef->getThreat() <= 1.1f * pCurrentVictim->getThreat() )
@ -330,7 +330,7 @@ HostileReference* ThreatContainer::selectNextVictim(Creature* pAttacker, Hostile
if (currentRef->getThreat() > 1.3f * pCurrentVictim->getThreat() ||
(currentRef->getThreat() > 1.1f * pCurrentVictim->getThreat() &&
pAttacker->IsWithinDistInMap(target, ATTACK_DISTANCE)) )
pAttacker->CanReachWithMeleeAttack(target)) )
{ //implement 110% threat rule for targets in melee range
found = true; //and 130% rule for targets in ranged distances
break; //for selecting alive targets

20
src/game/Unit.cpp
View file

@ -445,13 +445,23 @@ void Unit::resetAttackTimer(WeaponAttackType type)
m_attackTimer[type] = uint32(GetAttackTime(type) * m_modAttackSpeedPct[type]);
}
bool Unit::canReachWithAttack(Unit *pVictim) const
bool Unit::CanReachWithMeleeAttack(Unit* pVictim, float flat_mod /*= 0.0f*/) const
{
MANGOS_ASSERT(pVictim);
float reach = GetFloatValue(UNIT_FIELD_COMBATREACH);
if( reach <= 0.0f )
reach = 1.0f;
return IsWithinDistInMap(pVictim, reach);
// The measured values show BASE_MELEE_OFFSET in (1.3224, 1.342)
float reach = GetFloatValue(UNIT_FIELD_COMBATREACH) + pVictim->GetFloatValue(UNIT_FIELD_COMBATREACH) +
BASE_MELEERANGE_OFFSET + flat_mod;
if (reach < ATTACK_DISTANCE)
reach = ATTACK_DISTANCE;
// This check is not related to bounding radius
float dx = GetPositionX() - pVictim->GetPositionX();
float dy = GetPositionY() - pVictim->GetPositionY();
float dz = GetPositionZ() - pVictim->GetPositionZ();
return dx*dx + dy*dy + dz*dz < reach*reach;
}
void Unit::RemoveSpellsCausingAura(AuraType auraType)

3
src/game/Unit.h
View file

@ -125,6 +125,7 @@ enum SpellFacingFlags
SPELL_FACING_FLAG_INFRONT = 0x0001
};
#define BASE_MELEERANGE_OFFSET 1.33f
#define BASE_MINDAMAGE 1.0f
#define BASE_MAXDAMAGE 2.0f
#define BASE_ATTACK_TIME 2000
@ -1179,7 +1180,7 @@ class MANGOS_DLL_SPEC Unit : public WorldObject
return !HasFlag(UNIT_FIELD_FLAGS_2, UNIT_FLAG2_DISARM_RANGED);
}
}
bool canReachWithAttack(Unit *pVictim) const;
bool CanReachWithMeleeAttack(Unit* pVictim, float flat_mod = 0.0f) const;
uint32 m_extraAttacks;
void _addAttacker(Unit *pAttacker) // must be called only from Unit::Attack(Unit*)

2
src/shared/revision_nr.h
View file

@ -1,4 +1,4 @@
#ifndef __REVISION_NR_H__
#define __REVISION_NR_H__
#define REVISION_NR "11104"
#define REVISION_NR "11105"
#endif // __REVISION_NR_H__