From 9bb322554263172bc854eb2081a90594bed28f4b Mon Sep 17 00:00:00 2001
From: baz <bazzadobs@live.co.uk>
Date: Fri, 12 Jan 2024 15:53:23 +0000
Subject: [PATCH] Change Slide to work with Slide Input Action

---
 Source/Nakatomi/NakatomiCMC.cpp | 18 ++++++++----------
 Source/Nakatomi/NakatomiCMC.h   | 12 ++++++------
 2 files changed, 14 insertions(+), 16 deletions(-)

diff --git a/Source/Nakatomi/NakatomiCMC.cpp b/Source/Nakatomi/NakatomiCMC.cpp
index efea661..4cb16ac 100644
--- a/Source/Nakatomi/NakatomiCMC.cpp
+++ b/Source/Nakatomi/NakatomiCMC.cpp
@@ -60,7 +60,7 @@ void UNakatomiCMC::FSavedMove_Nakatomi::SetMoveFor(ACharacter* C, float InDeltaT
 	UNakatomiCMC* CharacterMovement = Cast<UNakatomiCMC>(C->GetCharacterMovement());
 
 	Saved_bWantsToSprint = CharacterMovement->Safe_bWantsToSprint;
-	Saved_bPrevWantsToCrouch = CharacterMovement->Safe_bPrevWantsToCrouch;
+	Saved_bWantsToSlide = CharacterMovement->Safe_bWantsToSlide;
 }
 
 void UNakatomiCMC::FSavedMove_Nakatomi::PrepMoveFor(ACharacter* C)
@@ -70,7 +70,7 @@ void UNakatomiCMC::FSavedMove_Nakatomi::PrepMoveFor(ACharacter* C)
 	UNakatomiCMC* CharacterMovement = Cast<UNakatomiCMC>(C->GetCharacterMovement());
 
 	CharacterMovement->Safe_bWantsToSprint = Saved_bWantsToSprint;
-	CharacterMovement->Safe_bPrevWantsToCrouch = Saved_bPrevWantsToCrouch;
+	CharacterMovement->Safe_bWantsToSlide = Saved_bWantsToSlide;
 }
 
 UNakatomiCMC::FNetworkPredictionData_Client_Nakatomi::FNetworkPredictionData_Client_Nakatomi(
@@ -121,8 +121,6 @@ void UNakatomiCMC::OnMovementUpdated(float DeltaSeconds, const FVector& OldLocat
 			MaxWalkSpeed = Walk_MaxWalkSpeed;
 		}
 	}
-
-	Safe_bPrevWantsToCrouch = bWantsToCrouch;
 }
 
 bool UNakatomiCMC::IsMovingOnGround() const
@@ -137,7 +135,7 @@ bool UNakatomiCMC::CanCrouchInCurrentState() const
 
 void UNakatomiCMC::UpdateCharacterStateBeforeMovement(float DeltaSeconds)
 {
-	if (MovementMode == MOVE_Walking && !bWantsToCrouch && Safe_bPrevWantsToCrouch)
+	if (MovementMode == MOVE_Walking && Safe_bWantsToSlide)
 	{
 		FHitResult PotentialSlideSurface;
 		if (Velocity.SizeSquared() > pow(Slide_MinSpeed, 2) && GetSlideSurface(PotentialSlideSurface))
@@ -146,7 +144,7 @@ void UNakatomiCMC::UpdateCharacterStateBeforeMovement(float DeltaSeconds)
 		}
 	}
 
-	if (IsCustomMovementMode(CMOVE_Slide) && !bWantsToCrouch)
+	if (IsCustomMovementMode(CMOVE_Slide) && !Safe_bWantsToSlide)
 	{
 		ExitSlide();
 	}
@@ -190,12 +188,12 @@ void UNakatomiCMC::DisableCrouch()
 
 void UNakatomiCMC::EnableSlide()
 {
-	EnterSlide();
+	Safe_bWantsToSlide = true;
 }
 
 void UNakatomiCMC::DisableSlide()
 {
-	ExitSlide();
+	Safe_bWantsToSlide = false;
 }
 
 bool UNakatomiCMC::IsCustomMovementMode(ECustomMovementMove InCustomMovementMode) const
@@ -205,14 +203,14 @@ bool UNakatomiCMC::IsCustomMovementMode(ECustomMovementMove InCustomMovementMode
 
 void UNakatomiCMC::EnterSlide()
 {
-	bWantsToCrouch = true;
+	// bWantsToCrouch = true;
 	Velocity += Velocity.GetSafeNormal2D() * Slide_EnterImpulse;
 	SetMovementMode(MOVE_Custom, CMOVE_Slide);
 }
 
 void UNakatomiCMC::ExitSlide()
 {
-	bWantsToCrouch = false;
+	// bWantsToCrouch = false;
 
 	FQuat NewRotation = FRotationMatrix::MakeFromXZ(UpdatedComponent->GetForwardVector().GetSafeNormal2D(), FVector::UpVector).ToQuat();
 	FHitResult Hit;
diff --git a/Source/Nakatomi/NakatomiCMC.h b/Source/Nakatomi/NakatomiCMC.h
index 8ae8ceb..0bccab8 100644
--- a/Source/Nakatomi/NakatomiCMC.h
+++ b/Source/Nakatomi/NakatomiCMC.h
@@ -29,8 +29,8 @@ class NAKATOMI_API UNakatomiCMC : public UCharacterMovementComponent
 
 		// Flag
 		uint8 Saved_bWantsToSprint:1;
-
-		uint8 Saved_bPrevWantsToCrouch:1;
+		
+		uint8 Saved_bWantsToSlide:1;
 		
 		virtual bool CanCombineWith(const FSavedMovePtr& NewMove, ACharacter* InCharacter, float MaxDelta) const override;
 		virtual void Clear() override;
@@ -56,19 +56,19 @@ class NAKATOMI_API UNakatomiCMC : public UCharacterMovementComponent
 	float Walk_MaxWalkSpeed;
 
 	UPROPERTY(EditDefaultsOnly)
-	float Slide_MinSpeed = 10.f;
+	float Slide_MinSpeed = 50.f;
 
 	UPROPERTY(EditDefaultsOnly)
 	float Slide_EnterImpulse = 2000.f;
 
 	UPROPERTY(EditDefaultsOnly)
-	float Slide_GravityForce = 5000.f;
+	float Slide_GravityForce = 2500.f;
 
 	UPROPERTY(EditDefaultsOnly)
-	float Slide_Friction = 1.3f;
+	float Slide_Friction = 1.f;
 	
 	bool Safe_bWantsToSprint;
-	bool Safe_bPrevWantsToCrouch;
+	bool Safe_bWantsToSlide;
 
 	UPROPERTY(Transient)
 	ANakatomiCharacter* NakatomiCharacterOwner;