diff --git a/Content/Blueprints/Combat_UI/CombatTutorial.uasset b/Content/Blueprints/Combat_UI/CombatTutorial.uasset index 3b2e409..6737027 100644 --- a/Content/Blueprints/Combat_UI/CombatTutorial.uasset +++ b/Content/Blueprints/Combat_UI/CombatTutorial.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:3902cdce2b55bc5f3715dab3d64f5dea287cb52481e8e12d47c4392b4dd5793f -size 64715 +oid sha256:ab95a1a79af04b04f5c8ca4852a84f68e6247177a46fb1bac23027d968e0abcc +size 68709 diff --git a/Source/the_twilight_abyss/TurnBasedCombatV2/HoldToInitCombat.cpp b/Source/the_twilight_abyss/TurnBasedCombatV2/HoldToInitCombat.cpp index 520affc..0ff2e49 100644 --- a/Source/the_twilight_abyss/TurnBasedCombatV2/HoldToInitCombat.cpp +++ b/Source/the_twilight_abyss/TurnBasedCombatV2/HoldToInitCombat.cpp @@ -8,7 +8,6 @@ #include "BehaviorTree/BlackboardComponent.h" #include "Blueprint/UserWidget.h" #include "Camera/CameraComponent.h" -#include "Kismet/GameplayStatics.h" #include "Misc/OutputDeviceNull.h" @@ -61,11 +60,6 @@ void UHoldToInitCombat::TickComponent(float DeltaTime, ELevelTick TickType, FAct { CombatSystem->RedVignetteMaterialInstance->SetScalarParameterValue(FName("BlendWeight"), RedVignetteIntensity - DeltaTime * 2.0f); } - - if (bClickDown && TargetEnemy != nullptr) - { - Cast(GetWorld()->GetGameState())->StartCombat(TargetEnemy); - } } void UHoldToInitCombat::OnClickDown() diff --git a/Source/the_twilight_abyss/TurnBasedCombatV2/TurnBaseCombatV2.cpp b/Source/the_twilight_abyss/TurnBasedCombatV2/TurnBaseCombatV2.cpp index 3557479..f2c00b5 100644 --- a/Source/the_twilight_abyss/TurnBasedCombatV2/TurnBaseCombatV2.cpp +++ b/Source/the_twilight_abyss/TurnBasedCombatV2/TurnBaseCombatV2.cpp @@ -72,6 +72,9 @@ void ATurnBaseCombatV2::StartCombat(AActor* Enemy, bool bWasShot) { DisableButtons(); CombatTutorialWidgetInstance->AddToViewport(); + FProperty* Property = FindFieldChecked(CombatTutorialWidgetInstance->GetClass(), "WasShot"); + const FBoolProperty* WasShotProperty = CastFieldChecked(Property); + WasShotProperty->SetPropertyValue_InContainer(CombatTutorialWidgetInstance, bWasShot); HasSeenTutorial = true; return; } diff --git a/Source/the_twilight_abyss/TurnBasedCombatV2/TurnBaseCombatV2.h b/Source/the_twilight_abyss/TurnBasedCombatV2/TurnBaseCombatV2.h index f375c8b..9669dde 100644 --- a/Source/the_twilight_abyss/TurnBasedCombatV2/TurnBaseCombatV2.h +++ b/Source/the_twilight_abyss/TurnBasedCombatV2/TurnBaseCombatV2.h @@ -7,12 +7,10 @@ #include "Components/ProgressBar.h" #include "Components/TextBlock.h" #include "StatusEffect.h" -#include "NiagaraComponent.h" #include "NiagaraFunctionLibrary.h" #include "GameFramework/GameStateBase.h" #include "Components/WidgetComponent.h" #include "Engine/PostProcessVolume.h" -#include "StatusEffects/Thorns.h" #include "TurnBaseCombatV2.generated.h" class UNiagaraSystem;