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

Updated TurnBaseCombat to End Combat onDeath

Browse Source
This commit is contained in:
Philip W 2022-11-14 23:29:16 +00:00
parent b20004e599
commit 521ab6c089
2 changed files with 13 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -23,9 +23,7 @@ void ATurnBaseCombat::StartCombat()
if (HUD->IsInViewport()) return; if (HUD->IsInViewport()) return;
HUD->AddToViewport(); HUD->AddToViewport();
APlayerController* PC = Cast<APlayerController>(GetWorld()->GetFirstPlayerController()); if (APlayerController* PC = Cast<APlayerController>(GetWorld()->GetFirstPlayerController()))
if (PC)
{ {
PC->bShowMouseCursor = true; PC->bShowMouseCursor = true;
PC->bEnableClickEvents = true; PC->bEnableClickEvents = true;
@ -94,6 +92,13 @@ void ATurnBaseCombat::ExecuteCast(FString Combo)
GEngine->AddOnScreenDebugMessage(-1, 5.f, FColor::Blue, FString::Printf(TEXT("Player Damaged %d"), *ValidCombos.Find(Combo))); GEngine->AddOnScreenDebugMessage(-1, 5.f, FColor::Blue, FString::Printf(TEXT("Player Damaged %d"), *ValidCombos.Find(Combo)));
break; break;
} }
//End Combat if either the player or enemy is dead
if (PlayerHealth <= 0 || EnemyHealth <= 0)
{
EndCombat();
return;
}
SwitchTurn(); SwitchTurn();
} }
@ -214,10 +219,8 @@ void ATurnBaseCombat::ClearBattleLog()
void ATurnBaseCombat::UpdateBattleLog() void ATurnBaseCombat::UpdateBattleLog()
{ {
TArray<FString> tempArray; TArray<FString> TempArray;
//Get the amount of lines in the battle log if (const int32 LineCount = BattleLog.ParseIntoArray(TempArray, TEXT("\n"), true); LineCount > 10)
int32 LineCount = BattleLog.ParseIntoArray(tempArray, TEXT("\n"), true);
if (LineCount > 10) //If there are more than 10 lines
{ {
ClearBattleLog(); ClearBattleLog();
} }

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

@ -29,14 +29,13 @@ public:
UPROPERTY(EditDefaultsOnly) UPROPERTY(EditDefaultsOnly)
int ActiveActionPoints = 0; int ActiveActionPoints = 0;
AActor* PlayerActor; // AActor* PlayerActor;
AActor* EnemyActor; // AActor* EnemyActor;
AActor* ActiveActor; // AActor* ActiveActor;
/* /*
TODO: TODO:
Reference Player Inventory Reference Player Inventory
Reference Combat Logging System
*/ */
UPROPERTY(EditAnywhere) UPROPERTY(EditAnywhere)
TSubclassOf<UUserWidget> HUDWidget; TSubclassOf<UUserWidget> HUDWidget;