From 19fcc0c063f3dc032e35814a22d8d7244358ac0f Mon Sep 17 00:00:00 2001
From: PHILIP White <PW259246@falmouth.ac.uk>
Date: Thu, 27 Apr 2023 04:24:54 +0100
Subject: [PATCH] Updated Combat to Include Enemy UI

---
 Content/Blueprints/Combat_UI/Combat_UI.uasset                 | 4 ++--
 .../the_twilight_abyss/TurnBasedCombatV2/TurnBaseCombatV2.cpp | 2 ++
 .../the_twilight_abyss/TurnBasedCombatV2/TurnBaseCombatV2.h   | 2 +-
 3 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/Content/Blueprints/Combat_UI/Combat_UI.uasset b/Content/Blueprints/Combat_UI/Combat_UI.uasset
index 7bd371c..152da4c 100644
--- a/Content/Blueprints/Combat_UI/Combat_UI.uasset
+++ b/Content/Blueprints/Combat_UI/Combat_UI.uasset
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:018662f3950037cb894b8d4b308e80b7f8913660de3d239f663e0b23846e1fc1
-size 54682
+oid sha256:109e5c204a191b8e7b069a6b0b847fd6f8841b021e0b5c41ec2f637e46f0e6c1
+size 37651
diff --git a/Source/the_twilight_abyss/TurnBasedCombatV2/TurnBaseCombatV2.cpp b/Source/the_twilight_abyss/TurnBasedCombatV2/TurnBaseCombatV2.cpp
index eec5d2c..6b7104a 100644
--- a/Source/the_twilight_abyss/TurnBasedCombatV2/TurnBaseCombatV2.cpp
+++ b/Source/the_twilight_abyss/TurnBasedCombatV2/TurnBaseCombatV2.cpp
@@ -38,6 +38,7 @@ void ATurnBaseCombatV2::StartCombat(AActor* Enemy, bool bWasShot)
 	EnemyActor = Enemy;
 	if (bIsInCombat) return;
 	BookHUD->SetVisibility(ESlateVisibility::SelfHitTestInvisible);
+	HUD->AddToViewport(-1);
 	EscapePercentage = CalculateEscapePercentage();
 	EscapePercentageTextBlock->SetText(FText::Join(FText::FromString(""), FText::FromString(FString::FromInt(EscapePercentage * 100)), FText::FromString("%")));
 	bIsInCombat = true;
@@ -110,6 +111,7 @@ void ATurnBaseCombatV2::CombatCheck(bool bWasShot)
 void ATurnBaseCombatV2::EndCombat()
 {
 	BookHUD->SetVisibility(ESlateVisibility::Hidden);
+	HUD->RemoveFromParent();
 	Cast<ATempCharacter>(PlayerActor)->ResetWidgetPointer();
 	TurnIndicatorTextBlock->SetText(FText::FromString(""));
 	bEnemyHasExtraTurn = false;
diff --git a/Source/the_twilight_abyss/TurnBasedCombatV2/TurnBaseCombatV2.h b/Source/the_twilight_abyss/TurnBasedCombatV2/TurnBaseCombatV2.h
index bf780b0..a515768 100644
--- a/Source/the_twilight_abyss/TurnBasedCombatV2/TurnBaseCombatV2.h
+++ b/Source/the_twilight_abyss/TurnBasedCombatV2/TurnBaseCombatV2.h
@@ -52,7 +52,7 @@ public:
 	UPROPERTY(EditDefaultsOnly)
 	UNiagaraSystem* GunEffect;
 
-	UPROPERTY(VisibleAnywhere)
+	UPROPERTY(VisibleAnywhere, BlueprintReadWrite)
 	AActor* PlayerActor;
 	UPROPERTY(VisibleAnywhere, BlueprintReadWrite)
 	AActor* EnemyActor;