From 8fbedf486d6ddef95fffed1ad30948d2f2c169f0 Mon Sep 17 00:00:00 2001
From: Melbyj1125 <60886701+Melbyj1125@users.noreply.github.com>
Date: Mon, 7 Feb 2022 18:10:32 -0600
Subject: [PATCH] made dash use R button

---
 Assets/Prefabs/Player/DebugPlayerPrefab 1.prefab           | 2 +-
 Assets/Prefabs/Player/DebugPlayerPrefab.prefab             | 2 +-
 Assets/Prefabs/Player/PlayerPrefab 2.prefab                | 2 +-
 Assets/Prefabs/Player/PlayerPrefab.prefab                  | 2 +-
 Assets/Scenes/Demos/MovementScene.unity                    | 2 +-
 .../Scripts/PlayerScripts/PlayerItems/ItemScripts/Dash.cs  | 2 +-
 UserSettings/EditorUserSettings.asset                      | 7 ++-----
 7 files changed, 8 insertions(+), 11 deletions(-)

diff --git a/Assets/Prefabs/Player/DebugPlayerPrefab 1.prefab b/Assets/Prefabs/Player/DebugPlayerPrefab 1.prefab
index 5bc5428..b039ab9 100644
--- a/Assets/Prefabs/Player/DebugPlayerPrefab 1.prefab	
+++ b/Assets/Prefabs/Player/DebugPlayerPrefab 1.prefab	
@@ -3640,7 +3640,7 @@ MonoBehaviour:
   m_Name: 
   m_EditorClassIdentifier: 
   maxVel: 45
-  minVel: 15
+  minVel: 18
   curVel: 0
   hardCapMaxVel: 90
   acc: 0.02
diff --git a/Assets/Prefabs/Player/DebugPlayerPrefab.prefab b/Assets/Prefabs/Player/DebugPlayerPrefab.prefab
index a95929f..9aa4533 100644
--- a/Assets/Prefabs/Player/DebugPlayerPrefab.prefab
+++ b/Assets/Prefabs/Player/DebugPlayerPrefab.prefab
@@ -302,7 +302,7 @@ MonoBehaviour:
   m_Name: 
   m_EditorClassIdentifier: 
   maxVel: 45
-  minVel: 15
+  minVel: 18
   curVel: 0
   hardCapMaxVel: 90
   acc: 0.02
diff --git a/Assets/Prefabs/Player/PlayerPrefab 2.prefab b/Assets/Prefabs/Player/PlayerPrefab 2.prefab
index bfaa218..9029042 100644
--- a/Assets/Prefabs/Player/PlayerPrefab 2.prefab	
+++ b/Assets/Prefabs/Player/PlayerPrefab 2.prefab	
@@ -261,7 +261,7 @@ MonoBehaviour:
   m_Name: 
   m_EditorClassIdentifier: 
   maxVel: 45
-  minVel: 15
+  minVel: 18
   curVel: 0
   hardCapMaxVel: 90
   acc: 0.02
diff --git a/Assets/Prefabs/Player/PlayerPrefab.prefab b/Assets/Prefabs/Player/PlayerPrefab.prefab
index d97befb..7d9b0b7 100644
--- a/Assets/Prefabs/Player/PlayerPrefab.prefab
+++ b/Assets/Prefabs/Player/PlayerPrefab.prefab
@@ -301,7 +301,7 @@ MonoBehaviour:
   m_Name: 
   m_EditorClassIdentifier: 
   maxVel: 45
-  minVel: 15
+  minVel: 18
   curVel: 0
   hardCapMaxVel: 90
   acc: 0.02
diff --git a/Assets/Scenes/Demos/MovementScene.unity b/Assets/Scenes/Demos/MovementScene.unity
index a55f10d..d4dd035 100644
--- a/Assets/Scenes/Demos/MovementScene.unity
+++ b/Assets/Scenes/Demos/MovementScene.unity
@@ -2308,7 +2308,7 @@ PrefabInstance:
       objectReference: {fileID: 0}
     - target: {fileID: 6664667533527261801, guid: 6adb8bcc65ee3a54da64d7c65225f219, type: 3}
       propertyPath: minVel
-      value: 15
+      value: 18
       objectReference: {fileID: 0}
     - target: {fileID: 6664667533527261801, guid: 6adb8bcc65ee3a54da64d7c65225f219, type: 3}
       propertyPath: hasGrapple
diff --git a/Assets/Scripts/PlayerScripts/PlayerItems/ItemScripts/Dash.cs b/Assets/Scripts/PlayerScripts/PlayerItems/ItemScripts/Dash.cs
index 09c1878..a8d3f02 100644
--- a/Assets/Scripts/PlayerScripts/PlayerItems/ItemScripts/Dash.cs
+++ b/Assets/Scripts/PlayerScripts/PlayerItems/ItemScripts/Dash.cs
@@ -33,7 +33,7 @@ public class Dash : NetworkBehaviour{
     void DashPlayer(){
         //if (!IsLocalPlayer) { return; }
         if(characterController.enabled == true){
-            if ((Input.GetKeyDown(KeyCode.E) || Input.GetAxis("Dash") != 0) && isOnCoolDown == false)
+            if ((Input.GetKeyDown(KeyCode.R) || Input.GetAxis("Dash") != 0) && isOnCoolDown == false)
             {
                 currentDashTime = 0;
                 StartCoroutine(startCoolDown());
diff --git a/UserSettings/EditorUserSettings.asset b/UserSettings/EditorUserSettings.asset
index 95d06dc..46b5659 100644
--- a/UserSettings/EditorUserSettings.asset
+++ b/UserSettings/EditorUserSettings.asset
@@ -6,7 +6,7 @@ EditorUserSettings:
   serializedVersion: 4
   m_ConfigSettings:
     RecentlyUsedScenePath-0:
-      value: 22424703114646680e0b0227036c6b19021b1d192f2d2835633c133af6f9
+      value: 22424703114646680e0b0227036c731f1415016439262f2434
       flags: 0
     RecentlyUsedScenePath-1:
       value: 22424703114646680e0b0227036c6f1f05033f2b212d68252320092a
@@ -24,10 +24,7 @@ EditorUserSettings:
       value: 22424703114646680e0b0227036c7b151b180b6501273035202c1327d1e33136e7a923e7ee2e26
       flags: 0
     RecentlyUsedScenePath-6:
-      value: 22424703114646680e0b0227036c7b151b180b6501273035202c1327d1e33136e7a923e7ee2e26
-      flags: 0
-    RecentlyUsedScenePath-7:
-      value: 22424703114646680e0b0227036c7b151b180b652b3a27292f260573f1e33136e7a923e7ee2e26
+      value: 22424703114646680e0b0227036c6f02131b172b282d347e38271427fb
       flags: 0
     vcSharedLogLevel:
       value: 0d5e400f0650