pa/eqemu-server
2
0
Fork 0
mirror of https://github.com/EQEmu/Server.git synced 2025-12-12 01:11:29 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

[Aggro] Cleanup Mob::CombatRange (#2652)

Browse Source 
* [Aggro] Cleanup Mob::CombatRange

* Change to Race_ constants
This commit is contained in:
Aeadoin 2022-12-19 22:08:50 -05:00 committed by GitHub
parent e6f58382de
commit ed6194ad19
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 28 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

48
zone/aggro.cpp
View File

@ -980,24 +980,28 @@ bool Mob::IsBeneficialAllowed(Mob *target)
bool Mob::CombatRange(Mob* other, float fixed_size_mod, bool aeRampage) bool Mob::CombatRange(Mob* other, float fixed_size_mod, bool aeRampage)
{ {
if(!other) if (!other) {
return(false); return(false);
}
float size_mod = GetSize(); float size_mod = GetSize();
float other_size_mod = other->GetSize(); float other_size_mod = other->GetSize();
if(GetRace() == 49 || GetRace() == 158 || GetRace() == 196) //For races with a fixed size if (GetRace() == RACE_LAVA_DRAGON_49 || GetRace() == RACE_WURM_158 || GetRace() == RACE_GHOST_DRAGON_196) { //For races with a fixed size
size_mod = 60.0f; size_mod = 60.0f;
else if (size_mod < 6.0) }
else if (size_mod < 6.0) {
size_mod = 8.0f; size_mod = 8.0f;
}
if(other->GetRace() == 49 || other->GetRace() == 158 || other->GetRace() == 196) //For races with a fixed size if (other->GetRace() == RACE_LAVA_DRAGON_49 || other->GetRace() == RACE_WURM_158 || other->GetRace() == RACE_GHOST_DRAGON_196) { //For races with a fixed size
other_size_mod = 60.0f; other_size_mod = 60.0f;
else if (other_size_mod < 6.0) }
else if (other_size_mod < 6.0) {
other_size_mod = 8.0f; other_size_mod = 8.0f;
}
if (other_size_mod > size_mod) if (other_size_mod > size_mod) {
{
size_mod = other_size_mod; size_mod = other_size_mod;
} }
@ -1011,11 +1015,11 @@ bool Mob::CombatRange(Mob* other, float fixed_size_mod, bool aeRampage)
size_mod *= size_mod * 4; size_mod *= size_mod * 4;
} }
if (other->GetRace() == 184) // Lord Vyemm and other velious dragons if (other->GetRace() == RACE_VELIOUS_DRAGON_184) // Lord Vyemm and other velious dragons
{ {
size_mod *= 1.75; size_mod *= 1.75;
} }
if (other->GetRace() == 122) // Dracoliche in Fear. Skeletal Dragon if (other->GetRace() == RACE_DRAGON_SKELETON_122) // Dracoliche in Fear. Skeletal Dragon
{ {
size_mod *= 2.25; size_mod *= 2.25;
} }
@ -1029,44 +1033,48 @@ bool Mob::CombatRange(Mob* other, float fixed_size_mod, bool aeRampage)
// improved playability and "you are too far away" while chasing // improved playability and "you are too far away" while chasing
// a fleeing mob. The Blind check is to make sure that this does not // a fleeing mob. The Blind check is to make sure that this does not
// apply to disoriented fleeing mobs who need proximity to turn and fight. // apply to disoriented fleeing mobs who need proximity to turn and fight.
if (other->currently_fleeing && !other->IsBlind()) if (other->currently_fleeing && !other->IsBlind()) {
{
size_mod *= 3; size_mod *= 3;
} }
// prevention of ridiculously sized hit boxes // prevention of ridiculously sized hit boxes
if (size_mod > 10000) if (size_mod > 10000) {
size_mod = size_mod / 7; size_mod = size_mod / 7;
}
float _DistNoRoot = DistanceSquaredNoZ(m_Position, other->GetPosition()); float _DistNoRoot = DistanceSquaredNoZ(m_Position, other->GetPosition());
float _zDist = m_Position.z - other->GetZ(); float _zDist = m_Position.z - other->GetZ();
_zDist *= _zDist; _zDist *= _zDist;
if (GetSpecialAbility(NPC_CHASE_DISTANCE)){ if (GetSpecialAbility(NPC_CHASE_DISTANCE)) {
bool DoLoSCheck = true; bool DoLoSCheck = true;
float max_dist = static_cast<float>(GetSpecialAbilityParam(NPC_CHASE_DISTANCE, 0)); float max_dist = static_cast<float>(GetSpecialAbilityParam(NPC_CHASE_DISTANCE, 0));
float min_distance = static_cast<float>(GetSpecialAbilityParam(NPC_CHASE_DISTANCE, 1)); float min_distance = static_cast<float>(GetSpecialAbilityParam(NPC_CHASE_DISTANCE, 1));
if (GetSpecialAbilityParam(NPC_CHASE_DISTANCE, 2)) if (GetSpecialAbilityParam(NPC_CHASE_DISTANCE, 2)) {
DoLoSCheck = false; //Ignore line of sight check DoLoSCheck = false; //Ignore line of sight check
}
if (max_dist == 1) if (max_dist == 1) {
max_dist = 250.0f; //Default it to 250 if you forget to put a value max_dist = 250.0f; //Default it to 250 if you forget to put a value
}
max_dist = max_dist * max_dist; max_dist = max_dist * max_dist;
if (!min_distance) if (!min_distance) {
min_distance = size_mod; //Default to melee range min_distance = size_mod; //Default to melee range
else } else {
min_distance = min_distance * min_distance; min_distance = min_distance * min_distance;
}
if ((DoLoSCheck && CheckLastLosState()) && (_DistNoRoot >= min_distance && _DistNoRoot <= max_dist)) if ((DoLoSCheck && CheckLastLosState()) && (_DistNoRoot >= min_distance && _DistNoRoot <= max_dist)) {
SetPseudoRoot(true); SetPseudoRoot(true);
else } else {
SetPseudoRoot(false); SetPseudoRoot(false);
}
} }
if(aeRampage) { if (aeRampage) {
float multiplyer = GetSize() * RuleR(Combat, AERampageSafeZone); float multiplyer = GetSize() * RuleR(Combat, AERampageSafeZone);
float ramp_range = (size_mod * multiplyer); float ramp_range = (size_mod * multiplyer);
if (_DistNoRoot <= ramp_range) { if (_DistNoRoot <= ramp_range) {