pxt-arcade 1.12.2 → 1.12.3

package/docs/skillmap/mole/mole3.md

@@ -42,10 +42,10 @@ hint~
 
 **Let’s add a label to the bottom our Whack-the-Mole game booth.**
 
-- :tree: From the ``||scene: Scene||`` category in the toolbox, grab <br/>
+- :tree: From the ``||carnival: Carnival||`` category in the toolbox, grab <br/>
 
 ```block
-scene.add_label_to("Whack-the-Mole", areas.Bottom)
+carnival.addLabelTo("Whack-the-Mole", carnival.Areas.Bottom)
 ```
 
 and snap it inside and at the very **end** of the
@@ -72,10 +72,10 @@ let myHammer: Sprite = null
 scene.setBackgroundImage(assets.image`grid`)
 myMole = sprites.create(assets.image`mole`, SpriteKind.Enemy)
 myHammer = sprites.create(assets.image`hammer`, SpriteKind.Player)
-controller.move_only_onscreen_with_arrows(myHammer, speeds.Fast)
-info.startCountdownGame(15, winTypes.Score)
+controller.moveOnlyOnscreenWithArrows(myHammer, controller.Speeds.Fast)
+carnival.startCountdownGame(15, carnival.WinTypes.Score)
 //@highlight
-scene.add_label_to("Whack-the-Mole", areas.Bottom)
+carnival.addLabelTo("Whack-the-Mole", carnival.Areas.Bottom)
 ```
 
 
@@ -113,7 +113,7 @@ sprites.onOverlap(SpriteKind.Player, SpriteKind.Enemy, function (sprite, otherSp
     let myMole: Sprite = null
     let myHammer: Sprite = null
     info.changeScoreBy(1)
-    sprites.move_to_random_hole_on_grid(myMole)
+    sprites.moveToRandomHoleOnGrid(myMole)
     //@highlight
 music.knock.play()
 
@@ -184,7 +184,7 @@ sprites.onOverlap(SpriteKind.Player, SpriteKind.Enemy, function (sprite, otherSp
     let myMole: Sprite = null
     let myHammer: Sprite = null
     info.changeScoreBy(1)
-    sprites.move_to_random_hole_on_grid(myMole)
+    sprites.moveToRandomHoleOnGrid(myMole)
     music.knock.play()
     //@highlight
 animation.runImageAnimation(
@@ -215,11 +215,11 @@ When your rubber hammer overlaps the mole, points should show up in the top-righ
 
 ## {11. Finale}
 
-**🎡 Woohoo! 🎡**
+**🎡 You've done it! 🎡**
 
-You've finished the single-player version of Whack-the-Mole!
+You've created a Whack-the-Mole game!
 
-When you're ready, click **Done** to return to the skillmap to turn it into a multiplayer game.
+When you're ready, click **Done** to return to the skillmap so you can turn it into a game for two players!
 
 
 
@@ -235,12 +235,16 @@ false
 )
 myHammer = sprites.create(img`.`, SpriteKind.Player)
 sprites.onOverlap(SpriteKind.Player, SpriteKind.Enemy, function (sprite, otherSprite) { info.changeScoreBy(1) })
+carnival.addLabelTo("Whack-the-Mole", carnival.Areas.Bottom)
+carnival.startCountdownGame(15, carnival.WinTypes.Score)
+
 ```
 
 
+
 ```package
-simple-blocks=github:microsoft/arcade-tutorial-extensions/simple-blocks/
-arcade-text=github:microsoft/arcade-text/
+simple-blocks=github:microsoft/arcade-tutorial-extensions/simple-blocks
+carnival=github:microsoft/arcade-carnival
 ```
 
 
@@ -248,7 +252,7 @@ arcade-text=github:microsoft/arcade-text/
 
 sprites.onOverlap(SpriteKind.Player, SpriteKind.Enemy, function (sprite, otherSprite) {
     info.changeScoreBy(1)
-    sprites.move_to_random_hole_on_grid(myMole)
+    sprites.moveToRandomHoleOnGrid(myMole)
 
 })
 let myMole: Sprite = null
@@ -256,79 +260,29 @@ let myHammer: Sprite = null
 scene.setBackgroundImage(assets.image`grid`)
 myMole = sprites.create(assets.image`mole`, SpriteKind.Enemy)
 myHammer = sprites.create(assets.image`hammer`, SpriteKind.Player)
-controller.move_only_onscreen_with_arrows(myHammer, speeds.Fast)
-info.startCountdownGame(15, winTypes.Score)
+controller.moveOnlyOnscreenWithArrows(myHammer, controller.Speeds.Fast)
+carnival.startCountdownGame(15, carnival.WinTypes.Score)
 
 game.onUpdateInterval(1000, function () {
-    sprites.move_to_random_hole_on_grid(myMole)
+    sprites.moveToRandomHoleOnGrid(myMole)
 })
 
 ```
 
 
-
 ```customts
 
-enum winTypes {
-    //% block="win game"
-    Win,
-    //% block="lose game"
-    Lose,
-    //% block="high score"
-    Score,
-    //% block="multiplayer"
-    Multi
-}
-
-enum speeds {
-    //% block="fast"
-    Fast,
-    //% block="medium"
-    Med,
-    //% block="slow"
-    Slow
-}
-
-enum areas {
-    //% block="top"
-    Top,
-    //% block="middle"
-    Mid,
-    //% block="bottom"
-    Bottom
-}
-
-let textSprite: TextSprite = null
-//let fanfare: effects.BackgroundEffect = undefined;
-//let winStyle = winTypes.Score
-
-
+namespace controller{
 
-namespace scene {
-    /**
-    * Adds text to the top, middle, or bottom
-    * of screen as defined by circuis games
-    */
-    //% color="#4b6584"
-    //% blockId=add_label_to
-    //% block="add label $myLabel to $myPosition of window || $myColor"
-    //% myLabel.defl="Whack-the-Mole"
-    //% myColor.shadow="colorindexpicker"
-    //% myColor.defl=4
-    //% myPosition.defl=areas.Bottom
-    //% inlineInputMode=inline
-    export function add_label_to(myLabel: string, myPosition: areas, myColor?:number) {
-        if (!myColor)
-            myColor = 4;
-
-        textSprite = textsprite.create(myLabel, 0, myColor)
-        if (myPosition == areas.Bottom) textSprite.setPosition(80, 110);
-        if (myPosition == areas.Mid) textSprite.setPosition(80, 50);
-        if (myPosition == areas.Top) textSprite.setPosition(80, 20);
+    export enum Speeds {
+        //% block="fast"
+        Fast,
+        //% block="medium"
+        Med,
+        //% block="slow"
+        Slow
     }
-}
 
-namespace controller{
 
     /**
     * Combines a simple "move with arrows"
@@ -337,13 +291,13 @@ namespace controller{
     //% color="#d54322"
     //% blockId=move_only_onscreen_with_arrows
     //% block="move $thisSprite=variables_get(myHammer) on screen with speed $mySpeed"
-    //% mySpeed.defl=speeds.Fast
+    //% mySpeed.defl=Speeds.Fast
     //% inlineInputMode=inline
-    export function move_only_onscreen_with_arrows(thisSprite: Sprite, mySpeed: speeds) {
+    export function moveOnlyOnscreenWithArrows(thisSprite: Sprite, mySpeed: Speeds) {
         thisSprite.setStayInScreen(true)
-        if (mySpeed == speeds.Fast) {
+        if (mySpeed == Speeds.Fast) {
             controller.moveSprite(thisSprite, 225, 225)
-        } else if (mySpeed == speeds.Med) {
+        } else if (mySpeed == Speeds.Med) {
             controller.moveSprite(thisSprite, 175, 175)
         } else {
             controller.moveSprite(thisSprite, 100, 100)
@@ -361,251 +315,17 @@ namespace sprites {
     //% blockId=move_to_random_hole_on_grid
     //% block="move sprite $thisSprite=variables_get(myMole) to random area"
     //% inlineInputMode=inline
-    export function move_to_random_hole_on_grid(thisSprite: Sprite) {
+    export function moveToRandomHoleOnGrid(thisSprite: Sprite) {
         thisSprite.setPosition(simplified.chooseRandomNumber(28, 80, 130), simplified.chooseRandomNumber(21, 53, 85))
+    simplified.still = 0;
     }
 }
 
-namespace info {
-    let countdownInitialized = false;
-    /**
-     * Adds game end style to countdown
-     */
-    //% color="#cf6a87"
-    //% group=countdown
-    //% blockId=start_countdown_game
-    //% block="start countdown $myTime (s) || and game over $winType effect $winEffect"
-    //% myTime.defl=15
-    //% winType.defl=winTypes.Score
-    //% winEffect.defl=effects.confetti
-    //% inlineInputMode=inline
-    export function startCountdownGame(myTime: number, winType?: winTypes, winEffect?: effects.BackgroundEffect) {
-        if (!winType)
-            winType = winTypes.Win;
-        if (!winEffect && winType != winTypes.Lose){
-            winEffect = effects.confetti;
-        }
-        else { winEffect = effects.melt;}
-        init(winType, winEffect);
-        info.startCountdown(myTime)
-
-    }
-
-    export function newGameOver(winStyle: winTypes, fanfare: effects.BackgroundEffect) {
-
-        // Prep default variables for different win types
-        let winnerNumber = 1;
-        let thisHigh = 0;
-
-        // Save all scores as relevant to the game.
-        info.saveAllScores();
-
-        // collect the scores before popping the scenes
-        const scoreInfo1 = info.player1.getState();
-        const scoreInfo2 = info.player2.getState();
-        const scoreInfo3 = info.player3.getState();
-        const scoreInfo4 = info.player4.getState();
-        const highScore = info.highScore();
-        const allScores = [scoreInfo1.score, scoreInfo2.score, scoreInfo3.score, scoreInfo4.score];
-
-        // Find player with highest score
-        for (let i = 0; i < 4; i++) {
-            if (allScores[i] > thisHigh) {
-                thisHigh = allScores[i];
-                winnerNumber = i+1;
-            }
-        }
-        // If highest score is higher than saved high, replace
-        if (thisHigh > highScore){
-            info.saveHighScore(); }
-
-
-        // releasing memory and clear fibers. Do not add anything that releases the fiber until background is set below,
-        // or screen will be cleared on the new frame and will not appear as background in the game over screen.
-        game.popScene();
-        game.pushScene();
-        scene.setBackgroundImage(screen.clone());
-
-        music.powerUp.play();
-
-        fanfare.startScreenEffect();
-
-        pause(400);
 
-        const overDialog = new GameOverDialog(true, thisHigh, highScore, winnerNumber, winStyle);
-        scene.createRenderable(scene.HUD_Z, target => {
-            overDialog.update();
-            target.drawTransparentImage(
-                overDialog.image,
-                0,
-                (screen.height - overDialog.image.height) >> 1
-            );
-        });
-        pause(500); // wait for users to stop pressing keys
-        overDialog.displayCursor();
-        game.waitAnyButton();
-        control.reset();
-
-    }
-
-    function init(winStyle: winTypes, fanfare: effects.BackgroundEffect) {
-        if (countdownInitialized) return;
-        countdownInitialized = true;
-
-        info.onCountdownEnd(function () {
-            if (winStyle == winTypes.Win) {
-                game.over(true, fanfare)
-            } else if (winStyle == winTypes.Lose) {
-                game.over(false, fanfare)
-            } else {
-                newGameOver(winStyle, fanfare);
-            }
-        })
-    }
-
-    export class GameOverDialog extends game.BaseDialog {
-        protected cursorOn: boolean;
-        protected isNewHighScore: boolean;
-
-        constructor(
-            protected win: boolean,
-            protected score?: number,
-            protected highScore?: number,
-            protected winnerNum?: number,
-            protected winStyle?: winTypes
-        ) {
-            super(screen.width, 46, img`
-        1 1 1
-        f f f
-        1 1 1
-        `);
-            this.cursorOn = false;
-            this.isNewHighScore = this.score > this.highScore;
-        }
-
-        displayCursor() {
-            this.cursorOn = true;
-        }
-
-        update() {
-            this.clearInterior();
-            this.drawTextCore();
-
-            if (this.cursorOn) {
-                this.drawCursorRow();
-            }
-        }
-
-        drawTextCore() {
-            const titleHeight = 8;
-            if (this.winStyle == winTypes.Multi){
-                this.image.printCenter(
-                    "Player " + this.winnerNum + " wins!",
-                    titleHeight,
-                    screen.isMono ? 1 : 5,
-                    image.font8
-                );
-
-                if (this.score !== undefined) {
-                    const scoreHeight = 23;
-                    const highScoreHeight = 34;
-                    const scoreColor = screen.isMono ? 1 : 2;
-
-                    this.image.printCenter(
-                        "Score:" + this.score,
-                        scoreHeight,
-                        scoreColor,
-                        image.font8
-                    );
-
-                    if (this.isNewHighScore) {
-                        this.image.printCenter(
-                            "New High Score!",
-                            highScoreHeight,
-                            scoreColor,
-                            image.font5
-                        );
-                    } else {
-                        this.image.printCenter(
-                            "HI:" + this.highScore,
-                            highScoreHeight,
-                            scoreColor,
-                            image.font8
-                        );
-                    }
-                }
-            }
-            else {
-                this.image.printCenter(
-                    "Great Job!",
-                    titleHeight,
-                    screen.isMono ? 1 : 5,
-                    image.font8
-                );
-
-                if (this.score !== undefined) {
-                    const scoreHeight = 23;
-                    const highScoreHeight = 34;
-                    const scoreColor = screen.isMono ? 1 : 2;
-
-                    this.image.printCenter(
-                        "Score:" + this.score,
-                        scoreHeight,
-                        scoreColor,
-                        image.font8
-                    );
-
-                    if (this.isNewHighScore) {
-                        this.image.printCenter(
-                            "New High Score!",
-                            highScoreHeight,
-                            scoreColor,
-                            image.font5
-                        );
-                    } else {
-                        this.image.printCenter(
-                            "HI:" + this.highScore,
-                            highScoreHeight,
-                            scoreColor,
-                            image.font8
-                        );
-                    }
-                }
-            }
-        }
-    }
-}
+namespace simplified {
 
-namespace game {
-    /**
-     * Adds additional end game styles
-     */
-    //% color="#8854d0"
-    //% group=Gameplay
-    //% blockId=on_game_over_expanded
-    //% block="game over $winStyle || add effect $winEffect"
-    //% winType.defl=winTypes.Win
-    //% winEffect.defl=effects.confetti
-    //% inlineInputMode=inline
-    export function onGameOverExpanded(winStyle: winTypes, winEffect?: effects.BackgroundEffect) {
-        if (!winStyle)
-            winStyle = winTypes.Win;
-        if (!winEffect && winStyle != winTypes.Lose) {
-            winEffect = effects.confetti;
-        }
-        else { winEffect = effects.melt; }
+   export let still = 0;
 
-        if (winStyle == winTypes.Win) {
-            game.over(true, winEffect)
-        } else if (winStyle == winTypes.Lose) {
-            game.over(false, winEffect)
-        } else {
-            info.newGameOver(winStyle, winEffect);
-        }
-    }
-}
-
-namespace simplified {
     /**
      * Randomly chooses one of the parameter numbers
      *
@@ -632,7 +352,18 @@ namespace simplified {
         return myList._pickRandom();
     }
 
+    /**
+     * Checks to see if mole has been moved since last time position was checked
+     */
 
+    //% blockId=check_mole_escape
+    //% block="check if mole has escaped"
+    export function checkMoleEscape () {
+        if (still == 1) {
+            info.player2.changeScoreBy(1)
+        }
+        still = 1
+    }
 
 }
 

package/docs/skillmap/mole.md

@@ -3,7 +3,7 @@
 * description: Create your own mole whacking carnival game. Double-click the first level to start.
 * infoUrl: skillmap/educator-info/mole-map-info
 * bannerUrl: /static/skillmap/mole/mole3.gif
-* backgroundurl: https://raw.githubusercontent.com/clkantner/whack/master/skillmap2-final.gif
+* backgroundurl: /static/skillmap/backgrounds/mole-comp.gif
 * primarycolor: #ffffff
 * secondarycolor: #fff53d
 * tertiarycolor: #82cd54
@@ -47,13 +47,23 @@
 * type: tutorial
 * description: Finish your game by adding a thrilling carnival sound and real frame-by-frame animations!
 * tags: easy, clicker, sprite, buttons
-* next: mole-cert
+* next: mole4
 * url: /skillmap/mole/mole3
 * imageUrl: /static/skillmap/mole/mole3.gif
 * position: 1 1
 
 
 
+### mole4
+* name: Play with Friends
+* type: tutorial
+* description: Want to play with friends? A few simple changes will have you playing chase in no time!
+* tags: easy, clicker, multiplayer, buttons
+* next: mole-cert
+* url: /skillmap/mole/mole4
+* imageUrl: /static/skillmap/mole/mole3.gif
+* position: 1 0
+
 
 ### mole-cert
 * name: Congrats!
@@ -61,9 +71,10 @@
 * type: certificate
 * url: /static/skillmap/certificates/mole-cert.pdf
 * imageUrl: /static/skillmap/certificates/mole-cert.png
+* showMultiplayerShare: true
 * position: 2 0
 * actions:
-    * map: [Create Another Carnival Game](/skillmap/balloon)
+    * map: [Try Burstin' Balloons](/skillmap/balloon)
     * editor: [Open in Creative Mode](/)
 * rewards:
     * certificate:
@@ -72,4 +83,3 @@
     * completion-badge:
         * image: /static/badges/badge-mole.png
         * name: Whack-the-Mole
-