From b5d451d9480334a8ebc11211adca2906b68fa84b Mon Sep 17 00:00:00 2001 From: PHILIP White Date: Fri, 21 Apr 2023 14:35:36 +0100 Subject: [PATCH] Updated BookUI for Small Cosmetic Changes --- Config/DefaultGame.ini | 6 +++--- .../Blueprints/Combat_UI/BookCombat_UI.uasset | 4 ++-- Content/Blueprints/Combat_UI/Combat_UI.uasset | 4 ++-- .../TurnBasedCombatV2/TurnBaseCombatV2.cpp | 18 +----------------- .../TurnBasedCombatV2/TurnBaseCombatV2.h | 6 ------ 5 files changed, 8 insertions(+), 30 deletions(-) diff --git a/Config/DefaultGame.ini b/Config/DefaultGame.ini index ef0bd10..9f47fb3 100644 --- a/Config/DefaultGame.ini +++ b/Config/DefaultGame.ini @@ -3,7 +3,7 @@ [/Script/EngineSettings.GeneralProjectSettings] ProjectID=F2B2881E401D78B424BDDF9BBE633AFD ProjectVersion=0.2.0 -CompanyName=Team 2:13 -ProjectDisplayedTitle=NSLOCTEXT("[/Script/EngineSettings]", "3415E4AF4ECD4236C9C61DA55D72AA2A", "The Twilight Abyss") -ProjectName=The Twilight Abyss +CompanyName=Cave In Studios +ProjectDisplayedTitle=NSLOCTEXT("[/Script/EngineSettings]", "3415E4AF4ECD4236C9C61DA55D72AA2A", "Azure Abyss") +ProjectName=Azure Abyss diff --git a/Content/Blueprints/Combat_UI/BookCombat_UI.uasset b/Content/Blueprints/Combat_UI/BookCombat_UI.uasset index a076b9d..a85e764 100644 --- a/Content/Blueprints/Combat_UI/BookCombat_UI.uasset +++ b/Content/Blueprints/Combat_UI/BookCombat_UI.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:4433c9e4e7edf603032ad0172122582b80144ceae49b98ab3d9ea32e0a6ab1f8 -size 57706 +oid sha256:e74728e7e283a4fb123dc2e0852c0065f1676772d11544c4342d12812a206272 +size 58725 diff --git a/Content/Blueprints/Combat_UI/Combat_UI.uasset b/Content/Blueprints/Combat_UI/Combat_UI.uasset index 510316a..7bd371c 100644 --- a/Content/Blueprints/Combat_UI/Combat_UI.uasset +++ b/Content/Blueprints/Combat_UI/Combat_UI.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:2f6e1bc0ac7f714f23188a5493f19db8a2eee98d2fdc687e2da3e6e88f308275 -size 56965 +oid sha256:018662f3950037cb894b8d4b308e80b7f8913660de3d239f663e0b23846e1fc1 +size 54682 diff --git a/Source/the_twilight_abyss/TurnBasedCombatV2/TurnBaseCombatV2.cpp b/Source/the_twilight_abyss/TurnBasedCombatV2/TurnBaseCombatV2.cpp index 37058b2..7c15521 100644 --- a/Source/the_twilight_abyss/TurnBasedCombatV2/TurnBaseCombatV2.cpp +++ b/Source/the_twilight_abyss/TurnBasedCombatV2/TurnBaseCombatV2.cpp @@ -55,8 +55,6 @@ void ATurnBaseCombatV2::StartCombat(AActor* Enemy) HUD->AddToViewport(); EnemyActor = Enemy; - //Cast(PlayerActor)->ImportantStatsWidget->SetVisibility(ESlateVisibility::Hidden); - ProbertiumResource = 10; EisResource = 10; AzosResource = 10; @@ -96,7 +94,6 @@ void ATurnBaseCombatV2::EndCombat() { StatusEffect->OnExpiry(PlayerActor); } - //Cast(PlayerActor)->ImportantStatsWidget->SetVisibility(ESlateVisibility::Visible); HUD->RemoveFromParent(); APawn* PlayerPawn = Cast(GetWorld()->GetFirstPlayerController()->GetPawn()); @@ -113,16 +110,6 @@ void ATurnBaseCombatV2::EndCombat() PlayerController->bShowMouseCursor = false; } -// void ATurnBaseCombatV2::FKeyPressed() -// { -// PButtonOnClick(); -// } -// -// void ATurnBaseCombatV2::WKeyPressed() -// { -// EButtonOnClick(); -// } - void ATurnBaseCombatV2::BeginPlay() { Super::BeginPlay(); @@ -147,7 +134,6 @@ void ATurnBaseCombatV2::BeginPlay() CurrentComboTextBlock = Cast(BookHUD->GetWidgetFromName("CurrentCombo")); CurrentComboTextBlock1 = Cast(BookHUD->GetWidgetFromName("CurrentCombo_1")); CurrentComboTextBlock2 = Cast(BookHUD->GetWidgetFromName("CurrentCombo_2")); - ActionPointsTextBlock = Cast(HUD->GetWidgetFromName("ActionPoints")); BattleLogTextBlock = Cast(HUD->GetWidgetFromName("BattleLog")); PlayerHealthBar = Cast(BookHUD->GetWidgetFromName("PlayerHealthBar")); EnemyHealthBar = Cast(HUD->GetWidgetFromName("EnemyHealthBar")); @@ -239,13 +225,11 @@ void ATurnBaseCombatV2::ExecuteCast(FString Combo) case true: // Player Turn DamageEnemy(*ValidCombos.Find(Combo)); - //GEngine->AddOnScreenDebugMessage(-1, 5.f, FColor::Green, FString::Printf(TEXT("Enemy Damaged %d"), *ValidCombos.Find(Combo))); OnPlayerTurn.Broadcast(PlayerActor, EnemyActor); break; case false: // Enemy Turn DamagePlayer(*ValidCombos.Find(Combo)); - //GEngine->AddOnScreenDebugMessage(-1, 5.f, FColor::Green, FString::Printf(TEXT("Player Damaged %d"), *ValidCombos.Find(Combo))); OnEnemyTurn.Broadcast(EnemyActor, PlayerActor); break; } @@ -471,7 +455,7 @@ void ATurnBaseCombatV2::UpdateComboString(FString NewCombo) const void ATurnBaseCombatV2::UpdateActionPoints() const { - ActionPointsTextBlock->SetText(FText::FromString(FString::FromInt(DefaultActionPoints - ActiveActionPoints))); + return; } void ATurnBaseCombatV2::AddBattleLogMessage(FString Message) diff --git a/Source/the_twilight_abyss/TurnBasedCombatV2/TurnBaseCombatV2.h b/Source/the_twilight_abyss/TurnBasedCombatV2/TurnBaseCombatV2.h index e480092..190452e 100644 --- a/Source/the_twilight_abyss/TurnBasedCombatV2/TurnBaseCombatV2.h +++ b/Source/the_twilight_abyss/TurnBasedCombatV2/TurnBaseCombatV2.h @@ -100,10 +100,6 @@ public: void StartCombat(AActor* Enemy); UFUNCTION(BlueprintCallable) void EndCombat(); - // UFUNCTION(BlueprintCallable) - // void FKeyPressed(); - // UFUNCTION(BlueprintCallable) - // void WKeyPressed(); DECLARE_EVENT_TwoParams(ATurnBaseCombatV2, FOnPlayerTurn, AActor*, AActor*); DECLARE_EVENT_TwoParams(ATurnBaseCombatV2, FOnEnemyTurn, AActor*, AActor*); @@ -154,8 +150,6 @@ private: UTextBlock* CurrentComboTextBlock2; UPROPERTY(VisibleAnywhere) UTextBlock* BattleLogTextBlock; - UPROPERTY(VisibleAnywhere) - UTextBlock* ActionPointsTextBlock; UPROPERTY(VisibleAnywhere) UProgressBar* PlayerHealthBar;