Source/vampires/PlayerCharacter.cpp

@@ -7,7 +7,6 @@
 #include "EnhancedInputComponent.h"
 #include "EnhancedInputSubsystems.h"
 #include "InputMappingContext.h"
-#include "Kismet/GameplayStatics.h"
 
 APlayerCharacter::APlayerCharacter()
 {
@@ -30,20 +29,11 @@ APlayerCharacter::APlayerCharacter()
 
 	// Create EXP Component
 	EXPComponent = CreateDefaultSubobject<UEXPComponent>(TEXT("EXP Component"));
-
-	// Create Garlic Sphere Component
-	GarlicSphereComponent = CreateDefaultSubobject<USphereComponent>(TEXT("Garlic Sphere Component"));
-	GarlicSphereComponent->SetupAttachment(RootComponent);
-	GarlicSphereComponent->SetSphereRadius(150.0f);
 }
 
 void APlayerCharacter::BeginPlay()
 {
 	Super::BeginPlay();
-
-	GarlicSphereComponent->OnComponentBeginOverlap.AddDynamic(this, &APlayerCharacter::OnGarlicBeginOverlap);
-	GarlicSphereComponent->OnComponentEndOverlap.AddDynamic(this, &APlayerCharacter::OnGarlicEndOverlap);
-	GetWorldTimerManager().SetTimer(GarlicTimerHandle, this, &APlayerCharacter::GarlicUpdate, GarlicUpdateTime, true);
 }
 
 void APlayerCharacter::SetupPlayerInputComponent(UInputComponent* PlayerInputComponent)
@@ -81,46 +71,3 @@ void APlayerCharacter::MovementCallback(const FInputActionInstance& Instance)
 		AddMovementInput({1.0f, 0.0f, 0.0f}, vec2.X);
 	}
 }
-
-void APlayerCharacter::OnGarlicBeginOverlap(UPrimitiveComponent* OverlappedComponent, AActor* OtherActor,
-                                            UPrimitiveComponent* OtherComp, int32 OtherBodyIndex, bool bFromSweep,
-                                            const FHitResult& SweepResult)
-{
-	if (AEnemyCharacter* Enemy = Cast<AEnemyCharacter>(OtherActor))
-	{
-		OverlappedEnemies.Add(Enemy);
-	}
-}
-
-void APlayerCharacter::OnGarlicEndOverlap(UPrimitiveComponent* OverlappedComp, AActor* OtherActor,
-                                          UPrimitiveComponent* OtherComp, int32 OtherBodyIndex)
-{
-	if (AEnemyCharacter* Enemy = Cast<AEnemyCharacter>(OtherActor))
-	{
-		OverlappedEnemies.Remove(Enemy);
-	}
-}
-
-void APlayerCharacter::GarlicUpdate()
-{	
-	for (int i = 0; i < OverlappedEnemies.Num(); i++)
-	{
-		bool deadCheck = false;
-		UHealthComponent* EnemyHealthComponent = OverlappedEnemies[i]->GetHealthComponent();
-
-		if (!EnemyHealthComponent->GetIsDead())
-		{
-			if (EnemyHealthComponent->GetCurrentHealth() < GarlicDamage)
-			{
-				deadCheck = true;
-			}
-			
-			EnemyHealthComponent->TakeDamage(OverlappedEnemies[i], GarlicDamage, nullptr, GetController(), this);
-		}
-
-		if (deadCheck)
-		{
-			i -= 1;
-		}
-	}
-}

Source/vampires/PlayerCharacter.h

@@ -3,11 +3,9 @@
 #pragma once
 
 #include "CoreMinimal.h"
-#include "EnemyCharacter.h"
 #include "EXPComponent.h"
 #include "VampireCharacter.h"
 #include "Camera/CameraComponent.h"
-#include "Components/SphereComponent.h"
 #include "GameFramework/SpringArmComponent.h"
 #include "PlayerCharacter.generated.h"
 
@@ -35,25 +33,11 @@ public:
 	UPROPERTY(EditDefaultsOnly, BlueprintReadWrite)
 	UInputAction* MovementAction;
 
-	UPROPERTY(EditDefaultsOnly, BlueprintReadWrite)
-	float GarlicDamage = 51.0f;
-
-	UPROPERTY(EditDefaultsOnly, BlueprintReadWrite)
-	float GarlicUpdateTime = 1.0f;
-
 protected:
+
 	UPROPERTY()
 	UEXPComponent* EXPComponent;
 
-	UPROPERTY(VisibleAnywhere)
-	USphereComponent* GarlicSphereComponent;
-
-	UPROPERTY()
-	TArray<AEnemyCharacter*> OverlappedEnemies;
-
-private:
-	FTimerHandle GarlicTimerHandle;
-
 public:
 	APlayerCharacter();
 
@@ -66,16 +50,4 @@ public:
 private:
 	UFUNCTION()
 	void MovementCallback(const FInputActionInstance& Instance);
-
-	UFUNCTION()
-	void OnGarlicBeginOverlap(UPrimitiveComponent* OverlappedComponent, AActor* OtherActor,
-	                          UPrimitiveComponent* OtherComp, int32 OtherBodyIndex, bool bFromSweep,
-	                          const FHitResult& SweepResult);
-
-	UFUNCTION()
-	void OnGarlicEndOverlap(UPrimitiveComponent* OverlappedComp, AActor* OtherActor, UPrimitiveComponent* OtherComp,
-	                        int32 OtherBodyIndex);
-
-	UFUNCTION()
-	void GarlicUpdate();
 };