made saveAllScores take the scoring method (#1480)

microsoft · Jul 22, 2024 · 1c2be24 · 1c2be24
1 parent fdfe364
commit 1c2be24
Show file tree

Hide file tree

Showing 2 changed files with 18 additions and 3 deletions.
diff --git a/libs/game/game.ts b/libs/game/game.ts
@@ -348,6 +348,15 @@ namespace game {
         _gameOverImpl(true, player);
     }
 
+    function _mapScoreTypeToString(scoreType: ScoringType): string {
+        switch (scoreType) {
+            case ScoringType.HighScore: return "highscore";
+            case ScoringType.LowScore: return "lowscore";
+            case ScoringType.None: return "none";
+            default: return "none";
+        }
+    }
+
     function _gameOverImpl(win: boolean, winnerOverride?: number) {
         init();
         if (__isOver) return;
@@ -365,7 +374,8 @@ namespace game {
             const scores = playersWithScores.map(player => new GameOverPlayerScore(player.number, player.impl.score(), player === winner));
 
             // Save all scores. Dependency Note: this action triggers Kiosk to exit the simulator and show the high score screen.
-            info.saveAllScores();
+            const scoreTypeString = _mapScoreTypeToString(goc.scoringType);
+            info.saveAllScores(scoreTypeString);
 
             // Save high score if this was a judged game and there was a winner (don't save in the LOSE case).
             if (judged && winner) {

diff --git a/libs/game/info.ts b/libs/game/info.ts
@@ -241,7 +241,7 @@ namespace info {
         return players ? players.filter(item => item.impl.hasScore()) : [];
     }
 
-    export function saveAllScores() {
+    export function saveAllScores(scoringType: string) {
         const allScoresKey = "all-scores";
         let allScores: number[];
         const pws = playersWithScores();
@@ -252,7 +252,12 @@ namespace info {
             allScores = [];
         }
 
-        settings.writeJSON(allScoresKey, allScores);
+        const scoresObj = {
+            "allScores": allScores,
+            "scoringType": allScores.length ? scoringType : "None"
+        }
+
+        settings.writeJSON(allScoresKey, scoresObj);
     }
 
     export function winningPlayer(): PlayerInfo {