diff --git a/Content/Blueprints/Combat_UI/Widget3DPassThrough.uasset b/Content/Blueprints/Combat_UI/Widget3DPassThrough.uasset index f10d64e..273acf1 100644 --- a/Content/Blueprints/Combat_UI/Widget3DPassThrough.uasset +++ b/Content/Blueprints/Combat_UI/Widget3DPassThrough.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:f5d1cbcb30b74cc00df53c37c2f4698a872720b2cc8a9ba0b9a0e3b44d1fb748 -size 15226 +oid sha256:80330ee973ec9788e1c257aa9800c41043c19bc14f2cea0f9b9a9529d51bdf06 +size 15346 diff --git a/Source/the_twilight_abyss/TurnBasedCombatV2/TurnBaseCombatV2.cpp b/Source/the_twilight_abyss/TurnBasedCombatV2/TurnBaseCombatV2.cpp index 95d5413..37058b2 100644 --- a/Source/the_twilight_abyss/TurnBasedCombatV2/TurnBaseCombatV2.cpp +++ b/Source/the_twilight_abyss/TurnBasedCombatV2/TurnBaseCombatV2.cpp @@ -453,10 +453,11 @@ void ATurnBaseCombatV2::RunButtonOnClick() void ATurnBaseCombatV2::UpdateComboString(FString NewCombo) const { - CurrentComboTextBlock->SetText(FText::FromString(NewCombo)); - CurrentComboTextBlock1->SetText(FText::FromString("")); - CurrentComboTextBlock2->SetText(FText::FromString("")); + CurrentComboTextBlock->SetText(FText::FromString("?")); + CurrentComboTextBlock1->SetText(FText::FromString("?")); + CurrentComboTextBlock2->SetText(FText::FromString("?")); + if (IsValidCombo(NewCombo)) CurrentComboTextBlock->SetText(FText::FromString(NewCombo)); if (NewCombo.Len() == 1) { CurrentComboTextBlock1->SetText(FText::FromString(NewCombo));