Philip/AzureAbyss
1
0
Fork 0
Code Issues Pull Requests Releases 1 Activity

Updated TurnBaseCombat for Enemy Death onHealthZero

Browse Source
This commit is contained in:
Philip W 2022-11-14 23:41:55 +00:00
parent 521ab6c089
commit a976775e61
3 changed files with 14 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

BIN
Content/Blueprints/Combat_UI/TestCombatCharacter.uasset (Stored with Git LFS)
View File

Binary file not shown.

11
Source/the_twilight_abyss/TurnBasedCombat/TurnBaseCombat.cpp
View File

@ -18,10 +18,11 @@ ATurnBaseCombat::ATurnBaseCombat()
}
}
void ATurnBaseCombat::StartCombat()
void ATurnBaseCombat::StartCombat(AActor* Enemy)
{
if (HUD->IsInViewport()) return;
HUD->AddToViewport();
EnemyActor = Enemy;
if (APlayerController* PC = Cast<APlayerController>(GetWorld()->GetFirstPlayerController()))
{
@ -93,7 +94,13 @@ void ATurnBaseCombat::ExecuteCast(FString Combo)
break;
}
//End Combat if either the player or enemy is dead
if (PlayerHealth <= 0 || EnemyHealth <= 0)
if (EnemyHealth <= 0)
{
EndCombat();
EnemyActor->Destroy();
return;
}
if (PlayerHealth <= 0)
{
EndCombat();
return;

5
Source/the_twilight_abyss/TurnBasedCombat/TurnBaseCombat.h
View File

@ -30,7 +30,8 @@ public:
int ActiveActionPoints = 0;
// AActor* PlayerActor;
// AActor* EnemyActor;
UPROPERTY(VisibleAnywhere)
AActor* EnemyActor;
// AActor* ActiveActor;
/*
@ -52,7 +53,7 @@ public:
FString BattleLog;
UFUNCTION(BlueprintCallable)
void StartCombat();
void StartCombat(AActor* Enemy);
UFUNCTION(BlueprintCallable)
void EndCombat();