From 076bf0e15814fcd4efc76e59afc328b08a069990 Mon Sep 17 00:00:00 2001 From: Melbyj1125 <60886701+Melbyj1125@users.noreply.github.com> Date: Wed, 26 Jan 2022 13:30:01 -0600 Subject: [PATCH] fixed a couple of the bugs that was found in playtest 3 --- .../Prefabs/Player/DebugPlayerPrefab 1.prefab | 25 ++- .../Prefabs/Player/DebugPlayerPrefab.prefab | 8 +- Assets/Prefabs/Player/PlayerPrefab 2.prefab | 17 +- Assets/Prefabs/Player/PlayerPrefab.prefab | 2 +- Assets/Scenes/Demos/MovementScene.unity | 158 +++++++----------- Assets/Scenes/Lobby.unity | 24 ++- .../DebugPlayer/DebugItems/dNitro.cs | 37 ++++ .../DebugPlayer/DebugItems/dNitro.cs.meta | 11 ++ .../PlayerScripts/DebugPlayer/dPlayCam.cs | 2 +- .../DebugPlayer/dPlayerMovement.cs | 3 +- .../PlayerItems/ItemScripts/Nitro.cs | 2 +- .../Resources/ItemObjects/Springs.asset | 2 +- .../Scripts/SetInvScene/InvSceneSettings.cs | 4 +- UserSettings/EditorUserSettings.asset | 6 +- 14 files changed, 180 insertions(+), 121 deletions(-) create mode 100644 Assets/Scripts/PlayerScripts/DebugPlayer/DebugItems/dNitro.cs create mode 100644 Assets/Scripts/PlayerScripts/DebugPlayer/DebugItems/dNitro.cs.meta diff --git a/Assets/Prefabs/Player/DebugPlayerPrefab 1.prefab b/Assets/Prefabs/Player/DebugPlayerPrefab 1.prefab index 4f3d1ce..dd3a314 100644 --- a/Assets/Prefabs/Player/DebugPlayerPrefab 1.prefab +++ b/Assets/Prefabs/Player/DebugPlayerPrefab 1.prefab @@ -1483,7 +1483,7 @@ Transform: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 3039877022422189067} m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} - m_LocalPosition: {x: 44.3, y: 6.52, z: -4} + m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} m_Children: - {fileID: 1950656855408660672} @@ -3090,7 +3090,7 @@ Transform: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 5150911369967604842} m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} - m_LocalPosition: {x: -0.088, y: 2.45, z: -3.76} + m_LocalPosition: {x: 0, y: 3.73, z: -3.75} m_LocalScale: {x: 1, y: 1, z: 1} m_Children: [] m_Father: {fileID: 297879044457584256} @@ -3486,6 +3486,7 @@ GameObject: - component: {fileID: 6664667533527262097} - component: {fileID: 6664667533527262098} - component: {fileID: 6664667533527262099} + - component: {fileID: 2761631967499966007} m_Layer: 0 m_Name: T-Pose m_TagString: Player @@ -3684,14 +3685,14 @@ MonoBehaviour: vel: {x: 0, y: 0, z: 0} driftVel: {x: 0, y: 0, z: 0} curJumpNum: 0 - lowJumpMultiplier: 0.1 + lowJumpMultiplier: 0.001 fallMultiplier: 1.6 g: 0 isGrounded: 0 groundCheckDistance: 0.05 cam: {fileID: 2637749574256434612} minAngle: -30 - maxAngle: 45 + maxAngle: 30 sensitivity: 200 isSliding: 0 --- !u!114 &6664667533527262096 @@ -3739,7 +3740,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 &6664667533527262099 MonoBehaviour: m_ObjectHideFlags: 0 @@ -3760,7 +3761,19 @@ MonoBehaviour: jumpDuration: 0.02 wallBouncing: 3 cameraTransitionDuration: 1 - wallGravityDownForce: 5 + wallGravityDownForce: 3 +--- !u!114 &2761631967499966007 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 6664667533527262100} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 71b2b26f3c822f045b43d4966fb097e6, type: 3} + m_Name: + m_EditorClassIdentifier: --- !u!1 &6716225286288627934 GameObject: m_ObjectHideFlags: 0 diff --git a/Assets/Prefabs/Player/DebugPlayerPrefab.prefab b/Assets/Prefabs/Player/DebugPlayerPrefab.prefab index 7866e8d..5bce95b 100644 --- a/Assets/Prefabs/Player/DebugPlayerPrefab.prefab +++ b/Assets/Prefabs/Player/DebugPlayerPrefab.prefab @@ -27,7 +27,7 @@ Transform: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 2556153648277679257} m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} - m_LocalPosition: {x: 0, y: 4.5, z: -7} + m_LocalPosition: {x: 0, y: 4.6, z: -8.7} m_LocalScale: {x: 1, y: 1, z: 1} m_Children: [] m_Father: {fileID: 6926740475113451123} @@ -229,7 +229,7 @@ Transform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 3607330906377400225} - m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: 0, y: 3.15, z: -4} m_LocalScale: {x: 1, y: 1, z: 1} m_Children: @@ -441,14 +441,14 @@ MonoBehaviour: vel: {x: 0, y: 0, z: 0} driftVel: {x: 0, y: 0, z: 0} curJumpNum: 0 - lowJumpMultiplier: 0.1 + lowJumpMultiplier: 0.0001 fallMultiplier: 1.6 g: 0 isGrounded: 0 groundCheckDistance: 0.05 cam: {fileID: 4654986889578046791} minAngle: -30 - maxAngle: 45 + maxAngle: 30 sensitivity: 200 isSliding: 0 --- !u!114 &4788888989419098570 diff --git a/Assets/Prefabs/Player/PlayerPrefab 2.prefab b/Assets/Prefabs/Player/PlayerPrefab 2.prefab index 0b273ba..e896d8a 100644 --- a/Assets/Prefabs/Player/PlayerPrefab 2.prefab +++ b/Assets/Prefabs/Player/PlayerPrefab 2.prefab @@ -202,6 +202,7 @@ GameObject: - component: {fileID: 643107261017207494} - component: {fileID: 643107261017207493} - component: {fileID: 3000149458743537421} + - component: {fileID: 8545598182256100239} m_Layer: 0 m_Name: T-Pose m_TagString: Player @@ -407,7 +408,7 @@ MonoBehaviour: groundCheckDistance: 0.05 cam: {fileID: 8073346823032474851} minAngle: -30 - maxAngle: 45 + maxAngle: 30 sensitivity: 200 isSliding: 0 --- !u!114 &643107261017207495 @@ -476,7 +477,19 @@ MonoBehaviour: jumpDuration: 0.02 wallBouncing: 3 cameraTransitionDuration: 1 - wallGravityDownForce: 5 + wallGravityDownForce: 3 +--- !u!114 &8545598182256100239 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 643107261017207491} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 1a8c22589436d2449a89cf3a40b6d252, type: 3} + m_Name: + m_EditorClassIdentifier: --- !u!1 &695157680752675209 GameObject: m_ObjectHideFlags: 0 diff --git a/Assets/Prefabs/Player/PlayerPrefab.prefab b/Assets/Prefabs/Player/PlayerPrefab.prefab index ef6598c..759b7b0 100644 --- a/Assets/Prefabs/Player/PlayerPrefab.prefab +++ b/Assets/Prefabs/Player/PlayerPrefab.prefab @@ -161,7 +161,7 @@ MonoBehaviour: groundCheckDistance: 0.05 cam: {fileID: 7188906082643956516} minAngle: -30 - maxAngle: 45 + maxAngle: 30 sensitivity: 301 isSliding: 0 --- !u!114 &273103334658887749 diff --git a/Assets/Scenes/Demos/MovementScene.unity b/Assets/Scenes/Demos/MovementScene.unity index 3235b7f..23eed21 100644 --- a/Assets/Scenes/Demos/MovementScene.unity +++ b/Assets/Scenes/Demos/MovementScene.unity @@ -1545,6 +1545,71 @@ Rigidbody: m_Interpolate: 0 m_Constraints: 0 m_CollisionDetection: 0 +--- !u!1001 &1444336204 +PrefabInstance: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + m_TransformParent: {fileID: 0} + m_Modifications: + - target: {fileID: 297879044457584256, guid: 6adb8bcc65ee3a54da64d7c65225f219, type: 3} + propertyPath: m_RootOrder + value: 8 + objectReference: {fileID: 0} + - target: {fileID: 297879044457584256, guid: 6adb8bcc65ee3a54da64d7c65225f219, type: 3} + propertyPath: m_LocalPosition.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 297879044457584256, guid: 6adb8bcc65ee3a54da64d7c65225f219, type: 3} + propertyPath: m_LocalPosition.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 297879044457584256, guid: 6adb8bcc65ee3a54da64d7c65225f219, type: 3} + propertyPath: m_LocalPosition.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 297879044457584256, guid: 6adb8bcc65ee3a54da64d7c65225f219, type: 3} + propertyPath: m_LocalRotation.w + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 297879044457584256, guid: 6adb8bcc65ee3a54da64d7c65225f219, type: 3} + propertyPath: m_LocalRotation.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 297879044457584256, guid: 6adb8bcc65ee3a54da64d7c65225f219, type: 3} + propertyPath: m_LocalRotation.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 297879044457584256, guid: 6adb8bcc65ee3a54da64d7c65225f219, type: 3} + propertyPath: m_LocalRotation.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 297879044457584256, guid: 6adb8bcc65ee3a54da64d7c65225f219, type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 297879044457584256, guid: 6adb8bcc65ee3a54da64d7c65225f219, type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 297879044457584256, guid: 6adb8bcc65ee3a54da64d7c65225f219, type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3039877022422189067, guid: 6adb8bcc65ee3a54da64d7c65225f219, type: 3} + propertyPath: m_Name + value: DebugPlayerPrefab 1 + objectReference: {fileID: 0} + - target: {fileID: 6664667533527261801, guid: 6adb8bcc65ee3a54da64d7c65225f219, type: 3} + propertyPath: hasNitro + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 6664667533527261801, guid: 6adb8bcc65ee3a54da64d7c65225f219, type: 3} + propertyPath: hasGlider + value: 1 + objectReference: {fileID: 0} + m_RemovedComponents: [] + m_SourcePrefab: {fileID: 100100000, guid: 6adb8bcc65ee3a54da64d7c65225f219, type: 3} --- !u!1 &1493944130 GameObject: m_ObjectHideFlags: 0 @@ -1680,99 +1745,6 @@ MeshFilter: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1650963652} m_Mesh: {fileID: 10202, guid: 0000000000000000e000000000000000, type: 0} ---- !u!1001 &1730158536 -PrefabInstance: - m_ObjectHideFlags: 0 - serializedVersion: 2 - m_Modification: - m_TransformParent: {fileID: 0} - m_Modifications: - - target: {fileID: 5633209979457551608, guid: 362ca97b75c291a47ab81d628a81f440, type: 3} - propertyPath: m_Name - value: DebugPlayerPrefab - objectReference: {fileID: 0} - - target: {fileID: 6926740475113451123, guid: 362ca97b75c291a47ab81d628a81f440, type: 3} - propertyPath: m_RootOrder - value: 8 - objectReference: {fileID: 0} - - target: {fileID: 6926740475113451123, guid: 362ca97b75c291a47ab81d628a81f440, type: 3} - propertyPath: m_LocalPosition.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 6926740475113451123, guid: 362ca97b75c291a47ab81d628a81f440, type: 3} - propertyPath: m_LocalPosition.y - value: 3.3 - objectReference: {fileID: 0} - - target: {fileID: 6926740475113451123, guid: 362ca97b75c291a47ab81d628a81f440, type: 3} - propertyPath: m_LocalPosition.z - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 6926740475113451123, guid: 362ca97b75c291a47ab81d628a81f440, type: 3} - propertyPath: m_LocalRotation.w - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 6926740475113451123, guid: 362ca97b75c291a47ab81d628a81f440, type: 3} - propertyPath: m_LocalRotation.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 6926740475113451123, guid: 362ca97b75c291a47ab81d628a81f440, type: 3} - propertyPath: m_LocalRotation.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 6926740475113451123, guid: 362ca97b75c291a47ab81d628a81f440, type: 3} - propertyPath: m_LocalRotation.z - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 6926740475113451123, guid: 362ca97b75c291a47ab81d628a81f440, type: 3} - propertyPath: m_LocalEulerAnglesHint.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 6926740475113451123, guid: 362ca97b75c291a47ab81d628a81f440, type: 3} - propertyPath: m_LocalEulerAnglesHint.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 6926740475113451123, guid: 362ca97b75c291a47ab81d628a81f440, type: 3} - propertyPath: m_LocalEulerAnglesHint.z - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 8100520363622627413, guid: 362ca97b75c291a47ab81d628a81f440, type: 3} - propertyPath: hasGrapple - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 8720404377688450390, guid: 362ca97b75c291a47ab81d628a81f440, type: 3} - propertyPath: m_LocalRotation.w - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 8720404377688450390, guid: 362ca97b75c291a47ab81d628a81f440, type: 3} - propertyPath: m_LocalRotation.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 8720404377688450390, guid: 362ca97b75c291a47ab81d628a81f440, type: 3} - propertyPath: m_LocalRotation.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 8720404377688450390, guid: 362ca97b75c291a47ab81d628a81f440, type: 3} - propertyPath: m_LocalRotation.z - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 8720404377688450390, guid: 362ca97b75c291a47ab81d628a81f440, type: 3} - propertyPath: m_LocalEulerAnglesHint.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 8720404377688450390, guid: 362ca97b75c291a47ab81d628a81f440, type: 3} - propertyPath: m_LocalEulerAnglesHint.z - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 9156062931443001395, guid: 362ca97b75c291a47ab81d628a81f440, type: 3} - propertyPath: m_LocalPosition.y - value: 4.6 - objectReference: {fileID: 0} - - target: {fileID: 9156062931443001395, guid: 362ca97b75c291a47ab81d628a81f440, type: 3} - propertyPath: m_LocalPosition.z - value: -8.7 - objectReference: {fileID: 0} - m_RemovedComponents: [] - m_SourcePrefab: {fileID: 100100000, guid: 362ca97b75c291a47ab81d628a81f440, type: 3} --- !u!1 &1806935633 GameObject: m_ObjectHideFlags: 0 diff --git a/Assets/Scenes/Lobby.unity b/Assets/Scenes/Lobby.unity index dd9c485..a60fcf6 100644 --- a/Assets/Scenes/Lobby.unity +++ b/Assets/Scenes/Lobby.unity @@ -310,21 +310,33 @@ PrefabInstance: propertyPath: m_RootOrder value: 1 objectReference: {fileID: 0} + - target: {fileID: 7188906082087890177, guid: a9840baa4cc526b44bfef27c6fea042a, type: 3} + propertyPath: m_LocalScale.x + value: 10 + objectReference: {fileID: 0} + - target: {fileID: 7188906082087890177, guid: a9840baa4cc526b44bfef27c6fea042a, type: 3} + propertyPath: m_LocalScale.y + value: 10 + objectReference: {fileID: 0} + - target: {fileID: 7188906082087890177, guid: a9840baa4cc526b44bfef27c6fea042a, type: 3} + propertyPath: m_LocalScale.z + value: 10 + objectReference: {fileID: 0} - target: {fileID: 7188906082087890177, guid: a9840baa4cc526b44bfef27c6fea042a, type: 3} propertyPath: m_LocalPosition.x - value: 1.7 + value: 20.5 objectReference: {fileID: 0} - target: {fileID: 7188906082087890177, guid: a9840baa4cc526b44bfef27c6fea042a, type: 3} propertyPath: m_LocalPosition.y - value: 0 + value: -33 objectReference: {fileID: 0} - target: {fileID: 7188906082087890177, guid: a9840baa4cc526b44bfef27c6fea042a, type: 3} propertyPath: m_LocalPosition.z - value: 3.9 + value: 4 objectReference: {fileID: 0} - target: {fileID: 7188906082087890177, guid: a9840baa4cc526b44bfef27c6fea042a, type: 3} propertyPath: m_LocalRotation.w - value: 1 + value: 0 objectReference: {fileID: 0} - target: {fileID: 7188906082087890177, guid: a9840baa4cc526b44bfef27c6fea042a, type: 3} propertyPath: m_LocalRotation.x @@ -332,7 +344,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 7188906082087890177, guid: a9840baa4cc526b44bfef27c6fea042a, type: 3} propertyPath: m_LocalRotation.y - value: 0 + value: 1 objectReference: {fileID: 0} - target: {fileID: 7188906082087890177, guid: a9840baa4cc526b44bfef27c6fea042a, type: 3} propertyPath: m_LocalRotation.z @@ -344,7 +356,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 7188906082087890177, guid: a9840baa4cc526b44bfef27c6fea042a, type: 3} propertyPath: m_LocalEulerAnglesHint.y - value: 0 + value: 180 objectReference: {fileID: 0} - target: {fileID: 7188906082087890177, guid: a9840baa4cc526b44bfef27c6fea042a, type: 3} propertyPath: m_LocalEulerAnglesHint.z diff --git a/Assets/Scripts/PlayerScripts/DebugPlayer/DebugItems/dNitro.cs b/Assets/Scripts/PlayerScripts/DebugPlayer/DebugItems/dNitro.cs new file mode 100644 index 0000000..59a80da --- /dev/null +++ b/Assets/Scripts/PlayerScripts/DebugPlayer/DebugItems/dNitro.cs @@ -0,0 +1,37 @@ +using System.Collections; +using System.Collections.Generic; +using UnityEngine; + +public class dNitro : MonoBehaviour +{ + private PlayerStats playerStats; + private CoolDown driver; + private bool isOnCoolDown = false; + //this will need to be set from scritable object or something; + private float coolDown; + + // Start is called before the first frame update + void Start() + { + playerStats = GetComponent(); + } + + // Update is called once per frame + void Update() + { + //once cooldowns are implemented, put this on one (a long one) + if (Input.GetKeyDown(KeyCode.LeftShift) && isOnCoolDown == false && playerStats.HasNitro) + { + playerStats.CurVel = playerStats.MaxVel; + StartCoroutine(startCoolDown()); + } + } + + private IEnumerator startCoolDown(){ + Debug.Log("start corotine"); + isOnCoolDown = true; + // driver.startUICooldown("Nitro"); + yield return new WaitForSeconds(coolDown); + isOnCoolDown = false; + } +} diff --git a/Assets/Scripts/PlayerScripts/DebugPlayer/DebugItems/dNitro.cs.meta b/Assets/Scripts/PlayerScripts/DebugPlayer/DebugItems/dNitro.cs.meta new file mode 100644 index 0000000..a76ab73 --- /dev/null +++ b/Assets/Scripts/PlayerScripts/DebugPlayer/DebugItems/dNitro.cs.meta @@ -0,0 +1,11 @@ +fileFormatVersion: 2 +guid: 71b2b26f3c822f045b43d4966fb097e6 +MonoImporter: + externalObjects: {} + serializedVersion: 2 + defaultReferences: [] + executionOrder: 0 + icon: {instanceID: 0} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Scripts/PlayerScripts/DebugPlayer/dPlayCam.cs b/Assets/Scripts/PlayerScripts/DebugPlayer/dPlayCam.cs index bde5ff7..6fff00d 100644 --- a/Assets/Scripts/PlayerScripts/DebugPlayer/dPlayCam.cs +++ b/Assets/Scripts/PlayerScripts/DebugPlayer/dPlayCam.cs @@ -20,7 +20,7 @@ public class dPlayCam : NetworkBehaviour //if (!IsLocalPlayer) { return; } offset = transform.parent.forward * rad.magnitude; - transform.position = new Vector3((player.transform.position.x - offset.x),((player.transform.position.y - offset.y)+2),(player.transform.position.z - offset.z)); + transform.position = new Vector3((player.transform.position.x - offset.x),((player.transform.position.y - offset.y)+3),(player.transform.position.z - offset.z)); } } diff --git a/Assets/Scripts/PlayerScripts/DebugPlayer/dPlayerMovement.cs b/Assets/Scripts/PlayerScripts/DebugPlayer/dPlayerMovement.cs index 758cf30..84e3168 100644 --- a/Assets/Scripts/PlayerScripts/DebugPlayer/dPlayerMovement.cs +++ b/Assets/Scripts/PlayerScripts/DebugPlayer/dPlayerMovement.cs @@ -288,6 +288,7 @@ public class dPlayerMovement : NetworkBehaviour if(wallRun.IsWallRunning()){ AddImpact((wallRun.GetWallJumpDirection()), pStats.JumpPow * 8f); g = pStats.JumpPow; + curJumpNum = 0; } else{ @@ -409,7 +410,7 @@ public class dPlayerMovement : NetworkBehaviour //Gliding if(pStats.HasGlider && g < 0 && Input.GetButton("Jump")){ //Gravity with glider - GravityCalculation(6); + GravityCalculation(8); //Set temp values to put traction back to normal if(tempSet == false){ diff --git a/Assets/Scripts/PlayerScripts/PlayerItems/ItemScripts/Nitro.cs b/Assets/Scripts/PlayerScripts/PlayerItems/ItemScripts/Nitro.cs index 52c6866..51b478b 100644 --- a/Assets/Scripts/PlayerScripts/PlayerItems/ItemScripts/Nitro.cs +++ b/Assets/Scripts/PlayerScripts/PlayerItems/ItemScripts/Nitro.cs @@ -20,7 +20,7 @@ public class Nitro : MonoBehaviour void Update() { //once cooldowns are implemented, put this on one (a long one) - if (Input.GetKeyDown(KeyCode.LeftShift) && isOnCoolDown == false) + if (Input.GetKeyDown(KeyCode.LeftShift) && isOnCoolDown == false && playerStats.HasNitro) { playerStats.CurVel = playerStats.MaxVel; StartCoroutine(startCoolDown()); diff --git a/Assets/Scripts/PlayerScripts/PlayerItems/Resources/ItemObjects/Springs.asset b/Assets/Scripts/PlayerScripts/PlayerItems/Resources/ItemObjects/Springs.asset index 33d601a..d6cdd8d 100644 --- a/Assets/Scripts/PlayerScripts/PlayerItems/Resources/ItemObjects/Springs.asset +++ b/Assets/Scripts/PlayerScripts/PlayerItems/Resources/ItemObjects/Springs.asset @@ -19,7 +19,7 @@ MonoBehaviour: minVelM: 0 curVelM: 0 accM: 0 - jumpPowM: 15 + jumpPowM: 30 jumpNumM: 0 tractionM: 0 kickPowM: 0 diff --git a/Assets/Scripts/SetInvScene/InvSceneSettings.cs b/Assets/Scripts/SetInvScene/InvSceneSettings.cs index 6dcacc2..455c35b 100644 --- a/Assets/Scripts/SetInvScene/InvSceneSettings.cs +++ b/Assets/Scripts/SetInvScene/InvSceneSettings.cs @@ -117,8 +117,8 @@ public class InvSceneSettings : MonoBehaviour player1.GetComponent().enabled = pStats.HasWallrun; if(pStats.HasGrapple != player1.GetComponent().enabled) player1.GetComponent().enabled = pStats.HasGrapple; - if(pStats.HasNitro != player1.GetComponent().enabled) - player1.GetComponent().enabled = pStats.HasNitro; + if(pStats.HasNitro != player1.GetComponent().enabled) + player1.GetComponent().enabled = pStats.HasNitro; } diff --git a/UserSettings/EditorUserSettings.asset b/UserSettings/EditorUserSettings.asset index 6f16979..f132bb4 100644 --- a/UserSettings/EditorUserSettings.asset +++ b/UserSettings/EditorUserSettings.asset @@ -6,16 +6,16 @@ EditorUserSettings: serializedVersion: 4 m_ConfigSettings: RecentlyUsedScenePath-0: - value: 22424703114646680e0b0227036c731f1415016439262f2434 + value: 22424703114646680e0b0227036c78111b125507233d28242c20137df7ee3d2cfb flags: 0 RecentlyUsedScenePath-1: - value: 22424703114646680e0b0227036c78111b125507233d28242c20137df7ee3d2cfb + value: 22424703114646680e0b0227036c7b151b180b6501273035202c1327d1e33136e7a923e7ee2e26 flags: 0 RecentlyUsedScenePath-2: value: 22424703114646680e0b0227036c6f02131b172b282d347e38271427fb flags: 0 RecentlyUsedScenePath-3: - value: 22424703114646680e0b0227036c7b151b180b6501273035202c1327d1e33136e7a923e7ee2e26 + value: 22424703114646680e0b0227036c731f1415016439262f2434 flags: 0 vcSharedLogLevel: value: 0d5e400f0650