Skip to content

Announce Joyous Journeys event and max XP rate on login #38

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 3 commits into from
Aug 27, 2025
Merged

Announce Joyous Journeys event and max XP rate on login #38

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
7e2e01c
Add Joyous Journeys event support to double XP module
Nyeriah Aug 27, 2025
8ea0854
Announce Joyous Journeys event and max XP rate on login
Nyeriah Aug 27, 2025
e37c988
Merge branch 'master' into master
Nyeriah Aug 27, 2025
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
5 changes: 4 additions & 1 deletion src/mod-double-xp-weekend.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -145,6 +145,7 @@ class DoubleXpWeekend
float ConfigJoyousJourneysXPRate() const { return sConfigMgr->GetOption<float>("XPWeekend.JoyousJourneysXPRate", 1.0f); }
float ConfigJoyousJourneysRepRate() const { return sConfigMgr->GetOption<float>("XPWeekend.JoyousJourneysRepRate", 1.10f); }
bool ExcludeInsaneReps() const { return sConfigMgr->GetOption<bool>("XPWeekend.ExcludeInsaneReps", true); }
float ConfigMaxAllowedRate() const { return sConfigMgr->GetOption<float>("XPWeekend.MaxAllowedRate", 2.0f) + (IsJoyousJourneysActive() ? ConfigJoyousJourneysXPRate() : 0.0f); }

private:

Expand All @@ -156,7 +157,6 @@ class DoubleXpWeekend
float ConfigxpAmount() const { return sConfigMgr->GetOption<float>("XPWeekend.xpAmount", 2.0f); }
bool ConfigIndividualXPEnabled() const { return sConfigMgr->GetOption<bool>("XPWeekend.IndividualXPEnabled", false); }
bool ConfigEnabled() const { return sConfigMgr->GetOption<bool>("XPWeekend.Enabled", false); }
float ConfigMaxAllowedRate() const { return sConfigMgr->GetOption<float>("XPWeekend.MaxAllowedRate", 2.0f) + (IsJoyousJourneysActive() ? ConfigJoyousJourneysXPRate() : 0.0f); }
bool ConfigIsDKStartZoneRequired() const { return sConfigMgr->GetOption<bool>("XPWeekend.IsDKStartZoneRequired", false); }

bool IsDKStartZoneComplete(Player* player) const
Expand Down Expand Up @@ -312,6 +312,9 @@ class DoubleXpWeekendPlayerScript : public PlayerScript
DoubleXpWeekend* mod = DoubleXpWeekend::instance();
ChatHandler handler = ChatHandler(player->GetSession());
mod->OnPlayerLogin(player, &handler);

if (mod->IsJoyousJourneysActive() && mod->ConfigJoyousJourneysXPRate())
handler.PSendSysMessage("|cff00ccffThe Joyous Journeys event is active! You may set your rates up to {} while it is active!|r", mod->ConfigMaxAllowedRate());
}

void OnPlayerGiveXP(Player* player, uint32& amount, Unit* /*victim*/, uint8 xpSource) override
Expand Down