From d8f169bd4e11c535a70fa6df6b01760f1ccf105e Mon Sep 17 00:00:00 2001
From: "James B. Pollack" <jamesbradenpollack@gmail.com>
Date: Fri, 6 Nov 2015 17:04:55 -0800
Subject: [PATCH] add collision sounds to bballs

---
 unpublishedScripts/basketballsResetter.js | 2 +-
 unpublishedScripts/hiddenEntityReset.js   | 3 ++-
 unpublishedScripts/masterReset.js         | 9 +++++----
 3 files changed, 8 insertions(+), 6 deletions(-)

diff --git a/unpublishedScripts/basketballsResetter.js b/unpublishedScripts/basketballsResetter.js
index 4d02296e8e..791ac1c0cf 100644
--- a/unpublishedScripts/basketballsResetter.js
+++ b/unpublishedScripts/basketballsResetter.js
@@ -82,7 +82,7 @@ var HIFI_PUBLIC_BUCKET = "http://s3.amazonaws.com/hifi-public/";
                         z: 0
                     },
                     collisionsWillMove: true,
-                    collisionsSoundURL: basketballCollisionSoundURL,
+                    collisionSoundURL: basketballCollisionSoundURL,
                     ignoreForCollisions: false,
                     modelURL: basketballURL,
                     userData: JSON.stringify({
diff --git a/unpublishedScripts/hiddenEntityReset.js b/unpublishedScripts/hiddenEntityReset.js
index ef0557a54f..0773cc5640 100644
--- a/unpublishedScripts/hiddenEntityReset.js
+++ b/unpublishedScripts/hiddenEntityReset.js
@@ -308,6 +308,7 @@
                             z: 0
                         },
                         collisionsWillMove: true,
+                        collisionSoundURL: 'http://hifi-public.s3.amazonaws.com/sounds/basketball/basketball.wav',
                         ignoreForCollisions: false,
                         modelURL: basketballURL,
                         userData: JSON.stringify({
@@ -1258,4 +1259,4 @@
     };
     // entity scripts always need to return a newly constructed object of our type
     return new ResetSwitch();
-});
+});
\ No newline at end of file
diff --git a/unpublishedScripts/masterReset.js b/unpublishedScripts/masterReset.js
index a8e156617a..aa7a1912de 100644
--- a/unpublishedScripts/masterReset.js
+++ b/unpublishedScripts/masterReset.js
@@ -248,7 +248,7 @@ MasterReset = function() {
                 },
                 grabbableKey: {
                     grabbable: false,
-                    wantsTrigger:true
+                    wantsTrigger: true
                 }
             })
         });
@@ -289,6 +289,7 @@ MasterReset = function() {
                         z: 0
                     },
                     collisionsWillMove: true,
+                    collisionSoundURL: 'http://hifi-public.s3.amazonaws.com/sounds/basketball/basketball.wav',
                     ignoreForCollisions: false,
                     modelURL: basketballURL,
                     userData: JSON.stringify({
@@ -334,7 +335,7 @@ MasterReset = function() {
             name: "Basketball Resetter",
             script: basketballResetterScriptURL,
             dimensions: dimensions,
-            visible:false,
+            visible: false,
             userData: JSON.stringify({
                 resetMe: {
                     resetMe: true
@@ -367,7 +368,7 @@ MasterReset = function() {
             name: "Target Resetter",
             script: targetsResetterScriptURL,
             dimensions: dimensions,
-            visible:false,
+            visible: false,
             userData: JSON.stringify({
                 resetMe: {
                     resetMe: true
@@ -1238,4 +1239,4 @@ MasterReset = function() {
 
         Script.scriptEnding.connect(cleanup);
     }
-};
+};
\ No newline at end of file