From efb3e577d2af5b84400366ed6926b3a4cbdd55ff Mon Sep 17 00:00:00 2001
From: Ryan Huffman <ryanhuffman@gmail.com>
Date: Tue, 20 Dec 2016 16:00:41 -0800
Subject: [PATCH] Add support to tutorial for touch grip equip

---
 tutorial/tutorial.js          |  9 +++++----
 tutorial/tutorialEntityIDs.js | 24 ++++++++++++++++--------
 2 files changed, 21 insertions(+), 12 deletions(-)

diff --git a/tutorial/tutorial.js b/tutorial/tutorial.js
index a3941cbef0..77fd497361 100644
--- a/tutorial/tutorial.js
+++ b/tutorial/tutorial.js
@@ -535,11 +535,12 @@ stepNearGrab.prototype = {
         this.finished = false;
         this.onFinish = onFinish;
 
-        setControllerPartLayer('tips', 'trigger');
-
         if (this.controllerName === CONTROLLER_TOUCH) {
-            setControllerPartLayer('both_triggers', 'highlight');
+            setControllerPartLayer('tips', 'both_triggers');
+            setControllerPartLayer('trigger', 'highlight');
+            setControllerPartLayer('grip', 'highlight');
         } else {
+            setControllerPartLayer('tips', 'trigger');
             setControllerPartLayer('trigger', 'highlight');
         }
 
@@ -581,8 +582,8 @@ stepNearGrab.prototype = {
         debug("NearGrab | Cleanup");
         this.finished = true;
         setControllerPartLayer('tips', 'blank');
-        setControllerPartLayer('both_triggers', 'normal');
         setControllerPartLayer('trigger', 'normal');
+        setControllerPartLayer('grip', 'normal');
         hideEntitiesWithTags(this.tags);
         deleteEntitiesWithTag(this.tempTag);
         if (this.positionWatcher) {
diff --git a/tutorial/tutorialEntityIDs.js b/tutorial/tutorialEntityIDs.js
index e98131e8ed..f53ac1a56c 100644
--- a/tutorial/tutorialEntityIDs.js
+++ b/tutorial/tutorialEntityIDs.js
@@ -77,13 +77,20 @@ TUTORIAL_TAG_TO_ENTITY_IDS_MAP = {
             "tag": "nearGrab"
         }
     },
+    "equip-part1-touch": {
+        "{470f0634-8be7-4b52-a8bd-5183d489fcb6}": {
+            "tag": "equip-part1-touch"
+        }
+    },
+    "equip-part1-vive": {
+        "{97ced5e7-fc81-40f9-a9e8-f85b4b30f24c}": {
+            "tag": "equip-part1-vive"
+        }
+    },
     "equip-part1": {
         "{d73822ca-0a34-4cf4-a530-3258ac459a14}": {
             "tag": "equip-part1"
         },
-        "{97ced5e7-fc81-40f9-a9e8-f85b4b30f24c}": {
-            "tag": "equip-part1"
-        },
         "{8572d991-5777-45df-97bf-7243d7b12f81}": {
             "tag": "equip-part1"
         },
@@ -109,16 +116,17 @@ TUTORIAL_TAG_TO_ENTITY_IDS_MAP = {
     "equip-part2-vive": {
         "{b5d17eda-90ab-40cf-b973-efcecb2e992e}": {
             "tag": "equip-part2-vive"
+        },
+        "{6307cd16-dd1d-4988-a339-578178436b45}": {
+            "tag": "equip-part2-vive"
         }
     },
     "equip-part2-touch": {
         "{69195139-e020-4739-bb2c-50faebc6860a}": {
             "tag": "equip-part2-touch"
-        }
-    },
-    "equip-part2": {
-        "{6307cd16-dd1d-4988-a339-578178436b45}": {
-            "tag": "equip-part2"
+        },
+        "{9b0a99ae-221b-4e59-ba3c-d8e64a083774}": {
+            "tag": "equip-part2-touch"
         }
     },
     "bothGrab": {