mirror of
https://github.com/EQEmu/Server.git
synced 2026-05-31 00:46:46 +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:
+86
-10
@@ -5,6 +5,7 @@
|
||||
#include "../common/packet_functions.h"
|
||||
#include "../common/eq_packet_structs.h"
|
||||
#include "../common/net/packet.h"
|
||||
#include "../common/guilds.h"
|
||||
#include <cereal/cereal.hpp>
|
||||
#include <cereal/archives/binary.hpp>
|
||||
#include <cereal/types/chrono.hpp>
|
||||
@@ -94,6 +95,23 @@
|
||||
#define ServerOP_WebInterfaceEvent 0x0066
|
||||
#define ServerOP_WebInterfaceSubscribe 0x0067
|
||||
#define ServerOP_WebInterfaceUnsubscribe 0x0068
|
||||
#define ServerOP_GuildPermissionUpdate 0x0069
|
||||
#define ServerOP_GuildTributeUpdate 0x0070
|
||||
#define ServerOP_GuildRankNameChange 0x0071
|
||||
#define ServerOP_GuildTributeActivate 0x0072
|
||||
#define ServerOP_GuildTributeOptInToggle 0x0073
|
||||
#define ServerOP_GuildTributeFavAndTimer 0x0074
|
||||
#define ServerOP_RequestGuildActiveTributes 0x0075
|
||||
#define ServerOP_RequestGuildFavorAndTimer 0x0076
|
||||
#define ServerOP_GuildTributeUpdateDonations 0x0077
|
||||
#define ServerOP_GuildMemberLevelUpdate 0x0078
|
||||
#define ServerOP_GuildMemberPublicNote 0x0079
|
||||
#define ServerOP_GuildMemberRemove 0x007A
|
||||
#define ServerOP_GuildMemberAdd 0x007B
|
||||
#define ServerOP_GuildChannel 0x007C
|
||||
#define ServerOP_GuildURL 0x007D
|
||||
#define ServerOP_GuildSendGuildList 0x007E
|
||||
#define ServerOP_GuildMembersList 0x007F
|
||||
|
||||
#define ServerOP_RaidAdd 0x0100 //in use
|
||||
#define ServerOP_RaidRemove 0x0101 //in use
|
||||
@@ -567,6 +585,8 @@ struct ServerClientList_Struct {
|
||||
uint8 anon;
|
||||
bool tellsoff;
|
||||
uint32 guild_id;
|
||||
uint32 guild_rank;
|
||||
bool guild_tribute_opt_in;
|
||||
bool LFG;
|
||||
uint8 gm;
|
||||
uint8 ClientVersion;
|
||||
@@ -1006,19 +1026,34 @@ struct ServerGuildCharRefresh_Struct {
|
||||
uint32 char_id;
|
||||
};
|
||||
|
||||
struct ServerGuildRankUpdate_Struct
|
||||
{
|
||||
uint32 GuildID;
|
||||
char MemberName[64];
|
||||
uint32 Rank;
|
||||
uint32 Banker;
|
||||
struct ServerGuildRankUpdate_Struct {
|
||||
uint32 guild_id;
|
||||
char member_name[64];
|
||||
uint32 rank;
|
||||
uint32 banker;
|
||||
uint32 alt;
|
||||
bool no_update;
|
||||
};
|
||||
|
||||
struct ServerGuildMemberUpdate_Struct {
|
||||
uint32 GuildID;
|
||||
char MemberName[64];
|
||||
uint32 ZoneID;
|
||||
uint32 LastSeen;
|
||||
uint32 guild_id;
|
||||
char member_name[64];
|
||||
uint32 zone_id;
|
||||
uint32 last_seen;
|
||||
};
|
||||
|
||||
struct ServerGuildPermissionUpdate_Struct {
|
||||
uint32 guild_id;
|
||||
char member_name[64];
|
||||
uint32 rank;
|
||||
uint32 function_id;
|
||||
uint32 function_value;
|
||||
};
|
||||
|
||||
struct ServerGuildRankNameChange {
|
||||
uint32 guild_id;
|
||||
uint32 rank;
|
||||
char rank_name[51]; //RoF2 has 51 max.
|
||||
};
|
||||
|
||||
struct SpawnPlayerCorpse_Struct {
|
||||
@@ -1857,6 +1892,47 @@ struct ServerZoneStatus_Struct {
|
||||
int16 admin;
|
||||
};
|
||||
|
||||
struct GuildTributeUpdate {
|
||||
uint32 guild_id;
|
||||
uint32 tribute_id_1;
|
||||
uint32 tribute_id_2;
|
||||
uint32 tribute_id_1_tier;
|
||||
uint32 tribute_id_2_tier;
|
||||
uint32 enabled;
|
||||
uint32 favor;
|
||||
uint32 time_remaining;
|
||||
uint32 member_favor;
|
||||
uint32 member_time;
|
||||
uint32 member_enabled;
|
||||
char player_name[64];
|
||||
};
|
||||
|
||||
struct GuildTributeMemberToggle {
|
||||
uint32 guild_id;
|
||||
uint32 char_id;
|
||||
char player_name[64];
|
||||
uint32 tribute_toggle;
|
||||
uint32 command;
|
||||
uint32 time_remaining;
|
||||
uint32 no_donations;
|
||||
uint32 member_last_donated;
|
||||
};
|
||||
|
||||
struct ServerOP_GuildMessage_Struct {
|
||||
uint32 guild_id{GUILD_NONE};
|
||||
char player_name[64]{0};
|
||||
uint32 player_level{0};
|
||||
uint32 player_class{0};
|
||||
uint32 player_rank{GUILD_RANK_NONE};
|
||||
uint32 player_zone_id{0};
|
||||
bool player_offline{false};
|
||||
char player_new_name[64]{0};
|
||||
char new_guild_name[64]{0};
|
||||
char note[256]{0};
|
||||
char channel[2048]{0};
|
||||
char url[2048]{0};
|
||||
};
|
||||
|
||||
#pragma pack()
|
||||
|
||||
#endif
|
||||
|
||||
Reference in New Issue
Block a user