pa/eqemu-server
2
0
Fork 0
mirror of https://github.com/EQEmu/Server.git synced 2026-09-05 03:06:38 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

[Feature] Add RoF2 Guild features (#3699)

Browse Source 
* [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
2024-02-10 05:27:58 -04:00
committed by GitHub
parent dacebca9dd
commit 91f5932c6d
80 changed files with 8152 additions and 2463 deletions
Download Patch File Download Diff File Expand all files Collapse all files
world/client.cpp
+42
View File
@@ -2387,3 +2387,45 @@ void Client::RecordPossibleHack(const std::string& message)
PlayerEventLogsRepository::InsertOne(database, e);
}
}
void Client::SendGuildTributeFavorAndTimer(uint32 favor, uint32 time_remaining)
{
auto cle = GetCLE();
if (!cle) {
return;
}
auto guild = guild_mgr.GetGuildByGuildID(GetCLE()->GuildID());
if (guild) {
guild->tribute.favor = favor;
guild->tribute.time_remaining = time_remaining;
auto outapp = new EQApplicationPacket(OP_GuildTributeFavorAndTimer, sizeof(GuildTributeFavorTimer_Struct));
auto gtsa = (GuildTributeFavorTimer_Struct *)outapp->pBuffer;
gtsa->guild_id = GetCLE()->GuildID();
gtsa->guild_favor = guild->tribute.favor;
gtsa->tribute_timer = guild->tribute.time_remaining;
gtsa->trophy_timer = 0; //not yet implemented
QueuePacket(outapp);
safe_delete(outapp);
}
}
void Client::SendGuildTributeOptInToggle(const GuildTributeMemberToggle *in)
{
auto outapp = new EQApplicationPacket(OP_GuildOptInOut, sizeof(GuildTributeOptInOutReply_Struct));
auto data = (GuildTributeOptInOutReply_Struct *)outapp->pBuffer;
data->guild_id = in->guild_id;
data->no_donations = in->no_donations;
data->tribute_toggle = in->tribute_toggle;
data->tribute_trophy_toggle = 0; //not yet implemented
data->time = time(nullptr);
data->command = in->command;
strn0cpy(data->player_name, in->player_name, sizeof(data->player_name));
QueuePacket(outapp);
safe_delete(outapp);
}
world/client.h
+2
View File
@@ -51,6 +51,8 @@ public:
void SendLogServer();
void SendApproveWorld();
void SendPostEnterWorld();
void SendGuildTributeFavorAndTimer(uint32 favor, uint32 time_remaining);
void SendGuildTributeOptInToggle(const GuildTributeMemberToggle* in);
inline uint32 GetIP() { return ip; }
inline uint16 GetPort() { return port; }
world/cliententry.cpp
+3
View File
@@ -223,6 +223,8 @@ void ClientListEntry::Update(ZoneServer *iZS, ServerClientList_Struct *scl, CLE_
panon = scl->anon;
ptellsoff = scl->tellsoff;
pguild_id = scl->guild_id;
pguild_rank = scl->guild_rank;
pguild_tribute_opt_in = scl->guild_tribute_opt_in;
pLFG = scl->LFG;
gm = scl->gm;
pClientVersion = scl->ClientVersion;
@@ -280,6 +282,7 @@ void ClientListEntry::ClearVars(bool iAll)
panon = 0;
ptellsoff = 0;
pguild_id = GUILD_NONE;
pguild_rank = 0;
pLFG = 0;
gm = 0;
pClientVersion = 0;
world/cliententry.h
+28 -23
View File
@@ -95,29 +95,32 @@ public:
inline void SetAdmin(uint16 iAdmin) { padmin = iAdmin; }
// Character info
inline ZoneServer* Server() const { return pzoneserver; }
inline void ClearServer() { pzoneserver = 0; }
inline uint32 CharID() const { return pcharid; }
inline const char* name() const { return pname; }
inline uint32 zone() const { return pzone; }
inline uint16 instance() const { return pinstance; }
inline uint8 level() const { return plevel; }
inline uint8 class_() const { return pclass_; }
inline uint16 race() const { return prace; }
inline uint8 Anon() { return panon; }
inline uint8 TellsOff() const { return ptellsoff; }
inline uint32 GuildID() const { return pguild_id; }
inline void SetGuild(uint32 guild_id) { pguild_id = guild_id; }
inline bool LFG() const { return pLFG; }
inline uint8 GetGM() const { return gm; }
inline void SetGM(uint8 igm) { gm = igm; }
inline void SetZone(uint32 zone) { pzone = zone; }
inline bool IsLocalClient() const { return plocal; }
inline uint8 GetLFGFromLevel() const { return pLFGFromLevel; }
inline uint8 GetLFGToLevel() const { return pLFGToLevel; }
inline bool GetLFGMatchFilter() const { return pLFGMatchFilter; }
inline const char* GetLFGComments() const { return pLFGComments; }
inline uint8 GetClientVersion() { return pClientVersion; }
inline ZoneServer *Server() const { return pzoneserver; }
inline void ClearServer() { pzoneserver = 0; }
inline uint32 CharID() const { return pcharid; }
inline const char *name() const { return pname; }
inline uint32 zone() const { return pzone; }
inline uint16 instance() const { return pinstance; }
inline uint8 level() const { return plevel; }
inline uint8 class_() const { return pclass_; }
inline uint16 race() const { return prace; }
inline uint8 Anon() { return panon; }
inline uint8 TellsOff() const { return ptellsoff; }
inline uint32 GuildID() const { return pguild_id; }
inline uint32 GuildRank() const { return pguild_rank; }
inline bool GuildTributeOptIn() const { return pguild_tribute_opt_in; }
inline void SetGuild(uint32 guild_id) { pguild_id = guild_id; }
inline void SetGuildTributeOptIn(bool opt) { pguild_tribute_opt_in = opt; }
inline bool LFG() const { return pLFG; }
inline uint8 GetGM() const { return gm; }
inline void SetGM(uint8 igm) { gm = igm; }
inline void SetZone(uint32 zone) { pzone = zone; }
inline bool IsLocalClient() const { return plocal; }
inline uint8 GetLFGFromLevel() const { return pLFGFromLevel; }
inline uint8 GetLFGToLevel() const { return pLFGToLevel; }
inline bool GetLFGMatchFilter() const { return pLFGMatchFilter; }
inline const char *GetLFGComments() const { return pLFGComments; }
inline uint8 GetClientVersion() { return pClientVersion; }
inline bool TellQueueFull() const { return tell_queue.size() >= RuleI(World, TellQueueSize); }
inline bool TellQueueEmpty() const { return tell_queue.empty(); }
@@ -160,6 +163,8 @@ private:
uint8 panon{};
uint8 ptellsoff{};
uint32 pguild_id{};
uint32 pguild_rank;
bool pguild_tribute_opt_in{};
bool pLFG{};
uint8 gm{};
uint8 pClientVersion{};
world/clientlist.cpp
+100
View File
@@ -384,6 +384,8 @@ void ClientList::ClientUpdate(ZoneServer *zoneserver, ServerClientList_Struct *s
" anon [{}]"
" tellsoff [{}]"
" guild_id [{}]"
" guild_rank [{}]"
" guild_tribute_opt_in [{}]"
" LFG [{}]"
" gm [{}]"
" ClientVersion [{}]"
@@ -409,6 +411,8 @@ void ClientList::ClientUpdate(ZoneServer *zoneserver, ServerClientList_Struct *s
scl->anon,
scl->tellsoff,
scl->guild_id,
scl->guild_rank,
scl->guild_tribute_opt_in,
scl->LFG,
scl->gm,
scl->ClientVersion,
@@ -1577,6 +1581,8 @@ void ClientList::GetClientList(Json::Value &response)
row["client_version"] = cle->GetClientVersion();
row["gm"] = cle->GetGM();
row["guild_id"] = cle->GuildID();
row["guild_rank"] = cle->GuildRank();
row["guild_tribute_opt_in"] = cle->GuildTributeOptIn();
row["instance"] = cle->instance();
row["is_local_client"] = cle->IsLocalClient();
row["level"] = cle->level();
@@ -1667,3 +1673,97 @@ void ClientList::SendCharacterMessageID(ClientListEntry* character,
character->Server()->SendPacket(pack.get());
}
void ClientList::GetGuildClientList(Json::Value& response, uint32 guild_id)
{
LinkedListIterator<ClientListEntry*> Iterator(clientlist);
Iterator.Reset();
while (Iterator.MoreElements()) {
ClientListEntry* cle = Iterator.GetData();
if (cle->GuildID() != guild_id) {
Iterator.Advance();
continue;
}
Json::Value row;
row["account_id"] = cle->AccountID();
row["account_name"] = cle->AccountName();
row["admin"] = cle->Admin();
row["id"] = cle->GetID();
row["ip"] = cle->GetIP();
row["loginserver_account_id"] = cle->LSAccountID();
row["loginserver_id"] = cle->LSID();
row["loginserver_name"] = cle->LSName();
row["online"] = cle->Online();
row["world_admin"] = cle->WorldAdmin();
auto server = cle->Server();
if (server) {
row["server"]["client_address"] = server->GetCAddress();
row["server"]["client_local_address"] = server->GetCLocalAddress();
row["server"]["client_port"] = server->GetCPort();
row["server"]["compile_time"] = server->GetCompileTime();
row["server"]["id"] = server->GetID();
row["server"]["instance_id"] = server->GetInstanceID();
row["server"]["ip"] = server->GetIP();
row["server"]["is_booting"] = server->IsBootingUp();
row["server"]["launch_name"] = server->GetLaunchName();
row["server"]["launched_name"] = server->GetLaunchedName();
row["server"]["number_players"] = server->NumPlayers();
row["server"]["port"] = server->GetPort();
row["server"]["previous_zone_id"] = server->GetPrevZoneID();
row["server"]["static_zone"] = server->IsStaticZone();
row["server"]["uui"] = server->GetUUID();
row["server"]["zone_id"] = server->GetZoneID();
row["server"]["zone_long_name"] = server->GetZoneLongName();
row["server"]["zone_name"] = server->GetZoneName();
row["server"]["zone_os_pid"] = server->GetZoneOSProcessID();
}
else {
row["server"] = Json::Value();
}
row["anon"] = cle->Anon();
row["character_id"] = cle->CharID();
row["class"] = cle->class_();
row["client_version"] = cle->GetClientVersion();
row["gm"] = cle->GetGM();
row["guild_id"] = cle->GuildID();
row["guild_rank"] = cle->GuildRank();
row["guild_tribute_opt_in"] = cle->GuildTributeOptIn();
row["instance"] = cle->instance();
row["is_local_client"] = cle->IsLocalClient();
row["level"] = cle->level();
row["lfg"] = cle->LFG();
row["lfg_comments"] = cle->GetLFGComments();
row["lfg_from_level"] = cle->GetLFGFromLevel();
row["lfg_match_filter"] = cle->GetLFGMatchFilter();
row["lfg_to_level"] = cle->GetLFGToLevel();
row["name"] = cle->name();
row["race"] = cle->race();
row["tells_off"] = cle->TellsOff();
row["zone"] = cle->zone();
response.append(row);
Iterator.Advance();
}
}
std::map<uint32, ClientListEntry *> ClientList::GetGuildClientsWithTributeOptIn(uint32 guild_id)
{
std::map<uint32, ClientListEntry *> guild_members;
LinkedListIterator<ClientListEntry *> Iterator(clientlist);
Iterator.Reset();
while (Iterator.MoreElements()) {
auto c = Iterator.GetData();
if (c->GuildID() == guild_id && c->GuildTributeOptIn()) {
guild_members.emplace(c->CharID(), c);
}
Iterator.Advance();
}
return guild_members;
}
world/clientlist.h
+4 -1
View File
@@ -33,7 +33,9 @@ public:
void ZoneBootup(ZoneServer* zs);
void RemoveCLEReferances(ClientListEntry* cle);
std::map<uint32, ClientListEntry*> GetGuildClientsWithTributeOptIn(uint32 guild_id);
std::map<uint32, ClientListEntry*> GetGuildClientList(uint32 guild_id);
//Client* GetClient(uint32 char_id);
//from ZSList
@@ -65,6 +67,7 @@ public:
void GetClients(const char *zone_name, std::vector<ClientListEntry *> &into);
void GetClientList(Json::Value &response);
void GetGuildClientList(Json::Value& response, uint32 guild_id);
void SendCharacterMessage(uint32_t character_id, int chat_type, const std::string& message);
void SendCharacterMessage(const std::string& character_name, int chat_type, const std::string& message);
world/eqemu_api_world_data_service.cpp
+60 -2
View File
@@ -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);
}
world/eqemu_api_world_data_service.h
+1
View File
@@ -28,6 +28,7 @@ public:
static void get(Json::Value &r, const std::vector<std::string> &args);
static void reload(Json::Value &r, const std::vector<std::string> &args);
static void message(Json::Value &r, const std::string &message);
static void callGetGuildDetails(Json::Value &response, const std::vector<std::string> &args);
};
world/main.cpp
+2
View File
@@ -45,6 +45,7 @@
#include "../common/misc.h"
#include "client.h"
#include "worlddb.h"
#include "wguild_mgr.h"
#ifdef _WINDOWS
#include <process.h>
@@ -409,6 +410,7 @@ int main(int argc, char **argv)
event_scheduler.Process(&zoneserver_list);
client_list.Process();
guild_mgr.Process();
if (player_event_process_timer.Check()) {
player_event_logs.Process();
world/wguild_mgr.cpp
+307 -17
View File
@@ -22,17 +22,25 @@
#include "../common/servertalk.h"
#include "clientlist.h"
#include "zonelist.h"
#include "zoneserver.h"
#include "cliententry.h"
#include "client.h"
#include "../common/repositories/guilds_repository.h"
#include "../common/repositories/guild_ranks_repository.h"
#include "../common/repositories/guild_permissions_repository.h"
#include "../common/repositories/guild_members_repository.h"
#include "../common/repositories/guild_bank_repository.h"
#include "../common/repositories/guild_tributes_repository.h"
#include "../common/repositories/tributes_repository.h"
#include "../common/repositories/tribute_levels_repository.h"
extern ClientList client_list;
extern ZSList zoneserver_list;
std::map<uint32, TributeData> tribute_list;
WorldGuildManager guild_mgr;
void WorldGuildManager::SendGuildRefresh(uint32 guild_id, bool name, bool motd, bool rank, bool relation) {
LogGuilds("Broadcasting guild refresh for [{}], changes: name=[{}], motd=[{}], rank=d, relation=[{}]", guild_id, name, motd, rank, relation);
auto pack = new ServerPacket(ServerOP_RefreshGuild, sizeof(ServerGuildRefresh_Struct));
@@ -89,14 +97,12 @@ void WorldGuildManager::ProcessZonePacket(ServerPacket *pack) {
break;
}
case ServerOP_GuildCharRefresh: {
if(pack->size != sizeof(ServerGuildCharRefresh_Struct)) {
LogGuilds("Received ServerOP_RefreshGuild of incorrect size [{}], expected [{}]", pack->size, sizeof(ServerGuildCharRefresh_Struct));
return;
}
case ServerOP_GuildCharRefresh:
{
ServerGuildCharRefresh_Struct *s = (ServerGuildCharRefresh_Struct *) pack->pBuffer;
LogGuilds("Received and broadcasting guild member refresh for char [{}] to all zones with members of guild [{}]", s->char_id, s->guild_id);
RefreshGuild(s->guild_id);
//preform the local update
client_list.UpdateClientGuild(s->char_id, s->guild_id);
@@ -107,41 +113,325 @@ void WorldGuildManager::ProcessZonePacket(ServerPacket *pack) {
break;
}
case ServerOP_DeleteGuild: {
case ServerOP_DeleteGuild:
{
if(pack->size != sizeof(ServerGuildID_Struct)) {
LogGuilds("Received ServerOP_DeleteGuild of incorrect size [{}], expected [{}]", pack->size, sizeof(ServerGuildID_Struct));
return;
}
ServerGuildID_Struct *s = (ServerGuildID_Struct *) pack->pBuffer;
auto res = m_guilds.find(s->guild_id);
if (res != m_guilds.end()) {
delete res->second;
m_guilds.erase(res);
}
LogGuilds("Received and broadcasting guild delete for guild [{}]", s->guild_id);
//broadcast this packet to all zones.
zoneserver_list.SendPacket(pack);
//preform a local refresh.
if(!LocalDeleteGuild(s->guild_id)) {
LogGuilds("Unable to preform local delete on guild [{}]", s->guild_id);
//can we do anything?
}
break;
}
case ServerOP_GuildMemberUpdate: {
case ServerOP_GuildMemberUpdate:
{
if(pack->size != sizeof(ServerGuildMemberUpdate_Struct))
{
LogGuilds("Received ServerOP_GuildMemberUpdate of incorrect size [{}], expected [{}]", pack->size, sizeof(ServerGuildMemberUpdate_Struct));
return;
}
auto s = (ServerGuildID_Struct *)pack->pBuffer;
RefreshGuild(s->guild_id);
zoneserver_list.SendPacket(pack);
break;
}
case ServerOP_GuildPermissionUpdate:
{
if (pack->size != sizeof(ServerGuildPermissionUpdate_Struct))
{
LogGuilds("Received ServerOP_GuildPermissionUpdate of incorrect size [{}], expected [{}]", pack->size, sizeof(ServerGuildPermissionUpdate_Struct));
return;
}
auto sg = (ServerGuildPermissionUpdate_Struct *)pack->pBuffer;
auto guild = GetGuildByGuildID(sg->guild_id);
if (!guild) {
guild_mgr.LoadGuilds();
guild = GetGuildByGuildID(sg->guild_id);
}
if (guild) {
if (sg->function_value) {
guild->functions[sg->function_id].perm_value |= (1UL << (8 - sg->rank));
}
else {
guild->functions[sg->function_id].perm_value &= ~(1UL << (8 - sg->rank));
}
LogGuilds("World Received ServerOP_GuildPermissionUpdate for guild [{}] function id {} with value of {}",
sg->guild_id,
sg->function_id,
sg->function_value
);
zoneserver_list.SendPacketToBootedZones(pack);
}
else {
LogError("World Received ServerOP_GuildPermissionUpdate for guild [{}] function id {} with value of {} but guild could not be found.",
sg->guild_id,
sg->function_id,
sg->function_value
);
}
break;
}
case ServerOP_GuildRankNameChange:
{
if (pack->size != sizeof(ServerGuildRankNameChange))
{
LogGuilds("Received ServerOP_ServerGuildRankNameChange of incorrect size [{}], expected [{}]", pack->size, sizeof(ServerGuildPermissionUpdate_Struct));
return;
}
auto rnc = (ServerGuildRankNameChange*)pack->pBuffer;
auto guild = GetGuildByGuildID(rnc->guild_id);
if (!guild) {
guild_mgr.LoadGuilds();
guild = GetGuildByGuildID(rnc->guild_id);
}
if (guild) {
guild->rank_names[rnc->rank] = rnc->rank_name;
LogGuilds("World Received ServerOP_GuildRankNameChange from zone for guild [{}] rank id {} with new name of {}",
rnc->guild_id,
rnc->rank,
rnc->rank_name
);
zoneserver_list.SendPacketToBootedZones(pack);
}
else {
LogError("World Received ServerOP_GuildRankNameChange from zone for guild [{}] rank id {} with new name of {} but could not find guild.",
rnc->guild_id,
rnc->rank,
rnc->rank_name
);
}
break;
}
case ServerOP_GuildMemberLevelUpdate:
case ServerOP_GuildMemberPublicNote:
case ServerOP_GuildChannel:
case ServerOP_GuildURL:
case ServerOP_GuildMemberRemove:
case ServerOP_GuildMemberAdd:
case ServerOP_GuildSendGuildList:
case ServerOP_GuildMembersList:
{
zoneserver_list.SendPacketToBootedZones(pack);
break;
}
default:
LogGuilds("Unknown packet {:#04x} received from zone??", pack->opcode);
break;
}
}
void WorldGuildManager::Process()
{
for (auto &g: m_guilds) {
if (!g.second->tribute.enabled) {
continue;
}
else if (g.second->tribute.enabled && !g.second->tribute.timer.Enabled()) {
g.second->tribute.timer.Start(g.second->tribute.time_remaining);
LogGuilds(
"Found a Guild Tribute Timer for guild [{}]. that was not started. Started it with [{}] time remaining before restart.",
g.first,
g.second->tribute.time_remaining
);
}
else if (g.second->tribute.enabled && g.second->tribute.timer.Check()) {
g.second->tribute.favor -= GetGuildTributeCost(g.first);
g.second->tribute.time_remaining = RuleI(Guild, TributeTime);
g.second->tribute.timer.Start(RuleI(Guild, TributeTime));
guild_mgr.UpdateDbGuildFavor(g.first, g.second->tribute.favor);
guild_mgr.UpdateDbTributeTimeRemaining(g.first, RuleI(Guild, TributeTime));
SendGuildTributeFavorAndTimer(g.first, g.second->tribute.favor, g.second->tribute.timer.GetRemainingTime());
}
else if (g.second->tribute.send_timer &&
((g.second->tribute.timer.GetRemainingTime() / 1000) %
(RuleI(Guild, TributeTimeRefreshInterval) / 1000)) == 0 &&
!g.second->tribute.timer.Check()
) {
g.second->tribute.send_timer = false;
g.second->tribute.time_remaining = g.second->tribute.timer.GetRemainingTime();
SendGuildTributeFavorAndTimer(g.first, g.second->tribute.favor, g.second->tribute.time_remaining);
guild_mgr.UpdateDbTributeTimeRemaining(g.first, g.second->tribute.time_remaining);
LogGuilds(
"Timer Frequency [{}] ms hit sending time [{}] to guild clients",
RuleI(Guild, TributeTimeRefreshInterval),
g.second->tribute.time_remaining
);
}
else if (!g.second->tribute.send_timer &&
((g.second->tribute.timer.GetRemainingTime() / 1000) %
(RuleI(Guild, TributeTimeRefreshInterval) / 1000)) > 0 &&
!g.second->tribute.timer.Check()
) {
g.second->tribute.send_timer = true;
}
}
}
uint32 WorldGuildManager::GetGuildTributeCost(uint32 guild_id)
{
auto guild_members = client_list.GetGuildClientsWithTributeOptIn(guild_id);
auto total = guild_members.size();
auto total_cost = 0;
auto guild = guild_mgr.GetGuildByGuildID(guild_id);
if (guild)
{
TributeData &d1 = tribute_list[guild->tribute.id_1];
TributeData &d2 = tribute_list[guild->tribute.id_2];
uint32 cost_id1 = d1.tiers[guild->tribute.id_1_tier].cost;
uint32 cost_id2 = d2.tiers[guild->tribute.id_2_tier].cost;
uint32 level_id1 = d2.tiers[guild->tribute.id_1_tier].level;
uint32 level_id2 = d2.tiers[guild->tribute.id_2_tier].level;
for (auto const &m: guild_members) {
if (m.second->level() >= level_id1) {
total_cost += cost_id1;
}
if (m.second->level() >= level_id2) {
total_cost += cost_id2;
}
}
}
return total_cost;
}
bool WorldGuildManager::LoadTributes()
{
TributeData td{};
td.tier_count = 0;
tribute_list.clear();
auto tributes = TributesRepository::All(*m_db);
for (auto const& t : tributes) {
td.name = t.name;
td.description = t.descr;
td.unknown = t.unknown;
td.is_guild = t.isguild == 0 ? false : true;
tribute_list[t.id] = td;
}
LogInfo("Loaded [{}] tributes", Strings::Commify(tributes.size()));
auto tribute_levels = TributeLevelsRepository::GetWhere(*m_db, "TRUE ORDER BY tribute_id, level");
for (auto const& t : tribute_levels) {
uint32 id = t.tribute_id;
if (tribute_list.count(id) != 1) {
LogError("Error in LoadTributes: unknown tribute [{}] in tribute_levels", (unsigned long)id);
continue;
}
TributeData& cur = tribute_list[id];
if (cur.tier_count >= MAX_TRIBUTE_TIERS) {
LogError("Error in LoadTributes: on tribute [{}] more tiers defined than permitted", (unsigned long)id);
continue;
}
TributeLevel_Struct& s = cur.tiers[cur.tier_count];
s.level = t.level;
s.cost = t.cost;
s.tribute_item_id = t.item_id;
cur.tier_count++;
}
LogInfo("Loaded [{}] tribute levels", Strings::Commify(tribute_levels.size()));
return true;
}
bool WorldGuildManager::RefreshGuild(uint32 guild_id)
{
auto temp_guild = GetGuildByGuildID(guild_id);
BaseGuildManager::GuildInfo temp_guild_detail;
if (temp_guild) {
temp_guild_detail.tribute = temp_guild->tribute;
}
if (guild_id <= 0) {
LogError("Requested to refresh guild id [{}] but id must be greater than 0.", guild_id);
return false;
}
auto db_guild = GuildsRepository::FindOne(*m_db, guild_id);
if (!db_guild.id) {
LogGuilds("Guild ID [{}] not found in database.", db_guild.id);
return false;
}
LogGuilds("Found guild id [{}]. Loading details.....", db_guild.id);
_CreateGuild(db_guild.id, db_guild.name, db_guild.leader, db_guild.minstatus, db_guild.motd, db_guild.motd_setter, db_guild.channel, db_guild.url, db_guild.favor);
auto guild = GetGuildByGuildID(guild_id);
auto where_filter = fmt::format("guild_id = '{}'", guild_id);
auto guild_ranks = GuildRanksRepository::GetWhere(*m_db, where_filter);
for (auto const& r : guild_ranks) {
guild->rank_names[r.rank_] = r.title;
}
where_filter = fmt::format("guild_id = '{}'", guild_id);
auto guild_permissions = GuildPermissionsRepository::GetWhere(*m_db, where_filter);
for (auto const& p : guild_permissions) {
guild->functions[p.perm_id].id = p.id;
guild->functions[p.perm_id].guild_id = p.guild_id;
guild->functions[p.perm_id].perm_id = p.perm_id;
guild->functions[p.perm_id].perm_value = p.permission;
}
auto guild_tributes = GuildTributesRepository::FindOne(*m_db, guild_id);
if (guild_tributes.guild_id) {
guild->tribute.id_1 = guild_tributes.tribute_id_1;
guild->tribute.id_2 = guild_tributes.tribute_id_2;
guild->tribute.id_1_tier = guild_tributes.tribute_id_1_tier;
guild->tribute.id_2_tier = guild_tributes.tribute_id_2_tier;
guild->tribute.enabled = guild_tributes.enabled;
guild->tribute.time_remaining = guild_tributes.time_remaining;
}
if (temp_guild_detail.tribute.enabled == 1) {
guild->tribute = temp_guild_detail.tribute;
}
LogGuilds("Successfully refreshed guild id [{}] from the [WORLD] database", guild_id);
LogGuilds("Timer has [{}] time remaining from the [WORLD] refresh.", guild->tribute.time_remaining);
return true;
}
void WorldGuildManager::SendGuildTributeFavorAndTimer(uint32 guild_id, uint32 favor, uint32 time)
{
auto sp = new ServerPacket(ServerOP_GuildTributeFavAndTimer, sizeof(GuildTributeFavorTimer_Struct));
auto data = (GuildTributeFavorTimer_Struct *)sp->pBuffer;
data->guild_id = guild_id;
data->guild_favor = favor;
data->tribute_timer = time;
data->trophy_timer = 0;
zoneserver_list.SendPacketToBootedZones(sp);
safe_delete(sp)
}
world/wguild_mgr.h
+10 -3
View File
@@ -1,5 +1,5 @@
#ifndef GUILD_MGR_H_
#define GUILD_MGR_H_
#ifndef WGUILD_MGR_H_
#define WGUILD_MGR_H_
#include "../common/types.h"
#include "../common/guild_base.h"
@@ -12,6 +12,12 @@ public:
//called by zoneserver when it receives a guild message from zone.
void ProcessZonePacket(ServerPacket *pack);
void Process();
bool LoadTributes();
void SendGuildTributeFavorAndTimer(uint32 guild_id);
void SendGuildTributeFavorAndTimer(uint32 guild_id, uint32 favor, uint32 time);
uint32 GetGuildTributeCost(uint32 guild_id);
virtual bool RefreshGuild(uint32 guild_id);
protected:
virtual void SendGuildRefresh(uint32 guild_id, bool name, bool motd, bool rank, bool relation);
@@ -19,11 +25,12 @@ protected:
virtual void SendRankUpdate(uint32 CharID) { return; }
virtual void SendGuildDelete(uint32 guild_id);
//map<uint32, uint32> m_tribute; //map from guild ID to current tribute ammount
};
extern WorldGuildManager guild_mgr;
#endif /*GUILD_MGR_H_*/
#endif /*WGUILD_MGR_H_*/
world/world_boot.cpp
+1
View File
@@ -297,6 +297,7 @@ bool WorldBoot::DatabaseLoadRoutines(int argc, char **argv)
}
guild_mgr.LoadGuilds();
guild_mgr.LoadTributes();
//rules:
{
world/zonelist.cpp
+12
View File
@@ -857,3 +857,15 @@ const std::list<std::unique_ptr<ZoneServer>> &ZSList::getZoneServerList() const
{
return zone_server_list;
}
bool ZSList::SendPacketToBootedZones(ServerPacket* pack)
{
for (auto const& z : zone_server_list) {
auto r = z.get();
if (r && r->GetZoneID() > 0) {
r->SendPacket(pack);
}
}
return true;
}
world/zonelist.h
+1
View File
@@ -28,6 +28,7 @@ public:
bool SendPacket(ServerPacket *pack);
bool SendPacket(uint32 zoneid, ServerPacket *pack);
bool SendPacket(uint32 zoneid, uint16 instanceid, ServerPacket *pack);
bool SendPacketToBootedZones(ServerPacket* pack);
bool SetLockedZone(uint16 iZoneID, bool iLock);
EQTime worldclock;
world/zoneserver.cpp
+177 -1
View File
@@ -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);