fix the game not properly saving/loading adventurers for hire

src/App.vue

@@ -37,16 +37,16 @@ export default defineComponent({
   data: () => ({
     guild: new Guild(1, 500),
     lastQuestGot: {
-      S: null as null|number,
+      S: null as null | number,
-      A: null as null|number,
+      A: null as null | number,
-      B: null as null|number,
+      B: null as null | number,
-      C: null as null|number,
+      C: null as null | number,
-      D: null as null|number,
+      D: null as null | number,
-      E: null as null|number,
+      E: null as null | number,
-      F: null as null|number,
+      F: null as null | number,
-    } as { [key: string]: null|number },
+    } as { [key: string]: null | number },
-    lastRecruitHandled: null as null|number,
+    lastRecruitHandled: null as null | number,
-    adventurerForHire: null as Adventurer|null,
+    adventurerForHire: null as Adventurer | null,
     adventurersDatabase: {} as Array<Adventurer>,
     adventurers: {} as { [key: string]: Adventurer },
     quests: {} as { [key: string]: { [key: string]: Quest } },
@@ -81,14 +81,20 @@ export default defineComponent({
 
     },
     async checkForNewRecruit(currentTimestamp: number) {
-      if (this.lastRecruitHandled === null) {
+
+      if (this.lastRecruitHandled == null) {
         this.lastRecruitHandled = 0;
       }
-      if (currentTimestamp - this.lastRecruitHandled >= 1000 * 60 * 30 && this.adventurerForHire === null) {
+
+      if (Object.keys(this.adventurers).length <= 0) {
+        this.adventurerForHire = this.adventurersDatabase[0];
+      }
+
+      if (currentTimestamp - this.lastRecruitHandled >= 1000 * 60 * 30 && this.adventurerForHire == null) {
         this.adventurerForHire = getNewAdventurerForHire(this.adventurersDatabase);
       }
     },
-    recruitAction(adventurer: Adventurer|null): void {
+    recruitAction(adventurer: Adventurer | null): void {
       this.lastRecruitHandled = Number(new Date());
       this.adventurerForHire = null;
       if (adventurer === null) return;
@@ -155,12 +161,11 @@ export default defineComponent({
           );
           adventurer.busy = data.busy;
           adventurers[data.id] = adventurer;
-         } catch (e) {}
+        } catch (e) {
+        }
       }
       this.adventurers = adventurers;
 
-
-
       const missives = {} as { [key: string]: { [key: string]: Quest } };
 
       for (const id in saveData.missives) {
@@ -181,15 +186,10 @@ export default defineComponent({
 
       this.lastRecruitHandled = saveData.lastRecruitAction ?? 0;
 
-      if (Object.keys(this.adventurers).length <= 0) {
+      if (saveData.adventurerForHireId != null) {
-        this.adventurerForHire = this.adventurersDatabase[0];
-        return;
-      }
-
-      if (saveData.currentlyForHireId !== null) {
         for (const id in this.adventurersDatabase) {
           const adventurer = this.adventurersDatabase[id];
-          if (adventurer.id === saveData.currentlyForHireId) {
+          if (adventurer.id === saveData.adventurerForHireId) {
             this.adventurerForHire = adventurer;
             return;
           }
@@ -203,21 +203,20 @@ export default defineComponent({
     }
   },
   async mounted() {
-    this.loadGame();
     this.quests = await loadAvailableQuests();
     this.adventurersDatabase = await loadAdventurersForHire(Object.keys(this.adventurers));
+    this.loadGame();
 
     setInterval(() => {
-      saveGame(new GameData(
+      saveGame(new GameData({
-          this.guild,
+        adventurers: this.adventurers,
-          this.adventurers,
+        guild: this.guild,
-          this.missives,
+        missives: this.missives,
-          this.lastQuestGot,
+        lastQuestGot: this.lastQuestGot,
-          this.lastRecruitHandled,
+        lastRecruitAction: this.lastRecruitHandled,
-          this.adventurerForHire?.id ?? null
+        adventurerForHireId: this.adventurerForHire?.id ?? null,
-          )
+      }));
-      );
+    }, 10 * 1000)
-    }, 10*1000)
 
     setInterval(() => {
       this.updateMissives();
@@ -349,6 +348,7 @@ nav {
     font-size: 2rem;
     color: #fff;
     text-decoration: none;
+
     &.router-link-active {
       text-decoration: underline;
     }

src/GameData.ts

@@ -1,4 +1,4 @@
-import type {Guild} from "@/classes/Guild";
+import {Guild} from "@/classes/Guild";
 import {Adventurer} from "@/classes/Adventurer";
 import {Quest} from "@/classes/Quest";
 import {getFromString, QuestRank} from "@/classes/QuestRank";
@@ -9,21 +9,17 @@ export class GameData {
   missives: { [key: string]: { [key: string]: Quest } };
   lastQuestGot: { [key: string]: null | number };
   lastRecruitAction: null | number;
-    currentlyForHireId: string|null;
+  adventurerForHireId: string | null;
 
   constructor(
-        guild: Guild, adventurers: { [key: string]: Adventurer },
+    data: any,
-        missives: { [key: string]: { [key: string]: Quest } },
-        lastQuestGot: { [key: string]: null | number },
-        lastRecruitAction: null | number,
-        currentlyForHireId: string|null = null
   ) {
-        this.guild = guild;
+    this.guild = data.guild ?? new Guild(1, 0);
-        this.adventurers = adventurers;
+    this.adventurers = data.adventurers ?? {} as { [key: string]: Adventurer };
-        this.missives = missives;
+    this.missives = data.missives ?? {} as { [key: string]: { [key: string]: Quest } };
-        this.lastQuestGot = lastQuestGot;
+    this.lastQuestGot = data.lastQuestGot ?? {} as { [key: string]: null | number };
-        this.lastRecruitAction = lastRecruitAction;
+    this.lastRecruitAction = data.lastRecruitAction ?? null;
-        this.currentlyForHireId = currentlyForHireId;
+    this.adventurerForHireId = data.adventurerForHireId ?? null;
   }
 }
 
@@ -41,22 +37,16 @@ export function saveGame(
     missives: data.missives,
     lastQuestGot: data.lastQuestGot,
     lastRecruitAction: data.lastRecruitAction,
-        adventurerForHireId: data.currentlyForHireId,
+    adventurerForHireId: data.adventurerForHireId,
   }));
 }
 
 export function loadGame(): GameData | null {
   const savedGame = window.localStorage.getItem("savedGame");
   if (!savedGame) return null;
-    console.debug("Loading game...");
   const parsedGame = JSON.parse(savedGame);
-    return new GameData(
+  console.debug("Loading game...");
-        parsedGame.guild,
+  return new GameData(parsedGame);
-        parsedGame.adventurers,
-        parsedGame.missives,
-        parsedGame.lastQuestGot,
-        parsedGame.lastRecruitAction
-    );
 }
 
 export async function loadAvailableQuests(): Promise<{ [key: string]: { [key: string]: Quest } }> {