From 337b6f38e0d96b9a821f95330663084c86b357af Mon Sep 17 00:00:00 2001
From: Alex King <89047260+Kinglykrab@users.noreply.github.com>
Date: Sun, 28 Jan 2024 22:58:58 -0500
Subject: [PATCH] [Mercenaries] Add expansion settings update to Mercs:Enable
 (#4001)

# 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.
---
 world/cli/mercs_enable.cpp | 30 ++++++++++++++++++++++++++++--
 1 file changed, 28 insertions(+), 2 deletions(-)

diff --git a/world/cli/mercs_enable.cpp b/world/cli/mercs_enable.cpp
index 2970f835d..efb005421 100644
--- a/world/cli/mercs_enable.cpp
+++ b/world/cli/mercs_enable.cpp
@@ -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");
 }