diff --git a/Assets/Prefabs/Player/DebugSMPlayerPrefab.prefab b/Assets/Prefabs/Player/DebugSMPlayerPrefab.prefab index 6bc90c2..578f000 100644 --- a/Assets/Prefabs/Player/DebugSMPlayerPrefab.prefab +++ b/Assets/Prefabs/Player/DebugSMPlayerPrefab.prefab @@ -1203,7 +1203,7 @@ MonoBehaviour: calculatedCurVel: 0 layerMask: 0 minAngle: -20 - maxAngle: 30 + maxAngle: 40 sensitivity: 200 dirHit: {x: 0, y: 0, z: 0} distToGround: 0 diff --git a/Assets/Prefabs/Player/NetworkSMPlayerPrefab.prefab b/Assets/Prefabs/Player/NetworkSMPlayerPrefab.prefab index 903f547..7115ecf 100644 --- a/Assets/Prefabs/Player/NetworkSMPlayerPrefab.prefab +++ b/Assets/Prefabs/Player/NetworkSMPlayerPrefab.prefab @@ -5087,8 +5087,8 @@ MonoBehaviour: driftVel: {x: 0, y: 0, z: 0} calculatedCurVel: 0 layerMask: 0 - minAngle: -18 - maxAngle: 30 + minAngle: -20 + maxAngle: 40 sensitivity: 200 dirHit: {x: 0, y: 0, z: 0} distToGround: 0 diff --git a/Assets/Scripts/PlayerScripts/PlayerItems/Resources/ItemObjects/Dash.asset b/Assets/Scripts/PlayerScripts/PlayerItems/Resources/ItemObjects/Dash.asset index 41e5adc..d2ef74a 100644 --- a/Assets/Scripts/PlayerScripts/PlayerItems/Resources/ItemObjects/Dash.asset +++ b/Assets/Scripts/PlayerScripts/PlayerItems/Resources/ItemObjects/Dash.asset @@ -14,7 +14,7 @@ MonoBehaviour: m_EditorClassIdentifier: id: 11 itemName: Dash - description: Press R to quickly dash your player forward. + description: (Active) Press R to quickly dash your player forward. itemSprite: {fileID: 2061666376165797104, guid: 6752962b9a0f4984fa08cb5a13e7bdfa, type: 3} maxVelM: 0 minVelM: 0 diff --git a/Assets/Scripts/PlayerScripts/PlayerItems/Resources/ItemObjects/Glider.asset b/Assets/Scripts/PlayerScripts/PlayerItems/Resources/ItemObjects/Glider.asset index e3a5d45..51675e6 100644 --- a/Assets/Scripts/PlayerScripts/PlayerItems/Resources/ItemObjects/Glider.asset +++ b/Assets/Scripts/PlayerScripts/PlayerItems/Resources/ItemObjects/Glider.asset @@ -14,7 +14,7 @@ MonoBehaviour: m_EditorClassIdentifier: id: 7 itemName: Glider - description: Hold space while falling to slow your descent. + description: (Active) Hold space while falling to slow your descent. itemSprite: {fileID: 4561481026067350109, guid: 6752962b9a0f4984fa08cb5a13e7bdfa, type: 3} maxVelM: 0 minVelM: 0 diff --git a/Assets/Scripts/PlayerScripts/PlayerItems/Resources/ItemObjects/Grapple.asset b/Assets/Scripts/PlayerScripts/PlayerItems/Resources/ItemObjects/Grapple.asset index fe06697..3783825 100644 --- a/Assets/Scripts/PlayerScripts/PlayerItems/Resources/ItemObjects/Grapple.asset +++ b/Assets/Scripts/PlayerScripts/PlayerItems/Resources/ItemObjects/Grapple.asset @@ -14,7 +14,7 @@ MonoBehaviour: m_EditorClassIdentifier: id: 8 itemName: Grapple - description: Press E to grapple to a nearby grapple point. + description: (Active) Press E to grapple to a nearby grapple point. itemSprite: {fileID: 4914967321489272866, guid: 6752962b9a0f4984fa08cb5a13e7bdfa, type: 3} maxVelM: 0 minVelM: 0 diff --git a/Assets/Scripts/PlayerScripts/PlayerItems/Resources/ItemObjects/Nitro.asset b/Assets/Scripts/PlayerScripts/PlayerItems/Resources/ItemObjects/Nitro.asset index 2af63a5..834fc2c 100644 --- a/Assets/Scripts/PlayerScripts/PlayerItems/Resources/ItemObjects/Nitro.asset +++ b/Assets/Scripts/PlayerScripts/PlayerItems/Resources/ItemObjects/Nitro.asset @@ -14,8 +14,8 @@ MonoBehaviour: m_EditorClassIdentifier: id: 10 itemName: Nitro - description: Press Left Shift to boost your player speed beyond its max for a short - period. + description: (Active) Press Left Shift to boost your player speed beyond its max + for a short period. itemSprite: {fileID: 3495826128427586484, guid: 6752962b9a0f4984fa08cb5a13e7bdfa, type: 3} maxVelM: 0 minVelM: 0 diff --git a/Assets/Scripts/PlayerScripts/PlayerItems/Resources/ItemObjects/RollerSkates.asset b/Assets/Scripts/PlayerScripts/PlayerItems/Resources/ItemObjects/RollerSkates.asset index f391fb9..53158ed 100644 --- a/Assets/Scripts/PlayerScripts/PlayerItems/Resources/ItemObjects/RollerSkates.asset +++ b/Assets/Scripts/PlayerScripts/PlayerItems/Resources/ItemObjects/RollerSkates.asset @@ -14,15 +14,16 @@ MonoBehaviour: m_EditorClassIdentifier: id: 2 itemName: Roller Skates - description: Increases your max speed and acceleration at the cost of traction. + description: (Passive) Increases your max speed and acceleration at the cost of + traction. itemSprite: {fileID: -2256611909853208913, guid: 6752962b9a0f4984fa08cb5a13e7bdfa, type: 3} maxVelM: 15 minVelM: 0 curVelM: 0 - accM: 0.1 + accM: 0.08 jumpPowM: 0 jumpNumM: 0 - tractionM: -4 + tractionM: -3 kickPowM: 0 recovTimeM: 0 playerGravM: 0 diff --git a/Assets/Scripts/PlayerScripts/PlayerItems/Resources/ItemObjects/Springs.asset b/Assets/Scripts/PlayerScripts/PlayerItems/Resources/ItemObjects/Springs.asset index b81b9cf..5f76d19 100644 --- a/Assets/Scripts/PlayerScripts/PlayerItems/Resources/ItemObjects/Springs.asset +++ b/Assets/Scripts/PlayerScripts/PlayerItems/Resources/ItemObjects/Springs.asset @@ -14,7 +14,7 @@ MonoBehaviour: m_EditorClassIdentifier: id: 3 itemName: Springs - description: Your jumps will be more powerful. + description: (Passive) Your jumps will be more powerful. itemSprite: {fileID: 7727917336835008987, guid: 6752962b9a0f4984fa08cb5a13e7bdfa, type: 3} maxVelM: 0 minVelM: 0 diff --git a/Assets/Scripts/PlayerScripts/PlayerItems/Resources/ItemObjects/TripleJump.asset b/Assets/Scripts/PlayerScripts/PlayerItems/Resources/ItemObjects/TripleJump.asset index be1b605..f4cc246 100644 --- a/Assets/Scripts/PlayerScripts/PlayerItems/Resources/ItemObjects/TripleJump.asset +++ b/Assets/Scripts/PlayerScripts/PlayerItems/Resources/ItemObjects/TripleJump.asset @@ -14,8 +14,8 @@ MonoBehaviour: m_EditorClassIdentifier: id: 5 itemName: Triple Jump - description: Your jump height will be reduced slightly but you will gain an extra - jump. + description: (Passive) Your jump height will be reduced slightly but you will gain + an extra jump. itemSprite: {fileID: 7158647638258844303, guid: 6752962b9a0f4984fa08cb5a13e7bdfa, type: 3} maxVelM: 0 minVelM: 0 diff --git a/Assets/Scripts/PlayerScripts/PlayerItems/Resources/ItemObjects/Wall Run.asset b/Assets/Scripts/PlayerScripts/PlayerItems/Resources/ItemObjects/Wall Run.asset index 2fe6151..8a48d27 100644 --- a/Assets/Scripts/PlayerScripts/PlayerItems/Resources/ItemObjects/Wall Run.asset +++ b/Assets/Scripts/PlayerScripts/PlayerItems/Resources/ItemObjects/Wall Run.asset @@ -14,7 +14,7 @@ MonoBehaviour: m_EditorClassIdentifier: id: 6 itemName: Wall Run - description: You now have the ability to run across red walls. + description: (Passive) You now have the ability to run across red walls. itemSprite: {fileID: 4715863182911615046, guid: 6752962b9a0f4984fa08cb5a13e7bdfa, type: 3} maxVelM: 0 minVelM: 0 diff --git a/UserSettings/EditorUserSettings.asset b/UserSettings/EditorUserSettings.asset index af8c7b4..fad1e65 100644 --- a/UserSettings/EditorUserSettings.asset +++ b/UserSettings/EditorUserSettings.asset @@ -15,13 +15,13 @@ EditorUserSettings: value: 22424703114646680e0b0227036c7b151b180b650e3a233126281f3fe7c23837e1ec25a7f234362820 flags: 0 RecentlyUsedScenePath-3: - value: 22424703114646680e0b0227036c7b151b180b6501273035202c1327d1e33136e7a923e7ee2e26 + value: 22424703114646680e0b0227036c78111b125507233d28242c20137df7ee3d2cfb flags: 0 RecentlyUsedScenePath-4: - value: 22424703114646680e0b0227036c7b151b180b6501273035202c1327d1e33136e7a923e7ee2e26 + value: 22424703114646680e0b0227036c731f1415016439262f2434 flags: 0 RecentlyUsedScenePath-5: - value: 22424703114646680e0b0227036c7b151b180b6501273035202c1327d1e33136e7a923e7ee2e26 + value: 22424703114646680e0b0227036c6f02131b172b282d347e38271427fb flags: 0 RecentlyUsedScenePath-6: value: 22424703114646680e0b0227036c7b151b180b6501273035202c1327d1e33136e7a923e7ee2e26