Merge pull request #129 from raspberrypilearning/draft

Updates

en/step_1.md

@@ -2,14 +2,6 @@
 
 Build a scrolling endless runner game where your character has to avoid obstacles.
 
-<p style="border-left: solid; border-width:10px; border-color: #0faeb0; background-color: aliceblue; padding: 10px;"> 
-<span style="color: #0faeb0">**Endless runners**</span> are a type of game where you have to avoid obstacles and the game only ends when you hit an obstacle. You score points by staying alive for as long as you can.</p>
-
-You will:
-+ Use game **conditions** to control what happens
-+ Learn about procedural generation and collision detection
-+ Personalise a game to your interests
-
 ![Images of different project examples.](images/showcase_projects.png)
 
 ![Skiing cat project example](images/example2.png){:width="300px"}

en/step_2.md

@@ -1,22 +1,4 @@
-## Set the theme
-
-<div style="display: flex; flex-wrap: wrap">
-<div style="flex-basis: 200px; flex-grow: 1; margin-right: 15px;">
-Set the theme of your game and create a player character that follows the mouse pointer.
-
-</div>
-<div>
-
-![Image of cartoon turtle viewed from above set against a blue background.](images/theme-turtle.png){:width="300px"}
-
-</div>
-</div>
-
-What is the theme of your game? Here are some ideas:
-- Sports
-- Hobbies
-- Science
-- Nature
+## Set the scene
 
 --- task ---
 
@@ -26,267 +8,105 @@ Open the [starter project](https://editor.raspberrypi.org/en/projects/dont-colli
 
 --- task ---
 
-Create a variable called `safe` to store the background colour based on the theme you want for your game. 
+Create a variable called `safe` to store the background colour.
 
-This is the colour that it is safe for the player to be on and you will use this variable again later.
+In the game, the player is safe if they are touching the background colour. 
 
 --- code ---
 ---
 language: python
-filename: main.py - draw()
 line_numbers: true
-line_number_start: 13
-line_highlights: 14, 15, 16
+line_number_start: 20
+line_highlights: 22-24
 ---
-
-def draw():
+
+def draw():   
+    # Put code to run every frame here
     global safe
-    safe = Color(200, 100, 0)  # Add the colour of your theme
-    background(safe)
-
+    safe = Color(200, 100, 0) 
+    background(safe) 
+  
 --- /code ---
 
-[[[generic-theory-simple-colours]]]
-
 --- /task ---
 
 --- task ---
+**Test:** Run your code and you should see a coloured square. 
 
-**Test:** Run your code to see the background colour. Change it until you are happy with the colour and the size of the screen.
-
+The colour is three numbers - the amount of red, green and blue. Try changing the numbers to any whole number between 0 and 255 to get a different colour.
 --- /task ---
 
-Now choose the character that is playing the game and avoiding the obstacles. Is it an object, person, animal, or something else?
-
-The player will appear at a fixed `y` position and same `x` position as the mouse pointer, which is stored in the `p5` variable `mouse_x`. 
-
 --- task ---
 
-It's a good idea to organise the code for drawing the player character into a function.
-
-Define a `draw_player()` function and create a `player_y` position for the fixed `y` position of the player: 
+Define a `draw_player` function. Inside, add an emoji and a pair of x, y coordinates to represent the player. 
 
 --- code ---
 ---
 language: python
-filename: main.py - draw_player()
 line_numbers: true
-line_number_start: 12
-line_highlights: 12-14
+line_number_start: 7
+line_highlights: 8-9
 ---
-
+# Draw player function goes here
 def draw_player():
-    player_y = int(height * 0.8)  # Positioned towards the screen bottom
-
+    text('🤠', 200, 320)
+  
 --- /code ---
 
-Add code to `draw()` to call `draw_player()` each frame.
+--- /task ---
+
+--- task ---
+
+Call the `draw_player` function so that the player is drawn on the screen.
 
 --- code ---
 ---
 language: python
-filename: main.py - draw()
 line_numbers: true
-line_number_start: 15
-line_highlights: 19
+line_number_start: 21
+line_highlights: 26
 ---
 
-def draw():
+def draw():  
+    # Put code to run every frame here 
     global safe
-    safe = Color(200, 100, 0)  # Your chosen colour
+    safe = Color(200, 100, 0) 
     background(safe)
     draw_player()
 
 --- /code ---
 
 --- /task ---
 
-Next you will add code to the `draw_player()` function to draw your shape. You may also need to add `setup()` code.
-
 --- task ---
+**Test:** Run your code and you should see the emoji appear near the bottom of the screen. 
 
-**Choose:** What does your player look like? Your player could be:
-+ An image provided in the starter project
-+ An emoji 🎈 or text
-+ Drawn using a series of shapes 
+You can paste in a different emoji if you want to.
 
---- collapse ---
----
-title: Use a starter image
----
+--- /task ---
 
 [[[choose-an-emoji]]]
 
---- /code ---
-
-Call the `image()` and set it as global in the `draw_player()` function.
-
---- code ---
----
-language: python
-filename: main.py - draw_player()
-line_numbers: true
-line_number_start: 14
-line_highlights: 16
----
-
-def draw_player():
-    player_y = int(height * 0.8)  # Positioned towards the screen bottom
-    image(player, mouse_x, player_y, 30, 30)
-
---- /code ---
-
---- /collapse ---
-
---- collapse ---
----
-title: Use emoji characters
----
-
-You can use emoji characters in the p5 `text()` function to use an emoji to represent your player. 
-
-Here's an example:
-
---- code ---
----
-language: python
-filename: main.py - setup()
-line_numbers: true
-line_number_start: 9
-line_highlights: 11-13
----
-
-def setup():
-    size(400, 400)
-    text_size(40)  # Controls the size of the emoji
-    text_align(CENTER, TOP)  # Position around the centre
-
---- /code ---
+--- task ---
 
-Call the `text()` and set it as global in the `draw_player()` function.
+To make the player follow the mouse as it moves from side to side, change the player's x position to `mouse_x`.
 
 --- code ---
 ---
 language: python
-filename: main.py - draw_player()
 line_numbers: true
-line_number_start: 14
-line_highlights: 16-17
+line_number_start: 7
+line_highlights: 9
 ---
-
+# Draw player function goes here
 def draw_player():
-    player_y = int(height * 0.8)
-    text('🎈', mouse_x, player_y)
-
---- /code ---
-
---- /collapse ---
-
-[[[processing-python-text]]]
-
-[[[generic-theory-simple-colours]]]
-
-[[[processing-python-ellipse]]]
-
-[[[processing-python-rect]]]
-
-[[[processing-python-triangle]]]
-
-[[[processing-tint]]]
-
-[[[processing-stroke]]]
-
-**Tip:** You can use several simple shapes in the same function to create a more complex player.
-
---- collapse ---
----
-title: Draw a player using multiple shapes
----
-
-![A face shape made from a green circle as a background and two eyes drawn from blue circles, with black circles within and a glint within those using a white circle.](images/face_player.png)
-
---- code ---
----
-language: python
-filename: main.py - draw_player()
----
-
-def draw_player():
-    player_y = int(height * 0.8)
-    noStroke()
-    # Face
-    fill(0, 200, 100)
-    ellipse(mouse_x, player_y, 60, 60)
-
-    # Eyes
-    fill(0, 100, 200)
-    ellipse(mouse_x - 10, player_y - 10, 20, 20)
-    ellipse(mouse_x + 10, player_y - 10, 20, 20)
-    fill(0)
-    ellipse(mouse_x - 10, player_y - 10, 10, 10)
-    ellipse(mouse_x + 10, player_y - 10, 10, 10)
-    fill(255)
-    ellipse(mouse_x - 12, player_y - 12, 5, 5)
-    ellipse(mouse_x + 12, player_y - 12, 5, 5)
-
+    text('🤠', mouse_x, 320)
+
 --- /code ---
-
---- /collapse ---
-
---- /task ---
-
---- task ---
-
-**Test:** Run your code and move the mouse to control the player.
-
-Does it move like you expect?
-
 --- /task ---
 
-**Debug:** You might find some bugs in your project that you need to fix. Here are some common bugs.
-
 --- task ---
+Run your code and check that the player moves left and right when you move the mouse. 
 
---- collapse ---
----
-title: I can't see the player
----
-
-Try switching to full screen. Also, check the `x` and `y` coordinates that you used to draw the player — make sure they are inside the canvas you created with `size()`.
-
---- /collapse ---
-
---- collapse ---
----
-title: An image isn't loading
----
-
-First, check that the image is in the `Image gallery`. Then, check the filename really carefully — remember capital letters are different to lower case letters and punctuation is important.
-
---- /collapse ---
-
---- collapse ---
----
-title: An image is the wrong size
----
-
-Check the inputs that control the width and height of the image:
-
-```python
-image(image_file, x_coord, y_coord, width, height)
-```
-
---- /collapse ---
-
---- collapse ---
----
-title: An emoji is the wrong size
----
-
-If your emoji is too big or too small, change the value in `text_size()`.
-
---- /collapse ---
-
---- /task ---
 
---- save ---
+--- /task ---