fix broken saving and broken modded upgrade loading

Author: FifthTundraG

src/ts/clickercookie.ts

@@ -23,7 +23,7 @@ const defaultUpgradeDescriptions = {
 let cookieProductionStopped = false;
 
 interface ClickerCookieSaveData {
-    version: string;
+    version: number;
 
     // core
     cookies: number;
@@ -639,7 +639,7 @@ export default class ClickerCookie extends Mod {
     // ------------ All of ClickerCookie's SaveProvider stuff ------------
     getSaveData(): ClickerCookieSaveData {
         return {
-            version: Game.VERSION,
+            version: 0, // todo: this will be 1 when full release
             cookies: this.cookies,
             totalCookies: this.totalCookies,
             cookiesPerClick: this.cookiesPerClick,

src/ts/handlers.ts

@@ -3,7 +3,7 @@
 import { Building } from "./buildings.js";
 import { Handler, Identifier, UniqueKeyHandler } from "./handler.js";
 import { url } from "./helper.js";
-import { Game } from "./main.js";
+import { Game, GameSaveData } from "./main.js";
 import { Mod } from "./mods.js";
 import { Background, CurrentlyClickedObject } from "./personalization.js";
 import { AdvancedPopup, SimplePopup } from "./popup.js";
@@ -209,6 +209,8 @@ export class UpgradeHandler extends Handler<Upgrade> {
 
             if (namespace !== undefined && id.namespace !== namespace) continue;
 
+            if (this.getFromIdentifier(id) === undefined) continue; // if upgrades are not registered we obviously can't load them. todo: should this warn?
+
             this.getFromIdentifier(id).bought = saveObj[stringifiedIdentifier].bought;
             this.getFromIdentifier(id).unlocked = saveObj[stringifiedIdentifier].unlocked;
         }
@@ -236,6 +238,9 @@ export class ModHandler extends UniqueKeyHandler<Mod> {
 
         Game.getInstance().isModded = true;
 
+        // load game save data to todo: write
+        Game.getInstance().loadSaveData(Game.getInstance().savinator5000.getLocalStorageSave().getData("game") as GameSaveData);
+
         console.log("Loaded mod from URL: "+url);
     }
 
@@ -260,6 +265,9 @@ export class ModHandler extends UniqueKeyHandler<Mod> {
 
             Game.getInstance().isModded = true;
 
+            // load game save data to todo: write
+            Game.getInstance().loadSaveData(Game.getInstance().savinator5000.getLocalStorageSave().getData("game") as GameSaveData)
+
             console.log("Successfully added mod from file: "+file.name);
         };
     }
@@ -350,7 +358,7 @@ export class ModHandler extends UniqueKeyHandler<Mod> {
 export class SaveHandler extends UniqueKeyHandler<SaveProvider> {
     dumpSaveData(): Record<string, unknown> {
         const saveData: Record<string, unknown> = {};
-        for (const namespace in this.registered) {
+        for (const namespace of this.registered.keys()) {
             saveData[namespace] = this.registered.get(namespace).getSaveData();
         }
         return saveData;

src/ts/main.ts

@@ -67,7 +67,7 @@ export enum VersionBranch {
 
 type MiddleState = "none" | "stats" | "info" | "options";
 
-interface GameSaveData {
+export interface GameSaveData {
     hasCheated: boolean;
     isModded: boolean;
     autoSavingAllowed: boolean;
@@ -346,6 +346,9 @@ export class Game extends SaveProvider {
     }
 
     getSaveData(): GameSaveData {
+        /** savedata is null on first boot */
+        const originalUpgradeSave = (this.savinator5000.getLocalStorageSave()) ? (this.savinator5000.getLocalStorageSave().getData("game") as GameSaveData).upgradesSave : {}
+
         return {
             hasCheated: this.hasCheated,
             isModded: this.isModded,
@@ -355,7 +358,10 @@ export class Game extends SaveProvider {
             currentlyClickedObjectKey: Handlers.CURRENTLY_CLICKED.getKeyFromValue(Handlers.CURRENTLY_CLICKED.getCurrentlyClicked()),
             currentBackgroundKey: Handlers.BACKGROUND.getKeyFromValue(Handlers.BACKGROUND.getCurrentBackground()), // todo: make better
 
-            upgradesSave: Handlers.UPGRADE.dumpSave()
+            upgradesSave: { // merge to preserve unregistered upgrades
+                ...originalUpgradeSave,
+                ...Handlers.UPGRADE.dumpSave()
+            }
         }
     }
 

src/ts/saving.ts

@@ -86,10 +86,11 @@ export class Savinator {
     load() {
         const localStorageSave = this.getLocalStorageSave();
         const providers = this.saveHandler.getProviders();
-        for (const namespace in providers) { //? should this go over providers or the localStorageSave.getNamespaces()? is there any benefit to one or the other?
-            if (localStorageSave.getNamespaces().includes(namespace) && namespace !== "game") { // if the provider namespace is present in the local storage save
-                providers.get(namespace).loadSaveData(localStorageSave.getData(namespace));
-                console.log(`Loaded save data for ${namespace} namespace.`);
+        for (const provider of this.saveHandler) {
+            const namespace = this.saveHandler.getKeyFromValue(provider);
+            if (localStorageSave.getNamespaces().includes(namespace) && namespace !== "game") {
+                provider.loadSaveData(localStorageSave.getData(namespace));
+                console.log(`Loaded save data for "${namespace}" namespace.`);
             }
         }
         if (providers.get("game") !== undefined) { // game should always be there, but just in case it isn't we check
@@ -200,11 +201,15 @@ export class Save {
         this.data.data[namespace] = value;
     }
 
-    getData(namespace: string): unknown {
-        if (this.data.data[namespace] === undefined || this.data.data[namespace] === null) 
-            throw new Error(`Tried to obtain data from a Save with a namespace (${namespace}) that does not exist on the save.`);
-
-        return this.data.data[namespace];
+    getData(namespace: string=undefined): unknown {
+        if (namespace) {
+            if (this.data.data[namespace] === undefined || this.data.data[namespace] === null) 
+                throw new Error(`Tried to obtain data from a Save with a namespace (${namespace}) that does not exist on the save.`);
+    
+            return this.data.data[namespace];
+        } else {
+            return this.data.data;
+        }
     }
     getHeader() {
         return this.data.header;