pxt-common-packages 10.3.7 → 10.3.9

package/libs/multiplayer/ns.ts

@@ -0,0 +1,6 @@
+//% color="#207a77" weight=96 icon="\uf0c0"
+//% blockGap=8
+//% block="Multiplayer"
+//% groups='["Sprites", "Controller", "Info", "Game", "Utility"]'
+namespace mp {
+}

package/libs/multiplayer/player.ts

@@ -1,6 +1,3 @@
-//% color="#207a77"
-//% icon="\uf0c0"
-//% block="Multiplayer"
 namespace mp {
     const MAX_PLAYERS = 4;
 
@@ -98,7 +95,7 @@ namespace mp {
             if (sprite && sprite.image) {
                 // Passing 'implicit' flag so we don't override icons that
                 // user has explicitly defined.
-                multiplayer.postPresenceIcon(
+                mp.postPresenceIcon(
                     this.number,
                     sprite.image,
                     /** implicit **/ true
@@ -106,12 +103,12 @@ namespace mp {
             } else {
                 // Passing 'implicit' flag so we don't override icons that
                 // user has explicitly defined.
-                multiplayer.postPresenceIcon(
+                mp.postPresenceIcon(
                     this.number,
                     undefined,
                     /** implicit **/ true
                 );
-    
+
             }
             this._sprite = sprite;
         }
@@ -403,6 +400,7 @@ namespace mp {
     //% help=multiplayer/get-player-sprite
     //% parts="multiplayer"
     export function getPlayerSprite(player: Player): Sprite {
+        if (!player) return undefined;
         return player.getSprite();
     }
 
@@ -421,6 +419,7 @@ namespace mp {
     //% help=multiplayer/set-player-sprite
     //% parts="multiplayer"
     export function setPlayerSprite(player: Player, sprite: Sprite) {
+        if (!player) return;
         player.setSprite(sprite);
     }
 
@@ -445,6 +444,7 @@ namespace mp {
     //% help=controller/move-sprite
     //% parts="multiplayer"
     export function moveWithButtons(player: Player, vx?: number, vy?: number) {
+        if (!player) return;
         player.moveWithButtons(vx, vy);
     }
 
@@ -481,6 +481,7 @@ namespace mp {
     //% help=controller/button/is-pressed
     //% parts="multiplayer"
     export function isButtonPressed(player: Player, button: MultiplayerButton): boolean {
+        if (!player) return false;
         return getButton(player._getController(), button).isPressed();
     }
 
@@ -517,6 +518,7 @@ namespace mp {
     //% help=multiplayer/get-player-state
     //% parts="multiplayer"
     export function getPlayerState(player: Player, state: number): number {
+        if (!player) return 0;
         return player.getState(state);
     }
 
@@ -536,6 +538,7 @@ namespace mp {
     //% help=multiplayer/set-player-state
     //% parts="multiplayer"
     export function setPlayerState(player: Player, state: number, value: number) {
+        if (!player) return;
         player.setState(state, value);
     }
 
@@ -556,6 +559,7 @@ namespace mp {
     //% help=multiplayer/change-player-state-by
     //% parts="multiplayer"
     export function changePlayerStateBy(player: Player, state: number, delta: number) {
+        if (!player) return;
         player.setState(state, player.getState(state) + delta);
     }
 
@@ -574,6 +578,7 @@ namespace mp {
     //% help=multiplayer/get-player-property
     //% parts="multiplayer"
     export function getPlayerProperty(player: Player, prop: PlayerProperty): number {
+        if (!player) return 0;
         return player.getProperty(prop);
     }
 
@@ -611,6 +616,19 @@ namespace mp {
         _mpstate().onLifeZero(handler);
     }
 
+    //% blockId=mp_gameOverPlayerWin
+    //% block="game over $player wins"
+    //% player.shadow=mp_playerSelector
+    //% group=Game
+    //% weight=100
+    //% blockGap=8
+    //% help=multiplayer/game-over-player-win
+    //% parts="multiplayer"
+    export function gameOverPlayerWin(player: Player) {
+        if (!player) return;
+        game.gameOverPlayerWin(player.number);
+    }
+
     /**
      * Gets the player by number
      * @param number The one-based number of the player

package/libs/multiplayer/pxt.json

@@ -3,6 +3,7 @@
     "description": "Additional blocks for building multiplayer games",
     "files": [
         "README.md",
+        "ns.ts",
         "fieldEditors.ts",
         "images.ts",
         "player.ts",

package/libs/music/ns.ts

@@ -4,6 +4,6 @@
  */
 //% color=#E30FC0 weight=90 icon="\uf025"
 //% blockGap=8
-//% groups='["Sounds", "Melody", "Tone",  "Volume", "Tempo"]'
+//% groups='["Songs", "Sounds", "Tone",  "Volume", "Tempo"]'
 namespace music {
 }