From b32bdba1115a6cbef30b87579c91de727402c997 Mon Sep 17 00:00:00 2001 From: David Rowe Date: Tue, 26 May 2020 14:58:27 +1200 Subject: [PATCH] Reinstate controller module priorities per master --- .../system/controllers/controllerModules/disableOtherModule.js | 2 +- scripts/system/controllers/controllerModules/equipEntity.js | 2 +- scripts/system/controllers/controllerModules/nearGrabEntity.js | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/scripts/system/controllers/controllerModules/disableOtherModule.js b/scripts/system/controllers/controllerModules/disableOtherModule.js index 549735b658..d49776f06a 100644 --- a/scripts/system/controllers/controllerModules/disableOtherModule.js +++ b/scripts/system/controllers/controllerModules/disableOtherModule.js @@ -17,7 +17,7 @@ Script.include("/~/system/libraries/controllerDispatcherUtils.js"); this.hand = hand; this.disableModules = false; this.parameters = makeDispatcherModuleParameters( - 82, + 95, this.hand === RIGHT_HAND ? ["rightHand", "rightHandEquip", "rightHandTrigger"] : ["leftHand", "leftHandEquip", "leftHandTrigger"], diff --git a/scripts/system/controllers/controllerModules/equipEntity.js b/scripts/system/controllers/controllerModules/equipEntity.js index 534231f407..54b56ff271 100644 --- a/scripts/system/controllers/controllerModules/equipEntity.js +++ b/scripts/system/controllers/controllerModules/equipEntity.js @@ -278,7 +278,7 @@ EquipHotspotBuddy.prototype.update = function(deltaTime, timestamp, controllerDa this.handHasBeenRightsideUp = false; this.parameters = makeDispatcherModuleParameters( - 85, + 115, this.hand === RIGHT_HAND ? ["rightHand", "rightHandEquip"] : ["leftHand", "leftHandEquip"], [], 100); diff --git a/scripts/system/controllers/controllerModules/nearGrabEntity.js b/scripts/system/controllers/controllerModules/nearGrabEntity.js index 381197badf..45d518bb39 100644 --- a/scripts/system/controllers/controllerModules/nearGrabEntity.js +++ b/scripts/system/controllers/controllerModules/nearGrabEntity.js @@ -28,7 +28,7 @@ Script.include("/~/system/libraries/controllers.js"); this.grabID = null; this.parameters = makeDispatcherModuleParameters( - 90, + 500, this.hand === RIGHT_HAND ? ["rightHand"] : ["leftHand"], [], 100);