pxt-common-packages 10.4.1 → 10.4.3

package/libs/game/controller.ts

@@ -13,6 +13,30 @@ enum ControllerEvent {
 //% blockGap=8
 namespace controller {
     let _players: Controller[];
+    game.addScenePopHandler(() => {
+        const stateWhenPushed = game.currentScene().controllerConnectionState;
+        if (!stateWhenPushed)
+            return;
+        for (let i = 0; i < stateWhenPushed.length; i++) {
+            const p = _players[i];
+            if (p && (!!stateWhenPushed[i] != !!p.connected)) {
+                // connection state changed while in another scene; raise the event.
+                control.raiseEvent(
+                    p.id,
+                    p.connected ? ControllerEvent.Connected : ControllerEvent.Disconnected
+                );
+            }
+        }
+
+    })
+    game.addScenePushHandler(oldScene => {
+        oldScene.controllerConnectionState = [];
+        for (let i = 0; i < _players.length; i++) {
+            if (_players[i]) {
+                oldScene.controllerConnectionState[i] = _players[i].connected;
+            }
+        }
+    })
 
     function addController(ctrl: Controller) {
         if (!_players) {

package/libs/game/game.ts

@@ -248,7 +248,7 @@ namespace game {
      * @param win whether the sound should play on a win (true) or lose (false)
      * @param effect
      */
-    //% blockId=game_setgameoversound
+    //% blockId=game_setgameoverplayable
     //% block="use $sound looping $looping for $win"
     //% sound.shadow=music_melody_playable
     //% sound.defl=music.powerUp
@@ -260,12 +260,19 @@ namespace game {
     //% weight=80
     //% blockGap=8
     //% help=game/set-game-over-sound
-    export function setGameOverSound(win: boolean, sound: music.Playable, looping: boolean) {
+    export function setGameOverPlayable(win: boolean, sound: music.Playable, looping: boolean) {
         init();
         const goc = game.gameOverConfig();
         goc.setSound(win, sound, looping, true);
     }
 
+    // Legacy api. Older extensions may still use this.
+    export function setGameOverSound(win: boolean, sound: music.Melody) {
+        init();
+        const goc = game.gameOverConfig();
+        goc.setSound(win, music.melodyPlayable(sound), false, true);
+    }
+
     /**
      * Set the message that displays when the game is over
      * @param win whether the message should show on a win (true) or lose (false)
@@ -357,9 +364,11 @@ namespace game {
             const winner = judged && win && info.winningPlayer();
             const scores = playersWithScores.map(player => new GameOverPlayerScore(player.number, player.impl.score(), player === winner));
 
-            // Save scores if this was a judged game and there was a winner (don't save in the LOSE case).
+            // Save all scores. Dependency Note: this action triggers Kiosk to exit the simulator and show the high score screen.
+            info.saveAllScores();
+
+            // Save high score if this was a judged game and there was a winner (don't save in the LOSE case).
             if (judged && winner) {
-                info.saveAllScores();
                 info.saveHighScore();
             }
 

package/libs/game/multiplayer.ts

@@ -34,10 +34,12 @@ namespace multiplayer {
                     postImage(screen);
                 }
             })
+        }
+    }
 
-            for (let p = 1; p <= 4; p++) {
-                registerPlayerConnectionListeners(p);
-            }
+    export function initPlayerConnectionListeners() {
+        for (let p = 1; p <= 4; p++) {
+            registerPlayerConnectionListeners(p);
         }
     }
 

package/libs/game/scene.ts

@@ -94,6 +94,7 @@ namespace scene {
         gameForeverHandlers: GameForeverHandler[];
         particleSources: particles.ParticleSource[];
         controlledSprites: controller.ControlledSprite[][];
+        controllerConnectionState: boolean[]
         followingSprites: sprites.FollowingSprite[];
         buttonEventHandlers: controller.ButtonEventHandlerState[];
 
@@ -181,6 +182,7 @@ namespace scene {
             // update screen
             this.eventContext.registerFrameHandler(UPDATE_SCREEN_PRIORITY, control.__screen.update);
             multiplayer.initServer();
+            multiplayer.initPlayerConnectionListeners();
             // register additional components
             Scene.initializers.forEach(f => f(this));
         }

package/libs/game/sim/multiplayer.ts

@@ -17,11 +17,14 @@ namespace pxsim.multiplayer {
     }
 
     export function postIcon(iconType: IconType, slot: number, im: pxsim.RefImage) {
-        if (im._width * im._height > 64 * 64) {
+        if (im && (im._width * im._height > 64 * 64)) {
             // setting 64x64 as max size for icon for now
             return;
         }
-        const asBuf = pxsim.image.toBuffer(im);
+
+        // treat empty icon as undefined
+        const asBuf = (im && im.data.some(pixel => pixel != 0))
+            ? pxsim.image.toBuffer(im) : undefined;
         const sb = board() as ScreenBoard;
         const screenState = sb && sb.screenState;
         getMultiplayerState().send({
@@ -192,9 +195,7 @@ namespace pxsim {
                     }
                 }
             } else if (isConnectionMessage(msg)) {
-                if (this.origin === "server") {
-                    this.registerConnectionState(msg.slot, msg.connected);
-                }
+                this.registerConnectionState(msg.slot, msg.connected);
             }
         }
     }

package/libs/game/sprite.ts

@@ -854,6 +854,7 @@ class Sprite extends sprites.BaseSprite {
     //% duration.shadow=timePicker
     //% expandableArgumentMode="toggle"
     //% help=sprites/sprite/destroy
+    //% deprecated=1
     destroy(effect?: effects.ParticleEffect, duration?: number) {
         if (this.flags & sprites.Flag.Destroyed)
             return;

package/libs/game/sprites.ts

@@ -60,6 +60,19 @@ namespace sprites {
         return sprites.create(img, kind);
     }
 
+    //% group="Effects"
+    //% weight=80
+    //% blockId=spritedestroy2 block="destroy $sprite || with $effect effect for $duration ms"
+    //% sprite.shadow=variables_get
+    //% sprite.defl=mySprite
+    //% duration.shadow=timePicker
+    //% expandableArgumentMode="toggle"
+    //% help=sprites/sprite/destroy
+    export function destroy(sprite: Sprite, effect?: effects.ParticleEffect, duration?: number) {
+        if (!sprite) return;
+        sprite.destroy(effect, duration);
+    }
+
     /**
      * Return an array of all sprites of the given kind.
      * @param kind the target kind

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

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

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___P98597(s) {
+function _main___P98810(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___98840 = (undefined);
-    globals._pollEventQueue___98853 = (undefined);
+    globals._intervals___99053 = (undefined);
+    globals._pollEventQueue___99066 = (undefined);
     r0 = undefined;
     return leave(s, r0)
   default: oops()
 } } }
-_main___P98597.info = {"start":0,"length":0,"line":0,"column":0,"endLine":0,"endColumn":0,"fileName":"tsl2591.ts","functionName":"<main>","argumentNames":[]}
-_main___P98597.continuations = [  ]
+_main___P98810.info = {"start":0,"length":0,"line":0,"column":0,"endLine":0,"endColumn":0,"fileName":"tsl2591.ts","functionName":"<main>","argumentNames":[]}
+_main___P98810.continuations = [  ]
 
-function _main___P98597_mk(s) {
+function _main___P98810_mk(s) {
     checkStack(s.depth);
     return {
-        parent: s, fn: _main___P98597, depth: s.depth + 1,
+        parent: s, fn: _main___P98810, depth: s.depth + 1,
         pc: 0, retval: undefined, r0: undefined, overwrittenPC: false, lambdaArgs: null,
 } }
 
@@ -88,5 +88,5 @@ function _main___P98597_mk(s) {
 
 const breakpoints = setupDebugger(1, [])
 
-return _main___P98597
+return _main___P98810
 })

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

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

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

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

package/libs/mixer/instrument.ts

@@ -811,4 +811,11 @@ namespace music.sequencer {
         // Use cosine to smooth out the value somewhat
         return Math.cos(((time / 1000) * lfo.frequency) * 2 * Math.PI) * lfo.amplitude
     }
+
+    export function _stopAllSongs() {
+        if (currentSequencer) {
+            currentSequencer.stop();
+            currentSequencer = undefined;
+        }
+    }
 }

package/libs/mixer/melody.ts

@@ -184,6 +184,7 @@ namespace music {
         Melody.stopAll();
         stopPlaying();
         _stopPlayables();
+        sequencer._stopAllSongs();
     }
 
     //% fixedInstances