pxt-common-packages 10.3.10 → 10.3.12

package/libs/game/controller.ts

@@ -169,6 +169,11 @@ namespace controller {
             this._moveSpriteInternal(sprite, vx, vy);
         }
 
+        stopControllingSprite(sprite: Sprite) {
+            if (!sprite) return;
+            this._controlledSprites = this._controlledSprites.filter(s => s.s.id !== sprite.id);
+        }
+
         // use this instead of movesprite internally to avoid adding the "multiplayer" part
         // to the compiled program
         _moveSpriteInternal(sprite: Sprite, vx: number = 100, vy: number = 100) {

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

@@ -17,8 +17,6 @@ namespace pxsim.multiplayer {
     }
 
     export function postIcon(iconType: IconType, slot: number, im: pxsim.RefImage) {
-        if (getMultiplayerState().origin !== "server")
-            return;
         if (im._width * im._height > 64 * 64) {
             // setting 64x64 as max size for icon for now
             return;
@@ -100,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;
@@ -146,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;
@@ -178,6 +191,10 @@ namespace pxsim {
                         pxsim.AudioContextManager.muteAllChannels();
                     }
                 }
+            } else if (isConnectionMessage(msg)) {
+                if (this.origin === "server") {
+                    this.registerConnectionState(msg.slot, msg.connected);
+                }
             }
         }
     }
@@ -197,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___P48702(s) {
+function _main___P48755(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___48945 = (undefined);
-    globals._pollEventQueue___48958 = (undefined);
+    globals._intervals___48998 = (undefined);
+    globals._pollEventQueue___49011 = (undefined);
     r0 = undefined;
     return leave(s, r0)
   default: oops()
 } } }
-_main___P48702.info = {"start":0,"length":0,"line":0,"column":0,"endLine":0,"endColumn":0,"fileName":"characterlcd.ts","functionName":"<main>","argumentNames":[]}
-_main___P48702.continuations = [  ]
+_main___P48755.info = {"start":0,"length":0,"line":0,"column":0,"endLine":0,"endColumn":0,"fileName":"characterlcd.ts","functionName":"<main>","argumentNames":[]}
+_main___P48755.continuations = [  ]
 
-function _main___P48702_mk(s) {
+function _main___P48755_mk(s) {
     checkStack(s.depth);
     return {
-        parent: s, fn: _main___P48702, depth: s.depth + 1,
+        parent: s, fn: _main___P48755, depth: s.depth + 1,
         pc: 0, retval: undefined, r0: undefined, overwrittenPC: false, lambdaArgs: null,
 } }
 
@@ -88,5 +88,5 @@ function _main___P48702_mk(s) {
 
 const breakpoints = setupDebugger(1, [])
 
-return _main___P48702
+return _main___P48755
 })

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

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

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

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

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