OpenWF/SpaceNinjaServer
21
23
Fork 29
Code Issues 22 Pull Requests 2 Actions Packages Projects Releases Activity

rename waterFight to dogDays
All checks were successful
Build / build (pull_request) Successful in 1m3s
Details

Browse Source
This commit is contained in:
AMelonInsideLemon 2025-08-11 20:40:17 +02:00
parent ed82225ec1
commit 7a60b86c11
2 changed files with 10 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/services/configService.ts
View File

@ -87,8 +87,8 @@ export interface IConfig {
ghoulEmergenceOverride?: boolean;
plagueStarOverride?: boolean;
starDaysOverride?: boolean;
waterFightOverride?: boolean;
waterFightRewardsOverride?: number;
dogDaysOverride?: boolean;
dogDaysRewardsOverride?: number;
eidolonOverride?: string;
vallisOverride?: string;
duviriOverride?: string;

19
src/services/worldStateService.ts
View File

@ -1633,19 +1633,16 @@ export const getWorldState = (buildLabel?: string): IWorldState => {
const firstAugustWeekday = new Date(Date.UTC(date.getUTCFullYear(), 7, 1)).getUTCDay();
const firstAugustWednesdayOffset = (3 - firstAugustWeekday + 7) % 7;
const waterFightStart = Date.UTC(date.getUTCFullYear(), 7, 1 + firstAugustWednesdayOffset, 15);
const dogDaysStart = Date.UTC(date.getUTCFullYear(), 7, 1 + firstAugustWednesdayOffset, 15);
const firstSeptemberWeekday = new Date(Date.UTC(date.getUTCFullYear(), 8, 1)).getUTCDay();
const firstSeptemberWednesdayOffset = (3 - firstSeptemberWeekday + 7) % 7;
const waterFightEnd = Date.UTC(date.getUTCFullYear(), 8, 1 + firstSeptemberWednesdayOffset, 15);
const dogDaysEnd = Date.UTC(date.getUTCFullYear(), 8, 1 + firstSeptemberWednesdayOffset, 15);
const isWaterFightActive = timeMs >= waterFightStart && timeMs < waterFightEnd;
logger.debug(isWaterFightActive);
if (config.worldState?.waterFightOverride ?? isWaterFightActive) {
const activationTimeStamp = config.worldState?.waterFightOverride
? "1699372800000"
: waterFightStart.toString();
const expiryTimeStamp = config.worldState?.waterFightOverride ? "2000000000000" : waterFightEnd.toString();
const isDogDaysActive = timeMs >= dogDaysStart && timeMs < dogDaysEnd;
if (config.worldState?.dogDaysOverride ?? isDogDaysActive) {
const activationTimeStamp = config.worldState?.dogDaysOverride ? "1699372800000" : dogDaysStart.toString();
const expiryTimeStamp = config.worldState?.dogDaysOverride ? "2000000000000" : dogDaysEnd.toString();
const rewards = [
[
{
@ -1793,11 +1790,11 @@ export const getWorldState = (buildLabel?: string): IWorldState => {
]
];
const year = config.worldState?.waterFightRewardsOverride ?? 3;
const year = config.worldState?.dogDaysRewardsOverride ?? 3;
worldState.Goals.push({
_id: {
$oid: ((waterFightStart / 1000) & 0xffffffff).toString(16).padStart(8, "0") + "c57487c3768936df"
$oid: ((dogDaysStart / 1000) & 0xffffffff).toString(16).padStart(8, "0") + "c57487c3768936df"
},
Activation: { $date: { $numberLong: activationTimeStamp } },
Expiry: { $date: { $numberLong: expiryTimeStamp } },