Merge pull request #129 from Nick-Pearson/testing

Char: no longer can jump during slide,
Nick-Pearson · Apr 18, 2018 · 15efa5f · 15efa5f
2 parents 76f8177 + 0fef86b
commit 15efa5f
Show file tree

Hide file tree

Showing 3 changed files with 16 additions and 6 deletions.
diff --git a/ParkourGame/Content/ThirdPersonCPP/Blueprints/ThirdPersonCharacter.uasset b/ParkourGame/Content/ThirdPersonCPP/Blueprints/ThirdPersonCharacter.uasset
diff --git a/ParkourGame/Source/ParkourGame/Private/ParkourGameCharacter.cpp b/ParkourGame/Source/ParkourGame/Private/ParkourGameCharacter.cpp
@@ -942,9 +942,11 @@ void AParkourGameCharacter::SetRagdollOnBodyPart_Implementation(EBodyPart Part,
 	OnRep_RagdollState();
 }
 
-bool AParkourGameCharacter::SetFullRagdoll_Validate(bool bIsFullRagdoll) { return true; }
-void AParkourGameCharacter::SetFullRagdoll_Implementation(bool bIsFullRagdoll)
+bool AParkourGameCharacter::SetFullRagdoll_Validate(bool bIsFullRagdoll, bool bFromSlide) { return true; }
+void AParkourGameCharacter::SetFullRagdoll_Implementation(bool bIsFullRagdoll, bool bFromSlide)
 {
+
+	bWasSliding = bFromSlide;
 	m_RagdollState[(int32)EBodyPart::MAX] = bIsFullRagdoll ? 1 : 0;
 	OnRep_RagdollState();
 	OnRagdoll.Broadcast();
@@ -1184,9 +1186,15 @@ void AParkourGameCharacter::CapsuleToRagdoll()
 {
 	USkeletalMeshComponent* PlayerMesh = GetSkeletalMesh();
 	if (m_RagdollState[(int32)EBodyPart::MAX] > 0) {
+		//handle capsule position differently if sliding, for the camera's sake
+		FVector offset = FVector(0.0, 0.0, 0.0);
+		if (bWasSliding) {
+			offset = FVector(0.0, 0.0, 97.0);
+		}
+
 		FVector SocketLocation = PlayerMesh->GetSocketLocation(UParkourHelperLibrary::GetRootBoneForBodyPart(EBodyPart::Pelvis));
 		UCapsuleComponent* Capsule = GetCapsuleComponent();
-		Capsule->SetWorldLocation(SocketLocation);
+		Capsule->SetWorldLocation(SocketLocation + offset);
 	}
 }
 

diff --git a/ParkourGame/Source/ParkourGame/Private/ParkourGameCharacter.h b/ParkourGame/Source/ParkourGame/Private/ParkourGameCharacter.h
@@ -402,7 +402,7 @@ class AParkourGameCharacter : public ACharacter
 	void SetRagdollOnBodyPart(EBodyPart Part, bool bNewRagdoll);
 
 	UFUNCTION(BlueprintCallable, Category = "Physics", Server, Reliable, WithValidation)
-	void SetFullRagdoll(bool bIsFullRagdoll);
+	void SetFullRagdoll(bool bIsFullRagdoll, bool bFromSlide = false);
 
 	UFUNCTION(BlueprintPure, Category = "Physics")
 	bool IsFullRagdoll() const;
@@ -432,6 +432,7 @@ class AParkourGameCharacter : public ACharacter
   UFUNCTION()
   void OnGameOver(AMiniGameBase* Game, EMiniGameEndReason Reason);
 
+  UFUNCTION(BlueprintCallable, Category = "CharacterState")
   void EnableJumping(bool Enable = true);
 
 private:
@@ -483,5 +484,6 @@ class AParkourGameCharacter : public ACharacter
 	class AParkourPlayerState* ParkourPlayerState;
 
   bool bCanJump = true;
+  bool bWasSliding = false;
 };