Philip/AzureAbyss
1
0
Fork 0
Code Issues Pull Requests Releases 1 Activity

Updated Combat to Hide Book in Non-Combat

Browse Source
This commit is contained in:
Philip W 2023-04-27 07:19:19 +01:00
parent 11c905613a
commit 4f8f2b37d1
3 changed files with 11 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

BIN
Content/Blueprints/Combat_UI/CombatCharacter.uasset (Stored with Git LFS)
View File

Binary file not shown.

7
Source/the_twilight_abyss/TurnBasedCombatV2/TurnBaseCombatV2.cpp
View File

@ -40,6 +40,7 @@ void ATurnBaseCombatV2::StartCombat(AActor* Enemy, bool bWasShot)
if (bIsInCombat) return; if (bIsInCombat) return;
BookHUD->SetVisibility(ESlateVisibility::SelfHitTestInvisible); BookHUD->SetVisibility(ESlateVisibility::SelfHitTestInvisible);
HUD->AddToViewport(-1); HUD->AddToViewport(-1);
BookStaticMeshComponent->SetVisibility(true);
EscapePercentage = CalculateEscapePercentage(); EscapePercentage = CalculateEscapePercentage();
EscapePercentageTextBlock->SetText(FText::Join(FText::FromString(""), FText::FromString(FString::FromInt(EscapePercentage * 100)), FText::FromString("%"))); EscapePercentageTextBlock->SetText(FText::Join(FText::FromString(""), FText::FromString(FString::FromInt(EscapePercentage * 100)), FText::FromString("%")));
bIsInCombat = true; bIsInCombat = true;
@ -113,6 +114,7 @@ void ATurnBaseCombatV2::EndCombat()
{ {
BookHUD->SetVisibility(ESlateVisibility::Hidden); BookHUD->SetVisibility(ESlateVisibility::Hidden);
HUD->RemoveFromParent(); HUD->RemoveFromParent();
BookStaticMeshComponent->SetVisibility(false);
Cast<ATempCharacter>(PlayerActor)->ResetWidgetPointer(); Cast<ATempCharacter>(PlayerActor)->ResetWidgetPointer();
TurnIndicatorTextBlock->SetText(FText::FromString("")); TurnIndicatorTextBlock->SetText(FText::FromString(""));
bEnemyHasExtraTurn = false; bEnemyHasExtraTurn = false;
@ -164,6 +166,11 @@ void ATurnBaseCombatV2::BeginPlay()
PostProcessVolume->Settings.WeightedBlendables.Array.Add(WeightedBlendable); PostProcessVolume->Settings.WeightedBlendables.Array.Add(WeightedBlendable);
} }
TArray<UStaticMeshComponent*> StaticMeshComponents;
PlayerActor->GetComponents<UStaticMeshComponent>(StaticMeshComponents);
BookStaticMeshComponent = StaticMeshComponents[1];
BookStaticMeshComponent->SetVisibility(false);
CombatTutorialWidgetInstance = CreateWidget<UUserWidget>(GetWorld(), CombatTutorialWidget); CombatTutorialWidgetInstance = CreateWidget<UUserWidget>(GetWorld(), CombatTutorialWidget);
HUD = CreateWidget<UUserWidget>(GetWorld(), HUDWidget); HUD = CreateWidget<UUserWidget>(GetWorld(), HUDWidget);
TArray<AActor*> PlayerChildActors; TArray<AActor*> PlayerChildActors;

2
Source/the_twilight_abyss/TurnBasedCombatV2/TurnBaseCombatV2.h
View File

@ -237,4 +237,6 @@ private:
UUserWidget* DeathScreenWidget; UUserWidget* DeathScreenWidget;
UPROPERTY() UPROPERTY()
TSubclassOf<UUserWidget> DeathScreenWidgetSubclass; TSubclassOf<UUserWidget> DeathScreenWidgetSubclass;
UPROPERTY()
UStaticMeshComponent* BookStaticMeshComponent;
}; };