mirror of
https://github.com/EQEmu/Server.git
synced 2026-09-05 15:36:38 +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:
+30
-1
@@ -718,8 +718,16 @@ public:
|
||||
|
||||
inline bool IsInAGuild() const { return(guild_id != GUILD_NONE && guild_id != 0); }
|
||||
inline bool IsInGuild(uint32 in_gid) const { return(in_gid == guild_id && IsInAGuild()); }
|
||||
inline bool GetGuildListDirty() { return guild_dirty; }
|
||||
inline void SetGuildListDirty(bool state) { guild_dirty = state; }
|
||||
inline uint32 GuildID() const { return guild_id; }
|
||||
inline uint8 GuildRank() const { return guildrank; }
|
||||
inline bool GuildTributeOptIn() const { return guild_tribute_opt_in; }
|
||||
void SetGuildTributeOptIn(bool state);
|
||||
void SendGuildTributeDonateItemReply(GuildTributeDonateItemRequest_Struct* in, uint32 favor);
|
||||
void SendGuildTributeDonatePlatReply(GuildTributeDonatePlatRequest_Struct* in, uint32 favor);
|
||||
void SetGuildRank(uint32 rank);
|
||||
void SetGuildID(uint32 guild_id);
|
||||
void SendGuildMOTD(bool GetGuildMOTDReply = false);
|
||||
void SendGuildURL();
|
||||
void SendGuildChannel();
|
||||
@@ -729,6 +737,24 @@ public:
|
||||
void SendGuildList();
|
||||
void SendGuildJoin(GuildJoin_Struct* gj);
|
||||
void RefreshGuildInfo();
|
||||
void SendGuildRankNames();
|
||||
void SendGuildTributeDetails(uint32 tribute_id, uint32 tier);
|
||||
void DoGuildTributeUpdate();
|
||||
void SendGuildActiveTributes(uint32 guild_id);
|
||||
void SendGuildFavorAndTimer(uint32 guild_id);
|
||||
void SendGuildTributeOptInToggle(const GuildTributeMemberToggle* in);
|
||||
void RequestGuildActiveTributes(uint32 guild_id);
|
||||
void RequestGuildFavorAndTimer(uint32 guild_id);
|
||||
void SendGuildMembersList();
|
||||
void SendGuildMemberAdd(uint32 guild_id, uint32 level, uint32 _class, uint32 rank, uint32 guild_show, uint32 zone_id, std::string player_name);
|
||||
void SendGuildMemberRename(uint32 guild_id, std::string player_name, std::string new_player_name);
|
||||
void SendGuildMemberDelete(uint32 guild_id, std::string player_name);
|
||||
void SendGuildMemberLevel(uint32 guild_id, uint32 level, std::string player_name);
|
||||
void SendGuildMemberRankAltBanker(uint32 guild_id, uint32 rank, std::string player_name, bool alt, bool banker);
|
||||
void SendGuildMemberPublicNote(uint32 guild_id, std::string player_name, std::string public_note);
|
||||
void SendGuildMemberDetails(uint32 guild_id, uint32 zone_id, uint32 offline_mode, std::string player_name);
|
||||
void SendGuildRenameGuild(uint32 guild_id, std::string new_guild_name);
|
||||
void SendGuildDeletePacket(uint32 guild_id);
|
||||
|
||||
uint8 GetClientMaxLevel() const { return client_max_level; }
|
||||
void SetClientMaxLevel(uint8 max_level) { client_max_level = max_level; }
|
||||
@@ -1481,6 +1507,7 @@ public:
|
||||
void GuildBankAck();
|
||||
void GuildBankDepositAck(bool Fail, int8 action);
|
||||
inline bool IsGuildBanker() { return GuildBanker; }
|
||||
inline void SetGuildBanker(bool banker) { GuildBanker = banker; }
|
||||
void ClearGuildBank();
|
||||
void SendGroupCreatePacket();
|
||||
void SendGroupLeaderChangePacket(const char *LeaderName);
|
||||
@@ -1782,7 +1809,9 @@ private:
|
||||
char lskey[30];
|
||||
int16 admin;
|
||||
uint32 guild_id;
|
||||
uint8 guildrank; // player's rank in the guild, 0-GUILD_MAX_RANK
|
||||
uint8 guildrank; // player's rank in the guild, 1- Leader 8 Recruit
|
||||
bool guild_tribute_opt_in;
|
||||
bool guild_dirty{ true }; //used to control add/delete opcodes due to client bug in Ti thru RoF2
|
||||
bool GuildBanker;
|
||||
uint16 duel_target;
|
||||
bool duelaccepted;
|
||||
|
||||
Reference in New Issue
Block a user