Merge pull request #195 from xthebat/175-add-destroyable-targets

Added Shooting Range
xthebat · Feb 16, 2024 · a4af2ce · a4af2ce
2 parents d7358c9 + 5af260c
commit a4af2ce
Show file tree

Hide file tree

Showing 8 changed files with 48 additions and 4 deletions.
diff --git a/Content/Blueprints/Character/Ball/BP_Ball.uasset b/Content/Blueprints/Character/Ball/BP_Ball.uasset
diff --git a/Content/Blueprints/Character/Ball/BP_BallShootingRange.uasset b/Content/Blueprints/Character/Ball/BP_BallShootingRange.uasset
diff --git a/Content/Maps/warmup.umap b/Content/Maps/warmup.umap
diff --git a/Source/Cloud9/Character/Cloud9Character.cpp b/Source/Cloud9/Character/Cloud9Character.cpp
@@ -228,6 +228,12 @@ UCloud9Inventory* ACloud9Character::GetInventory() const { return Inventory; }
 
 UCloud9CharacterHealthComponent* ACloud9Character::GetHealthComponent() const { return HealthComponent; }
 
+void ACloud9Character::AddScore()
+{
+	Score += 1;
+	OnScoreChanged.Broadcast(1);
+}
+
 void ACloud9Character::UseObject()
 {
 	// TODO: Implement UseObject

diff --git a/Source/Cloud9/Character/Cloud9Character.h b/Source/Cloud9/Character/Cloud9Character.h
@@ -31,6 +31,7 @@
 
 #include "Cloud9Character.generated.h"
 
+DECLARE_DYNAMIC_MULTICAST_DELEGATE_OneParam(FOnScoreChanged, int, Count);
 
 class UCloud9CharacterHealthComponent;
 
@@ -85,6 +86,8 @@ class ACloud9Character : public ACharacter
 
 	UCloud9CharacterHealthComponent* GetHealthComponent() const;
 
+	void AddScore();
+
 	void UseObject();
 
 	// Set by character movement to specify that this Character is currently sneaking.
@@ -125,6 +128,10 @@ class ACloud9Character : public ACharacter
 	UPROPERTY(VisibleAnywhere, BlueprintReadOnly, Category=State, meta=(AllowPrivateAccess))
 	UCloud9CharacterHealthComponent* HealthComponent;
 
+	/** Event called when character score changed. */
+	UPROPERTY(BlueprintAssignable, meta=(AllowPrivateAccess), Category=Events)
+	FOnScoreChanged OnScoreChanged;
+
 	/** Current number of frags made by character */
 	UPROPERTY(VisibleAnywhere, BlueprintReadOnly, Category=State, meta=(AllowPrivateAccess))
 	int Score;

diff --git a/Source/Cloud9/Character/Components/Cloud9CharacterHealthComponent.cpp b/Source/Cloud9/Character/Components/Cloud9CharacterHealthComponent.cpp
@@ -2,6 +2,7 @@
 
 #include "Cloud9CharacterHealthComponent.h"
 
+#include "Cloud9/Character/Cloud9Character.h"
 #include "Cloud9/Tools/Macro/Common.h"
 #include "Cloud9/Tools/Macro/Logging.h"
 
@@ -114,6 +115,12 @@ void UCloud9CharacterHealthComponent::OnTakePointDamage(
 {
 	TakeHealthDamage(Damage); // TODO: Add factor by armor
 	TakeArmorDamage(0.0f); // TODO: Add armor damage calc
+
+	if (DamagedActor->IsPendingKill())
+	{
+		log(Display, "DamageCauser=%s", *DamageCauser->GetOwner()->GetName());
+		Cast<ACloud9Character>(DamageCauser->GetOwner())->AddScore();
+	}
 }
 
 void UCloud9CharacterHealthComponent::OnTakeRadialDamage(

diff --git a/Source/Cloud9/Environment/Cloud9ShootingRange.cpp b/Source/Cloud9/Environment/Cloud9ShootingRange.cpp
@@ -27,42 +27,63 @@ void ACloud9ShootingRange::OnConstruction(const FTransform& Transform)
 void ACloud9ShootingRange::BeginPlay()
 {
 	Super::BeginPlay();
+	SpawnShootingActors();
 }
 
 void ACloud9ShootingRange::Tick(float DeltaTime)
 {
 	Super::Tick(DeltaTime);
+}
+
+void ACloud9ShootingRange::OnChildActorDestroyed(AActor* DestroyedActor)
+{
+	Actors.Remove(DestroyedActor);
 	SpawnShootingActors();
 }
 
 bool ACloud9ShootingRange::SpawnShootingActors()
 {
+	if (not IsValid(Template))
+	{
+		log(Error, "Actor class not specified!");
+		return false;
+	}
+
 	int Retries = 0;
 	FVector Origin;
 	FVector BoxExtent;
 	GetActorBounds(false, Origin, BoxExtent);
 	while (Actors.Num() != Count)
 	{
 		// GridSize items can be zero (GridSnap should handle it)
-		let Location = EFVector::Random(BoxExtent - Origin, BoxExtent + Origin, GridSize);
-		let Actor = GetWorld()->SpawnActor(Class.Get(), &Location);
+		let Location = EFVector::Random(Origin - BoxExtent, Origin + BoxExtent, GridSize);
+		let Actor = GetWorld()->SpawnActor(Template, &Location, nullptr);
+
+		if (not IsValid(Actor))
+		{
+			log(Fatal, "Can't spawn actor at location = %s", *Location.ToString());
+			return false;
+		}
+
 		if (Actors | ETContainer::AnyByPredicate{[Actor](let It) { return It->IsOverlappingActor(Actor); }})
 		{
+			Actor->Destroy();
+
 			if (constexpr int MaxRetries = 10; Retries++ == MaxRetries)
 			{
 				log(
 					Error,
 					"[Range=%s] parameters seems to be invalid can't spawn specified count of Actors = %d",
 					*GetName(), Count
 				);
-				SetActorTickEnabled(false);
 				return false;
 			}
 
 			continue;
 		}
 
 		Actors.Add(Actor);
+		Actor->OnDestroyed.AddDynamic(this, &ACloud9ShootingRange::OnChildActorDestroyed);
 	}
 
 	return true;

diff --git a/Source/Cloud9/Environment/Cloud9ShootingRange.h b/Source/Cloud9/Environment/Cloud9ShootingRange.h
@@ -25,6 +25,9 @@ class CLOUD9_API ACloud9ShootingRange : public AActor
 
 	virtual void Tick(float DeltaTime) override;
 
+	UFUNCTION(BlueprintCallable)
+	void OnChildActorDestroyed(AActor* DestroyedActor);
+
 	UPROPERTY(BlueprintReadOnly, Category=Implementation)
 	UBoxComponent* ZoneComponent;
 
@@ -35,7 +38,7 @@ class CLOUD9_API ACloud9ShootingRange : public AActor
 	int Count;
 
 	UPROPERTY(EditAnywhere, Category=Config)
-	TSoftClassPtr<AActor> Class;
+	UClass* Template;
 
 	UPROPERTY(EditAnywhere, Category=Config)
 	FVector ZoneSize;