Skip to content

Add Joyous Journeys toggle to double XP weekend mod #40

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.

Sign up for GitHub

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

Merged
Nyeriah merged 1 commit into from
Aug 29, 2025
Merged

Add Joyous Journeys toggle to double XP weekend mod #40

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
21 changes: 19 additions & 2 deletions src/mod-double-xp-weekend.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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,
Expand Down Expand Up @@ -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();
}
Expand Down Expand Up @@ -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;
Expand All @@ -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
Expand All @@ -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
Expand Down