include sweater charge for balloon pickup when balloon on sweater, see …

…#295
phetsims · Sep 13, 2017 · 9cf2b1a · 9cf2b1a
1 parent 3ad4fde
commit 9cf2b1a
Show file tree

Hide file tree

Showing 3 changed files with 14 additions and 1 deletion.
diff --git a/js/balloons-and-static-electricity/BASEA11yStrings.js b/js/balloons-and-static-electricity/BASEA11yStrings.js
@@ -356,6 +356,7 @@ define( function( require ) {
     //--------------------------------------------------------------------------
     showAllGrabbedPatternString: '{{grabbed}}. {{location}}. {{charge}}. {{help}}',
     showAllWithInducedGrabbedPatternString: '{{grabbed}}. {{location}}. {{charge}}. {{induced}}. {{help}}',
+    showAllOnSweaterGrabbedPatternString: '{{grabbed}}. {{location}}. {{charge}}. {{sweaterCharge}}. {{help}}',
     showNoneGrabbedPatternString: '{{grabbed}}. {{location}}. {{help}}',
     showDifferencesGrabbedPatternString: '{{grabbed}}. {{location}}. {{relativeCharge}}. {{help}}',
 

diff --git a/js/balloons-and-static-electricity/view/describers/BalloonDescriber.js b/js/balloons-and-static-electricity/view/describers/BalloonDescriber.js
@@ -109,6 +109,7 @@ define( function( require ) {
   var balloonHasNegativeChargePatternString = BASEA11yStrings.balloonHasNegativeChargePatternString;
   var lastChargePickedUpPatternString = BASEA11yStrings.lastChargePickedUpPatternString;
   var showAllWithInducedGrabbedPatternString = BASEA11yStrings.showAllWithInducedGrabbedPatternString;
+  var showAllOnSweaterGrabbedPatternString = BASEA11yStrings.showAllOnSweaterGrabbedPatternString;
 
   // constants
   // maps balloon direction to a description string while the balloon is being dragged
@@ -491,6 +492,17 @@ define( function( require ) {
             help: interactionCueString
           } );
         }
+        else if ( this.balloonModel.stickingToSweater() ) {
+          var sweaterCharge = this.model.sweater.chargeProperty.get();
+          var relativeSweaterCharge = SweaterDescriber.getRelativeChargeDescriptionWithLabel( sweaterCharge, chargesShown );
+          alertString = StringUtils.fillIn( showAllOnSweaterGrabbedPatternString, {
+            grabbed: grabbedString,
+            location: stateAndLocation,
+            charge: chargeString,
+            sweaterCharge: relativeSweaterCharge,
+            help: interactionCueString
+          } );
+        }
         else {
           alertString = StringUtils.fillIn( showAllGrabbedPatternString, {
             grabbed: grabbedString,

diff --git a/js/balloons-and-static-electricity/view/describers/SweaterDescriber.js b/js/balloons-and-static-electricity/view/describers/SweaterDescriber.js
@@ -192,7 +192,7 @@ define( function( require ) {
 
     /**
      * Get the relative charge on the sweater.  Usually just returns the relative description
-     * from BalloonsAndStaticElectricity, but if all charges are gone, the sweater uses a special
+     * from BalloonsAndStaticElectricityDescriber, but if all charges are gone, the sweater uses a special
      * word to indicate this.
      *
      * @param {number} charge