From 0a371e4b753184400c3e0f995b9dda01a61b5b8e Mon Sep 17 00:00:00 2001 From: ericrius1 Date: Wed, 13 Jan 2016 11:06:29 -0800 Subject: [PATCH 1/5] 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 From f02cc8fd46935f6db8d9055de77933dc8ce17a51 Mon Sep 17 00:00:00 2001 From: ericrius1 Date: Wed, 13 Jan 2016 14:43:52 -0800 Subject: [PATCH 2/5] Tweaked bow position --- unpublishedScripts/hiddenEntityReset.js | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) diff --git a/unpublishedScripts/hiddenEntityReset.js b/unpublishedScripts/hiddenEntityReset.js index 19bf689357..f96443f059 100644 --- a/unpublishedScripts/hiddenEntityReset.js +++ b/unpublishedScripts/hiddenEntityReset.js @@ -113,7 +113,6 @@ z: 504.5 }); - createCombinedArmChair({ x: 549.29, y: 494.9, @@ -365,16 +364,16 @@ invertSolidWhileHeld: true, spatialKey: { rightRelativePosition: { - x: -0.03, - y: 0, + x: 0.03, + y: 0.08, z: 0.11 }, leftRelativePosition: { - x: 0.03, - y: 0, + x: -0.03, + y: 0.08, z: 0.11 }, - relativeRotation: Quat.fromPitchYawRollDegrees(0, -90, 90) + relativeRotation: Quat.fromPitchYawRollDegrees(180, 90, 90) } } }) From cda6d6e4eaf43c846a5adb4b3c765d70283011d9 Mon Sep 17 00:00:00 2001 From: ericrius1 Date: Wed, 13 Jan 2016 14:44:42 -0800 Subject: [PATCH 3/5] bow tweaks --- unpublishedScripts/masterReset.js | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/unpublishedScripts/masterReset.js b/unpublishedScripts/masterReset.js index f0c5ad6075..81c2db9e05 100644 --- a/unpublishedScripts/masterReset.js +++ b/unpublishedScripts/masterReset.js @@ -349,16 +349,16 @@ MasterReset = function() { invertSolidWhileHeld: true, spatialKey: { rightRelativePosition: { - x: -0.03, - y: 0, + x: 0.03, + y: 0.08, z: 0.11 }, leftRelativePosition: { - x: 0.03, - y: 0, + x: -0.03, + y: 0.08, z: 0.11 }, - relativeRotation: Quat.fromPitchYawRollDegrees(0, -90, 90) + relativeRotation: Quat.fromPitchYawRollDegrees(180, 90, 90) } } }) From 5a9d533e7007d71a59c6fc06ad16ac0bc9c71a16 Mon Sep 17 00:00:00 2001 From: ericrius1 Date: Wed, 13 Jan 2016 15:30:12 -0800 Subject: [PATCH 4/5] ping pong and gun tweaks --- unpublishedScripts/hiddenEntityReset.js | 17 +++++++++++------ unpublishedScripts/masterReset.js | 17 +++++++++++------ 2 files changed, 22 insertions(+), 12 deletions(-) diff --git a/unpublishedScripts/hiddenEntityReset.js b/unpublishedScripts/hiddenEntityReset.js index f96443f059..cd4a05dfce 100644 --- a/unpublishedScripts/hiddenEntityReset.js +++ b/unpublishedScripts/hiddenEntityReset.js @@ -301,15 +301,15 @@ spatialKey: { rightRelativePosition: { x: 0.03, - y: 0, + y: 0.0, z: -0.085 }, leftRelativePosition: { x: -0.03, - y: 0, + y: 0.00, z: -0.085 }, - relativeRotation: Quat.fromPitchYawRollDegrees(100, 90, 0) + relativeRotation: Quat.fromPitchYawRollDegrees(90, 90, 0) }, invertSolidWhileHeld: true }, @@ -1160,9 +1160,14 @@ }, grabbableKey: { spatialKey: { - relativePosition: { - x: 0.01, - y: 0, + rightRelativePosition: { + x: -0.05, + y: .06, + z: 0.1 + }, + leftRelativePosition: { + x: 0.05, + y: 0.06, z: 0.1 }, relativeRotation: Quat.fromPitchYawRollDegrees(0, -90, -90) diff --git a/unpublishedScripts/masterReset.js b/unpublishedScripts/masterReset.js index 81c2db9e05..79e14b4c88 100644 --- a/unpublishedScripts/masterReset.js +++ b/unpublishedScripts/masterReset.js @@ -286,15 +286,15 @@ MasterReset = function() { spatialKey: { rightRelativePosition: { x: 0.03, - y: 0, + y: 0.0, z: -0.085 }, leftRelativePosition: { x: -0.03, - y: 0, + y: 0.00, z: -0.085 }, - relativeRotation: Quat.fromPitchYawRollDegrees(100, 90, 0) + relativeRotation: Quat.fromPitchYawRollDegrees(90, 90, 0) }, invertSolidWhileHeld: true }, @@ -1146,9 +1146,14 @@ MasterReset = function() { }, grabbableKey: { spatialKey: { - relativePosition: { - x: 0.01, - y: 0, + rightRelativePosition: { + x: -0.05, + y: .06, + z: 0.1 + }, + leftRelativePosition: { + x: 0.05, + y: 0.06, z: 0.1 }, relativeRotation: Quat.fromPitchYawRollDegrees(0, -90, -90) From 9a51a011c56354d0cda8b3d8a871642bcda74c67 Mon Sep 17 00:00:00 2001 From: ericrius1 Date: Wed, 13 Jan 2016 15:51:22 -0800 Subject: [PATCH 5/5] further tweaks --- unpublishedScripts/hiddenEntityReset.js | 8 ++++---- unpublishedScripts/masterReset.js | 8 ++++---- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/unpublishedScripts/hiddenEntityReset.js b/unpublishedScripts/hiddenEntityReset.js index cd4a05dfce..8f095ba0c5 100644 --- a/unpublishedScripts/hiddenEntityReset.js +++ b/unpublishedScripts/hiddenEntityReset.js @@ -302,12 +302,12 @@ rightRelativePosition: { x: 0.03, y: 0.0, - z: -0.085 + z: -0.065 }, leftRelativePosition: { x: -0.03, y: 0.00, - z: -0.085 + z: -0.065 }, relativeRotation: Quat.fromPitchYawRollDegrees(90, 90, 0) }, @@ -1163,12 +1163,12 @@ rightRelativePosition: { x: -0.05, y: .06, - z: 0.1 + z: 0.05 }, leftRelativePosition: { x: 0.05, y: 0.06, - z: 0.1 + z: 0.05 }, relativeRotation: Quat.fromPitchYawRollDegrees(0, -90, -90) }, diff --git a/unpublishedScripts/masterReset.js b/unpublishedScripts/masterReset.js index 79e14b4c88..e6605c17e0 100644 --- a/unpublishedScripts/masterReset.js +++ b/unpublishedScripts/masterReset.js @@ -287,12 +287,12 @@ MasterReset = function() { rightRelativePosition: { x: 0.03, y: 0.0, - z: -0.085 + z: -0.065 }, leftRelativePosition: { x: -0.03, y: 0.00, - z: -0.085 + z: -0.065 }, relativeRotation: Quat.fromPitchYawRollDegrees(90, 90, 0) }, @@ -1149,12 +1149,12 @@ MasterReset = function() { rightRelativePosition: { x: -0.05, y: .06, - z: 0.1 + z: 0.05 }, leftRelativePosition: { x: 0.05, y: 0.06, - z: 0.1 + z: 0.05 }, relativeRotation: Quat.fromPitchYawRollDegrees(0, -90, -90) },