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
@@ -4844,7 +4844,7 @@ UPDATE data_buckets SET bot_id = SUBSTRING_INDEX(SUBSTRING_INDEX( `key`, '-', 2
|
||||
ADD COLUMN `marked_npc_3_zone_id` INT UNSIGNED NOT NULL DEFAULT '0' AFTER `marked_npc_3_entity_id`,
|
||||
ADD COLUMN `marked_npc_3_instance_id` INT UNSIGNED NOT NULL DEFAULT '0' AFTER `marked_npc_3_zone_id`;
|
||||
)"
|
||||
},
|
||||
},
|
||||
ManifestEntry{
|
||||
.version = 9235,
|
||||
.description = "2023_07_31_character_stats_record.sql",
|
||||
@@ -5284,7 +5284,68 @@ ADD COLUMN `gm_exp` int(11) UNSIGNED NOT NULL DEFAULT 0 AFTER `rez_time`,
|
||||
ADD COLUMN `killed_by` int(11) UNSIGNED NOT NULL DEFAULT 0 AFTER `gm_exp`,
|
||||
ADD COLUMN `rezzable` tinyint(1) UNSIGNED NOT NULL DEFAULT 0 AFTER `killed_by`;
|
||||
)"
|
||||
}
|
||||
},
|
||||
ManifestEntry{
|
||||
.version = 9260,
|
||||
.description = "2023_11_11_guild_features.sql",
|
||||
.check = "SHOW TABLES LIKE 'guild_permissions'",
|
||||
.condition = "empty",
|
||||
.match = "",
|
||||
.sql = R"(
|
||||
CREATE TABLE `guild_permissions` (
|
||||
`id` INT(11) NOT NULL AUTO_INCREMENT,
|
||||
`perm_id` INT(11) NOT NULL DEFAULT '0',
|
||||
`guild_id` INT(11) NOT NULL DEFAULT '0',
|
||||
`permission` INT(11) NOT NULL DEFAULT '0',
|
||||
PRIMARY KEY (`id`) USING BTREE,
|
||||
UNIQUE INDEX `perm_id_guild_id` (`perm_id`, `guild_id`) USING BTREE
|
||||
)
|
||||
ENGINE=InnoDB
|
||||
AUTO_INCREMENT=1;
|
||||
|
||||
UPDATE guild_ranks SET title = 'Leader' WHERE `rank` = '1';
|
||||
UPDATE guild_ranks SET title = 'Senior Officer' WHERE `rank` = '2';
|
||||
UPDATE guild_ranks SET title = 'Officer' WHERE `rank` = '3';
|
||||
UPDATE guild_ranks SET title = 'Senior Member' WHERE `rank` = '4';
|
||||
UPDATE guild_ranks SET title = 'Member' WHERE `rank` = '5';
|
||||
UPDATE guild_ranks SET title = 'Junior Member' WHERE `rank` = '6';
|
||||
UPDATE guild_ranks SET title = 'Initiate' WHERE `rank` = '7';
|
||||
UPDATE guild_ranks SET title = 'Recruit' WHERE `rank` = '8';
|
||||
|
||||
DELETE FROM guild_ranks WHERE `rank` = 0;
|
||||
|
||||
ALTER TABLE `guild_ranks`
|
||||
DROP COLUMN `can_hear`,
|
||||
DROP COLUMN `can_speak`,
|
||||
DROP COLUMN `can_invite`,
|
||||
DROP COLUMN `can_remove`,
|
||||
DROP COLUMN `can_promote`,
|
||||
DROP COLUMN `can_demote`,
|
||||
DROP COLUMN `can_motd`,
|
||||
DROP COLUMN `can_warpeace`;
|
||||
|
||||
UPDATE guild_members SET `rank` = '5' WHERE `rank` = '0';
|
||||
UPDATE guild_members SET `rank` = '3' WHERE `rank` = '1';
|
||||
UPDATE guild_members SET `rank` = '1' WHERE `rank` = '2';
|
||||
|
||||
ALTER TABLE `guild_members`
|
||||
ADD COLUMN `online` TINYINT(3) UNSIGNED NOT NULL DEFAULT '0' AFTER `alt`;
|
||||
|
||||
ALTER TABLE `guilds`
|
||||
ADD COLUMN `favor` INT(10) UNSIGNED NOT NULL DEFAULT '0' AFTER `url`;
|
||||
|
||||
CREATE TABLE guild_tributes (
|
||||
guild_id int(11) unsigned NOT NULL DEFAULT 0,
|
||||
tribute_id_1 int(11) unsigned NOT NULL DEFAULT 0,
|
||||
tribute_id_1_tier int(11) unsigned NOT NULL DEFAULT 0,
|
||||
tribute_id_2 int(11) unsigned NOT NULL DEFAULT 0,
|
||||
tribute_id_2_tier int(11) unsigned NOT NULL DEFAULT 0,
|
||||
time_remaining int(11) unsigned NOT NULL DEFAULT 0,
|
||||
enabled int(11) unsigned NOT NULL DEFAULT 0,
|
||||
PRIMARY KEY (guild_id) USING BTREE
|
||||
) ENGINE=InnoDB;
|
||||
)"
|
||||
},
|
||||
// -- template; copy/paste this when you need to create a new entry
|
||||
// ManifestEntry{
|
||||
// .version = 9228,
|
||||
|
||||
Reference in New Issue
Block a user