nchebrov/azerothcore-wotlk
1
0
Fork 0
mirror of https://github.com/mod-playerbots/azerothcore-wotlk.git synced 2026-01-13 01:08:35 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix(Core/Events): set Brewfest to static date Sept 20 (#24342)

Browse Source 
Co-authored-by: blinkysc <blinkysc@users.noreply.github.com>
This commit is contained in:
blinkysc
2026-01-07 10:25:28 -06:00
committed by GitHub
parent 3fd0fa1e64
commit fc36f1b68c
2 changed files with 32 additions and 47 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/server/game/Events/HolidayDateCalculator.cpp
View File

@@ -49,8 +49,8 @@ static const std::vector<HolidayRule> HolidayRules = {
// Pirates' Day: Fixed Sep 19
{ HOLIDAY_PIRATES_DAY, HolidayCalculationType::FIXED_DATE, 9, 19, 0, 0 },
// Brewfest: Oktoberfest rule - first Saturday on/after Sept 15, minus 7 for holidayStage offset
{ HOLIDAY_BREWFEST, HolidayCalculationType::WEEKDAY_ON_OR_AFTER, 9, 15, static_cast<int>(Weekday::SATURDAY), -7 },
// Brewfest: Fixed Sept 20 main event, prep starts Sept 13
{ HOLIDAY_BREWFEST, HolidayCalculationType::FIXED_DATE, 9, 13, 0, 0 },
// Harvest Festival: 2 days before autumn equinox (Sept 20-21)
{ HOLIDAY_HARVEST_FESTIVAL, HolidayCalculationType::AUTUMN_EQUINOX, 0, 0, 0, -2 },

75
src/test/server/game/Events/HolidayDateCalculatorTest.cpp
View File

@@ -397,60 +397,45 @@ TEST_F(HolidayDateCalculatorTest, FixedDateHolidays_ConsistentAcrossYears_1900_2
}
// ============================================================
// Brewfest Tests (Oktoberfest rule)
// First Saturday on or after Sept 15, minus 7 days for holidayStage offset
// Brewfest Tests (Fixed Sept 20 main event)
// ============================================================
TEST_F(HolidayDateCalculatorTest, Brewfest_OktoberfestRule)
TEST_F(HolidayDateCalculatorTest, Brewfest_FixedSept13)
{
// Brewfest follows the Oktoberfest rule:
// Oktoberfest starts the Saturday after Sept 15 (or on Sept 15 if it's Saturday)
// Brewfest holidayStage 1 starts 7 days before that
HolidayRule brewfest = { 372, HolidayCalculationType::WEEKDAY_ON_OR_AFTER, 9, 15, static_cast<int>(Weekday::SATURDAY), -7 };
// Brewfest is now fixed: prep starts Sept 13, main event Sept 20
// This avoids any potential overlap with Pirates' Day (Sept 19)
HolidayRule brewfest = { 372, HolidayCalculationType::FIXED_DATE, 9, 13, 0, 0 };
struct BrewfestTestCase { int year; int expectedMonth; int expectedDay; };
std::vector<BrewfestTestCase> testCases = {
// Sept 15, 2024 is Sunday, first Sat after is Sept 21, minus 7 = Sept 14
{ 2024, 9, 14 },
// Sept 15, 2025 is Monday, first Sat after is Sept 20, minus 7 = Sept 13
{ 2025, 9, 13 },
// Sept 15, 2026 is Tuesday, first Sat after is Sept 19, minus 7 = Sept 12
{ 2026, 9, 12 },
// Sept 15, 2027 is Wednesday, first Sat after is Sept 18, minus 7 = Sept 11
{ 2027, 9, 11 },
// Sept 15, 2028 is Friday, first Sat after is Sept 16, minus 7 = Sept 9
{ 2028, 9, 9 },
// Sept 15, 2029 is Saturday, so Sept 15, minus 7 = Sept 8
{ 2029, 9, 8 },
};
for (auto const& tc : testCases)
{
std::tm date = HolidayDateCalculator::CalculateHolidayDate(brewfest, tc.year);
SCOPED_TRACE("Year: " + std::to_string(tc.year));
EXPECT_EQ(date.tm_year + 1900, tc.year);
EXPECT_EQ(date.tm_mon + 1, tc.expectedMonth);
EXPECT_EQ(date.tm_mday, tc.expectedDay);
}
}
TEST_F(HolidayDateCalculatorTest, Brewfest_AlwaysInSeptember_1900_2200)
{
HolidayRule brewfest = { 372, HolidayCalculationType::WEEKDAY_ON_OR_AFTER, 9, 15, static_cast<int>(Weekday::SATURDAY), -7 };
for (int year = 1900; year <= 2200; ++year)
for (int year = 2000; year <= 2030; ++year)
{
std::tm date = HolidayDateCalculator::CalculateHolidayDate(brewfest, year);
SCOPED_TRACE("Year: " + std::to_string(year));
// Brewfest should always be in September (after -7 offset from Sept 15-21)
EXPECT_EQ(date.tm_mon + 1, 9) << "Brewfest should be in September";
// Should be between Sept 8 and Sept 14 (7 days before Sept 15-21)
EXPECT_GE(date.tm_mday, 8) << "Brewfest should be >= Sept 8";
EXPECT_LE(date.tm_mday, 14) << "Brewfest should be <= Sept 14";
EXPECT_EQ(date.tm_year + 1900, year);
EXPECT_EQ(date.tm_mon + 1, 9); // September
EXPECT_EQ(date.tm_mday, 13); // Always Sept 13
}
}
TEST_F(HolidayDateCalculatorTest, Brewfest_NoPiratesDayConflict)
{
// Brewfest main event (Sept 20) is always after Pirates' Day (Sept 19)
HolidayRule brewfest = { 372, HolidayCalculationType::FIXED_DATE, 9, 13, 0, 0 };
HolidayRule piratesDay = { 398, HolidayCalculationType::FIXED_DATE, 9, 19, 0, 0 };
for (int year = 2000; year <= 2030; ++year)
{
std::tm brewfestDate = HolidayDateCalculator::CalculateHolidayDate(brewfest, year);
std::tm piratesDate = HolidayDateCalculator::CalculateHolidayDate(piratesDay, year);
SCOPED_TRACE("Year: " + std::to_string(year));
// Brewfest prep is Sept 13, main event is Sept 20
// Pirates' Day is Sept 19, which falls between prep and main event
EXPECT_EQ(brewfestDate.tm_mday, 13); // Brewfest prep
EXPECT_EQ(piratesDate.tm_mday, 19); // Pirates' Day
// Main event (Sept 20) > Pirates' Day (Sept 19)
}
}