microsoft · kiki-lee · Oct 17, 2023 · Oct 17, 2023
diff --git a/docs/courses/educator-trainings.md b/docs/courses/educator-trainings.md
@@ -0,0 +1,54 @@
+# Training Opportunities for MakeCode Educators
+
+A collection of courses meant to help educators learn to use Microsoft MakeCode
+
+
+
+Minecraft - https://learn.microsoft.com/en-us/training/paths/minecraft-teacher-academy/
+Arcade - https://learn.microsoft.com/en-us/training/modules/utilize-makecode-arcade-your-classroom/
+Micro:bit - https://microbit.org/teach/professional-development/
+
+
+## Course Sections
+
+```codecard
+[
+    {
+        "name": "CS Intro 1",
+        "description": "A semester length computer science course for beginning coders",
+        "url":"/courses/csintro1",
+        "imageUrl": "/static/courses/csintro1.gif"
+    }, {
+        "name": "CS Intro 2",
+        "description": "A continuation of the Intro to CS course",
+        "url":"/courses/csintro2",
+        "imageUrl": "/static/courses/csintro2.gif"
+    }, {
+        "name": "CS Intro 3",
+        "description": "A quarter length transition from blocks to JavaScript",
+        "url": "/courses/csintro3",
+        "imageUrl": "/static/courses/csintro3.gif"
+    }
+]
+```
+
+## About the CS Intro Series
+
+The CS Intro Series is designed to teach new developers how to code from the ground up.
+
+In CS Intro 1, students are introduced to programming through the MakeCode Blocks editor. They can create their own games, while learning concepts that are crucial to software development: creating variables, responding to events, and using iteration to simplify and extend their programs. Throughout the course, they will learn to develop their own games through small daily tasks, as well as projects that guide them through the process of turning basic ideas into full-fledged games.
+
+In CS Intro 2, students will continue to develop the software development skills they were introduced to in the first course, with more advanced programming concepts such as functions, logical comparisons, and arrays. These new skills will allow students to create more advanced and compelling games.
+
+### ~hint
+
+In the future CS Intro 3 and CS Intro 4 courses, students will transition the skills they have learned in a Block based environment into skills in a text based coding environment, allowing them to dig deeper into the games they make, as well as transition their skills in the @boardname@ into other environments.
+
+### ~
+
+## See also
+
+[Courses Home Page](/courses),
+[CS Intro 1](/courses/csintro1),
+[CS Intro 2](/courses/csintro2),
+[CS Intro 3](/courses/csintro3)
diff --git a/docs/skillmap/educator-info/class-map-info.md b/docs/skillmap/educator-info/class-map-info.md
@@ -0,0 +1,58 @@
+# About 80's Rockstar Maze!
+
+**A page for Educators & Parents**
+
+The **80's Rockstar Maze!** map uses basic code blocks in MakeCode Arcade to implement simple game concepts.
+
+In this short set of activities, students set a rockstar sprite in a backstage maze where it must collect instruments and avoid fans after a show. 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 & 14, this experience contains a total of 3 tutorials (approximating 22 minutes of instruction).  At the end of the learning path, students receive a certificate of completion.
+
+|                 | Minutes* | Game Type | Key Concepts |
+| --------------- | -------- | --------- | ------------ |
+| Trapped Backstage | 7 | Intro | movement, creation |
+| Gather Your Gear | 8 | Maze | events, game score |
+| Enemies Attack! | 7 | Maze | events, game score, timer |
+
+\* 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 80's Rockstar Maze, students will have gained exposure to computer science and game design elements using MakeCode Arcade.
+
+Specifically, they will experience the following topics:
+
+- Events
+- Movement
+- Collisions
+- Game Score
+- Timer
+
+### Projects
+
+As students progress through these projects, they will progressively build a game where the rockstar navigate backstage, gains points when collecting instruments, and loses points when running into an avid fan.
+
+```package
+pxt-tilemaps=github:microsoft/pxt-tilemaps/
+```
+
+#### 1. Trapped Backstage
+| Activity | Trapped Backstage (7 min) |
+|---|---|
+| ![Trapped Backstage thumbnail](/static/skillmap/rockstar/rockstar1.gif) | Create a rockstar backstage after the show and keep an eye on them as they navigate the set. |
+| 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 | [Trapped Backstage Project](https://makecode.com/_FM1DbPhEia87) |
+
+#### 2. Gather Your Gear
+| Activity | Gather Your Gear (8 min) |
+|---|---|
+| ![Gather Your Gear thumbnail](/static/skillmap/rockstar/rockstar2.gif) | Give your rockstar the ability to collect points while grabbing instruments and a way to finish the game. |
+| Blocks used | ``[scene.onOverlapTile()]``<br/>``[tiles.setTileAt(location, assets.tile`transparency16`)]``<br/>``[info.changeScoreBy(1)]``<br/>``[game.over(true)]`` |
+| Solution option | [Gather Your Gear Project](https://makecode.com/_aE3eYm23wad3) |
+
+#### 3. Avoid the Fans!
+| Activity | Avoid the Fans! (7 min) |
+|---|---|
+| ![Avoid the Fans! thumbnail](/static/skillmap/rockstar/rockstar3.gif) | Add functionality for some crazed fans who will steal points as souvenirs unless the rockstar can avoid them. |
+| Blocks used | ``[scene.onOverlapTile()]``<br/>``[tiles.setTileAt(location, assets.tile`transparency16`)]``<br/>``[info.changeScoreBy(-1)]``<br/>``[info.startCountdown(0)]`` |
+| Solution option | [Avoid the Fans! Project](https://makecode.com/_dW115JWAR2d0) |
diff --git a/docs/static/skillmap/backgrounds/class-comp.png b/docs/static/skillmap/backgrounds/class-comp.png
diff --git a/docs/static/skillmap/class/class1.gif b/docs/static/skillmap/class/class1.gif
diff --git a/docs/static/skillmap/class/class2.gif b/docs/static/skillmap/class/class2.gif
diff --git a/docs/static/skillmap/class/class3.gif b/docs/static/skillmap/class/class3.gif
diff --git a/docs/static/skillmap/class/class4.gif b/docs/static/skillmap/class/class4.gif
diff --git a/docs/static/skillmap/class/student-right.png b/docs/static/skillmap/class/student-right.png
diff --git a/docs/test/skillmap/class.md b/docs/test/skillmap/class.md
@@ -23,7 +23,7 @@
 * tags: easy, sprites, tiles
 * imageUrl: /static/skillmap/class/class1.gif
 * next: class2
-* position: 1 -1
+* position: 0 -1
 
 ### class2
 * name: All the Assignments
@@ -33,7 +33,7 @@
 * tags: easy, tiles, events
 * imageUrl: /static/skillmap/class/class2.gif
 * next: class3
-* position: 2 -1
+* position: 1 -2
 
 ### class3
 * name: Avoid the Teacher!
@@ -43,15 +43,16 @@
 * tags: easy, enemies, overlap, lives
 * imageUrl: /static/skillmap/class/class3.gif
 * next: class-finish
-* position: 3 0
+* position: 3 -2
+* edges: 4 -2
 
 
 ### class-finish
 * kind: completion
 * type: certificate
 * url: /static/skillmap/certificates/class-cert.pdf
 * imageUrl: /static/skillmap/certificates/class-cert.png
-* position: 4 0
+* position: 4 -1
 * actions:
     * map: [Try Space Explorer](/skillmap/space)
     * editor: [Mod this project](/)

diff --git a/docs/test/skillmap/class/class3.md b/docs/test/skillmap/class/class3.md
@@ -255,7 +255,7 @@ info.onScore(0, function () {
 
 ## {Step 9}
 
-**🕹️ Try your finished game!**
+**🕹️ Try your game!**
 
 ---
 
@@ -272,12 +272,12 @@ Can you escape with a time less than 400?
 
 ## Finale
 
-💯 **You did great!** 💯
+📝 **Great game!** 📝
 
 ---
 
-When you're finished playing your game, click **Done** to head back to the skillmap where you
-can share your game or keep customizing it!
+When you're finished playing your game, click **Done** to head back to the skillmap where you can move
+on to try animating your character.
 
 ~hint How do I share my game?💡