pa/eqemu-server
2
0
Fork 0
mirror of https://github.com/EQEmu/Server.git synced 2026-06-27 20:47:15 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

end of day Jan 16

Browse Source
This commit is contained in:
neckkola
2022-01-17 10:00:25 -04:00
parent ec2e79c042
commit 26c12d46ef
3 changed files with 19 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
zone/bot_raid.cpp
+1 -1
View File
@@ -54,7 +54,7 @@ void Bot::AI_Process_Raid()
Raid* raid = entity_list.GetRaidByBot(this); Raid* raid = entity_list.GetRaidByBot(this);
Client* bot_owner = (GetBotOwner() && GetBotOwner()->IsClient() ? GetBotOwner()->CastToClient() : nullptr); Client* bot_owner = (GetBotOwner() && GetBotOwner()->IsClient() ? GetBotOwner()->CastToClient() : nullptr);
int r_group = raid->GetGroup(GetName()); uint32 r_group = raid->GetGroup(GetName());
LogAI("Bot_Raid: Entered Raid Process() for [{}].", this->GetCleanName()); LogAI("Bot_Raid: Entered Raid Process() for [{}].", this->GetCleanName());
zone/botspellsai.cpp
+2 -2
View File
@@ -34,8 +34,8 @@ bool Bot::AICastSpell(Mob* tar, uint8 iChance, uint32 iSpellTypes) {
// Bot AI // Bot AI
Raid* raid = entity_list.GetRaidByBot(this); Raid* raid = entity_list.GetRaidByBot(this);
if (raid) { if (raid) {
AICastSpell_Raid(tar, iChance, iSpellTypes); return AICastSpell_Raid(tar, iChance, iSpellTypes);
return true; //return true;
} }
if (!tar) { if (!tar) {
zone/client_packet.cpp
+16
View File
@@ -569,6 +569,22 @@ void Client::CompleteConnect()
if (raid) { if (raid) {
SetRaidGrouped(true); SetRaidGrouped(true);
raid->LearnMembers(); raid->LearnMembers();
#ifdef BOTS
std::vector<RaidMember> r_members = raid->GetMembers();
for (RaidMember iter : r_members) {
if (iter.member && iter.member->IsBot() && iter.member->GetOwner()->CastToClient()->CharacterID() == this->CharacterID()) {
iter.member->CastToBot()->Spawn(this);
iter.member->CastToBot()->SetRaidGrouped(true);
uint32 r_group = raid->GetGroup(iter.member->GetName());
if (r_group > 0) {
iter.member->CastToBot()->SetFollowID(raid->GetGroupLeader(r_group)->CastToClient()->GetID());
}
else {
iter.member->CastToBot()->SetFollowID(raid->GetLeader()->GetID());
}
}
}
#endif
raid->VerifyRaid(); raid->VerifyRaid();
raid->GetRaidDetails(); raid->GetRaidDetails();
/* /*