mirror of
https://github.com/EQEmu/Server.git
synced 2026-06-28 05:07:37 +00:00
[Feature] Add RoF2 Guild features (#3699)
* [Feature] Add additional Guild Features This adds the following guild features and design pattern - the existing guild system was used - guild features are based on RoF2 within source with translaters used to converted between client differences - backward compatible with Ti and UF, and allows for mixed client servers - Guild Back for Ti and UF is based on RoF2 Permissions for banking if Guild Leader does not use Ti/UF - Guild Ranks and Permissions are enabled. - Guild Tributes are enabled. - Event logging via rules for donating tribute items and plat - Rules to limit Guild Tributes based on max level of server - Rewrote guild communications to client using specific opcodes -- Server no longer sends a guild member list on each zone -- Guild window is updated when a member levels, rank changes, zone changes, banker/alt status using individual opcodes -- When a member is removed or added to a guild, a single opcode is sent to each guild member -- This reduces network traffic considerably Known issues: - Visual bug only. Guild Tributes window will display a 0 for level if tribute is above max level rule setting. - Visual bug only. Guild Mgmt Window will not display an online member if the player has 'show offline' unchecked and a guild member zones within the Notes/Tribute tab. This is resolved by selecting and de-selecting the 'Show Offline' checkbox. * Updated RoF2 Guild Comms Updated RoF2 Guild Comms Update RoF2 Opcodes Rewrote RoF2 Guild Communications using specific opcodes. Added database changes - they are irreversible * Formatting * Update base_guild_members_repository.h * Format GuildInfo * Format GuildAction enum * Formatting in clientlist * quantity vs quantity * desc vs description * Format structs * Inline struct values * Formatting * Formatting * Formatting fixes * Formatting items * Formatting * Formatting * struct formatting updates * Updated formatting * Updated - std:string items - naming conventions - magic numbers * Repo refactors Other formatting updates * Remove test guild commands * Updated #guild info command * Add new repo methods for Neckolla ReplaceOne and ReplaceMany * Fix guild_tributes repo * Update database_update_manifest.cpp * Phase 1 of final testing with RoF2 -> RoF2. Next phase will be inter compatibility review * Remove #guild testing commands * Fix uf translator error Rewrite LoadGuilds * Use extended repository * FIx guild window on member add * LoadGuild Changes * Update guild_base.cpp * Few small fixes for display issue with UF * Update guild_base.cpp * Update guild_members_repository.h * Update zoneserver.cpp * Update guild.cpp * Update entity.h * Switch formatting * Formatting * Update worldserver.cpp * Switch formatting * Formatting switch statement * Update guild.cpp * Formatting in guild_base * We don't need to validate m_db everywhere * More formatting / spacing issues * Switch format * Update guild_base.cpp * Fix an UF issue displaying incorrect guildtag as <> * Updated several constants, fixed a few issues with Ti/UF and guild tributes not being removed or sent when a member is removed/disbands from a guild. * Formatting and logging updates * Fix for Loadguilds and permissions after repo updates. * Cleanup unnecessary m_db checks * Updated logging to use player_event_logs * Updated to use the single opcodes for guild traffic for Ti/UF/RoF2. Several enhancements for guild functionality for more reusable code and readability. * Update to fix Demote Self and guild invites declining when option set to not accept guild invites * Potential fix for guild notes/tribute display issues when client has 'Show Offline' unchecked. * Updates to fox recent master changes Updates to fix recent master changes * Updates in response to comments * Further Updates in response to comments * Comment updates and refactor for SendAppearance functions * Comment updates * Update client spawn process for show guild name Add show guild tag to default spawn process * Update to use zone spawn packets for RoF2 Removed several unused functions as a result Updated MemberRankUpdate to properly update guild_show on rank change. Updated OP_GuildURLAndChannel opcode for UF/RoF2 * Cleanup of world changes Created function for repetitive zonelist sendpackets to only booted zones Re-Inserted accidental delete of scanclosemobs * Fixes * Further world cleanup * Fix a few test guild bank cases for backward compat Removed a duplicate db call Fixed a fallthrough issue * Update guild_mgr.cpp * Cleanup --------- Co-authored-by: Akkadius <akkadius1@gmail.com>
This commit is contained in:
Mitch Freeman
GitHub
@@ -3,286 +3,47 @@
|
||||
|
||||
#include "../database.h"
|
||||
#include "../strings.h"
|
||||
#include "base/base_guild_bank_repository.h"
|
||||
|
||||
class GuildBankRepository {
|
||||
class GuildBankRepository: public BaseGuildBankRepository {
|
||||
public:
|
||||
struct GuildBank {
|
||||
int guildid;
|
||||
int8 area;
|
||||
int slot;
|
||||
int itemid;
|
||||
int qty;
|
||||
std::string donator;
|
||||
int8 permissions;
|
||||
std::string whofor;
|
||||
};
|
||||
|
||||
static std::string PrimaryKey()
|
||||
{
|
||||
return std::string("");
|
||||
}
|
||||
/**
|
||||
* This file was auto generated and can be modified and extended upon
|
||||
*
|
||||
* Base repository methods are automatically
|
||||
* generated in the "base" version of this repository. The base repository
|
||||
* is immutable and to be left untouched, while methods in this class
|
||||
* are used as extension methods for more specific persistence-layer
|
||||
* accessors or mutators.
|
||||
*
|
||||
* Base Methods (Subject to be expanded upon in time)
|
||||
*
|
||||
* Note: Not all tables are designed appropriately to fit functionality with all base methods
|
||||
*
|
||||
* InsertOne
|
||||
* UpdateOne
|
||||
* DeleteOne
|
||||
* FindOne
|
||||
* GetWhere(std::string where_filter)
|
||||
* DeleteWhere(std::string where_filter)
|
||||
* InsertMany
|
||||
* All
|
||||
*
|
||||
* Example custom methods in a repository
|
||||
*
|
||||
* GuildBankRepository::GetByZoneAndVersion(int zone_id, int zone_version)
|
||||
* GuildBankRepository::GetWhereNeverExpires()
|
||||
* GuildBankRepository::GetWhereXAndY()
|
||||
* GuildBankRepository::DeleteWhereXAndY()
|
||||
*
|
||||
* Most of the above could be covered by base methods, but if you as a developer
|
||||
* find yourself re-using logic for other parts of the code, its best to just make a
|
||||
* method that can be re-used easily elsewhere especially if it can use a base repository
|
||||
* method and encapsulate filters there
|
||||
*/
|
||||
|
||||
static std::vector<std::string> Columns()
|
||||
{
|
||||
return {
|
||||
"guildid",
|
||||
"area",
|
||||
"slot",
|
||||
"itemid",
|
||||
"qty",
|
||||
"donator",
|
||||
"permissions",
|
||||
"whofor",
|
||||
};
|
||||
}
|
||||
|
||||
static std::string ColumnsRaw()
|
||||
{
|
||||
return std::string(Strings::Implode(", ", Columns()));
|
||||
}
|
||||
|
||||
static std::string InsertColumnsRaw()
|
||||
{
|
||||
std::vector<std::string> insert_columns;
|
||||
|
||||
for (auto &column : Columns()) {
|
||||
if (column == PrimaryKey()) {
|
||||
continue;
|
||||
}
|
||||
|
||||
insert_columns.push_back(column);
|
||||
}
|
||||
|
||||
return std::string(Strings::Implode(", ", insert_columns));
|
||||
}
|
||||
|
||||
static std::string TableName()
|
||||
{
|
||||
return std::string("guild_bank");
|
||||
}
|
||||
|
||||
static std::string BaseSelect()
|
||||
{
|
||||
return fmt::format(
|
||||
"SELECT {} FROM {}",
|
||||
ColumnsRaw(),
|
||||
TableName()
|
||||
);
|
||||
}
|
||||
|
||||
static std::string BaseInsert()
|
||||
{
|
||||
return fmt::format(
|
||||
"INSERT INTO {} ({}) ",
|
||||
TableName(),
|
||||
InsertColumnsRaw()
|
||||
);
|
||||
}
|
||||
|
||||
static GuildBank NewEntity()
|
||||
{
|
||||
GuildBank entry{};
|
||||
|
||||
entry.guildid = 0;
|
||||
entry.area = 0;
|
||||
entry.slot = 0;
|
||||
entry.itemid = 0;
|
||||
entry.qty = 0;
|
||||
entry.donator = 0;
|
||||
entry.permissions = 0;
|
||||
entry.whofor = 0;
|
||||
|
||||
return entry;
|
||||
}
|
||||
|
||||
static GuildBank GetGuildBankEntry(
|
||||
const std::vector<GuildBank> &guild_banks,
|
||||
int guild_bank_id
|
||||
)
|
||||
{
|
||||
for (auto &guild_bank : guild_banks) {
|
||||
if (guild_bank. == guild_bank_id) {
|
||||
return guild_bank;
|
||||
}
|
||||
}
|
||||
|
||||
return NewEntity();
|
||||
}
|
||||
|
||||
static GuildBank FindOne(
|
||||
int guild_bank_id
|
||||
)
|
||||
{
|
||||
auto results = database.QueryDatabase(
|
||||
fmt::format(
|
||||
"{} WHERE id = {} LIMIT 1",
|
||||
BaseSelect(),
|
||||
guild_bank_id
|
||||
)
|
||||
);
|
||||
|
||||
auto row = results.begin();
|
||||
if (results.RowCount() == 1) {
|
||||
GuildBank entry{};
|
||||
|
||||
entry.guildid = atoi(row[0]);
|
||||
entry.area = atoi(row[1]);
|
||||
entry.slot = atoi(row[2]);
|
||||
entry.itemid = atoi(row[3]);
|
||||
entry.qty = atoi(row[4]);
|
||||
entry.donator = row[5];
|
||||
entry.permissions = atoi(row[6]);
|
||||
entry.whofor = row[7];
|
||||
|
||||
return entry;
|
||||
}
|
||||
|
||||
return NewEntity();
|
||||
}
|
||||
|
||||
static int DeleteOne(
|
||||
int guild_bank_id
|
||||
)
|
||||
{
|
||||
auto results = database.QueryDatabase(
|
||||
fmt::format(
|
||||
"DELETE FROM {} WHERE {} = {}",
|
||||
TableName(),
|
||||
PrimaryKey(),
|
||||
guild_bank_id
|
||||
)
|
||||
);
|
||||
|
||||
return (results.Success() ? results.RowsAffected() : 0);
|
||||
}
|
||||
|
||||
static int UpdateOne(
|
||||
GuildBank guild_bank_entry
|
||||
)
|
||||
{
|
||||
std::vector<std::string> update_values;
|
||||
|
||||
auto columns = Columns();
|
||||
|
||||
update_values.push_back(columns[0] + " = " + std::to_string(guild_bank_entry.guildid));
|
||||
update_values.push_back(columns[1] + " = " + std::to_string(guild_bank_entry.area));
|
||||
update_values.push_back(columns[2] + " = " + std::to_string(guild_bank_entry.slot));
|
||||
update_values.push_back(columns[3] + " = " + std::to_string(guild_bank_entry.itemid));
|
||||
update_values.push_back(columns[4] + " = " + std::to_string(guild_bank_entry.qty));
|
||||
update_values.push_back(columns[5] + " = '" + Strings::Escape(guild_bank_entry.donator) + "'");
|
||||
update_values.push_back(columns[6] + " = " + std::to_string(guild_bank_entry.permissions));
|
||||
update_values.push_back(columns[7] + " = '" + Strings::Escape(guild_bank_entry.whofor) + "'");
|
||||
|
||||
auto results = database.QueryDatabase(
|
||||
fmt::format(
|
||||
"UPDATE {} SET {} WHERE {} = {}",
|
||||
TableName(),
|
||||
Strings::Implode(", ", update_values),
|
||||
PrimaryKey(),
|
||||
guild_bank_entry.
|
||||
)
|
||||
);
|
||||
|
||||
return (results.Success() ? results.RowsAffected() : 0);
|
||||
}
|
||||
|
||||
static GuildBank InsertOne(
|
||||
GuildBank guild_bank_entry
|
||||
)
|
||||
{
|
||||
std::vector<std::string> insert_values;
|
||||
|
||||
insert_values.push_back(std::to_string(guild_bank_entry.guildid));
|
||||
insert_values.push_back(std::to_string(guild_bank_entry.area));
|
||||
insert_values.push_back(std::to_string(guild_bank_entry.slot));
|
||||
insert_values.push_back(std::to_string(guild_bank_entry.itemid));
|
||||
insert_values.push_back(std::to_string(guild_bank_entry.qty));
|
||||
insert_values.push_back("'" + Strings::Escape(guild_bank_entry.donator) + "'");
|
||||
insert_values.push_back(std::to_string(guild_bank_entry.permissions));
|
||||
insert_values.push_back("'" + Strings::Escape(guild_bank_entry.whofor) + "'");
|
||||
|
||||
auto results = database.QueryDatabase(
|
||||
fmt::format(
|
||||
"{} VALUES ({})",
|
||||
BaseInsert(),
|
||||
Strings::Implode(",", insert_values)
|
||||
)
|
||||
);
|
||||
|
||||
if (results.Success()) {
|
||||
guild_bank_entry.id = results.LastInsertedID();
|
||||
return guild_bank_entry;
|
||||
}
|
||||
|
||||
guild_bank_entry = InstanceListRepository::NewEntity();
|
||||
|
||||
return guild_bank_entry;
|
||||
}
|
||||
|
||||
static int InsertMany(
|
||||
std::vector<GuildBank> guild_bank_entries
|
||||
)
|
||||
{
|
||||
std::vector<std::string> insert_chunks;
|
||||
|
||||
for (auto &guild_bank_entry: guild_bank_entries) {
|
||||
std::vector<std::string> insert_values;
|
||||
|
||||
insert_values.push_back(std::to_string(guild_bank_entry.guildid));
|
||||
insert_values.push_back(std::to_string(guild_bank_entry.area));
|
||||
insert_values.push_back(std::to_string(guild_bank_entry.slot));
|
||||
insert_values.push_back(std::to_string(guild_bank_entry.itemid));
|
||||
insert_values.push_back(std::to_string(guild_bank_entry.qty));
|
||||
insert_values.push_back("'" + Strings::Escape(guild_bank_entry.donator) + "'");
|
||||
insert_values.push_back(std::to_string(guild_bank_entry.permissions));
|
||||
insert_values.push_back("'" + Strings::Escape(guild_bank_entry.whofor) + "'");
|
||||
|
||||
insert_chunks.push_back("(" + Strings::Implode(",", insert_values) + ")");
|
||||
}
|
||||
|
||||
std::vector<std::string> insert_values;
|
||||
|
||||
auto results = database.QueryDatabase(
|
||||
fmt::format(
|
||||
"{} VALUES {}",
|
||||
BaseInsert(),
|
||||
Strings::Implode(",", insert_chunks)
|
||||
)
|
||||
);
|
||||
|
||||
return (results.Success() ? results.RowsAffected() : 0);
|
||||
}
|
||||
|
||||
static std::vector<GuildBank> All()
|
||||
{
|
||||
std::vector<GuildBank> all_entries;
|
||||
|
||||
auto results = database.QueryDatabase(
|
||||
fmt::format(
|
||||
"{}",
|
||||
BaseSelect()
|
||||
)
|
||||
);
|
||||
|
||||
all_entries.reserve(results.RowCount());
|
||||
|
||||
for (auto row = results.begin(); row != results.end(); ++row) {
|
||||
GuildBank entry{};
|
||||
|
||||
entry.guildid = atoi(row[0]);
|
||||
entry.area = atoi(row[1]);
|
||||
entry.slot = atoi(row[2]);
|
||||
entry.itemid = atoi(row[3]);
|
||||
entry.qty = atoi(row[4]);
|
||||
entry.donator = row[5];
|
||||
entry.permissions = atoi(row[6]);
|
||||
entry.whofor = row[7];
|
||||
|
||||
all_entries.push_back(entry);
|
||||
}
|
||||
|
||||
return all_entries;
|
||||
}
|
||||
// Custom extended repository methods here
|
||||
|
||||
};
|
||||
|
||||
|
||||
Reference in New Issue
Block a user