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

Added 1st and 2nd Element UI Book Elements

Browse Source
This commit is contained in:
Philip W 2023-04-21 04:16:46 +01:00
parent 02e1ec436c
commit 11a58bb836
4 changed files with 28 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

Binary file not shown.

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

Binary file not shown.

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

@ -24,7 +24,7 @@ ATurnBaseCombatV2::ATurnBaseCombatV2()
ThornsStatusEffect = StatusEffectThornsClassFinder.Class; ThornsStatusEffect = StatusEffectThornsClassFinder.Class;
static ConstructorHelpers::FClassFinder<UStatusEffect> StatusEffectDOTClassFinder(TEXT("/Game/Blueprints/StatusEffects/BP_DamageOverTime")); static ConstructorHelpers::FClassFinder<UStatusEffect> StatusEffectDOTClassFinder(TEXT("/Game/Blueprints/StatusEffects/BP_DamageOverTime"));
DOTStatusEffect = StatusEffectDOTClassFinder.Class; DOTStatusEffect = StatusEffectDOTClassFinder.Class;
static ConstructorHelpers::FClassFinder<UUserWidget> DeathScreenWidgetClass(TEXT("/Game/Blueprints/Death_UI/Death_UI")); static ConstructorHelpers::FClassFinder<UUserWidget> DeathScreenWidgetClass(TEXT("/Game/Blueprints/Death_UI/Death_UI"));
DeathScreenWidgetSubclass = DeathScreenWidgetClass.Class; DeathScreenWidgetSubclass = DeathScreenWidgetClass.Class;
} }
@ -40,7 +40,7 @@ void ATurnBaseCombatV2::StartCombat(AActor* Enemy)
FProperty* HealthProperty = Enemy->GetClass()->FindPropertyByName(FName("Health")); FProperty* HealthProperty = Enemy->GetClass()->FindPropertyByName(FName("Health"));
int32* EnemyHealthPtr = HealthProperty->ContainerPtrToValuePtr<int32>(Enemy); int32* EnemyHealthPtr = HealthProperty->ContainerPtrToValuePtr<int32>(Enemy);
EnemyHealth = EnemyHealthPtr; EnemyHealth = EnemyHealthPtr;
if (EnemyBlackboard->GetValueAsBool("Sight")) if (EnemyBlackboard->GetValueAsBool("Sight"))
{ {
//bEnemyHasExtraTurn = true; //bEnemyHasExtraTurn = true;
@ -144,7 +144,9 @@ void ATurnBaseCombatV2::BeginPlay()
BookHUD = PlayerWidget->GetWidget(); BookHUD = PlayerWidget->GetWidget();
TurnIndicatorTextBlock = Cast<UTextBlock>(HUD->GetWidgetFromName("TurnIndicator")); TurnIndicatorTextBlock = Cast<UTextBlock>(HUD->GetWidgetFromName("TurnIndicator"));
CurrentComboTextBlock = Cast<UTextBlock>(HUD->GetWidgetFromName("CurrentCombo")); CurrentComboTextBlock = Cast<UTextBlock>(BookHUD->GetWidgetFromName("CurrentCombo"));
CurrentComboTextBlock1 = Cast<UTextBlock>(BookHUD->GetWidgetFromName("CurrentCombo_1"));
CurrentComboTextBlock2 = Cast<UTextBlock>(BookHUD->GetWidgetFromName("CurrentCombo_2"));
ActionPointsTextBlock = Cast<UTextBlock>(HUD->GetWidgetFromName("ActionPoints")); ActionPointsTextBlock = Cast<UTextBlock>(HUD->GetWidgetFromName("ActionPoints"));
BattleLogTextBlock = Cast<UTextBlock>(HUD->GetWidgetFromName("BattleLog")); BattleLogTextBlock = Cast<UTextBlock>(HUD->GetWidgetFromName("BattleLog"));
PlayerHealthBar = Cast<UProgressBar>(BookHUD->GetWidgetFromName("PlayerHealthBar")); PlayerHealthBar = Cast<UProgressBar>(BookHUD->GetWidgetFromName("PlayerHealthBar"));
@ -237,13 +239,13 @@ void ATurnBaseCombatV2::ExecuteCast(FString Combo)
case true: case true:
// Player Turn // Player Turn
DamageEnemy(*ValidCombos.Find(Combo)); DamageEnemy(*ValidCombos.Find(Combo));
//GEngine->AddOnScreenDebugMessage(-1, 5.f, FColor::Green, FString::Printf(TEXT("Enemy Damaged %d"), *ValidCombos.Find(Combo))); //GEngine->AddOnScreenDebugMessage(-1, 5.f, FColor::Green, FString::Printf(TEXT("Enemy Damaged %d"), *ValidCombos.Find(Combo)));
OnPlayerTurn.Broadcast(PlayerActor, EnemyActor); OnPlayerTurn.Broadcast(PlayerActor, EnemyActor);
break; break;
case false: case false:
// Enemy Turn // Enemy Turn
DamagePlayer(*ValidCombos.Find(Combo)); DamagePlayer(*ValidCombos.Find(Combo));
//GEngine->AddOnScreenDebugMessage(-1, 5.f, FColor::Green, FString::Printf(TEXT("Player Damaged %d"), *ValidCombos.Find(Combo))); //GEngine->AddOnScreenDebugMessage(-1, 5.f, FColor::Green, FString::Printf(TEXT("Player Damaged %d"), *ValidCombos.Find(Combo)));
OnEnemyTurn.Broadcast(EnemyActor, PlayerActor); OnEnemyTurn.Broadcast(EnemyActor, PlayerActor);
break; break;
} }
@ -452,6 +454,18 @@ void ATurnBaseCombatV2::RunButtonOnClick()
void ATurnBaseCombatV2::UpdateComboString(FString NewCombo) const void ATurnBaseCombatV2::UpdateComboString(FString NewCombo) const
{ {
CurrentComboTextBlock->SetText(FText::FromString(NewCombo)); CurrentComboTextBlock->SetText(FText::FromString(NewCombo));
CurrentComboTextBlock1->SetText(FText::FromString(""));
CurrentComboTextBlock2->SetText(FText::FromString(""));
if (NewCombo.Len() == 1)
{
CurrentComboTextBlock1->SetText(FText::FromString(NewCombo));
}
else if (NewCombo.Len() == 2)
{
CurrentComboTextBlock1->SetText(FText::FromString(NewCombo.LeftChop(1)));
CurrentComboTextBlock2->SetText(FText::FromString(NewCombo.RightChop(1)));
}
} }
void ATurnBaseCombatV2::UpdateActionPoints() const void ATurnBaseCombatV2::UpdateActionPoints() const

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

@ -27,7 +27,7 @@ public:
int* EnemyHealth = nullptr; int* EnemyHealth = nullptr;
float* PlayerHealth = nullptr; float* PlayerHealth = nullptr;
UPROPERTY(EditDefaultsOnly) UPROPERTY(EditDefaultsOnly)
int DefaultActionPoints = 3; int DefaultActionPoints = 2;
UPROPERTY(EditDefaultsOnly) UPROPERTY(EditDefaultsOnly)
int ActiveActionPoints = 0; int ActiveActionPoints = 0;
@ -149,6 +149,10 @@ private:
UPROPERTY(VisibleAnywhere) UPROPERTY(VisibleAnywhere)
UTextBlock* CurrentComboTextBlock; UTextBlock* CurrentComboTextBlock;
UPROPERTY(VisibleAnywhere) UPROPERTY(VisibleAnywhere)
UTextBlock* CurrentComboTextBlock1;
UPROPERTY(VisibleAnywhere)
UTextBlock* CurrentComboTextBlock2;
UPROPERTY(VisibleAnywhere)
UTextBlock* BattleLogTextBlock; UTextBlock* BattleLogTextBlock;
UPROPERTY(VisibleAnywhere) UPROPERTY(VisibleAnywhere)
UTextBlock* ActionPointsTextBlock; UTextBlock* ActionPointsTextBlock;