From 4f8f2b37d1f4e234e65c142cb7adf77df451e21b Mon Sep 17 00:00:00 2001
From: PHILIP White <PW259246@falmouth.ac.uk>
Date: Thu, 27 Apr 2023 07:19:19 +0100
Subject: [PATCH] Updated Combat to Hide Book in Non-Combat

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

diff --git a/Content/Blueprints/Combat_UI/CombatCharacter.uasset b/Content/Blueprints/Combat_UI/CombatCharacter.uasset
index abf2202..1b1d3f6 100644
--- a/Content/Blueprints/Combat_UI/CombatCharacter.uasset
+++ b/Content/Blueprints/Combat_UI/CombatCharacter.uasset
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:8716a81dbb2ed49fa3142483140ace8f6b59aa28de3f8d7bba096953e3e7a953
-size 158858
+oid sha256:d1cede40c31d3cb3cde60064203ae42e0035f14885f2d48f361ac9f0f8a754cd
+size 157935
diff --git a/Source/the_twilight_abyss/TurnBasedCombatV2/TurnBaseCombatV2.cpp b/Source/the_twilight_abyss/TurnBasedCombatV2/TurnBaseCombatV2.cpp
index b1f3cc8..67a2c09 100644
--- a/Source/the_twilight_abyss/TurnBasedCombatV2/TurnBaseCombatV2.cpp
+++ b/Source/the_twilight_abyss/TurnBasedCombatV2/TurnBaseCombatV2.cpp
@@ -40,6 +40,7 @@ void ATurnBaseCombatV2::StartCombat(AActor* Enemy, bool bWasShot)
 	if (bIsInCombat) return;
 	BookHUD->SetVisibility(ESlateVisibility::SelfHitTestInvisible);
 	HUD->AddToViewport(-1);
+	BookStaticMeshComponent->SetVisibility(true);
 	EscapePercentage = CalculateEscapePercentage();
 	EscapePercentageTextBlock->SetText(FText::Join(FText::FromString(""), FText::FromString(FString::FromInt(EscapePercentage * 100)), FText::FromString("%")));
 	bIsInCombat = true;
@@ -113,6 +114,7 @@ void ATurnBaseCombatV2::EndCombat()
 {
 	BookHUD->SetVisibility(ESlateVisibility::Hidden);
 	HUD->RemoveFromParent();
+	BookStaticMeshComponent->SetVisibility(false);
 	Cast<ATempCharacter>(PlayerActor)->ResetWidgetPointer();
 	TurnIndicatorTextBlock->SetText(FText::FromString(""));
 	bEnemyHasExtraTurn = false;
@@ -164,6 +166,11 @@ void ATurnBaseCombatV2::BeginPlay()
 		PostProcessVolume->Settings.WeightedBlendables.Array.Add(WeightedBlendable);
 	}
 
+	TArray<UStaticMeshComponent*> StaticMeshComponents;
+	PlayerActor->GetComponents<UStaticMeshComponent>(StaticMeshComponents);
+	BookStaticMeshComponent = StaticMeshComponents[1];
+	BookStaticMeshComponent->SetVisibility(false);
+
 	CombatTutorialWidgetInstance = CreateWidget<UUserWidget>(GetWorld(), CombatTutorialWidget);
 	HUD = CreateWidget<UUserWidget>(GetWorld(), HUDWidget);
 	TArray<AActor*> PlayerChildActors;
diff --git a/Source/the_twilight_abyss/TurnBasedCombatV2/TurnBaseCombatV2.h b/Source/the_twilight_abyss/TurnBasedCombatV2/TurnBaseCombatV2.h
index daf6c4a..f375c8b 100644
--- a/Source/the_twilight_abyss/TurnBasedCombatV2/TurnBaseCombatV2.h
+++ b/Source/the_twilight_abyss/TurnBasedCombatV2/TurnBaseCombatV2.h
@@ -237,4 +237,6 @@ private:
 	UUserWidget* DeathScreenWidget;
 	UPROPERTY()
 	TSubclassOf<UUserWidget> DeathScreenWidgetSubclass;
+	UPROPERTY()
+	UStaticMeshComponent* BookStaticMeshComponent;
 };