Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[Feature] Add RoF2 Guild features #3699

Merged
merged 78 commits into from
Feb 10, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
78 commits
Select commit Hold shift + click to select a range
b51f08e
[Feature] Add additional Guild Features
neckkola Nov 11, 2023
6b6ebe9
Updated RoF2 Guild Comms
neckkola Nov 11, 2023
936c262
Formatting
Akkadius Dec 22, 2023
153ab09
Update base_guild_members_repository.h
Akkadius Dec 22, 2023
c69d25e
Format GuildInfo
Akkadius Dec 22, 2023
9912b59
Format GuildAction enum
Akkadius Dec 22, 2023
6bad8df
Formatting in clientlist
Akkadius Dec 22, 2023
be0fbd6
quantity vs quantity
Akkadius Dec 22, 2023
efdf665
desc vs description
Akkadius Dec 22, 2023
2e1b654
Format structs
Akkadius Dec 22, 2023
b8d84b0
Inline struct values
Akkadius Dec 22, 2023
8cc10b4
Formatting
Akkadius Dec 22, 2023
47632ab
Formatting
Akkadius Dec 22, 2023
075e117
Formatting fixes
neckkola Dec 22, 2023
559c731
Formatting items
neckkola Dec 22, 2023
aaf27b4
Formatting
neckkola Dec 23, 2023
3b89b58
Formatting
neckkola Dec 23, 2023
a02d38a
struct formatting updates
neckkola Dec 23, 2023
f317155
Updated formatting
neckkola Dec 23, 2023
e3df77d
Updated
neckkola Dec 24, 2023
1fe4697
Repo refactors
neckkola Dec 24, 2023
a120e2b
Remove test guild commands
neckkola Dec 24, 2023
ce25564
Updated #guild info command
neckkola Dec 25, 2023
1174a7c
Add new repo methods for Neckolla ReplaceOne and ReplaceMany
Akkadius Dec 25, 2023
be6978d
Fix guild_tributes repo
Akkadius Dec 25, 2023
27fba61
Update database_update_manifest.cpp
Akkadius Dec 25, 2023
77dc8a1
Phase 1 of final testing with RoF2 -> RoF2.
neckkola Dec 27, 2023
19c1e02
Remove #guild testing commands
neckkola Dec 27, 2023
3ba8543
Fix uf translator error
neckkola Dec 28, 2023
7215ce1
Use extended repository
Akkadius Dec 28, 2023
e980ae0
FIx guild window on member add
neckkola Dec 28, 2023
9cd9235
LoadGuild Changes
neckkola Dec 28, 2023
f06322c
Update guild_base.cpp
Akkadius Dec 28, 2023
585e0ce
Few small fixes for display issue with UF
neckkola Dec 28, 2023
e72a197
Update guild_base.cpp
Akkadius Dec 28, 2023
7794044
Update guild_members_repository.h
Akkadius Dec 28, 2023
56b64bf
Update zoneserver.cpp
Akkadius Dec 28, 2023
6575513
Update guild.cpp
Akkadius Dec 28, 2023
00c749c
Update entity.h
Akkadius Dec 28, 2023
1d0416e
Switch formatting
Akkadius Dec 28, 2023
585d910
Formatting
Akkadius Dec 28, 2023
c1c372f
Update worldserver.cpp
Akkadius Dec 28, 2023
429690b
Switch formatting
Akkadius Dec 28, 2023
d3d31be
Formatting switch statement
Akkadius Dec 28, 2023
0b44f7c
Update guild.cpp
Akkadius Dec 28, 2023
8929f03
Formatting in guild_base
Akkadius Dec 28, 2023
377e83e
We don't need to validate m_db everywhere
Akkadius Dec 28, 2023
75e85e5
More formatting / spacing issues
Akkadius Dec 28, 2023
d9b2365
Switch format
Akkadius Dec 28, 2023
1a32833
Update guild_base.cpp
Akkadius Dec 28, 2023
386ba73
Fix an UF issue displaying incorrect guildtag as <>
neckkola Dec 28, 2023
96c979f
Updated several constants, fixed a few issues with Ti/UF and guild tr…
neckkola Dec 29, 2023
272bad4
Formatting and logging updates
neckkola Dec 29, 2023
c532b95
Fix for Loadguilds and permissions after repo updates.
neckkola Dec 29, 2023
75a9d07
Cleanup unnecessary m_db checks
neckkola Dec 29, 2023
6aa9f53
Updated logging to use player_event_logs
neckkola Dec 29, 2023
8a1f7e9
Updated to use the single opcodes for guild traffic for Ti/UF/RoF2. …
neckkola Jan 2, 2024
590f7c2
Merge branch 'master' into GuildFeatures
neckkola Jan 2, 2024
bd6e064
Merge branch 'GuildFeatures' of https://github.com/neckkola/Server in…
neckkola Jan 2, 2024
a2b939e
Update to fix Demote Self and guild invites declining when option set…
neckkola Jan 3, 2024
0d774bd
Potential fix for guild notes/tribute display issues when client has …
neckkola Jan 5, 2024
56028aa
Merge branch 'master' into GuildFeatures
neckkola Jan 18, 2024
27b2017
Updates to fox recent master changes
neckkola Jan 18, 2024
0f0e310
Updates in response to comments
neckkola Jan 20, 2024
2edf29f
Further Updates in response to comments
neckkola Jan 20, 2024
ce01863
Comment updates and refactor for SendAppearance functions
neckkola Jan 21, 2024
0db0482
Comment updates
neckkola Jan 21, 2024
4a26284
Update client spawn process for show guild name
neckkola Jan 24, 2024
6cb955c
Update to use zone spawn packets for RoF2
neckkola Jan 26, 2024
66e672c
Merge branch 'master' into GuildFeatures
neckkola Jan 26, 2024
5db06a5
Cleanup of world changes
neckkola Jan 27, 2024
969d8d4
Fixes
neckkola Jan 27, 2024
32d9eba
Further world cleanup
neckkola Jan 27, 2024
9fb6fb5
Fix a few test guild bank cases for backward compat
neckkola Jan 27, 2024
cbe8fc9
Update guild_mgr.cpp
Akkadius Feb 7, 2024
a3277ee
Cleanup
Akkadius Feb 7, 2024
a2d5604
Merge remote-tracking branch 'origin/master' into pr/3699
Akkadius Feb 7, 2024
7aebd28
Merge remote-tracking branch 'origin/master' into pr/3699
Akkadius Feb 10, 2024
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 6 additions & 0 deletions common/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -222,6 +222,9 @@ SET(repositories
repositories/base/base_group_leaders_repository.h
repositories/base/base_guilds_repository.h
repositories/base/base_guild_ranks_repository.h
repositories/base/base_guild_permissions_repository.h
repositories/base/base_guild_members_repository.h
repositories/base/base_guild_bank_repository.h
repositories/base/base_guild_relations_repository.h
repositories/base/base_horses_repository.h
repositories/base/base_instance_list_repository.h
Expand Down Expand Up @@ -399,6 +402,9 @@ SET(repositories
repositories/group_leaders_repository.h
repositories/guilds_repository.h
repositories/guild_ranks_repository.h
repositories/guild_permissions_repository.h
repositories/guild_members_repository.h
repositories/guild_bank_repository.h
repositories/guild_relations_repository.h
repositories/horses_repository.h
repositories/instance_list_repository.h
Expand Down
65 changes: 63 additions & 2 deletions common/database/database_update_manifest.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -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",
Expand Down Expand Up @@ -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
)
hgtw marked this conversation as resolved.
Show resolved Hide resolved
ENGINE=InnoDB
AUTO_INCREMENT=1;

UPDATE guild_ranks SET title = 'Leader' WHERE `rank` = '1';
Akkadius marked this conversation as resolved.
Show resolved Hide resolved
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,
Expand Down
1 change: 1 addition & 0 deletions common/database_schema.h
Original file line number Diff line number Diff line change
Expand Up @@ -148,6 +148,7 @@ namespace DatabaseSchema {
"guild_members",
"guild_ranks",
"guild_relations",
"guild_tributes",
"guilds",
"instance_list_player",
"inventory",
Expand Down
22 changes: 21 additions & 1 deletion common/emu_oplist.h
Original file line number Diff line number Diff line change
Expand Up @@ -228,6 +228,7 @@ N(OP_GuildBank),
N(OP_GuildBankItemList),
N(OP_GuildCreate),
N(OP_GuildDelete),
N(OP_GuildDeleteGuild),
N(OP_GuildDemote),
N(OP_GuildInvite),
N(OP_GuildInviteAccept),
Expand All @@ -239,15 +240,33 @@ N(OP_GuildManageStatus),
N(OP_GuildMemberLevelUpdate),
N(OP_GuildMemberList),
N(OP_GuildMemberUpdate),
N(OP_GuildMemberLevel),
N(OP_GuildMemberRankAltBanker),
N(OP_GuildMemberPublicNote),
N(OP_GuildMemberAdd),
N(OP_GuildMemberRename),
N(OP_GuildMemberDelete),
N(OP_GuildMemberDetails),
N(OP_GuildRenameGuild),
N(OP_GuildMOTD),
N(OP_GuildPeace),
N(OP_GuildPromote),
N(OP_GuildPublicNote),
N(OP_GuildRemove),
N(OP_GuildSelectTribute),
N(OP_GuildModifyBenefits),
N(OP_GuildTributeToggleReq),
N(OP_GuildTributeToggleReply),
N(OP_GuildOptInOut),
N(OP_GuildSaveActiveTributes),
N(OP_GuildSendActiveTributes),
N(OP_GuildTributeFavorAndTimer),
N(OP_GuildsList),
N(OP_GuildStatus),
N(OP_GuildTributeInfo),
N(OP_GuildUpdateURLAndChannel),
N(OP_GuildUpdate),
N(OP_GuildTributeDonateItem),
N(OP_GuildTributeDonatePlat),
N(OP_GuildWar),
N(OP_Heartbeat),
N(OP_Hide),
Expand Down Expand Up @@ -425,6 +444,7 @@ N(OP_ReqClientSpawn),
N(OP_ReqNewZone),
N(OP_RequestClientZoneChange),
N(OP_RequestDuel),
N(OP_RequestGuildTributes),
N(OP_RequestKnowledgeBase),
N(OP_RequestTitles),
N(OP_RespawnWindow),
Expand Down
Loading