mirror of
https://github.com/EQEmu/Server.git
synced 2025-12-24 13:11: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>
425 lines
9.6 KiB
C++
425 lines
9.6 KiB
C++
/**
|
|
* DO NOT MODIFY THIS FILE
|
|
*
|
|
* This repository was automatically generated and is NOT to be modified directly.
|
|
* Any repository modifications are meant to be made to the repository extending the base.
|
|
* Any modifications to base repositories are to be made by the generator only
|
|
*
|
|
* @generator ./utils/scripts/generators/repository-generator.pl
|
|
* @docs https://eqemu.gitbook.io/server/in-development/developer-area/repositories
|
|
*/
|
|
|
|
#ifndef EQEMU_BASE_RAID_MEMBERS_REPOSITORY_H
|
|
#define EQEMU_BASE_RAID_MEMBERS_REPOSITORY_H
|
|
|
|
#include "../../database.h"
|
|
#include "../../strings.h"
|
|
#include <ctime>
|
|
|
|
|
|
class BaseRaidMembersRepository {
|
|
public:
|
|
struct RaidMembers {
|
|
uint64_t id;
|
|
int32_t raidid;
|
|
int32_t charid;
|
|
int32_t bot_id;
|
|
uint32_t groupid;
|
|
int8_t _class;
|
|
int8_t level;
|
|
std::string name;
|
|
int8_t isgroupleader;
|
|
int8_t israidleader;
|
|
int8_t islooter;
|
|
};
|
|
|
|
static std::string PrimaryKey()
|
|
{
|
|
return std::string("id");
|
|
}
|
|
|
|
static std::vector<std::string> Columns()
|
|
{
|
|
return {
|
|
"id",
|
|
"raidid",
|
|
"charid",
|
|
"bot_id",
|
|
"groupid",
|
|
"_class",
|
|
"level",
|
|
"name",
|
|
"isgroupleader",
|
|
"israidleader",
|
|
"islooter",
|
|
};
|
|
}
|
|
|
|
static std::vector<std::string> SelectColumns()
|
|
{
|
|
return {
|
|
"id",
|
|
"raidid",
|
|
"charid",
|
|
"bot_id",
|
|
"groupid",
|
|
"_class",
|
|
"level",
|
|
"name",
|
|
"isgroupleader",
|
|
"israidleader",
|
|
"islooter",
|
|
};
|
|
}
|
|
|
|
static std::string ColumnsRaw()
|
|
{
|
|
return std::string(Strings::Implode(", ", Columns()));
|
|
}
|
|
|
|
static std::string SelectColumnsRaw()
|
|
{
|
|
return std::string(Strings::Implode(", ", SelectColumns()));
|
|
}
|
|
|
|
static std::string TableName()
|
|
{
|
|
return std::string("raid_members");
|
|
}
|
|
|
|
static std::string BaseSelect()
|
|
{
|
|
return fmt::format(
|
|
"SELECT {} FROM {}",
|
|
SelectColumnsRaw(),
|
|
TableName()
|
|
);
|
|
}
|
|
|
|
static std::string BaseInsert()
|
|
{
|
|
return fmt::format(
|
|
"INSERT INTO {} ({}) ",
|
|
TableName(),
|
|
ColumnsRaw()
|
|
);
|
|
}
|
|
|
|
static RaidMembers NewEntity()
|
|
{
|
|
RaidMembers e{};
|
|
|
|
e.id = 0;
|
|
e.raidid = 0;
|
|
e.charid = 0;
|
|
e.bot_id = 0;
|
|
e.groupid = 0;
|
|
e._class = 0;
|
|
e.level = 0;
|
|
e.name = "";
|
|
e.isgroupleader = 0;
|
|
e.israidleader = 0;
|
|
e.islooter = 0;
|
|
|
|
return e;
|
|
}
|
|
|
|
static RaidMembers GetRaidMembers(
|
|
const std::vector<RaidMembers> &raid_memberss,
|
|
int raid_members_id
|
|
)
|
|
{
|
|
for (auto &raid_members : raid_memberss) {
|
|
if (raid_members.id == raid_members_id) {
|
|
return raid_members;
|
|
}
|
|
}
|
|
|
|
return NewEntity();
|
|
}
|
|
|
|
static RaidMembers FindOne(
|
|
Database& db,
|
|
int raid_members_id
|
|
)
|
|
{
|
|
auto results = db.QueryDatabase(
|
|
fmt::format(
|
|
"{} WHERE {} = {} LIMIT 1",
|
|
BaseSelect(),
|
|
PrimaryKey(),
|
|
raid_members_id
|
|
)
|
|
);
|
|
|
|
auto row = results.begin();
|
|
if (results.RowCount() == 1) {
|
|
RaidMembers e{};
|
|
|
|
e.id = strtoull(row[0], nullptr, 10);
|
|
e.raidid = static_cast<int32_t>(atoi(row[1]));
|
|
e.charid = static_cast<int32_t>(atoi(row[2]));
|
|
e.bot_id = static_cast<int32_t>(atoi(row[3]));
|
|
e.groupid = static_cast<uint32_t>(strtoul(row[4], nullptr, 10));
|
|
e._class = static_cast<int8_t>(atoi(row[5]));
|
|
e.level = static_cast<int8_t>(atoi(row[6]));
|
|
e.name = row[7] ? row[7] : "";
|
|
e.isgroupleader = static_cast<int8_t>(atoi(row[8]));
|
|
e.israidleader = static_cast<int8_t>(atoi(row[9]));
|
|
e.islooter = static_cast<int8_t>(atoi(row[10]));
|
|
|
|
return e;
|
|
}
|
|
|
|
return NewEntity();
|
|
}
|
|
|
|
static int DeleteOne(
|
|
Database& db,
|
|
int raid_members_id
|
|
)
|
|
{
|
|
auto results = db.QueryDatabase(
|
|
fmt::format(
|
|
"DELETE FROM {} WHERE {} = {}",
|
|
TableName(),
|
|
PrimaryKey(),
|
|
raid_members_id
|
|
)
|
|
);
|
|
|
|
return (results.Success() ? results.RowsAffected() : 0);
|
|
}
|
|
|
|
static int UpdateOne(
|
|
Database& db,
|
|
const RaidMembers &e
|
|
)
|
|
{
|
|
std::vector<std::string> v;
|
|
|
|
auto columns = Columns();
|
|
|
|
v.push_back(columns[1] + " = " + std::to_string(e.raidid));
|
|
v.push_back(columns[2] + " = " + std::to_string(e.charid));
|
|
v.push_back(columns[3] + " = " + std::to_string(e.bot_id));
|
|
v.push_back(columns[4] + " = " + std::to_string(e.groupid));
|
|
v.push_back(columns[5] + " = " + std::to_string(e._class));
|
|
v.push_back(columns[6] + " = " + std::to_string(e.level));
|
|
v.push_back(columns[7] + " = '" + Strings::Escape(e.name) + "'");
|
|
v.push_back(columns[8] + " = " + std::to_string(e.isgroupleader));
|
|
v.push_back(columns[9] + " = " + std::to_string(e.israidleader));
|
|
v.push_back(columns[10] + " = " + std::to_string(e.islooter));
|
|
|
|
auto results = db.QueryDatabase(
|
|
fmt::format(
|
|
"UPDATE {} SET {} WHERE {} = {}",
|
|
TableName(),
|
|
Strings::Implode(", ", v),
|
|
PrimaryKey(),
|
|
e.id
|
|
)
|
|
);
|
|
|
|
return (results.Success() ? results.RowsAffected() : 0);
|
|
}
|
|
|
|
static RaidMembers InsertOne(
|
|
Database& db,
|
|
RaidMembers e
|
|
)
|
|
{
|
|
std::vector<std::string> v;
|
|
|
|
v.push_back(std::to_string(e.id));
|
|
v.push_back(std::to_string(e.raidid));
|
|
v.push_back(std::to_string(e.charid));
|
|
v.push_back(std::to_string(e.bot_id));
|
|
v.push_back(std::to_string(e.groupid));
|
|
v.push_back(std::to_string(e._class));
|
|
v.push_back(std::to_string(e.level));
|
|
v.push_back("'" + Strings::Escape(e.name) + "'");
|
|
v.push_back(std::to_string(e.isgroupleader));
|
|
v.push_back(std::to_string(e.israidleader));
|
|
v.push_back(std::to_string(e.islooter));
|
|
|
|
auto results = db.QueryDatabase(
|
|
fmt::format(
|
|
"{} VALUES ({})",
|
|
BaseInsert(),
|
|
Strings::Implode(",", v)
|
|
)
|
|
);
|
|
|
|
if (results.Success()) {
|
|
e.id = results.LastInsertedID();
|
|
return e;
|
|
}
|
|
|
|
e = NewEntity();
|
|
|
|
return e;
|
|
}
|
|
|
|
static int InsertMany(
|
|
Database& db,
|
|
const std::vector<RaidMembers> &entries
|
|
)
|
|
{
|
|
std::vector<std::string> insert_chunks;
|
|
|
|
for (auto &e: entries) {
|
|
std::vector<std::string> v;
|
|
|
|
v.push_back(std::to_string(e.id));
|
|
v.push_back(std::to_string(e.raidid));
|
|
v.push_back(std::to_string(e.charid));
|
|
v.push_back(std::to_string(e.bot_id));
|
|
v.push_back(std::to_string(e.groupid));
|
|
v.push_back(std::to_string(e._class));
|
|
v.push_back(std::to_string(e.level));
|
|
v.push_back("'" + Strings::Escape(e.name) + "'");
|
|
v.push_back(std::to_string(e.isgroupleader));
|
|
v.push_back(std::to_string(e.israidleader));
|
|
v.push_back(std::to_string(e.islooter));
|
|
|
|
insert_chunks.push_back("(" + Strings::Implode(",", v) + ")");
|
|
}
|
|
|
|
std::vector<std::string> v;
|
|
|
|
auto results = db.QueryDatabase(
|
|
fmt::format(
|
|
"{} VALUES {}",
|
|
BaseInsert(),
|
|
Strings::Implode(",", insert_chunks)
|
|
)
|
|
);
|
|
|
|
return (results.Success() ? results.RowsAffected() : 0);
|
|
}
|
|
|
|
static std::vector<RaidMembers> All(Database& db)
|
|
{
|
|
std::vector<RaidMembers> all_entries;
|
|
|
|
auto results = db.QueryDatabase(
|
|
fmt::format(
|
|
"{}",
|
|
BaseSelect()
|
|
)
|
|
);
|
|
|
|
all_entries.reserve(results.RowCount());
|
|
|
|
for (auto row = results.begin(); row != results.end(); ++row) {
|
|
RaidMembers e{};
|
|
|
|
e.id = strtoull(row[0], nullptr, 10);
|
|
e.raidid = static_cast<int32_t>(atoi(row[1]));
|
|
e.charid = static_cast<int32_t>(atoi(row[2]));
|
|
e.bot_id = static_cast<int32_t>(atoi(row[3]));
|
|
e.groupid = static_cast<uint32_t>(strtoul(row[4], nullptr, 10));
|
|
e._class = static_cast<int8_t>(atoi(row[5]));
|
|
e.level = static_cast<int8_t>(atoi(row[6]));
|
|
e.name = row[7] ? row[7] : "";
|
|
e.isgroupleader = static_cast<int8_t>(atoi(row[8]));
|
|
e.israidleader = static_cast<int8_t>(atoi(row[9]));
|
|
e.islooter = static_cast<int8_t>(atoi(row[10]));
|
|
|
|
all_entries.push_back(e);
|
|
}
|
|
|
|
return all_entries;
|
|
}
|
|
|
|
static std::vector<RaidMembers> GetWhere(Database& db, const std::string &where_filter)
|
|
{
|
|
std::vector<RaidMembers> all_entries;
|
|
|
|
auto results = db.QueryDatabase(
|
|
fmt::format(
|
|
"{} WHERE {}",
|
|
BaseSelect(),
|
|
where_filter
|
|
)
|
|
);
|
|
|
|
all_entries.reserve(results.RowCount());
|
|
|
|
for (auto row = results.begin(); row != results.end(); ++row) {
|
|
RaidMembers e{};
|
|
|
|
e.id = strtoull(row[0], nullptr, 10);
|
|
e.raidid = static_cast<int32_t>(atoi(row[1]));
|
|
e.charid = static_cast<int32_t>(atoi(row[2]));
|
|
e.bot_id = static_cast<int32_t>(atoi(row[3]));
|
|
e.groupid = static_cast<uint32_t>(strtoul(row[4], nullptr, 10));
|
|
e._class = static_cast<int8_t>(atoi(row[5]));
|
|
e.level = static_cast<int8_t>(atoi(row[6]));
|
|
e.name = row[7] ? row[7] : "";
|
|
e.isgroupleader = static_cast<int8_t>(atoi(row[8]));
|
|
e.israidleader = static_cast<int8_t>(atoi(row[9]));
|
|
e.islooter = static_cast<int8_t>(atoi(row[10]));
|
|
|
|
all_entries.push_back(e);
|
|
}
|
|
|
|
return all_entries;
|
|
}
|
|
|
|
static int DeleteWhere(Database& db, const std::string &where_filter)
|
|
{
|
|
auto results = db.QueryDatabase(
|
|
fmt::format(
|
|
"DELETE FROM {} WHERE {}",
|
|
TableName(),
|
|
where_filter
|
|
)
|
|
);
|
|
|
|
return (results.Success() ? results.RowsAffected() : 0);
|
|
}
|
|
|
|
static int Truncate(Database& db)
|
|
{
|
|
auto results = db.QueryDatabase(
|
|
fmt::format(
|
|
"TRUNCATE TABLE {}",
|
|
TableName()
|
|
)
|
|
);
|
|
|
|
return (results.Success() ? results.RowsAffected() : 0);
|
|
}
|
|
|
|
static int64 GetMaxId(Database& db)
|
|
{
|
|
auto results = db.QueryDatabase(
|
|
fmt::format(
|
|
"SELECT COALESCE(MAX({}), 0) FROM {}",
|
|
PrimaryKey(),
|
|
TableName()
|
|
)
|
|
);
|
|
|
|
return (results.Success() && results.begin()[0] ? strtoll(results.begin()[0], nullptr, 10) : 0);
|
|
}
|
|
|
|
static int64 Count(Database& db, const std::string &where_filter = "")
|
|
{
|
|
auto results = db.QueryDatabase(
|
|
fmt::format(
|
|
"SELECT COUNT(*) FROM {} {}",
|
|
TableName(),
|
|
(where_filter.empty() ? "" : "WHERE " + where_filter)
|
|
)
|
|
);
|
|
|
|
return (results.Success() && results.begin()[0] ? strtoll(results.begin()[0], nullptr, 10) : 0);
|
|
}
|
|
|
|
};
|
|
|
|
#endif //EQEMU_BASE_RAID_MEMBERS_REPOSITORY_H
|