pxt-common-packages 10.3.11 → 10.3.13

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)

package/libs/game/multiplayer.ts

@@ -25,6 +25,8 @@ namespace multiplayer {
         game.pushScene();
     }
 
+    const MULTIPLAYER_PLAYER_JOINED_ID = 3241;
+    const MULTIPLAYER_PLAYER_LEFT_ID = 3242;
     export function initServer() {
         if (getOrigin() === "server") {
             game.eventContext().registerFrameHandler(scene.MULTIPLAYER_POST_SCREEN_PRIORITY, () => {
@@ -32,7 +34,44 @@ namespace multiplayer {
                     postImage(screen);
                 }
             })
+
+            for (let p = 1; p <= 4; p++) {
+                registerPlayerConnectionListeners(p);
+            }
+        }
+    }
+
+    function registerPlayerConnectionListeners(playerNumber: number) {
+        control.onEvent(
+            MULTIPLAYER_PLAYER_JOINED_ID,
+            playerNumber,
+            () => receiveConnectionChangedEvent(playerNumber, true)
+        );
+        control.onEvent(
+            MULTIPLAYER_PLAYER_LEFT_ID,
+            playerNumber,
+            () => receiveConnectionChangedEvent(playerNumber, false)
+        );
+    }
+
+    function receiveConnectionChangedEvent(playerNumber: number, connected: boolean) {
+        let c: controller.Controller;
+        switch (playerNumber) {
+            case 1:
+                c = controller.player1;
+                break;
+            case 2:
+                c = controller.player2;
+                break;
+            case 3:
+                c = controller.player3;
+                break;
+            case 4:
+                c = controller.player4;
+                break;
         }
+        if (c)
+            c.connected = connected;
     }
 }
 

package/libs/game/sim/multiplayer.ts

@@ -98,6 +98,15 @@ namespace pxsim {
         soundbuf?: Uint8Array;
     }
 
+    export interface MultiplayerConnectionEvent extends SimulatorMultiplayerMessage {
+        content: "Connection";
+        slot: number;
+        connected: boolean;
+    }
+
+    const MULTIPLAYER_PLAYER_JOINED_ID = 3241;
+    const MULTIPLAYER_PLAYER_LEFT_ID = 3242;
+
     export class MultiplayerState {
         lastMessageId: number;
         origin: string;
@@ -144,6 +153,12 @@ namespace pxsim {
             }
         }
 
+        registerConnectionState(player: number, connected: boolean) {
+            const evId = connected ? MULTIPLAYER_PLAYER_JOINED_ID : MULTIPLAYER_PLAYER_LEFT_ID;
+            const b = board();
+            b.bus.queue(evId, player);
+        }
+
         protected messageHandler(msg: SimulatorMessage) {
             if (!isMultiplayerMessage(msg)) {
                 return;
@@ -176,6 +191,10 @@ namespace pxsim {
                         pxsim.AudioContextManager.muteAllChannels();
                     }
                 }
+            } else if (isConnectionMessage(msg)) {
+                if (this.origin === "server") {
+                    this.registerConnectionState(msg.slot, msg.connected);
+                }
             }
         }
     }
@@ -195,4 +214,8 @@ namespace pxsim {
     function isAudioMessage(msg: SimulatorMultiplayerMessage): msg is MultiplayerAudioEvent {
         return msg && msg.content === "Audio";
     }
+
+    function isConnectionMessage(msg: SimulatorMultiplayerMessage): msg is MultiplayerConnectionEvent {
+        return msg && msg.content === "Connection";
+    }
 }

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

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

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___P98441(s) {
+function _main___P98603(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___98684 = (undefined);
-    globals._pollEventQueue___98697 = (undefined);
+    globals._intervals___98846 = (undefined);
+    globals._pollEventQueue___98859 = (undefined);
     r0 = undefined;
     return leave(s, r0)
   default: oops()
 } } }
-_main___P98441.info = {"start":0,"length":0,"line":0,"column":0,"endLine":0,"endColumn":0,"fileName":"tsl2591.ts","functionName":"<main>","argumentNames":[]}
-_main___P98441.continuations = [  ]
+_main___P98603.info = {"start":0,"length":0,"line":0,"column":0,"endLine":0,"endColumn":0,"fileName":"tsl2591.ts","functionName":"<main>","argumentNames":[]}
+_main___P98603.continuations = [  ]
 
-function _main___P98441_mk(s) {
+function _main___P98603_mk(s) {
     checkStack(s.depth);
     return {
-        parent: s, fn: _main___P98441, depth: s.depth + 1,
+        parent: s, fn: _main___P98603, depth: s.depth + 1,
         pc: 0, retval: undefined, r0: undefined, overwrittenPC: false, lambdaArgs: null,
 } }
 
@@ -88,5 +88,5 @@ function _main___P98441_mk(s) {
 
 const breakpoints = setupDebugger(1, [])
 
-return _main___P98441
+return _main___P98603
 })

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

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

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

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

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