pxt-arcade 1.11.10 → 1.11.12

package/built/common-sim.d.ts

@@ -794,7 +794,7 @@ declare namespace pxsim {
     interface MultiplayerImageMessage extends SimulatorMultiplayerMessage {
         content: "Image";
         goal: string;
-        image: RefImage;
+        image: RefBuffer;
     }
     interface MultiplayerButtonEvent extends SimulatorMultiplayerMessage {
         content: "Button";

package/built/common-sim.js

@@ -2527,7 +2527,7 @@ var pxsim;
         }
         clearMap(name) {
             const keyCodes = this.mappings[name];
-            keyCodes === null || keyCodes === void 0 ? void 0 : keyCodes.forEach(keyCode => delete this.keymap[keyCode]);
+            keyCodes && keyCodes.forEach(keyCode => delete this.keymap[keyCode]);
             delete this.mappings[name];
         }
     }
@@ -2565,6 +2565,7 @@ var pxsim;
         return pxsim.board().multiplayerState;
     }
     pxsim.getMultiplayerState = getMultiplayerState;
+    let postScreenInterval;
     class MultiplayerState {
         constructor() {
             this.lastMessageId = 0;
@@ -2575,7 +2576,10 @@ var pxsim;
         init(origin) {
             this.origin = origin;
             pxsim.runtime.board.addMessageListener(msg => this.messageHandler(msg));
-            setInterval(() => {
+            if (postScreenInterval) {
+                clearInterval(postScreenInterval);
+            }
+            postScreenInterval = setInterval(() => {
                 if (this.origin === "server") {
                     const b = pxsim.board();
                     const screenState = b && b.screenState;
@@ -2608,7 +2612,7 @@ var pxsim;
             }
             else if (isButtonMessage(msg)) {
                 if (this.origin === "server") {
-                    pxsim.board().setButton(msg.button + (7 * (msg.clientNumber || 1)), // + 7 to make it player 2 controls,
+                    pxsim.board().handleKeyEvent(msg.button + (7 * (msg.clientNumber || 1)), // + 7 to make it player 2 controls,
                     msg.state === "Pressed" || msg.state === "Held");
                 }
             }

package/built/sim.js

@@ -146,7 +146,7 @@ var pxsim;
         const old = ctrl.state[key];
         if (old != pressed) {
             ctrl.state[key] = pressed;
-            pxsim.board().handleKeyEvent(key + (7 * (ctrl.player - 1)), pressed);
+            pxsim.board().setButton(key + (7 * (ctrl.player - 1)), pressed);
         }
     }
 })(pxsim || (pxsim = {}));
@@ -167,11 +167,11 @@ var pxsim;
         const canvas = document.getElementById("game-screen");
         const encoder = new TextEncoder();
         const sendMsg = (msg) => {
-            var _a;
             const data = encoder.encode(JSON.stringify(msg));
-            const state = (_a = pxsim.board()) === null || _a === void 0 ? void 0 : _a.controlMessageState;
+            const board = pxsim.board();
+            const state = board && board.controlMessageState;
             // queue in control sims
-            state === null || state === void 0 ? void 0 : state.enqueue({
+            state && state.enqueue({
                 type: "messagepacket",
                 channel: "pointer-events",
                 broadcast: false,
@@ -440,6 +440,9 @@ var pxsim;
             }
         }
         setButton(which, isPressed) {
+            // Disallow local input for player 2+ in multiplayer mode.
+            if (this.multiplayerState.origin && which > pxsim.Key.Menu)
+                return;
             if (which) {
                 this.handleKeyEvent(which, isPressed);
             }
@@ -2717,7 +2720,7 @@ var pxsim;
         }
         clearMap(name) {
             const keyCodes = this.mappings[name];
-            keyCodes === null || keyCodes === void 0 ? void 0 : keyCodes.forEach(keyCode => delete this.keymap[keyCode]);
+            keyCodes && keyCodes.forEach(keyCode => delete this.keymap[keyCode]);
             delete this.mappings[name];
         }
     }
@@ -2755,6 +2758,7 @@ var pxsim;
         return pxsim.board().multiplayerState;
     }
     pxsim.getMultiplayerState = getMultiplayerState;
+    let postScreenInterval;
     class MultiplayerState {
         constructor() {
             this.lastMessageId = 0;
@@ -2765,7 +2769,10 @@ var pxsim;
         init(origin) {
             this.origin = origin;
             pxsim.runtime.board.addMessageListener(msg => this.messageHandler(msg));
-            setInterval(() => {
+            if (postScreenInterval) {
+                clearInterval(postScreenInterval);
+            }
+            postScreenInterval = setInterval(() => {
                 if (this.origin === "server") {
                     const b = pxsim.board();
                     const screenState = b && b.screenState;
@@ -2798,7 +2805,7 @@ var pxsim;
             }
             else if (isButtonMessage(msg)) {
                 if (this.origin === "server") {
-                    pxsim.board().setButton(msg.button + (7 * (msg.clientNumber || 1)), // + 7 to make it player 2 controls,
+                    pxsim.board().handleKeyEvent(msg.button + (7 * (msg.clientNumber || 1)), // + 7 to make it player 2 controls,
                     msg.state === "Pressed" || msg.state === "Held");
                 }
             }