From 134783edf24e7dbeb420bd8df57f3dc8eecd82a1 Mon Sep 17 00:00:00 2001
From: AMelonInsideLemon <166175391+AMelonInsideLemon@users.noreply.github.com>
Date: Fri, 15 Aug 2025 05:12:43 +0200
Subject: [PATCH 1/2] chore: put reward year into goal _id

Closes #2623
---
 src/services/worldStateService.ts | 11 +++++++----
 1 file changed, 7 insertions(+), 4 deletions(-)

diff --git a/src/services/worldStateService.ts b/src/services/worldStateService.ts
index 9520fe54..ca80a837 100644
--- a/src/services/worldStateService.ts
+++ b/src/services/worldStateService.ts
@@ -1801,7 +1801,10 @@ export const getWorldState = (buildLabel?: string): IWorldState => {
 
         worldState.Goals.push({
             _id: {
-                $oid: ((dogDaysStart / 1000) & 0xffffffff).toString(16).padStart(8, "0") + "c57487c3768936df"
+                $oid:
+                    ((dogDaysStart / 1000) & 0xffffffff).toString(16).padStart(8, "0") +
+                    "c57487c3768936d" +
+                    year.toString()
             },
             Activation: { $date: { $numberLong: activationTimeStamp } },
             Expiry: { $date: { $numberLong: expiryTimeStamp } },
@@ -2094,7 +2097,7 @@ export const getWorldState = (buildLabel?: string): IWorldState => {
         const year = config.worldState.hallowedNightmaresRewardsOverride ?? 0;
 
         worldState.Goals.push({
-            _id: { $oid: "5bc9e8f7972d7d184c8398c9" },
+            _id: { $oid: "5bc98f00000000000000000" + year.toString() },
             Activation: { $date: { $numberLong: "1539972000000" } },
             Expiry: { $date: { $numberLong: "2000000000000" } },
             Count: 0,
@@ -2119,7 +2122,7 @@ export const getWorldState = (buildLabel?: string): IWorldState => {
         });
         if (year != 2) {
             worldState.Goals.push({
-                _id: { $oid: "5bca18b1e12d9e14a0b6ad27" },
+                _id: { $oid: "5bc98f01000000000000000" + year.toString() },
                 Activation: { $date: { $numberLong: "1539972000000" } },
                 Expiry: { $date: { $numberLong: "2000000000000" } },
                 Count: 0,
@@ -2192,7 +2195,7 @@ export const getWorldState = (buildLabel?: string): IWorldState => {
         const year = config.worldState.proxyRebellionRewardsOverride ?? 0;
 
         worldState.Goals.push({
-            _id: { $oid: "5b5743ac972d7d3ed0517b0d" },
+            _id: { $oid: "5b5b5da0000000000000000" + year.toString() },
             Activation: { $date: { $numberLong: "1532714400000" } },
             Expiry: { $date: { $numberLong: "2000000000000" } },
             Count: 0,
-- 
2.47.2


From d27d2f9c5eb351a430215ef82b1b2ceb7055d93a Mon Sep 17 00:00:00 2001
From: AMelonInsideLemon <166175391+AMelonInsideLemon@users.noreply.github.com>
Date: Fri, 15 Aug 2025 19:03:21 +0200
Subject: [PATCH 2/2] Update worldStateService.ts

---
 src/services/worldStateService.ts | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/src/services/worldStateService.ts b/src/services/worldStateService.ts
index ca80a837..500766e7 100644
--- a/src/services/worldStateService.ts
+++ b/src/services/worldStateService.ts
@@ -1804,7 +1804,7 @@ export const getWorldState = (buildLabel?: string): IWorldState => {
                 $oid:
                     ((dogDaysStart / 1000) & 0xffffffff).toString(16).padStart(8, "0") +
                     "c57487c3768936d" +
-                    year.toString()
+                    year.toString(16)
             },
             Activation: { $date: { $numberLong: activationTimeStamp } },
             Expiry: { $date: { $numberLong: expiryTimeStamp } },
@@ -2097,7 +2097,7 @@ export const getWorldState = (buildLabel?: string): IWorldState => {
         const year = config.worldState.hallowedNightmaresRewardsOverride ?? 0;
 
         worldState.Goals.push({
-            _id: { $oid: "5bc98f00000000000000000" + year.toString() },
+            _id: { $oid: "5bc98f00000000000000000" + year.toString(16) },
             Activation: { $date: { $numberLong: "1539972000000" } },
             Expiry: { $date: { $numberLong: "2000000000000" } },
             Count: 0,
@@ -2122,7 +2122,7 @@ export const getWorldState = (buildLabel?: string): IWorldState => {
         });
         if (year != 2) {
             worldState.Goals.push({
-                _id: { $oid: "5bc98f01000000000000000" + year.toString() },
+                _id: { $oid: "5bc98f01000000000000000" + year.toString(16) },
                 Activation: { $date: { $numberLong: "1539972000000" } },
                 Expiry: { $date: { $numberLong: "2000000000000" } },
                 Count: 0,
@@ -2195,7 +2195,7 @@ export const getWorldState = (buildLabel?: string): IWorldState => {
         const year = config.worldState.proxyRebellionRewardsOverride ?? 0;
 
         worldState.Goals.push({
-            _id: { $oid: "5b5b5da0000000000000000" + year.toString() },
+            _id: { $oid: "5b5b5da0000000000000000" + year.toString(16) },
             Activation: { $date: { $numberLong: "1532714400000" } },
             Expiry: { $date: { $numberLong: "2000000000000" } },
             Count: 0,
-- 
2.47.2