From b84a16e926924c8d173a18feabda06262ae52c57 Mon Sep 17 00:00:00 2001
From: PHILIP White <PW259246@falmouth.ac.uk>
Date: Tue, 31 Jan 2023 01:21:49 +0000
Subject: [PATCH] Updated TurnBaseCombat to Link Health Values

---
 .../TurnBasedCombatV2/TurnBaseCombatV2.cpp                | 8 +++++---
 .../TurnBasedCombatV2/TurnBaseCombatV2.h                  | 3 +--
 2 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/Source/the_twilight_abyss/TurnBasedCombatV2/TurnBaseCombatV2.cpp b/Source/the_twilight_abyss/TurnBasedCombatV2/TurnBaseCombatV2.cpp
index 4fb30da..0750f06 100644
--- a/Source/the_twilight_abyss/TurnBasedCombatV2/TurnBaseCombatV2.cpp
+++ b/Source/the_twilight_abyss/TurnBasedCombatV2/TurnBaseCombatV2.cpp
@@ -10,6 +10,7 @@
 #include "Components/ProgressBar.h"
 #include "GameFramework/Character.h"
 #include "Kismet/GameplayStatics.h"
+#include "the_twilight_abyss/PlayerTemp/TempCharacter.h"
 
 // Sets default values
 ATurnBaseCombatV2::ATurnBaseCombatV2()
@@ -102,6 +103,7 @@ void ATurnBaseCombatV2::BeginPlay()
 	{
 		PlayerActor = Cast<AActor>(Actor);
 	}
+	PlayerHealth = &Cast<ATempCharacter>(PlayerActor)->Health;
 
 	HUD = CreateWidget<UUserWidget>(GetWorld(), HUDWidget);
 
@@ -181,7 +183,7 @@ void ATurnBaseCombatV2::ExecuteCast(FString Combo)
 		EnemyActor->Destroy();
 		return;
 	}
-	if (PlayerHealth <= 0)
+	if (*PlayerHealth <= 0)
 	{
 		EndCombat();
 		return;
@@ -210,7 +212,7 @@ void ATurnBaseCombatV2::RevertActionPoints()
 
 void ATurnBaseCombatV2::DamagePlayer(int Damage)
 {
-	PlayerHealth -= FMath::Clamp(Damage, 0, 100);
+	*PlayerHealth -= FMath::Clamp(Damage, 0, 100);
 	UpdateProgressBars();
 	AddBattleLogMessage("Player was damaged for " + FString::FromInt(Damage) + " damage.");
 }
@@ -224,7 +226,7 @@ void ATurnBaseCombatV2::DamageEnemy(int Damage)
 
 void ATurnBaseCombatV2::UpdateProgressBars() const
 {
-	PlayerHealthBar->SetPercent(PlayerHealth / 100.0f);
+	PlayerHealthBar->SetPercent(*PlayerHealth / 100.0f);
 	EnemyHealthBar->SetPercent(*EnemyHealth / 100.0f);
 }
 
diff --git a/Source/the_twilight_abyss/TurnBasedCombatV2/TurnBaseCombatV2.h b/Source/the_twilight_abyss/TurnBasedCombatV2/TurnBaseCombatV2.h
index 7d019e2..88f918d 100644
--- a/Source/the_twilight_abyss/TurnBasedCombatV2/TurnBaseCombatV2.h
+++ b/Source/the_twilight_abyss/TurnBasedCombatV2/TurnBaseCombatV2.h
@@ -22,8 +22,7 @@ public:
 	ATurnBaseCombatV2();
 
 	int* EnemyHealth = nullptr;
-	UPROPERTY(EditDefaultsOnly)
-	int PlayerHealth = 100;
+	float* PlayerHealth = nullptr;
 	UPROPERTY(EditDefaultsOnly)
 	int DefaultActionPoints = 3;
 	UPROPERTY(EditDefaultsOnly)