Mirror/TrinityCore
1
0
Fork 0
mirror of https://github.com/TrinityCore/TrinityCore.git synced 2026-01-18 00:18:43 +01:00
Code Issues Packages Projects Releases Wiki Activity

Revert "Core/Creatures: updated aggro range calculation with 335 commit data"

Browse Source 
This reverts commit 75ae86d062.
This commit is contained in:
Ovahlord
2019-07-09 10:33:31 +02:00
parent 478df5a9c8
commit 7a297ccd8e
1 changed files with 17 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

30
src/server/game/Entities/Creature/Creature.cpp
View File

@@ -1785,34 +1785,38 @@ bool Creature::CheckNoGrayAggroConfig(uint32 playerLevel, uint32 creatureLevel)
float Creature::GetAttackDistance(Unit const* player) const
{
// WoW Wiki: the minimum radius seems to be 5 yards, while the maximum range is 45 yards
float maxRadius = (45.0f * sWorld->getRate(RATE_CREATURE_AGGRO));
float minRadius = (5.0f * sWorld->getRate(RATE_CREATURE_AGGRO));
float aggroRate = sWorld->getRate(RATE_CREATURE_AGGRO);
float maxRadius = (45.0f * aggroRate);
float minRadius = (5.0f * aggroRate);
uint8 expansionMaxLevel = uint8(GetMaxLevelForExpansion(GetCreatureTemplate()->expansion));
int32 levelDifference = getLevel() - player->getLevel();
uint32 playerLevel = player->getLevel();
uint32 creatureLevel = getLevel();
if (aggroRate == 0.0f)
return 0.0f;
// The aggro radius for creatures with equal level as the player is 20 yards.
// The aggro radius for creatures with equal level as the player is 15 yards.
// The combatreach should not get taken into account for the distance so we drop it from the range (see Supremus as expample)
float baseAggroDistance = 20.0f - GetFloatValue(UNIT_FIELD_COMBATREACH);
// + - 1 yard for each level difference between player and creature
float aggroRadius = baseAggroDistance + float(levelDifference);
float baseAggroDistance = 15.0f - GetCombatReach();
float aggroRadius = baseAggroDistance;
// detect range auras
if (float(getLevel() + 5) <= sWorld->getIntConfig(CONFIG_MAX_PLAYER_LEVEL))
if ((creatureLevel + 5) <= sWorld->getIntConfig(CONFIG_MAX_PLAYER_LEVEL))
{
aggroRadius += GetTotalAuraModifier(SPELL_AURA_MOD_DETECT_RANGE);
aggroRadius += GetTotalAuraModifier(SPELL_AURA_MOD_DETECTED_RANGE);
aggroRadius += player->GetTotalAuraModifier(SPELL_AURA_MOD_DETECTED_RANGE);
}
// The aggro range of creatures with higher levels than the total player level for the expansion should get the maxlevel treatment
// This makes sure that creatures such as bosses wont have a bigger aggro range than the rest of the npc's
// The following code is used for blizzlike behaivior such as skippable bosses
if (getLevel() > expansionMaxLevel)
aggroRadius = baseAggroDistance + float(expansionMaxLevel - player->getLevel());
// The following code is used for blizzlike behavior such as skipable bosses (e.g. Commander Springvale at level 85)
if (creatureLevel > expansionMaxLevel)
aggroRadius += float(expansionMaxLevel) - float(playerLevel);
// + - 1 yard for each level difference between player and creature
else
aggroRadius += float(creatureLevel) - float(playerLevel);
// Make sure that we wont go over the total range limits
if (aggroRadius > maxRadius)