mirror of
https://github.com/EQEmu/Server.git
synced 2026-05-16 22:58:34 +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
+177
-1
@@ -1,3 +1,4 @@
|
||||
|
||||
/* EQEMu: Everquest Server Emulator
|
||||
Copyright (C) 2001-2005 EQEMu Development Team (http://eqemulator.net)
|
||||
|
||||
@@ -47,6 +48,7 @@ Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
|
||||
#include "../common/events/player_event_logs.h"
|
||||
#include "../common/patches/patches.h"
|
||||
#include "../zone/data_bucket.h"
|
||||
#include "../common/repositories/guild_tributes_repository.h"
|
||||
|
||||
extern ClientList client_list;
|
||||
extern GroupLFPList LFPGroupList;
|
||||
@@ -978,7 +980,18 @@ void ZoneServer::HandleMessage(uint16 opcode, const EQ::Net::Packet &p) {
|
||||
case ServerOP_DeleteGuild:
|
||||
case ServerOP_GuildCharRefresh:
|
||||
case ServerOP_GuildMemberUpdate:
|
||||
case ServerOP_RefreshGuild: {
|
||||
case ServerOP_GuildPermissionUpdate:
|
||||
case ServerOP_GuildRankNameChange:
|
||||
case ServerOP_RefreshGuild:
|
||||
case ServerOP_GuildMemberLevelUpdate:
|
||||
case ServerOP_GuildMemberPublicNote:
|
||||
case ServerOP_GuildChannel:
|
||||
case ServerOP_GuildURL:
|
||||
case ServerOP_GuildMemberRemove:
|
||||
case ServerOP_GuildMemberAdd:
|
||||
case ServerOP_GuildSendGuildList:
|
||||
case ServerOP_GuildMembersList:
|
||||
{
|
||||
guild_mgr.ProcessZonePacket(pack);
|
||||
break;
|
||||
}
|
||||
@@ -1552,6 +1565,169 @@ void ZoneServer::HandleMessage(uint16 opcode, const EQ::Net::Packet &p) {
|
||||
|
||||
break;
|
||||
}
|
||||
case ServerOP_GuildTributeUpdate: {
|
||||
auto data = (GuildTributeUpdate *)pack->pBuffer;
|
||||
auto guild = guild_mgr.GetGuildByGuildID(data->guild_id);
|
||||
|
||||
if (guild) {
|
||||
guild->tribute.enabled = 0;
|
||||
guild->tribute.id_1 = data->tribute_id_1;
|
||||
guild->tribute.id_2 = data->tribute_id_2;
|
||||
guild->tribute.id_1_tier = data->tribute_id_1_tier;
|
||||
guild->tribute.id_2_tier = data->tribute_id_2_tier;
|
||||
guild->tribute.time_remaining = RuleI(Guild, TributeTime);
|
||||
|
||||
guild->tribute.timer.Disable();
|
||||
|
||||
zoneserver_list.SendPacketToBootedZones(pack);
|
||||
}
|
||||
break;
|
||||
}
|
||||
case ServerOP_GuildTributeActivate: {
|
||||
auto data = (GuildTributeUpdate *)pack->pBuffer;
|
||||
auto guild = guild_mgr.GetGuildByGuildID(data->guild_id);
|
||||
|
||||
if (guild) {
|
||||
guild->tribute.enabled = data->enabled;
|
||||
|
||||
if (guild->tribute.enabled) {
|
||||
data->enabled = 1;
|
||||
if (guild->tribute.time_remaining == RuleI(Guild, TributeTime)) {
|
||||
data->favor = (guild->tribute.favor -= guild_mgr.GetGuildTributeCost(data->guild_id));
|
||||
}
|
||||
data->time_remaining = guild->tribute.time_remaining;
|
||||
data->tribute_id_1 = guild->tribute.id_1;
|
||||
data->tribute_id_2 = guild->tribute.id_2;
|
||||
data->tribute_id_1_tier = guild->tribute.id_1_tier;
|
||||
data->tribute_id_2_tier = guild->tribute.id_2_tier;
|
||||
|
||||
guild->tribute.timer.Start(guild->tribute.time_remaining);
|
||||
LogInfo("Guild Tribute Timer Started.");
|
||||
}
|
||||
else {
|
||||
if (guild->tribute.timer.Enabled()) {
|
||||
guild->tribute.time_remaining = guild->tribute.timer.GetRemainingTime();
|
||||
}
|
||||
data->enabled = 0;
|
||||
data->favor = guild->tribute.favor;
|
||||
data->time_remaining = guild->tribute.time_remaining;
|
||||
data->tribute_id_1 = guild->tribute.id_1;
|
||||
data->tribute_id_2 = guild->tribute.id_2;
|
||||
data->tribute_id_1_tier = guild->tribute.id_1_tier;
|
||||
data->tribute_id_2_tier = guild->tribute.id_2_tier;
|
||||
LogInfo("Guild Tribute Timer Stopped with {} ms remaining.", data->time_remaining);
|
||||
guild->tribute.timer.Disable();
|
||||
}
|
||||
guild_mgr.UpdateDbGuildTributeEnabled(data->guild_id, data->enabled);
|
||||
guild_mgr.UpdateDbGuildFavor(data->guild_id, data->favor);
|
||||
guild_mgr.UpdateDbTributeTimeRemaining(data->guild_id, data->time_remaining);
|
||||
|
||||
zoneserver_list.SendPacketToBootedZones(pack);
|
||||
}
|
||||
break;
|
||||
}
|
||||
case ServerOP_GuildTributeOptInToggle:
|
||||
{
|
||||
auto in = (GuildTributeMemberToggle *)pack->pBuffer;
|
||||
auto guild = guild_mgr.GetGuildByGuildID(in->guild_id);
|
||||
auto c = client_list.FindCharacter(in->player_name);
|
||||
if (c) {
|
||||
c->SetGuildTributeOptIn(in->tribute_toggle ? true : false);
|
||||
}
|
||||
|
||||
auto cle = client_list.FindCLEByCharacterID(in->char_id);
|
||||
if (cle) {
|
||||
cle->SetGuildTributeOptIn(in->tribute_toggle ? true : false);
|
||||
}
|
||||
|
||||
if (guild) {
|
||||
CharGuildInfo gci;
|
||||
guild_mgr.GetCharInfo(in->char_id, gci);
|
||||
|
||||
auto out = new ServerPacket(ServerOP_GuildTributeOptInToggle, sizeof(GuildTributeMemberToggle));
|
||||
auto data = (GuildTributeMemberToggle *)out->pBuffer;
|
||||
|
||||
data->char_id = in->char_id;
|
||||
data->command = in->command;
|
||||
data->tribute_toggle = in->tribute_toggle;
|
||||
data->no_donations = gci.total_tribute;
|
||||
data->member_last_donated = gci.last_tribute;
|
||||
data->guild_id = in->guild_id;
|
||||
data->time_remaining = in->time_remaining;
|
||||
strn0cpy(data->player_name, in->player_name, sizeof(data->player_name));
|
||||
|
||||
zoneserver_list.SendPacketToBootedZones(out);
|
||||
safe_delete(out);
|
||||
}
|
||||
break;
|
||||
}
|
||||
case ServerOP_RequestGuildActiveTributes:
|
||||
{
|
||||
auto in = (GuildTributeUpdate *)pack->pBuffer;
|
||||
auto guild = guild_mgr.GetGuildByGuildID(in->guild_id);
|
||||
|
||||
if (guild) {
|
||||
auto sp = new ServerPacket(ServerOP_RequestGuildActiveTributes, sizeof(GuildTributeUpdate));
|
||||
auto out = (GuildTributeUpdate *)sp->pBuffer;
|
||||
|
||||
out->guild_id = in->guild_id;
|
||||
out->enabled = guild->tribute.enabled;
|
||||
out->favor = guild->tribute.favor;
|
||||
out->tribute_id_1 = guild->tribute.id_1;
|
||||
out->tribute_id_2 = guild->tribute.id_2;
|
||||
out->tribute_id_1_tier = guild->tribute.id_1_tier;
|
||||
out->tribute_id_2_tier = guild->tribute.id_2_tier;
|
||||
out->time_remaining = guild_mgr.GetGuildTributeTimeRemaining(in->guild_id);
|
||||
|
||||
zoneserver_list.SendPacketToBootedZones(sp);
|
||||
safe_delete(sp);
|
||||
}
|
||||
|
||||
break;
|
||||
}
|
||||
case ServerOP_RequestGuildFavorAndTimer:
|
||||
{
|
||||
auto in = (GuildTributeUpdate *)pack->pBuffer;
|
||||
auto guild = guild_mgr.GetGuildByGuildID(in->guild_id);
|
||||
|
||||
if (guild) {
|
||||
auto sp = new ServerPacket(ServerOP_RequestGuildFavorAndTimer, sizeof(GuildTributeFavorTimer_Struct));
|
||||
auto out = (GuildTributeFavorTimer_Struct *) sp->pBuffer;
|
||||
|
||||
out->guild_id = in->guild_id;
|
||||
out->guild_favor = guild->tribute.favor;
|
||||
out->tribute_timer = guild_mgr.GetGuildTributeTimeRemaining(in->guild_id);
|
||||
out->trophy_timer = 0;
|
||||
|
||||
zoneserver_list.SendPacketToBootedZones(sp);
|
||||
safe_delete(sp);
|
||||
}
|
||||
|
||||
break;
|
||||
}
|
||||
case ServerOP_GuildTributeUpdateDonations:
|
||||
{
|
||||
auto in = (GuildTributeUpdate*)pack->pBuffer;
|
||||
auto guild = guild_mgr.GetGuildByGuildID(in->guild_id);
|
||||
|
||||
if (guild) {
|
||||
guild->tribute.favor = in->favor;
|
||||
guild_mgr.SendGuildTributeFavorAndTimer(in->guild_id, guild->tribute.favor, guild_mgr.GetGuildTributeTimeRemaining(in->guild_id)/*guild->tribute.timer.GetRemainingTime()*/);
|
||||
|
||||
auto sp = new ServerPacket(ServerOP_GuildTributeUpdateDonations, sizeof(GuildTributeUpdate));
|
||||
auto out = (GuildTributeUpdate *) sp->pBuffer;
|
||||
|
||||
out->guild_id = in->guild_id;
|
||||
out->member_favor = in->member_favor;
|
||||
out->member_enabled = in->member_enabled ? true : false;
|
||||
out->member_time = in->member_time;
|
||||
strn0cpy(out->player_name, in->player_name, sizeof(out->player_name));
|
||||
|
||||
zoneserver_list.SendPacketToBootedZones(sp);
|
||||
safe_delete(sp)
|
||||
}
|
||||
break;
|
||||
}
|
||||
default: {
|
||||
LogInfo("Unknown ServerOPcode from zone {:#04x}, size [{}]", pack->opcode, pack->size);
|
||||
DumpPacket(pack->pBuffer, pack->size);
|
||||
|
||||
Reference in New Issue
Block a user