pxt-arcade 1.12.2 → 1.12.3

package/docs/skillmap/mole/mole2.md

@@ -82,7 +82,7 @@ We need to be able to move the hammer around the screen to chase the mole.
 
 - :game: From the ``||controller: Controller||`` category, grab <br/>
 ```block
-controller.move_only_onscreen_with_arrows(myHammer, speeds.Fast)
+controller.moveOnlyOnscreenWithArrows(myHammer, controller.Speeds.Fast)
 ```
 and snap it in at **the end** of the ``||loops(noclick): on start||`` block already in the workspace.
 
@@ -107,7 +107,7 @@ scene.setBackgroundImage(assets.image`grid`)
 myMole = sprites.create(assets.image`mole`, SpriteKind.Enemy)
 myHammer = sprites.create(assets.image`hammer`, SpriteKind.Player)
 //@highlight
-controller.move_only_onscreen_with_arrows(myHammer, speeds.Fast)
+controller.moveOnlyOnscreenWithArrows(myHammer, controller.Speeds.Fast)
 ```
 
 
@@ -116,7 +116,7 @@ controller.move_only_onscreen_with_arrows(myHammer, speeds.Fast)
 
 - :binoculars: Test your project in the game window to see how it works!
 
-Try using the on-screen joypad (or the arrow keys on your keyboard) to move the hammer around the screen.
+Try using the on-screen joypad **(or the arrow keys on your keyboard)** to move the hammer around the screen.
 
 
 
@@ -165,6 +165,7 @@ sprites.onOverlap(SpriteKind.Player, SpriteKind.Enemy, function (sprite, otherSp
 
 - :binoculars: Play with your project in the game window!
 
+Use the on-screen joypad **(or the arrow keys on your keyboard)** to move the hammer.
 
 When your rubber hammer overlaps the mole, you should see points start to show up in the top-right corner.
 
@@ -180,7 +181,7 @@ Did you notice that the points added up really quickly when the rubber hammer st
 - :paper plane: From the ``||sprites: Sprites||`` category, grab <br/>
 
 ```block
-    sprites.move_to_random_hole_on_grid(myMole)
+    sprites.moveToRandomHoleOnGrid(myMole)
 ```
 
 and snap it into **the end** of the ``||sprites(noclick): on sprite overlaps otherSprite||`` block container already in the workspace.
@@ -203,7 +204,7 @@ hint~
 sprites.onOverlap(SpriteKind.Player, SpriteKind.Enemy, function (sprite, otherSprite) {
     info.changeScoreBy(1)
 //@highlight
-    sprites.move_to_random_hole_on_grid(myMole)
+    sprites.moveToRandomHoleOnGrid(myMole)
 })
 ```
 
@@ -215,10 +216,10 @@ sprites.onOverlap(SpriteKind.Player, SpriteKind.Enemy, function (sprite, otherSp
 Finally, let's add a timer to keep the game exciting.
 
 
-- :id card: From the ``||info: Info||`` category, grab <br/>
+- :id card: From the ``||carnival: Carnival||`` category, grab <br/>
 
 ```block
-info.startCountdownGame(15, winTypes.Score)
+carnival.startCountdownGame(15, carnival.WinTypes.Score)
 ```
 
 and snap it into **the end** of the <br/>
@@ -243,9 +244,9 @@ 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)
+controller.moveOnlyOnscreenWithArrows(myHammer, controller.Speeds.Fast)
 //@highlight
-info.startCountdownGame(15, winTypes.Score)
+carnival.startCountdownGame(15, carnival.WinTypes.Score)
 ```
 
 
@@ -283,12 +284,14 @@ When you're ready, click **Done** to return to the skillmap so you can add sound
 ```blockconfig.global
 let myHammer = sprites.create(img`.`, SpriteKind.Player)
 sprites.onOverlap(SpriteKind.Player, SpriteKind.Enemy, function (sprite, otherSprite) { info.changeScoreBy(1) })
+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
 ```
 
 
@@ -299,94 +302,25 @@ scene.setBackgroundImage(assets.image`grid`)
 myMole = sprites.create(assets.image`mole`, SpriteKind.Enemy)
 
 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 animation {
-    /**
-    * Prefills animation block with hammer items
-    */
-    //% color="#03aa74"
-    //% blockId=run-image-animation-hammer
-    //% block="animate $sprite=variables_get(myHammer) frames $frames=animation_editor interval (ms) $frameInterval=timePicker loop $loop=toggleOnOff"
-    //% frameInterval.defl=100
-    //% group="Animate"
-    //% weight=100
-    //% help=animation/run-image-animation-hammer
-    export function runImageAnimationHammer(sprite: Sprite, frames: Image[], frameInterval?: number, loop?: boolean) {
-        const anim = new ImageAnimation(sprite, frames, frameInterval || 100, !!loop);
-        anim.init();
-    }
-}
-
-
+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"
@@ -395,13 +329,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)
@@ -419,251 +353,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 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; }
+namespace simplified {
 
-        if (winStyle == winTypes.Win) {
-            game.over(true, winEffect)
-        } else if (winStyle == winTypes.Lose) {
-            game.over(false, winEffect)
-        } else {
-            info.newGameOver(winStyle, winEffect);
-        }
-    }
-}
+   export let still = 0;
 
-namespace simplified {
     /**
      * Randomly chooses one of the parameter numbers
      *
@@ -690,7 +390,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
+    }
 
 }
 
@@ -708,4 +419,4 @@ namespace simplified {
   "main.ts": "",
   "pxt.json": "{\n    \"name\": \"Whackem2 - Assets Only\",\n    \"description\": \"\",\n    \"dependencies\": {\n        \"device\": \"*\"\n    },\n    \"files\": [\n        \"main.blocks\",\n        \"main.ts\",\n        \"README.md\",\n        \"assets.json\",\n        \"images.g.jres\",\n        \"images.g.ts\",\n        \"custom.ts\"\n    ],\n    \"targetVersions\": {\n        \"branch\": \"v1.8.26\",\n        \"tag\": \"v1.8.26\",\n        \"commits\": \"https://github.com/microsoft/pxt-arcade/commits/6434cb63948fe7c1d1a7498115a4bc495495512c\",\n        \"target\": \"1.8.26\",\n        \"pxt\": \"7.4.27\"\n    },\n    \"preferredEditor\": \"tsprj\"\n}\n"
 }
-```
+```