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

Updated Combat System to Disengage from Combat

Browse Source
This commit is contained in:
Philip W 2023-01-31 01:39:42 +00:00
parent 5b60412cf9
commit 45374da8bb
4 changed files with 21 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

BIN
Content/BlueprintAI/AI/BT_Bruh.uasset (Stored with Git LFS)
View File

Binary file not shown.

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

Binary file not shown.

11
Source/the_twilight_abyss/TurnBasedCombatV2/TurnBaseCombatV2.cpp
View File

@ -122,10 +122,12 @@ void ATurnBaseCombatV2::BeginPlay()
FButton = Cast<UButton>(HUD->GetWidgetFromName("FButton")); FButton = Cast<UButton>(HUD->GetWidgetFromName("FButton"));
WButton = Cast<UButton>(HUD->GetWidgetFromName("WButton")); WButton = Cast<UButton>(HUD->GetWidgetFromName("WButton"));
BackspaceButton = Cast<UButton>(HUD->GetWidgetFromName("BackspaceButton")); BackspaceButton = Cast<UButton>(HUD->GetWidgetFromName("BackspaceButton"));
RunButton = Cast<UButton>(HUD->GetWidgetFromName("RunButton"));
CastButton->OnClicked.AddDynamic(this, &ATurnBaseCombatV2::CastButtonOnClick); CastButton->OnClicked.AddDynamic(this, &ATurnBaseCombatV2::CastButtonOnClick);
FButton->OnClicked.AddDynamic(this, &ATurnBaseCombatV2::FButtonOnClick); FButton->OnClicked.AddDynamic(this, &ATurnBaseCombatV2::FButtonOnClick);
WButton->OnClicked.AddDynamic(this, &ATurnBaseCombatV2::WButtonOnClick); WButton->OnClicked.AddDynamic(this, &ATurnBaseCombatV2::WButtonOnClick);
BackspaceButton->OnClicked.AddDynamic(this, &ATurnBaseCombatV2::BackspaceButtonOnClick); BackspaceButton->OnClicked.AddDynamic(this, &ATurnBaseCombatV2::BackspaceButtonOnClick);
RunButton->OnClicked.AddDynamic(this, &ATurnBaseCombatV2::RunButtonOnClick);
} }
void ATurnBaseCombatV2::ExecuteCast(FString Combo) void ATurnBaseCombatV2::ExecuteCast(FString Combo)
@ -315,6 +317,14 @@ void ATurnBaseCombatV2::BackspaceButtonOnClick()
UpdateResourceBars(); UpdateResourceBars();
} }
void ATurnBaseCombatV2::RunButtonOnClick()
{
UBlackboardComponent* EnemyBlackboard = Cast<AAIController>(EnemyActor->GetInstigatorController())->GetBlackboardComponent();
EnemyBlackboard->SetValueAsBool("IsInCombat", false);
EndCombat();
}
void ATurnBaseCombatV2::UpdateComboString(FString NewCombo) const void ATurnBaseCombatV2::UpdateComboString(FString NewCombo) const
{ {
CurrentComboTextBlock->SetText(FText::FromString(NewCombo)); CurrentComboTextBlock->SetText(FText::FromString(NewCombo));
@ -358,6 +368,7 @@ void ATurnBaseCombatV2::ToggleButtons() const
WButton->SetIsEnabled(!WButton->GetIsEnabled()); WButton->SetIsEnabled(!WButton->GetIsEnabled());
BackspaceButton->SetIsEnabled(!BackspaceButton->GetIsEnabled()); BackspaceButton->SetIsEnabled(!BackspaceButton->GetIsEnabled());
CastButton->SetIsEnabled(!CastButton->GetIsEnabled()); CastButton->SetIsEnabled(!CastButton->GetIsEnabled());
RunButton->SetIsEnabled(!RunButton->GetIsEnabled());
} }
void ATurnBaseCombatV2::EnemyTurn() void ATurnBaseCombatV2::EnemyTurn()

6
Source/the_twilight_abyss/TurnBasedCombatV2/TurnBaseCombatV2.h
View File

@ -126,6 +126,9 @@ private:
UPROPERTY(VisibleAnywhere) UPROPERTY(VisibleAnywhere)
UButton* BackspaceButton; UButton* BackspaceButton;
UPROPERTY(VisibleAnywhere)
UButton* RunButton;
UFUNCTION() UFUNCTION()
void CastButtonOnClick(); void CastButtonOnClick();
@ -138,6 +141,9 @@ private:
UFUNCTION() UFUNCTION()
void BackspaceButtonOnClick(); void BackspaceButtonOnClick();
UFUNCTION()
void RunButtonOnClick();
void UpdateComboString(FString NewCombo) const; void UpdateComboString(FString NewCombo) const;
void UpdateActionPoints() const; void UpdateActionPoints() const;