pxt-arcade 1.7.2 → 1.7.3

package/built/targetlight.json

@@ -448,11 +448,11 @@
     ],
     "uploadDocs": true,
     "versions": {
-        "branch": "v1.7.2",
-        "tag": "v1.7.2",
-        "commits": "https://github.com/microsoft/pxt-arcade/commits/5c0351836e55d924140e90500d22054ac4220e7e",
-        "target": "1.7.2",
-        "pxt": "7.3.2"
+        "branch": "v1.7.3",
+        "tag": "v1.7.3",
+        "commits": "https://github.com/microsoft/pxt-arcade/commits/5f25293cb2206b608be9e3b76c2d8d42a3ad7449",
+        "target": "1.7.3",
+        "pxt": "7.3.4"
     },
     "blocksprj": {
         "id": "blocksprj",

package/docs/hardware.md

@@ -45,7 +45,7 @@ These boards run MakeCode Arcade games. Choose a board to find out more about it
         "name": "TinkerGen GameGo",
         "description": "A fun-sized console to play the games you code.",
         "imageUrl": "/static/hardware/gamego.jpg",
-        "url": "https://shop.tinkergen.com/gamego.html",
+        "url": "https://www.tinkergen.com/gamego",
         "variant": "hw---stm32f401"
     },
     {

package/docs/index-ref.json

@@ -1,3 +1,3 @@
 {
-    "appref": "v1.6.21"
+    "appref": "v1.6.23"
 }

package/docs/projects/SUMMARY.md

@@ -203,7 +203,7 @@
   * [Adafruit PyBadge](https://www.adafruit.com/product/4200)
   * [Adafruit PyGamer](https://www.adafruit.com/product/4242)
   * [Kitronik ARCADE](https://www.kitronik.co.uk/arcade)
-  * [TinkerGen GameGo](https://shop.tinkergen.com/gamego.html)
+  * [TinkerGen GameGo](https://www.tinkergen.com/gamego)
   * [Ovobot Xtron Pro](https://www.ovobot.cc/en/product/detail/xtron-pro/)
   * [Adafruit EdgeBadge](https://www.adafruit.com/product/4400)
   * [Adafruit M4](https://learn.adafruit.com/makecode-arcade-m4)

package/docs/skillmap/educator-info/forest-map-info.md

@@ -4,18 +4,18 @@
 
 The **Save the Forest!** map uses basic code blocks and extensions in MakeCode Arcade to implement simple game concepts.
 
-In this short set of activities, students code a scenario where players fly fire planes across a burning forest in an urgent effort to douse the flames. This map is intended for students who are new to MakeCode with little or no previous coding experience.
+In this short set of activities, students code a game that recreates the conditions for a forest fire, and then code a fire-fighting airtanker plane to spray water and put out the flames! This map is intended for students who are new to MakeCode with little or no previous coding experience.
 
 Designed for students between the ages of 11 & 18, this experience contains a total of 6 tutorials (approximating 54 minutes of instruction).  At the end of the learning path, students receive a certificate of completion.
 
 |                 | Minutes* | Game Type | Key Concepts |
 | --------------- | -------- | --------- | ------------ |
-| Prepare Your Plane | 7 | Intro | movement, creation |
-| Burning Issues | 8 | Maze | events, game score |
-| Fire Fighting | 10 | Maze | events, game score, timer |
-| Spreads Like Wildfire | 10 | Maze | events, game score, timer |
-| Head's Up! | 9 | Maze | events, game score, timer |
-| Keep Going | 10 | Maze | events, game score, timer |
+| Prepare Your Plane | 7 | Intro | movement, sprites |
+| Burning Issues | 8 | Maze | events, loops, random |
+| Fire Fighting | 10 | Maze | events, projectiles |
+| Spreads Like Wildfire | 10 | Maze | events, variables, collisions |
+| Head's Up! | 9 | Maze | displays, customization |
+| Keep Going | 10 | Maze | animations, sounds |
 
 \* Minutes are approximate, based on time to follow instructions as written. Times do not include time spent on designing elements or re-aquainting with previously-written code. Providing extra time for creativity and debugging is encouraged.
 
@@ -32,6 +32,8 @@ Specifically, they will experience the following topics:
 - Movement
 - Collisions
 - Projectiles
+- Animation
+- Sounds
 - Strength/Life Mechanics
 
 
@@ -46,20 +48,58 @@ pxt-tilemaps=github:microsoft/pxt-tilemaps/
 #### 1. Prepare Your Plane
 | Activity | Prepare Your Plane (7 min) |
 |---|---|
-| ![Prepare Your Plane thumbnail](/static/skillmap/rockstar/rockstar1.gif) | Set up your plane to make sure you can get everywhere you need to be!  |
+| ![Prepare Your Plane thumbnail](/static/skillmap/forest/forest1.gif) | Set up your plane to make sure you can get everywhere you need to be!  |
 | Blocks used | ``[let mySprite = sprites.create(img`.`, SpriteKind.Player)]``<br/>``[let mySprite: Sprite=null; controller.moveSprite(mySprite)]``<br/>``[tiles.placeOnRandomTile()]``<br/>``[let mySprite: Sprite=null; scene.cameraFollowSprite(mySprite)]`` |
-| Solution option | [Prepare Your Plane Project](https://makecode.com/_FM1DbPhEia87) |
+| Solution option | [Prepare Your Plane Project](https://makecode.com/_0CbLhcf6TW1W) |
 
 #### 2. Burning Issues
 | Activity | Burning Issues (8 min) |
 |---|---|
-| ![Burning Issues thumbnail](/static/skillmap/rockstar/rockstar2.gif) | Use loops to add random fires to your map!  |
+| ![Burning Issues thumbnail](/static/skillmap/forest/forest2.gif) | Use loops to add random fires to your map!  |
 | Blocks used | ``[scene.onOverlapTile()]``<br/>``[tiles.setTileAt(location, assets.tile`transparency16`)]``<br/>``[info.changeScoreBy(1)]``<br/>``[game.over(true)]`` |
-| Solution option | [Burning Issues Project](https://makecode.com/_aE3eYm23wad3) |
+| Solution option | [Burning Issues Project](https://makecode.com/_EdjVbU6eMTPW) |
 
 #### 3. Fire Fighting
 | Activity | Fire Fighting (10 min) |
 |---|---|
-| ![Fire Fighting! thumbnail](/static/skillmap/rockstar/rockstar3.gif) | Add a water hose to your plane so you can keep your fires under control.  |
+| ![Fire Fighting! thumbnail](/static/skillmap/forest/forest3.gif) | Add a water hose to your plane so you can keep your fires under control.  |
 | Blocks used | ``[scene.onOverlapTile()]``<br/>``[tiles.setTileAt(location, assets.tile`transparency16`)]``<br/>``[info.changeScoreBy(-1)]``<br/>``[info.startCountdown(0)]`` |
-| Solution option | [Fire Fighting Project](https://makecode.com/_dW115JWAR2d0) |
+| Solution option | [Fire Fighting Project](https://makecode.com/_9p32WzfzX1uv) |
+
+#### 4. Spreads Like Wildfire
+| Activity | Spreads Like Wildfire (10 min) |
+|---|---|
+| ![Spreads Like Wildfire thumbnail](/static/skillmap/forest/forest4.gif) | Conditions in the weather and environment such as drought, winds, vegetation density and dryness can cause fires to spread more quickly.  Let’s simulate these conditions in our game.  |
+| Blocks used | ``[scene.onOverlapTile()]``<br/>``[tiles.setTileAt(location, assets.tile`transparency16`)]``<br/>``[info.changeScoreBy(-1)]``<br/>``[info.startCountdown(0)]`` |
+| Solution option | [Spreads Like Wildfire Project](https://makecode.com/_ifR6pigEHKP7) |
+
+#### 5. Head's Up!
+| Activity | Head's Up! (9 min) |
+|---|---|
+| ![Head's Up!](/static/skillmap/forest/forest5.gif) | Computer science is more important to firefighting than ever before. Let's add a heads-up-display (HUD) to help the pilot get information from their fire database in real-time.  |
+| Blocks used | ``[scene.onOverlapTile()]``<br/>``[tiles.setTileAt(location, assets.tile`transparency16`)]``<br/>``[info.changeScoreBy(-1)]``<br/>``[info.startCountdown(0)]`` |
+| Solution option | [Head's Up Project](https://makecode.com/_77cLwx4b120o) |
+
+#### 4. Keep Going
+| Activity | Keep Going (10 min) |
+|---|---|
+| ![Keep Going thumbnail](/static/skillmap/forest/forest6.gif) | Add more to your game! Experiment with sounds and animation to make your game truly unique.  |
+| Blocks used | ``[scene.onOverlapTile()]``<br/>``[tiles.setTileAt(location, assets.tile`transparency16`)]``<br/>``[info.changeScoreBy(-1)]``<br/>``[info.startCountdown(0)]`` |
+| Solution option | [Keep Going Project](https://makecode.com/_0kzFyAgPMa4A) |
+
+##### Game Mod Ideas
+
+As students work on **Keep Going**, we encourage them to plan out ways they can dive even deeper using the full editor after opening their game using the [SAVE TO MY PROJECTS] button. 
+
+- What other environment could my plane explore? Neighborhoods? The desert?
+- What could pop-up randomly instead of fires? Fish? Mice? Snowmen?
+- What could you move around instead of an airplane? A boat? A magnifying glass?
+
+##### What's Next?
+
+When students are finished with **Save the Forest!** consider graduating them to another map to work on skills further.
+
+- [Try the Beginner Skillmap](/skillmap/beginner)
+- [Try the Jungle Monkey Skillmap](/skillmap/jungle)
+- [Try the Space Explorer Map](/skillmap/space)
+- [Try our Time Flies Tutorial](/tutorials/froggy)

package/docs/skillmap/forest/forest1.md

@@ -42,11 +42,12 @@ tiles.setTilemap(tilemap`level2`)
 
 ## 3. Set Your Map
 
-- :paint brush: Click the empty grey square in
-the
-``||scene:set tilemap to []||``
+- :paint brush: Click the empty grey square in  
+``||scene:set tilemap to []||``  
 and toggle to **My Assets** to select the tilemap called **level1**.
 
+![Toggle to My Assets](/static/skillmap/assets/my-assets.png "Resources have been provided for you!")
+
 
 ```blocks
 //@highlight
@@ -56,13 +57,13 @@ tiles.setTilemap(tilemap`level1`)
 ## 4. Take a Look!
 
 **Click the Game Window Tab (Above)**
-![Click the Game Window tab to see your scene. ](/static/skillmap/assets/game-win-tab.png "Look what we're about to do today!")
+![Click the Game Window tab to see your scene. ](/static/skillmap/assets/game-win-tab.png "Don't forget to look at your game!")
 
 ---
 
 Open the game window to take a look at the scene you've just set up.
 
-When you're ready to continue, click back to the instructions tab for more!
+When you're ready to continue, click into the instructions tab again!
 
 
 
@@ -73,7 +74,7 @@ When you're ready to continue, click back to the instructions tab for more!
 **We need a hero**
 
 Choose a [__*sprite*__](#sprote "a 2-D image that moves on the screen")
-for your aircraft that you will fly around the screen.
+for your aircraft that will fly around the screen.
 
 ---
 

package/docs/skillmap/forest/forest2.md

@@ -38,7 +38,7 @@ container.
 
 - :paper plane:  Add
 ``||variables:set [mySprite2] to sprite [ ] of kind [Player]||``
-to the end of the
+to the empty
 ``||loops:repeat [4] times||``
 container.
 
@@ -133,7 +133,7 @@ for (let index = 0; index < 4; index++) {
 
 
 
-##  Try It
+##  6. Try It
 
 **🕹️ Test it out in the Game Window **
 

package/docs/skillmap/forest/forest3.md

@@ -32,10 +32,10 @@ Let's add code that sprays water when you press the (A) button.
 
 - :game: Drag the  
 ``||controller:on [A] button [pressed]||``  
-
 container into an empty area in your workspace.
 
-- :mouse pointer: Change ``||controller:pressed||`` to ``||controller:repeat||`` to keep the water spraying as you hold the (A) button.
+- :mouse pointer: Change ``||controller:pressed||`` to ``||controller:repeat||`` to keep the water spraying as you hold the (A) button.  
+
 _💡 Find it too hard to keep (A) pressed?  Try using the spacebar on your keyboard!_
 
 

package/docs/skillmap/forest/forest4.md

@@ -152,7 +152,7 @@ Does it get out of control too quickly?
 
 ## 7. No Fuel, No Fire
 
-Right now, the fires don't burn the trees, 
+Right now, the fires don't burn the trees
 so they can appear on the same tree over and over. 
 When a flame burns out, we want to mark that spot in the forest with a special tile.
 
@@ -221,6 +221,8 @@ with
 - :mouse pointer:   To get the location for the correct sprite, replace  ``||variables:mySprite||`` with the ``||variables:sprite||``
 value from the outer ** on destroyed** container.
 
+![Grab the sprite value from the title bar of the outer container](/static/skillmap/assets/sprite-from-container.gif "This is how your block knows which sprite to use")
+
 
 ```blocks
 namespace SpriteKind {
@@ -235,6 +237,10 @@ sprites.onDestroyed(SpriteKind.Fire, function (sprite) {
 
 ```
 
+---
+
+![Grab the sprite value from the title bar of the outer container](/static/skillmap/assets/sprite-from-container.gif "This is how your block knows which sprite to use")
+
 
 
 ## 10. Smoke Screen

package/docs/skillmap/forest/forest5.md

@@ -4,6 +4,7 @@
 ## Welcome @showdialog
 
 Computer science is more important to firefighting than ever before.
+
 Let's add a heads-up-display (HUD) to help the pilot get information from their fire database in real-time.
 
 ![A HUD can help keep you informed](/static/skillmap/forest/forest5.gif "Look what we're about to do!")
@@ -109,7 +110,7 @@ hud.danger_hud(true)
 
 ## 6. Healthy Forests
 
-The crew needs to know how engulfed the forest is. Add another hud
+The crew needs to know the progress of the fire. Add another hud
 to share information on how much of the forest is still healthy.
 
 ---
@@ -271,12 +272,12 @@ sprites.onOverlap(SpriteKind.Fire, SpriteKind.Fire, function (sprite, otherSprit
     sprite.destroy()
 })
 
-scene.onOverlapTile(SpriteKind.Fire, assets.tile`smoulder`, function (sprite, location) {
+scene.onOverlapTile(SpriteKind.Fire, assets.tile`burnt tree`, function (sprite, location) {
     sprite.destroy()
 })
 
 sprites.onDestroyed(SpriteKind.Fire, function (sprite) {
-    tiles.setTileAt(tiles.locationOfSprite(sprite), assets.tile`smoulder`)
+    tiles.setTileAt(tiles.locationOfSprite(sprite), assets.tile`burnt tree`)
 })
 
 game.onUpdate(function () {
@@ -358,6 +359,7 @@ let hudBG = sprites.create(img`
 hudBG.bottom = 120
 hudBG.z = 2000
 hudBG.setFlag(SpriteFlag.Invisible, true)
+hudBG.setFlag(SpriteFlag.RelativeToCamera, true)
 let statusbar2 = statusbars.create(8, 8, StatusBarKind.Magic)
 statusbar2.setLabel("Fire Danger:")
 statusbar2.setColor(7, 2)
@@ -373,7 +375,7 @@ statusbar2.setFlag(SpriteFlag.Invisible, true)
 
 game.onUpdate(function () {
     statusbar.max = tiles.tilemapRows() * tiles.tilemapColumns()
-    statusbar.value = tiles.tilemapRows() * tiles.tilemapColumns() - tiles.getTilesByType(assets.tile`smoulder`).length
+    statusbar.value = tiles.tilemapRows() * tiles.tilemapColumns() - tiles.getTilesByType(assets.tile`burnt tree`).length
     spreadTimeBase = 4500 - (250 * windSpeed + 250 * dryGrass - 100 * tinder)
         if (spreadTimeBase >= 4000) {
         statusbar2.setColor(7, 2)

package/docs/skillmap/forest/forest6.md

@@ -102,7 +102,7 @@ Your plane should face left when you fly left and right when you fly right!
 
 ---
 
-- :headphones: Find a block to add sound when a sprite of kind ``||sprites:Fire||`` is **destroyed**.  
+- :headphones: Find the block that will let you add sound when a sprite of kind ``||sprites:Fire||`` is **destroyed**.  
 💡 We like the **thump** sound for this.
 
 - :question: Can you figure out where to add this block if you want it to play each time a sprite of kind **Fire** is **destroyed**?
@@ -115,7 +115,7 @@ namespace SpriteKind {
     export const Burnt = SpriteKind.create()
 }
 sprites.onDestroyed(SpriteKind.Fire, function (sprite) {
-    tiles.setTileAt(tiles.locationOfSprite(sprite), assets.tile`smoulder`)
+    tiles.setTileAt(tiles.locationOfSprite(sprite), assets.tile`burnt tree`)
     //@highlight
     music.thump.play()
 })
@@ -156,7 +156,7 @@ sprites.onCreated(SpriteKind.Fire, function (sprite) {
 
 ---
 
-Don't forget to play with the grass, wind, and trees
+Don't forget to play with the grass, wind, and tree
 variables to see how challenging your game can be.
 
 
@@ -192,7 +192,7 @@ namespace SpriteKind {
     export const Burnt = SpriteKind.create()
 }
 sprites.onDestroyed(SpriteKind.Fire, function (sprite) {
-    tiles.setTileAt(tiles.locationOfSprite(sprite), assets.tile`smoulder`)
+    tiles.setTileAt(tiles.locationOfSprite(sprite), assets.tile`burnt tree`)
 })
 sprites.onCreated(SpriteKind.Fire, function (sprite) {
     sprite.startEffect(effects.fire)
@@ -209,7 +209,7 @@ sprites.onOverlap(SpriteKind.Water, SpriteKind.Fire, function (sprite, otherSpri
     sprite.destroy()
     sprites.change_flame_strength_by(otherSprite, -1)
 })
-scene.onOverlapTile(SpriteKind.Fire, assets.tile`smoulder`, function (sprite, location) {
+scene.onOverlapTile(SpriteKind.Fire, assets.tile`burnt tree`, function (sprite, location) {
     sprite.destroy()
 })
 let newFire: Sprite = null
@@ -328,6 +328,7 @@ let hudBG = sprites.create(img`
 hudBG.bottom = 120
 hudBG.z = 2000
 hudBG.setFlag(SpriteFlag.Invisible, true)
+hudBG.setFlag(SpriteFlag.RelativeToCamera, true)
 let statusbar2 = statusbars.create(8, 8, StatusBarKind.Magic)
 statusbar2.setLabel("Fire Danger:")
 statusbar2.setColor(7, 2)
@@ -343,7 +344,7 @@ statusbar2.setFlag(SpriteFlag.Invisible, true)
 
 game.onUpdate(function () {
     statusbar.max = tiles.tilemapRows() * tiles.tilemapColumns()
-    statusbar.value = tiles.tilemapRows() * tiles.tilemapColumns() - tiles.getTilesByType(assets.tile`smoulder`).length
+    statusbar.value = tiles.tilemapRows() * tiles.tilemapColumns() - tiles.getTilesByType(assets.tile`burnt tree`).length
     spreadTimeBase = 4500 - (250 * windSpeed + 250 * dryGrass - 100 * tinder)
         if (spreadTimeBase >= 4000) {
         statusbar2.setColor(7, 2)
@@ -366,37 +367,6 @@ game.onUpdate(function () {
 
 
 
-namespace animation {
-    /*
-     * Loops the passed frames on the sprite at the given interval whenever
-     * the specified rule is true for that sprite.
-     *
-     * If more than one rule applies, the most specific rule will be used.
-     * If multiple rules are equally specific, the currently executing rule
-     * is favored (or one is chosen at random).
-     *
-     * @param sprite    the sprite to animate
-     * @param frames    the images that make up that animation
-     * @param frame     Interval the amount of time to spend on each frame in milliseconds
-     * @param rule      the rule that decides when this animation will play
-     */
-    //% blockId=arcade_character_loop_frames2
-    //% block="animate $sprite loop frames $frames interval (ms) $frameInterval when $rule"
-    //% sprite.defl=mySprite
-    //% frames.defl=Fire Plane Right
-    //% sprite.shadow=variables_get
-    //% frames.shadow=animation_editor
-    //% frameInterval.shadow=timePicker
-    //% rule.shadow=arcade_character_make_rule
-    //% weight=100
-    //% blockGap=8
-    //% help=github:arcade-character-animations/docs/loop-character-animation
-    export function loopFrames2(sprite: Sprite, frames: Image[], frameInterval: number, rule: number) {
-        characterAnimations.loopFrames(sprite, frames, frameInterval, rule);
-    }
-}
-
-
 namespace game {
 
     /*

package/docs/skillmap/forest.md

@@ -2,7 +2,7 @@
 * name: Save the Forest
 * description: The last few summers have been some of the hottest on record and the forest service needs your air team to help keep fires under control. Use blocks to code your airtanker and set up your HUDs so your ground team can help you save the forest!
 * infoUrl: skillmap/educator-info/forest-map-info
-* bannerUrl: /static/skillmap/forest/forest1.gif
+* bannerUrl: /static/skillmap/forest/forest6.gif
 * backgroundurl: /static/skillmap/backgrounds/forest-comp.png
 * primarycolor: #b27ea3
 * secondarycolor: #ffffff

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "pxt-arcade",
-    "version": "1.7.2",
+    "version": "1.7.3",
     "description": "Small arcade editor for MakeCode",
     "keywords": [
         "JavaScript",
@@ -32,8 +32,8 @@
         "typescript": "^4.2.3"
     },
     "dependencies": {
-        "pxt-common-packages": "9.2.7",
-        "pxt-core": "7.3.2"
+        "pxt-common-packages": "9.3.2",
+        "pxt-core": "7.3.4"
     },
     "optionalDependencies": {
         "pxt-arcade-sim": "microsoft/pxt-arcade-sim.git#v0.8.7"