diff --git a/js/moleculesandlight/view/MoleculesAndLightScreenView.js b/js/moleculesandlight/view/MoleculesAndLightScreenView.js index 7babc8d2..cc54fa8b 100644 --- a/js/moleculesandlight/view/MoleculesAndLightScreenView.js +++ b/js/moleculesandlight/view/MoleculesAndLightScreenView.js @@ -69,6 +69,10 @@ define( require => { const infraredPhotonV3SoundInfo = require( 'sound!MOLECULES_AND_LIGHT/photon-v3-4th-interval-001.mp3' ); const visiblePhotonV3SoundInfo = require( 'sound!MOLECULES_AND_LIGHT/photon-v3-4th-interval-002.mp3' ); const ultravioletPhotonV3SoundInfo = require( 'sound!MOLECULES_AND_LIGHT/photon-v3-4th-interval-003.mp3' ); + const microwavePhotonV3saSoundInfo = require( 'sound!MOLECULES_AND_LIGHT/photon-v3-4th-interval-000-softened-attack.mp3' ); + const infraredPhotonV3saSoundInfo = require( 'sound!MOLECULES_AND_LIGHT/photon-v3-4th-interval-001-softened-attack.mp3' ); + const visiblePhotonV3saSoundInfo = require( 'sound!MOLECULES_AND_LIGHT/photon-v3-4th-interval-002-softened-attack.mp3' ); + const ultravioletPhotonV3saSoundInfo = require( 'sound!MOLECULES_AND_LIGHT/photon-v3-4th-interval-003-softened-attack.mp3' ); // constants // Model-view transform for intermediate coordinates. @@ -361,6 +365,12 @@ define( require => { new SoundClip( infraredPhotonV3SoundInfo, photonSoundClipOptions ), new SoundClip( visiblePhotonV3SoundInfo, photonSoundClipOptions ), new SoundClip( ultravioletPhotonV3SoundInfo, photonSoundClipOptions ) + ], + [ + new SoundClip( microwavePhotonV3saSoundInfo, photonSoundClipOptions ), + new SoundClip( infraredPhotonV3saSoundInfo, photonSoundClipOptions ), + new SoundClip( visiblePhotonV3saSoundInfo, photonSoundClipOptions ), + new SoundClip( ultravioletPhotonV3saSoundInfo, photonSoundClipOptions ) ] ]; photonEmissionSoundPlayers.forEach( soundSet => { @@ -373,8 +383,6 @@ define( require => { if ( photon.locationProperty.value.x < 0 ) { // photon was emitted from lamp, use the initial emission sound - // soundSetIndex = malSoundOptionsDialogContent.photonInitialEmissionSoundSetProperty.value - 1; - const playEmitFromLampSound = position => { if ( position.x >= PLAY_LAMP_EMISSION_X_POSITION ) { const soundSetIndex = malSoundOptionsDialogContent.photonInitialEmissionSoundSetProperty.value - 1; diff --git a/js/moleculesandlight/view/malSoundOptionsDialogContent.js b/js/moleculesandlight/view/malSoundOptionsDialogContent.js index de266818..98e5de22 100644 --- a/js/moleculesandlight/view/malSoundOptionsDialogContent.js +++ b/js/moleculesandlight/view/malSoundOptionsDialogContent.js @@ -64,7 +64,7 @@ define( require => { // radio button entries, but I've done it this way so that the sound families can be easily named if desired. const photonInitialEmissionRadioButtonGroup = new VerticalAquaRadioButtonGroup( this.photonInitialEmissionSoundSetProperty, - createNumberedRadioButtonDescriptorSet( 3 ) + createNumberedRadioButtonDescriptorSet( 4 ) ); const photonInitialEmissionSoundSelectionPanel = new Panel( new VBox( { @@ -78,7 +78,7 @@ define( require => { // Create the secondary photon emission radio buttons. const photonSecondaryEmissionRadioButtonGroup = new VerticalAquaRadioButtonGroup( this.photonSecondaryEmissionSoundSetProperty, - createNumberedRadioButtonDescriptorSet( 3 ) + createNumberedRadioButtonDescriptorSet() ); const photonSecondaryEmissionSoundSelectionPanel = new Panel( new VBox( { diff --git a/sounds/license.json b/sounds/license.json index 475a108f..0d58784f 100644 --- a/sounds/license.json +++ b/sounds/license.json @@ -87,6 +87,14 @@ "license": "contact phethelp@colorado.edu", "notes": "created by Ashton Morris (PhET Interactive Simulations)" }, + "photon-v3-4th-interval-000-softened-attack.mp3": { + "text": [ + "Copyright 2018 University of Colorado Boulder" + ], + "projectURL": "http://phet.colorado.edu", + "license": "contact phethelp@colorado.edu", + "notes": "created by Ashton Morris (PhET Interactive Simulations)" + }, "photon-v3-4th-interval-001.mp3": { "text": [ "Copyright 2018 University of Colorado Boulder" @@ -95,6 +103,14 @@ "license": "contact phethelp@colorado.edu", "notes": "created by Ashton Morris (PhET Interactive Simulations)" }, + "photon-v3-4th-interval-001-softened-attack.mp3": { + "text": [ + "Copyright 2018 University of Colorado Boulder" + ], + "projectURL": "http://phet.colorado.edu", + "license": "contact phethelp@colorado.edu", + "notes": "created by Ashton Morris (PhET Interactive Simulations)" + }, "photon-v3-4th-interval-002.mp3": { "text": [ "Copyright 2018 University of Colorado Boulder" @@ -103,6 +119,14 @@ "license": "contact phethelp@colorado.edu", "notes": "created by Ashton Morris (PhET Interactive Simulations)" }, + "photon-v3-4th-interval-002-softened-attack.mp3": { + "text": [ + "Copyright 2018 University of Colorado Boulder" + ], + "projectURL": "http://phet.colorado.edu", + "license": "contact phethelp@colorado.edu", + "notes": "created by Ashton Morris (PhET Interactive Simulations)" + }, "photon-v3-4th-interval-003.mp3": { "text": [ "Copyright 2018 University of Colorado Boulder" @@ -111,6 +135,14 @@ "license": "contact phethelp@colorado.edu", "notes": "created by Ashton Morris (PhET Interactive Simulations)" }, + "photon-v3-4th-interval-003-softened-attack.mp3": { + "text": [ + "Copyright 2018 University of Colorado Boulder" + ], + "projectURL": "http://phet.colorado.edu", + "license": "contact phethelp@colorado.edu", + "notes": "created by Ashton Morris (PhET Interactive Simulations)" + }, "rotate-002.mp3": { "text": [ "Copyright 2018 University of Colorado Boulder" diff --git a/sounds/photon-v3-4th-interval-000-softened-attack.mp3 b/sounds/photon-v3-4th-interval-000-softened-attack.mp3 new file mode 100644 index 00000000..3d2b106e Binary files /dev/null and b/sounds/photon-v3-4th-interval-000-softened-attack.mp3 differ diff --git a/sounds/photon-v3-4th-interval-001-softened-attack.mp3 b/sounds/photon-v3-4th-interval-001-softened-attack.mp3 new file mode 100644 index 00000000..7f404479 Binary files /dev/null and b/sounds/photon-v3-4th-interval-001-softened-attack.mp3 differ diff --git a/sounds/photon-v3-4th-interval-002-softened-attack.mp3 b/sounds/photon-v3-4th-interval-002-softened-attack.mp3 new file mode 100644 index 00000000..82ef7198 Binary files /dev/null and b/sounds/photon-v3-4th-interval-002-softened-attack.mp3 differ diff --git a/sounds/photon-v3-4th-interval-003-softened-attack.mp3 b/sounds/photon-v3-4th-interval-003-softened-attack.mp3 new file mode 100644 index 00000000..6bae7aa5 Binary files /dev/null and b/sounds/photon-v3-4th-interval-003-softened-attack.mp3 differ