Source/Nakatomi/Decorators/BTDCanSeeTarget.cpp

@@ -1,27 +0,0 @@
-// Fill out your copyright notice in the Description page of Project Settings.
-
-
-#include "../Decorators/BTDCanSeeTarget.h"
-
-#include "AIController.h"
-#include "BehaviorTree/BlackboardComponent.h"
-
-bool UBTDCanSeeTarget::CalculateRawConditionValue(UBehaviorTreeComponent& OwnerComp, uint8* NodeMemory) const
-{
-	FHitResult HitResult;
-	
-	FVector Start = OwnerComp.GetAIOwner()->GetPawn()->GetActorLocation();
-
-	UBlackboardComponent* BlackboardComponent = OwnerComp.GetBlackboardComponent();
-	AActor* TargetActor = Cast<AActor>(BlackboardComponent->GetValueAsObject(TargetActorKey.SelectedKeyName));
-	FVector End = TargetActor->GetActorLocation();
-
-	GetWorld()->LineTraceSingleByChannel(HitResult, Start, End, ECC_Pawn);
-
-	if (HitResult.GetActor())
-	{
-		return true;
-	}
-
-	return false;
-}

Source/Nakatomi/Decorators/BTDCanSeeTarget.h

@@ -1,24 +0,0 @@
-// Fill out your copyright notice in the Description page of Project Settings.
-
-#pragma once
-
-#include "CoreMinimal.h"
-#include "BehaviorTree/BTDecorator.h"
-#include "BTDCanSeeTarget.generated.h"
-
-/**
- * 
- */
-UCLASS()
-class NAKATOMI_API UBTDCanSeeTarget : public UBTDecorator
-{
-	GENERATED_BODY()
-
-public:
-	UPROPERTY(EditAnywhere, Category = "Options",
-		Meta = (AllowPrivateAccess = "true", DisplayName = "Target Actor Key"))
-	FBlackboardKeySelector TargetActorKey;
-
-protected:
-	virtual bool CalculateRawConditionValue(UBehaviorTreeComponent& OwnerComp, uint8* NodeMemory) const override;
-};

Source/Nakatomi/Decorators/BTDIsHealthBelowThreshold.cpp

@@ -1,14 +0,0 @@
-// Fill out your copyright notice in the Description page of Project Settings.
-
-
-#include "../Decorators/BTDIsHealthBelowThreshold.h"
-
-#include "BehaviorTree/BlackboardComponent.h"
-
-bool UBTDIsHealthBelowThreshold::CalculateRawConditionValue(UBehaviorTreeComponent& OwnerComp, uint8* NodeMemory) const
-{
-	UBlackboardComponent* BlackboardComponent = OwnerComp.GetBlackboardComponent();
-	float currentHealth = BlackboardComponent->GetValueAsFloat(CurrentHealthKey.SelectedKeyName);
-	
-	return currentHealth <= HealthThreshold ? true : false;
-}

Source/Nakatomi/Decorators/BTDIsHealthBelowThreshold.h

@@ -1,29 +0,0 @@
-// Fill out your copyright notice in the Description page of Project Settings.
-
-#pragma once
-
-#include "CoreMinimal.h"
-#include "BehaviorTree/BTDecorator.h"
-#include "BTDIsHealthBelowThreshold.generated.h"
-
-/**
- * 
- */
-UCLASS()
-class NAKATOMI_API UBTDIsHealthBelowThreshold : public UBTDecorator
-{
-	GENERATED_BODY()
-
-public:
-
-	UPROPERTY(EditAnywhere, Category = "Options",
-		Meta = (AllowPrivateAccess = "true", DisplayName = "Current Health Key"))
-	FBlackboardKeySelector CurrentHealthKey;
-
-	UPROPERTY(EditAnywhere, Category = "Options",
-	Meta = (AllowPrivateAccess = "true", DisplayName = "Health Threshold"))
-	float HealthThreshold = 25.0f;
-
-protected:
-	virtual bool CalculateRawConditionValue(UBehaviorTreeComponent& OwnerComp, uint8* NodeMemory) const override;
-};

Source/Nakatomi/Decorators/BTDWeaponCooldown.cpp

@@ -1,23 +0,0 @@
-// Fill out your copyright notice in the Description page of Project Settings.
-
-
-#include "../Decorators/BTDWeaponCooldown.h"
-
-#include "AIController.h"
-#include "Nakatomi/EnemyCharacter.h"
-
-void UBTDWeaponCooldown::TickNode(UBehaviorTreeComponent& OwnerComp, uint8* NodeMemory, float DeltaSeconds)
-{
-	AEnemyCharacter* EnemyCharacter = Cast<AEnemyCharacter>(OwnerComp.GetAIOwner()->GetPawn());
-
-	if (EnemyCharacter && EnemyCharacter->GetCurrentWeapon())
-	{
-		const float Cooldown = EnemyCharacter->GetCurrentWeapon()->GetWeaponProperties()->WeaponCooldown;
-		if (CoolDownTime != Cooldown)
-		{
-			CoolDownTime = Cooldown;
-		}
-	}
-
-	Super::TickNode(OwnerComp, NodeMemory, DeltaSeconds);
-}

Source/Nakatomi/Decorators/BTDWeaponCooldown.h

@@ -1,19 +0,0 @@
-// Fill out your copyright notice in the Description page of Project Settings.
-
-#pragma once
-
-#include "CoreMinimal.h"
-#include "BehaviorTree/Decorators/BTDecorator_Cooldown.h"
-#include "BTDWeaponCooldown.generated.h"
-
-/**
- * 
- */
-UCLASS()
-class NAKATOMI_API UBTDWeaponCooldown : public UBTDecorator_Cooldown
-{
-	GENERATED_BODY()
-
-protected:
-	virtual void TickNode(UBehaviorTreeComponent& OwnerComp, uint8* NodeMemory, float DeltaSeconds) override;
-};

Source/Nakatomi/EnemyCharacter.cpp

@@ -4,9 +4,6 @@
 #include "EnemyAIController.h"
 #include "EnemyHealthComponent.h"
 #include "InteractableComponent.h"
-#include "BehaviorTree/BehaviorTree.h"
-#include "BehaviorTree/BlackboardComponent.h"
-#include "BehaviorTree/BlackboardData.h"
 
 #define COLLISION_WEAPON	ECC_GameTraceChannel1
 
@@ -19,7 +16,7 @@ AEnemyCharacter::AEnemyCharacter(const FObjectInitializer& ObjectInitializer) :
 	GetHealthComponent()->OnDamaged.BindUFunction(this, "OnDamaged");
 	GetHealthComponent()->OnDeath.BindUFunction(this, "OnDeath");
 	GetHealthComponent()->SetMaxHealth(100.0f);
-	
+
 	this->Tags.Add(FName("Enemy"));
 }
 
@@ -57,10 +54,6 @@ void AEnemyCharacter::WeaponCooldownHandler()
 void AEnemyCharacter::BeginPlay()
 {
 	Super::BeginPlay();
-
-	AEnemyAIController* controller = Cast<AEnemyAIController>(GetController());
-	controller->GetBlackboardComponent()->SetValueAsFloat("CurrentHealth", GetHealthComponent()->GetCurrentHealth());
-	GetHealthComponent()->OnDamaged.BindUFunction(this, "OnDamaged");
 }
 
 void AEnemyCharacter::PlayOnFireAnimations()
@@ -137,12 +130,3 @@ void AEnemyCharacter::ProcessHits(TArray<FHitResult> hits)
 		}
 	}
 }
-
-void AEnemyCharacter::OnDamaged()
-{
-	Super::OnDamaged();
-
-	AEnemyAIController* controller = Cast<AEnemyAIController>(GetController());
-	controller->GetBlackboardComponent()->SetValueAsFloat("CurrentHealth", GetHealthComponent()->GetCurrentHealth());
-}
-

Source/Nakatomi/EnemyCharacter.h

@@ -55,7 +55,4 @@ private:
 	virtual void CalculateHits(TArray<FHitResult>* hits) override;
 
 	virtual void ProcessHits(TArray<FHitResult> hits) override;
-
-protected:
-	virtual void OnDamaged() override;
 };