From 45ce1576b5694e786ea2557789f7df8e71df5a09 Mon Sep 17 00:00:00 2001
From: Melbyj1125 <60886701+Melbyj1125@users.noreply.github.com>
Date: Fri, 10 Dec 2021 13:42:32 -0600
Subject: [PATCH] updated debug and network player prefab

---
 .../Prefabs/Player/DebugPlayerPrefab.prefab   | 17 ++++++++------
 Assets/Prefabs/Player/PlayerPrefab.prefab     | 23 ++++++++++++++++++-
 .../DebugPlayer/dPlayerMovement.cs            |  2 +-
 UserSettings/EditorUserSettings.asset         | 10 ++++----
 4 files changed, 38 insertions(+), 14 deletions(-)

diff --git a/Assets/Prefabs/Player/DebugPlayerPrefab.prefab b/Assets/Prefabs/Player/DebugPlayerPrefab.prefab
index 8ff0def..b2c6c33 100644
--- a/Assets/Prefabs/Player/DebugPlayerPrefab.prefab
+++ b/Assets/Prefabs/Player/DebugPlayerPrefab.prefab
@@ -297,16 +297,16 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: addc2e37ff81c1b4989ec34b6150b4f7, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
-  maxVel: 25
-  minVel: 2
+  maxVel: 40
+  minVel: 15
   curVel: 0
-  acc: 0.1
-  jumpPow: 500
+  acc: 0.01
+  jumpPow: 60
   jumpNum: 2
   traction: 3
   kickPow: 150
   recovTime: 3
-  playerGrav: 35
+  playerGrav: 200
   hasBlink: 0
   hasGlider: 0
   hasGrapple: 0
@@ -439,6 +439,8 @@ MonoBehaviour:
   pStats: {fileID: 0}
   vel: {x: 0, y: 0, z: 0}
   curJumpNum: 0
+  lowJumpMultiplier: 0.3
+  fallMultiplier: 1.5
   isGrounded: 0
   groundCheckDistance: 0.05
   cam: {fileID: 4654986889578046791}
@@ -457,6 +459,7 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: 813241e4d3933be429c9295081a09142, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
+  pMove: {fileID: 0}
   pStats: {fileID: 0}
 --- !u!114 &471283137481508403
 MonoBehaviour:
@@ -486,7 +489,7 @@ MonoBehaviour:
   moveDirection: {x: 0, y: 0, z: 0}
   dashDistance: 10
   dashStoppingSpeed: 0.1
-  dashItem: {fileID: 0}
+  dashItem: {fileID: 11400000, guid: 4399d7276b3edf446ac51c5145539a5e, type: 2}
 --- !u!114 &1818923263116056088
 MonoBehaviour:
   m_ObjectHideFlags: 0
@@ -499,7 +502,7 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: f4264f4f7bed1d7499a037436582ed17, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
-  wallMaxDistance: 5
+  wallMaxDistance: 0.8
   wallSpeedMultiplier: 1.2
   minimumHeight: 0.1
   maxAngleRoll: 20
diff --git a/Assets/Prefabs/Player/PlayerPrefab.prefab b/Assets/Prefabs/Player/PlayerPrefab.prefab
index da25140..c7aad01 100644
--- a/Assets/Prefabs/Player/PlayerPrefab.prefab
+++ b/Assets/Prefabs/Player/PlayerPrefab.prefab
@@ -107,6 +107,23 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: addc2e37ff81c1b4989ec34b6150b4f7, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
+  maxVel: 40
+  minVel: 15
+  curVel: 0
+  acc: 0.01
+  jumpPow: 60
+  jumpNum: 2
+  traction: 3
+  kickPow: 150
+  recovTime: 3
+  playerGrav: 200
+  hasBlink: 0
+  hasGlider: 0
+  hasGrapple: 0
+  hasWallrun: 0
+  hasNitro: 0
+  hasDash: 0
+  playerPoints: 15
 --- !u!114 &3725107173017604129
 MonoBehaviour:
   m_ObjectHideFlags: 0
@@ -121,7 +138,6 @@ MonoBehaviour:
   m_EditorClassIdentifier: 
   networkItemList: []
   pStats: {fileID: 0}
-  invMan: {fileID: 0}
 --- !u!114 &508183713705064073
 MonoBehaviour:
   m_ObjectHideFlags: 0
@@ -136,6 +152,9 @@ MonoBehaviour:
   m_EditorClassIdentifier: 
   pStats: {fileID: 0}
   vel: {x: 0, y: 0, z: 0}
+  curJumpNum: 0
+  lowJumpMultiplier: 0.3
+  fallMultiplier: 1.5
   isGrounded: 0
   groundCheckDistance: 0.05
   cam: {fileID: 7188906082643956516}
@@ -191,6 +210,7 @@ MonoBehaviour:
   moveDirection: {x: 0, y: 0, z: 0}
   dashDistance: 10
   dashStoppingSpeed: 0.1
+  dashItem: {fileID: 0}
 --- !u!114 &3672942772524564832
 MonoBehaviour:
   m_ObjectHideFlags: 0
@@ -216,6 +236,7 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: 0c0aad94b3b1332408ef8e7d07f3b321, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
+  pMove: {fileID: 0}
   pStats: {fileID: 0}
 --- !u!114 &2942875262947626129
 MonoBehaviour:
diff --git a/Assets/Scripts/PlayerScripts/DebugPlayer/dPlayerMovement.cs b/Assets/Scripts/PlayerScripts/DebugPlayer/dPlayerMovement.cs
index 6391e7c..e9a54fd 100644
--- a/Assets/Scripts/PlayerScripts/DebugPlayer/dPlayerMovement.cs
+++ b/Assets/Scripts/PlayerScripts/DebugPlayer/dPlayerMovement.cs
@@ -109,7 +109,7 @@ public class dPlayerMovement : NetworkBehaviour
 
         //Get parents up direction
         up = GetComponentInParent<Transform>().up;
-
+//
         //Coyote Timer Initialization
         curCoyJumpTimer = coyJumpTimer;
     }
diff --git a/UserSettings/EditorUserSettings.asset b/UserSettings/EditorUserSettings.asset
index 8253946..17ccef5 100644
--- a/UserSettings/EditorUserSettings.asset
+++ b/UserSettings/EditorUserSettings.asset
@@ -12,19 +12,19 @@ EditorUserSettings:
       value: 22424703114646680e0b0227036c7b151b180b650d262f3d192c0e27d1e33136e7a923e7ee2e26
       flags: 0
     RecentlyUsedScenePath-2:
-      value: 22424703114646680e0b0227036c7b151b180b6501273035202c1327d1e33136e7a923e7ee2e26
+      value: 22424703114646680e0b0227036c7b151b180b6519016b0515163936efef2776f7e93ffdfe
       flags: 0
     RecentlyUsedScenePath-3:
-      value: 22424703114646680e0b0227036c7b151b180b6519016b0515163936efef2776f7e93ffdfe
+      value: 22424703114646680e0b0227036c731f1415016439262f2434
       flags: 0
     RecentlyUsedScenePath-4:
       value: 22424703114646680e0b0227036c731f1415016439262f2434
       flags: 0
     RecentlyUsedScenePath-5:
-      value: 22424703114646680e0b0227036c7b151b180b652b3a27292f260573f1e33136e7a923e7ee2e26
+      value: 22424703114646680e0b0227036c78111b125507233d28242c20137df7ee3d2cfb
       flags: 0
     RecentlyUsedScenePath-6:
-      value: 22424703114646680e0b0227036c6f1f05033f2b212d68252320092a
+      value: 22424703114646680e0b0227036c7b151b180b652b3a27292f260573f1e33136e7a923e7ee2e26
       flags: 0
     RecentlyUsedScenePath-7:
       value: 22424703114646680e0b0227036c7b151b180b652b3a27292f260573f1e33136e7a923e7ee2e26
@@ -33,7 +33,7 @@ EditorUserSettings:
       value: 22424703114646680e0b0227036c7b151b180b650e3a233126281f3fe7c23837e1ec25a7f234362820
       flags: 0
     RecentlyUsedScenePath-9:
-      value: 22424703114646680e0b0227036c7b151b180b650e3a233126281f3fe7c23837e1ec25a7f234362820
+      value: 22424703114646680e0b0227036c7b151b180b6501273035202c1327d1e33136e7a923e7ee2e26
       flags: 0
     UnityRemoteCompression:
       value: 337f73