Merge pull request #142 from MashdorDev/Sprinting-fix

Sprinting fix

Source/unbread/Private/SCharacter.cpp

@@ -49,7 +49,6 @@ ASCharacter::ASCharacter()
 	WalkSpeed = 0.5f;
 	SprintSpeed = 1.0f;
 	Speed = WalkSpeed;
-	bIsWalking = true;
 }
 
 // Called when the game starts or when spawned
@@ -176,15 +175,21 @@ void ASCharacter::Sprint()
 		return;
 	}
 
-	bIsWalking = !bIsWalking;
-	if (bIsWalking)
-	{
-		Speed = WalkSpeed;
-	}
-	else
+
+	Speed = SprintSpeed;
+
+}
+
+void ASCharacter::Walk()
+{
+	if(bIsHeadForm)
 	{
-		Speed = SprintSpeed;
+		return;
 	}
+
+
+	Speed = WalkSpeed;
+
 }
 
 void ASCharacter::Landed(const FHitResult& Hit)
@@ -265,9 +270,9 @@ void ASCharacter::ReformBody()
 
 	NearestCrumbles->Destroy();
 	NearestCrumbles = nullptr;
-
 	bIsHeadForm = false;
-
+	Speed = WalkSpeed;
+
 	DestroyBodyAndSpawnCrumbles();
 
 	AddActorWorldOffset(FVector(0.f, 0.f, 90.f));
@@ -305,6 +310,8 @@ void ASCharacter::SetupPlayerInputComponent(UInputComponent* PlayerInputComponen
 
 		// TEMPORARY
 		EnhancedInputComponent->BindAction(SprintAction, ETriggerEvent::Triggered, this, &ASCharacter::Sprint);
+		EnhancedInputComponent->BindAction(SprintAction, ETriggerEvent::Completed, this, &ASCharacter::Walk);
+
 
 		// GAS
 		EnhancedInputComponent->BindAction(PrimaryAttackAction, ETriggerEvent::Triggered, this, &ASCharacter::OnPrimaryAttack);

Source/unbread/Private/SDestructible.cpp

@@ -33,7 +33,6 @@ void ASDestructible::BeginPlay()
 	}
 
 	AbilitySystemComp->GetGameplayAttributeValueChangeDelegate(HealthAttributeSet->GetHealthAttribute()).AddUObject(this, &ASDestructible::OnHealthAttributeChanged);
-
 }
 
 // Called every frame

Source/unbread/Private/SRanged_AIController.cpp

@@ -144,7 +144,7 @@ void ASRanged_AIController::OnPerception(AActor* actor, FAIStimulus stimulus)
 	}
 }
 
-void ASRanged_AIController::SetDetectionLevel()
+void ASRanged_AIController::SetDetectionLevel() 
 {
 	auto State = BBC->GetValueAsEnum("AIState");
 

Source/unbread/Private/SRespawnGameMode.cpp

@@ -62,7 +62,7 @@ void ASRespawnGameMode::SpawnPlayer()
 void ASRespawnGameMode::RespawnPlayer(AActor* Destroyed)
 {
 	CurLives--;
-
+	
 	if (CheckLoss()) return;
 
 	// spawn player with delay, or no delay if 0.

Source/unbread/Public/SCharacter.h

@@ -125,10 +125,8 @@ class UNBREAD_API ASCharacter : public ACharacter, public IDynamicCameraInterfac
 	UPROPERTY(EditAnywhere, Category = "Movement")
 	float SprintSpeed;
 
-	UPROPERTY(EditAnywhere, Category = "Movement")
-	bool bIsWalking;
-
 	void Sprint();
+	void Walk();
 
 	UPROPERTY(EditAnywhere, BlueprintReadWrite, Category = "Movement")
 	float LerpSpeed = 0.6f;