Skip to content

Commit

Permalink
Merge branch 'master' of https://github.com/microsoft/pxt-arcade into…
Browse files Browse the repository at this point in the history
… srietkerk/pxt-bump-10018
  • Loading branch information
srietkerk committed Apr 15, 2024
2 parents a2434a5 + 1a22666 commit a75e13c
Show file tree
Hide file tree
Showing 9 changed files with 1,151 additions and 119 deletions.
49 changes: 49 additions & 0 deletions docs/games.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,49 @@
# Play First!

## Play the Games You Can Make!

Choose one or more of the games below to play. You can make any of these by following the tutorials listed at [arcade.makecode.com](https://arcade.makecode.com)

```codecard
[
{
"name": "Turkey Day",
"cardType": "link",
"description": "It's time to break out! Help your turkey free all of its friends and climb to freedom in this fast-paced vertical platformer.",
"imageUrl": "https://makecode.com/api/_3a81pJ6t1dHX/thumb",
"url": "https://makecode.com/_3a81pJ6t1dHX",
"directOpen": true
}, {
"name": "Save the Baby Dinos",
"description": "Rescue the baby dinos from the dangerous traffic.",
"url": "https://makecode.com/_VbY6wsJ643HV",
"cardType": "link",
"imageUrl": "https://makecode.com/api/_VbY6wsJ643HV/thumb"
}, {
"name": "Sparks Flying",
"description": "This game challenges you to light a fire to keep warm! But be careful--it's not as easy as it sounds.",
"url": "https://makecode.com/_KkM6gg0fEevk",
"cardType": "link",
"imageUrl": "/static/skillmap/sparks/sparks1.gif"
}, {
"name": "Monster Truck Racer",
"cardType": "link",
"description": "Get your truck out of the cave as fast as you can without hitting any spikes. ",
"imageUrl": "https://makecode.com/api/_1yfTMtFAe5yC/thumb",
"url": "https://makecode.com/_1yfTMtFAe5yC",
"directOpen": true
}, {
"name": "Save the Galaxy",
"description": "Reboot all of the satellites before getting hit by asteroids.",
"url": "https://makecode.com/_VuJha6i1FeWT",
"cardType": "link",
"imageUrl": "https://makecode.com/api/_VuJha6i1FeWT/thumb"
}, {
"name": "Whack the Mole",
"description": "Hit the pesky mole with a rubber mallet before it dashes away.",
"url": "https://makecode.com/_PCKW94TVLMpA",
"cardType": "link",
"imageUrl": "https://makecode.com/api/_PCKW94TVLMpA/thumb"
}
]
```
2 changes: 1 addition & 1 deletion docs/index-ref.json
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
{
"appref": "v1.12.49"
"appref": "v1.12.51"
}
6 changes: 6 additions & 0 deletions docs/jr-tutorials.md
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,12 @@
"url": "https://arcade.makecode.com/#tutorial:/tutorials/sparks-jr",
"cardType": "link",
"imageUrl": "https://makecode.com/api/_Aw3E84FyDPKX/thumb"
}, {
"name": "Free Throw Jr.",
"description": "Code a game that lets you to line up a shot and throw for the hoop.",
"url": "https://arcade.makecode.com/#tutorial:/tutorials/free-throw-jr",
"cardType": "link",
"imageUrl": "https://makecode.com/api/S77067-48788-87054-57025/thumb"
}
]
```
6 changes: 3 additions & 3 deletions docs/skillmap/educator-info/dino-map-info.md
Original file line number Diff line number Diff line change
Expand Up @@ -78,9 +78,9 @@ Students will work with sprite controller blocks, variables, and conditional sta

| Activity | Animate It! (20 min) |
|---|---|
| ![Animate It! thumbnail](/static/skillmap/map-info/animate-it.png) | Polish your game using animation to make your characters come to life! |
| Blocks used | ``[info.changeLifeBy(1)]``|
| Solution option | [Animate It Project](https://arcade.makecode.com/20377-15271-69070-26521) |
| ![Animate It! thumbnail](https://makecode.com/api/_VbY6wsJ643HV/thumb) | Polish your game using animation to make your characters come to life! |
| Blocks used | ``[animation.runImageAnimation()]``|
| Solution option | [Animate It Project](https://makecode.com/_VbY6wsJ643HV) |

##### Game Mod Ideas

Expand Down
80 changes: 26 additions & 54 deletions docs/skillmap/educator-info/racer-map-info.md
Original file line number Diff line number Diff line change
Expand Up @@ -6,36 +6,28 @@ The **Monster Racer** map uses basic code blocks and extensions in MakeCode Arca

In this short set of activities, ... 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.
Designed for students between the ages of 10 & 16, this experience contains a total of 3 tutorials (approximating 35 minutes of instruction). At the end of the learning path, students receive a certificate of completion.

| | Minutes* | Key Concepts |
| --------------- | -------- | ------------ |
| Prepare Your Plane | 7 | movement, sprites |
| Burning Issues | 8 | events, loops, random |
| Fire Fighting | 10 | events, projectiles |
| Spreads Like Wildfire | 10 | events, variables, collisions |
| Head's Up! | 9 | displays, customization |
| Keep Going | 10 | animations, sounds |
| Ready, Set, Go! | 9 | movement, sprites |
| Over and Under | 11 | events, game over |
| Going Further | 15 | animation, tilemaps |


\* 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.

### Objectives

After completing Monster Racer...

Specifically, they will experience the following topics:
After completing Monster Racer, students will experience the following topics:

- Loops
- Events
- Variables
- Tilemaps
- Movement
- Collisions
- Projectiles
- Animation
- Sounds
- Strength/Life Mechanics


### Projects

Expand All @@ -45,61 +37,41 @@ As students progress through these projects, they will progressively build a gam
pxt-forest-special=github:kiki-lee/forest-special/
```

#### 1. Prepare Your Plane
| Activity | Prepare Your Plane (7 min) |
#### 1. Ready, Set, Go!
| Activity | Ready, Set, Go! (7 min) |
|---|---|
| ![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/>``[let mySprite: Sprite=null; scene.cameraFollowSprite(mySprite)]`` |
| Solution option | [Prepare Your Plane Project](https://makecode.com/_0CbLhcf6TW1W) |
| ![Ready, Set, Go! thumbnail](https://makecode.com/api/_biY17aMhFFpJ/thumb) | Choose a truck and get moving. |
| Blocks used | ``[let truck = sprites.create(img`.`, SpriteKind.Player)]``<br/>``[let truck: Sprite=null; truck.ay = 500]`` <br/> ``[let truck: Sprite=null;truck.vx = 100]``<br/>``[let truck: Sprite=null; scene.cameraFollowSprite(mySprite)]`` |
| Solution option | [Ready, Set, Go! Project](https://makecode.com/_biY17aMhFFpJ) |

#### 2. Burning Issues
| Activity | Burning Issues (8 min) |
#### 2. Over and Under
| Activity | Over and Under (8 min) |
|---|---|
| ![Burning Issues thumbnail](/static/skillmap/forest/forest2.gif) | Use loops to add random fires to your map! |
| Blocks used | ``[for (let index = 0; index < 4; index++) {}]``<br/>``[newFire = sprites.create(img`.`, SpriteKind.Player)]``<br/>``[tiles.placeOnRandomTile(newFire, assets.tile`transparency16`)]``<br/>``[sprites.onCreated()]``<br/>``[let sprite: Sprite=null; sprite.startEffect(effects.fire)]`` |
| Solution option | [Burning Issues Project](https://makecode.com/_EdjVbU6eMTPW) |
| ![Over and Under thumbnail](https://makecode.com/api/_FYseeH2FhhHR/thumb) | Add the ability to jump, win, and lose. |
| Blocks used | ``[scene.onOverlapTile()]``<br/>``[game.over(true)]`` |
| Solution option | [Over and Under Project](https://makecode.com/_FYseeH2FhhHR) |

#### 3. Fire Fighting
| Activity | Fire Fighting (10 min) |
#### 3. Going Further
| Activity | Going Further (10 min) |
|---|---|
| ![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 | ``[controller.A.onEvent(ControllerButtonEvent.Repeated, function () {})]``<br/>``[let mySprite: Sprite=null; sprites.spray(mySprite, img`.`)]``<br/>``[sprites.set_flame_strength(sprite, 10)]``<br/>``[sprites.onOverlap()]``<br/>``[let sprite: Sprite=null; sprite.destroy()]``<br/>``[sprites.change_flame_strength_by(sprite, -1)]`` |
| Solution option | [Fire Fighting Project](https://makecode.com/_9p32WzfzX1uv) |
| ![Going Further! thumbnail](https://makecode.com/api/_1yfTMtFAe5yC/thumb) | Add animation and sound to your project! |
| Blocks used | ``[animation.runImageAnimation()]``<br/>``[music.play(music.melodyPlayable(music.knock), music.PlaybackMode.InBackground)]`` |
| Solution option | [Going Further Project](https://makecode.com/_1yfTMtFAe5yC) |

#### 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 | ``[game.set_health_of_trees(7)]``<br/>``[game.set_strength_of_wind(3)]``<br/>``[game.set_dryness_of_grass(3)]``<br/>``[game.onUpdate(function () {})]``<br/>``[sprites.random_spread(img`.`]``<br/>``[sprites.onDestroyed(SpriteKind.Player, function (sprite) {})]``<br/>``[tiles.setTileAt(tiles.locationOfSprite(sprite), assets.tile`transparency16`)]``<br/>``[scene.onOverlapTile()]``<br/>``[sprites.onOverlap()]``<br/>``[let otherSprite: Sprite=null; otherSprite.destroy()]``<br/> |
| 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 | ``[hud.forest_hud(true)]``<br/>``[hud.danger_hud(true)]``<br/>``[hud.forest_hud(true)]`` |
| 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 | ``[controller.left.onEvent(ControllerButtonEvent.Pressed, function () {})]``<br/>``[animation.runImageAnimation()]``<br/>``[music.thump.play()]`` |
| 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 other tiles can you add to the cave?
- Could something chase you as you travel through the cave?
- How can you make your truck go faster or slower with the arrow keys?

##### What's Next?

When students are finished with **Save the Forest!** consider graduating them to another map to work on skills further.
When students are finished with **Monster Racer** 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 the Save the Galaxy Map](/skillmap/galaxy)
- [Try our Time Flies Tutorial](/tutorials/froggy)
86 changes: 36 additions & 50 deletions docs/static/gamejam/jams/female-gamechangers/info.json
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,42 @@
"path": "/static/gamejam/jams/female-gamechangers/rules.md"
},
"featured": [
{
"id": "81763-74727-74866-09375",
"title": "Amanda Gorman and \"The Hill We Climb\"",
"author": "Ceggiebear",
"description": "Play as poet Amanda Gorman as she composes her poem for President Biden's inauguration!"
},
{
"id": "38226-95731-47070-73388",
"title": "Megan Rapinoe",
"author": "GoMustangs",
"description": "Play as Megan Rapinoe in this classic shmup game with a twist! Switch your hair color to wrack up a score multiplier for major points!"
},
{
"id": "75876-49918-50592-15147",
"title": "Amelia Earhart: Aviator Extraordinaire",
"author": "Blobbey",
"description": "Recreate famous flights from Amelia Earhart's life in this flight simulator!"
},
{
"id": "98398-96774-94162-09922",
"title": "Blast and Slash",
"author": "Lucas_M/DangerKitty",
"description": "Blast and slash your way through the desert in this addictive female-led roguelike game! Collect money to unlock upgrades in preparation for the climactic boss battle!"
},
{
"id": "76909-17578-71814-49492",
"title": "FOR ALL WOMANKIND",
"author": "Oscar",
"description": "Play as a team of astronauts trying to land their shuttlecraft in this game dedicated to Katherine Johnson!"
},
{
"id": "49970-33654-67029-92638",
"title": "Infiltration",
"author": "M1nt-Phoen1x",
"description": "Stand up to the tyranny of megacorporations and save your family in the metroidvania game!"
},
{
"id": "07354-43385-19795-87252",
"title": "BootlegMan",
Expand Down Expand Up @@ -38,11 +74,6 @@
"title": "Marie Curie's Impact",
"author": "Aeth"
},
{
"id": "81763-74727-74866-09375",
"title": "Amanda Gorman and \"The Hill We Climb\"",
"author": "Ceggiebear"
},
{
"id": "13291-46234-96045-98750",
"title": "Monika's Literature club activity",
Expand All @@ -63,11 +94,6 @@
"title": "Women suffrage moment. ",
"author": "Muhammad Mr. Ahmed"
},
{
"id": "38226-95731-47070-73388",
"title": "Megan Rapinoe",
"author": "GoMustangs"
},
{
"id": "33348-22247-29839-27999",
"title": "damsel vs distress",
Expand All @@ -93,26 +119,6 @@
"title": "Ghost Clone Invaders",
"author": "Monishka S"
},
{
"id": "98537-40423-47522-15861",
"title": "Marie Curie (Game jam submission)",
"author": "Peppercorn Studios"
},
{
"id": "75876-49918-50592-15147",
"title": "Amelia Earhart: Aviator Extraordinaire",
"author": "Blobbey"
},
{
"id": "24653-68670-93715-48748",
"title": "The Adventures of Frances Perkins",
"author": "Brohann"
},
{
"id": "58950-52861-22099-51073",
"title": "Lady Lovelace's Time Machine",
"author": "verisutha"
},
{
"id": "14704-73542-39194-29081",
"title": "Jump Simone Jump",
Expand Down Expand Up @@ -183,35 +189,15 @@
"title": "very fun cave game :):)",
"author": "gideon_loves_cats :):)"
},
{
"id": "98398-96774-94162-09922",
"title": "Blash and Slash",
"author": "Lucas_M/DangerKitty"
},
{
"id": "86994-86785-55167-78927",
"title": "Annie and Mary",
"author": "hanki"
},
{
"id": "14599-75222-61879-27532",
"title": "Hop-O-Matic",
"author": "rymc88"
},
{
"id": "76909-17578-71814-49492",
"title": "FOR ALL WOMANKIND",
"author": "Oscar"
},
{
"id": "39130-17586-84955-97935",
"title": "ZANDOX",
"author": "NOVABOY"
},
{
"id": "49970-33654-67029-92638",
"title": "Infiltration",
"author": "M1nt-Phoen1x"
}
],
"start": "2024-3-1 00:00:01 GMT-0700",
Expand Down
Loading

0 comments on commit a75e13c

Please sign in to comment.