From 3bdb15b236d2950a52cd9e69617dc9da2d453517 Mon Sep 17 00:00:00 2001
From: AMelonInsideLemon <166175391+AMelonInsideLemon@users.noreply.github.com>
Date: Mon, 11 Aug 2025 20:40:17 +0200
Subject: [PATCH] rename `waterFight` to `dogDays`

---
 src/services/configService.ts     |  4 ++--
 src/services/worldStateService.ts | 19 ++++++++-----------
 2 files changed, 10 insertions(+), 13 deletions(-)

diff --git a/src/services/configService.ts b/src/services/configService.ts
index a5170518..63b999d9 100644
--- a/src/services/configService.ts
+++ b/src/services/configService.ts
@@ -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;
diff --git a/src/services/worldStateService.ts b/src/services/worldStateService.ts
index 1006cb4d..42581dba 100644
--- a/src/services/worldStateService.ts
+++ b/src/services/worldStateService.ts
@@ -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 } },