From 69bd004895f97b795dec9049db65bac94ab4f4b1 Mon Sep 17 00:00:00 2001
From: PHILIP White <PW259246@falmouth.ac.uk>
Date: Thu, 27 Apr 2023 07:22:40 +0100
Subject: [PATCH] Bugfix Combat Values Not Being Reset on Combat End

---
 .../TurnBasedCombatV2/TurnBaseCombatV2.cpp           | 12 +++++++++---
 1 file changed, 9 insertions(+), 3 deletions(-)

diff --git a/Source/the_twilight_abyss/TurnBasedCombatV2/TurnBaseCombatV2.cpp b/Source/the_twilight_abyss/TurnBasedCombatV2/TurnBaseCombatV2.cpp
index 67a2c09..f2de4ab 100644
--- a/Source/the_twilight_abyss/TurnBasedCombatV2/TurnBaseCombatV2.cpp
+++ b/Source/the_twilight_abyss/TurnBasedCombatV2/TurnBaseCombatV2.cpp
@@ -87,17 +87,23 @@ void ATurnBaseCombatV2::CombatCheck(bool bWasShot)
 	EisResource = 10;
 	AzosResource = 10;
 	IroquoidResource = 10;
+	
+	ChainDamageMultiplier = 1.0f;
+	BaseDamageMultiplier = 1.0f;
+	DamageMultiplierTextBlock->SetText(FText::FromString(""));
 
+	FProperty* ReactionSpeedProperty = EnemyActor->GetClass()->FindPropertyByName(FName("ReactionSpeed"));
+	float* EnemyReactionSpeedPtr = ReactionSpeedProperty->ContainerPtrToValuePtr<float>(EnemyActor);
+	
 	CurrentComboString = "";
 	UpdateComboString(CurrentComboString);
 	RevertActionPoints();
 	UpdateActionPoints();
 	UpdateResourceBars();
+	UpdateProgressBars();
 	ClearBattleLog();
 	EnableButtons();
-
-	FProperty* ReactionSpeedProperty = EnemyActor->GetClass()->FindPropertyByName(FName("ReactionSpeed"));
-	float* EnemyReactionSpeedPtr = ReactionSpeedProperty->ContainerPtrToValuePtr<float>(EnemyActor);
+	
 	if (EnemyBlackboard->GetValueAsBool("Sight") && !bWasShot)
 	{
 		//bEnemyHasExtraTurn = true;