pxt-arcade 1.12.13 → 1.12.16

package/built/common-sim.d.ts

@@ -818,6 +818,11 @@ declare namespace pxsim {
         instruction: "playinstructions" | "muteallchannels";
         soundbuf?: Uint8Array;
     }
+    interface MultiplayerConnectionEvent extends SimulatorMultiplayerMessage {
+        content: "Connection";
+        slot: number;
+        connected: boolean;
+    }
     class MultiplayerState {
         lastMessageId: number;
         origin: string;
@@ -826,6 +831,7 @@ declare namespace pxsim {
         send(msg: SimulatorMultiplayerMessage): void;
         init(origin: string): void;
         setButton(key: number, isPressed: boolean): void;
+        registerConnectionState(player: number, connected: boolean): void;
         protected messageHandler(msg: SimulatorMessage): void;
     }
 }

package/built/common-sim.js

@@ -2554,8 +2554,6 @@ var pxsim;
         }
         multiplayer.postImage = postImage;
         function postIcon(iconType, slot, im) {
-            if (pxsim.getMultiplayerState().origin !== "server")
-                return;
             if (im._width * im._height > 64 * 64) {
                 // setting 64x64 as max size for icon for now
                 return;
@@ -2596,6 +2594,8 @@ var pxsim;
         IconType[IconType["Player"] = 0] = "Player";
         IconType[IconType["Reaction"] = 1] = "Reaction";
     })(IconType = pxsim.IconType || (pxsim.IconType = {}));
+    const MULTIPLAYER_PLAYER_JOINED_ID = 3241;
+    const MULTIPLAYER_PLAYER_LEFT_ID = 3242;
     class MultiplayerState {
         constructor() {
             this.lastMessageId = 0;
@@ -2628,6 +2628,11 @@ var pxsim;
                 });
             }
         }
+        registerConnectionState(player, connected) {
+            const evId = connected ? MULTIPLAYER_PLAYER_JOINED_ID : MULTIPLAYER_PLAYER_LEFT_ID;
+            const b = pxsim.board();
+            b.bus.queue(evId, player);
+        }
         messageHandler(msg) {
             if (!isMultiplayerMessage(msg)) {
                 return;
@@ -2661,6 +2666,11 @@ var pxsim;
                     }
                 }
             }
+            else if (isConnectionMessage(msg)) {
+                if (this.origin === "server") {
+                    this.registerConnectionState(msg.slot, msg.connected);
+                }
+            }
         }
     }
     pxsim.MultiplayerState = MultiplayerState;
@@ -2676,6 +2686,9 @@ var pxsim;
     function isAudioMessage(msg) {
         return msg && msg.content === "Audio";
     }
+    function isConnectionMessage(msg) {
+        return msg && msg.content === "Connection";
+    }
 })(pxsim || (pxsim = {}));
 var pxsim;
 (function (pxsim) {

package/built/sim.js

@@ -156,11 +156,17 @@ var pxsim;
     let isFirstRunSafari = true;
     window.addEventListener("DOMContentLoaded", () => {
         const searchParams = new URL(window.location.toString()).searchParams;
-        setSimThemeColor("background-color", searchParams.get("background-color"));
-        setSimThemeColor("button-stroke", searchParams.get("button-stroke"));
-        setSimThemeColor("text-color", searchParams.get("text-color"));
-        setSimThemeColor("button-fill", searchParams.get("button-fill"));
-        setSimThemeColor("dpad-fill", searchParams.get("dpad-fill"));
+        const setThemeIfDefined = (themeType) => {
+            const paramVal = searchParams.get(themeType);
+            if (paramVal) {
+                setSimThemeColor(themeType, paramVal);
+            }
+        };
+        setThemeIfDefined("background-color");
+        setThemeIfDefined("button-stroke");
+        setThemeIfDefined("text-color");
+        setThemeIfDefined("button-fill");
+        setThemeIfDefined("dpad-fill");
         if (!!searchParams.get("pointer-events"))
             registerPointerEvents();
         if (!!searchParams.get("hideSimButtons"))
@@ -223,20 +229,33 @@ var pxsim;
         canvas.addEventListener("pointerout", reporter);
         canvas.addEventListener("wheel", wheelReporter);
     }
-    function setSimThemeColor(part, color) {
-        if (!part || !color || !/^[0-9A-F]{6}$/i.test(color))
+    function setSimThemeColor(part, color, elOverride) {
+        if (!part || (!(color == undefined || /^[0-9A-F]{6}$/i.test(color))))
             return;
+        if (part != "background-color"
+            && part != "button-stroke"
+            && part != "text-color"
+            && part != "button-fill"
+            && part != "dpad-fill") {
+            return;
+        }
         const propName = `--sim-${part}`;
-        const propColor = `#${color}`;
-        const wrapper = document.getElementById("wrap");
-        wrapper.style.setProperty(propName, propColor);
+        const propColor = color ? `#${color}` : undefined;
+        const wrapper = elOverride || document.getElementById("wrap");
+        if (propColor) {
+            wrapper.style.setProperty(propName, propColor);
+        }
+        else {
+            wrapper.style.removeProperty(propName);
+        }
     }
     /**
      * This function gets called each time the program restarts
      */
-    pxsim.initCurrentRuntime = () => {
+    pxsim.initCurrentRuntime = (msg) => {
         pxsim.runtime.board = new Board();
         pxsim.initGamepad();
+        board().setActivePlayer(msg.activePlayer);
         if (!forcedUpdateLoop) {
             forcedUpdateLoop = true;
             // this is used to force screen update if game loop is stuck or not set up properly
@@ -305,6 +324,7 @@ var pxsim;
                 }
             };
             window.addEventListener("message", (ev) => {
+                var _a;
                 if (ev.data.button !== undefined && ev.data.type !== "multiplayer") {
                     let key;
                     switch (ev.data.button) {
@@ -344,6 +364,15 @@ var pxsim;
                         b.multiplayerState.origin = ev.data.context;
                     }
                 }
+                if (ev.data.type == "setactiveplayer") {
+                    const b = board();
+                    if (!(b.multiplayerState && b.multiplayerState.origin)) {
+                        b.setActivePlayer(ev.data.playerNumber);
+                    }
+                }
+                else if (ev.data.type == "setsimthemecolor") {
+                    setSimThemeColor(ev.data.part, (_a = ev.data.color) === null || _a === void 0 ? void 0 : _a.replace("#", ""));
+                }
             });
         }
     };
@@ -425,6 +454,32 @@ var pxsim;
             const scale = isEdge() || isIE() ? 10 : 1;
             this.gameplayer = new pxsim.visuals.GamePlayer(scale);
             throttleAnimation((cb) => (this.screenState.onChange = cb), () => this.gameplayer.draw(this.screenState));
+            this.activePlayer = undefined;
+        }
+        setActivePlayer(playerNumber) {
+            if (this.multiplayerState && this.multiplayerState.origin)
+                return;
+            // TODO: this is duplicated in pxt/multiplayer's ArcadeSimulator.tsx;
+            // we could dedup this by starting a set of 'named' themes in the future
+            // (e.g. player1, player2, hotrodflames, ...)
+            // [[backgroundColor, buttonStroke]]
+            const playerThemes = [
+                [undefined, undefined],
+                ["ED3636", "8D2525"],
+                ["4E4EE9", "3333A1"],
+                ["FF9A14", "B0701A"],
+                ["4EB94E", "245D24"],
+            ];
+            const newPlayerTheme = playerThemes[playerNumber || 0];
+            if (!newPlayerTheme) {
+                // invalid playerNumber
+                return;
+            }
+            const themeOverrideElement = document.querySelector(".game-player");
+            setSimThemeColor("background-color", newPlayerTheme[0], themeOverrideElement);
+            setSimThemeColor("button-stroke", newPlayerTheme[1], themeOverrideElement);
+            setSimThemeColor("dpad-fill", newPlayerTheme[1], themeOverrideElement);
+            this.activePlayer = playerNumber || undefined;
         }
         getDefaultPitchPin() {
             return undefined;
@@ -438,14 +493,24 @@ var pxsim;
             }
         }
         setButton(which, isPressed) {
+            const inMultiplayerSession = !!this.multiplayerState.origin;
             // Disallow local input for player 2+ in multiplayer mode.
-            if (this.multiplayerState.origin && which > pxsim.Key.Menu)
+            if (inMultiplayerSession && which > pxsim.Key.Menu)
                 return;
-            if (which) {
-                this.handleKeyEvent(which, isPressed);
-            }
-        }
-        handleKeyEvent(key, isPressed) {
+            if (!which)
+                return;
+            let playerOffset = 0;
+            if (!inMultiplayerSession
+                && this.activePlayer
+                && this.activePlayer > 1
+                && which > 0
+                && which < 7) {
+                playerOffset = this.activePlayer - 1;
+            }
+            this.handleKeyEvent(which, isPressed, playerOffset);
+        }
+        handleKeyEvent(key, isPressed, playerOffset = 0) {
+            const gameKey = key + 7 * (playerOffset | 0);
             // handle system keys
             switch (key) {
                 case pxsim.Key.Reset:
@@ -475,10 +540,14 @@ var pxsim;
                     break;
             }
             //this.lastKey = Date.now()
-            this.bus.queue(isPressed ? INTERNAL_KEY_DOWN : INTERNAL_KEY_UP, key);
-            this.bus.queue(isPressed ? INTERNAL_KEY_DOWN : INTERNAL_KEY_UP, 0); // "any" key
-            if (this.gameplayer)
+            this.bus.queue(isPressed ? INTERNAL_KEY_DOWN : INTERNAL_KEY_UP, gameKey);
+            // no 'any' for p2-4
+            if (!playerOffset) {
+                this.bus.queue(isPressed ? INTERNAL_KEY_DOWN : INTERNAL_KEY_UP, 0); // "any" key
+            }
+            if (this.gameplayer) {
                 this.gameplayer.buttonChanged(key, isPressed);
+            }
             if (this.multiplayerState && key >= pxsim.Key.Left && key <= pxsim.Key.B) {
                 this.multiplayerState.setButton(key, isPressed);
             }
@@ -494,10 +563,10 @@ var pxsim;
         }
         resize() { }
         async initAsync(msg) {
-            var _a;
             if (msg.options.mpRole) {
                 this.multiplayerState.origin = msg.options.mpRole;
             }
+            this.setActivePlayer(msg.activePlayer);
             this.runOptions = msg;
             this.stats = document.getElementById("debug-stats");
             this.stats.className = "stats no-select";
@@ -518,7 +587,7 @@ var pxsim;
             let safariEnablePromise;
             if (isFirstRunSafari && !safariEnablePromise) {
                 const safariWarning = document.getElementById("safari-enable-game");
-                if (isSafari() && ((_a = msg.options) === null || _a === void 0 ? void 0 : _a.mpRole) === "server") {
+                if (isSafari() && msg.options && msg.options.mpRole === "server") {
                     safariEnablePromise = new Promise(resolve => {
                         safariWarning.style.display = "flex";
                         safariWarning.addEventListener("click", () => {
@@ -1262,11 +1331,11 @@ var pxsim;
     var visuals;
     (function (visuals) {
         function pressButton(button) {
-            pxsim.board().handleKeyEvent(button, true);
+            pxsim.board().setButton(button, true);
         }
         visuals.pressButton = pressButton;
         function releaseButton(button) {
-            pxsim.board().handleKeyEvent(button, false);
+            pxsim.board().setButton(button, false);
         }
         visuals.releaseButton = releaseButton;
         function hasPointerEvents() {
@@ -2799,8 +2868,6 @@ var pxsim;
         }
         multiplayer.postImage = postImage;
         function postIcon(iconType, slot, im) {
-            if (pxsim.getMultiplayerState().origin !== "server")
-                return;
             if (im._width * im._height > 64 * 64) {
                 // setting 64x64 as max size for icon for now
                 return;
@@ -2841,6 +2908,8 @@ var pxsim;
         IconType[IconType["Player"] = 0] = "Player";
         IconType[IconType["Reaction"] = 1] = "Reaction";
     })(IconType = pxsim.IconType || (pxsim.IconType = {}));
+    const MULTIPLAYER_PLAYER_JOINED_ID = 3241;
+    const MULTIPLAYER_PLAYER_LEFT_ID = 3242;
     class MultiplayerState {
         constructor() {
             this.lastMessageId = 0;
@@ -2873,6 +2942,11 @@ var pxsim;
                 });
             }
         }
+        registerConnectionState(player, connected) {
+            const evId = connected ? MULTIPLAYER_PLAYER_JOINED_ID : MULTIPLAYER_PLAYER_LEFT_ID;
+            const b = pxsim.board();
+            b.bus.queue(evId, player);
+        }
         messageHandler(msg) {
             if (!isMultiplayerMessage(msg)) {
                 return;
@@ -2906,6 +2980,11 @@ var pxsim;
                     }
                 }
             }
+            else if (isConnectionMessage(msg)) {
+                if (this.origin === "server") {
+                    this.registerConnectionState(msg.slot, msg.connected);
+                }
+            }
         }
     }
     pxsim.MultiplayerState = MultiplayerState;
@@ -2921,6 +3000,9 @@ var pxsim;
     function isAudioMessage(msg) {
         return msg && msg.content === "Audio";
     }
+    function isConnectionMessage(msg) {
+        return msg && msg.content === "Connection";
+    }
 })(pxsim || (pxsim = {}));
 var pxsim;
 (function (pxsim) {

package/built/target-strings.json

@@ -44,10 +44,10 @@
     "Microsoft MakeCode Arcade": "Microsoft MakeCode Arcade",
     "Mouse emulation over HID": "Mouse emulation over HID",
     "Multiplayer Games": "Multiplayer Games",
+    "Multiplayer Games!": "Multiplayer Games!",
     "NRF52833 board": "NRF52833 board",
     "NRF52840 board": "NRF52840 board",
     "Networking abstractions": "Networking abstractions",
-    "New? Start here!": "New? Start here!",
     "Onboard light level sensor": "Onboard light level sensor",
     "Palette manipulations": "Palette manipulations",
     "Power and sleep management": "Power and sleep management",
@@ -60,7 +60,6 @@
     "Settings storage in internal flash": "Settings storage in internal flash",
     "Seven segment digit display": "Seven segment digit display",
     "Skillmaps": "Skillmaps",
-    "Start Skillmap": "Start Skillmap",
     "The accelerometer library": "The accelerometer library",
     "The base library": "The base library",
     "The core library for Codal-based targets": "The core library for Codal-based targets",
@@ -71,6 +70,7 @@
     "The programmable LED (WS2812b,APA102) driver.": "The programmable LED (WS2812b,APA102) driver.",
     "The radio services": "The radio services",
     "The screen library": "The screen library",
+    "Try Now": "Try Now",
     "Tutorials": "Tutorials",
     "UART communication": "UART communication",
     "VM": "VM",