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

feat(Core/Formations): implemented a new formation groupAI flag "GROUP_AI_FLAG_EVADE_TOGETHER" (#8758)

Browse Source
This commit is contained in:
Andrius Peleckas
2021-11-16 20:14:34 +02:00
committed by GitHub
parent 3895487dc2
commit 31f028abfc
4 changed files with 56 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
src/server/game/AI/CreatureAI.cpp
View File

@@ -18,6 +18,7 @@
#include "Creature.h"
#include "CreatureAI.h"
#include "CreatureAIImpl.h"
#include "CreatureGroups.h"
#include "CreatureTextMgr.h"
#include "Log.h"
#include "MapReference.h"
@@ -292,7 +293,9 @@ bool CreatureAI::UpdateVictim()
bool CreatureAI::_EnterEvadeMode()
{
if (!me->IsAlive())
{
return false;
}
// don't remove vehicle auras, passengers aren't supposed to drop off the vehicle
// don't remove clone caster on evade (to be verified)
@@ -308,8 +311,15 @@ bool CreatureAI::_EnterEvadeMode()
me->SetLastDamagedTime(0);
me->SetCannotReachTarget(false);
if (CreatureGroup* formation = me->GetFormation())
{
formation->MemberEvaded(me);
}
if (me->IsInEvadeMode())
{
return false;
}
return true;
}

3
src/server/game/Entities/Creature/Creature.h
View File

@@ -330,7 +330,8 @@ public:
void UpdateWaypointID(uint32 wpID) { m_waypointID = wpID; }
void SearchFormation();
[[nodiscard]] CreatureGroup* GetFormation() const { return m_formation; }
[[nodiscard]] CreatureGroup const* GetFormation() const { return m_formation; }
[[nodiscard]] CreatureGroup* GetFormation() { return m_formation; }
void SetFormation(CreatureGroup* formation) { m_formation = formation; }
Unit* SelectVictim();

41
src/server/game/Entities/Creature/CreatureGroups.cpp
View File

@@ -226,6 +226,47 @@ void CreatureGroup::MemberAttackStart(Creature* member, Unit* target)
}
}
void CreatureGroup::MemberEvaded(Creature* member)
{
uint8 const groupAI = sFormationMgr->CreatureGroupMap[member->GetSpawnId()].groupAI;
if (!(groupAI & std::underlying_type_t<GroupAIFlags>(GroupAIFlags::GROUP_AI_FLAG_EVADE_TOGETHER)))
{
return;
}
for (auto const& itr : m_members)
{
Creature* pMember = itr.first;
//Skip one check
if (pMember == member)
{
continue;
}
if (!pMember->IsAlive())
{
continue;
}
if (pMember->IsInEvadeMode())
{
continue;
}
if (itr.second.HasGroupFlag(std::underlying_type_t<GroupAIFlags>(GroupAIFlags::GROUP_AI_FLAG_EVADE_TOGETHER)))
{
if (pMember->IsAIEnabled)
{
if (CreatureAI* pMemberAI = pMember->AI())
{
pMemberAI->EnterEvadeMode();
}
}
}
}
}
void CreatureGroup::FormationReset(bool dismiss, bool initMotionMaster)
{
if (m_members.size() && !(m_members.begin()->second.HasGroupFlag(std::underlying_type_t<GroupAIFlags>(GroupAIFlags::GROUP_AI_FLAG_FOLLOW_LEADER))))

5
src/server/game/Entities/Creature/CreatureGroups.h
View File

@@ -30,7 +30,7 @@ enum class GroupAIFlags : uint16
{
GROUP_AI_FLAG_MEMBER_ASSIST_LEADER = 0x001,
GROUP_AI_FLAG_LEADER_ASSIST_MEMBER = 0x002,
//GROUP_AI_FLAG_UNK1 = 0x004,
GROUP_AI_FLAG_EVADE_TOGETHER = 0x004,
//GROUP_AI_FLAG_UNK2 = 0x008,
//GROUP_AI_FLAG_UNK3 = 0x010,
//GROUP_AI_FLAG_UNK4 = 0x020,
@@ -40,7 +40,7 @@ enum class GroupAIFlags : uint16
GROUP_AI_FLAG_FOLLOW_LEADER = 0x200,
// Used to verify valid and usable flags
GROUP_AI_FLAG_SUPPORTED = GROUP_AI_FLAG_MEMBER_ASSIST_LEADER | GROUP_AI_FLAG_LEADER_ASSIST_MEMBER | GROUP_AI_FLAG_FOLLOW_LEADER
GROUP_AI_FLAG_SUPPORTED = GROUP_AI_FLAG_MEMBER_ASSIST_LEADER | GROUP_AI_FLAG_LEADER_ASSIST_MEMBER | GROUP_AI_FLAG_EVADE_TOGETHER | GROUP_AI_FLAG_FOLLOW_LEADER
};
struct FormationInfo
@@ -103,6 +103,7 @@ public:
void LeaderMoveTo(float x, float y, float z, bool run);
void MemberAttackStart(Creature* member, Unit* target);
void MemberEvaded(Creature* member);
private:
Creature* m_leader; //Important do not forget sometimes to work with pointers instead synonims :D:D