Merge pull request code-dot-org#10153 from code-dot-org/planter

Add new Planter Subtype

Author: Hamms

apps/i18n/maze/en_us.json

@@ -18,6 +18,7 @@
   "cornTooltip": "Harvest some corn",
   "didNotCollectAllCrops": "Make sure you don't leave any crops behind!",
   "didNotCollectEverything": "Make sure you don't leave any nectar or honey behind!",
+  "didNotPlantEverywhere": "Make sure you plant something in every soil patch!",
   "dig": "remove 1",
   "digTooltip": "remove 1 unit of dirt",
   "dirE": "E",
@@ -80,6 +81,9 @@
   "pathRight": "if path to the right",
   "pick": "pick",
   "pilePresent": "there is a pile",
+  "plant": "plant",
+  "plantInNonSoilError": "I can only plant something in fresh soil.",
+  "plantTooltip": "Plant a sprout",
   "pumpkin": "pumpkin",
   "pumpkinTooltip": "Harvest a pumpkin",
   "putdownTower": "put down tower",
@@ -92,6 +96,8 @@
   "repeatUntil": "repeat until",
   "repeatUntilBlocked": "while path ahead",
   "repeatUntilFinish": "repeat until finish",
+  "soil": "soil",
+  "sprout": "sprout",
   "step": "Step",
   "totalHoney": "total honey",
   "totalNectar": "total nectar",

apps/src/code-studio/components/GridEditor.jsx

@@ -6,12 +6,14 @@
 /* global dashboard */
 import React from 'react';
 var HarvesterCell = require('@cdo/apps/maze/harvesterCell');
+var PlanterCell = require('@cdo/apps/maze/planterCell');
 var BeeCell = require('@cdo/apps/maze/beeCell');
 var Cell = require('@cdo/apps/maze/cell');
 var StudioCell = require('@cdo/apps/studio/cell');
 var mazeUtils = require('@cdo/apps/maze/mazeUtils');
 
 var HarvesterCellEditor = require('./HarvesterCellEditor');
+var PlanterCellEditor = require('./PlanterCellEditor');
 var BeeCellEditor = require('./BeeCellEditor');
 var CellEditor = require('./CellEditor');
 var StudioCellEditor = require('./StudioCellEditor');
@@ -81,6 +83,8 @@ var GridEditor = React.createClass({
       return BeeCell;
     } else if (mazeUtils.isHarvesterSkin(this.props.skin)) {
       return HarvesterCell;
+    } else if (mazeUtils.isPlanterSkin(this.props.skin)) {
+      return PlanterCell;
     }
     return Cell;
   },
@@ -92,6 +96,8 @@ var GridEditor = React.createClass({
       return BeeCellEditor;
     } else if (mazeUtils.isHarvesterSkin(this.props.skin)) {
       return HarvesterCellEditor;
+    } else if (mazeUtils.isPlanterSkin(this.props.skin)) {
+      return PlanterCellEditor;
     }
     return CellEditor;
   },

apps/src/code-studio/components/PlanterCellEditor.jsx

@@ -0,0 +1,72 @@
+/**
+ * @overview React component to allow for easy editing and creation of
+ * PlanterCells
+ * @see @cdo/apps/maze/harvesterCell
+ */
+
+var React = require('react');
+var ReactDOM = require('react-dom');
+var PlanterCell = require('@cdo/apps/maze/planterCell');
+var tiles = require('@cdo/apps/maze/tiles');
+var SquareType = tiles.SquareType;
+
+var PlanterCellEditor = React.createClass({
+  propTypes: {
+    cell: React.PropTypes.object.isRequired,
+    row: React.PropTypes.number.isRequired,
+    col: React.PropTypes.number.isRequired,
+    onUpdate: React.PropTypes.func.isRequired,
+  },
+
+  handleChange: function (event) {
+    var serializedArray = $(ReactDOM.findDOMNode(this)).serializeArray();
+    var values = serializedArray.reduce((prev, curr) => {
+      var value = isNaN(curr.value) ? undefined : Number(curr.value);
+      prev[curr.name] = value;
+      return prev;
+    }, {});
+    this.props.onUpdate(values);
+  },
+
+  /**
+   * Focus and select the input that contains this cell's serialized
+   * JSON representation on creation or update, to provide a convenient
+   * copy/paste update route.
+   */
+  render: function () {
+    var values = this.props.cell.serialize();
+
+    // We want undefined values that are going to be in <selects> to
+    // actually be the STRING 'undefined' rather than the value.
+    ['tileType'].forEach(function (value) {
+      if (values[value] === undefined) {
+        values[value] = 'undefined';
+      }
+    });
+
+    return (
+      <form className="span4 offset1">
+        <header>
+          <strong>Editing Cell ({this.props.row}, {this.props.col})</strong>
+        </header>
+
+        <label htmlFor="tileType">Tile Type (required):</label>
+        <select name="tileType" value={values.tileType} onChange={this.handleChange}>
+          {Object.keys(SquareType).map(type => (
+            <option key={type} value={SquareType[type]}>{type.toLowerCase()}</option>
+          ))}
+        </select>
+
+        <label htmlFor="featureType">Feature Type:</label>
+        <select name="featureType" value={values.featureType} disabled={this.props.cell.getTile() !== SquareType.OPEN} onChange={this.handleChange}>
+          {Object.keys(PlanterCell.FeatureType).map(type => (
+            <option key={type} value={PlanterCell.FeatureType[type]}>{type.toLowerCase()}</option>
+          ))}
+        </select>
+
+      </form>
+    );
+  },
+});
+
+module.exports = PlanterCellEditor;

apps/src/maze/api.js

@@ -339,3 +339,19 @@ exports.hasPumpkin = API_FUNCTION(function (id) {
 exports.hasBean = API_FUNCTION(function (id) {
   return Maze.subtype.hasBean(id);
 });
+
+/**
+ * Planter
+ */
+
+exports.plant = API_FUNCTION(function (id) {
+  Maze.subtype.plant(id);
+});
+
+exports.atSoil = API_FUNCTION(function (id) {
+  return Maze.subtype.atSoil(id);
+});
+
+exports.atSprout = API_FUNCTION(function (id) {
+  return Maze.subtype.atSprout(id);
+});

apps/src/maze/blocks.js

@@ -39,6 +39,8 @@ exports.install = function (blockly, blockInstallOptions) {
     require('./collectorBlocks').install(blockly, blockInstallOptions);
   } else if (mazeUtils.isHarvesterSkin(skin.id)) {
     require('./harvesterBlocks').install(blockly, blockInstallOptions);
+  } else if (mazeUtils.isPlanterSkin(skin.id)) {
+    require('./planterBlocks').install(blockly, blockInstallOptions);
   }
 
   var SimpleMove = {

apps/src/maze/gatherer.js

@@ -7,33 +7,6 @@ export default class Gatherer extends Subtype {
     this.maze_.map.resetDirt();
   }
 
-  /**
-   * @param {Number} row
-   * @param {Number} col
-   * @returns {Number} val
-   */
-  getValue(row, col) {
-    return this.getCell(row, col).getCurrentValue();
-  }
-
-  /**
-   * @param {Number} row
-   * @param {Number} col
-   * @param {Number} val
-   */
-  setValue(row, col, val) {
-    this.getCell(row, col).setCurrentValue(val);
-  }
-
-  /**
-   * @param {Number} row
-   * @param {Number} col
-   * @returns {Object} cell
-   */
-  getCell(row, col) {
-    return this.maze_.map.currentStaticGrid[row][col];
-  }
-
   /**
    * @return {boolean}
    */

apps/src/maze/maze.js

@@ -48,6 +48,7 @@ import WordSearch from './wordsearch';
 import Scrat from './scrat';
 import Farmer from './farmer';
 import Harvester from './harvester';
+import Planter from './planter';
 
 var ExecutionInfo = require('./executionInfo');
 
@@ -417,6 +418,8 @@ Maze.init = function (config) {
     Maze.subtype = new Scrat(Maze, studioApp, config);
   } else if (mazeUtils.isHarvesterSkin(config.skinId)) {
     Maze.subtype = new Harvester(Maze, studioApp, config);
+  } else if (mazeUtils.isPlanterSkin(config.skinId)) {
+    Maze.subtype = new Planter(Maze, studioApp, config);
   } else {
     Maze.subtype = new Farmer(Maze, studioApp, config);
   }
@@ -1245,6 +1248,9 @@ function animateAction(action, spotlightBlocks, timePerStep) {
     case 'get_bean':
       Maze.subtype.animateGetBean();
       break;
+    case 'plant':
+      Maze.subtype.animatePlant();
+      break;
     default:
       // action[0] is null if generated by studioApp.checkTimeout().
       break;

apps/src/maze/mazeMap.js

@@ -24,6 +24,18 @@ class MazeMap {
     });
   }
 
+  /**
+   * Returns a flattened list of all cells in this map. Good for
+   * situations where we want to map or reduce the cells without caring
+   * about their position
+   * @return {Cell[]}
+   */
+  getAllCells() {
+    return this.currentStaticGrid.reduce(
+      (prev, curr) => prev.concat(curr), []
+    );
+  }
+
   getCell(x, y) {
     return this.currentStaticGrid[x] && this.currentStaticGrid[x][y];
   }

apps/src/maze/mazeUtils.js

@@ -26,6 +26,10 @@ exports.isScratSkin = function (skinId) {
   return (/scrat/).test(skinId);
 };
 
+exports.isPlanterSkin = function (skinId) {
+  return (/planter/).test(skinId);
+};
+
 exports.isHarvesterSkin = function (skinId) {
   return (/harvester/).test(skinId);
 };