levelbuilder content changes (-robo-commit)

code-dot-org · Jan 4, 2018 · 3d9ea20 · 3d9ea20
1 parent 02936d1
commit 3d9ea20
Show file tree

Hide file tree

Showing 8 changed files with 80 additions and 25 deletions.
diff --git a/dashboard/config/scripts/csp_algorithms_map.external b/dashboard/config/scripts/csp_algorithms_map.external
@@ -9,37 +9,41 @@ markdown <<MARKDOWN
 
 An algorithm is a precise sequence of instructions for a process that completes a task. Algorithms can be executed by a computer and are implemented using programming languages.
 
-**Completing Tasks in Daily Life**
+<div style="clear: both"> </div>
 
-<div style="float:right;width:300px">
+<div style="float:right;width:200px">
 <img src="https://images.code.org/3f6dc46078eb19ba8885fb6d02fe0203-image-1515092634132.jpg">
 
 By asobuno (Own work) [<a href="https://creativecommons.org/licenses/by-sa/3.0">CC BY-SA 3.0</a>], <a href="https://commons.wikimedia.org/wiki/File%3ATying_one&#039;s_shoe.jpg">via Wikimedia Commons</a>
 </div>
 
+## Automating Physical Tasks
+
+**Physical Tasks in Daily Life**
+
 One way to look at your typical day is as a series of tasks you need to complete. For example you'll need to get dressed, pack your things, travel from one place to another, complete work, keep up with friends and family, prepare and eat meals, clean and organize your things, and relax and have fun.
 
-The types of tasks that make up our days haven't actually changed all that much through history. 100, 1,000, or 10,000 years ago people still more or less completed these same tasks. Over history what we see is significant shifts in how we complete these tasks, and one of the most significant shifts in this regard is through automation.
+<div style="clear: both"> </div>
 
-**Automating Tasks**
+<img src="https://images.code.org/a2835a98c80954695d1db19f0d66cf6b-image-1515092970066.jpg" style="float:right;width:200px">
 
-<img src="![](https://images.code.org/a2835a98c80954695d1db19f0d66cf6b-image-1515092970066.jpg)" style="float:right;width:100px">
+**Automating Tasks**
 
-Many of the tasks we've completed across history are, frankly, unenjoyable. They might be physically demanding, boring, dangerous, or require intense focus or memory. To solve these problems we've designed many types of tools. Shovels have helped us dig holes, trucks help us move heavy loads, and writing tools make it much easier to keep track of important information.
+Over history one of the most significant shifts in how we complete tasks is through automation. Historically humans have invented tools to solve problems. Shovels have helped us dig holes, trucks help us move heavy loads, and writing tools make it much easier to keep track of important information.
 
-Automation brought even more significant changes. Instead of just making tools to help us complete tasks, we created tools that essentially did the entire task for us. Machines to weave cloth, harvest food, and assemble tools could complete these tasks with almost no human input at all!
+With automation instead of just making tools to help us complete tasks, we created tools that essentially did the entire task for us. We invented machines to weave cloth, harvest food, and assemble tools that could complete these tasks with almost no human input at all!
 
-**Automation Requires Algorithms**
+<div style="clear: both"> </div>
 
-<div style="float:right;width:300px">
+<div style="float:right;width:200px">
 <img src="https://images.code.org/28011d19f50522a3b3b5c563e9a79c37-image-1515091698632.JPG">
 
 By Clem Rutter, Rochester, Kent. (self) [<a href="http://www.gnu.org/copyleft/fdl.html">GFDL</a> or <a href="http://creativecommons.org/licenses/by/3.0">CC BY 3.0</a>], <a href="https://commons.wikimedia.org/wiki/File%3AQSMM_John_Pilling_%26_Son_Loom_2707.JPG">via Wikimedia Commons</a>
 </div>
 
-Machines are best at completing well-structured tasks. If you want to design a machine to plant and harvest crops, for example, it's usually much easier to assume the plants will all be planted in neat rows and a set distance apart. If you want a machine to weave a piece of cloth it should probably have the same number of stitches in each row.
+**Automation Requires Algorithms**
 
-Not only should the task itself be well-structured, but the process to complete it needs to be well-structured as well. Every stitch, every plant, or every part of a tool needs to be done in the same way each time. These precise steps that automate a task are algorithms!
+Automation typically results in tasks that are completed more quickly, easily, and reliably. In order to build a machine to automate a task, however, you need to be able to describe precisely how the task should be completed. For example, you need to know all the steps to make each stitch in a piece of cloth, or exactly how close to one another and at what depth each seed should be planted. These precise steps that automate a task are algorithms!
 
 <div style="clear: both"> </div>
 
@@ -55,7 +59,7 @@ Not only should the task itself be well-structured, but the process to complete
 
 Many of the daily tasks we do are thinking tasks like keeping track of money, remembering birthdays, or scheduling tasks for the day. Just like physical tasks, thinking tasks can be monotonous or challenging, and so we've made tools to help us complete them. Calendars, clocks, financial records, and books help us keep track of and make sense of information.
 
-Just like physical tasks, however, we don't just want tools to help us complete thinking tasks, we want tools that can essentially do the entire task for us. This desire led to the creation of the computer! Computers store and process information to complete all kinds of information tasks automatically.
+Just like physical tasks, humans want tools to automate our thinking tasks. It was this desire that led to the creation of the computer. Computers store and process information to complete all kinds of information tasks automatically.
 
 **Programming - Communicating algorithms to a computer**
 

diff --git a/dashboard/config/scripts/levels/Course E: Artist Project Template.level b/dashboard/config/scripts/levels/Course E: Artist Project Template.level
@@ -32,11 +32,13 @@
     "discard_background": "false",
     "hide_share_and_remix": "false",
     "disable_if_else_editing": "false",
+    "disable_procedure_autopopulate": "false",
+    "top_level_procedure_autopopulate": "false",
     "contained_level_names": null
   },
   "published": true,
   "notes": "",
-  "audit_log": "[{\"changed_at\":\"2017-06-13 21:49:43 +0000\",\"changed\":[\"start_blocks\",\"toolbox_blocks\",\"contained_level_names\"],\"changed_by_id\":684,\"changed_by_email\":\"audrey.clark@code.org\"},{\"changed_at\":\"2017-06-13 21:51:20 +0000\",\"changed\":[\"start_blocks\",\"toolbox_blocks\",\"contained_level_names\"],\"changed_by_id\":684,\"changed_by_email\":\"audrey.clark@code.org\"},{\"changed_at\":\"2017-06-19 20:37:48 +0000\",\"changed\":[\"start_blocks\",\"toolbox_blocks\",\"contained_level_names\"],\"changed_by_id\":684,\"changed_by_email\":\"audrey.clark@code.org\"},{\"changed_at\":\"2017-06-19 20:39:10 +0000\",\"changed\":[\"start_blocks\",\"toolbox_blocks\",\"contained_level_names\"],\"changed_by_id\":684,\"changed_by_email\":\"audrey.clark@code.org\"},{\"changed_at\":\"2017-06-19 20:40:44 +0000\",\"changed\":[\"start_blocks\",\"toolbox_blocks\",\"contained_level_names\"],\"changed_by_id\":684,\"changed_by_email\":\"audrey.clark@code.org\"},{\"changed_at\":\"2017-06-19 20:48:38 +0000\",\"changed\":[\"start_blocks\",\"toolbox_blocks\",\"contained_level_names\"],\"changed_by_id\":684,\"changed_by_email\":\"audrey.clark@code.org\"},{\"changed_at\":\"2017-11-22 02:13:52 +0000\",\"changed\":[\"toolbox_blocks\"],\"changed_by_id\":63,\"changed_by_email\":\"kiki@code.org\"}]",
+  "audit_log": "[{\"changed_at\":\"2017-06-13 21:49:43 +0000\",\"changed\":[\"start_blocks\",\"toolbox_blocks\",\"contained_level_names\"],\"changed_by_id\":684,\"changed_by_email\":\"audrey.clark@code.org\"},{\"changed_at\":\"2017-06-13 21:51:20 +0000\",\"changed\":[\"start_blocks\",\"toolbox_blocks\",\"contained_level_names\"],\"changed_by_id\":684,\"changed_by_email\":\"audrey.clark@code.org\"},{\"changed_at\":\"2017-06-19 20:37:48 +0000\",\"changed\":[\"start_blocks\",\"toolbox_blocks\",\"contained_level_names\"],\"changed_by_id\":684,\"changed_by_email\":\"audrey.clark@code.org\"},{\"changed_at\":\"2017-06-19 20:39:10 +0000\",\"changed\":[\"start_blocks\",\"toolbox_blocks\",\"contained_level_names\"],\"changed_by_id\":684,\"changed_by_email\":\"audrey.clark@code.org\"},{\"changed_at\":\"2017-06-19 20:40:44 +0000\",\"changed\":[\"start_blocks\",\"toolbox_blocks\",\"contained_level_names\"],\"changed_by_id\":684,\"changed_by_email\":\"audrey.clark@code.org\"},{\"changed_at\":\"2017-06-19 20:48:38 +0000\",\"changed\":[\"start_blocks\",\"toolbox_blocks\",\"contained_level_names\"],\"changed_by_id\":684,\"changed_by_email\":\"audrey.clark@code.org\"},{\"changed_at\":\"2017-11-22 02:13:52 +0000\",\"changed\":[\"toolbox_blocks\"],\"changed_by_id\":63,\"changed_by_email\":\"kiki@code.org\"},{\"changed_at\":\"2018-01-04 20:25:17 +0000\",\"changed\":[\"start_blocks\",\"toolbox_blocks\",\"contained_level_names\"],\"changed_by_id\":63,\"changed_by_email\":\"kiki@code.org\"},{\"changed_at\":\"2018-01-04 20:25:45 +0000\",\"changed\":[\"toolbox_blocks\"],\"changed_by_id\":63,\"changed_by_email\":\"kiki@code.org\"}]",
   "level_concept_difficulty": {
   }
 }]]></config>
@@ -179,6 +181,22 @@
               </block>
             </value>
           </block>
+          <block type="controls_if" inline="false">
+            <mutation else="1"/>
+            <value name="IF0">
+              <block type="logic_compare" inline="true">
+                <title name="OP">EQ</title>
+              </block>
+            </value>
+          </block>
+          <block type="controls_if" inline="false">
+            <mutation elseif="1" else="1"/>
+            <value name="IF0">
+              <block type="logic_compare" inline="true">
+                <title name="OP">EQ</title>
+              </block>
+            </value>
+          </block>
         </category>
         <category name="Functions" custom="PROCEDURE"/>
         <category name="Variables" custom="VARIABLE">

diff --git a/dashboard/config/scripts/levels/Course E: Artist Project.level b/dashboard/config/scripts/levels/Course E: Artist Project.level
@@ -32,12 +32,14 @@
     "impressive": "false",
     "discard_background": "false",
     "hide_share_and_remix": "false",
-    "disable_if_else_editing": "false",
-    "contained_level_names": null
+    "disable_if_else_editing": "true",
+    "contained_level_names": null,
+    "disable_procedure_autopopulate": "false",
+    "top_level_procedure_autopopulate": "false"
   },
   "published": true,
   "notes": "",
-  "audit_log": "[{\"changed_at\":\"2017-06-22 14:52:53 +0000\",\"changed\":[\"disable_param_editing\",\"contained_level_names\"],\"changed_by_id\":42,\"changed_by_email\":\"sarah.filman@code.org\"}]",
+  "audit_log": "[{\"changed_at\":\"2017-06-22 14:52:53 +0000\",\"changed\":[\"disable_param_editing\",\"contained_level_names\"],\"changed_by_id\":42,\"changed_by_email\":\"sarah.filman@code.org\"},{\"changed_at\":\"2018-01-04 20:26:00 +0000\",\"changed\":[\"disable_if_else_editing\",\"contained_level_names\"],\"changed_by_id\":63,\"changed_by_email\":\"kiki@code.org\"}]",
   "level_concept_difficulty": {
   }
 }]]></config>

diff --git a/dashboard/config/scripts/levels/Course E: Play Lab Project.level b/dashboard/config/scripts/levels/Course E: Play Lab Project.level
@@ -37,15 +37,15 @@
     "wall_map_collisions": "false",
     "block_moving_into_walls": "false",
     "hide_share_and_remix": "false",
-    "disable_if_else_editing": "false",
+    "disable_if_else_editing": "true",
     "disable_procedure_autopopulate": "true",
     "top_level_procedure_autopopulate": "false",
     "remove_items_when_actor_collides": "false",
     "contained_level_names": null
   },
   "published": true,
   "notes": "",
-  "audit_log": "[{\"changed_at\":\"2017-06-14 17:51:26 +0000\",\"changed\":[\"contained_level_names\"],\"changed_by_id\":684,\"changed_by_email\":\"audrey.clark@code.org\"},{\"changed_at\":\"2017-06-22 18:24:09 +0000\",\"changed\":[\"toolbox_blocks\",\"contained_level_names\"],\"changed_by_id\":63,\"changed_by_email\":\"kiki@code.org\"},{\"changed_at\":\"2017-06-22 18:25:57 +0000\",\"changed\":[\"contained_level_names\"],\"changed_by_id\":63,\"changed_by_email\":\"kiki@code.org\"},{\"changed_at\":\"2017-06-22 18:26:30 +0000\",\"changed\":[\"contained_level_names\",\"toolbox_blocks\"],\"changed_by_id\":63,\"changed_by_email\":\"kiki@code.org\"},{\"changed_at\":\"2017-06-22 18:27:47 +0000\",\"changed\":[],\"changed_by_id\":63,\"changed_by_email\":\"kiki@code.org\"},{\"changed_at\":\"2017-06-22 18:30:54 +0000\",\"changed\":[\"project_template_level_name\",\"toolbox_blocks\",\"contained_level_names\"],\"changed_by_id\":63,\"changed_by_email\":\"kiki@code.org\"},{\"changed_at\":\"2017-07-12 21:24:00 +0000\",\"changed\":[\"toolbox_blocks\",\"contained_level_names\"],\"changed_by_id\":63,\"changed_by_email\":\"kiki@code.org\"},{\"changed_at\":\"2017-07-12 21:25:30 +0000\",\"changed\":[\"toolbox_blocks\"],\"changed_by_id\":63,\"changed_by_email\":\"kiki@code.org\"},{\"changed_at\":\"2017-07-12 21:25:45 +0000\",\"changed\":[\"toolbox_blocks\",\"contained_level_names\"],\"changed_by_id\":63,\"changed_by_email\":\"kiki@code.org\"},{\"changed_at\":\"2017-07-19 15:47:46 +0000\",\"changed\":[],\"changed_by_id\":684,\"changed_by_email\":\"audrey.clark@code.org\"},{\"changed_at\":\"2017-07-19 15:47:46 +0000\",\"changed\":[\"start_blocks\"],\"changed_by_id\":684,\"changed_by_email\":\"audrey.clark@code.org\"},{\"changed_at\":\"2017-07-19 15:47:49 +0000\",\"changed\":[\"start_blocks\"],\"changed_by_id\":684,\"changed_by_email\":\"audrey.clark@code.org\"},{\"changed_at\":\"2017-07-20 21:42:24 +0000\",\"changed\":[\"start_blocks\",\"toolbox_blocks\",\"contained_level_names\"],\"changed_by_id\":684,\"changed_by_email\":\"audrey.clark@code.org\"},{\"changed_at\":\"2017-07-24 22:07:22 +0000\",\"changed\":[\"start_blocks\",\"toolbox_blocks\",\"contained_level_names\"],\"changed_by_id\":63,\"changed_by_email\":\"kiki@code.org\"},{\"changed_at\":\"2017-07-24 22:14:04 +0000\",\"changed\":[\"start_blocks\",\"toolbox_blocks\",\"contained_level_names\"],\"changed_by_id\":63,\"changed_by_email\":\"kiki@code.org\"},{\"changed_at\":\"2017-07-24 22:29:54 +0000\",\"changed\":[\"start_blocks\",\"toolbox_blocks\",\"contained_level_names\"],\"changed_by_id\":63,\"changed_by_email\":\"kiki@code.org\"},{\"changed_at\":\"2017-07-24 23:13:24 +0000\",\"changed\":[\"start_blocks\",\"toolbox_blocks\",\"disable_procedure_autopopulate\",\"contained_level_names\"],\"changed_by_id\":63,\"changed_by_email\":\"kiki@code.org\"},{\"changed_at\":\"2017-07-24 23:13:49 +0000\",\"changed\":[\"start_blocks\",\"toolbox_blocks\",\"disable_procedure_autopopulate\",\"contained_level_names\"],\"changed_by_id\":63,\"changed_by_email\":\"kiki@code.org\"},{\"changed_at\":\"2017-07-24 23:26:54 +0000\",\"changed\":[\"toolbox_blocks\"],\"changed_by_id\":63,\"changed_by_email\":\"kiki@code.org\"},{\"changed_at\":\"2017-11-22 02:12:00 +0000\",\"changed\":[\"start_blocks\",\"toolbox_blocks\",\"contained_level_names\"],\"changed_by_id\":63,\"changed_by_email\":\"kiki@code.org\"}]",
+  "audit_log": "[{\"changed_at\":\"2017-06-14 17:51:26 +0000\",\"changed\":[\"contained_level_names\"],\"changed_by_id\":684,\"changed_by_email\":\"audrey.clark@code.org\"},{\"changed_at\":\"2017-06-22 18:24:09 +0000\",\"changed\":[\"toolbox_blocks\",\"contained_level_names\"],\"changed_by_id\":63,\"changed_by_email\":\"kiki@code.org\"},{\"changed_at\":\"2017-06-22 18:25:57 +0000\",\"changed\":[\"contained_level_names\"],\"changed_by_id\":63,\"changed_by_email\":\"kiki@code.org\"},{\"changed_at\":\"2017-06-22 18:26:30 +0000\",\"changed\":[\"contained_level_names\",\"toolbox_blocks\"],\"changed_by_id\":63,\"changed_by_email\":\"kiki@code.org\"},{\"changed_at\":\"2017-06-22 18:27:47 +0000\",\"changed\":[],\"changed_by_id\":63,\"changed_by_email\":\"kiki@code.org\"},{\"changed_at\":\"2017-06-22 18:30:54 +0000\",\"changed\":[\"project_template_level_name\",\"toolbox_blocks\",\"contained_level_names\"],\"changed_by_id\":63,\"changed_by_email\":\"kiki@code.org\"},{\"changed_at\":\"2017-07-12 21:24:00 +0000\",\"changed\":[\"toolbox_blocks\",\"contained_level_names\"],\"changed_by_id\":63,\"changed_by_email\":\"kiki@code.org\"},{\"changed_at\":\"2017-07-12 21:25:30 +0000\",\"changed\":[\"toolbox_blocks\"],\"changed_by_id\":63,\"changed_by_email\":\"kiki@code.org\"},{\"changed_at\":\"2017-07-12 21:25:45 +0000\",\"changed\":[\"toolbox_blocks\",\"contained_level_names\"],\"changed_by_id\":63,\"changed_by_email\":\"kiki@code.org\"},{\"changed_at\":\"2017-07-19 15:47:46 +0000\",\"changed\":[],\"changed_by_id\":684,\"changed_by_email\":\"audrey.clark@code.org\"},{\"changed_at\":\"2017-07-19 15:47:46 +0000\",\"changed\":[\"start_blocks\"],\"changed_by_id\":684,\"changed_by_email\":\"audrey.clark@code.org\"},{\"changed_at\":\"2017-07-19 15:47:49 +0000\",\"changed\":[\"start_blocks\"],\"changed_by_id\":684,\"changed_by_email\":\"audrey.clark@code.org\"},{\"changed_at\":\"2017-07-20 21:42:24 +0000\",\"changed\":[\"start_blocks\",\"toolbox_blocks\",\"contained_level_names\"],\"changed_by_id\":684,\"changed_by_email\":\"audrey.clark@code.org\"},{\"changed_at\":\"2017-07-24 22:07:22 +0000\",\"changed\":[\"start_blocks\",\"toolbox_blocks\",\"contained_level_names\"],\"changed_by_id\":63,\"changed_by_email\":\"kiki@code.org\"},{\"changed_at\":\"2017-07-24 22:14:04 +0000\",\"changed\":[\"start_blocks\",\"toolbox_blocks\",\"contained_level_names\"],\"changed_by_id\":63,\"changed_by_email\":\"kiki@code.org\"},{\"changed_at\":\"2017-07-24 22:29:54 +0000\",\"changed\":[\"start_blocks\",\"toolbox_blocks\",\"contained_level_names\"],\"changed_by_id\":63,\"changed_by_email\":\"kiki@code.org\"},{\"changed_at\":\"2017-07-24 23:13:24 +0000\",\"changed\":[\"start_blocks\",\"toolbox_blocks\",\"disable_procedure_autopopulate\",\"contained_level_names\"],\"changed_by_id\":63,\"changed_by_email\":\"kiki@code.org\"},{\"changed_at\":\"2017-07-24 23:13:49 +0000\",\"changed\":[\"start_blocks\",\"toolbox_blocks\",\"disable_procedure_autopopulate\",\"contained_level_names\"],\"changed_by_id\":63,\"changed_by_email\":\"kiki@code.org\"},{\"changed_at\":\"2017-07-24 23:26:54 +0000\",\"changed\":[\"toolbox_blocks\"],\"changed_by_id\":63,\"changed_by_email\":\"kiki@code.org\"},{\"changed_at\":\"2017-11-22 02:12:00 +0000\",\"changed\":[\"start_blocks\",\"toolbox_blocks\",\"contained_level_names\"],\"changed_by_id\":63,\"changed_by_email\":\"kiki@code.org\"},{\"changed_at\":\"2018-01-04 20:27:38 +0000\",\"changed\":[\"start_blocks\",\"toolbox_blocks\",\"disable_if_else_editing\",\"contained_level_names\"],\"changed_by_id\":63,\"changed_by_email\":\"kiki@code.org\"},{\"changed_at\":\"2018-01-04 20:28:07 +0000\",\"changed\":[\"toolbox_blocks\"],\"changed_by_id\":63,\"changed_by_email\":\"kiki@code.org\"}]",
   "level_concept_difficulty": {
   }
 }]]></config>
@@ -323,6 +323,12 @@
         </category>
         <category name="Logic">
           <block type="controls_if" inline="false"/>
+          <block type="controls_if" inline="false">
+            <mutation else="1"/>
+          </block>
+          <block type="controls_if" inline="false">
+            <mutation elseif="1" else="1"/>
+          </block>
           <block type="logic_compare" inline="true">
             <title name="OP">EQ</title>
           </block>