From 0a371e4b753184400c3e0f995b9dda01a61b5b8e Mon Sep 17 00:00:00 2001
From: ericrius1 <ericrius1>
Date: Wed, 13 Jan 2016 11:06:29 -0800
Subject: [PATCH] Adjusted relative hand grab data for gun, ping ponger, and
 bow to to optimize for owen grabbing

---
 unpublishedScripts/hiddenEntityReset.js | 30 ++++++++++++++++---------
 unpublishedScripts/masterReset.js       | 25 ++++++++++++---------
 2 files changed, 35 insertions(+), 20 deletions(-)

diff --git a/unpublishedScripts/hiddenEntityReset.js b/unpublishedScripts/hiddenEntityReset.js
index 4352a5d562..19bf689357 100644
--- a/unpublishedScripts/hiddenEntityReset.js
+++ b/unpublishedScripts/hiddenEntityReset.js
@@ -300,12 +300,17 @@
                 userData: JSON.stringify({
                     grabbableKey: {
                         spatialKey: {
-                            relativePosition: {
-                                x: 0,
+                            rightRelativePosition: {
+                                x: 0.03,
                                 y: 0,
-                                z: 0
+                                z: -0.085
                             },
-                            relativeRotation: Quat.fromPitchYawRollDegrees(45, 90, 0)
+                            leftRelativePosition: {
+                                x: -0.03,
+                                y: 0,
+                                z: -0.085
+                            },
+                            relativeRotation: Quat.fromPitchYawRollDegrees(100, 90, 0)
                         },
                         invertSolidWhileHeld: true
                     },
@@ -359,9 +364,14 @@
                     grabbableKey: {
                         invertSolidWhileHeld: true,
                         spatialKey: {
-                            relativePosition: {
-                                x: 0,
-                                y: 0.06,
+                            rightRelativePosition: {
+                                x: -0.03,
+                                y: 0,
+                                z: 0.11
+                            },
+                            leftRelativePosition: {
+                                x: 0.03,
+                                y: 0,
                                 z: 0.11
                             },
                             relativeRotation: Quat.fromPitchYawRollDegrees(0, -90, 90)
@@ -1152,9 +1162,9 @@
                     grabbableKey: {
                         spatialKey: {
                             relativePosition: {
-                                x: -0.05,
+                                x: 0.01,
                                 y: 0,
-                                z: 0.0
+                                z: 0.1
                             },
                             relativeRotation: Quat.fromPitchYawRollDegrees(0, -90, -90)
                         },
@@ -1509,4 +1519,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 8aedd1c650..f0c5ad6075 100644
--- a/unpublishedScripts/masterReset.js
+++ b/unpublishedScripts/masterReset.js
@@ -285,14 +285,14 @@ MasterReset = function() {
                 grabbableKey: {
                     spatialKey: {
                         rightRelativePosition: {
-                            x: 0.02,
+                            x: 0.03,
                             y: 0,
-                            z: -0.03
+                            z: -0.085
                         },
                         leftRelativePosition: {
-                            x: -0.02,
+                            x: -0.03,
                             y: 0,
-                            z: -0.03
+                            z: -0.085
                         },
                         relativeRotation: Quat.fromPitchYawRollDegrees(100, 90, 0)
                     },
@@ -348,9 +348,14 @@ MasterReset = function() {
                 grabbableKey: {
                     invertSolidWhileHeld: true,
                     spatialKey: {
-                        relativePosition: {
-                            x: 0,
-                            y: 0.06,
+                        rightRelativePosition: {
+                            x: -0.03,
+                            y: 0,
+                            z: 0.11
+                        },
+                        leftRelativePosition: {
+                            x: 0.03,
+                            y: 0,
                             z: 0.11
                         },
                         relativeRotation: Quat.fromPitchYawRollDegrees(0, -90, 90)
@@ -1142,9 +1147,9 @@ MasterReset = function() {
                 grabbableKey: {
                     spatialKey: {
                         relativePosition: {
-                            x: 0,
+                            x: 0.01,
                             y: 0,
-                            z: 0.06
+                            z: 0.1
                         },
                         relativeRotation: Quat.fromPitchYawRollDegrees(0, -90, -90)
                     },
@@ -1494,4 +1499,4 @@ MasterReset = function() {
 
         Script.scriptEnding.connect(cleanup);
     }
-};
+};
\ No newline at end of file