From a976775e6189ab59b811e4a0f81ce006745244f4 Mon Sep 17 00:00:00 2001
From: PHILIP White <PW259246@falmouth.ac.uk>
Date: Mon, 14 Nov 2022 23:41:55 +0000
Subject: [PATCH] Updated TurnBaseCombat for Enemy Death onHealthZero

---
 .../Blueprints/Combat_UI/TestCombatCharacter.uasset   |  4 ++--
 .../TurnBasedCombat/TurnBaseCombat.cpp                | 11 +++++++++--
 .../TurnBasedCombat/TurnBaseCombat.h                  |  5 +++--
 3 files changed, 14 insertions(+), 6 deletions(-)

diff --git a/Content/Blueprints/Combat_UI/TestCombatCharacter.uasset b/Content/Blueprints/Combat_UI/TestCombatCharacter.uasset
index e018216..1c221ce 100644
--- a/Content/Blueprints/Combat_UI/TestCombatCharacter.uasset
+++ b/Content/Blueprints/Combat_UI/TestCombatCharacter.uasset
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:52c661eb9501db06a66485f2a9fd9a78cd3aa7a7a6d5e7144140d89fbcc74767
-size 92597
+oid sha256:9b15ccfde9f9f5a07cfdc24a16193ff5a3c6c46ed5c2644e340bc12666e3c0f6
+size 91832
diff --git a/Source/the_twilight_abyss/TurnBasedCombat/TurnBaseCombat.cpp b/Source/the_twilight_abyss/TurnBasedCombat/TurnBaseCombat.cpp
index e8c3d75..01aa6ad 100644
--- a/Source/the_twilight_abyss/TurnBasedCombat/TurnBaseCombat.cpp
+++ b/Source/the_twilight_abyss/TurnBasedCombat/TurnBaseCombat.cpp
@@ -18,10 +18,11 @@ ATurnBaseCombat::ATurnBaseCombat()
 	}
 }
 
-void ATurnBaseCombat::StartCombat()
+void ATurnBaseCombat::StartCombat(AActor* Enemy)
 {
 	if (HUD->IsInViewport()) return;
 	HUD->AddToViewport();
+	EnemyActor = Enemy;
 
 	if (APlayerController* PC = Cast<APlayerController>(GetWorld()->GetFirstPlayerController()))
 	{
@@ -93,7 +94,13 @@ void ATurnBaseCombat::ExecuteCast(FString Combo)
 		break;
 	}
 	//End Combat if either the player or enemy is dead
-	if (PlayerHealth <= 0 || EnemyHealth <= 0)
+	if (EnemyHealth <= 0)
+	{
+		EndCombat();
+		EnemyActor->Destroy();
+		return;
+	}
+	if (PlayerHealth <= 0)
 	{
 		EndCombat();
 		return;
diff --git a/Source/the_twilight_abyss/TurnBasedCombat/TurnBaseCombat.h b/Source/the_twilight_abyss/TurnBasedCombat/TurnBaseCombat.h
index bbde3cf..c94c185 100644
--- a/Source/the_twilight_abyss/TurnBasedCombat/TurnBaseCombat.h
+++ b/Source/the_twilight_abyss/TurnBasedCombat/TurnBaseCombat.h
@@ -30,7 +30,8 @@ public:
 	int ActiveActionPoints = 0;
 
 	// AActor* PlayerActor;
-	// AActor* EnemyActor;
+	UPROPERTY(VisibleAnywhere)
+	AActor* EnemyActor;
 	// AActor* ActiveActor;
 
 	/*
@@ -52,7 +53,7 @@ public:
 	FString BattleLog;
 
 	UFUNCTION(BlueprintCallable)
-	void StartCombat();
+	void StartCombat(AActor* Enemy);
 	UFUNCTION(BlueprintCallable)
 	void EndCombat();