Merge pull request #20837 from code-dot-org/staging

DTT (Staging > Test) [robo-dtt]
code-dot-org · Feb 22, 2018 · 5edb30f · 5edb30f
2 parents 8f9c8e0 + 5c14f56
commit 5edb30f
Show file tree

Hide file tree

Showing 3 changed files with 54 additions and 0 deletions.
diff --git a/apps/src/gamelab/blocks.js b/apps/src/gamelab/blocks.js
@@ -7,6 +7,7 @@ const SPRITE_CATEGORY = 'sprites';
 const EVENT_CATEGORY = 'events';
 const EVENT_LOOP_CATEGORY = 'event_loop';
 const VARIABLES_CATEGORY = 'variables';
+const WORLD_CATEGORY = 'world';
 const CATEGORIES = {
   [SPRITE_CATEGORY]: {
     color: [184, 1.00, 0.74],
@@ -20,6 +21,9 @@ const CATEGORIES = {
   [VARIABLES_CATEGORY]: {
     color: [312, 0.32, 0.62],
   },
+  [WORLD_CATEGORY]: {
+    color: [240, 0.45, 0.65],
+  },
 };
 
 const SPRITES = [
@@ -304,5 +308,24 @@ export default {
       blockText: 'second touched sprite',
       returnType: SPRITE_TYPE,
     });
+
+    createJsWrapperBlock({
+      category: SPRITE_CATEGORY,
+      expression: 'length',
+      orderPrecedence: ORDER_MEMBER,
+      name: 'groupLength',
+      blockText: 'number of sprites in {THIS}',
+      methodCall: true,
+      returnType: blockly.BlockValueType.NUMBER,
+    });
+
+    createJsWrapperBlock({
+      category: WORLD_CATEGORY,
+      func: 'setBackground',
+      blockText: 'set background color {COLOR}',
+      args: [
+        { name: 'COLOR', type: blockly.BlockValueType.COLOUR },
+      ],
+    });
   },
 };
diff --git a/dashboard/app/models/levels/gamelab_jr.rb b/dashboard/app/models/levels/gamelab_jr.rb
@@ -52,6 +52,13 @@ def common_blocks(type)
   <block type="when_run" />
 </category>
 <category name="Variables" custom="VARIABLE" />
+<category name="World">
+  <block type="gamelab_setBackground">
+    <value name="COLOR">
+      <block type="colour_picker"></block>
+    </value>
+  </block>
+</category>
 <category name="Sprites">
   <block type="gamelab_makeNewSprite" />
   <block type="gamelab_moveUp" />
@@ -66,6 +73,7 @@ def common_blocks(type)
 <category name="Groups">
   <block type="gamelab_makeNewGroup" />
   <block type="gamelab_add" />
+  <block type="gamelab_groupLength" />
 </category>
 <category name="Events">
   <block type="gamelab_whenUpArrow" />

diff --git a/dashboard/config/scripts/levels/New Game Lab Jr Project.level b/dashboard/config/scripts/levels/New Game Lab Jr Project.level
@@ -231,6 +231,15 @@
         <category name="Start">
           <block type="when_run"/>
         </category>
+        <category name="World">
+          <block type="gamelab_setBackground" inline="true">
+            <value name="COLOR">
+              <block type="colour_picker">
+                <title name="COLOUR">#ff0000</title>
+              </block>
+            </value>
+          </block>
+        </category>
         <category name="Sprites">
           <block type="variables_set" inline="false">
             <title name="VAR">sprite</title>
@@ -317,6 +326,7 @@
               </block>
             </value>
           </block>
+          <block type="gamelab_groupLength" inline="true"/>
         </category>
         <category name="Events">
           <block type="gamelab_whenUpArrow"/>
@@ -387,6 +397,19 @@
             </value>
           </block>
         </category>
+        <category name="Logic">
+          <block type="controls_if" inline="false"/>
+          <block type="logic_compare" inline="true">
+            <title name="OP">EQ</title>
+          </block>
+          <block type="logic_operation" inline="true">
+            <title name="OP">AND</title>
+          </block>
+          <block type="logic_negate" inline="false"/>
+          <block type="logic_boolean">
+            <title name="BOOL">TRUE</title>
+          </block>
+        </category>
       </xml>
     </toolbox_blocks>
   </blocks>