pa/eqemu-server
2
0
Fork 0
mirror of https://github.com/EQEmu/Server.git synced 2025-12-11 21:01:29 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

[Mercenaries] Add expansion settings update to Mercs:Enable (#4001)

Browse Source 
# Notes
- Adds an expansion settings update to the `Mercs:Enable` command, only updates if the expansion setting isn't already `-1` or doesn't already contain the bitmask for Seeds of Destruction (16384).
- This will enable Mercenary Liaisons spawning properly in Plane of Knowledge for the hiring of mercenaries.
This commit is contained in:
Alex King 2024-01-28 22:58:58 -05:00 committed by GitHub
parent b4414d3052
commit 337b6f38e0
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
1 changed files with 28 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
world/cli/mercs_enable.cpp
View File

@ -20,8 +20,34 @@ void WorldserverCLI::MercsEnable(int argc, char **argv, argh::parser &cmd, std::
LogInfo("Merc tables already exist, skipping bootstrap");
}
LogInfo("Enabling mercs");
uint32 expansions_setting = RuleManager::Instance()->GetIntRule(RuleManager::Int__ExpansionSettings);
uint32 expansions_setting_before = expansions_setting;
bool update_expansions = false;
if (expansions_setting != -1 && !(expansions_setting & EQ::expansions::ExpansionBitmask::bitSoD)) {
expansions_setting += EQ::expansions::ExpansionBitmask::bitSoD;
update_expansions = true;
}
LogInfo("Enabling Mercenaries");
LogInfo("Setting rule Mercs:AllowMercs to true");
RuleManager::Instance()->SetRule("Mercs:AllowMercs", "true", &database, true, true);
LogInfo("Mercs enabled");
if (update_expansions) {
LogInfo(
"Updating World:ExpansionSettings from [{}] to [{}] to enable Mercenary Liaison spawns",
expansions_setting_before,
expansions_setting
);
RuleManager::Instance()->SetRule(
"World:ExpansionSettings",
std::to_string(expansions_setting),
&database,
true,
true
);
}
LogInfo("Mercenaries enabled");
}