Merge pull request #144 from MashdorDev/HeadRagdoll

Make the level path more clear & Make the splitting mechanic more interesting

Source/unbread/Private/AIManager.cpp

@@ -94,7 +94,7 @@ void AAIManager::NotifyAIState(EAIState state)
 {
 	for(auto & Cntrl: Agents)
 	{
-		Cntrl->BBC->SetValueAsEnum("AIState", (uint8_t)state);
+		Cntrl->BBC->SetValueAsEnum("AIState", StaticCast<uint8>(state));
 		if(state == EAIState::Attack)
 		{
 			GetWorldTimerManager().ClearTimer(Cntrl->DetectionTimer);

Source/unbread/Private/SCharacter.cpp

@@ -126,10 +126,28 @@ void ASCharacter::Move(const FInputActionValue& Value)
 	// TODO: Update forward and right vectors according to camera position and rotation
 	//
 	//
+
+	if(!bUseNewRotation) return;
+
+	const FVector2D RotVector = Value.Get<FVector2D>();
+
+	const float Angle = FMath::Atan2(RotVector.Y, RotVector.X) * (180.0f / PI);
+
+	// Rotate the character relative to the current camera
+	FRotator CameraWorldRotation = DynamicCamera->CurrentCameraActor->GetComponentByClass<UCameraComponent>()->GetComponentRotation();
+	CameraWorldRotation.Roll = 0.f;
+	CameraWorldRotation.Pitch = 0.f;	
+	const FRotator TargetRotation = UKismetMathLibrary::ComposeRotators(FRotator(0.0f, -1* Angle, 0.0f), CameraWorldRotation);
+
+	FRotator LerpedRotation = FMath::Lerp(GetMesh()->GetComponentRotation(), TargetRotation, LerpSpeed);
+
+	GetMesh()->SetWorldRotation(LerpedRotation);
 }
 
 void ASCharacter::Rotate(const FInputActionValue& Value)
 {
+	if(bUseNewRotation) return;
+
 	const FVector2D RotVector = Value.Get<FVector2D>();
 
 	const float Angle = FMath::Atan2(RotVector.Y, RotVector.X) * (180.0f / PI);
@@ -222,7 +240,7 @@ void ASCharacter::LaunchHead()
 	bIsHeadForm = true;
 
 	// Store the current location and rotation of the character
-	const FVector BodySpawnLocation = GetMesh()->GetComponentLocation();
+	const FVector BodySpawnLocation = GetMesh()->GetComponentLocation() + FVector(0.f, 0.f, 50.f);
 	const FRotator BodySpawnRotation = GetMesh()->GetComponentRotation();
 
 	// Swap the mesh and launch the head
@@ -239,7 +257,11 @@ void ASCharacter::LaunchHead()
 	GetCharacterMovement()->Velocity = LaunchVelocity;
 
 	// Spawn the body and add it to ActiveBodies
-	ActiveBodies.AddUnique(GetWorld()->SpawnActor<ASExplodingBody>(BodyClass, BodySpawnLocation, BodySpawnRotation));
+	FActorSpawnParameters Parameters {};
+	Parameters.bNoFail = true;
+	auto Spawned = GetWorld()->SpawnActor<ASExplodingBody>(BodyClass, BodySpawnLocation, BodySpawnRotation, Parameters);
+	Spawned->Mesh->AddImpulse(-GetMesh()->GetRightVector() * 10 * HeadLaunchVelocityMultiplier);
+	ActiveBodies.AddUnique(Spawned);
 
 }
 
@@ -268,7 +290,12 @@ void ASCharacter::ReformBody()
 		return;
 	}
 
-	NearestCrumbles->Destroy();
+	//NearestCrumbles->Destroy();
+
+	if(NearestCrumbles->GetClass()->ImplementsInterface(UInteractInterface::StaticClass()))
+	{
+		IInteractInterface::Execute_CrumbleInteraction(NearestCrumbles, this);
+	}
 	NearestCrumbles = nullptr;
 	bIsHeadForm = false;
 	Speed = WalkSpeed;

Source/unbread/Private/SCrumbles.cpp

@@ -60,6 +60,9 @@ void ASCrumbles::Tick(float DeltaTime)
 void ASCrumbles::CrumbleInteraction_Implementation(AActor* InstigatingActor)
 {
 	IInteractInterface::CrumbleInteraction_Implementation(InstigatingActor);
-	Destroy();
+	if(bDestroyOnUse)
+	{
+		Destroy();
+	}
 }
 

Source/unbread/Private/SExplodingBody.cpp

@@ -16,23 +16,23 @@ ASExplodingBody::ASExplodingBody()
 	Root = CreateDefaultSubobject<USceneComponent>("RootComponent");
 	SetRootComponent(Root);
 
+	//Capsule = CreateDefaultSubobject<UCapsuleComponent>("CapsuleComponent");
+	//Capsule->SetupAttachment(Root);
+	//Capsule->SetRelativeLocation(FVector(0.f, 0.f, 88.f));
+	//Capsule->SetCapsuleHalfHeight(88.f);
+	//Capsule->SetCapsuleRadius(34.f);
+
+	Mesh = CreateDefaultSubobject<USkeletalMeshComponent>("SkeletalMesh");
+	Mesh->SetupAttachment(Root);
+	Mesh->SetRelativeScale3D(FVector(0.465f, 0.465f, 0.465f));
+	Mesh->SetRelativeLocation(FVector(0.f, 0.f, 0.f));
+
 	RadialForce = CreateDefaultSubobject<URadialForceComponent>("RadialForceComponent");
-	RadialForce->SetupAttachment(Root);
+	RadialForce->SetupAttachment(Mesh);
 	RadialForce->Radius = 200.f;
 	RadialForce->ImpulseStrength = 1000.f;
 	RadialForce->bImpulseVelChange = true;
 
-	Capsule = CreateDefaultSubobject<UCapsuleComponent>("CapsuleComponent");
-	Capsule->SetupAttachment(Root);
-	Capsule->SetRelativeLocation(FVector(0.f, 0.f, 88.f));
-	Capsule->SetCapsuleHalfHeight(88.f);
-	Capsule->SetCapsuleRadius(34.f);
-
-	Mesh = CreateDefaultSubobject<USkeletalMeshComponent>("SkeletalMesh");
-	Mesh->SetupAttachment(Capsule);
-	Mesh->SetRelativeScale3D(FVector(0.465f, 0.465f, 0.465f));
-	Mesh->SetRelativeLocation(FVector(0.f, 0.f, -90.f));
-
 }
 
 // Called when the game starts or when spawned
@@ -59,7 +59,10 @@ void ASExplodingBody::Explode()
 {
 	RadialForce->FireImpulse();
 	const FActorSpawnParameters SpawnParameters;
-	GetWorld()->SpawnActor<ASCrumbles>(CrumblesActor, Mesh->GetComponentLocation(), Mesh->GetComponentRotation(), SpawnParameters);
+	FRotator SpawnRotation = Mesh->GetComponentRotation();
+	SpawnRotation.Pitch = 0.f;
+	SpawnRotation.Roll = 0.f;
+	GetWorld()->SpawnActor<ASCrumbles>(CrumblesActor, Mesh->GetComponentLocation(), SpawnRotation, SpawnParameters);
 	Destroy();
 }
 

Source/unbread/Private/SRespawnGameMode.cpp

@@ -61,7 +61,7 @@ void ASRespawnGameMode::SpawnPlayer()
 
 void ASRespawnGameMode::RespawnPlayer(AActor* Destroyed)
 {
-	CurLives--;
+	//CurLives--;
 
 	if (CheckLoss()) return;
 

Source/unbread/Public/SCharacter.h

@@ -131,6 +131,9 @@ class UNBREAD_API ASCharacter : public ACharacter, public IDynamicCameraInterfac
 	UPROPERTY(EditAnywhere, BlueprintReadWrite, Category = "Movement")
 	float LerpSpeed = 0.6f;
 
+	UPROPERTY(EditAnywhere, BlueprintReadWrite, Category = "Movement")
+	bool bUseNewRotation = true;
+
 	// Splitting Variables
 
 	UPROPERTY(EditAnywhere, BlueprintReadWrite)

Source/unbread/Public/SCrumbles.h

@@ -26,6 +26,9 @@ class UNBREAD_API ASCrumbles : public AActor, public IInteractInterface
 	UPROPERTY(EditAnywhere, BlueprintReadWrite, Category = "Components")
 	UBoxComponent* TriggerVolume;
 
+	UPROPERTY(EditAnywhere, BlueprintReadWrite)
+	bool bDestroyOnUse = true;
+
 protected:
 	// Called when the game starts or when spawned
 	virtual void BeginPlay() override;

Source/unbread/Public/SExplodingBody.h

@@ -25,8 +25,8 @@ class UNBREAD_API ASExplodingBody : public APawn
 	UPROPERTY(EditAnywhere, BlueprintReadWrite, Category = "Components")
 	URadialForceComponent* RadialForce;
 
-	UPROPERTY(EditAnywhere, BlueprintReadWrite, Category = "Components")
-	UCapsuleComponent* Capsule;
+	//UPROPERTY(EditAnywhere, BlueprintReadWrite, Category = "Components")
+	//UCapsuleComponent* Capsule;
 
 	UPROPERTY(EditAnywhere, BlueprintReadWrite, Category = "Components")
 	USkeletalMeshComponent* Mesh;