diff --git a/Content/Blueprints/Combat_UI/BookCombat_UI.uasset b/Content/Blueprints/Combat_UI/BookCombat_UI.uasset index c624f15..a076b9d 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:d57607a898225569eabcc855beb990269ce5ba4779b26c62c7b6c31d07611645 -size 49372 +oid sha256:4433c9e4e7edf603032ad0172122582b80144ceae49b98ab3d9ea32e0a6ab1f8 +size 57706 diff --git a/Content/Blueprints/Combat_UI/Widget3DPassThrough.uasset b/Content/Blueprints/Combat_UI/Widget3DPassThrough.uasset index 890ae88..f10d64e 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:80185348ae756e23935a315876652656c86e7f82c9d717db5d14bf86d9a10f30 -size 14949 +oid sha256:f5d1cbcb30b74cc00df53c37c2f4698a872720b2cc8a9ba0b9a0e3b44d1fb748 +size 15226 diff --git a/Source/the_twilight_abyss/TurnBasedCombatV2/TurnBaseCombatV2.cpp b/Source/the_twilight_abyss/TurnBasedCombatV2/TurnBaseCombatV2.cpp index f426565..95d5413 100644 --- a/Source/the_twilight_abyss/TurnBasedCombatV2/TurnBaseCombatV2.cpp +++ b/Source/the_twilight_abyss/TurnBasedCombatV2/TurnBaseCombatV2.cpp @@ -24,7 +24,7 @@ ATurnBaseCombatV2::ATurnBaseCombatV2() ThornsStatusEffect = StatusEffectThornsClassFinder.Class; static ConstructorHelpers::FClassFinder StatusEffectDOTClassFinder(TEXT("/Game/Blueprints/StatusEffects/BP_DamageOverTime")); DOTStatusEffect = StatusEffectDOTClassFinder.Class; - + static ConstructorHelpers::FClassFinder DeathScreenWidgetClass(TEXT("/Game/Blueprints/Death_UI/Death_UI")); DeathScreenWidgetSubclass = DeathScreenWidgetClass.Class; } @@ -40,7 +40,7 @@ void ATurnBaseCombatV2::StartCombat(AActor* Enemy) FProperty* HealthProperty = Enemy->GetClass()->FindPropertyByName(FName("Health")); int32* EnemyHealthPtr = HealthProperty->ContainerPtrToValuePtr(Enemy); EnemyHealth = EnemyHealthPtr; - + if (EnemyBlackboard->GetValueAsBool("Sight")) { //bEnemyHasExtraTurn = true; @@ -144,7 +144,9 @@ void ATurnBaseCombatV2::BeginPlay() BookHUD = PlayerWidget->GetWidget(); TurnIndicatorTextBlock = Cast(HUD->GetWidgetFromName("TurnIndicator")); - CurrentComboTextBlock = Cast(HUD->GetWidgetFromName("CurrentCombo")); + CurrentComboTextBlock = Cast(BookHUD->GetWidgetFromName("CurrentCombo")); + CurrentComboTextBlock1 = Cast(BookHUD->GetWidgetFromName("CurrentCombo_1")); + CurrentComboTextBlock2 = Cast(BookHUD->GetWidgetFromName("CurrentCombo_2")); ActionPointsTextBlock = Cast(HUD->GetWidgetFromName("ActionPoints")); BattleLogTextBlock = Cast(HUD->GetWidgetFromName("BattleLog")); PlayerHealthBar = Cast(BookHUD->GetWidgetFromName("PlayerHealthBar")); @@ -237,13 +239,13 @@ void ATurnBaseCombatV2::ExecuteCast(FString Combo) case true: // Player Turn DamageEnemy(*ValidCombos.Find(Combo)); - //GEngine->AddOnScreenDebugMessage(-1, 5.f, FColor::Green, FString::Printf(TEXT("Enemy Damaged %d"), *ValidCombos.Find(Combo))); + //GEngine->AddOnScreenDebugMessage(-1, 5.f, FColor::Green, FString::Printf(TEXT("Enemy Damaged %d"), *ValidCombos.Find(Combo))); OnPlayerTurn.Broadcast(PlayerActor, EnemyActor); break; case false: // Enemy Turn DamagePlayer(*ValidCombos.Find(Combo)); - //GEngine->AddOnScreenDebugMessage(-1, 5.f, FColor::Green, FString::Printf(TEXT("Player Damaged %d"), *ValidCombos.Find(Combo))); + //GEngine->AddOnScreenDebugMessage(-1, 5.f, FColor::Green, FString::Printf(TEXT("Player Damaged %d"), *ValidCombos.Find(Combo))); OnEnemyTurn.Broadcast(EnemyActor, PlayerActor); break; } @@ -452,6 +454,18 @@ void ATurnBaseCombatV2::RunButtonOnClick() void ATurnBaseCombatV2::UpdateComboString(FString NewCombo) const { CurrentComboTextBlock->SetText(FText::FromString(NewCombo)); + CurrentComboTextBlock1->SetText(FText::FromString("")); + CurrentComboTextBlock2->SetText(FText::FromString("")); + + if (NewCombo.Len() == 1) + { + CurrentComboTextBlock1->SetText(FText::FromString(NewCombo)); + } + else if (NewCombo.Len() == 2) + { + CurrentComboTextBlock1->SetText(FText::FromString(NewCombo.LeftChop(1))); + CurrentComboTextBlock2->SetText(FText::FromString(NewCombo.RightChop(1))); + } } void ATurnBaseCombatV2::UpdateActionPoints() const diff --git a/Source/the_twilight_abyss/TurnBasedCombatV2/TurnBaseCombatV2.h b/Source/the_twilight_abyss/TurnBasedCombatV2/TurnBaseCombatV2.h index 82996fc..e480092 100644 --- a/Source/the_twilight_abyss/TurnBasedCombatV2/TurnBaseCombatV2.h +++ b/Source/the_twilight_abyss/TurnBasedCombatV2/TurnBaseCombatV2.h @@ -27,7 +27,7 @@ public: int* EnemyHealth = nullptr; float* PlayerHealth = nullptr; UPROPERTY(EditDefaultsOnly) - int DefaultActionPoints = 3; + int DefaultActionPoints = 2; UPROPERTY(EditDefaultsOnly) int ActiveActionPoints = 0; @@ -149,6 +149,10 @@ private: UPROPERTY(VisibleAnywhere) UTextBlock* CurrentComboTextBlock; UPROPERTY(VisibleAnywhere) + UTextBlock* CurrentComboTextBlock1; + UPROPERTY(VisibleAnywhere) + UTextBlock* CurrentComboTextBlock2; + UPROPERTY(VisibleAnywhere) UTextBlock* BattleLogTextBlock; UPROPERTY(VisibleAnywhere) UTextBlock* ActionPointsTextBlock;