made the expression descriptions get loaded into the collection areas

phetsims · Feb 7, 2017 · bc40fff · bc40fff
1 parent 23d72df
commit bc40fff
Show file tree

Hide file tree

Showing 2 changed files with 18 additions and 4 deletions.
diff --git a/js/game/model/EEGameLevelModel.js b/js/game/model/EEGameLevelModel.js
@@ -9,10 +9,12 @@ define( function( require ) {
   'use strict';
 
   // modules
+  var EEChallengeDescriptors = require( 'EXPRESSION_EXCHANGE/game/model/EEChallengeDescriptors' );
   var ExpressionCollectionArea = require( 'EXPRESSION_EXCHANGE/game/model/ExpressionCollectionArea' );
   var ExpressionManipulationModel = require( 'EXPRESSION_EXCHANGE/common/model/ExpressionManipulationModel' );
   var expressionExchange = require( 'EXPRESSION_EXCHANGE/expressionExchange' );
   var inherit = require( 'PHET_CORE/inherit' );
+  var Property = require( 'AXON/Property' );
 
   // constants
   var EXPRESSION_COLLECTION_AREA_X_OFFSET = 750;
@@ -27,10 +29,14 @@ define( function( require ) {
   function EEGameLevelModel( level, allowedRepresentations ) {
 
     var self = this;
-    this.level = level; // @public, read only
-    this.challengeNumber = 0;
 
-    // @public, model that allows user to manipulate coin terms and expressions
+    this.challengeNumber = 0; // TODO: Make this private later if possible
+    this.level = level; // {number} @public, read only
+
+    // @public - property that refers to the current challenge
+    this.currentChallengeProperty = new Property( EEChallengeDescriptors[ level ][ this.challengeNumber ] );
+
+    // @public, read only, model that allows user to manipulate coin terms and expressions
     this.expressionManipulationModel = new ExpressionManipulationModel( {
       allowedRepresentations: allowedRepresentations,
       partialCancellationEnabled: false // partial cancellation isn't performed in the games
@@ -44,6 +50,13 @@ define( function( require ) {
         EXPRESSION_COLLECTION_AREA_INITIAL_Y_OFFSET + index * EXPRESSION_COLLECTION_AREA_Y_SPACING
       ) );
     } );
+
+    // update the expression description associated with the expression collection areas each time a new challenge is set
+    this.currentChallengeProperty.link( function( currentChallenge ) {
+      self.expressionCollectionAreas.forEach( function( expressionCollectionArea, index ) {
+        expressionCollectionArea.expressionDescriptionProperty.set( currentChallenge.expressionsToCollect[ index ] );
+      } );
+    } );
   }
 
   expressionExchange.register( 'EEGameLevelModel', EEGameLevelModel );

diff --git a/js/game/view/EEGameLevelView.js b/js/game/view/EEGameLevelView.js
@@ -27,6 +27,7 @@ define( function( require ) {
     Node.call( this );
 
     // add the coin term creator box
+    // TODO: Pass in the challenge itself instead of the number
     var coinTermCreatorBox = CoinTermCreatorBoxFactory.createGameScreenCreatorBox(
       levelModel.level,
       levelModel.challengeNumber,
@@ -35,7 +36,7 @@ define( function( require ) {
     );
     this.addChild( coinTermCreatorBox );
 
-    // add the expression collection areas
+    // add the expression collection area nodes
     levelModel.expressionCollectionAreas.forEach( function( expressionCollectionArea ) {
       self.addChild( new ExpressionCollectionAreaNode( expressionCollectionArea ) );
     } );