pxt-common-packages 12.0.1 → 12.0.2

package/libs/game/game.ts

@@ -372,6 +372,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;
@@ -389,7 +398,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) {

package/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 {

package/libs/lcd/built/debug/binary.js

@@ -56,7 +56,7 @@ const pxsim_pxtrt = pxsim.pxtrt;
 const pxsim_numops = pxsim.numops;
 
 
-function _main___P48912(s) {
+function _main___P48913(s) {
 let r0 = s.r0, step = s.pc;
 s.pc = -1;
 
@@ -66,19 +66,19 @@ if (yieldSteps-- < 0 && maybeYield(s, step, r0) || runtime !== pxsim.runtime) re
 switch (step) {
   case 0:
 
-    globals._intervals___49155 = (undefined);
-    globals._pollEventQueue___49168 = (undefined);
+    globals._intervals___49156 = (undefined);
+    globals._pollEventQueue___49169 = (undefined);
     r0 = undefined;
     return leave(s, r0)
   default: oops()
 } } }
-_main___P48912.info = {"start":0,"length":0,"line":0,"column":0,"endLine":0,"endColumn":0,"fileName":"characterlcd.ts","functionName":"<main>","argumentNames":[]}
-_main___P48912.continuations = [  ]
+_main___P48913.info = {"start":0,"length":0,"line":0,"column":0,"endLine":0,"endColumn":0,"fileName":"characterlcd.ts","functionName":"<main>","argumentNames":[]}
+_main___P48913.continuations = [  ]
 
-function _main___P48912_mk(s) {
+function _main___P48913_mk(s) {
     checkStack(s.depth);
     return {
-        parent: s, fn: _main___P48912, depth: s.depth + 1,
+        parent: s, fn: _main___P48913, depth: s.depth + 1,
         pc: 0, retval: undefined, r0: undefined, overwrittenPC: false, lambdaArgs: null,
 } }
 
@@ -88,5 +88,5 @@ function _main___P48912_mk(s) {
 
 const breakpoints = setupDebugger(1, [])
 
-return _main___P48912
+return _main___P48913
 })

package/libs/light-spectrum-sensor/built/debug/binary.js

@@ -56,7 +56,7 @@ const pxsim_pxtrt = pxsim.pxtrt;
 const pxsim_numops = pxsim.numops;
 
 
-function _main___P99074(s) {
+function _main___P99077(s) {
 let r0 = s.r0, step = s.pc;
 s.pc = -1;
 
@@ -66,19 +66,19 @@ if (yieldSteps-- < 0 && maybeYield(s, step, r0) || runtime !== pxsim.runtime) re
 switch (step) {
   case 0:
 
-    globals._intervals___99317 = (undefined);
-    globals._pollEventQueue___99330 = (undefined);
+    globals._intervals___99320 = (undefined);
+    globals._pollEventQueue___99333 = (undefined);
     r0 = undefined;
     return leave(s, r0)
   default: oops()
 } } }
-_main___P99074.info = {"start":0,"length":0,"line":0,"column":0,"endLine":0,"endColumn":0,"fileName":"tsl2591.ts","functionName":"<main>","argumentNames":[]}
-_main___P99074.continuations = [  ]
+_main___P99077.info = {"start":0,"length":0,"line":0,"column":0,"endLine":0,"endColumn":0,"fileName":"tsl2591.ts","functionName":"<main>","argumentNames":[]}
+_main___P99077.continuations = [  ]
 
-function _main___P99074_mk(s) {
+function _main___P99077_mk(s) {
     checkStack(s.depth);
     return {
-        parent: s, fn: _main___P99074, depth: s.depth + 1,
+        parent: s, fn: _main___P99077, depth: s.depth + 1,
         pc: 0, retval: undefined, r0: undefined, overwrittenPC: false, lambdaArgs: null,
 } }
 
@@ -88,5 +88,5 @@ function _main___P99074_mk(s) {
 
 const breakpoints = setupDebugger(1, [])
 
-return _main___P99074
+return _main___P99077
 })

package/libs/lora/built/debug/binary.js

@@ -56,7 +56,7 @@ const pxsim_pxtrt = pxsim.pxtrt;
 const pxsim_numops = pxsim.numops;
 
 
-function _main___P60220(s) {
+function _main___P60221(s) {
 let r0 = s.r0, step = s.pc;
 s.pc = -1;
 
@@ -66,19 +66,19 @@ if (yieldSteps-- < 0 && maybeYield(s, step, r0) || runtime !== pxsim.runtime) re
 switch (step) {
   case 0:
 
-    globals._intervals___60463 = (undefined);
-    globals._pollEventQueue___60476 = (undefined);
+    globals._intervals___60464 = (undefined);
+    globals._pollEventQueue___60477 = (undefined);
     r0 = undefined;
     return leave(s, r0)
   default: oops()
 } } }
-_main___P60220.info = {"start":0,"length":0,"line":0,"column":0,"endLine":0,"endColumn":0,"fileName":"lora.ts","functionName":"<main>","argumentNames":[]}
-_main___P60220.continuations = [  ]
+_main___P60221.info = {"start":0,"length":0,"line":0,"column":0,"endLine":0,"endColumn":0,"fileName":"lora.ts","functionName":"<main>","argumentNames":[]}
+_main___P60221.continuations = [  ]
 
-function _main___P60220_mk(s) {
+function _main___P60221_mk(s) {
     checkStack(s.depth);
     return {
-        parent: s, fn: _main___P60220, depth: s.depth + 1,
+        parent: s, fn: _main___P60221, depth: s.depth + 1,
         pc: 0, retval: undefined, r0: undefined, overwrittenPC: false, lambdaArgs: null,
 } }
 
@@ -88,5 +88,5 @@ function _main___P60220_mk(s) {
 
 const breakpoints = setupDebugger(1, [])
 
-return _main___P60220
+return _main___P60221
 })

package/libs/matrix-keypad/built/debug/binary.js

@@ -56,7 +56,7 @@ const pxsim_pxtrt = pxsim.pxtrt;
 const pxsim_numops = pxsim.numops;
 
 
-function _main___P192910(s) {
+function _main___P192917(s) {
 let r0 = s.r0, step = s.pc;
 s.pc = -1;
 
@@ -66,19 +66,19 @@ if (yieldSteps-- < 0 && maybeYield(s, step, r0) || runtime !== pxsim.runtime) re
 switch (step) {
   case 0:
 
-    globals._intervals___193153 = (undefined);
-    globals._pollEventQueue___193166 = (undefined);
+    globals._intervals___193160 = (undefined);
+    globals._pollEventQueue___193173 = (undefined);
     r0 = undefined;
     return leave(s, r0)
   default: oops()
 } } }
-_main___P192910.info = {"start":0,"length":0,"line":0,"column":0,"endLine":0,"endColumn":0,"fileName":"keypad.ts","functionName":"<main>","argumentNames":[]}
-_main___P192910.continuations = [  ]
+_main___P192917.info = {"start":0,"length":0,"line":0,"column":0,"endLine":0,"endColumn":0,"fileName":"keypad.ts","functionName":"<main>","argumentNames":[]}
+_main___P192917.continuations = [  ]
 
-function _main___P192910_mk(s) {
+function _main___P192917_mk(s) {
     checkStack(s.depth);
     return {
-        parent: s, fn: _main___P192910, depth: s.depth + 1,
+        parent: s, fn: _main___P192917, depth: s.depth + 1,
         pc: 0, retval: undefined, r0: undefined, overwrittenPC: false, lambdaArgs: null,
 } }
 
@@ -88,5 +88,5 @@ function _main___P192910_mk(s) {
 
 const breakpoints = setupDebugger(1, [])
 
-return _main___P192910
+return _main___P192917
 })

package/libs/mixer/sim/music.ts

@@ -54,16 +54,16 @@ namespace pxsim.music {
 
         await res.sequencer.initAsync();
         res.sequencer.addEventListener("stop", () => {
-            board().bus.queue(SEQUENCER_STOP_MESSAGE, this.id);
+            board().bus.queue(SEQUENCER_STOP_MESSAGE, res.id);
         });
         res.sequencer.addEventListener("state-change", () => {
-            board().bus.queue(SEQUENCER_STATE_CHANGE_MESSAGE, this.id);
+            board().bus.queue(SEQUENCER_STATE_CHANGE_MESSAGE, res.id);
         });
         res.sequencer.addEventListener("looped", () => {
-            board().bus.queue(SEQUENCER_LOOPED_MESSAGE, this.id);
+            board().bus.queue(SEQUENCER_LOOPED_MESSAGE, res.id);
         });
         res.sequencer.addEventListener("tick", () => {
-            board().bus.queue(SEQUENCER_TICK_MESSAGE, this.id);
+            board().bus.queue(SEQUENCER_TICK_MESSAGE, res.id);
         });