pxt-common-packages 10.3.7 → 10.3.9

package/libs/game/multiplayer.ts

@@ -1,18 +1,10 @@
 namespace multiplayer {
-    enum IconType {
-        Player = 0,
-        Reaction = 1,
-    }
-
     //% shim=multiplayer::getCurrentImage
     declare function getCurrentImage(): Image;
 
     //% shim=multiplayer::postImage
     declare function postImage(im: Image): void;
 
-    //% shim=multiplayer::postIcon
-    declare function postIcon(type: IconType, slot: number, im: Image): void;
-
     //% shim=multiplayer::setOrigin
     declare function setOrigin(origin: string): void;
 
@@ -42,6 +34,15 @@ namespace multiplayer {
             })
         }
     }
+}
+
+namespace mp {
+    enum IconType {
+        Player = 0,
+        Reaction = 1,
+    }
+    //% shim=multiplayer::postIcon
+    declare function postIcon(type: IconType, slot: number, im: Image): void;
 
     export function postPresenceIcon(slot: number, im: Image, implicit?: boolean) {
         initIconState();

package/libs/game/ns.ts

@@ -0,0 +1,5 @@
+//% color=#8854d0 weight=97 icon="\uf111"
+//% blockGap=8
+//% groups='["Gameplay", "Game Over", "Prompt",  "Dialogs"]'
+namespace game {
+}

package/libs/game/numberprompt.ts

@@ -5,7 +5,6 @@ namespace game {
      * @param message The message to display on the text-entry screen
      * @param answerLength The maximum number of digits the user can enter (1 - 10)
      */
-    //% group="Gameplay"
     //% weight=10 help=game/ask-for-number
     //% blockId=gameaskfornumber block="ask for number %message || and max length %answerLength"
     //% message.shadow=text

package/libs/game/particleeffects.ts

@@ -337,4 +337,34 @@ namespace effects {
         source.z = -2;
         return source;
     });
+
+    //% fixedInstance whenUsed block="none"
+    export const none = new ScreenEffect(0, 0, 0, function (anchor: particles.ParticleAnchor, particlesPerSecond: number) {
+        class NullParticleSource extends particles.ParticleSource {
+            constructor() {
+                super(null, 0);
+                this._prune();
+            }
+
+            __draw(camera: scene.Camera) {}
+
+            _update(dt: number) {}
+
+            // remove self at next opportunity
+            _prune() {
+                const scene = game.currentScene();
+                if (!scene)
+                    return;
+                scene.allSprites.removeElement(this);
+                const sources = scene.particleSources;
+                if (sources && sources.length)
+                    sources.removeElement(this);
+            }
+            destroy() { this._prune(); }
+            clear() { this.head = undefined; }
+        }
+        const source = new NullParticleSource();
+
+        return source;
+    });
 }

package/libs/game/prompt.ts

@@ -16,7 +16,6 @@ namespace game {
      * @param message The message to display on the text-entry screen
      * @param answerLength The maximum number of characters the user can enter (1 - 24)
      */
-    //% group="Gameplay"
     //% weight=10 help=game/ask-for-string
     //% blockId=gameaskforstring block="ask for string %message || and max length %answerLength"
     //% message.shadow=text

package/libs/game/pxt.json

@@ -2,6 +2,7 @@
     "name": "game",
     "description": "The game and sprite library - beta",
     "files": [
+        "ns.ts",
         "gameoverrides.ts",
         "basesprite.ts",
         "constants.ts",

package/libs/game/textDialogs.ts

@@ -14,6 +14,22 @@ enum DialogLayout {
 }
 
 namespace game {
+    function padStr(len: number): string {
+        let str = "";
+        for (let i = 0; i < len; ++i) {
+            str += " ";
+        }
+        return str;
+    }
+
+    function replaceRange(dst: string, src: string, start: number, len: number): string {
+        return dst.substr(0, start) + src.substr(0, len) + dst.substr(start + len);
+    }
+
+    function screenColor(c: number): number {
+        return screen.isMono ? 1 : c;
+    }
+
     let dialogFrame: Image;
     let dialogCursor: Image;
     let dialogTextColor: number;
@@ -36,24 +52,21 @@ namespace game {
         textColor: number;
 
         constructor(width: number, height: number, frame?: Image, font?: image.Font, cursor?: Image) {
-            this.image = image.create(width, height);
+            this.cursorCount = 0;
+            this.resize(width, height, frame, font, cursor);
+        }
 
+        resize(width: number, height: number, frame?: Image, font?: image.Font, cursor?: Image) {
             this.frame = frame || dialogFrame || (dialogFrame = defaultFrame());
-
-            this.font = font || image.font8;
-
-            this.cursor = cursor || dialogCursor || (dialogCursor = defaultCursorImage());
-
-            this.textColor = dialogTextColor == undefined ? dialogTextColor = 15 : dialogTextColor;
-
             this.unit = Math.floor(this.frame.width / 3);
             this.columns = Math.floor(width / this.unit);
             this.rows = Math.floor(height / this.unit);
-
             this.innerLeft = (width - (this.columns * this.unit)) >> 1;
             this.innerTop = (height - (this.rows * this.unit)) >> 1;
-
-            this.cursorCount = 0;
+            this.image = image.create(width, height);
+            this.font = font || image.font8;
+            this.cursor = cursor || dialogCursor || (dialogCursor = defaultCursorImage());
+            this.textColor = dialogTextColor == undefined ? dialogTextColor = 15 : dialogTextColor;
 
             this.drawBorder();
             this.clearInterior();
@@ -332,18 +345,150 @@ namespace game {
         }
     }
 
+    const img_trophy_sm = img`
+    . . . . . . . 
+    . 4 5 5 5 1 . 
+    . 4 5 5 5 1 . 
+    . 4 5 5 5 1 . 
+    . . 4 5 1 . . 
+    . . . 5 . . . 
+    . . 4 5 1 . . 
+    . . . . . . . 
+    `;
+
+    const img_trophy_lg = img`
+    . . . . . . . . . . . . . . . . 
+    . . . . . . . . . . . . . . . . 
+    . . . . . 5 5 5 5 5 5 . . . . . 
+    . . . . 5 4 4 4 4 4 4 5 . . . . 
+    . . . . 5 5 5 5 5 5 5 5 . . . . 
+    . . . . 4 5 5 5 5 5 5 1 . . . . 
+    . . . 5 4 4 5 5 5 5 1 1 5 . . . 
+    . . 5 . 4 4 5 5 5 5 1 1 . 5 . . 
+    . . 5 . 4 4 5 5 5 5 1 1 . 5 . . 
+    . . . 5 4 4 5 5 5 5 1 1 5 . . . 
+    . . . . 4 4 5 5 5 5 1 1 . . . . 
+    . . . . . 4 5 5 5 1 1 . . . . . 
+    . . . . . . 4 5 1 1 . . . . . . 
+    . . . . . . . 4 1 . . . . . . . 
+    . . . . . 4 4 5 5 1 1 . . . . . 
+    . . . . . . . . . . . . . . . . 
+    `;
+
+    const img_sleepy_sim = img`
+    . . . . . . . . . . . . . . . . 
+    . . . 6 6 6 6 6 6 6 6 6 6 . . . 
+    . . 6 f f f f f f f f f f 6 . . 
+    . . 6 f f f f f f f f f f 6 . . 
+    . . 6 f f 1 1 f f 1 1 f f 6 . . 
+    . . 6 f f f f f f f f f f 6 . . 
+    . . 6 f f f f 1 1 f f f f 6 . . 
+    . . 6 f f f f f f f f f f 6 . . 
+    . . 6 6 6 6 6 6 6 6 6 6 6 6 . . 
+    . . 6 6 f 6 6 6 6 6 6 6 f 6 . . 
+    . . 6 f f f 6 6 6 6 6 6 6 6 . . 
+    . . 6 6 f 6 6 6 6 6 f 6 6 6 . . 
+    . . 6 6 6 6 6 6 6 6 6 6 6 6 . . 
+    . . . 6 6 6 6 6 6 6 6 6 6 . . . 
+    . . . . . . . . . . . . . . . . 
+    . . . . . . . . . . . . . . . . 
+    `;
+
+    export class GameOverPlayerScore {
+        public str: string;
+        constructor(
+            public player: number,
+            public value: number,
+            public winner: boolean) { }
+    }
+
+    enum GameOverDialogFlags {
+        WIN = 1,
+        HAS_BEST = 2,
+        NEW_BEST = 4,
+        MULTIPLAYER = 8,
+        HAS_SCORES = 16
+    };
+
     export class GameOverDialog extends game.BaseDialog {
         protected cursorOn: boolean;
-        protected isNewHighScore: boolean;
+        protected flags: GameOverDialogFlags;
+        protected height: number;
+
+        get isWinCondition() { return !!(this.flags & GameOverDialogFlags.WIN); }
+        get isJudgedGame() { return this.judged; }
+        get hasScores() { return !!(this.flags & GameOverDialogFlags.HAS_SCORES); }
+        get hasBestScore() { return !!(this.flags & GameOverDialogFlags.HAS_BEST); }
+        get isNewBestScore() { return !!(this.flags & GameOverDialogFlags.NEW_BEST); }
+        get isMultiplayerGame() { return !!(this.flags & GameOverDialogFlags.MULTIPLAYER); }
 
         constructor(
-            protected win: boolean,
-            protected score?: number,
-            protected highScore?: number
+            win: boolean,
+            protected message: string,
+            protected judged: boolean,
+            protected scores: GameOverPlayerScore[],
+            protected bestScore?: number,
+            protected winnerOverride?: number
         ) {
             super(screen.width, 46, defaultSplashFrame());
             this.cursorOn = false;
-            this.isNewHighScore = this.score > this.highScore;
+            this.flags = 0;
+
+            if (win) {
+                this.flags |= GameOverDialogFlags.WIN;
+            }
+
+            // Fixup states in case of winner override
+            if (winnerOverride) {
+                win = true;
+                this.flags |= GameOverDialogFlags.WIN;
+                // For display purposes, treat this as a multiplayer game
+                this.flags |= GameOverDialogFlags.MULTIPLAYER;
+                const score = scores.find(score => score.player === winnerOverride);
+                if (!score) {
+                    scores.push(new GameOverPlayerScore(winnerOverride, null, true));
+                    scores.sort((a, b) => a.player - b.player);
+                }
+                scores.forEach(score => score.winner = score.player === winnerOverride);
+            }
+
+            if (scores.length) {
+                // If any score present is other than player 1, this is a multiplayer game
+                scores.forEach(score => score.player > 1 && (this.flags |= GameOverDialogFlags.MULTIPLAYER));
+                if (win) {
+                    let winner = scores.find(score => score.winner);
+                    if (!winner && scores.length === 1) winner = scores[0];
+                    if (winner) {
+                        if (winner.value != null) {
+                            if (bestScore == null) {
+                                this.bestScore = winner.value;
+                                this.flags |= GameOverDialogFlags.NEW_BEST;
+                            } else if (info.isBetterScore(winner.value, bestScore)) {
+                                this.bestScore = winner.value;
+                                this.flags |= GameOverDialogFlags.NEW_BEST;
+                            }
+                        }
+                        // Replace string tokens with resolved values
+                        this.message = this.message
+                            .replaceAll("${WINNER}", "PLAYER " + winner.player)
+                            .replaceAll("${Winner}", "Player " + winner.player)
+                            .replaceAll("${winner}", "player " + winner.player)
+                            .replaceAll("${winner_short}", "P" + winner.player);
+                    }
+                }
+            }
+
+            const scoresWithValues = scores.filter(score => score.value != null);
+            if (scoresWithValues.length) this.flags |= GameOverDialogFlags.HAS_SCORES;
+
+            if (this.isWinCondition && this.isJudgedGame && this.hasScores && (this.bestScore != null)) {
+                this.flags |= GameOverDialogFlags.HAS_BEST;
+            }
+
+            // Two scores per row
+            const scoreRows = Math.max(0, scoresWithValues.length - 1) >> 1;
+            this.height = 47 + scoreRows * image.font5.charHeight;
+            this.resize(screen.width, this.height, defaultSplashFrame());
         }
 
         displayCursor() {
@@ -359,44 +504,134 @@ namespace game {
             }
         }
 
-        drawTextCore() {
-            const titleHeight = 8;
+        drawMessage() {
+            const currY = 5;
             this.image.printCenter(
-                this.win ? "YOU WIN!" : "GAME OVER!",
-                titleHeight,
-                screen.isMono ? 1 : 5,
+                this.message,
+                currY,
+                screenColor(5),
                 image.font8
             );
+        }
 
-            if (this.score !== undefined) {
-                const scoreHeight = 23;
-                const highScoreHeight = 34;
-                const scoreColor = screen.isMono ? 1 : 2;
-
-                this.image.printCenter(
-                    "Score:" + this.score,
-                    scoreHeight,
-                    scoreColor,
-                    image.font8
-                );
+        drawScores() {
+            if (this.hasScores) {
+                const scores = this.scores.filter(score => score.value != null);
+                let currY = image.font5.charHeight + 16;
+                if (this.isMultiplayerGame) {
+                    if (scores.length === 1) {
+                        // Multiplayer special case: Only one player scored
+                        const score = scores[0];
+                        score.str = "P" + score.player + ":" + score.value;
+                        this.image.printCenter(
+                            score.str,
+                            currY,
+                            screenColor(1),
+                            image.font5
+                        );
+                        if (score.winner) {
+                            // In multiplayer, the winning score gets a trophy
+                            const x = (this.image.width >> 1) - ((score.str.length * image.font5.charWidth) >> 1);
+                            this.image.drawTransparentImage(img_trophy_sm, x - img_trophy_sm.width - 3, currY - 2);
+                        }
+                    } else {
+                        // Multiplayer general case: Multiple players scored
+                        // Compute max score width
+                        const strlens = [0, 0];
+                        for (let i = 0; i < scores.length; ++i) {
+                            const col = i % 2;
+                            const score = scores[i];
+                            score.str = "P" + score.player + ":" + score.value;
+                            strlens[col] = Math.max(strlens[col], score.str.length);
+                        }
+                        // Print scores in a grid, two per row
+                        for (let i = 0; i < scores.length; ++i) {
+                            const col = i % 2;
+                            const score = scores[i];
+                            let str = padStr(strlens[col]);
+                            str = replaceRange(str, score.str, 0, score.str.length);
+                            let x = 0;
+                            if (col === 0) {
+                                x = (this.image.width >> 1) - strlens[col] * image.font5.charWidth - 3;
+                            } else {
+                                x = (this.image.width >> 1) + 3;
+                            }
+                            if (score.winner) {
+                                // In multiplayer, the winning score gets a trophy
+                                if (i % 2 === 0) {
+                                    this.image.drawTransparentImage(img_trophy_sm, x - img_trophy_sm.width - 3, currY - 2);
+                                } else {
+                                    this.image.drawTransparentImage(img_trophy_sm, x + score.str.length * image.font5.charWidth + 2, currY - 2);
+                                }
+                            }
+                            this.image.print(
+                                str,
+                                x,
+                                currY,
+                                screenColor(1),
+                                image.font5
+                            );
+                            if (i % 2 === 1) {
+                                currY += image.font5.charHeight + 2;
+                            }
+                        }
+                    }
+                } else {
+                    // Single player case
+                    const score = scores[0];
+                    score.str = "Score:" + score.value;
+                    this.image.printCenter(
+                        score.str,
+                        currY - 1,
+                        screenColor(1),
+                        image.font8 // Single player score gets a bigger font
+                    );
+                }
+            } else if (this.isWinCondition) {
+                // No score, but there is a win condition. Show a trophy.
+                let currY = image.font5.charHeight + 14;
+                this.image.drawTransparentImage(img_trophy_lg, (this.image.width >> 1) - (img_trophy_lg.width >> 1), currY);
+            } else {
+                // No score, no win, show a generic game over icon (sleepy sim)
+                let currY = image.font5.charHeight + 14;
+                this.image.drawTransparentImage(img_sleepy_sim, (this.image.width >> 1) - (img_sleepy_sim.width >> 1), currY);
+            }
+        }
 
-                if (this.isNewHighScore) {
+        drawBestScore() {
+            if (this.hasBestScore) {
+                const currY = this.height - image.font8.charHeight - 5;
+                if (this.isNewBestScore) {
+                    const label = "New Best Score!";
                     this.image.printCenter(
-                        "New High Score!",
-                        highScoreHeight,
-                        scoreColor,
-                        image.font5
+                        label,
+                        currY,
+                        screenColor(9),
+                        image.font8
                     );
+                    // In single player draw trophy icons on either side of the label.
+                    // In multiplayer a trophy icon is drawn next to the winning score instead.
+                    if (!this.isMultiplayerGame) {
+                        const halfWidth = (label.length * image.font8.charWidth) >> 1;
+                        this.image.drawTransparentImage(img_trophy_sm, (this.image.width >> 1) - halfWidth - img_trophy_sm.width - 2, currY);
+                        this.image.drawTransparentImage(img_trophy_sm, (this.image.width >> 1) + halfWidth, currY);
+                    }
                 } else {
                     this.image.printCenter(
-                        "HI" + this.highScore,
-                        highScoreHeight,
-                        scoreColor,
+                        "Best:" + this.bestScore,
+                        currY,
+                        screenColor(9),
                         image.font8
                     );
                 }
             }
         }
+
+        drawTextCore() {
+            this.drawMessage();
+            this.drawScores();
+            this.drawBestScore();
+        }
     }
 
     /**

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

@@ -56,7 +56,7 @@ const pxsim_pxtrt = pxsim.pxtrt;
 const pxsim_numops = pxsim.numops;
 
 
-function _main___P48571(s) {
+function _main___P48685(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___48814 = (undefined);
-    globals._pollEventQueue___48827 = (undefined);
+    globals._intervals___48928 = (undefined);
+    globals._pollEventQueue___48941 = (undefined);
     r0 = undefined;
     return leave(s, r0)
   default: oops()
 } } }
-_main___P48571.info = {"start":0,"length":0,"line":0,"column":0,"endLine":0,"endColumn":0,"fileName":"characterlcd.ts","functionName":"<main>","argumentNames":[]}
-_main___P48571.continuations = [  ]
+_main___P48685.info = {"start":0,"length":0,"line":0,"column":0,"endLine":0,"endColumn":0,"fileName":"characterlcd.ts","functionName":"<main>","argumentNames":[]}
+_main___P48685.continuations = [  ]
 
-function _main___P48571_mk(s) {
+function _main___P48685_mk(s) {
     checkStack(s.depth);
     return {
-        parent: s, fn: _main___P48571, depth: s.depth + 1,
+        parent: s, fn: _main___P48685, depth: s.depth + 1,
         pc: 0, retval: undefined, r0: undefined, overwrittenPC: false, lambdaArgs: null,
 } }
 
@@ -88,5 +88,5 @@ function _main___P48571_mk(s) {
 
 const breakpoints = setupDebugger(1, [])
 
-return _main___P48571
+return _main___P48685
 })

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___P98045(s) {
+function _main___P98387(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___98288 = (undefined);
-    globals._pollEventQueue___98301 = (undefined);
+    globals._intervals___98630 = (undefined);
+    globals._pollEventQueue___98643 = (undefined);
     r0 = undefined;
     return leave(s, r0)
   default: oops()
 } } }
-_main___P98045.info = {"start":0,"length":0,"line":0,"column":0,"endLine":0,"endColumn":0,"fileName":"tsl2591.ts","functionName":"<main>","argumentNames":[]}
-_main___P98045.continuations = [  ]
+_main___P98387.info = {"start":0,"length":0,"line":0,"column":0,"endLine":0,"endColumn":0,"fileName":"tsl2591.ts","functionName":"<main>","argumentNames":[]}
+_main___P98387.continuations = [  ]
 
-function _main___P98045_mk(s) {
+function _main___P98387_mk(s) {
     checkStack(s.depth);
     return {
-        parent: s, fn: _main___P98045, depth: s.depth + 1,
+        parent: s, fn: _main___P98387, depth: s.depth + 1,
         pc: 0, retval: undefined, r0: undefined, overwrittenPC: false, lambdaArgs: null,
 } }
 
@@ -88,5 +88,5 @@ function _main___P98045_mk(s) {
 
 const breakpoints = setupDebugger(1, [])
 
-return _main___P98045
+return _main___P98387
 })

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

@@ -56,7 +56,7 @@ const pxsim_pxtrt = pxsim.pxtrt;
 const pxsim_numops = pxsim.numops;
 
 
-function _main___P59873(s) {
+function _main___P59987(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___60116 = (undefined);
-    globals._pollEventQueue___60129 = (undefined);
+    globals._intervals___60230 = (undefined);
+    globals._pollEventQueue___60243 = (undefined);
     r0 = undefined;
     return leave(s, r0)
   default: oops()
 } } }
-_main___P59873.info = {"start":0,"length":0,"line":0,"column":0,"endLine":0,"endColumn":0,"fileName":"lora.ts","functionName":"<main>","argumentNames":[]}
-_main___P59873.continuations = [  ]
+_main___P59987.info = {"start":0,"length":0,"line":0,"column":0,"endLine":0,"endColumn":0,"fileName":"lora.ts","functionName":"<main>","argumentNames":[]}
+_main___P59987.continuations = [  ]
 
-function _main___P59873_mk(s) {
+function _main___P59987_mk(s) {
     checkStack(s.depth);
     return {
-        parent: s, fn: _main___P59873, depth: s.depth + 1,
+        parent: s, fn: _main___P59987, depth: s.depth + 1,
         pc: 0, retval: undefined, r0: undefined, overwrittenPC: false, lambdaArgs: null,
 } }
 
@@ -88,5 +88,5 @@ function _main___P59873_mk(s) {
 
 const breakpoints = setupDebugger(1, [])
 
-return _main___P59873
+return _main___P59987
 })

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

@@ -56,7 +56,7 @@ const pxsim_pxtrt = pxsim.pxtrt;
 const pxsim_numops = pxsim.numops;
 
 
-function _main___P190517(s) {
+function _main___P191315(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___190760 = (undefined);
-    globals._pollEventQueue___190773 = (undefined);
+    globals._intervals___191558 = (undefined);
+    globals._pollEventQueue___191571 = (undefined);
     r0 = undefined;
     return leave(s, r0)
   default: oops()
 } } }
-_main___P190517.info = {"start":0,"length":0,"line":0,"column":0,"endLine":0,"endColumn":0,"fileName":"keypad.ts","functionName":"<main>","argumentNames":[]}
-_main___P190517.continuations = [  ]
+_main___P191315.info = {"start":0,"length":0,"line":0,"column":0,"endLine":0,"endColumn":0,"fileName":"keypad.ts","functionName":"<main>","argumentNames":[]}
+_main___P191315.continuations = [  ]
 
-function _main___P190517_mk(s) {
+function _main___P191315_mk(s) {
     checkStack(s.depth);
     return {
-        parent: s, fn: _main___P190517, depth: s.depth + 1,
+        parent: s, fn: _main___P191315, depth: s.depth + 1,
         pc: 0, retval: undefined, r0: undefined, overwrittenPC: false, lambdaArgs: null,
 } }
 
@@ -88,5 +88,5 @@ function _main___P190517_mk(s) {
 
 const breakpoints = setupDebugger(1, [])
 
-return _main___P190517
+return _main___P191315
 })