nchebrov/azerothcore-wotlk
1
0
Fork 0
mirror of https://github.com/mod-playerbots/azerothcore-wotlk.git synced 2026-01-23 05:36:23 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix(Core/PetAI): aggro and movement of Warlock's IMP (#2379)

Browse Source
This commit is contained in:
Nightprince
2019-11-18 18:35:25 +03:30
committed by Francesco Borzì
parent 616b8d9fb1
commit ded3bd8900
2 changed files with 68 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

52
src/server/game/AI/CoreAI/PetAI.cpp
View File

@@ -87,11 +87,52 @@ void PetAI::_doMeleeAttack()
DoMeleeAttackIfReady();
}
bool PetAI::_canMeleeAttack() const
bool PetAI::_canMeleeAttack()
{
return me->GetEntry() != 416 /*ENTRY_IMP*/ &&
me->GetEntry() != 510 /*ENTRY_WATER_ELEMENTAL*/ &&
me->GetEntry() != 37994 /*ENTRY_WATER_ELEMENTAL_PERM*/;
combatRange = 0.f;
switch (me->GetEntry())
{
case ENTRY_IMP:
case ENTRY_WATER_ELEMENTAL:
case ENTRY_WATER_ELEMENTAL_PERM:
{
for (uint8 i = 0; i < me->GetPetAutoSpellSize(); ++i)
{
uint32 spellID = me->GetPetAutoSpellOnPos(i);
switch (spellID)
{
case IMP_FIREBOLT_RANK_1:
case IMP_FIREBOLT_RANK_2:
case IMP_FIREBOLT_RANK_3:
case IMP_FIREBOLT_RANK_4:
case IMP_FIREBOLT_RANK_5:
case IMP_FIREBOLT_RANK_6:
case IMP_FIREBOLT_RANK_7:
case IMP_FIREBOLT_RANK_8:
case IMP_FIREBOLT_RANK_9:
case WATER_ELEMENTAL_WATERBOLT_1:
case WATER_ELEMENTAL_WATERBOLT_2:
{
SpellInfo const* spellInfo = sSpellMgr->GetSpellInfo(spellID);
int32 mana = me->GetPower(POWER_MANA);
if (mana >= spellInfo->CalcPowerCost(me, spellInfo->GetSchoolMask()))
{
combatRange = spellInfo->GetMaxRange();
return true;
}
}
default:
break;
}
}
return false;
}
default:
break;
}
return true;
}
void PetAI::UpdateAI(uint32 diff)
@@ -563,7 +604,8 @@ void PetAI::DoAttack(Unit* target, bool chase)
if (chase)
{
me->GetMotionMaster()->MoveChase(target, !_canMeleeAttack() ? 20.0f: 0.0f, me->GetAngle(target));
if (_canMeleeAttack())
me->GetMotionMaster()->MoveChase(target, combatRange, float(M_PI));
}
else // (Stay && ((Aggressive || Defensive) && In Melee Range)))
{

22
src/server/game/AI/CoreAI/PetAI.h
View File

@@ -13,6 +13,25 @@
class Creature;
class Spell;
enum SpecialPets
{
ENTRY_IMP = 416,
ENTRY_WATER_ELEMENTAL = 510,
ENTRY_WATER_ELEMENTAL_PERM = 37994,
IMP_FIREBOLT_RANK_1 = 3110,
IMP_FIREBOLT_RANK_2 = 7799,
IMP_FIREBOLT_RANK_3 = 7800,
IMP_FIREBOLT_RANK_4 = 7801,
IMP_FIREBOLT_RANK_5 = 7802,
IMP_FIREBOLT_RANK_6 = 11762,
IMP_FIREBOLT_RANK_7 = 11763,
IMP_FIREBOLT_RANK_8 = 27267,
IMP_FIREBOLT_RANK_9 = 47964,
WATER_ELEMENTAL_WATERBOLT_1 = 31707,
WATER_ELEMENTAL_WATERBOLT_2 = 72898
};
class PetAI : public CreatureAI
{
public:
@@ -43,13 +62,14 @@ class PetAI : public CreatureAI
bool _needToStop(void);
void _stopAttack(void);
void _doMeleeAttack();
bool _canMeleeAttack() const;
bool _canMeleeAttack();
void UpdateAllies();
TimeTracker i_tracker;
std::set<uint64> m_AllySet;
uint32 m_updateAlliesTimer;
float combatRange;
Unit* SelectNextTarget(bool allowAutoSelect) const;
void HandleReturnMovement();