From bc0aad5f6b2d940d49b2baabb1d663a9ff898b9e Mon Sep 17 00:00:00 2001 From: PHILIP White Date: Sat, 13 May 2023 19:58:29 +0100 Subject: [PATCH] Updated Combat UI to Display Enemy Name --- Content/BlueprintAI/AI/AIBruh.uasset | 4 ++-- Content/BlueprintAI/AI/AIBruh_Boss.uasset | 4 ++-- Content/Blueprints/Combat_UI/Combat_UI.uasset | 4 ++-- .../the_twilight_abyss/TurnBasedCombatV2/TurnBaseCombatV2.cpp | 2 ++ .../the_twilight_abyss/TurnBasedCombatV2/TurnBaseCombatV2.h | 3 +++ 5 files changed, 11 insertions(+), 6 deletions(-) diff --git a/Content/BlueprintAI/AI/AIBruh.uasset b/Content/BlueprintAI/AI/AIBruh.uasset index 712c9e6..10ecbdd 100644 --- a/Content/BlueprintAI/AI/AIBruh.uasset +++ b/Content/BlueprintAI/AI/AIBruh.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:fd2ed6c4f53386c79e1daff8522dd56b341cf93fa2957fd06bd48d324af0ee04 -size 100469 +oid sha256:e4b7f843317f8e181ee86c1b83a2f9d143139463046759f7fbda55ccbbf6c329 +size 100629 diff --git a/Content/BlueprintAI/AI/AIBruh_Boss.uasset b/Content/BlueprintAI/AI/AIBruh_Boss.uasset index d2d384d..5104866 100644 --- a/Content/BlueprintAI/AI/AIBruh_Boss.uasset +++ b/Content/BlueprintAI/AI/AIBruh_Boss.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:744ada7cea6b4ddea4f8b3d73c05ff60e3e1f2ede4a84acd9b3665aefda380d0 -size 243507 +oid sha256:d03f0af1757f114a2875d362f74f74ff03eef7d38c072b12532261c236fb2031 +size 240450 diff --git a/Content/Blueprints/Combat_UI/Combat_UI.uasset b/Content/Blueprints/Combat_UI/Combat_UI.uasset index 43d91cf..ee7224e 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:44bf29e69412c889033c5106b9624303c2f3a851d6c9e8ec711785d6fb141315 -size 93552 +oid sha256:d06375929a045ee051f2d41e1b18362bf78bde277d0b5081df1aedb271b2a517 +size 108155 diff --git a/Source/the_twilight_abyss/TurnBasedCombatV2/TurnBaseCombatV2.cpp b/Source/the_twilight_abyss/TurnBasedCombatV2/TurnBaseCombatV2.cpp index 0bdb479..044c3d5 100644 --- a/Source/the_twilight_abyss/TurnBasedCombatV2/TurnBaseCombatV2.cpp +++ b/Source/the_twilight_abyss/TurnBasedCombatV2/TurnBaseCombatV2.cpp @@ -82,7 +82,9 @@ void ATurnBaseCombatV2::StartCombat(AActor* Enemy, const bool bWasShot) LookAtRotation.Pitch = NewRotation.Pitch - PlayerActor->GetActorRotation().Pitch; LookAtRotation.Pitch += 10; //Offset PlayerController->SetControlRotation(LookAtRotation); + EnemyName = FText::FromString("Crystal Mutant"); } + else EnemyName = FText::FromString("Feral Goat"); if (IsValid(CombatTutorialWidgetInstance) && CombatTutorialWidgetInstance->IsInViewport()) return; if (!HasSeenTutorial) diff --git a/Source/the_twilight_abyss/TurnBasedCombatV2/TurnBaseCombatV2.h b/Source/the_twilight_abyss/TurnBasedCombatV2/TurnBaseCombatV2.h index cd71c0e..d464590 100644 --- a/Source/the_twilight_abyss/TurnBasedCombatV2/TurnBaseCombatV2.h +++ b/Source/the_twilight_abyss/TurnBasedCombatV2/TurnBaseCombatV2.h @@ -28,6 +28,9 @@ public: UPROPERTY(BlueprintReadOnly) bool bIsInCombat = false; + UPROPERTY(BlueprintReadOnly) + FText EnemyName = FText::FromString("Enemy"); + UPROPERTY() float BaseDamageMultiplier = 1.0f; UPROPERTY(EditDefaultsOnly)