diff --git a/Source/the_twilight_abyss/TurnBasedCombatV2/TurnBaseCombatV2.cpp b/Source/the_twilight_abyss/TurnBasedCombatV2/TurnBaseCombatV2.cpp index 67a2c09..f2de4ab 100644 --- a/Source/the_twilight_abyss/TurnBasedCombatV2/TurnBaseCombatV2.cpp +++ b/Source/the_twilight_abyss/TurnBasedCombatV2/TurnBaseCombatV2.cpp @@ -87,17 +87,23 @@ void ATurnBaseCombatV2::CombatCheck(bool bWasShot) EisResource = 10; AzosResource = 10; IroquoidResource = 10; + + ChainDamageMultiplier = 1.0f; + BaseDamageMultiplier = 1.0f; + DamageMultiplierTextBlock->SetText(FText::FromString("")); + FProperty* ReactionSpeedProperty = EnemyActor->GetClass()->FindPropertyByName(FName("ReactionSpeed")); + float* EnemyReactionSpeedPtr = ReactionSpeedProperty->ContainerPtrToValuePtr(EnemyActor); + CurrentComboString = ""; UpdateComboString(CurrentComboString); RevertActionPoints(); UpdateActionPoints(); UpdateResourceBars(); + UpdateProgressBars(); ClearBattleLog(); EnableButtons(); - - FProperty* ReactionSpeedProperty = EnemyActor->GetClass()->FindPropertyByName(FName("ReactionSpeed")); - float* EnemyReactionSpeedPtr = ReactionSpeedProperty->ContainerPtrToValuePtr(EnemyActor); + if (EnemyBlackboard->GetValueAsBool("Sight") && !bWasShot) { //bEnemyHasExtraTurn = true;