Skip to content

Commit

Permalink
Merge pull request #21161 from code-dot-org/staging
Browse files Browse the repository at this point in the history
DTT (Staging > Test) [robo-dtt]
  • Loading branch information
deploy-code-org committed Mar 9, 2018
2 parents a102639 + aff6fe1 commit 5fdd3ce
Show file tree
Hide file tree
Showing 79 changed files with 845 additions and 81 deletions.
2 changes: 1 addition & 1 deletion dashboard/config/scripts/csd3-1819draft.script
Original file line number Diff line number Diff line change
Expand Up @@ -187,7 +187,7 @@ level 'CSD U3 abstraction rotation control', progression: 'Velocity'
level 'CSD U3 abstraction velocityY control', progression: 'Velocity'
level 'CSD U3 abstraction velocityX if-statements', progression: 'Velocity'
level 'CSD U3 abstraction velocityX control', progression: 'Velocity'
level 'CSD U3 abstraction jump', progression: 'Side Scroller'
level 'CSD U3 abstraction jump-2018', progression: 'Side Scroller'
level 'CSD U3 abstraction tumbleweed', progression: 'Side Scroller'
level 'CSD U3 abstraction looping', progression: 'Side Scroller'
named_level 'CSD U3 L15 Freeplay'
Expand Down
8 changes: 4 additions & 4 deletions dashboard/config/scripts/csd_u3_game_intro.external
Original file line number Diff line number Diff line change
Expand Up @@ -10,13 +10,13 @@ Now that you have all the skills you need, it's time to make your own game!

With a partner, brainstorm some different ideas for your game. You can think about the games you've already seen, or look at some more sample games to give you ideas.

[<img src="https://images.code.org/fc2d4cdba80a476b1ff476081991031e-image-1498594631779.png" style="width: 200px; float: left; margin: 10px;">](https://studio.code.org/projects/gamelab/-e63S2hP9AnPvsQyCfYQrg)
[<img src="https://images.code.org/fc2d4cdba80a476b1ff476081991031e-image-1498594631779.png" style="width: 200px; float: left; margin: 10px;">](https://studio.code.org/projects/gamelab/AwDcX5nehOApfzyywI6BOLT1xbf0MIV1dUj8KjQaNtA)

[<img src="https://images.code.org/b89895bdd43be4b729ca9165fc2923cf-image-1498595512898.28.24 PM.png" style="width: 200px; float: left; margin: 10px;">](https://studio.code.org/projects/gamelab/aZhgijA6KwMcN4s_cEdr7qVNQ5vvLp38o54cPL_QOCc)
[<img src="https://images.code.org/b89895bdd43be4b729ca9165fc2923cf-image-1498595512898.28.24 PM.png" style="width: 200px; float: left; margin: 10px;">](https://studio.code.org/projects/gamelab/r9OYVTSj2od8vaCA-nKikTVpx-2Co8qHhuZiBIu30JA)

[<img src="https://images.code.org/d430061caab264330da0227b53e2db90-image-1498595505047.27.59 PM.png" style="width: 200px; margin: 10px;">](https://studio.code.org/projects/gamelab/VtVgPggDmdm1GHM6bMq0OTXafufBF1WYQMkSEYJplhc)
[<img src="https://images.code.org/d430061caab264330da0227b53e2db90-image-1498595505047.27.59 PM.png" style="width: 200px; margin: 10px;">](https://studio.code.org/projects/gamelab/hAz7RSdqc0c_MSQVUpvz1XrLDr8QLsansWDVI0ZberQ)

[<img src="https://images.code.org/c9fb241c5684e10d9ba2b85d4d4a906b-image-1498764384615.25.58 PM.png" style="width: 200px; margin: 10px;">](https://studio.code.org/projects/gamelab/pbIagL-fn3ATM5nzQ_eJfPmfdEjtpMpGHt0wiclY_PE)
[<img src="https://images.code.org/c9fb241c5684e10d9ba2b85d4d4a906b-image-1498764384615.25.58 PM.png" style="width: 200px; margin: 10px;">](https://studio.code.org/projects/gamelab/DmRPNYR3n7bMO--_KkP7r6mOoGynBVyi3BMVPWDiVeI)

Once you have settled on a type of game with your partner, fill out the Project Guide with the backgrounds, variables, sprites, and functions that you will need to make the game. You'll spend the next few levels creating your game.
MARKDOWN
Original file line number Diff line number Diff line change
Expand Up @@ -97,12 +97,12 @@
"hide_share_and_remix": "false",
"disable_if_else_editing": "false",
"expand_debugger": "false",
"contained_level_names": null,
"display_name": "Visibility Challenge",
"disable_procedure_autopopulate": "false",
"top_level_procedure_autopopulate": "false",
"start_blocks": "var balloon = createSprite(200, 200);\r\nballoon.setAnimation(\"balloon\");\r\nballoon.scale = 0.1;\r\n\r\nfunction draw() {\r\n // Draw Background\r\n background(\"white\");\r\n \r\n // Update Values\r\n balloon.scale = balloon.scale + 0.001;\r\n\r\n // Draw Animations\r\n drawSprites();\r\n}",
"start_animations": "{\r\n \"orderedKeys\": [\r\n \"balloon\",\r\n \"pop\"\r\n ],\r\n \"propsByKey\": {\r\n \"balloon\": {\r\n \"name\": \"balloon\",\r\n \"sourceUrl\": \"https://curriculum.code.org/images/sprites/balloon.png\",\r\n \"sourceSize\": {\r\n \"x\": 444,\r\n \"y\": 598\r\n },\r\n \"frameSize\": {\r\n \"x\": 444,\r\n \"y\": 598\r\n },\r\n \"frameCount\": 1,\r\n \"frameDelay\": 2,\r\n \"looping\": true\r\n },\r\n \"pop\": {\r\n \"name\": \"pop\",\r\n \"sourceUrl\": \"https://curriculum.code.org/images/sprites/pop.png\",\r\n \"sourceSize\": {\r\n \"x\": 600,\r\n \"y\": 465\r\n },\r\n \"frameSize\": {\r\n \"x\": 600,\r\n \"y\": 465\r\n },\r\n \"frameCount\": 1,\r\n \"frameDelay\": 2,\r\n \"looping\": true\r\n }\r\n }\r\n}"
"start_animations": "{\r\n \"orderedKeys\": [\r\n \"balloon\",\r\n \"pop\"\r\n ],\r\n \"propsByKey\": {\r\n \"balloon\": {\r\n \"name\": \"balloon\",\r\n \"sourceUrl\": \"https://curriculum.code.org/images/sprites/balloon.png\",\r\n \"sourceSize\": {\r\n \"x\": 444,\r\n \"y\": 598\r\n },\r\n \"frameSize\": {\r\n \"x\": 444,\r\n \"y\": 598\r\n },\r\n \"frameCount\": 1,\r\n \"frameDelay\": 2,\r\n \"looping\": true\r\n },\r\n \"pop\": {\r\n \"name\": \"pop\",\r\n \"sourceUrl\": \"https://curriculum.code.org/images/sprites/pop.png\",\r\n \"sourceSize\": {\r\n \"x\": 600,\r\n \"y\": 465\r\n },\r\n \"frameSize\": {\r\n \"x\": 600,\r\n \"y\": 465\r\n },\r\n \"frameCount\": 1,\r\n \"frameDelay\": 2,\r\n \"looping\": true\r\n }\r\n }\r\n}",
"contained_level_names": null
},
"published": true,
"notes": "",
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -93,8 +93,8 @@
"watchers_prepopulated": "[\"apple.scale\"]",
"encrypted_examples": "2eMP4R7hopbR2Q4+VjpQr+1omA2X37TWHmW0fCJYVAb6+Krl6cgghAOZqiIF\na+OqMKccfNAweFCH7QB05xWIoGS0suG69m4rpxxo47IXuoQUky/H45Jd2iQk\neZDG9pSe+JRiQ7ZM+N2gCwejxaJkeA==\n",
"disable_procedure_autopopulate": "false",
"contained_level_names": null,
"top_level_procedure_autopopulate": "false"
"top_level_procedure_autopopulate": "false",
"contained_level_names": null
},
"published": true,
"notes": "",
Expand Down
97 changes: 97 additions & 0 deletions dashboard/config/scripts/levels/CSD U3 abstraction jump-2018.level
Original file line number Diff line number Diff line change
@@ -0,0 +1,97 @@
<Gamelab>
<config><![CDATA[{
"game_id": 50,
"created_at": "2018-03-09T17:48:50.000Z",
"level_num": "custom",
"user_id": 324,
"properties": {
"skin": "gamelab",
"embed": "false",
"is_k1": "false",
"skip_instructions_popup": "false",
"never_autoplay_video": "false",
"disable_param_editing": "true",
"disable_variable_editing": "false",
"use_modal_function_editor": "false",
"use_contract_editor": "false",
"contract_highlight": "false",
"contract_collapse": "false",
"examples_highlight": "false",
"examples_collapse": "false",
"examples_required": "false",
"definition_highlight": "false",
"definition_collapse": "false",
"disable_examples": "false",
"code_functions": {
"draw": null,
"drawSprites": null,
"comment_GameLab": null,
"background": null,
"fill": null,
"noFill": null,
"stroke": null,
"strokeWeight": null,
"noStroke": null,
"color": null,
"arc": null,
"ellipse": null,
"line": null,
"rect": null,
"comment_Drawing": null,
"var sprite = createSprite": null,
"setAnimation": null,
"rotationSpeed": null,
"velocityX": null,
"velocityY": null,
"x": null,
"y": null,
"comment_Sprites": null,
"ifBlock": null,
"ifElseBlock": null,
"addOperator": null,
"subtractOperator": null,
"multiplyOperator": null,
"divideOperator": null,
"equalityOperator": null,
"inequalityOperator": null,
"greaterThanOperator": null,
"greaterThanOrEqualOperator": null,
"lessThanOperator": null,
"lessThanOrEqualOperator": null,
"comment_Math": null,
"keyWentDown": null,
"keyDown": null
},
"droplet_tooltips_disabled": "false",
"lock_zero_param_functions": "false",
"free_play": "false",
"text_mode_at_start": "false",
"submittable": "false",
"hide_view_data_button": "false",
"debugger_disabled": "true",
"hide_animation_mode": "false",
"show_d_pad": "false",
"pause_animations_by_default": "false",
"callout_json": "[\r\n {\r\n \"localization_key\": \"CSD_U3_L11_S17_C1\",\r\n \"callout_text\": \"Look at this if statement\",\r\n \"element_id\": \"\",\r\n \"on\": \"code_triggered1\",\r\n \"qtip_config\": {\r\n \"codeStudio\": {\r\n \"canReappear\": true,\r\n \"dropletPaletteCategory\": \"\",\r\n \"codeString\": \" if (frog.y > 324) {\"\r\n },\r\n \"style\": {\r\n \"classes\": \"\"\r\n },\r\n \"position\": {\r\n \"my\": \"top center\",\r\n \"at\": \"bottom left\",\r\n \"adjust\": {\r\n \"x\": 160,\r\n \"y\": 10\r\n }\r\n }\r\n }\r\n },\r\n {\r\n \"localization_key\": \"CSD_U3_L11_S17_C2\",\r\n \"callout_text\": \"Send the frog back down here\",\r\n \"element_id\": \"\",\r\n \"on\": \"code_triggered2\",\r\n \"qtip_config\": {\r\n \"codeStudio\": {\r\n \"canReappear\": true,\r\n \"dropletPaletteCategory\": \"\",\r\n \"codeString\": \"// send it back down\"\r\n },\r\n \"style\": {\r\n \"classes\": \"\"\r\n },\r\n \"position\": {\r\n \"my\": \"top left\",\r\n \"at\": \"bottom left\",\r\n \"adjust\": {\r\n \"x\": 160,\r\n \"y\": 60\r\n }\r\n }\r\n }\r\n }\r\n ]",
"markdown_instructions": "# Jumping\r\n\r\nYou now have all the blocks you need to make your sprite jump! The sprite should jump up if it's on the ground and the user presses the \"up\" key, then should start moving back down when it reaches the top of its jump.\r\n\r\n# Do this\r\n\r\n* Find the `if` statement that checks whether the sprite is on the ground, and look at the `if` statement inside of it that checks whether the user has pressed the \"up\" arrow key. ( [Show me where](#triggercallout=code_triggered1) )\r\n\t* Make the frog jump up when the user presses the arrow key.\r\n\t* Make the frog stop moving otherwise.\r\n* Add code that does the following ( [Show me where](#triggercallout=code_triggered2) )\r\n * Checks whether the frog sprite has reached its highest point.\r\n * If so, make the sprite go back down.",
"project_template_level_name": "CSD U3 abstraction sidescroll template",
"start_in_animation_tab": "false",
"all_animations_single_frame": "true",
"instructions_important": "false",
"show_debug_watch": "true",
"encrypted_examples": "448fFh8qX1wumgv106ftexvk0qaMa0XqpaCee07WWsGl/6JB2AijjaWUdo9y\nUSPH\n",
"hide_share_and_remix": "false",
"disable_if_else_editing": "false",
"expand_debugger": "false",
"disable_procedure_autopopulate": "false",
"top_level_procedure_autopopulate": "false",
"contained_level_names": null
},
"published": true,
"notes": "",
"audit_log": "[{\"changed_at\":\"2017-06-05 23:42:21 +0000\",\"changed\":[\"code_functions\",\"markdown_instructions\",\"encrypted_examples\",\"contained_level_names\"],\"changed_by_id\":324,\"changed_by_email\":\"elizabeth@code.org\"},{\"changed_at\":\"2018-03-02 15:26:18 +0000\",\"changed\":[\"code_functions\",\"markdown_instructions\",\"encrypted_examples\",\"contained_level_names\"],\"changed_by_id\":106,\"changed_by_email\":\"gtwrobel@gmail.com\"},{\"changed_at\":\"2018-03-02 15:26:47 +0000\",\"changed\":[\"code_functions\",\"markdown_instructions\",\"encrypted_examples\",\"contained_level_names\"],\"changed_by_id\":106,\"changed_by_email\":\"gtwrobel@gmail.com\"},{\"changed_at\":\"2018-03-02 15:27:43 +0000\",\"changed\":[\"code_functions\",\"encrypted_examples\",\"contained_level_names\"],\"changed_by_id\":106,\"changed_by_email\":\"gtwrobel@gmail.com\"},{\"changed_at\":\"2018-03-09 17:55:40 +0000\",\"changed\":[\"code_functions\",\"markdown_instructions\",\"encrypted_examples\",\"contained_level_names\"],\"changed_by_id\":324,\"changed_by_email\":\"elizabeth@code.org\"}]",
"level_concept_difficulty": {
}
}]]></config>
<blocks/>
</Gamelab>

0 comments on commit 5fdd3ce

Please sign in to comment.