diff --git a/unpublishedScripts/hiddenEntityReset.js b/unpublishedScripts/hiddenEntityReset.js index 4352a5d562..8f095ba0c5 100644 --- a/unpublishedScripts/hiddenEntityReset.js +++ b/unpublishedScripts/hiddenEntityReset.js @@ -113,7 +113,6 @@ z: 504.5 }); - createCombinedArmChair({ x: 549.29, y: 494.9, @@ -300,12 +299,17 @@ userData: JSON.stringify({ grabbableKey: { spatialKey: { - relativePosition: { - x: 0, - y: 0, - z: 0 + rightRelativePosition: { + x: 0.03, + y: 0.0, + z: -0.065 }, - relativeRotation: Quat.fromPitchYawRollDegrees(45, 90, 0) + leftRelativePosition: { + x: -0.03, + y: 0.00, + z: -0.065 + }, + relativeRotation: Quat.fromPitchYawRollDegrees(90, 90, 0) }, invertSolidWhileHeld: true }, @@ -359,12 +363,17 @@ grabbableKey: { invertSolidWhileHeld: true, spatialKey: { - relativePosition: { - x: 0, - y: 0.06, + rightRelativePosition: { + x: 0.03, + y: 0.08, z: 0.11 }, - relativeRotation: Quat.fromPitchYawRollDegrees(0, -90, 90) + leftRelativePosition: { + x: -0.03, + y: 0.08, + z: 0.11 + }, + relativeRotation: Quat.fromPitchYawRollDegrees(180, 90, 90) } } }) @@ -1151,10 +1160,15 @@ }, grabbableKey: { spatialKey: { - relativePosition: { + rightRelativePosition: { x: -0.05, - y: 0, - z: 0.0 + y: .06, + z: 0.05 + }, + leftRelativePosition: { + x: 0.05, + y: 0.06, + z: 0.05 }, relativeRotation: Quat.fromPitchYawRollDegrees(0, -90, -90) }, @@ -1509,4 +1523,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..e6605c17e0 100644 --- a/unpublishedScripts/masterReset.js +++ b/unpublishedScripts/masterReset.js @@ -285,16 +285,16 @@ MasterReset = function() { grabbableKey: { spatialKey: { rightRelativePosition: { - x: 0.02, - y: 0, - z: -0.03 + x: 0.03, + y: 0.0, + z: -0.065 }, leftRelativePosition: { - x: -0.02, - y: 0, - z: -0.03 + x: -0.03, + y: 0.00, + z: -0.065 }, - relativeRotation: Quat.fromPitchYawRollDegrees(100, 90, 0) + relativeRotation: Quat.fromPitchYawRollDegrees(90, 90, 0) }, invertSolidWhileHeld: true }, @@ -348,12 +348,17 @@ MasterReset = function() { grabbableKey: { invertSolidWhileHeld: true, spatialKey: { - relativePosition: { - x: 0, - y: 0.06, + rightRelativePosition: { + x: 0.03, + y: 0.08, z: 0.11 }, - relativeRotation: Quat.fromPitchYawRollDegrees(0, -90, 90) + leftRelativePosition: { + x: -0.03, + y: 0.08, + z: 0.11 + }, + relativeRotation: Quat.fromPitchYawRollDegrees(180, 90, 90) } } }) @@ -1141,10 +1146,15 @@ MasterReset = function() { }, grabbableKey: { spatialKey: { - relativePosition: { - x: 0, - y: 0, - z: 0.06 + rightRelativePosition: { + x: -0.05, + y: .06, + z: 0.05 + }, + leftRelativePosition: { + x: 0.05, + y: 0.06, + z: 0.05 }, relativeRotation: Quat.fromPitchYawRollDegrees(0, -90, -90) }, @@ -1494,4 +1504,4 @@ MasterReset = function() { Script.scriptEnding.connect(cleanup); } -}; +}; \ No newline at end of file