From 56f4c895eedf179355b6272ab54c5d1250eabb8f Mon Sep 17 00:00:00 2001
From: Skjalf <47818697+Nyeriah@users.noreply.github.com>
Date: Fri, 29 Aug 2025 00:58:40 -0300
Subject: [PATCH] Add Joyous Journeys toggle to double XP weekend mod

Introduces a new player setting and chat command to enable or disable the Joyous Journeys XP boost per player. Updates login messaging to inform players about the ability to disable the boost.
---
 src/mod-double-xp-weekend.cpp | 21 +++++++++++++++++++--
 1 file changed, 19 insertions(+), 2 deletions(-)

diff --git a/src/mod-double-xp-weekend.cpp b/src/mod-double-xp-weekend.cpp
index 77a5ad5..c95f542 100644
--- a/src/mod-double-xp-weekend.cpp
+++ b/src/mod-double-xp-weekend.cpp
@@ -11,6 +11,7 @@ enum WeekendXP
     SETTING_WEEKEND_XP_RATE = 0,
     SETTING_WEEKEND_XP_DISABLE = 1,
     SETTING_WEEKEND_XP_VERSION = 2,
+    SETTING_WEEKEND_XP_JOYOUS_JOURNEYS = 3,
 
     LANG_CMD_WEEKEND_XP_SET   = 11120,
     LANG_CMD_WEEKEND_XP_ERROR = 11121,
@@ -245,7 +246,7 @@ class DoubleXpWeekend
                 rate = ConfigMaxAllowedRate();
         }
 
-        if (IsJoyousJourneysActive())
+        if (IsJoyousJourneysActive() && !player->GetPlayerSetting("mod-double-xp-weekend", SETTING_WEEKEND_XP_JOYOUS_JOURNEYS).IsEnabled())
         {
             rate += ConfigJoyousJourneysXPRate();
         }
@@ -284,6 +285,7 @@ class weekendxp_commandscript : public CommandScript
         {
             { "weekendxp rate", HandleSetXPBonusCommand, SEC_PLAYER, Console::No },
             { "weekendxp config", HandleGetCurrentConfigCommand, SEC_PLAYER, Console::No },
+            { "weekendxp joyousjourneys", HandleJoyousJourneysCommand, SEC_PLAYER, Console::No }
         };
 
         return commandTable;
@@ -300,6 +302,21 @@ class weekendxp_commandscript : public CommandScript
         DoubleXpWeekend* mod = DoubleXpWeekend::instance();
         return mod->HandleGetCurrentConfigCommand(handler);
     }
+
+    static bool HandleJoyousJourneysCommand(ChatHandler* handler, bool enable)
+    {
+        DoubleXpWeekend* mod = DoubleXpWeekend::instance();
+        if (!mod->IsJoyousJourneysActive())
+        {
+            handler->PSendSysMessage("The Joyous Journeys event is not enabled on this server.");
+            handler->SetSentErrorMessage(true);
+            return true;
+        }
+
+        handler->GetPlayer()->UpdatePlayerSetting("mod-double-xp-weekend", SETTING_WEEKEND_XP_JOYOUS_JOURNEYS, !enable);
+        handler->PSendSysMessage("Joyous Journeys experience boost {}.", !enable ? "disabled" : "enabled");
+        return true;
+    }
 };
 
 class DoubleXpWeekendPlayerScript : public PlayerScript
@@ -318,7 +335,7 @@ class DoubleXpWeekendPlayerScript : public PlayerScript
         mod->OnPlayerLogin(player, &handler);
 
         if (mod->IsJoyousJourneysActive() && mod->ConfigJoyousJourneysXPRate())
-            handler.PSendSysMessage("|cff00ccffThe Joyous Journeys event is active! Experience gains have been increased.|r");
+            handler.PSendSysMessage("|cff00ccffThe Joyous Journeys event is active! Experience gains have been increased. Type .weekendxp j off to disable it.|r");
     }
 
     void OnPlayerGiveXP(Player* player, uint32& amount, Unit* /*victim*/, uint8 xpSource) override