From 2638e71f9767e367fae1d59a5e9f04414d031b6d Mon Sep 17 00:00:00 2001 From: PHILIP White Date: Tue, 9 May 2023 13:29:52 +0100 Subject: [PATCH] Updated Combat UI to Make Extra Turn More Readable --- Content/Blueprints/Combat_UI/BookCombat_UI.uasset | 4 ++-- .../TurnBasedCombatV2/TurnBaseCombatV2.cpp | 9 ++++++++- UI designs/Coins.png | 3 +++ 3 files changed, 13 insertions(+), 3 deletions(-) create mode 100644 UI designs/Coins.png diff --git a/Content/Blueprints/Combat_UI/BookCombat_UI.uasset b/Content/Blueprints/Combat_UI/BookCombat_UI.uasset index cf2c7b8..1797a7b 100644 --- a/Content/Blueprints/Combat_UI/BookCombat_UI.uasset +++ b/Content/Blueprints/Combat_UI/BookCombat_UI.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:cb66d3238cf77ec921c1c701cd00b532350a140ce65838cea041bf62b47e506e -size 132101 +oid sha256:8679be9a07e030f59c091a5347c504f457e38df8731e3817e3418032e278af65 +size 132557 diff --git a/Source/the_twilight_abyss/TurnBasedCombatV2/TurnBaseCombatV2.cpp b/Source/the_twilight_abyss/TurnBasedCombatV2/TurnBaseCombatV2.cpp index a0d1ba1..ac64e95 100644 --- a/Source/the_twilight_abyss/TurnBasedCombatV2/TurnBaseCombatV2.cpp +++ b/Source/the_twilight_abyss/TurnBasedCombatV2/TurnBaseCombatV2.cpp @@ -141,10 +141,13 @@ void ATurnBaseCombatV2::CombatCheck(const bool bWasShot) { //bEnemyHasExtraTurn = true; SwitchTurn(); + return; } else if (Cast(PlayerActor)->ReactionSpeed > *EnemyReactionSpeedPtr && bWasShot) { + TurnIndicatorTextBlock->SetText(FText::FromString("Player Turn\nExtra")); bPlayerHasExtraTurn = true; + return; } TurnIndicatorTextBlock->SetText(FText::FromString("Player Turn")); } @@ -363,7 +366,11 @@ void ATurnBaseCombatV2::ExecuteCast(FString Combo) { SwitchTurn(); } - bPlayerHasExtraTurn = false; + else + { + TurnIndicatorTextBlock->SetText(FText::FromString("Player Turn")); + bPlayerHasExtraTurn = false; + } } void ATurnBaseCombatV2::UseActionPoint() diff --git a/UI designs/Coins.png b/UI designs/Coins.png new file mode 100644 index 0000000..b8c92dc --- /dev/null +++ b/UI designs/Coins.png @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:8178ce5167442f1279584b6caac087687831cc6bfe0659bc438ff6a6554f2fb6 +size 82442