yolinlin/mod-playerbots
1
0
Fork 0
mirror of https://github.com/mod-playerbots/mod-playerbots synced 2025-11-29 15:58:20 +08:00
Code Issues Packages Projects Releases Wiki Activity

Fix various formations - Issue #749 (#807)

Browse Source 
* Fix various formations

* Refactor Formation::GetFollowAngle()

* Update Formations.cpp

* Refactored Formation::GetFollowAngle()

Final refactor of Formation::GetFollowAngle()

 - By combining the group member iteration, unnecessary loops are avoided.
- Clearer Structure: The code is more readable, with fewer redundant operations.
- Better Maintainability: Comments and logical grouping make it easier to modify or extend the function in the future.

* Logic order improvement
This commit is contained in:
SaW
2024-12-22 23:08:47 +01:00
committed by GitHub
parent e5f1b862dd
commit d9f9d980cf
1 changed files with 62 additions and 58 deletions
Download Patch File Download Diff File Expand all files Collapse all files

126
src/strategy/values/Formations.cpp
View File

@@ -413,79 +413,83 @@ float Formation::GetFollowAngle()
Group* group = bot->GetGroup();
PlayerbotAI* botAI = GET_PLAYERBOT_AI(bot);
// If there's no master and no group
if (!master && !group)
return 0.0f;
uint32 index = 1;
uint32 total = 1;
PlayerbotMgr* masterBotMgr = nullptr;
if (master)
masterBotMgr = GET_PLAYERBOT_MGR(master);
if (!group && master && !GET_PLAYERBOT_AI(master) && masterBotMgr)
{
for (PlayerBotMap::const_iterator i = masterBotMgr->GetPlayerBotsBegin(); i != masterBotMgr->GetPlayerBotsEnd();
++i)
{
if (i->second == bot)
index = total;
std::vector<Player*> roster;
if (group)
{
bool left = true; // Used for alternating tanks' positions
for (GroupReference* ref = group->GetFirstMember(); ref; ref = ref->next())
{
Player* member = ref->GetSource();
// Skip invalid, dead, or out-of-map members
if (!member || !member->IsAlive() || bot->GetMapId() != member->GetMapId())
continue;
// Skip the master
if (member == master)
continue;
// Put DPS in the middle
if (!botAI->IsTank(member) && !botAI->IsHeal(member))
{
roster.insert(roster.begin() + roster.size() / 2, member);
}
// Put Healers in the middle
else if (botAI->IsHeal(member))
{
roster.insert(roster.begin() + roster.size() / 2, member);
}
// Handle tanks (alternate between front and back)
else if (botAI->IsTank(member))
{
if (left)
roster.push_back(member); // Place tank at the back
else
roster.insert(roster.begin(), member); // Place tank at the front
left = !left; // Alternate for the next tank
}
total++;
}
}
else if (master)
{
// If the bot is following a master, look up the bot's position in the master's list
PlayerbotMgr* masterBotMgr = GET_PLAYERBOT_MGR(master);
if (masterBotMgr && !GET_PLAYERBOT_AI(master))
{
for (auto it = masterBotMgr->GetPlayerBotsBegin(); it != masterBotMgr->GetPlayerBotsEnd(); ++it)
{
if (it->second == bot)
{
index = total; // Found bot in master's list, set the index
break;
}
++total;
}
}
else if (group)
{
std::vector<Player*> roster;
for (GroupReference* ref = group->GetFirstMember(); ref; ref = ref->next())
{
if (Player* member = ref->GetSource())
{
if (!member || member == bot || !member->IsAlive() || bot->GetMapId() != member->GetMapId()) continue;
if (member != master && !botAI->IsTank(member) && !botAI->IsHeal(member))
{
roster.insert(roster.begin() + roster.size() / 2, member);
}
}
}
for (GroupReference* ref = group->GetFirstMember(); ref; ref = ref->next())
// Find the bot's position in the roster
auto it = std::find(roster.begin(), roster.end(), bot);
if (it != roster.end())
{
if (Player* member = ref->GetSource())
{
if (!member || member == bot || !member->IsAlive() || bot->GetMapId() != member->GetMapId()) continue;
if (member != master && botAI->IsHeal(member))
{
roster.insert(roster.begin() + roster.size() / 2, member);
}
}
}
bool left = true;
for (GroupReference* ref = group->GetFirstMember(); ref; ref = ref->next())
{
if (Player* member = ref->GetSource())
{
if (!member || member == bot || !member->IsAlive() || bot->GetMapId() != member->GetMapId()) continue;
if (member != master && botAI->IsTank(member))
{
if (left)
roster.push_back(member);
else
roster.insert(roster.begin(), member);
left = !left;
}
}
}
for (Player* playerRoster : roster)
{
if (playerRoster == bot)
break;
++index;
}
total = roster.size() + 1;
index = std::distance(roster.begin(), it) + 1; // Find bot's index in the roster
}
// Return
float start = (master ? master->GetOrientation() : 0.0f);
return start + (0.125f + 1.75f * index / total + (total == 2 ? 0.125f : 0.0f)) * M_PI;
}