163 - Pickup Spawn Point

Source/Blaster/Pickups/AmmoPickup.cpp

@@ -6,19 +6,13 @@
 #include "Blaster/Character/BlasterCharacter.h"
 #include "Blaster/Components/CombatComponent.h"
 
-void AAmmoPickup::OnSphereOverlap(UPrimitiveComponent* OverlappedComponent, AActor* OtherActor, UPrimitiveComponent* OtherComp, int32 OtherBodyIndex,
+void AAmmoPickup::OnOverlap(ABlasterCharacter* BlasterCharacter)
-                                  bool bFromSweep, const FHitResult& SweepResult)
 {
-	Super::OnSphereOverlap(OverlappedComponent, OtherActor, OtherComp, OtherBodyIndex, bFromSweep, SweepResult);
+	Super::OnOverlap(BlasterCharacter);
 
-	ABlasterCharacter* BlasterCharacter = Cast<ABlasterCharacter>(OtherActor);
+	if (UCombatComponent* Combat = BlasterCharacter->GetCombat())
-	if (BlasterCharacter)
 	{
-		UCombatComponent* Combat = BlasterCharacter->GetCombat();
+		Combat->PickupAmmo(WeaponType, AmmoAmount);
-		if (Combat)
-		{
-			Combat->PickupAmmo(WeaponType, AmmoAmount);
-		}
 	}
 
 	Destroy();

Source/Blaster/Pickups/AmmoPickup.h

@@ -16,14 +16,7 @@ class BLASTER_API AAmmoPickup : public APickup
 	GENERATED_BODY()
 
 protected:
-	virtual void OnSphereOverlap(
+	virtual void OnOverlap(ABlasterCharacter* BlasterCharacter) override;
-		UPrimitiveComponent* OverlappedComponent,
-		AActor* OtherActor,
-		UPrimitiveComponent* OtherComp,
-		int32 OtherBodyIndex,
-		bool bFromSweep,
-		const FHitResult& SweepResult
-	) override;
 
 private:
 	UPROPERTY(EditAnywhere)

Source/Blaster/Pickups/HealthPickup.cpp

@@ -11,19 +11,13 @@ AHealthPickup::AHealthPickup()
 	bReplicates = true;
 }
 
-void AHealthPickup::OnSphereOverlap(UPrimitiveComponent* OverlappedComponent, AActor* OtherActor, UPrimitiveComponent* OtherComp, int32 OtherBodyIndex,
+void AHealthPickup::OnOverlap(ABlasterCharacter* BlasterCharacter)
-                                    bool bFromSweep, const FHitResult& SweepResult)
 {
-	Super::OnSphereOverlap(OverlappedComponent, OtherActor, OtherComp, OtherBodyIndex, bFromSweep, SweepResult);
+	Super::OnOverlap(BlasterCharacter);
 
-	ABlasterCharacter* BlasterCharacter = Cast<ABlasterCharacter>(OtherActor);
+	if (UBuffComponent* Buff = BlasterCharacter->GetBuff())
-	if (BlasterCharacter)
 	{
-		UBuffComponent* Buff = BlasterCharacter->GetBuff();
+		Buff->Heal(HealAmount, HealingTime);
-		if (Buff)
-		{
-			Buff->Heal(HealAmount, HealingTime);
-		}
 	}
 
 	Destroy();

Source/Blaster/Pickups/HealthPickup.h

@@ -18,14 +18,7 @@ public:
 	AHealthPickup();
 
 protected:
-	virtual void OnSphereOverlap(
+	virtual void OnOverlap(ABlasterCharacter* BlasterCharacter) override;
-		UPrimitiveComponent* OverlappedComponent,
-		AActor* OtherActor,
-		UPrimitiveComponent* OtherComp,
-		int32 OtherBodyIndex,
-		bool bFromSweep,
-		const FHitResult& SweepResult
-	) override;
 
 private:
 	UPROPERTY(EditAnywhere)

Source/Blaster/Pickups/JumpPickup.cpp

@@ -6,21 +6,14 @@
 #include "Blaster/Character/BlasterCharacter.h"
 #include "Blaster/Components/BuffComponent.h"
 
-void AJumpPickup::OnSphereOverlap(UPrimitiveComponent* OverlappedComponent, AActor* OtherActor, UPrimitiveComponent* OtherComp, int32 OtherBodyIndex,
+void AJumpPickup::OnOverlap(ABlasterCharacter* BlasterCharacter)
-                                  bool bFromSweep, const FHitResult& SweepResult)
 {
-	Super::OnSphereOverlap(OverlappedComponent, OtherActor, OtherComp, OtherBodyIndex, bFromSweep, SweepResult);
+	Super::OnOverlap(BlasterCharacter);
 
-	ABlasterCharacter* BlasterCharacter = Cast<ABlasterCharacter>(OtherActor);
+	if (UBuffComponent* Buff = BlasterCharacter->GetBuff())
-	if (BlasterCharacter)
 	{
-		UBuffComponent* Buff = BlasterCharacter->GetBuff();
+		Buff->BuffJump(JumpZVelocity, JumpBuffTime);
-		if (Buff)
-		{
-			Buff->BuffJump(JumpZVelocity, JumpBuffTime);
-		}
 	}
 
 	Destroy();
 }
-

Source/Blaster/Pickups/JumpPickup.h

@@ -15,14 +15,7 @@ class BLASTER_API AJumpPickup : public APickup
 	GENERATED_BODY()
 
 protected:
-	virtual void OnSphereOverlap(
+	virtual void OnOverlap(ABlasterCharacter* BlasterCharacter) override;
-		UPrimitiveComponent* OverlappedComponent,
-		AActor* OtherActor,
-		UPrimitiveComponent* OtherComp,
-		int32 OtherBodyIndex,
-		bool bFromSweep,
-		const FHitResult& SweepResult
-	) override;
 
 private:
 

Source/Blaster/Pickups/Pickup.cpp

@@ -42,14 +42,44 @@ void APickup::BeginPlay()
 
 	if (HasAuthority())
 	{
+		GetWorldTimerManager().SetTimer(
+			BindOverlapTimer,
+			this,
+			&APickup::BindOverlapTimerFinished,
+			BindOverlapTime
+		);
+	}
+}
+
+void APickup::OnOverlap(ABlasterCharacter* BlasterCharacter)
+{
+}
+
+void APickup::BindOverlapTimerFinished()
+{
+	if (HasAuthority())
+	{
+		TArray<AActor*> OverlappingActors;
+		GetOverlappingActors(OverlappingActors, ABlasterCharacter::StaticClass());
+		for (const auto OverlappingActor : OverlappingActors)
+		{
+			if (ABlasterCharacter* BlasterCharacter = Cast<ABlasterCharacter>(OverlappingActor))
+			{
+				OnOverlap(BlasterCharacter);
+			}
+		}
+
 		OverlapSphere->OnComponentBeginOverlap.AddDynamic(this, &APickup::OnSphereOverlap);
 	}
 }
 
 void APickup::OnSphereOverlap(UPrimitiveComponent* OverlappedComponent, AActor* OtherActor, UPrimitiveComponent* OtherComp, int32 OtherBodyIndex,
-	bool bFromSweep, const FHitResult& SweepResult)
+                              bool bFromSweep, const FHitResult& SweepResult)
 {
-	
+	if (ABlasterCharacter* BlasterCharacter = Cast<ABlasterCharacter>(OtherActor))
+	{
+		OnOverlap(BlasterCharacter);
+	}
 }
 
 void APickup::Tick(float DeltaTime)
@@ -84,4 +114,3 @@ void APickup::Destroyed()
 		);
 	}
 }
-

Source/Blaster/Pickups/Pickup.h

@@ -3,6 +3,7 @@
 #pragma once
 
 #include "CoreMinimal.h"
+#include "Blaster/Character/BlasterCharacter.h"
 #include "GameFramework/Actor.h"
 #include "Pickup.generated.h"
 
@@ -15,7 +16,7 @@ public:
 	APickup();
 	virtual void Tick(float DeltaTime) override;
 	virtual void Destroyed() override;
-	
+
 protected:
 	virtual void BeginPlay() override;
 
@@ -29,9 +30,16 @@ protected:
 		const FHitResult& SweepResult
 	);
 
+	virtual void OnOverlap(ABlasterCharacter* BlasterCharacter);
+
 	UPROPERTY(EditAnywhere)
 	float BaseTurnRate = 45.f;
-	
+
+	FTimerHandle BindOverlapTimer;
+	float BindOverlapTime = 0.25f;
+	void BindOverlapTimerFinished();
+
+
 private:
 	UPROPERTY(EditAnywhere)
 	class USphereComponent* OverlapSphere;
@@ -41,11 +49,10 @@ private:
 
 	UPROPERTY(EditAnywhere)
 	UStaticMeshComponent* PickupMesh;
-	
+
 	UPROPERTY(VisibleAnywhere)
 	class UNiagaraComponent* PickupEffectComponent;
 
 	UPROPERTY(EditAnywhere)
 	class UNiagaraSystem* PickupEffect;
-
 };

Source/Blaster/Pickups/PickupSpawnPoint.cpp

@@ -0,0 +1,59 @@
+// Fill out your copyright notice in the Description page of Project Settings.
+
+
+#include "PickupSpawnPoint.h"
+
+#include "Pickup.h"
+#include "Kismet/GameplayStatics.h"
+
+APickupSpawnPoint::APickupSpawnPoint()
+{
+	PrimaryActorTick.bCanEverTick = true;
+	bReplicates = true;
+}
+
+void APickupSpawnPoint::BeginPlay()
+{
+	Super::BeginPlay();
+	StartSpawnPickupTimer(nullptr);
+}
+
+void APickupSpawnPoint::SpawnPickup()
+{
+	if (const int32 NumPickupClasses = PickupClasses.Num(); NumPickupClasses > 0)
+	{
+		const int32 Selection = FMath::RandRange(0, NumPickupClasses - 1);
+		SpawnedPickup = GetWorld()->SpawnActor<APickup>(
+			PickupClasses[Selection],
+			GetActorTransform()
+		);
+		if (HasAuthority() && SpawnedPickup)
+		{
+			SpawnedPickup->OnDestroyed.AddDynamic(this, &APickupSpawnPoint::StartSpawnPickupTimer);
+		}
+	}
+}
+
+void APickupSpawnPoint::StartSpawnPickupTimer(AActor* Destroyed)
+{
+	const float SpawnTime = FMath::RandRange(SpawnPickupTimeMin, SpawnPickupTimeMax);
+	GetWorldTimerManager().SetTimer(
+		SpawnPickupTimer,
+		this,
+		&APickupSpawnPoint::SpawnPickupTimerFinished,
+		SpawnTime
+	);
+}
+
+void APickupSpawnPoint::SpawnPickupTimerFinished()
+{
+	if (HasAuthority())
+	{
+		SpawnPickup();
+	}
+}
+
+void APickupSpawnPoint::Tick(float DeltaTime)
+{
+	Super::Tick(DeltaTime);
+}

Source/Blaster/Pickups/PickupSpawnPoint.h

@@ -0,0 +1,41 @@
+// Fill out your copyright notice in the Description page of Project Settings.
+
+#pragma once
+
+#include "CoreMinimal.h"
+#include "GameFramework/Actor.h"
+#include "PickupSpawnPoint.generated.h"
+
+UCLASS()
+class BLASTER_API APickupSpawnPoint : public AActor
+{
+	GENERATED_BODY()
+	
+public:	
+	APickupSpawnPoint();
+	virtual void Tick(float DeltaTime) override;
+
+protected:
+	virtual void BeginPlay() override;
+
+	UPROPERTY(EditAnywhere)
+	TArray<TSubclassOf<class APickup>> PickupClasses;
+
+	UPROPERTY()
+	APickup* SpawnedPickup;
+	
+	UPROPERTY(EditAnywhere)
+	float SpawnPickupTimeMin;
+	UPROPERTY(EditAnywhere)
+	float SpawnPickupTimeMax;
+	
+	void SpawnPickup();
+	UFUNCTION()
+	void StartSpawnPickupTimer(AActor* Destroyed);
+	void SpawnPickupTimerFinished();
+	
+private:
+
+	FTimerHandle SpawnPickupTimer;
+
+};

Source/Blaster/Pickups/ShieldPickup.cpp

@@ -6,19 +6,13 @@
 #include "Blaster/Character/BlasterCharacter.h"
 #include "Blaster/Components/BuffComponent.h"
 
-void AShieldPickup::OnSphereOverlap(UPrimitiveComponent* OverlappedComponent, AActor* OtherActor, UPrimitiveComponent* OtherComp, int32 OtherBodyIndex,
+void AShieldPickup::OnOverlap(ABlasterCharacter* BlasterCharacter)
-                                    bool bFromSweep, const FHitResult& SweepResult)
 {
-	Super::OnSphereOverlap(OverlappedComponent, OtherActor, OtherComp, OtherBodyIndex, bFromSweep, SweepResult);
+	Super::OnOverlap(BlasterCharacter);
 
-	ABlasterCharacter* BlasterCharacter = Cast<ABlasterCharacter>(OtherActor);
+	if (UBuffComponent* Buff = BlasterCharacter->GetBuff())
-	if (BlasterCharacter)
 	{
-		UBuffComponent* Buff = BlasterCharacter->GetBuff();
+		Buff->ReplenishShield(ShieldReplenishAmount, ShieldReplenishTime);
-		if (Buff)
-		{
-			Buff->ReplenishShield(ShieldReplenishAmount, ShieldReplenishTime);
-		}
 	}
 
 	Destroy();

Source/Blaster/Pickups/ShieldPickup.h

@@ -16,14 +16,7 @@ class BLASTER_API AShieldPickup : public APickup
 
 	
 protected:
-	virtual void OnSphereOverlap(
+	virtual void OnOverlap(ABlasterCharacter* BlasterCharacter) override;
-		UPrimitiveComponent* OverlappedComponent,
-		AActor* OtherActor,
-		UPrimitiveComponent* OtherComp,
-		int32 OtherBodyIndex,
-		bool bFromSweep,
-		const FHitResult& SweepResult
-	) override;
 
 private:
 	UPROPERTY(EditAnywhere)

Source/Blaster/Pickups/SpeedPickup.cpp

@@ -6,20 +6,14 @@
 #include "Blaster/Character/BlasterCharacter.h"
 #include "Blaster/Components/BuffComponent.h"
 
-void ASpeedPickup::OnSphereOverlap(UPrimitiveComponent* OverlappedComponent, AActor* OtherActor, UPrimitiveComponent* OtherComp, int32 OtherBodyIndex,
+void ASpeedPickup::OnOverlap(ABlasterCharacter* BlasterCharacter)
-                                   bool bFromSweep, const FHitResult& SweepResult)
 {
-	Super::OnSphereOverlap(OverlappedComponent, OtherActor, OtherComp, OtherBodyIndex, bFromSweep, SweepResult);
+	Super::OnOverlap(BlasterCharacter);
 
-	ABlasterCharacter* BlasterCharacter = Cast<ABlasterCharacter>(OtherActor);
+	if (UBuffComponent* Buff = BlasterCharacter->GetBuff())
-	if (BlasterCharacter)
 	{
-		UBuffComponent* Buff = BlasterCharacter->GetBuff();
+		Buff->BuffSpeed(BaseSpeedBuff, CrouchSpeedBuff, SpeedBuffTime);
-		if (Buff)
-		{
-			Buff->BuffSpeed(BaseSpeedBuff, CrouchSpeedBuff, SpeedBuffTime);
-		}
 	}
-
+	
 	Destroy();
 }

Source/Blaster/Pickups/SpeedPickup.h

@@ -15,14 +15,7 @@ class BLASTER_API ASpeedPickup : public APickup
 	GENERATED_BODY()
 
 protected:
-	virtual void OnSphereOverlap(
+	virtual void OnOverlap(ABlasterCharacter* BlasterCharacter) override;
-		UPrimitiveComponent* OverlappedComponent,
-		AActor* OtherActor,
-		UPrimitiveComponent* OtherComp,
-		int32 OtherBodyIndex,
-		bool bFromSweep,
-		const FHitResult& SweepResult
-	) override;
 
 private: