From dd3d1386bed6f11c2c653f8929edd99decb0f7f2 Mon Sep 17 00:00:00 2001 From: slevy14 Date: Sat, 29 Apr 2023 18:22:26 -0700 Subject: [PATCH] edited some player data to make grapple and jump feel better --- Assets/Animations/Effects/Explosion.anim | 22 +++---- .../Porcupine Sprite Sheet_17.controller | 65 ++++++++++++++++++- .../Animations/Slug/SlugAnimations.controller | 65 ++++++++++++++++++- .../Squirrel Sprite Sheet_24.controller | 65 ++++++++++++++++++- Assets/Scripts/PlayerController.cs | 18 ++++- Assets/Scripts/PlayerMovementData.asset | 2 +- 6 files changed, 217 insertions(+), 20 deletions(-) diff --git a/Assets/Animations/Effects/Explosion.anim b/Assets/Animations/Effects/Explosion.anim index d2c0e06..41fba88 100644 --- a/Assets/Animations/Effects/Explosion.anim +++ b/Assets/Animations/Effects/Explosion.anim @@ -22,30 +22,30 @@ AnimationClip: curve: - time: 0 value: {fileID: -26058723, guid: 92e73c6a27aac4173a6e8d54acf9fe0b, type: 3} - - time: 0.083333336 + - time: 0.033333335 value: {fileID: 281161528, guid: 92e73c6a27aac4173a6e8d54acf9fe0b, type: 3} - - time: 0.16666667 + - time: 0.06666667 value: {fileID: 617933608, guid: 92e73c6a27aac4173a6e8d54acf9fe0b, type: 3} - - time: 0.25 + - time: 0.1 value: {fileID: 1125023128, guid: 92e73c6a27aac4173a6e8d54acf9fe0b, type: 3} - - time: 0.33333334 + - time: 0.13333334 value: {fileID: -520789876, guid: 92e73c6a27aac4173a6e8d54acf9fe0b, type: 3} - - time: 0.41666666 + - time: 0.16666667 value: {fileID: 1166439870, guid: 92e73c6a27aac4173a6e8d54acf9fe0b, type: 3} - - time: 0.5 + - time: 0.2 value: {fileID: -73333410, guid: 92e73c6a27aac4173a6e8d54acf9fe0b, type: 3} - - time: 0.5833333 + - time: 0.23333333 value: {fileID: 738581303, guid: 92e73c6a27aac4173a6e8d54acf9fe0b, type: 3} - - time: 0.6666667 + - time: 0.26666668 value: {fileID: -1832562378, guid: 92e73c6a27aac4173a6e8d54acf9fe0b, type: 3} - - time: 0.75 + - time: 0.3 value: {fileID: -509926637, guid: 92e73c6a27aac4173a6e8d54acf9fe0b, type: 3} attribute: m_Sprite path: classID: 212 script: {fileID: 0} flags: 2 - m_SampleRate: 12 + m_SampleRate: 30 m_WrapMode: 0 m_Bounds: m_Center: {x: 0, y: 0, z: 0} @@ -77,7 +77,7 @@ AnimationClip: m_AdditiveReferencePoseClip: {fileID: 0} m_AdditiveReferencePoseTime: 0 m_StartTime: 0 - m_StopTime: 0.8333333 + m_StopTime: 0.33333334 m_OrientationOffsetY: 0 m_Level: 0 m_CycleOffset: 0 diff --git a/Assets/Animations/Porcupine/Porcupine Sprite Sheet_17.controller b/Assets/Animations/Porcupine/Porcupine Sprite Sheet_17.controller index 24d55e6..d6eef21 100644 --- a/Assets/Animations/Porcupine/Porcupine Sprite Sheet_17.controller +++ b/Assets/Animations/Porcupine/Porcupine Sprite Sheet_17.controller @@ -10,7 +10,8 @@ AnimatorState: m_Name: PorcANim m_Speed: 1 m_CycleOffset: 0 - m_Transitions: [] + m_Transitions: + - {fileID: 8102649446289106678} m_StateMachineBehaviours: [] m_Position: {x: 50, y: 50, z: 0} m_IKOnFeet: 0 @@ -34,7 +35,13 @@ AnimatorController: m_PrefabAsset: {fileID: 0} m_Name: Porcupine Sprite Sheet_17 serializedVersion: 5 - m_AnimatorParameters: [] + m_AnimatorParameters: + - m_Name: Defeated + m_Type: 9 + m_DefaultFloat: 0 + m_DefaultInt: 0 + m_DefaultBool: 0 + m_Controller: {fileID: 0} m_AnimatorLayers: - serializedVersion: 5 m_Name: Base Layer @@ -60,6 +67,9 @@ AnimatorStateMachine: - serializedVersion: 1 m_State: {fileID: -1291027891959344277} m_Position: {x: 200, y: 0, z: 0} + - serializedVersion: 1 + m_State: {fileID: 5737919686634160007} + m_Position: {x: 405.74463, y: 278.35104, z: 0} m_ChildStateMachines: [] m_AnyStateTransitions: [] m_EntryTransitions: [] @@ -70,3 +80,54 @@ AnimatorStateMachine: m_ExitPosition: {x: 800, y: 120, z: 0} m_ParentStateMachinePosition: {x: 800, y: 20, z: 0} m_DefaultState: {fileID: -1291027891959344277} +--- !u!1102 &5737919686634160007 +AnimatorState: + serializedVersion: 6 + m_ObjectHideFlags: 1 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: Explosion + m_Speed: 1 + m_CycleOffset: 0 + m_Transitions: [] + m_StateMachineBehaviours: [] + m_Position: {x: 50, y: 50, z: 0} + m_IKOnFeet: 0 + m_WriteDefaultValues: 1 + m_Mirror: 0 + m_SpeedParameterActive: 0 + m_MirrorParameterActive: 0 + m_CycleOffsetParameterActive: 0 + m_TimeParameterActive: 0 + m_Motion: {fileID: 7400000, guid: 372a92126b64d49e98e9f73fa737b09d, type: 2} + m_Tag: + m_SpeedParameter: + m_MirrorParameter: + m_CycleOffsetParameter: + m_TimeParameter: +--- !u!1101 &8102649446289106678 +AnimatorStateTransition: + m_ObjectHideFlags: 1 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: + m_Conditions: + - m_ConditionMode: 1 + m_ConditionEvent: Defeated + m_EventTreshold: 0 + m_DstStateMachine: {fileID: 0} + m_DstState: {fileID: 5737919686634160007} + m_Solo: 0 + m_Mute: 0 + m_IsExit: 0 + serializedVersion: 3 + m_TransitionDuration: 0 + m_TransitionOffset: 0 + m_ExitTime: 0 + m_HasExitTime: 1 + m_HasFixedDuration: 1 + m_InterruptionSource: 0 + m_OrderedInterruption: 1 + m_CanTransitionToSelf: 1 diff --git a/Assets/Animations/Slug/SlugAnimations.controller b/Assets/Animations/Slug/SlugAnimations.controller index 294c1e7..5b44930 100644 --- a/Assets/Animations/Slug/SlugAnimations.controller +++ b/Assets/Animations/Slug/SlugAnimations.controller @@ -1,5 +1,56 @@ %YAML 1.1 %TAG !u! tag:unity3d.com,2011: +--- !u!1101 &-1418240956641886358 +AnimatorStateTransition: + m_ObjectHideFlags: 1 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: + m_Conditions: + - m_ConditionMode: 1 + m_ConditionEvent: Defeated + m_EventTreshold: 0 + m_DstStateMachine: {fileID: 0} + m_DstState: {fileID: -390653084716532759} + m_Solo: 0 + m_Mute: 0 + m_IsExit: 0 + serializedVersion: 3 + m_TransitionDuration: 0 + m_TransitionOffset: 0 + m_ExitTime: 0 + m_HasExitTime: 1 + m_HasFixedDuration: 1 + m_InterruptionSource: 0 + m_OrderedInterruption: 1 + m_CanTransitionToSelf: 1 +--- !u!1102 &-390653084716532759 +AnimatorState: + serializedVersion: 6 + m_ObjectHideFlags: 1 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: Explosion + m_Speed: 1 + m_CycleOffset: 0 + m_Transitions: [] + m_StateMachineBehaviours: [] + m_Position: {x: 50, y: 50, z: 0} + m_IKOnFeet: 0 + m_WriteDefaultValues: 1 + m_Mirror: 0 + m_SpeedParameterActive: 0 + m_MirrorParameterActive: 0 + m_CycleOffsetParameterActive: 0 + m_TimeParameterActive: 0 + m_Motion: {fileID: 7400000, guid: 372a92126b64d49e98e9f73fa737b09d, type: 2} + m_Tag: + m_SpeedParameter: + m_MirrorParameter: + m_CycleOffsetParameter: + m_TimeParameter: --- !u!91 &9100000 AnimatorController: m_ObjectHideFlags: 0 @@ -8,7 +59,13 @@ AnimatorController: m_PrefabAsset: {fileID: 0} m_Name: SlugAnimations serializedVersion: 5 - m_AnimatorParameters: [] + m_AnimatorParameters: + - m_Name: Defeated + m_Type: 9 + m_DefaultFloat: 0 + m_DefaultInt: 0 + m_DefaultBool: 0 + m_Controller: {fileID: 0} m_AnimatorLayers: - serializedVersion: 5 m_Name: Base Layer @@ -32,7 +89,8 @@ AnimatorState: m_Name: SlugMove m_Speed: 1 m_CycleOffset: 0 - m_Transitions: [] + m_Transitions: + - {fileID: -1418240956641886358} m_StateMachineBehaviours: [] m_Position: {x: 50, y: 50, z: 0} m_IKOnFeet: 0 @@ -60,6 +118,9 @@ AnimatorStateMachine: - serializedVersion: 1 m_State: {fileID: 4248165553369873906} m_Position: {x: 190, y: 240, z: 0} + - serializedVersion: 1 + m_State: {fileID: -390653084716532759} + m_Position: {x: 452.44678, y: 342.39365, z: 0} m_ChildStateMachines: [] m_AnyStateTransitions: [] m_EntryTransitions: [] diff --git a/Assets/Animations/Squirrel/Squirrel Sprite Sheet_24.controller b/Assets/Animations/Squirrel/Squirrel Sprite Sheet_24.controller index e30af69..6475088 100644 --- a/Assets/Animations/Squirrel/Squirrel Sprite Sheet_24.controller +++ b/Assets/Animations/Squirrel/Squirrel Sprite Sheet_24.controller @@ -10,7 +10,8 @@ AnimatorState: m_Name: SquirellEat m_Speed: 1 m_CycleOffset: 0 - m_Transitions: [] + m_Transitions: + - {fileID: -2778467767865725400} m_StateMachineBehaviours: [] m_Position: {x: 50, y: 50, z: 0} m_IKOnFeet: 0 @@ -38,6 +39,9 @@ AnimatorStateMachine: - serializedVersion: 1 m_State: {fileID: -8190335747711609504} m_Position: {x: 260, y: 150, z: 0} + - serializedVersion: 1 + m_State: {fileID: -523700081044417501} + m_Position: {x: 468.40417, y: 343.45743, z: 0} m_ChildStateMachines: [] m_AnyStateTransitions: [] m_EntryTransitions: [] @@ -48,6 +52,57 @@ AnimatorStateMachine: m_ExitPosition: {x: 800, y: 120, z: 0} m_ParentStateMachinePosition: {x: 800, y: 20, z: 0} m_DefaultState: {fileID: -8190335747711609504} +--- !u!1101 &-2778467767865725400 +AnimatorStateTransition: + m_ObjectHideFlags: 1 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: + m_Conditions: + - m_ConditionMode: 1 + m_ConditionEvent: Defeated + m_EventTreshold: 0 + m_DstStateMachine: {fileID: 0} + m_DstState: {fileID: -523700081044417501} + m_Solo: 0 + m_Mute: 0 + m_IsExit: 0 + serializedVersion: 3 + m_TransitionDuration: 0 + m_TransitionOffset: 0 + m_ExitTime: 0 + m_HasExitTime: 1 + m_HasFixedDuration: 1 + m_InterruptionSource: 0 + m_OrderedInterruption: 1 + m_CanTransitionToSelf: 1 +--- !u!1102 &-523700081044417501 +AnimatorState: + serializedVersion: 6 + m_ObjectHideFlags: 1 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: Explosion + m_Speed: 1 + m_CycleOffset: 0 + m_Transitions: [] + m_StateMachineBehaviours: [] + m_Position: {x: 50, y: 50, z: 0} + m_IKOnFeet: 0 + m_WriteDefaultValues: 1 + m_Mirror: 0 + m_SpeedParameterActive: 0 + m_MirrorParameterActive: 0 + m_CycleOffsetParameterActive: 0 + m_TimeParameterActive: 0 + m_Motion: {fileID: 7400000, guid: 372a92126b64d49e98e9f73fa737b09d, type: 2} + m_Tag: + m_SpeedParameter: + m_MirrorParameter: + m_CycleOffsetParameter: + m_TimeParameter: --- !u!91 &9100000 AnimatorController: m_ObjectHideFlags: 0 @@ -56,7 +111,13 @@ AnimatorController: m_PrefabAsset: {fileID: 0} m_Name: Squirrel Sprite Sheet_24 serializedVersion: 5 - m_AnimatorParameters: [] + m_AnimatorParameters: + - m_Name: Defeated + m_Type: 9 + m_DefaultFloat: 0 + m_DefaultInt: 0 + m_DefaultBool: 0 + m_Controller: {fileID: 0} m_AnimatorLayers: - serializedVersion: 5 m_Name: Base Layer diff --git a/Assets/Scripts/PlayerController.cs b/Assets/Scripts/PlayerController.cs index 28845f2..dcf57e1 100644 --- a/Assets/Scripts/PlayerController.cs +++ b/Assets/Scripts/PlayerController.cs @@ -46,6 +46,7 @@ public class PlayerMovement : MonoBehaviour public float LastPressedJumpTime { get; private set; } Tutorial_GrapplingRope grapplingRope; + bool wasGrappling = false; //Set all of these up in the inspector [Header("Checks")] @@ -114,6 +115,7 @@ public class PlayerMovement : MonoBehaviour { LastOnGroundTime = Data.coyoteTime; //if so sets the lastGrounded to coyoteTime trumpet = 2; + wasGrappling = false; } //Right Wall Check @@ -187,6 +189,14 @@ public class PlayerMovement : MonoBehaviour // } #endregion + #region GRAPPLE CHECKS + // set wasGrappling to true if the player starts grappling + if (grapplingRope.isGrappling) { + wasGrappling = true; + } + #endregion + + #region SLIDE CHECKS if (CanSlide() && ((LastOnWallLeftTime > 0 && _moveInput.x < 0) || (LastOnWallRightTime > 0 && _moveInput.x > 0))) IsSliding = true; @@ -280,10 +290,14 @@ public class PlayerMovement : MonoBehaviour //Gets an acceleration value based on if we are accelerating (includes turning) //or trying to decelerate (stop). As well as applying a multiplier if we're air borne. - if (LastOnGroundTime > 0) + if (LastOnGroundTime > 0) { accelRate = (Mathf.Abs(targetSpeed) > 0.01f) ? Data.runAccelAmount : Data.runDeccelAmount; - else + } + else if (wasGrappling) { + accelRate = (Mathf.Abs(targetSpeed) > 0.01f) ? Data.runAccelAmount * Data.accelInAir : Data.runDeccelAmount * (Data.deccelInAir / 5); + } else { accelRate = (Mathf.Abs(targetSpeed) > 0.01f) ? Data.runAccelAmount * Data.accelInAir : Data.runDeccelAmount * Data.deccelInAir; + } #endregion #region Add Bonus Jump Apex Acceleration diff --git a/Assets/Scripts/PlayerMovementData.asset b/Assets/Scripts/PlayerMovementData.asset index 66d55db..dff0170 100644 --- a/Assets/Scripts/PlayerMovementData.asset +++ b/Assets/Scripts/PlayerMovementData.asset @@ -24,7 +24,7 @@ MonoBehaviour: runDecceleration: 2 runDeccelAmount: 14.285714 accelInAir: 0.5 - deccelInAir: 0.05 + deccelInAir: 0.2 doConserveMomentum: 1 jumpHeight: 2.25 jumpTimeToApex: 0.4