mirror of
https://github.com/EQEmu/Server.git
synced 2025-12-11 21:01:29 +00:00
* Fix for GENERIC_9_STRINGS * Add Bot Heal Message Display Creates a new rule to display Bot heal messages to the Bot Owner * 2021-03-25 11L04pm Spell and Heal Rule added to allow for Bot spell and heal damage to be sent to the Bot Owner's Group. Also added a check to remove duplicate message for #damage on self. * Update .gitignore * BOT work Added BOT logging damage/heals to owner Added BOT message to owner for harmony fails Made var Critical global to remove duplicate crit messages Added a NULL check to Mob:GetCleanname() * Bot Group Work Fixed botid=charid spawn on zone issue Added a group_list update on zone to refresh from database to fix a dangling pointer to a Bot object that was camped but was previously in a group within the zone being entered. Modified Bot::ProcessBotGroupInvite to use the client of the bot when doing the Bot initialization so that a leader can invite another owner's Bot * Jan 4 Basic structure in place for Raid::AddBot though not working * Basement Jan 5 * End of day Jan 5 Working Raid Invite to a Bot. * Update to Client::QueuePacket to not attempt to send a packet to a BoT. Not clean, but a broad solution. * Updated Raid::VerifyRaid * Some Bot Raid working * Before VS Crash * Use Case 1, 2, 3,4,7 working. Need to fix 5, 6, 8 * Work on usecase 5 * A few more use cases working * New work on Raid invite with a invitor having a group * Bot Raid inviting working for all use cases * A few changes * end of day jan 10 * Jan 11 * end of day Jan 11 * Bot Invite/Accept cleanup * Start of moving raid bot functions to their own methods * More bot raid changes * More raid spell work * end of day Jan 16 * spawn work * Spawn on login working * End of Day Jan 18 * Raid leader and mana/hp updates fixed * Spell Tracking * Issue with Bot Death in raid when casted upon. 1741 raid.cpp * Bot Death fixed and few other crashes * Working on botgroup removal * Bot Disbanding Work 90% * Looks like BOTs are working * Fixed a bot crash * bug tracing on entity list mismatch * safe_delete resoves problem. No to track down leak * seems to be working * Memory corruption found - sending packets to BoTs using Client class * added Raid::IsRaidMemberBot() * Update p_raid_instance * g3 * Final - Bot Raid Working * Fixed IsRaidMemberBot to remove memory leak Fixed altcombat crash though RaidMainAssist (428) needs fixing * add RaidMember.IsBot * Repaired IsBot function to be more preformant. Now works on standard performance machine * Fixed Bard AE Target Spells Removed assert for buffs * updated based on Feb 2022 master updates * Added bot_db_updates and version increment * Cleanup of bot raid work and inclusion of bot_raid in cmake * Delete .gitignore * Revert "Delete .gitignore" This reverts commit 8523658d3bacdc068bcafaa652d2100afecddfc2. * Fixed a packet issue * Merged upstream/master Merged upstream/master and removed ifdef BOTS as per recent dev approach for BOTS. Functionality is there, compiles and tests ok. A few problems to be resolved though this is a good baseline. * Added sql update for raid_members to add isbot * Updated Bot Follow Function Bot will now follow the Group Leader if IsClient, otherwise follows the Bot Owner * Updates to Bot Raid System When camping a client, remove them from the raid. If they are leader, place leadership to the next client. Update a few crash checks in bot_raid.cpp * [BOTS] Added RuleB Enabled checks and updated base repo for raid_members Updated several RuleB(Bots, Enabled) checks Updated the base repo to be autogenerated. Raid functionality should work with a non-bots enabled database. * Few quick updates * Updates Corrected a number of comments. Compiled and tested against bot and non-bot database though requires the isbot column in raid_members for both. Moved the db update out of the bot stream to make bot check code easier. * Formatting and other small updates * A few more RuleB(Bots, Enabled) additions * Fix issue with conflict of bot ID versus character ID. * Delete CMakeSettings.json * Comment Updates and other Several updates including - fixed comments from PR - added id to raid_members and unique index on name to avoid botid and charid conflicts - updated a few raid functions for iterators - reordered several raid operations to ensure send leader packet to be the last item to ensure proper updating on the client - update sql to use Replace instead of Insert for botid conflicting with charid * Exploit fix for Raid Bots Added item from @Nite to disallow spawning or camping bots if Raid is engaged. Avoids abusive situations. * Initial Commit * fix Raid Window after zoning The raid window was not fully updating for clients not in the zone. * Cleanup * Update Fixed comments * Resolve crash for MOTD Fixed a crash situation sending a raid MOTD to BOTS. * Update ruletypes.h * Updated to resolve a few recent comments Fixed some comments within attack.cpp * fix sql query * update repository * prevent duplicate entries in raid after group invite, and cleanup * fixes for botgroups not following, and add already in raid messages. * fix messagestring * fixes * Cleanup, and resolving issues with disbanding * refactoring * more cleanup/fixing. * fixes for removing from ground in raid * Refactoring/fixing multiple clients * fix for compiling * Bugs from refactoring fixed * Testing completed, cleaning up unwanted items/duplicate code. * Cleaned up AICastSpell * fix typos * Refactoring * Adding Raid checks to AI_Process/cleanup * Fix a typo Was getting a SQL error on BOT spawn. Fixed typo. * fix for crash * Fixed crash when inviting player, more refactoring * AI_Process Refactoring work * More Refactoring/fixes for follow * Finish Refactoring AI_Process * cleanup * cleanup * cleanup * cleanup * fix melee attack loop * fix for leashowner. * fix for leashowner. * Bots persist in raid after client death/LD/Camp * Fix Bot Groups when zoning after death. * Fix Bots in group following after client death * remove unnecessary query * Allow Raid members to invite Bots if owner is in raid. cleanup * optimization of raid verification * remove this * Code Cleanup * formatting * formatting * formatting * fix for macro * add return for TryClassAttacks * fix query * fix for crash * restrict camping/spawn in combat. * Fix other crash issue. * update learnmembers to use Strings::To, cleanup magic numbers * fix for merge. --------- Co-authored-by: Kinglykrab <kinglykrab@gmail.com> Co-authored-by: Alex King <89047260+Kinglykrab@users.noreply.github.com> Co-authored-by: Aeadoin <109764533+Aeadoin@users.noreply.github.com>
288 lines
7.8 KiB
C++
288 lines
7.8 KiB
C++
/* EQEMu: Everquest Server Emulator
|
|
Copyright (C) 2001-2016 EQEMu Development Team (http://eqemulator.org)
|
|
|
|
This program is free software; you can redistribute it and/or modify
|
|
it under the terms of the GNU General Public License as published by
|
|
the Free Software Foundation; version 2 of the License.
|
|
|
|
This program is distributed in the hope that it will be useful,
|
|
but WITHOUT ANY WARRANTY except by those people which sell it, which
|
|
are required to give you total support for your newly bought product;
|
|
without even the implied warranty of MERCHANTABILITY or FITNESS FOR
|
|
A PARTICULAR PURPOSE. See the GNU General Public License for more details.
|
|
|
|
You should have received a copy of the GNU General Public License
|
|
along with this program; if not, write to the Free Software
|
|
Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
|
|
*/
|
|
|
|
#include "bot.h"
|
|
#include "object.h"
|
|
#include "raids.h"
|
|
#include "doors.h"
|
|
#include "quest_parser_collection.h"
|
|
#include "../common/data_verification.h"
|
|
|
|
extern volatile bool is_zone_loaded;
|
|
extern bool Critical;
|
|
|
|
std::vector<RaidMember> Raid::GetRaidGroupMembers(uint32 gid)
|
|
{
|
|
std::vector<RaidMember> raid_group_members;
|
|
raid_group_members.clear();
|
|
|
|
for (int i = 0; i < MAX_RAID_MEMBERS; ++i)
|
|
{
|
|
if (members[i].member && members[i].GroupNumber == gid)
|
|
{
|
|
raid_group_members.push_back(members[i]);
|
|
}
|
|
}
|
|
return raid_group_members;
|
|
}
|
|
|
|
// Returns Bot members that are in the raid
|
|
// passing in owner will return all Bots that have the same owner.
|
|
std::vector<Bot*> Raid::GetRaidBotMembers(uint32 owner)
|
|
{
|
|
std::vector<Bot*> raid_members_bots;
|
|
raid_members_bots.clear();
|
|
|
|
for (int i = 0; i < MAX_RAID_MEMBERS; i++) {
|
|
if (
|
|
members[i].member &&
|
|
members[i].member->IsBot()
|
|
) {
|
|
auto b_member = members[i].member->CastToBot();
|
|
if (owner && b_member->GetBotOwnerCharacterID() == owner) {
|
|
raid_members_bots.emplace_back(b_member);
|
|
} else if (!owner) {
|
|
raid_members_bots.emplace_back(b_member);
|
|
}
|
|
}
|
|
}
|
|
|
|
return raid_members_bots;
|
|
}
|
|
|
|
// Returns Bot members that are in the group specified
|
|
// passing in owner will return only Bots that have the same owner.
|
|
std::vector<Bot*> Raid::GetRaidGroupBotMembers(uint32 gid)
|
|
{
|
|
std::vector<Bot*> raid_members_bots;
|
|
raid_members_bots.clear();
|
|
|
|
for (int i = 0; i < MAX_RAID_MEMBERS; i++) {
|
|
if (
|
|
members[i].member &&
|
|
members[i].member->IsBot() &&
|
|
members[i].GroupNumber == gid
|
|
) {
|
|
auto b_member = members[i].member->CastToBot();
|
|
raid_members_bots.emplace_back(b_member);
|
|
raid_members_bots.emplace_back(b_member);
|
|
}
|
|
}
|
|
|
|
return raid_members_bots;
|
|
}
|
|
|
|
void Raid::HandleBotGroupDisband(uint32 owner, uint32 gid)
|
|
{
|
|
auto raid_members_bots = gid != RAID_GROUPLESS ? GetRaidGroupBotMembers(gid) : GetRaidBotMembers(owner);
|
|
|
|
// If any of the bots are a group leader then re-create the botgroup on disband, dropping any clients
|
|
for (auto& bot_iter: raid_members_bots) {
|
|
|
|
// Remove the entire BOT group in this case
|
|
if (
|
|
bot_iter &&
|
|
gid != RAID_GROUPLESS &&
|
|
IsRaidMember(bot_iter->GetName()) &&
|
|
IsGroupLeader(bot_iter->GetName())
|
|
) {
|
|
auto r_group_members = GetRaidGroupMembers(GetGroup(bot_iter->GetName()));
|
|
auto group_inst = new Group(bot_iter);
|
|
entity_list.AddGroup(group_inst);
|
|
database.SetGroupID(bot_iter->GetCleanName(), group_inst->GetID(), bot_iter->GetBotID());
|
|
database.SetGroupLeaderName(group_inst->GetID(), bot_iter->GetName());
|
|
|
|
for (auto member_iter: r_group_members) {
|
|
if (member_iter.member->IsBot()) {
|
|
auto b_member = member_iter.member->CastToBot();
|
|
if (strcmp(b_member->GetName(), bot_iter->GetName()) == 0) {
|
|
bot_iter->SetFollowID(owner);
|
|
} else {
|
|
Bot::AddBotToGroup(b_member, group_inst);
|
|
}
|
|
Bot::RemoveBotFromRaid(b_member);
|
|
}
|
|
}
|
|
} else {
|
|
Bot::RemoveBotFromRaid(bot_iter);
|
|
}
|
|
}
|
|
}
|
|
|
|
uint8 Bot::GetNumberNeedingHealedInRaidGroup(uint8& need_healed, uint8 hpr, bool includePets, Raid* raid) {
|
|
|
|
if (raid) {
|
|
uint32 r_group = raid->GetGroup(GetName());
|
|
auto raid_group_members = raid->GetRaidGroupMembers(r_group);
|
|
|
|
for (auto& m: raid_group_members) {
|
|
if (m.member && !m.member->qglobal) {
|
|
if (m.member->GetHPRatio() <= hpr) {
|
|
need_healed++;
|
|
}
|
|
|
|
if (includePets) {
|
|
if (m.member->GetPet() && m.member->GetPet()->GetHPRatio() <= hpr) {
|
|
need_healed++;
|
|
}
|
|
}
|
|
}
|
|
}
|
|
}
|
|
return need_healed;
|
|
}
|
|
|
|
void Bot::ProcessRaidInvite(Mob* invitee, Client* invitor, bool group_invite) {
|
|
|
|
if (!invitee || !invitor) {
|
|
return;
|
|
}
|
|
|
|
if (invitee->IsBot() &&
|
|
invitor->HasRaid() &&
|
|
invitee->GetOwner()->HasRaid() &&
|
|
invitor->GetRaid()->IsRaidMember(invitee->GetOwner()->GetName())
|
|
) {
|
|
// If the Bot Owner is in our raid we need to be able to invite their Bots
|
|
}
|
|
else if (invitee->IsBot() && (invitee->CastToBot()->GetBotOwnerCharacterID() != invitor->CharacterID())) {
|
|
invitor->Message(
|
|
Chat::Red,
|
|
fmt::format(
|
|
"{} is not your Bot. You can only invite your own Bots, or Bots that belong to a Raid member.",
|
|
invitee->GetCleanName()
|
|
).c_str()
|
|
);
|
|
return;
|
|
}
|
|
|
|
Raid* raid = entity_list.GetRaidByClient(invitor);
|
|
|
|
Bot::CreateBotRaid(invitee, invitor, group_invite, raid);
|
|
}
|
|
|
|
void Bot::CreateBotRaid(Mob* invitee, Client* invitor, bool group_invite, Raid* raid) {
|
|
|
|
Group* g_invitee = invitee->GetGroup();
|
|
Group* g_invitor = invitor->GetGroup();
|
|
|
|
if (g_invitee && invitor->IsClient()) {
|
|
if (!g_invitee->IsLeader(invitee)) {
|
|
invitor->Message(
|
|
Chat::Red,
|
|
fmt::format(
|
|
"You can only invite group leaders or ungrouped bots. Try {} instead.",
|
|
g_invitee->GetLeader()->GetCleanName()
|
|
).c_str()
|
|
);
|
|
return;
|
|
}
|
|
}
|
|
|
|
bool new_raid = false;
|
|
if (!raid) {
|
|
new_raid = true;
|
|
raid = new Raid(invitor);
|
|
entity_list.AddRaid(raid);
|
|
raid->SetRaidDetails();
|
|
}
|
|
|
|
// Add Invitor to new raid
|
|
if (new_raid) {
|
|
if (g_invitor) {
|
|
ProcessBotGroupAdd(g_invitor, raid, nullptr, true, true);
|
|
} else {
|
|
raid->SendRaidCreate(invitor);
|
|
raid->AddMember(invitor, 0xFFFFFFFF, true, false, true);
|
|
raid->SendMakeLeaderPacketTo(invitor->GetName(), invitor);
|
|
if (raid->IsLocked()) {
|
|
raid->SendRaidLockTo(invitor);
|
|
}
|
|
}
|
|
}
|
|
|
|
// Add Bot Group or Client Bot Group to raid
|
|
if (g_invitee) {
|
|
ProcessBotGroupAdd(g_invitee, raid);
|
|
|
|
// Add individual client to raid
|
|
} else if (invitee->IsClient()) {
|
|
ProcessBotGroupAdd(g_invitee, raid, invitee->CastToClient());
|
|
|
|
// Add individual bot to raid
|
|
} else {
|
|
auto gid = raid->GetGroup(invitor->GetName());
|
|
auto b = invitee->CastToBot();
|
|
|
|
// gives us a choice to either invite directly into the clients Raid Group, or just into the Raid
|
|
if (group_invite && raid->GroupCount(gid) < MAX_GROUP_MEMBERS) {
|
|
raid->AddBot(b, gid);
|
|
} else {
|
|
raid->AddBot(b);
|
|
}
|
|
|
|
if (new_raid) {
|
|
invitee->SetFollowID(invitor->GetID());
|
|
}
|
|
}
|
|
}
|
|
|
|
void Bot::ProcessBotGroupAdd(Group* group, Raid* raid, Client* client, bool new_raid, bool initial) {
|
|
|
|
uint32 raid_free_group_id = raid->GetFreeGroup();
|
|
if (group) {
|
|
for (int x = 0; x < MAX_GROUP_MEMBERS; x++) {
|
|
if (group->members[x]) {
|
|
Client* c = nullptr;
|
|
Bot* b = nullptr;
|
|
|
|
if (group->members[x] && group->members[x]->IsBot()) {
|
|
b = group->members[x]->CastToBot();
|
|
raid->AddBot(b, raid_free_group_id, false, x == 0, false);
|
|
} else if (group->members[x] && group->members[x]->IsClient()) {
|
|
c = group->members[x]->CastToClient();
|
|
raid->SendRaidCreate(c);
|
|
raid->AddMember(
|
|
c,
|
|
raid_free_group_id,
|
|
new_raid,
|
|
x == 0,
|
|
false
|
|
);
|
|
raid->SendMakeLeaderPacketTo(raid->leadername, c);
|
|
raid->SendBulkRaid(c);
|
|
}
|
|
}
|
|
}
|
|
group->JoinRaidXTarget(raid, initial);
|
|
group->DisbandGroup(true);
|
|
} else if (client) {
|
|
raid->SendRaidCreate(client);
|
|
raid->AddMember(client, RAID_GROUPLESS, false, false, true);
|
|
raid->SendMakeLeaderPacketTo(raid->leadername, client);
|
|
raid->SendBulkRaid(client);
|
|
if (raid->IsLocked()) {
|
|
raid->SendRaidLockTo(client);
|
|
}
|
|
}
|
|
|
|
raid->GroupUpdate(raid_free_group_id);
|
|
}
|
|
|
|
|