Behavior editor

apps/package.json

@@ -43,7 +43,7 @@
   "devDependencies": {
     "@cdo/apps": "file:src",
     "@code-dot-org/artist": "github:code-dot-org/artist#9c3ad003522aeab9d652fb1d8703a95d7ebde393",
-    "@code-dot-org/blockly": "2.0.1",
+    "@code-dot-org/blockly": "2.2.1",
     "@code-dot-org/bramble": "0.1.26",
     "@code-dot-org/craft": "github:code-dot-org/craft#46cddf8482ef7fad2cd1c4e9ce813c7fde4e8adf",
     "@code-dot-org/johnny-five": "0.11.1-cdo.2",

apps/src/gamelab/GameLab.js

@@ -271,7 +271,11 @@ GameLab.prototype.init = function (config) {
 
     if (this.studioApp_.isUsingBlockly()) {
       // Custom blockly config options for game lab jr
-      config.valueTypeTabShapeMap = { Sprite: 'angle' };
+      config.valueTypeTabShapeMap = {
+        Sprite: 'angle',
+        Behavior: 'rounded',
+        Location: 'square',
+      };
 
       this.studioApp_.displayAlert('#belowVisualization', {type: 'warning', sideMargin: 0},
         <div>

apps/src/gamelab/blocks.js

@@ -104,7 +104,12 @@ export default {
     const createJsWrapperBlock = createJsWrapperBlockCreator(
       blockly,
       'gamelab',
-      [SPRITE_TYPE],
+      [
+        // Strict Types
+        blockly.BlockValueType.SPRITE,
+        blockly.BlockValueType.BEHAVIOR,
+        blockly.BlockValueType.LOCATION,
+      ],
       SPRITE_TYPE,
       customInputTypes,
     );
@@ -481,6 +486,19 @@ export default {
     // Legacy style block definitions :(
     const generator = blockly.Generator.get('JavaScript');
 
+    const behaviorEditor = new Blockly.FunctionEditor(
+      {
+        FUNCTION_HEADER: 'Behavior',
+        FUNCTION_NAME_LABEL: 'Name your behavior:',
+        FUNCTION_DESCRIPTION_LABEL: 'What is your behavior supposed to do?',
+      },
+      'behavior_definition',
+      {
+        [Blockly.BlockValueType.SPRITE]: 'sprite_parameter_get',
+      },
+      true /* disableParamEditing */,
+    );
+
     Blockly.Blocks.sprite_variables_get = {
       // Variable getter.
       init: function () {
@@ -517,6 +535,30 @@ export default {
     Blockly.Variables.registerGetter(Blockly.BlockValueType.SPRITE,
       'sprite_variables_get');
 
+    Blockly.Blocks.sprite_parameter_get = {
+      init() {
+        var fieldLabel = new Blockly.FieldLabel(Blockly.Msg.VARIABLES_GET_ITEM);
+        // Must be marked EDITABLE so that cloned blocks share the same var name
+        fieldLabel.EDITABLE = true;
+        this.setHelpUrl(Blockly.Msg.VARIABLES_GET_HELPURL);
+        this.setHSV(7, 0.80, 0.95);
+        this.appendDummyInput()
+            .appendTitle(Blockly.Msg.VARIABLES_GET_TITLE)
+            .appendTitle(fieldLabel , 'VAR')
+            .appendTitle(Blockly.Msg.VARIABLES_GET_TAIL);
+        this.setStrictOutput(true, Blockly.BlockValueType.SPRITE);
+        this.setTooltip(Blockly.Msg.VARIABLES_GET_TOOLTIP);
+      },
+      renameVar(oldName, newName) {
+        if (behaviorEditor.isOpen()) {
+          behaviorEditor.renameParameter(oldName, newName);
+          behaviorEditor.refreshParamsEverywhere();
+        }
+      },
+      removeVar: Blockly.Blocks.variables_get.removeVar,
+    };
+    generator.sprite_parameter_get = generator.variables_get;
+
     Blockly.Blocks.sprite_variables_set = {
       // Variable setter.
       init: function () {
@@ -551,14 +593,102 @@ export default {
     generator.sprite_variables_set = generator.variables_set;
     Blockly.Variables.registerSetter(Blockly.BlockValueType.SPRITE,
       'sprite_variables_set');
+
+    Blockly.Blocks.gamelab_behavior_get = {
+      init() {
+        var fieldLabel = new Blockly.FieldLabel(Blockly.Msg.VARIABLES_GET_ITEM);
+        // Must be marked EDITABLE so that cloned blocks share the same var name
+        fieldLabel.EDITABLE = true;
+        this.setHelpUrl(Blockly.Msg.VARIABLES_GET_HELPURL);
+        this.setHSV(136, 0.84, 0.80);
+        const mainTitle = this.appendDummyInput()
+            .appendTitle(fieldLabel, 'VAR')
+            .appendTitle(Blockly.Msg.VARIABLES_GET_TAIL);
+
+        if (Blockly.useModalFunctionEditor) {
+          var editLabel = new Blockly.FieldIcon(Blockly.Msg.FUNCTION_EDIT);
+          Blockly.bindEvent_(editLabel.fieldGroup_, 'mousedown', this, this.openEditor);
+          mainTitle.appendTitle(editLabel);
+        }
+
+        this.setStrictOutput(true, Blockly.BlockValueType.BEHAVIOR);
+        this.setTooltip(Blockly.Msg.VARIABLES_GET_TOOLTIP);
+      },
+
+      openEditor(e) {
+        e.stopPropagation();
+        behaviorEditor.openEditorForFunction(this, this.getTitleValue('VAR'));
+      },
+
+      getVars() {
+        return Blockly.Variables.getVars.bind(this)(Blockly.BlockValueType.BEHAVIOR);
+      },
+
+      renameVar(oldName, newName) {
+        if (Blockly.Names.equals(oldName, this.getTitleValue('VAR'))) {
+          this.setTitleValue(newName, 'VAR');
+        }
+      },
+
+      renameProcedure(oldName, newName) {
+        if (Blockly.Names.equals(oldName, this.getTitleValue('VAR'))) {
+          this.setTitleValue(newName, 'VAR');
+        }
+      },
+    };
+
+    generator.gamelab_behavior_get = function () {
+      return [
+        Blockly.JavaScript.variableDB_.getName(
+            this.getTitleValue('VAR'),
+            Blockly.Procedures.NAME_TYPE),
+        Blockly.JavaScript.ORDER_ATOMIC
+      ];
+    };
+
+    Blockly.Blocks.behavior_definition = Blockly.Block.createProcedureDefinitionBlock({
+      initPostScript(block) {
+        block.setHSV(136, 0.84, 0.80);
+        block.parameterNames_ = ['this sprite'];
+        block.parameterTypes_ = [Blockly.BlockValueType.SPRITE];
+      },
+      overrides: {
+        getVars(category) {
+          return {
+            Behavior: [this.getTitleValue('NAME')],
+          };
+        },
+        callType_: 'gamelab_behavior_get',
+      }
+    });
+
+    generator.behavior_definition = generator.procedures_defnoreturn;
+
+    Blockly.Procedures.DEFINITION_BLOCK_TYPES.push('behavior_definition');
+    Blockly.Variables.registerGetter(Blockly.BlockValueType.BEHAVIOR,
+      'gamelab_behavior_get');
+    Blockly.Flyout.configure(Blockly.BlockValueType.BEHAVIOR, {
+      initialize(flyout, cursor) {
+        if (behaviorEditor && !behaviorEditor.isOpen()) {
+          flyout.addButtonToFlyout_(cursor, 'Create a Behavior',
+            behaviorEditor.openWithNewFunction.bind(behaviorEditor));
+        }
+      },
+      addDefaultVar: false,
+    });
   },
 
   installCustomBlocks(blockly, blockInstallOptions, customBlocks, level, hideCustomBlocks) {
     const SPRITE_TYPE = blockly.BlockValueType.SPRITE;
     const blockNames = customBlocks.map(createJsWrapperBlockCreator(
       blockly,
       'gamelab',
-      [SPRITE_TYPE],
+      [
+        // Strict Types
+        blockly.BlockValueType.SPRITE,
+        blockly.BlockValueType.BEHAVIOR,
+        blockly.BlockValueType.LOCATION,
+      ],
       SPRITE_TYPE,
       customInputTypes,
     ));

apps/yarn.lock

@@ -9,9 +9,9 @@
   version "0.0.1"
   resolved "https://codeload.github.com/code-dot-org/artist/tar.gz/9c3ad003522aeab9d652fb1d8703a95d7ebde393"
 
-"@code-dot-org/blockly@2.0.1":
-  version "2.0.1"
-  resolved "https://registry.yarnpkg.com/@code-dot-org/blockly/-/blockly-2.0.1.tgz#1c9f8c2282842727041324d764186ddf4eb26112"
+"@code-dot-org/blockly@2.2.1":
+  version "2.2.1"
+  resolved "https://registry.yarnpkg.com/@code-dot-org/blockly/-/blockly-2.2.1.tgz#ab5c086613686ed3d3b571bdbde6a405fe80e8e8"
 
 "@code-dot-org/bramble@0.1.26":
   version "0.1.26"

dashboard/app/models/levels/gamelab_jr.rb

@@ -172,6 +172,7 @@ def common_blocks(type)
   <block type="text_join_simple" inputcount="2" />
   <block type="text" />
 </category>
+<category name="Behaviors" custom="Behavior" />
     XML
   end