diff --git a/Content/Blueprints/Death_UI/Death_UI.uasset b/Content/Blueprints/Death_UI/Death_UI.uasset new file mode 100644 index 0000000..0bd0529 --- /dev/null +++ b/Content/Blueprints/Death_UI/Death_UI.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:49b79d73a78ec088bbc4a68d1abb079de02b3c66f3fbfc6222033eb1e8d29a99 +size 40073 diff --git a/Content/Levels/Build.umap b/Content/Levels/Build.umap index 16aaa72..4704f4f 100644 --- a/Content/Levels/Build.umap +++ b/Content/Levels/Build.umap @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:bfe70ae7d759d4a3357292cef5eceabe42fac8e3596a48d20fb5c0522dd4ab03 -size 3377496 +oid sha256:b88b625ec93d6bf872f0e3a0d1747b3143dd918424241f0b9078339aa04c0dff +size 3378439 diff --git a/Source/the_twilight_abyss/TurnBasedCombatV2/TurnBaseCombatV2.cpp b/Source/the_twilight_abyss/TurnBasedCombatV2/TurnBaseCombatV2.cpp index d2b3fda..1c34028 100644 --- a/Source/the_twilight_abyss/TurnBasedCombatV2/TurnBaseCombatV2.cpp +++ b/Source/the_twilight_abyss/TurnBasedCombatV2/TurnBaseCombatV2.cpp @@ -25,6 +25,9 @@ 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; } } @@ -250,7 +253,9 @@ void ATurnBaseCombatV2::ExecuteCast(FString Combo) } if (*PlayerHealth <= 0) { - EndCombat(); + //EndCombat(); + DeathScreenWidget = CreateWidget(GetWorld(), DeathScreenWidgetSubclass); + DeathScreenWidget->AddToViewport(); return; } diff --git a/Source/the_twilight_abyss/TurnBasedCombatV2/TurnBaseCombatV2.h b/Source/the_twilight_abyss/TurnBasedCombatV2/TurnBaseCombatV2.h index 37b9bdd..35edac3 100644 --- a/Source/the_twilight_abyss/TurnBasedCombatV2/TurnBaseCombatV2.h +++ b/Source/the_twilight_abyss/TurnBasedCombatV2/TurnBaseCombatV2.h @@ -204,4 +204,9 @@ private: void UpdateResourceBars() const; void ToggleButtons() const; void EnemyTurn(); + + UPROPERTY() + UUserWidget* DeathScreenWidget; + UPROPERTY() + TSubclassOf DeathScreenWidgetSubclass; };