mirror of
https://github.com/EQEmu/Server.git
synced 2026-09-02 20:56: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:
@@ -27,10 +27,12 @@
|
||||
#include "../common/database_schema.h"
|
||||
#include "../common/zone_store.h"
|
||||
#include "worlddb.h"
|
||||
#include "wguild_mgr.h"
|
||||
#include "world_config.h"
|
||||
|
||||
extern ZSList zoneserver_list;
|
||||
extern ClientList client_list;
|
||||
extern ZSList zoneserver_list;
|
||||
extern ClientList client_list;
|
||||
extern WorldGuildManager guild_mgr;
|
||||
|
||||
void callGetZoneList(Json::Value &response)
|
||||
{
|
||||
@@ -277,7 +279,63 @@ void EQEmuApiWorldDataService::get(Json::Value &r, const std::vector<std::string
|
||||
if (m == "reload") {
|
||||
reload(r, args);
|
||||
}
|
||||
if (m == "get_guild_details") {
|
||||
callGetGuildDetails(r, args);
|
||||
}
|
||||
if (m == "lock_status") {
|
||||
r["locked"] = WorldConfig::get()->Locked;
|
||||
}
|
||||
}
|
||||
|
||||
void EQEmuApiWorldDataService::callGetGuildDetails(Json::Value &response, const std::vector<std::string> &args)
|
||||
{
|
||||
|
||||
std::string command = !args[1].empty() ? args[1] : "";
|
||||
if (command.empty()) {
|
||||
return;
|
||||
}
|
||||
Json::Value row;
|
||||
|
||||
auto guild_id = Strings::ToUnsignedInt(command);
|
||||
if (!guild_id) {
|
||||
row = "useage is: api get_guild_details ### where ### is a valid guild id.";
|
||||
return;
|
||||
}
|
||||
auto guild = guild_mgr.GetGuildByGuildID(guild_id);
|
||||
if (!guild) {
|
||||
row = fmt::format("Could not find guild id {}", guild_id);
|
||||
return;
|
||||
}
|
||||
|
||||
row["guild_id"] = command;
|
||||
row["guild_name"] = guild->name;
|
||||
row["leader_id"] = guild->leader;
|
||||
row["min_status"] = guild->minstatus;
|
||||
row["motd"] = guild->motd;
|
||||
row["motd_setter"] = guild->motd_setter;
|
||||
row["url"] = guild->url;
|
||||
row["channel"] = guild->channel;
|
||||
|
||||
for (int i = GUILD_LEADER; i <= GUILD_RECRUIT; i++) {
|
||||
row["Ranks"][i] = guild->rank_names[i].c_str();
|
||||
}
|
||||
|
||||
for (int i = 1; i <= GUILD_MAX_FUNCTIONS; i++) {
|
||||
row["functions"][i]["db_id"] = guild->functions[i].id;
|
||||
row["functions"][i]["perm_id"] = guild->functions[i].perm_id;
|
||||
row["functions"][i]["guild_id"] = guild->functions[i].guild_id;
|
||||
row["functions"][i]["perm_value"] = guild->functions[i].perm_value;
|
||||
}
|
||||
|
||||
row["tribute"]["favor"] = guild->tribute.favor;
|
||||
row["tribute"]["id1"] = guild->tribute.id_1;
|
||||
row["tribute"]["id1_tier"] = guild->tribute.id_1_tier;
|
||||
row["tribute"]["id2"] = guild->tribute.id_2;
|
||||
row["tribute"]["id2_tier"] = guild->tribute.id_2_tier;
|
||||
row["tribute"]["time_remaining"] = guild->tribute.time_remaining;
|
||||
row["tribute"]["enabled"] = guild->tribute.enabled;
|
||||
|
||||
client_list.GetGuildClientList(response, guild_id);
|
||||
|
||||
response.append(row);
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user