diff --git a/Content/Blueprints/Combat_UI/Combat_UI.uasset b/Content/Blueprints/Combat_UI/Combat_UI.uasset index 17f3528..510316a 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:9a424991fcd6608754b8ccbac1016d9f1bf344a311e0228ddcbcd3fad10018d9 -size 80703 +oid sha256:2f6e1bc0ac7f714f23188a5493f19db8a2eee98d2fdc687e2da3e6e88f308275 +size 56965 diff --git a/Source/the_twilight_abyss/TurnBasedCombatV2/TurnBaseCombatV2.cpp b/Source/the_twilight_abyss/TurnBasedCombatV2/TurnBaseCombatV2.cpp index 9371649..f426565 100644 --- a/Source/the_twilight_abyss/TurnBasedCombatV2/TurnBaseCombatV2.cpp +++ b/Source/the_twilight_abyss/TurnBasedCombatV2/TurnBaseCombatV2.cpp @@ -12,7 +12,6 @@ #include "GameFramework/Character.h" #include "Kismet/GameplayStatics.h" #include "the_twilight_abyss/PlayerTemp/TempCharacter.h" -#include "UObject/UnrealTypePrivate.h" // Sets default values ATurnBaseCombatV2::ATurnBaseCombatV2() @@ -138,17 +137,22 @@ void ATurnBaseCombatV2::BeginPlay() PlayerHealth = &Cast(PlayerActor)->Health; HUD = CreateWidget(GetWorld(), HUDWidget); + TArray PlayerChildActors; + PlayerActor->GetAllChildActors(PlayerChildActors, false); + PlayerWidget = Cast(PlayerChildActors[0]->GetComponentByClass(UWidgetComponent::StaticClass())); + PlayerWidget->InitWidget(); + BookHUD = PlayerWidget->GetWidget(); TurnIndicatorTextBlock = Cast(HUD->GetWidgetFromName("TurnIndicator")); CurrentComboTextBlock = Cast(HUD->GetWidgetFromName("CurrentCombo")); ActionPointsTextBlock = Cast(HUD->GetWidgetFromName("ActionPoints")); BattleLogTextBlock = Cast(HUD->GetWidgetFromName("BattleLog")); - PlayerHealthBar = Cast(HUD->GetWidgetFromName("PlayerHealthBar")); + PlayerHealthBar = Cast(BookHUD->GetWidgetFromName("PlayerHealthBar")); EnemyHealthBar = Cast(HUD->GetWidgetFromName("EnemyHealthBar")); - ProbertiumResourceBar = Cast(HUD->GetWidgetFromName("ProbertiumResourceBar")); - EisResourceBar = Cast(HUD->GetWidgetFromName("EisResourceBar")); - AzosResourceBar = Cast(HUD->GetWidgetFromName("AzosResourceBar")); - IroquoidResourceBar = Cast(HUD->GetWidgetFromName("IroquoidResourceBar")); + ProbertiumResourceBar = Cast(BookHUD->GetWidgetFromName("ProbertiumResourceBar")); + EisResourceBar = Cast(BookHUD->GetWidgetFromName("EisResourceBar")); + AzosResourceBar = Cast(BookHUD->GetWidgetFromName("AzosResourceBar")); + IroquoidResourceBar = Cast(BookHUD->GetWidgetFromName("IroquoidResourceBar")); CastButton = Cast(HUD->GetWidgetFromName("CastButton")); PButton = Cast(HUD->GetWidgetFromName("PButton")); EButton = Cast(HUD->GetWidgetFromName("EButton")); diff --git a/Source/the_twilight_abyss/TurnBasedCombatV2/TurnBaseCombatV2.h b/Source/the_twilight_abyss/TurnBasedCombatV2/TurnBaseCombatV2.h index 35edac3..82996fc 100644 --- a/Source/the_twilight_abyss/TurnBasedCombatV2/TurnBaseCombatV2.h +++ b/Source/the_twilight_abyss/TurnBasedCombatV2/TurnBaseCombatV2.h @@ -10,6 +10,7 @@ #include "NiagaraComponent.h" #include "NiagaraFunctionLibrary.h" #include "GameFramework/GameStateBase.h" +#include "Components/WidgetComponent.h" #include "StatusEffects/Thorns.h" #include "TurnBaseCombatV2.generated.h" @@ -49,6 +50,11 @@ public: // AActor* ActiveActor; UPROPERTY(BlueprintReadWrite) UUserWidget* HUD; + + UPROPERTY() + UUserWidget* BookHUD; + UPROPERTY() + UWidgetComponent* PlayerWidget; /* TODO: Reference Player Inventory