Super saver

Game/src/KinkyDungeonTests.ts

@@ -40,8 +40,7 @@ function KDTestFullRunthrough(GameLoops: number, Init: boolean, NGP: boolean): b
 	if (Init) {
 		KDSetWorldSlot(0, 1, 0, 0);
 		MiniGameKinkyDungeonCheckpoint = "grv";
-		KinkyDungeonInitialize(1);
-		KDInitPerks();
+		KinkyDungeonInitialize(1) .then(() => KDInitPerks());
 	}
 	for (let i = 0; i < KinkyDungeonMaxLevel * GameLoops; i++) {
 		// Run through the stairs
@@ -189,4 +188,4 @@ function KDGetMissingSpellNames() {
 	}
 
 	return ret;
-}
+}

Game/src/base/KinkyDungeonErrors.ts

@@ -18,8 +18,8 @@ function KinkyDungeonTeardownCrashHandler(): void {
  * Error event handler for uncaught errors
  * @param event - The error event
  */
-function KinkyDungeonOnUncaughtError(event: ErrorEvent): void {
-	const report = KinkyDungeonGenerateErrorReport(event);
+async function KinkyDungeonOnUncaughtError(event: ErrorEvent): Promise<void> {
+	const report = await KinkyDungeonGenerateErrorReport(event);
 	KinkyDungeonShowCrashReportModal(report);
 }
 
@@ -28,13 +28,13 @@ function KinkyDungeonOnUncaughtError(event: ErrorEvent): void {
  * @param event - The error event
  * @returns The report
  */
-function KinkyDungeonGenerateErrorReport(event: ErrorEvent): string {
+async function KinkyDungeonGenerateErrorReport(event: ErrorEvent): Promise<string> {
 	return [
 		KinkyDungeonCrashReportErrorDetails(event),
 		KinkyDungeonCrashReportStateData(),
 		KinkyDungeonCrashReportDiagnostics(),
 		KinkyDungeonCrashReportDeviceDetails(),
-		KinkyDungeonCrashReportSaveData(),
+		await KinkyDungeonCrashReportSaveData(),
 	].join("\n\n");
 }
 
@@ -107,11 +107,11 @@ function KinkyDungeonCrashReportErrorDetails(event: ErrorEvent): string {
  * Generates a report string containing the current save state of the game
  * @returns The report
  */
-function KinkyDungeonCrashReportSaveData(): string {
+async function KinkyDungeonCrashReportSaveData(): Promise<string> {
 	let saveData = localStorage.getItem("KinkyDungeonSave");
 	if (!saveData) {
 		try {
-			saveData = LZString.compressToBase64(JSON.stringify(KinkyDungeonGenerateSaveData()));
+			saveData = await KinkyDungeonCompressSave (JSON.stringify (KinkyDungeonGenerateSaveData()), SaveType.Game);
 		} catch (error) {
 			saveData = "Could not locate or generate save data";
 		}

Game/src/base/game/KinkyDungeonGame.ts

@@ -462,7 +462,7 @@ function KDResetEventData(Data?: any) {
 
 
 
-function KinkyDungeonInitialize(Level: number, Load?: any) {
+async function KinkyDungeonInitialize(Level: number, Load?: any) {
 	KDWorldMap = {};
 	KDMapData = KDDefaultMapData(0, 0);
 	KDCurrentWorldSlot = {x: 0, y: 0};
@@ -497,9 +497,10 @@ function KinkyDungeonInitialize(Level: number, Load?: any) {
 
 	KinkyDungeonDressSet();
 	// Refresh the character
-	CharacterAppearanceRestore(KinkyDungeonPlayer, CharacterAppearanceStringify(KinkyDungeonPlayer,
-		KDGetCharMetadata(KinkyDungeonPlayer)
-	), false, true);
+	await CharacterAppearanceRestore (KinkyDungeonPlayer,
+	                                  CharacterAppearanceStringify (KinkyDungeonPlayer,
+	                                                                KDGetCharMetadata(KinkyDungeonPlayer)),
+	                                  false, true);
 	KinkyDungeonDrawState = "Game";
 	KDResetAlternateInventoryRender();
 	KDRefreshCharacter.set(KinkyDungeonPlayer, true);
@@ -2372,7 +2373,7 @@ function KinkyDungeonGameKeyDown() {
 				//case KinkyDungeonKeyMenu[6]: KinkyDungeonDrawState = "Collection"; break;
 				//case KinkyDungeonKeyMenu[7]: KinkyDungeonDrawState = "Facilities"; break;
 				/*case KinkyDungeonKeyMenu[9]: {
-					KinkyDungeonDrawState = "JourneyMap"; 
+					KinkyDungeonDrawState = "JourneyMap";
 					KDGameData.UseJourneyTarget = false;
 					break;}*/
 				case KinkyDungeonKeySkip[0]:
@@ -3738,8 +3739,8 @@ function KDAddAppearance (
 		C.Appearance.push(NA);
 		return NA;
 	}
-	
-		
+
+
 	return null;
 }
 
@@ -4155,7 +4156,7 @@ function KDSprintCost(sprintdata?: any, sprintCost?: number, accountForSlow: boo
 		boost: 0,
 		sprintCostOverride: sprintCost,
 	};
-	data.cost = (-KDSprintCostBase - KDSprintCostSlowLevel[Math.min(KDSprintCostSlowLevel.length-1, 
+	data.cost = (-KDSprintCostBase - KDSprintCostSlowLevel[Math.min(KDSprintCostSlowLevel.length-1,
 		Math.round(KinkyDungeonSlowLevel))] + (
 			(accountForSlow && KinkyDungeonSlowLevel > 1) ? -KDSprintAdjustSlowed : 0
 		));
@@ -4423,4 +4424,4 @@ let KDCustomKeyDown = [
 	},
 ];
 let KDCustomKeyUp = [
-];
+];

Game/src/base/game/KinkyDungeonHUD.ts

@@ -1941,11 +1941,12 @@ function KinkyDungeonHandleHUD() {
 				return true;
 			}
 			if (MouseIn(1500, 320, 300, 64)) {
-				let saveData = LZString.compressToBase64(JSON.stringify(KinkyDungeonSaveGame(true)));
-				KinkyDungeonState = "Save";
-				ElementCreateTextArea("saveDataField");
-				ElementValue("saveDataField", saveData);
-
+				(async () => {
+					let saveData = await KinkyDungeonCompressSave (JSON.stringify (KinkyDungeonSaveGame(true)), SaveType.Game);
+					KinkyDungeonState = "Save";
+					ElementCreateTextArea("saveDataField");
+					ElementValue("saveDataField", saveData);
+				})();
 
 				return true;
 			}
@@ -3121,7 +3122,7 @@ function KDDrawBuffIcons(minXX: number, minYY: number, statsDraw: Record<string,
 				}
 			}
 		} else {
-			if (((!KDMinBuffX && XX > minXX) || (KDMinBuffX && XX > KDMinBuffX)) && 
+			if (((!KDMinBuffX && XX > minXX) || (KDMinBuffX && XX > KDMinBuffX)) &&
 				(KDStatsSkipLine[currCategory] || KDStatsSkipLineBefore[stat.category]) && currCategory != stat.category) {
 
 				if (KDToggleShowAllBuffs) {

Game/src/collection/KinkyDungeonCollection.ts

@@ -486,71 +486,72 @@ function KDDrawSelectedCollectionMember(value: KDCollectionEntry, x: number, y:
 		DrawTextFitKD(TextGet("KDZoomNPC"), x + 220, y + 750, 500, KDBaseWhite, KDTextGray0);
 	}
 	if (KDGameData.Collection[value.id + ""] && DrawButtonKDEx("dressNPC", () => {
-		if (KDSoundEnabled())
-			AudioPlayInstantSoundKD(KinkyDungeonRootDirectory + "Audio/" + "LightJingle" + ".ogg");
-		//KDSpeakerNPC = null;
-		KinkyDungeonState = "Wardrobe";
-		KDCanRevertFlag = value.customOutfit != undefined;
-		ForceRefreshModels(KDSpeakerNPC);
-		KDOriginalValue = "";
-		CharacterReleaseTotal(KDSpeakerNPC);
-		KDWardrobeCallback = () => {
-			UpdateModels(KDSpeakerNPC);
-			KDShowCharacterPalette = false; KDWardrobePreviewRestraints = "";
-			KDRefreshCharacter.set(KDSpeakerNPC, true);
-			KDDressWardrobeChar(KDSpeakerNPC, false);
-
-			let value2 = value;
-			//if (KDOriginalValue) {
-			value2.customOutfit = LZString.compressToBase64(AppearanceItemStringify(KDSpeakerNPC.Appearance));
-			value2.Palette = KDSpeakerNPC.Palette;
-			value2.metadata = KDSpeakerNPC.metadata;
-
-			KDRefreshCharacter.set(KDSpeakerNPC, true);
-			KinkyDungeonCheckClothesLoss = true;
-			KinkyDungeonDressPlayer(KDSpeakerNPC, false, false, KDGameData.NPCRestraints ? KDGameData.NPCRestraints[value.id + ''] : undefined);
-
-			//}
-		};
-		if (value.customOutfit) {
-			let outfit = value.customOutfit;
-			KDWardrobeRevertCallback = () => {
+		(async () => {
+			if (KDSoundEnabled())
+				AudioPlayInstantSoundKD(KinkyDungeonRootDirectory + "Audio/" + "LightJingle" + ".ogg");
+			//KDSpeakerNPC = null;
+			KinkyDungeonState = "Wardrobe";
+			KDCanRevertFlag = value.customOutfit != undefined;
+			ForceRefreshModels(KDSpeakerNPC);
+			KDOriginalValue = "";
+			CharacterReleaseTotal(KDSpeakerNPC);
+			KDWardrobeCallback = async () => {
+				UpdateModels(KDSpeakerNPC);
 				KDShowCharacterPalette = false; KDWardrobePreviewRestraints = "";
-				if (outfit)
-					CharacterAppearanceRestore(KDSpeakerNPC, DecompressB64(outfit),false, true);
-				CharacterRefresh(KDSpeakerNPC);
-				KDInitProtectedGroups(KDSpeakerNPC);
 				KDRefreshCharacter.set(KDSpeakerNPC, true);
-				KinkyDungeonDressPlayer(KDSpeakerNPC, true);
-			};
-			KDWardrobeResetCallback = () => {
-				KDShowCharacterPalette = false; KDWardrobePreviewRestraints = "";
-				delete value.customOutfit;
-			};
-		} else {
-			KDWardrobeRevertCallback = () => {
-				KDShowCharacterPalette = false; KDWardrobePreviewRestraints = "";
-				delete value.customOutfit;
+				KDDressWardrobeChar(KDSpeakerNPC, false);
+
+				/*  FIXME: After setting up `value2`, nothing is done with it?  */
+				let value2 = value;
+				//if (KDOriginalValue) {
+				value2.customOutfit = await KinkyDungeonCompressSave (AppearanceItemStringify(KDSpeakerNPC.Appearance), SaveType.Outfit);
+				value2.Palette = KDSpeakerNPC.Palette;
+				value2.metadata = KDSpeakerNPC.metadata;
+
 				KDRefreshCharacter.set(KDSpeakerNPC, true);
-				KinkyDungeonDressPlayer(KDSpeakerNPC, true);
+				KinkyDungeonCheckClothesLoss = true;
+				KinkyDungeonDressPlayer(KDSpeakerNPC, false, false, KDGameData.NPCRestraints ? KDGameData.NPCRestraints[value.id + ''] : undefined);
+				//}
 			};
-			KDWardrobeResetCallback = null;
-		}
+			if (value.customOutfit) {
+				let outfit = value.customOutfit;
+				KDWardrobeRevertCallback = async () => {
+					KDShowCharacterPalette = false; KDWardrobePreviewRestraints = "";
+					if (outfit)
+						await CharacterAppearanceRestore(KDSpeakerNPC, await KinkyDungeonDecompressSave (outfit, SaveType.Outfit),false, true);
+					CharacterRefresh(KDSpeakerNPC);
+					KDInitProtectedGroups(KDSpeakerNPC);
+					KDRefreshCharacter.set(KDSpeakerNPC, true);
+					KinkyDungeonDressPlayer(KDSpeakerNPC, true);
+				};
+				KDWardrobeResetCallback = () => {
+					KDShowCharacterPalette = false; KDWardrobePreviewRestraints = "";
+					delete value.customOutfit;
+				};
+			} else {
+				KDWardrobeRevertCallback = () => {
+					KDShowCharacterPalette = false; KDWardrobePreviewRestraints = "";
+					delete value.customOutfit;
+					KDRefreshCharacter.set(KDSpeakerNPC, true);
+					KinkyDungeonDressPlayer(KDSpeakerNPC, true);
+				};
+				KDWardrobeResetCallback = null;
+			}
 
-		KDPlayerSetPose = false;
-		KDInitCurrentPose(true,KDSpeakerNPC);
-		KinkyDungeonInitializeDresses();
-		KDUpdateModelList();
-		KDRefreshOutfitInfo();
-		let itt = localStorage.getItem("kinkydungeonappearance" + KDCurrentOutfit);
-		let orig = itt ?
-			JSON.parse(LZString.decompressFromBase64(itt)).appearance
-			|| itt : "";
-		let current = LZString.compressToBase64(AppearanceItemStringify(KinkyDungeonPlayer.Appearance));
-		if (orig != current) KDOriginalValue = orig;
-		ForceRefreshModelsAsync(KDSpeakerNPC);
-		KDShowCharacterPalette = false; KDWardrobePreviewRestraints = "";
-		KDDressWardrobeChar(KDSpeakerNPC, true);
+			KDPlayerSetPose = false;
+			KDInitCurrentPose(true,KDSpeakerNPC);
+			KinkyDungeonInitializeDresses();
+			KDUpdateModelList();
+			KDRefreshOutfitInfo();
+			let itt = localStorage.getItem("kinkydungeonappearance" + KDCurrentOutfit);
+			let orig = itt ? JSON.parse (await KinkyDungeonDecompressSave (itt, SaveType.Outfit)).appearance || itt
+				       : "";
+			let current = await KinkyDungeonCompressSave (AppearanceItemStringify (KinkyDungeonPlayer.Appearance), SaveType.Outfit);
+			if (orig != current) KDOriginalValue = orig;
+			ForceRefreshModelsAsync(KDSpeakerNPC);
+			KDShowCharacterPalette = false; KDWardrobePreviewRestraints = "";
+			KDDressWardrobeChar(KDSpeakerNPC, true);
+		})();
 		return true;
 	}, true, x - 90, y + 90, 80, 80, "", KDBaseWhite,
 		KinkyDungeonRootDirectory + "UI/Dress.png", undefined, undefined,
@@ -697,7 +698,7 @@ function KDDrawSelectedCollectionMember(value: KDCollectionEntry, x: number, y:
 			NPCTags.set(KDSpeakerNPC, KinkyDungeonUpdateRestraints(KDSpeakerNPC, value.id, 0));
 			KDEntityRestraintMetadata.set(value.id, KDUpdateRestraintMetadata(value.id, 0));
 		}
-		KinkyDungeonDressPlayer(KDSpeakerNPC, false, false, 
+		KinkyDungeonDressPlayer(KDSpeakerNPC, false, false,
 			KDGameData.NPCRestraints ? KDGameData.NPCRestraints[value.id + ''] : undefined);
 		DrawCharacter(KDSpeakerNPC,
 			x + 20 + (KDToggleBigView ? 0 : 100),
@@ -780,7 +781,7 @@ function KDDrawSelectedCollectionMember(value: KDCollectionEntry, x: number, y:
 
 
 	} else {
-		
+
 		KDDraw(kdcanvas, kdpixisprites, value.name + "_coll," + value.id, KinkyDungeonRootDirectory + dir + sp + ".png",
 			x + 20,
 			y + 80,
@@ -1157,8 +1158,8 @@ function KDDrawCollectionInventory(x: number, y: number, drawCallback?: (value:
 			DrawCharacter(char,
 				XX + size/2.7,
 				YY + size*0.2,
-				size/1300, false, kdcanvas, undefined, 
-				CHIBIMOD, 101, false, undefined, 
+				size/1300, false, kdcanvas, undefined,
+				CHIBIMOD, 101, false, undefined,
 				value.name + "_coll," + value.id, CHIBIMODEND);
 
 		}
@@ -1275,8 +1276,8 @@ function KDDrawCollectionInventory(x: number, y: number, drawCallback?: (value:
 				DrawCharacter(char,
 					XX + size/2.7,
 					YY + size*0.2,
-					size/1300, false, kdcanvas, undefined, 
-					CHIBIMOD, 101, false, undefined, 
+					size/1300, false, kdcanvas, undefined,
+					CHIBIMOD, 101, false, undefined,
 					value.name + "_coll," + value.id, CHIBIMODEND);
 
 			}
@@ -1938,5 +1939,5 @@ function KDGenCharForCollection(value: KDCollectionEntry, enemyType: enemy) {
 				KDSpeakerNPC, true);
 		}
 		KDRefreshCharacter.set(KDSpeakerNPC, true);
-	} 
-}
+	}
+}

Game/src/map/KDStairActions.ts

@@ -133,7 +133,7 @@ function KDGoThruTile(x: number, y: number, suppressCheckPoint: boolean, force:
 					if (KDGameData.PriorJailbreaks > 0) KDGameData.PriorJailbreaksDecay = (KDGameData.PriorJailbreaksDecay + 1) || 1;
 
 					if (MiniGameKinkyDungeonLevel > 1) {
-						
+
 						KDAdvanceOneFloor();
 					}
 
@@ -167,7 +167,7 @@ function KDGoThruTile(x: number, y: number, suppressCheckPoint: boolean, force:
 			let movedUp = MiniGameKinkyDungeonLevel > KDGameData.HighestLevelCurrent;
 			KDGameData.HighestLevelCurrent = Math.max(KDGameData.HighestLevelCurrent || 1, MiniGameKinkyDungeonLevel);
 			KDGameData.HighestLevel = Math.max(KDGameData.HighestLevel || 1, MiniGameKinkyDungeonLevel);
-			
+
 
 			//if (KinkyDungeonTilesGet(KinkyDungeonPlayerEntity.x + "," + KinkyDungeonPlayerEntity.y)) {
 			let MapMod = data.mapMod;
@@ -264,15 +264,18 @@ function KDGoThruTile(x: number, y: number, suppressCheckPoint: boolean, force:
 
 function KDPostStairSave() {
 	if (KDGameData.RoomType == "PerkRoom" && MiniGameKinkyDungeonLevel >= 1) { //  && Math.floor(MiniGameKinkyDungeonLevel / 3) == MiniGameKinkyDungeonLevel / 3
-			if ((!KinkyDungeonStatsChoice.get("saveMode"))) {
-				let saveData = LZString.compressToBase64(JSON.stringify(KinkyDungeonSaveGame(true)));
+		if ((!KinkyDungeonStatsChoice.get("saveMode"))) {
+			(async() => {
+				let saveData = await KinkyDungeonCompressSave (JSON.stringify (KinkyDungeonSaveGame (true)), SaveType.Game);
 				KinkyDungeonState = "Save";
 				KDTextArea("saveDataField", 750, 100, 1000, 230);
 				ElementValue("saveDataField", saveData);
-			} else KinkyDungeonSaveGame();
-		}
-		else KinkyDungeonSaveGame();
- }
+			})();
+		} else KinkyDungeonSaveGame();
+	}
+	else KinkyDungeonSaveGame();
+}
+
 function KinkyDungeonHandleStairs(toTile: string, suppressCheckPoint?: boolean) {
 	if (KinkyDungeonFlags.get("stairslocked")) {
 		KinkyDungeonSendActionMessage(10, TextGet("KDStairsLocked").replace("NMB", "" + KinkyDungeonFlags.get("stairslocked")), KDBaseWhite, 1);

Game/src/map/KinkyDungeonAlt.ts

@@ -3284,4 +3284,4 @@ function KDEnumerateShopVisitors() {
 		options.AdaLovelock = 100;
 	}
 	return options;
-}
+}

Game/src/map/KinkyDungeonTiles.ts

@@ -1028,7 +1028,7 @@ function KDAdvanceOneFloor() {
 		KinkyDungeonChangeRep("Conjure", -1);
 		KinkyDungeonChangeRep("Illusion", -1);
 	}
-	
+
 	if (KDGameData.PrisonerState == "jail") {
 		KDGameData.PrisonerState = "";
 		// Increase security if escaping jail
@@ -1050,4 +1050,4 @@ function KDRoomUnwanderable(altType: string) {
 			return true;
 		}
 	return !altRoom; // bc is main
-}
+}