From 0a7025b68433514f6de29d9a4d4e78a20a825c6a Mon Sep 17 00:00:00 2001 From: Rowland Rowland Date: Tue, 31 Jan 2023 12:32:29 +0000 Subject: [PATCH 01/30] Added new links to Dev Added Google Slides for art and levels --- .../Additional Resources/Links To Additional Resources.txt | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/Misc/Additional Resources/Links To Additional Resources.txt b/Misc/Additional Resources/Links To Additional Resources.txt index e79ccf7..51cbe97 100644 --- a/Misc/Additional Resources/Links To Additional Resources.txt +++ b/Misc/Additional Resources/Links To Additional Resources.txt @@ -4,3 +4,10 @@ Combat Spread Sheet: https://docs.google.com/spreadsheets/d/1s_uxjS8ir1pbt4-ofdOVpSPaQZVC8x9gQzS78bzE3KI/edit#gid=0 https://docs.google.com/document/d/1Y6eYoKQPw9n8gl7p030fmtPjfJcE132YHAvwL7Gk4jk/edit +Level Blueprints - https://docs.google.com/presentation/d/1ckx8IpO-BIxTFy19MJoUy7EuAMYOYoWQE6x1E2egr1o/edit?usp=sharing + +Art: + +Final Boss Moodboard - https://docs.google.com/presentation/d/1gX9ULwwuVboH_wPwBXa9AMLEhPbUqvfy5N3zeBOL89I/edit?usp=sharing +Art examples (Pre-Production) - https://docs.google.com/presentation/d/1Tc7nAdgg7ENsuV-6jGyYGHbYBLcY65losUjOYYhMHWs/edit?usp=sharing +Art Examples (Post-Production) - https://docs.google.com/presentation/d/1AEB9NNNOdRZfw2UrT9vZEwUF5QP9rvr0lqPNxoMJWCE/edit?usp=sharing \ No newline at end of file From d36fe6fed0e46adc89ff22b94b29820b3d824ec0 Mon Sep 17 00:00:00 2001 From: PHILIP White Date: Wed, 1 Feb 2023 23:37:17 +0000 Subject: [PATCH 02/30] Added Breakable Walls BP Using Particles at the moment --- Content/Assets/Objects/Caves/Blue_rocks.uasset | 4 ++-- Content/Levels/Testing/BreakableWall_BP.uasset | 3 +++ Content/Levels/Testing/CopyStalagite.uasset | 3 --- Content/Levels/Testing/DestructableEnvironment.umap | 4 ++-- Content/Levels/Testing/Stalagite_GeometryCollection.uasset | 3 --- Content/Levels/Top_layer_level.umap | 4 ++-- Content/Particles/Break.uasset | 3 +++ 7 files changed, 12 insertions(+), 12 deletions(-) create mode 100644 Content/Levels/Testing/BreakableWall_BP.uasset delete mode 100644 Content/Levels/Testing/CopyStalagite.uasset delete mode 100644 Content/Levels/Testing/Stalagite_GeometryCollection.uasset create mode 100644 Content/Particles/Break.uasset diff --git a/Content/Assets/Objects/Caves/Blue_rocks.uasset b/Content/Assets/Objects/Caves/Blue_rocks.uasset index 8bd085a..51dd0d5 100644 --- a/Content/Assets/Objects/Caves/Blue_rocks.uasset +++ b/Content/Assets/Objects/Caves/Blue_rocks.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:fcd050bbb60987754b5901bb0bdae71a95fd8dfb8f8db0c2c3286a64b2936912 -size 17673 +oid sha256:c023592a8525e65e2d03cbc1d31c22989f9c3c987d13ca4a1368cf288ded748f +size 14309 diff --git a/Content/Levels/Testing/BreakableWall_BP.uasset b/Content/Levels/Testing/BreakableWall_BP.uasset new file mode 100644 index 0000000..ba635b2 --- /dev/null +++ b/Content/Levels/Testing/BreakableWall_BP.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:7215e1f1deff0cce99244ba8d52a19fd634917c6f477ac85df3172f66640f669 +size 48991 diff --git a/Content/Levels/Testing/CopyStalagite.uasset b/Content/Levels/Testing/CopyStalagite.uasset deleted file mode 100644 index b431889..0000000 --- a/Content/Levels/Testing/CopyStalagite.uasset +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:db92152f858900ca683a3802711017f8096bfa3fa3cb4927ab66e1aab4da448b -size 1342607 diff --git a/Content/Levels/Testing/DestructableEnvironment.umap b/Content/Levels/Testing/DestructableEnvironment.umap index 7ec9da9..24466ba 100644 --- a/Content/Levels/Testing/DestructableEnvironment.umap +++ b/Content/Levels/Testing/DestructableEnvironment.umap @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:3f06da83cd4d0159f28d9f56a2b3adfcefac21f62021d145a7a112422b75326c -size 38502 +oid sha256:52f5a712075e449782a7d9f79e633f4048945e39bcb21fd2af5f2e40c7925961 +size 37139 diff --git a/Content/Levels/Testing/Stalagite_GeometryCollection.uasset b/Content/Levels/Testing/Stalagite_GeometryCollection.uasset deleted file mode 100644 index 681a240..0000000 --- a/Content/Levels/Testing/Stalagite_GeometryCollection.uasset +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:e82c52e382833121ae4732dc3d9e99795b251a33ded6f5c8cf9590d46968bd98 -size 52222503 diff --git a/Content/Levels/Top_layer_level.umap b/Content/Levels/Top_layer_level.umap index bd00167..ad576cc 100644 --- a/Content/Levels/Top_layer_level.umap +++ b/Content/Levels/Top_layer_level.umap @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:20da6d47858f856f405d19681f0d889313cac266b92b1bb758480317cf763453 -size 246392 +oid sha256:b9913f8136b9bf2c1f42801089b7071ad667f9467ee25d72ab588ae96d7543f2 +size 247266 diff --git a/Content/Particles/Break.uasset b/Content/Particles/Break.uasset new file mode 100644 index 0000000..2571998 --- /dev/null +++ b/Content/Particles/Break.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:e0583a0b2c5bb438f52fd4bc9c1f62f11651b39088209ac738386024a2777908 +size 2980419 From 42ce95b84e4a077d438086a65d51a3f6de6f8940 Mon Sep 17 00:00:00 2001 From: PHILIP White Date: Wed, 1 Feb 2023 23:47:06 +0000 Subject: [PATCH 03/30] Added Dialogue Testing Map with Temp NPC --- Content/Dialogue/DialogueTest.umap | 3 +++ Content/Dialogue/NPCTest.uasset | 3 +++ 2 files changed, 6 insertions(+) create mode 100644 Content/Dialogue/DialogueTest.umap create mode 100644 Content/Dialogue/NPCTest.uasset diff --git a/Content/Dialogue/DialogueTest.umap b/Content/Dialogue/DialogueTest.umap new file mode 100644 index 0000000..244f14c --- /dev/null +++ b/Content/Dialogue/DialogueTest.umap @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:65fb1f5ae0a1d0e8503ac46af15e79d05afd9f83bf1a479bfc560df2f128c7b3 +size 40062 diff --git a/Content/Dialogue/NPCTest.uasset b/Content/Dialogue/NPCTest.uasset new file mode 100644 index 0000000..76db5fe --- /dev/null +++ b/Content/Dialogue/NPCTest.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:f277997103dbdece2162edd9c73e22e3076859c04b59a6ca970471643c9f32c1 +size 29535 From 5988272890967bf933bec248c5110b289af4a899 Mon Sep 17 00:00:00 2001 From: PHILIP White Date: Wed, 1 Feb 2023 23:47:59 +0000 Subject: [PATCH 04/30] Added Base Text Prompt Widget Blueprint --- Content/Dialogue/TextPrompt.uasset | 3 +++ 1 file changed, 3 insertions(+) create mode 100644 Content/Dialogue/TextPrompt.uasset diff --git a/Content/Dialogue/TextPrompt.uasset b/Content/Dialogue/TextPrompt.uasset new file mode 100644 index 0000000..1777bcb --- /dev/null +++ b/Content/Dialogue/TextPrompt.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:3faa628db877e647869edd000879734f6761c3a5e0bc8b21991a7d132a3828f7 +size 22011 From 343325446372c847c8891cf29bdcda2117f2fa77 Mon Sep 17 00:00:00 2001 From: PHILIP White Date: Thu, 2 Feb 2023 01:59:33 +0000 Subject: [PATCH 05/30] Added DialogueNPC Actor Component with Text Animation --- Content/Dialogue/DialogueTest.umap | 4 +- Content/Dialogue/NPCTest.uasset | 4 +- Content/Dialogue/TextPrompt.uasset | 4 +- .../Dialogue/DialogueNPC.cpp | 99 +++++++++++++++++++ .../the_twilight_abyss/Dialogue/DialogueNPC.h | 76 ++++++++++++++ 5 files changed, 181 insertions(+), 6 deletions(-) create mode 100644 Source/the_twilight_abyss/Dialogue/DialogueNPC.cpp create mode 100644 Source/the_twilight_abyss/Dialogue/DialogueNPC.h diff --git a/Content/Dialogue/DialogueTest.umap b/Content/Dialogue/DialogueTest.umap index 244f14c..4a0c8c3 100644 --- a/Content/Dialogue/DialogueTest.umap +++ b/Content/Dialogue/DialogueTest.umap @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:65fb1f5ae0a1d0e8503ac46af15e79d05afd9f83bf1a479bfc560df2f128c7b3 -size 40062 +oid sha256:911ac1a22605bd25c09862336710dd077c849e1bcbeb4046c70cd1e9ef698ff7 +size 41447 diff --git a/Content/Dialogue/NPCTest.uasset b/Content/Dialogue/NPCTest.uasset index 76db5fe..cdd38f9 100644 --- a/Content/Dialogue/NPCTest.uasset +++ b/Content/Dialogue/NPCTest.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:f277997103dbdece2162edd9c73e22e3076859c04b59a6ca970471643c9f32c1 -size 29535 +oid sha256:0594afb06d0d1957dd84c2ee2ee8487e30962a5bc85fad7ac1deb64cd3586552 +size 30359 diff --git a/Content/Dialogue/TextPrompt.uasset b/Content/Dialogue/TextPrompt.uasset index 1777bcb..4630031 100644 --- a/Content/Dialogue/TextPrompt.uasset +++ b/Content/Dialogue/TextPrompt.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:3faa628db877e647869edd000879734f6761c3a5e0bc8b21991a7d132a3828f7 -size 22011 +oid sha256:78605489bcbc381e7d4cd447e16413e8762156a38a47715305c8478c3df5eac3 +size 36800 diff --git a/Source/the_twilight_abyss/Dialogue/DialogueNPC.cpp b/Source/the_twilight_abyss/Dialogue/DialogueNPC.cpp new file mode 100644 index 0000000..74b35b0 --- /dev/null +++ b/Source/the_twilight_abyss/Dialogue/DialogueNPC.cpp @@ -0,0 +1,99 @@ +// Fill out your copyright notice in the Description page of Project Settings. + + +#include "DialogueNPC.h" +#include "Blueprint/UserWidget.h" +#include "Components/TextBlock.h" + +// Sets default values for this component's properties +UDialogueNPC::UDialogueNPC() +{ + // Set this component to be initialized when the game starts, and to be ticked every frame. You can turn these features + // off to improve performance if you don't need them. + PrimaryComponentTick.bCanEverTick = true; + + static ConstructorHelpers::FClassFinder DialogueWidgetClass(TEXT("/Game/Dialogue/TextPrompt")); + DialogueWidget = DialogueWidgetClass.Class; +} + + +// Called when the game starts +void UDialogueNPC::BeginPlay() +{ + Super::BeginPlay(); + + DialogueWidgetInstance = CreateWidget(GetWorld(), DialogueWidget); + + NPCNameText = Cast(DialogueWidgetInstance->GetWidgetFromName("Text_Name")); + DialogueText = Cast(DialogueWidgetInstance->GetWidgetFromName("Text_Dialogue")); + NextButton = Cast(DialogueWidgetInstance->GetWidgetFromName("Button_Next")); + NextButton->OnClicked.AddDynamic(this, &UDialogueNPC::NextDialogue); + + StartDialogue(); +} + + +void UDialogueNPC::NextDialogue() +{ + //log bruh + UE_LOG(LogTemp, Warning, TEXT("Next Dialogue")); + //Dialogue Skip + if (CurrentDialogue.Len() < Dialogue[DialogueIndex].Len()) + { + CurrentDialogue = Dialogue[DialogueIndex]; + DialogueText->SetText(FText::FromString(CurrentDialogue)); + return; + } + + DialogueIndex++; + if (DialogueIndex >= Dialogue.Num()) + { + EndDialogue(); + return; + } + CurrentDialogue = ""; +} + +void UDialogueNPC::NextCharacter() +{ + if (DialogueIndex >= Dialogue.Num()) return; + + if (CurrentDialogue.Len() < Dialogue[DialogueIndex].Len()) + { + CurrentDialogue.AppendChar(Dialogue[DialogueIndex][CurrentDialogue.Len()]); + DialogueText->SetText(FText::FromString(CurrentDialogue)); + } +} + +// Called every frame +void UDialogueNPC::TickComponent(float DeltaTime, ELevelTick TickType, FActorComponentTickFunction* ThisTickFunction) +{ + Super::TickComponent(DeltaTime, TickType, ThisTickFunction); + + // ... +} + +void UDialogueNPC::StartDialogue() +{ + //Set to UI Mode Only + APlayerController* PlayerController = GetWorld()->GetFirstPlayerController(); + PlayerController->SetInputMode(FInputModeUIOnly()); + PlayerController->bShowMouseCursor = true; + + DialogueWidgetInstance->AddToViewport(); + DialogueIndex = 0; + NPCNameText->SetText(FText::FromString(NPCName)); + CurrentDialogue = ""; + GetWorld()->GetTimerManager().SetTimer(TextAnimationTimerHandle, this, &UDialogueNPC::NextCharacter, 0.05f, true); +} + +void UDialogueNPC::EndDialogue() +{ + TextAnimationTimerHandle.Invalidate(); + DialogueWidgetInstance->RemoveFromParent(); + + //Reset UI Mode + APlayerController* PlayerController = GetWorld()->GetFirstPlayerController(); + PlayerController->SetInputMode(FInputModeGameOnly()); + PlayerController->bShowMouseCursor = false; +} diff --git a/Source/the_twilight_abyss/Dialogue/DialogueNPC.h b/Source/the_twilight_abyss/Dialogue/DialogueNPC.h new file mode 100644 index 0000000..3c084a2 --- /dev/null +++ b/Source/the_twilight_abyss/Dialogue/DialogueNPC.h @@ -0,0 +1,76 @@ +// Fill out your copyright notice in the Description page of Project Settings. + +#pragma once + +#include "CoreMinimal.h" +#include "Components/ActorComponent.h" +#include "Components/Button.h" +#include "Components/TextBlock.h" +#include "DialogueNPC.generated.h" + +UENUM() +enum class EDialogueType +{ + Text UMETA(DisplayName="Text"), + End UMETA(DisplayName="End"), + Action UMETA(DisplayName="Action"), +}; + +UCLASS(ClassGroup=(Custom), meta=(BlueprintSpawnableComponent)) +class THE_TWILIGHT_ABYSS_API UDialogueNPC : public UActorComponent +{ + GENERATED_BODY() + +public: + // Sets default values for this component's properties + UDialogueNPC(); + + UPROPERTY(EditAnywhere) + FString NPCName; + + UPROPERTY(EditAnywhere) + TArray DialogueType; + + UPROPERTY(EditAnywhere) + TArray Dialogue; + +protected: + // Called when the game starts + virtual void BeginPlay() override; + + UPROPERTY() + TSubclassOf DialogueWidget; + +private: + UPROPERTY() + UUserWidget* DialogueWidgetInstance; + + UPROPERTY() + UTextBlock* NPCNameText; + + UPROPERTY() + UTextBlock* DialogueText; + + UPROPERTY() + UButton* NextButton; + + int DialogueIndex = 0; + FString CurrentDialogue; + + UPROPERTY() + FTimerHandle TextAnimationTimerHandle; + + UFUNCTION() + void NextDialogue(); + void NextCharacter(); + +public: + // Called every frame + virtual void TickComponent(float DeltaTime, ELevelTick TickType, FActorComponentTickFunction* ThisTickFunction) override; + + UFUNCTION(BlueprintCallable) + void StartDialogue(); + + UFUNCTION(BlueprintCallable) + void EndDialogue(); +}; From 014a670ec580bb017cda0886859987f4cd65f720 Mon Sep 17 00:00:00 2001 From: PHILIP White Date: Thu, 2 Feb 2023 02:06:55 +0000 Subject: [PATCH 06/30] Bugfix Widget Focus Not Correctly Being Set --- .../TurnBasedCombatV2/TurnBaseCombatV2.cpp | 26 +++++++------------ 1 file changed, 9 insertions(+), 17 deletions(-) diff --git a/Source/the_twilight_abyss/TurnBasedCombatV2/TurnBaseCombatV2.cpp b/Source/the_twilight_abyss/TurnBasedCombatV2/TurnBaseCombatV2.cpp index 5fff2b7..b2c29ff 100644 --- a/Source/the_twilight_abyss/TurnBasedCombatV2/TurnBaseCombatV2.cpp +++ b/Source/the_twilight_abyss/TurnBasedCombatV2/TurnBaseCombatV2.cpp @@ -42,17 +42,16 @@ void ATurnBaseCombatV2::StartCombat(AActor* Enemy) IronResource = 10; SulfurResource = 10; - if (APlayerController* PC = Cast(GetWorld()->GetFirstPlayerController())) - { - PC->bShowMouseCursor = true; - PC->bEnableClickEvents = true; - PC->bEnableMouseOverEvents = true; - } //Disable Character Movement if (ACharacter* PlayerCharacter = Cast(GetWorld()->GetFirstPlayerController()->GetPawn())) { PlayerCharacter->DisableInput(GetWorld()->GetFirstPlayerController()); } + //Set to UI Mode Only + APlayerController* PlayerController = GetWorld()->GetFirstPlayerController(); + PlayerController->SetInputMode(FInputModeUIOnly()); + PlayerController->bShowMouseCursor = true; + CurrentComboString = ""; UpdateComboString(CurrentComboString); RevertActionPoints(); @@ -73,17 +72,10 @@ void ATurnBaseCombatV2::EndCombat() { PlayerCharacter->EnableInput(GetWorld()->GetFirstPlayerController()); } - if (APlayerController* PC = Cast(GetWorld()->GetFirstPlayerController())) - { - PC->bShowMouseCursor = false; - PC->bEnableClickEvents = false; - PC->bEnableMouseOverEvents = false; - } - GetWorld()->GetFirstPlayerController()->SetIgnoreLookInput(false); - GetWorld()->GetFirstPlayerController()->SetIgnoreMoveInput(false); - GetWorld()->GetFirstPlayerController()->bShowMouseCursor = false; - GetWorld()->GetFirstPlayerController()->bEnableClickEvents = false; - GetWorld()->GetFirstPlayerController()->bEnableMouseOverEvents = false; + //Set to Game Mode Only + APlayerController* PlayerController = GetWorld()->GetFirstPlayerController(); + PlayerController->SetInputMode(FInputModeGameOnly()); + PlayerController->bShowMouseCursor = false; } void ATurnBaseCombatV2::FKeyPressed() From 9e451d4539b00d6ecbd72e5b600a549ab95fdb07 Mon Sep 17 00:00:00 2001 From: PHILIP White Date: Thu, 2 Feb 2023 02:19:59 +0000 Subject: [PATCH 07/30] Bugfix Set Mouse Input to Only Poll Yaw Movement --- Content/Blueprints/Combat_UI/CombatCharacter.uasset | 4 ++-- Source/the_twilight_abyss/PlayerTemp/TempCharacter.cpp | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/Content/Blueprints/Combat_UI/CombatCharacter.uasset b/Content/Blueprints/Combat_UI/CombatCharacter.uasset index 3b2c174..b1fb7b7 100644 --- a/Content/Blueprints/Combat_UI/CombatCharacter.uasset +++ b/Content/Blueprints/Combat_UI/CombatCharacter.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:585edb5a7d5ed873e905c5150c3d20757177b5741d22806730b54a47415d472d -size 72618 +oid sha256:396a6ff81c0c1250e4a9251f6e9d027a09814199f3a07dc98ba8b087f35ce12b +size 72432 diff --git a/Source/the_twilight_abyss/PlayerTemp/TempCharacter.cpp b/Source/the_twilight_abyss/PlayerTemp/TempCharacter.cpp index bfdfe06..b17f9db 100644 --- a/Source/the_twilight_abyss/PlayerTemp/TempCharacter.cpp +++ b/Source/the_twilight_abyss/PlayerTemp/TempCharacter.cpp @@ -29,12 +29,12 @@ void ATempCharacter::BeginPlay() //Binds the input we made in the setup player component to the forward vector void ATempCharacter::ForwardInput(float Axis) { - AddMovementInput(GetActorForwardVector() * Axis); + AddMovementInput(UKismetMathLibrary::GetForwardVector(FRotator(0, GetControlRotation().Yaw, 0)) * Axis); } //Binds the input we made in the setup player component to the right vector void ATempCharacter::RightMoveInput(float Axis) { - AddMovementInput(GetActorRightVector() * Axis); + AddMovementInput(UKismetMathLibrary::GetRightVector(FRotator(0, GetControlRotation().Yaw, 0)) * Axis); } From 5c5b9152257d29e5baa3adf8d3c25695b10c064c Mon Sep 17 00:00:00 2001 From: PHILIP White Date: Thu, 2 Feb 2023 02:39:35 +0000 Subject: [PATCH 08/30] Updated DialogueNPC to Disable Character Movement --- .../the_twilight_abyss/Dialogue/DialogueNPC.cpp | 15 +++++++++++++-- 1 file changed, 13 insertions(+), 2 deletions(-) diff --git a/Source/the_twilight_abyss/Dialogue/DialogueNPC.cpp b/Source/the_twilight_abyss/Dialogue/DialogueNPC.cpp index 74b35b0..725471f 100644 --- a/Source/the_twilight_abyss/Dialogue/DialogueNPC.cpp +++ b/Source/the_twilight_abyss/Dialogue/DialogueNPC.cpp @@ -4,6 +4,7 @@ #include "DialogueNPC.h" #include "Blueprint/UserWidget.h" #include "Components/TextBlock.h" +#include "GameFramework/Character.h" // Sets default values for this component's properties UDialogueNPC::UDialogueNPC() @@ -57,7 +58,7 @@ void UDialogueNPC::NextDialogue() void UDialogueNPC::NextCharacter() { if (DialogueIndex >= Dialogue.Num()) return; - + if (CurrentDialogue.Len() < Dialogue[DialogueIndex].Len()) { CurrentDialogue.AppendChar(Dialogue[DialogueIndex][CurrentDialogue.Len()]); @@ -75,11 +76,16 @@ void UDialogueNPC::TickComponent(float DeltaTime, ELevelTick TickType, FActorCom void UDialogueNPC::StartDialogue() { + //Disable Character Movement + if (ACharacter* PlayerCharacter = Cast(GetWorld()->GetFirstPlayerController()->GetPawn())) + { + PlayerCharacter->DisableInput(GetWorld()->GetFirstPlayerController()); + } //Set to UI Mode Only APlayerController* PlayerController = GetWorld()->GetFirstPlayerController(); PlayerController->SetInputMode(FInputModeUIOnly()); PlayerController->bShowMouseCursor = true; - + DialogueWidgetInstance->AddToViewport(); DialogueIndex = 0; NPCNameText->SetText(FText::FromString(NPCName)); @@ -92,6 +98,11 @@ void UDialogueNPC::EndDialogue() TextAnimationTimerHandle.Invalidate(); DialogueWidgetInstance->RemoveFromParent(); + //Enable Character Movement + if (ACharacter* PlayerCharacter = Cast(GetWorld()->GetFirstPlayerController()->GetPawn())) + { + PlayerCharacter->EnableInput(GetWorld()->GetFirstPlayerController()); + } //Reset UI Mode APlayerController* PlayerController = GetWorld()->GetFirstPlayerController(); PlayerController->SetInputMode(FInputModeGameOnly()); From acefce8bbcc77e9eaa3590b32746c0741de514dc Mon Sep 17 00:00:00 2001 From: PHILIP White Date: Thu, 2 Feb 2023 03:15:50 +0000 Subject: [PATCH 09/30] Added InteractNPC to Line Trace for Interact --- .../Combat_UI/CombatCharacter.uasset | 4 +- Content/Dialogue/DialogueTest.umap | 4 +- Content/Dialogue/NPCTest.uasset | 4 +- .../Dialogue/DialogueNPC.cpp | 2 - .../Dialogue/InteractNPC.cpp | 54 +++++++++++++++++++ .../the_twilight_abyss/Dialogue/InteractNPC.h | 29 ++++++++++ 6 files changed, 89 insertions(+), 8 deletions(-) create mode 100644 Source/the_twilight_abyss/Dialogue/InteractNPC.cpp create mode 100644 Source/the_twilight_abyss/Dialogue/InteractNPC.h diff --git a/Content/Blueprints/Combat_UI/CombatCharacter.uasset b/Content/Blueprints/Combat_UI/CombatCharacter.uasset index 3b2c174..52a81f0 100644 --- a/Content/Blueprints/Combat_UI/CombatCharacter.uasset +++ b/Content/Blueprints/Combat_UI/CombatCharacter.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:585edb5a7d5ed873e905c5150c3d20757177b5741d22806730b54a47415d472d -size 72618 +oid sha256:485e33d984b8f741004f9015747b2ee40af6302886ae4f62d49ae13a32cb42a4 +size 81511 diff --git a/Content/Dialogue/DialogueTest.umap b/Content/Dialogue/DialogueTest.umap index 4a0c8c3..f2a5797 100644 --- a/Content/Dialogue/DialogueTest.umap +++ b/Content/Dialogue/DialogueTest.umap @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:911ac1a22605bd25c09862336710dd077c849e1bcbeb4046c70cd1e9ef698ff7 -size 41447 +oid sha256:6f2c0cc2d73c9fd35cf193c48ae0546bd41a9a10dedfe8c60d504fe09b55e819 +size 41343 diff --git a/Content/Dialogue/NPCTest.uasset b/Content/Dialogue/NPCTest.uasset index cdd38f9..8bcd011 100644 --- a/Content/Dialogue/NPCTest.uasset +++ b/Content/Dialogue/NPCTest.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:0594afb06d0d1957dd84c2ee2ee8487e30962a5bc85fad7ac1deb64cd3586552 -size 30359 +oid sha256:721d5229ead581f3db621f16f64292467e4f049587194e59b3c23343e61076c8 +size 31202 diff --git a/Source/the_twilight_abyss/Dialogue/DialogueNPC.cpp b/Source/the_twilight_abyss/Dialogue/DialogueNPC.cpp index 725471f..cc5535b 100644 --- a/Source/the_twilight_abyss/Dialogue/DialogueNPC.cpp +++ b/Source/the_twilight_abyss/Dialogue/DialogueNPC.cpp @@ -29,8 +29,6 @@ void UDialogueNPC::BeginPlay() DialogueText = Cast(DialogueWidgetInstance->GetWidgetFromName("Text_Dialogue")); NextButton = Cast(DialogueWidgetInstance->GetWidgetFromName("Button_Next")); NextButton->OnClicked.AddDynamic(this, &UDialogueNPC::NextDialogue); - - StartDialogue(); } diff --git a/Source/the_twilight_abyss/Dialogue/InteractNPC.cpp b/Source/the_twilight_abyss/Dialogue/InteractNPC.cpp new file mode 100644 index 0000000..32ba171 --- /dev/null +++ b/Source/the_twilight_abyss/Dialogue/InteractNPC.cpp @@ -0,0 +1,54 @@ +// Fill out your copyright notice in the Description page of Project Settings. + + +#include "InteractNPC.h" +#include "DialogueNPC.h" + + +// Sets default values for this component's properties +UInteractNPC::UInteractNPC() +{ + // Set this component to be initialized when the game starts, and to be ticked every frame. You can turn these features + // off to improve performance if you don't need them. + PrimaryComponentTick.bCanEverTick = true; + + // ... +} + + +// Called when the game starts +void UInteractNPC::BeginPlay() +{ + Super::BeginPlay(); + + // ... + +} + + +// Called every frame +void UInteractNPC::TickComponent(float DeltaTime, ELevelTick TickType, FActorComponentTickFunction* ThisTickFunction) +{ + Super::TickComponent(DeltaTime, TickType, ThisTickFunction); + + // ... +} + +void UInteractNPC::Interact() +{ + FVector Start = GetOwner()->GetActorLocation(); + FVector End = GetOwner()->GetActorForwardVector() * 100.0f + Start; + FCollisionQueryParams CollisionParams; + CollisionParams.AddIgnoredActor(GetOwner()); + if (FHitResult HitResult; GetWorld()->LineTraceSingleByChannel(HitResult, Start, End, ECC_Pawn, CollisionParams)) + { + //UE_LOG(LogTemp, Warning, TEXT("Hit: %s"), *HitResult.GetActor()->GetName()); + if (HitResult.GetActor()->Tags.Contains("NPC")) + { + //DrawDebugLine(GetWorld(), Start, End, FColor::Green, false, 5.0f, 0, 10.0f); + HitResult.GetActor()->FindComponentByClass()->StartDialogue(); + } + //DrawDebugLine(GetWorld(), Start, End, FColor::Red, false, 5.0f, 0, 10.0f); + } +} + diff --git a/Source/the_twilight_abyss/Dialogue/InteractNPC.h b/Source/the_twilight_abyss/Dialogue/InteractNPC.h new file mode 100644 index 0000000..6c76b27 --- /dev/null +++ b/Source/the_twilight_abyss/Dialogue/InteractNPC.h @@ -0,0 +1,29 @@ +// Fill out your copyright notice in the Description page of Project Settings. + +#pragma once + +#include "CoreMinimal.h" +#include "Components/ActorComponent.h" +#include "InteractNPC.generated.h" + + +UCLASS(ClassGroup=(Custom), meta=(BlueprintSpawnableComponent)) +class THE_TWILIGHT_ABYSS_API UInteractNPC : public UActorComponent +{ + GENERATED_BODY() + +public: + // Sets default values for this component's properties + UInteractNPC(); + +protected: + // Called when the game starts + virtual void BeginPlay() override; + +public: + // Called every frame + virtual void TickComponent(float DeltaTime, ELevelTick TickType, FActorComponentTickFunction* ThisTickFunction) override; + + UFUNCTION(BlueprintCallable) + void Interact(); +}; From 182f54a3c888a336127ecaf8eefdc9a39ab21156 Mon Sep 17 00:00:00 2001 From: MH261677 Date: Sat, 4 Feb 2023 17:39:12 +0000 Subject: [PATCH 10/30] Updated TempCharacter.cpp Added boolean to make inventory not open when in shop --- Source/the_twilight_abyss/PlayerTemp/TempCharacter.cpp | 3 +++ Source/the_twilight_abyss/PlayerTemp/TempCharacter.h | 3 +++ 2 files changed, 6 insertions(+) diff --git a/Source/the_twilight_abyss/PlayerTemp/TempCharacter.cpp b/Source/the_twilight_abyss/PlayerTemp/TempCharacter.cpp index bfdfe06..aed31e5 100644 --- a/Source/the_twilight_abyss/PlayerTemp/TempCharacter.cpp +++ b/Source/the_twilight_abyss/PlayerTemp/TempCharacter.cpp @@ -85,6 +85,7 @@ void ATempCharacter::LineTraceLogic() } if(OutHit.GetActor()->FindComponentByClass()) { + UE_LOG(LogTemp, Display, TEXT("Hit Merchant")); auto ItemArray = OutHit.GetActor()->FindComponentByClass()->GetItem(0); if(GoldBalance >= ItemArray->ItemCostPrice) { @@ -139,6 +140,7 @@ void ATempCharacter::LineTraceLogic() void ATempCharacter::InputDisabler() { UE_LOG(LogTemp, Display, TEXT("Disabling playermovement")); + disableTab = true; //GetWorld()->GetFirstPlayerController()->InputComponent->RemoveActionBinding("Interact", IE_Pressed); GetWorld()->GetFirstPlayerController()->SetIgnoreLookInput(true); GetWorld()->GetFirstPlayerController()->SetIgnoreMoveInput(true); @@ -163,6 +165,7 @@ void ATempCharacter::InputDisabler() void ATempCharacter::InputEnabler() { UE_LOG(LogTemp, Display, TEXT("Enabling Inputs")); + disableTab = true; GetWorld()->GetFirstPlayerController()->SetIgnoreLookInput(false); GetWorld()->GetFirstPlayerController()->SetIgnoreMoveInput(false); GetWorld()->GetFirstPlayerController()->bShowMouseCursor = false; diff --git a/Source/the_twilight_abyss/PlayerTemp/TempCharacter.h b/Source/the_twilight_abyss/PlayerTemp/TempCharacter.h index 928b8df..510587b 100644 --- a/Source/the_twilight_abyss/PlayerTemp/TempCharacter.h +++ b/Source/the_twilight_abyss/PlayerTemp/TempCharacter.h @@ -77,5 +77,8 @@ public: void BuyItem(); bool bShopKeeperText = false; + + UPROPERTY(BlueprintReadWrite) + bool disableTab = false; }; From f4e0511f5c497a938054876fb0e6ce2c5356a9df Mon Sep 17 00:00:00 2001 From: MH261677 Date: Sat, 4 Feb 2023 17:41:09 +0000 Subject: [PATCH 11/30] Updated TempCharacter blueprint Added a check to make sure the player is not in the shop when opening inventory --- Content/Blueprints/Inventory_UI/WBP_PlayerInventory.uasset | 4 ++-- Content/Blueprints/Player/BP_MyTempCharacter.uasset | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/Content/Blueprints/Inventory_UI/WBP_PlayerInventory.uasset b/Content/Blueprints/Inventory_UI/WBP_PlayerInventory.uasset index d2d7739..138ec00 100644 --- a/Content/Blueprints/Inventory_UI/WBP_PlayerInventory.uasset +++ b/Content/Blueprints/Inventory_UI/WBP_PlayerInventory.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:4177a97bce273fa21e43e1d37185390f84f3055fe4af730ea21754e8f3715246 -size 108778 +oid sha256:6077e113d99db0e0e7e66e52dc856fe1cf0473f23377f7d00f4e9ca187069ee1 +size 111320 diff --git a/Content/Blueprints/Player/BP_MyTempCharacter.uasset b/Content/Blueprints/Player/BP_MyTempCharacter.uasset index d369a35..68f202b 100644 --- a/Content/Blueprints/Player/BP_MyTempCharacter.uasset +++ b/Content/Blueprints/Player/BP_MyTempCharacter.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:0954984bc9728f0b7488017e75a199b474190a8b9ff5412cc7869aece4c93b46 -size 54779 +oid sha256:df9e97f92efc6e557cb50693743a5db37bb9b97703afeccf8d1452b5886931ea +size 66442 From 5364f92edb04f1d481188eaa58d01ca68be2c98a Mon Sep 17 00:00:00 2001 From: MH261677 Date: Sat, 4 Feb 2023 17:49:17 +0000 Subject: [PATCH 12/30] Updated WBP_ItemDisplay Item_Stack now changes to however many stacks the player has bought of the item --- Content/Blueprints/Inventory_UI/WBP_ItemDisplay.uasset | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Content/Blueprints/Inventory_UI/WBP_ItemDisplay.uasset b/Content/Blueprints/Inventory_UI/WBP_ItemDisplay.uasset index 3980322..708a5d3 100644 --- a/Content/Blueprints/Inventory_UI/WBP_ItemDisplay.uasset +++ b/Content/Blueprints/Inventory_UI/WBP_ItemDisplay.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:48426ed97184a867232380e93324520aeef1c39e773c7155c7caab764aa7f54a -size 86683 +oid sha256:1d2dacba46200972bd3ed39b2e006c6f815eed957e4cb57009fd850d3565dd6f +size 99076 From 81d926ffb37e3c78055e730378565144c11e416b Mon Sep 17 00:00:00 2001 From: MH261677 Date: Sat, 4 Feb 2023 17:56:25 +0000 Subject: [PATCH 13/30] Updated EatableItems.cpp Made it so when the players health is above 100 they cant heal anymore. (Removed healing stacking) --- .../BaseItems/Items/EatableItems.cpp | 16 +++++++++++----- 1 file changed, 11 insertions(+), 5 deletions(-) diff --git a/Source/the_twilight_abyss/BaseItems/Items/EatableItems.cpp b/Source/the_twilight_abyss/BaseItems/Items/EatableItems.cpp index cc2c535..ceae474 100644 --- a/Source/the_twilight_abyss/BaseItems/Items/EatableItems.cpp +++ b/Source/the_twilight_abyss/BaseItems/Items/EatableItems.cpp @@ -18,11 +18,17 @@ void UEatableItems::Use(ATempCharacter* Character) { if(isHealingItem == true) { - Character->Health += 10; - UE_LOG(LogTemp, Display, TEXT("Healed")); - //delete itself - Character->Inventory->RemoveItem(this); - + if (Character->Health < 100) + { + Character->Health += 10; + UE_LOG(LogTemp, Display, TEXT("Healed")); + //delete itself + Character->Inventory->RemoveItem(this); + } + else if (Character->Health >= 100) + { + UE_LOG(LogTemp, Display, TEXT("Health is full")); + } } if(isDamageBuffItem == true) { From 14c7d6b6d7860e5820adfc4dc9fa04942cbeb241 Mon Sep 17 00:00:00 2001 From: MH261677 Date: Sat, 4 Feb 2023 18:34:53 +0000 Subject: [PATCH 14/30] Updated TempCharacter.cpp Cached the camera reference isntead of constantly casting for it --- Source/the_twilight_abyss/PlayerTemp/TempCharacter.cpp | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/Source/the_twilight_abyss/PlayerTemp/TempCharacter.cpp b/Source/the_twilight_abyss/PlayerTemp/TempCharacter.cpp index aed31e5..f6c743b 100644 --- a/Source/the_twilight_abyss/PlayerTemp/TempCharacter.cpp +++ b/Source/the_twilight_abyss/PlayerTemp/TempCharacter.cpp @@ -24,6 +24,7 @@ void ATempCharacter::BeginPlay() { Super::BeginPlay(); Health = 100; + ThisCamera = Cast(this->FindComponentByClass()); } //Binds the input we made in the setup player component to the forward vector @@ -147,7 +148,6 @@ void ATempCharacter::InputDisabler() GetWorld()->GetFirstPlayerController()->bShowMouseCursor = true; GetWorld()->GetFirstPlayerController()->bEnableClickEvents = true; GetWorld()->GetFirstPlayerController()->bEnableMouseOverEvents = true; - ThisCamera = Cast(this->FindComponentByClass()); if (ThisCamera == nullptr) { return; @@ -173,7 +173,6 @@ void ATempCharacter::InputEnabler() GetWorld()->GetFirstPlayerController()->bEnableMouseOverEvents = false; //GetWorld()->GetFirstPlayerController()->InputComponent->BindAction("Interact", IE_Pressed, this, &ATempCharacter::KeyPressed); TraceDistance = 300; - ThisCamera = Cast(this->FindComponentByClass()); if (ThisCamera == nullptr) { return; From 63100506473e35beebf5e06588207cdc4d0f13a7 Mon Sep 17 00:00:00 2001 From: PHILIP White Date: Mon, 6 Feb 2023 01:13:17 +0000 Subject: [PATCH 15/30] Updated DialogueNPC for Text Animation Speed Property --- Source/the_twilight_abyss/Dialogue/DialogueNPC.cpp | 2 +- Source/the_twilight_abyss/Dialogue/DialogueNPC.h | 3 +++ 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/Source/the_twilight_abyss/Dialogue/DialogueNPC.cpp b/Source/the_twilight_abyss/Dialogue/DialogueNPC.cpp index cc5535b..50e8379 100644 --- a/Source/the_twilight_abyss/Dialogue/DialogueNPC.cpp +++ b/Source/the_twilight_abyss/Dialogue/DialogueNPC.cpp @@ -88,7 +88,7 @@ void UDialogueNPC::StartDialogue() DialogueIndex = 0; NPCNameText->SetText(FText::FromString(NPCName)); CurrentDialogue = ""; - GetWorld()->GetTimerManager().SetTimer(TextAnimationTimerHandle, this, &UDialogueNPC::NextCharacter, 0.05f, true); + GetWorld()->GetTimerManager().SetTimer(TextAnimationTimerHandle, this, &UDialogueNPC::NextCharacter, TextAnimationSpeed, true); } void UDialogueNPC::EndDialogue() diff --git a/Source/the_twilight_abyss/Dialogue/DialogueNPC.h b/Source/the_twilight_abyss/Dialogue/DialogueNPC.h index 3c084a2..a674427 100644 --- a/Source/the_twilight_abyss/Dialogue/DialogueNPC.h +++ b/Source/the_twilight_abyss/Dialogue/DialogueNPC.h @@ -34,6 +34,9 @@ public: UPROPERTY(EditAnywhere) TArray Dialogue; + UPROPERTY(EditAnywhere) + float TextAnimationSpeed = 0.05f; + protected: // Called when the game starts virtual void BeginPlay() override; From e5b624411d0f2174613eabc16bc66401a54581b9 Mon Sep 17 00:00:00 2001 From: PHILIP White Date: Mon, 6 Feb 2023 03:27:49 +0000 Subject: [PATCH 16/30] Updated TextPrompt for Choices --- Content/Dialogue/TextPrompt.uasset | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Content/Dialogue/TextPrompt.uasset b/Content/Dialogue/TextPrompt.uasset index 4630031..36af6e8 100644 --- a/Content/Dialogue/TextPrompt.uasset +++ b/Content/Dialogue/TextPrompt.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:78605489bcbc381e7d4cd447e16413e8762156a38a47715305c8478c3df5eac3 -size 36800 +oid sha256:9f186852f793c0cf57654d61c8314956651f3c41f25d508459e48d00f7ea0581 +size 45953 From 7f3e3cbb52f2a9324b5cbd310f47bb34ad66a13a Mon Sep 17 00:00:00 2001 From: PHILIP White Date: Mon, 6 Feb 2023 03:28:53 +0000 Subject: [PATCH 17/30] Updated DialogueNPC to Add Dialogue via Blueprints --- Content/Dialogue/NPCTest.uasset | 4 ++-- .../Dialogue/DialogueNPC.cpp | 16 ++++++++++--- .../the_twilight_abyss/Dialogue/DialogueNPC.h | 23 +++++++++++-------- 3 files changed, 28 insertions(+), 15 deletions(-) diff --git a/Content/Dialogue/NPCTest.uasset b/Content/Dialogue/NPCTest.uasset index 8bcd011..e33f5cc 100644 --- a/Content/Dialogue/NPCTest.uasset +++ b/Content/Dialogue/NPCTest.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:721d5229ead581f3db621f16f64292467e4f049587194e59b3c23343e61076c8 -size 31202 +oid sha256:3d8d35e08f9a82472293b350e194a815b8e58c85084e33c6211de9f7c59a67a8 +size 47133 diff --git a/Source/the_twilight_abyss/Dialogue/DialogueNPC.cpp b/Source/the_twilight_abyss/Dialogue/DialogueNPC.cpp index 50e8379..af4c7ba 100644 --- a/Source/the_twilight_abyss/Dialogue/DialogueNPC.cpp +++ b/Source/the_twilight_abyss/Dialogue/DialogueNPC.cpp @@ -34,8 +34,6 @@ void UDialogueNPC::BeginPlay() void UDialogueNPC::NextDialogue() { - //log bruh - UE_LOG(LogTemp, Warning, TEXT("Next Dialogue")); //Dialogue Skip if (CurrentDialogue.Len() < Dialogue[DialogueIndex].Len()) { @@ -85,7 +83,7 @@ void UDialogueNPC::StartDialogue() PlayerController->bShowMouseCursor = true; DialogueWidgetInstance->AddToViewport(); - DialogueIndex = 0; + DialogueIndex = 1; NPCNameText->SetText(FText::FromString(NPCName)); CurrentDialogue = ""; GetWorld()->GetTimerManager().SetTimer(TextAnimationTimerHandle, this, &UDialogueNPC::NextCharacter, TextAnimationSpeed, true); @@ -106,3 +104,15 @@ void UDialogueNPC::EndDialogue() PlayerController->SetInputMode(FInputModeGameOnly()); PlayerController->bShowMouseCursor = false; } + +TArray UDialogueNPC::AddDialogue(FText TextInput, TArray DialogueArrayInput) +{ + if (TextInput.IsEmpty()) return DialogueArrayInput; + DialogueArrayInput.Add(TextInput.ToString()); + return DialogueArrayInput; +} + +void UDialogueNPC::GetFinalDialogue(TArray DialogueArray) +{ + Dialogue = DialogueArray; +} diff --git a/Source/the_twilight_abyss/Dialogue/DialogueNPC.h b/Source/the_twilight_abyss/Dialogue/DialogueNPC.h index a674427..eeb8276 100644 --- a/Source/the_twilight_abyss/Dialogue/DialogueNPC.h +++ b/Source/the_twilight_abyss/Dialogue/DialogueNPC.h @@ -8,12 +8,12 @@ #include "Components/TextBlock.h" #include "DialogueNPC.generated.h" -UENUM() -enum class EDialogueType +UENUM(BlueprintType) +enum class EChoices : uint8 { - Text UMETA(DisplayName="Text"), - End UMETA(DisplayName="End"), - Action UMETA(DisplayName="Action"), + Choice1 UMETA(DisplayName="Choice 1"), + Choice2 UMETA(DisplayName="Choice 2"), + Choice3 UMETA(DisplayName="Choice 3"), }; UCLASS(ClassGroup=(Custom), meta=(BlueprintSpawnableComponent)) @@ -28,10 +28,7 @@ public: UPROPERTY(EditAnywhere) FString NPCName; - UPROPERTY(EditAnywhere) - TArray DialogueType; - - UPROPERTY(EditAnywhere) + UPROPERTY() TArray Dialogue; UPROPERTY(EditAnywhere) @@ -57,7 +54,7 @@ private: UPROPERTY() UButton* NextButton; - int DialogueIndex = 0; + int DialogueIndex = 1; FString CurrentDialogue; UPROPERTY() @@ -76,4 +73,10 @@ public: UFUNCTION(BlueprintCallable) void EndDialogue(); + + UFUNCTION(BlueprintPure) + TArray AddDialogue(FText TextInput, TArray DialogueArrayInput); + + UFUNCTION(BlueprintCallable) + void GetFinalDialogue(TArray DialogueArray); }; From 19a53529e98fcd7b1df64245840b185619bb9fe2 Mon Sep 17 00:00:00 2001 From: MARCEL HARA Date: Mon, 6 Feb 2023 14:29:26 +0000 Subject: [PATCH 18/30] Added Sneak keybind --- Config/DefaultInput.ini | 1 + 1 file changed, 1 insertion(+) diff --git a/Config/DefaultInput.ini b/Config/DefaultInput.ini index a87dbd8..8698439 100644 --- a/Config/DefaultInput.ini +++ b/Config/DefaultInput.ini @@ -82,6 +82,7 @@ DoubleClickTime=0.200000 +ActionMappings=(ActionName="Jump",bShift=False,bCtrl=False,bAlt=False,bCmd=False,Key=SpaceBar) +ActionMappings=(ActionName="Interact",bShift=False,bCtrl=False,bAlt=False,bCmd=False,Key=E) +ActionMappings=(ActionName="RightClick",bShift=False,bCtrl=False,bAlt=False,bCmd=False,Key=LeftMouseButton) ++ActionMappings=(ActionName="Sneak",bShift=False,bCtrl=False,bAlt=False,bCmd=False,Key=LeftControl) +AxisMappings=(AxisName="Look Up / Down Gamepad",Scale=1.000000,Key=Gamepad_RightY) +AxisMappings=(AxisName="Look Up / Down Mouse",Scale=-1.000000,Key=MouseY) +AxisMappings=(AxisName="Move Forward / Backward",Scale=1.000000,Key=Gamepad_LeftY) From 0cf4ace43a19211034d94c4d2778279986f9e7d0 Mon Sep 17 00:00:00 2001 From: MARCEL HARA Date: Mon, 6 Feb 2023 14:30:13 +0000 Subject: [PATCH 19/30] Updated TempCharacter Added Jump function which is using ACharacter and started working on custom Sneak function --- Content/Blueprints/Combat_UI/CombatCharacter.uasset | 4 ++-- Content/Blueprints/Player/BP_MyTempCharacter.uasset | 4 ++-- Source/the_twilight_abyss/PlayerTemp/TempCharacter.cpp | 9 +++++++++ Source/the_twilight_abyss/PlayerTemp/TempCharacter.h | 4 ++++ 4 files changed, 17 insertions(+), 4 deletions(-) diff --git a/Content/Blueprints/Combat_UI/CombatCharacter.uasset b/Content/Blueprints/Combat_UI/CombatCharacter.uasset index b1fb7b7..a1aecc3 100644 --- a/Content/Blueprints/Combat_UI/CombatCharacter.uasset +++ b/Content/Blueprints/Combat_UI/CombatCharacter.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:396a6ff81c0c1250e4a9251f6e9d027a09814199f3a07dc98ba8b087f35ce12b -size 72432 +oid sha256:75f1be8dcc2242cadbf525aee17e98a61c33a44d283b85f10073985ca70c642e +size 71310 diff --git a/Content/Blueprints/Player/BP_MyTempCharacter.uasset b/Content/Blueprints/Player/BP_MyTempCharacter.uasset index 68f202b..cf1a4a5 100644 --- a/Content/Blueprints/Player/BP_MyTempCharacter.uasset +++ b/Content/Blueprints/Player/BP_MyTempCharacter.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:df9e97f92efc6e557cb50693743a5db37bb9b97703afeccf8d1452b5886931ea -size 66442 +oid sha256:4f15d6bea7197b5335d686ea829286466b065c9e1329fcdb437a6c9aae018cc3 +size 65454 diff --git a/Source/the_twilight_abyss/PlayerTemp/TempCharacter.cpp b/Source/the_twilight_abyss/PlayerTemp/TempCharacter.cpp index 1062d20..aa0414e 100644 --- a/Source/the_twilight_abyss/PlayerTemp/TempCharacter.cpp +++ b/Source/the_twilight_abyss/PlayerTemp/TempCharacter.cpp @@ -38,6 +38,11 @@ void ATempCharacter::RightMoveInput(float Axis) AddMovementInput(UKismetMathLibrary::GetRightVector(FRotator(0, GetControlRotation().Yaw, 0)) * Axis); } +void ATempCharacter::Sneak() +{ + +} + // Called every frame void ATempCharacter::Tick(float DeltaTime) @@ -53,6 +58,8 @@ void ATempCharacter::SetupPlayerInputComponent(UInputComponent* PlayerInputCompo PlayerInputComponent->BindAxis(TEXT("Move Right / Left"), this, &ATempCharacter::RightMoveInput); PlayerInputComponent->BindAxis(TEXT("Turn Right / Left Mouse"), this, &ATempCharacter::AddControllerYawInput); PlayerInputComponent->BindAxis(TEXT("Look Up / Down Mouse"), this, &ATempCharacter::AddControllerPitchInput); + PlayerInputComponent->BindAction(TEXT("Jump"), IE_Pressed, this, &ATempCharacter::Jump); + PlayerInputComponent->BindAction(TEXT("Sneak"), IE_Pressed, this, &ATempCharacter::Sneak); PlayerInputComponent->BindAction("Interact", IE_Pressed, this, &ATempCharacter::KeyPressed); } @@ -62,6 +69,8 @@ void ATempCharacter::KeyPressed() LineTraceLogic(); } + + // Line trace logic void ATempCharacter::LineTraceLogic() { diff --git a/Source/the_twilight_abyss/PlayerTemp/TempCharacter.h b/Source/the_twilight_abyss/PlayerTemp/TempCharacter.h index 510587b..ef4d667 100644 --- a/Source/the_twilight_abyss/PlayerTemp/TempCharacter.h +++ b/Source/the_twilight_abyss/PlayerTemp/TempCharacter.h @@ -25,6 +25,9 @@ protected: void ForwardInput(float Axis); void RightMoveInput(float Axis); + UFUNCTION() + void Sneak(); + public: // Called every frame virtual void Tick(float DeltaTime) override; @@ -80,5 +83,6 @@ public: UPROPERTY(BlueprintReadWrite) bool disableTab = false; + }; From 5b4da1f02ecd0ce49914eed743334b6c20928867 Mon Sep 17 00:00:00 2001 From: MARCEL HARA Date: Mon, 6 Feb 2023 15:26:22 +0000 Subject: [PATCH 20/30] Updated TempCharacter for Jump and Sneak Added A sneak function and Jump function for the character --- .../Combat_UI/CombatCharacter.uasset | 2 +- .../Player/BP_MyTempCharacter.uasset | 4 +- .../PlayerTemp/TempCharacter.cpp | 47 ++++++++++++++----- .../PlayerTemp/TempCharacter.h | 3 ++ 4 files changed, 40 insertions(+), 16 deletions(-) diff --git a/Content/Blueprints/Combat_UI/CombatCharacter.uasset b/Content/Blueprints/Combat_UI/CombatCharacter.uasset index a1aecc3..8d884e7 100644 --- a/Content/Blueprints/Combat_UI/CombatCharacter.uasset +++ b/Content/Blueprints/Combat_UI/CombatCharacter.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:75f1be8dcc2242cadbf525aee17e98a61c33a44d283b85f10073985ca70c642e +oid sha256:d41dd0f4c13a2823d7cda168b1109dfa219681d8f7fda30c966830823dc227a6 size 71310 diff --git a/Content/Blueprints/Player/BP_MyTempCharacter.uasset b/Content/Blueprints/Player/BP_MyTempCharacter.uasset index cf1a4a5..21e9727 100644 --- a/Content/Blueprints/Player/BP_MyTempCharacter.uasset +++ b/Content/Blueprints/Player/BP_MyTempCharacter.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:4f15d6bea7197b5335d686ea829286466b065c9e1329fcdb437a6c9aae018cc3 -size 65454 +oid sha256:9f65775451fb2105a879b7ceed94887ea520b41464c773052234285414565157 +size 54763 diff --git a/Source/the_twilight_abyss/PlayerTemp/TempCharacter.cpp b/Source/the_twilight_abyss/PlayerTemp/TempCharacter.cpp index aa0414e..553ac9c 100644 --- a/Source/the_twilight_abyss/PlayerTemp/TempCharacter.cpp +++ b/Source/the_twilight_abyss/PlayerTemp/TempCharacter.cpp @@ -5,6 +5,8 @@ #include "Blueprint/UserWidget.h" #include "the_twilight_abyss/BaseItems/InventoryComponent.h" #include "the_twilight_abyss/BaseItems/Items/BaseItem.h" +#include "Components/CapsuleComponent.h" +#include "GameFramework/CharacterMovementComponent.h" #include "the_twilight_abyss/MerchantInteraction/Interaction.h" @@ -17,6 +19,7 @@ ATempCharacter::ATempCharacter() Inventory->MaxItemSlots = 10; GoldBalance = GoldBalance; Health = Health; + this->GetCharacterMovement()->GetNavAgentPropertiesRef().bCanCrouch = true; } // Called when the game starts or when spawned @@ -25,6 +28,7 @@ void ATempCharacter::BeginPlay() Super::BeginPlay(); Health = 100; ThisCamera = Cast(this->FindComponentByClass()); + PlayerCapsule = GetCapsuleComponent(); } //Binds the input we made in the setup player component to the forward vector @@ -40,6 +44,15 @@ void ATempCharacter::RightMoveInput(float Axis) void ATempCharacter::Sneak() { + UE_LOG(LogTemp, Display, TEXT("Sneak activated")); + if (bIsCrouched) + { + UnCrouch(); + } + else + { + Crouch(); + } } @@ -60,6 +73,7 @@ void ATempCharacter::SetupPlayerInputComponent(UInputComponent* PlayerInputCompo PlayerInputComponent->BindAxis(TEXT("Look Up / Down Mouse"), this, &ATempCharacter::AddControllerPitchInput); PlayerInputComponent->BindAction(TEXT("Jump"), IE_Pressed, this, &ATempCharacter::Jump); PlayerInputComponent->BindAction(TEXT("Sneak"), IE_Pressed, this, &ATempCharacter::Sneak); + PlayerInputComponent->BindAction(TEXT("Sneak"), IE_Released, this, &ATempCharacter::Sneak); PlayerInputComponent->BindAction("Interact", IE_Pressed, this, &ATempCharacter::KeyPressed); } @@ -149,14 +163,17 @@ void ATempCharacter::LineTraceLogic() void ATempCharacter::InputDisabler() { - UE_LOG(LogTemp, Display, TEXT("Disabling playermovement")); + //Disable Character Movement + if (ACharacter* PlayerCharacter = Cast(GetWorld()->GetFirstPlayerController()->GetPawn())) + { + PlayerCharacter->DisableInput(GetWorld()->GetFirstPlayerController()); + } + //Set to UI Mode Only + APlayerController* PlayerController = GetWorld()->GetFirstPlayerController(); + PlayerController->SetInputMode(FInputModeUIOnly()); + PlayerController->bShowMouseCursor = true; + disableTab = true; - //GetWorld()->GetFirstPlayerController()->InputComponent->RemoveActionBinding("Interact", IE_Pressed); - GetWorld()->GetFirstPlayerController()->SetIgnoreLookInput(true); - GetWorld()->GetFirstPlayerController()->SetIgnoreMoveInput(true); - GetWorld()->GetFirstPlayerController()->bShowMouseCursor = true; - GetWorld()->GetFirstPlayerController()->bEnableClickEvents = true; - GetWorld()->GetFirstPlayerController()->bEnableMouseOverEvents = true; if (ThisCamera == nullptr) { return; @@ -173,14 +190,18 @@ void ATempCharacter::InputDisabler() void ATempCharacter::InputEnabler() { + //Enable Character Movement + if (ACharacter* PlayerCharacter = Cast(GetWorld()->GetFirstPlayerController()->GetPawn())) + { + PlayerCharacter->EnableInput(GetWorld()->GetFirstPlayerController()); + } + //Reset UI Mode + APlayerController* PlayerController = GetWorld()->GetFirstPlayerController(); + PlayerController->SetInputMode(FInputModeGameOnly()); + PlayerController->bShowMouseCursor = false; + UE_LOG(LogTemp, Display, TEXT("Enabling Inputs")); disableTab = true; - GetWorld()->GetFirstPlayerController()->SetIgnoreLookInput(false); - GetWorld()->GetFirstPlayerController()->SetIgnoreMoveInput(false); - GetWorld()->GetFirstPlayerController()->bShowMouseCursor = false; - GetWorld()->GetFirstPlayerController()->bEnableClickEvents = false; - GetWorld()->GetFirstPlayerController()->bEnableMouseOverEvents = false; - //GetWorld()->GetFirstPlayerController()->InputComponent->BindAction("Interact", IE_Pressed, this, &ATempCharacter::KeyPressed); TraceDistance = 300; if (ThisCamera == nullptr) { diff --git a/Source/the_twilight_abyss/PlayerTemp/TempCharacter.h b/Source/the_twilight_abyss/PlayerTemp/TempCharacter.h index ef4d667..c1f22e9 100644 --- a/Source/the_twilight_abyss/PlayerTemp/TempCharacter.h +++ b/Source/the_twilight_abyss/PlayerTemp/TempCharacter.h @@ -28,6 +28,9 @@ protected: UFUNCTION() void Sneak(); + + UCapsuleComponent* PlayerCapsule; + public: // Called every frame virtual void Tick(float DeltaTime) override; From 36c18382a26fd08f9a635c8ad19f70e1fbba315c Mon Sep 17 00:00:00 2001 From: MARCEL HARA Date: Mon, 6 Feb 2023 15:55:12 +0000 Subject: [PATCH 21/30] Updated TempCharacter for sneaking vignette effect Added a Vignette effect when crouching --- Content/Levels/Top_layer_level.umap | 4 ++-- .../the_twilight_abyss/PlayerTemp/TempCharacter.cpp | 12 +++++++++--- Source/the_twilight_abyss/PlayerTemp/TempCharacter.h | 3 ++- 3 files changed, 13 insertions(+), 6 deletions(-) diff --git a/Content/Levels/Top_layer_level.umap b/Content/Levels/Top_layer_level.umap index ad576cc..a338efc 100644 --- a/Content/Levels/Top_layer_level.umap +++ b/Content/Levels/Top_layer_level.umap @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:b9913f8136b9bf2c1f42801089b7071ad667f9467ee25d72ab588ae96d7543f2 -size 247266 +oid sha256:b12ca45d23f48747799c368c38e00f316adb025ea913272a4a36b69ec4b30fa3 +size 247139 diff --git a/Source/the_twilight_abyss/PlayerTemp/TempCharacter.cpp b/Source/the_twilight_abyss/PlayerTemp/TempCharacter.cpp index 553ac9c..42a36fe 100644 --- a/Source/the_twilight_abyss/PlayerTemp/TempCharacter.cpp +++ b/Source/the_twilight_abyss/PlayerTemp/TempCharacter.cpp @@ -8,6 +8,7 @@ #include "Components/CapsuleComponent.h" #include "GameFramework/CharacterMovementComponent.h" #include "the_twilight_abyss/MerchantInteraction/Interaction.h" +#include // CONSTRUCTOR @@ -20,6 +21,7 @@ ATempCharacter::ATempCharacter() GoldBalance = GoldBalance; Health = Health; this->GetCharacterMovement()->GetNavAgentPropertiesRef().bCanCrouch = true; + } // Called when the game starts or when spawned @@ -29,6 +31,10 @@ void ATempCharacter::BeginPlay() Health = 100; ThisCamera = Cast(this->FindComponentByClass()); PlayerCapsule = GetCapsuleComponent(); + TArray AllActorsInScene; + + UGameplayStatics::GetAllActorsOfClass(GetWorld(), APostProcessVolume::StaticClass(), AllActorsInScene); + PostProcessVolume = Cast(AllActorsInScene[0]); } //Binds the input we made in the setup player component to the forward vector @@ -48,10 +54,12 @@ void ATempCharacter::Sneak() if (bIsCrouched) { UnCrouch(); + PostProcessVolume->Settings.VignetteIntensity = 0.0f; } else { Crouch(); + PostProcessVolume->Settings.VignetteIntensity = 0.8f; } } @@ -183,7 +191,6 @@ void ATempCharacter::InputDisabler() OriginalCameraLocation = ThisCamera->GetComponentLocation(); OriginalCameraRotation = ThisCamera->GetComponentRotation(); OriginalCameraFOV = ThisCamera->FieldOfView; - //ulog the originalcameralocation value UE_LOG(LogTemp, Display, TEXT("Original Camera Location: %s"), *OriginalCameraLocation.ToString()); } } @@ -212,7 +219,6 @@ void ATempCharacter::InputEnabler() ThisCamera->SetWorldLocation(OriginalCameraLocation); ThisCamera->SetWorldRotation(OriginalCameraRotation); ThisCamera->FieldOfView = OriginalCameraFOV; - //ulog the originalcameralocation value UE_LOG(LogTemp, Display, TEXT("Original Camera Location: %s"), *OriginalCameraLocation.ToString()); } } @@ -222,7 +228,7 @@ void ATempCharacter::UseItem(class UBaseItem* Item) if(Item) { Item->Use(this); - Item->OnUse(this); //Blueprint Version + Item->OnUse(this); //OnUse is a Blueprint Version } } diff --git a/Source/the_twilight_abyss/PlayerTemp/TempCharacter.h b/Source/the_twilight_abyss/PlayerTemp/TempCharacter.h index c1f22e9..f162b7f 100644 --- a/Source/the_twilight_abyss/PlayerTemp/TempCharacter.h +++ b/Source/the_twilight_abyss/PlayerTemp/TempCharacter.h @@ -7,6 +7,7 @@ #include "the_twilight_abyss/BaseItems/Items/BaseItem.h" #include "Camera/CameraComponent.h" #include "Kismet/KismetMathLibrary.h" +#include "Engine/PostProcessVolume.h" #include "TempCharacter.generated.h" UCLASS() @@ -87,5 +88,5 @@ public: UPROPERTY(BlueprintReadWrite) bool disableTab = false; - + APostProcessVolume* PostProcessVolume; }; From 797c447d4798889630baf514f2e4e687500fcafe Mon Sep 17 00:00:00 2001 From: MH261677 Date: Mon, 6 Feb 2023 23:51:45 +0000 Subject: [PATCH 22/30] Added Ammo Icon to Images --- .../Items/ItemsInWorld/BP_HealingJellyItem.uasset | 4 ++-- Content/Images/ammoicon.uasset | 3 +++ Content/Levels/MerchantPrototype.umap | 4 ++-- Source/the_twilight_abyss/BaseItems/InventoryComponent.cpp | 2 -- Source/the_twilight_abyss/BaseItems/Items/EatableItems.cpp | 7 ------- Source/the_twilight_abyss/PlayerTemp/TempCharacter.cpp | 1 + 6 files changed, 8 insertions(+), 13 deletions(-) create mode 100644 Content/Images/ammoicon.uasset diff --git a/Content/Blueprints/Items/ItemsInWorld/BP_HealingJellyItem.uasset b/Content/Blueprints/Items/ItemsInWorld/BP_HealingJellyItem.uasset index 5e94613..b53dd84 100644 --- a/Content/Blueprints/Items/ItemsInWorld/BP_HealingJellyItem.uasset +++ b/Content/Blueprints/Items/ItemsInWorld/BP_HealingJellyItem.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:32388bd47d08a69c1f782c682fdf67358fb2fdd5f9dd821ed9fc97d66a0bda70 -size 31327 +oid sha256:14abf326c7821612e3c60b5312759ae40948cadf47a909bf25201e0dfa39ea7d +size 31322 diff --git a/Content/Images/ammoicon.uasset b/Content/Images/ammoicon.uasset new file mode 100644 index 0000000..f2ed9de --- /dev/null +++ b/Content/Images/ammoicon.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:7c3fc688d58293f796f23824c1478b40cf0d62f868547a7f0e6bf25a471db496 +size 9826 diff --git a/Content/Levels/MerchantPrototype.umap b/Content/Levels/MerchantPrototype.umap index ea85903..b26f4c0 100644 --- a/Content/Levels/MerchantPrototype.umap +++ b/Content/Levels/MerchantPrototype.umap @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:838c48c134383d4b1db178233640e11ef2c4bcd49102f53648cf621dd1dcbf8a -size 27100 +oid sha256:a85cec4d3024ec9a40e0fd888530e7982d06461cf90dca88004eae911b6a8431 +size 33243 diff --git a/Source/the_twilight_abyss/BaseItems/InventoryComponent.cpp b/Source/the_twilight_abyss/BaseItems/InventoryComponent.cpp index a208bd0..2c808c8 100644 --- a/Source/the_twilight_abyss/BaseItems/InventoryComponent.cpp +++ b/Source/the_twilight_abyss/BaseItems/InventoryComponent.cpp @@ -40,13 +40,11 @@ bool UInventoryComponent::AddItem(class UBaseItem* BaseItem) BaseItem->StoredItems = this; BaseItem->World = GetWorld(); bool isNewItem = true; - // for every item in inventory for (auto & Item : Items) { //if the item is the same as the item that is being added if (Item->ItemDisplayName.ToString() == BaseItem->ItemDisplayName.ToString()) { - //add the amount of the item that is being added to the item in the inventory Item->StackCount++; UE_LOG(LogTemp, Display, TEXT("ITEM STACKCOUNT: %d"), Item->StackCount); isNewItem = false; diff --git a/Source/the_twilight_abyss/BaseItems/Items/EatableItems.cpp b/Source/the_twilight_abyss/BaseItems/Items/EatableItems.cpp index ceae474..eb3ceaa 100644 --- a/Source/the_twilight_abyss/BaseItems/Items/EatableItems.cpp +++ b/Source/the_twilight_abyss/BaseItems/Items/EatableItems.cpp @@ -22,7 +22,6 @@ void UEatableItems::Use(ATempCharacter* Character) { Character->Health += 10; UE_LOG(LogTemp, Display, TEXT("Healed")); - //delete itself Character->Inventory->RemoveItem(this); } else if (Character->Health >= 100) @@ -37,11 +36,5 @@ void UEatableItems::Use(ATempCharacter* Character) Character->Inventory->RemoveItem(this); } } - - /* - when player uses the item syrengine to debuff enemies - detect what enemie actors the player is fighting with - lower their damage by a value. - */ } diff --git a/Source/the_twilight_abyss/PlayerTemp/TempCharacter.cpp b/Source/the_twilight_abyss/PlayerTemp/TempCharacter.cpp index 42a36fe..039fdd4 100644 --- a/Source/the_twilight_abyss/PlayerTemp/TempCharacter.cpp +++ b/Source/the_twilight_abyss/PlayerTemp/TempCharacter.cpp @@ -33,6 +33,7 @@ void ATempCharacter::BeginPlay() PlayerCapsule = GetCapsuleComponent(); TArray AllActorsInScene; + //MAKE SURE POST PROCESSING IS IN THE SCENE OR GAME WILL CRASH UGameplayStatics::GetAllActorsOfClass(GetWorld(), APostProcessVolume::StaticClass(), AllActorsInScene); PostProcessVolume = Cast(AllActorsInScene[0]); } From 324f062cc7c72728367483a2a27aaa3c4d7d1a8a Mon Sep 17 00:00:00 2001 From: MH261677 Date: Tue, 7 Feb 2023 00:11:00 +0000 Subject: [PATCH 23/30] Updated EatableItems for AmmoFunctionality Added ammo base functionality for using the ammo item in game --- Content/Levels/MerchantPrototype.umap | 4 ++-- Source/the_twilight_abyss/BaseItems/Items/BaseItem.h | 3 +++ .../BaseItems/Items/EatableItems.cpp | 11 +++++++++-- 3 files changed, 14 insertions(+), 4 deletions(-) diff --git a/Content/Levels/MerchantPrototype.umap b/Content/Levels/MerchantPrototype.umap index b26f4c0..e1f4942 100644 --- a/Content/Levels/MerchantPrototype.umap +++ b/Content/Levels/MerchantPrototype.umap @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:a85cec4d3024ec9a40e0fd888530e7982d06461cf90dca88004eae911b6a8431 -size 33243 +oid sha256:c5cc473e60c24da835baacec54217c1f6c675c42c29643b889f07bff057a9c95 +size 34830 diff --git a/Source/the_twilight_abyss/BaseItems/Items/BaseItem.h b/Source/the_twilight_abyss/BaseItems/Items/BaseItem.h index 346966f..4ff62dd 100644 --- a/Source/the_twilight_abyss/BaseItems/Items/BaseItem.h +++ b/Source/the_twilight_abyss/BaseItems/Items/BaseItem.h @@ -53,6 +53,9 @@ public: UPROPERTY(EditAnywhere, Category = "Item") bool isDamageBuffItem; + UPROPERTY(EditAnywhere, Category = "Item") + bool isAmmoItemType; + UPROPERTY(EditAnywhere, BlueprintReadWrite, Category = "Item") int32 StackCount = 1; diff --git a/Source/the_twilight_abyss/BaseItems/Items/EatableItems.cpp b/Source/the_twilight_abyss/BaseItems/Items/EatableItems.cpp index eb3ceaa..dab88bc 100644 --- a/Source/the_twilight_abyss/BaseItems/Items/EatableItems.cpp +++ b/Source/the_twilight_abyss/BaseItems/Items/EatableItems.cpp @@ -16,7 +16,7 @@ void UEatableItems::Use(ATempCharacter* Character) { if(Character) { - if(isHealingItem == true) + if(isHealingItem) { if (Character->Health < 100) { @@ -29,12 +29,19 @@ void UEatableItems::Use(ATempCharacter* Character) UE_LOG(LogTemp, Display, TEXT("Health is full")); } } - if(isDamageBuffItem == true) + + if(isDamageBuffItem) { // need to add the damage buff functionality here UE_LOG(LogTemp, Display, TEXT("Damage Buffed")); Character->Inventory->RemoveItem(this); } + + if (isAmmoItemType) + { + UE_LOG(LogTemp, Display, TEXT("ADD AMMO FUNCTIONALITY HERE")); + Character->Inventory->RemoveItem(this); + } } } From a6436c9110bca13e1edb22ce296586505e63063e Mon Sep 17 00:00:00 2001 From: MH261677 Date: Tue, 7 Feb 2023 00:11:19 +0000 Subject: [PATCH 24/30] Added BP_AmmoItem Added Ammo into the game for the player to find --- Content/Blueprints/Items/AmmoItem.uasset | 3 +++ Content/Blueprints/Items/ItemsInWorld/BP_AmmoItem.uasset | 3 +++ 2 files changed, 6 insertions(+) create mode 100644 Content/Blueprints/Items/AmmoItem.uasset create mode 100644 Content/Blueprints/Items/ItemsInWorld/BP_AmmoItem.uasset diff --git a/Content/Blueprints/Items/AmmoItem.uasset b/Content/Blueprints/Items/AmmoItem.uasset new file mode 100644 index 0000000..9991ade --- /dev/null +++ b/Content/Blueprints/Items/AmmoItem.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:4d7e4e608a5183142630757d1496d08c76ac9cdcb16b039c3b2e51848ab89d9d +size 6552 diff --git a/Content/Blueprints/Items/ItemsInWorld/BP_AmmoItem.uasset b/Content/Blueprints/Items/ItemsInWorld/BP_AmmoItem.uasset new file mode 100644 index 0000000..fa2720b --- /dev/null +++ b/Content/Blueprints/Items/ItemsInWorld/BP_AmmoItem.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:733e8e625dc0b5a4b8e64f50ccda5397cdeb71aa75470f42b44a4c2606730875 +size 31844 From 77c43ab3d1f4eeb8148d634b5022aae0d80e0cfa Mon Sep 17 00:00:00 2001 From: MARCEL HARA Date: Thu, 16 Feb 2023 15:02:58 +0000 Subject: [PATCH 25/30] Updated TempCharacter to find AI Sphere --- Content/Blueprints/Combat_UI/CombatCharacter.uasset | 4 ++-- Content/Blueprints/Player/BP_MyTempCharacter.uasset | 4 ++-- Content/Levels/Top_layer_level.umap | 4 ++-- Source/the_twilight_abyss/PlayerTemp/TempCharacter.cpp | 2 ++ Source/the_twilight_abyss/PlayerTemp/TempCharacter.h | 5 +++++ 5 files changed, 13 insertions(+), 6 deletions(-) diff --git a/Content/Blueprints/Combat_UI/CombatCharacter.uasset b/Content/Blueprints/Combat_UI/CombatCharacter.uasset index 8d884e7..6078475 100644 --- a/Content/Blueprints/Combat_UI/CombatCharacter.uasset +++ b/Content/Blueprints/Combat_UI/CombatCharacter.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:d41dd0f4c13a2823d7cda168b1109dfa219681d8f7fda30c966830823dc227a6 -size 71310 +oid sha256:53c111471c3a161fb4ed5408ebeac5cfca08d224652308dbb07cac6d7b829d6b +size 76303 diff --git a/Content/Blueprints/Player/BP_MyTempCharacter.uasset b/Content/Blueprints/Player/BP_MyTempCharacter.uasset index 21e9727..26ace7f 100644 --- a/Content/Blueprints/Player/BP_MyTempCharacter.uasset +++ b/Content/Blueprints/Player/BP_MyTempCharacter.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:9f65775451fb2105a879b7ceed94887ea520b41464c773052234285414565157 -size 54763 +oid sha256:8cbb4fe454e40e00845b7b268c15000891cfc86bf0afba299b127f6634fc5edc +size 55495 diff --git a/Content/Levels/Top_layer_level.umap b/Content/Levels/Top_layer_level.umap index a338efc..b2c1483 100644 --- a/Content/Levels/Top_layer_level.umap +++ b/Content/Levels/Top_layer_level.umap @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:b12ca45d23f48747799c368c38e00f316adb025ea913272a4a36b69ec4b30fa3 -size 247139 +oid sha256:255a45f7e3d4362cc3378dd7a9858608bc92e2b4aa43fbe22db8e72eaa11e126 +size 247199 diff --git a/Source/the_twilight_abyss/PlayerTemp/TempCharacter.cpp b/Source/the_twilight_abyss/PlayerTemp/TempCharacter.cpp index 039fdd4..661de57 100644 --- a/Source/the_twilight_abyss/PlayerTemp/TempCharacter.cpp +++ b/Source/the_twilight_abyss/PlayerTemp/TempCharacter.cpp @@ -36,6 +36,8 @@ void ATempCharacter::BeginPlay() //MAKE SURE POST PROCESSING IS IN THE SCENE OR GAME WILL CRASH UGameplayStatics::GetAllActorsOfClass(GetWorld(), APostProcessVolume::StaticClass(), AllActorsInScene); PostProcessVolume = Cast(AllActorsInScene[0]); + + UGameplayStatics::GetAllActorsWithTag(GetWorld(), Enemy, AIActors); } //Binds the input we made in the setup player component to the forward vector diff --git a/Source/the_twilight_abyss/PlayerTemp/TempCharacter.h b/Source/the_twilight_abyss/PlayerTemp/TempCharacter.h index f162b7f..4c6c866 100644 --- a/Source/the_twilight_abyss/PlayerTemp/TempCharacter.h +++ b/Source/the_twilight_abyss/PlayerTemp/TempCharacter.h @@ -89,4 +89,9 @@ public: bool disableTab = false; APostProcessVolume* PostProcessVolume; + + TArray AIActors; + + FName Enemy; + }; From 43ef8e2110506dfa5c65082dfa3584dbc71d71cb Mon Sep 17 00:00:00 2001 From: MH261677 Date: Fri, 17 Feb 2023 13:12:28 +0000 Subject: [PATCH 26/30] Updated TempCharacter to sneak functionality Added sneak functionality which makes the sphere radius smaller near enemies. --- Config/DefaultEngine.ini | 12 +++++++ Content/Levels/Top_layer_level.umap | 2 +- .../PlayerTemp/TempCharacter.cpp | 32 ++++++++++++------- .../PlayerTemp/TempCharacter.h | 1 - 4 files changed, 34 insertions(+), 13 deletions(-) diff --git a/Config/DefaultEngine.ini b/Config/DefaultEngine.ini index b792816..f3f6b2f 100644 --- a/Config/DefaultEngine.ini +++ b/Config/DefaultEngine.ini @@ -128,3 +128,15 @@ CompressionQualityModifier=1.000000 AutoStreamingThreshold=0.000000 SoundCueCookQualityIndex=-1 +[/Script/GameplayDebugger.GameplayDebuggerConfig] +CategorySlot1=One +CategorySlot2=Two +CategorySlot3=Three +CategorySlot4=Four +CategorySlot5=Five +CategorySlot6=Six +CategorySlot7=Seven +CategorySlot8=Eight +CategorySlot9=Nine +CategorySlot0=Zero + diff --git a/Content/Levels/Top_layer_level.umap b/Content/Levels/Top_layer_level.umap index b2c1483..a836a5f 100644 --- a/Content/Levels/Top_layer_level.umap +++ b/Content/Levels/Top_layer_level.umap @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:255a45f7e3d4362cc3378dd7a9858608bc92e2b4aa43fbe22db8e72eaa11e126 +oid sha256:483069f41683db60a67e1b2417c5f3cd17005922d2a67500997ebbc20cb3cbba size 247199 diff --git a/Source/the_twilight_abyss/PlayerTemp/TempCharacter.cpp b/Source/the_twilight_abyss/PlayerTemp/TempCharacter.cpp index 661de57..6a7ace7 100644 --- a/Source/the_twilight_abyss/PlayerTemp/TempCharacter.cpp +++ b/Source/the_twilight_abyss/PlayerTemp/TempCharacter.cpp @@ -5,10 +5,11 @@ #include "Blueprint/UserWidget.h" #include "the_twilight_abyss/BaseItems/InventoryComponent.h" #include "the_twilight_abyss/BaseItems/Items/BaseItem.h" -#include "Components/CapsuleComponent.h" #include "GameFramework/CharacterMovementComponent.h" #include "the_twilight_abyss/MerchantInteraction/Interaction.h" #include +#include "Components/SphereComponent.h" +#include "Kismet/KismetMathLibrary.h" // CONSTRUCTOR @@ -37,6 +38,7 @@ void ATempCharacter::BeginPlay() UGameplayStatics::GetAllActorsOfClass(GetWorld(), APostProcessVolume::StaticClass(), AllActorsInScene); PostProcessVolume = Cast(AllActorsInScene[0]); + Enemy = TEXT("Enemy"); UGameplayStatics::GetAllActorsWithTag(GetWorld(), Enemy, AIActors); } @@ -58,10 +60,26 @@ void ATempCharacter::Sneak() { UnCrouch(); PostProcessVolume->Settings.VignetteIntensity = 0.0f; + for (AActor* Actor : AIActors) + { + USphereComponent* SphereComponent = Actor->FindComponentByClass(); + if (SphereComponent != nullptr) + { + SphereComponent->SetSphereRadius(40.0f); //default value + } + } } else { Crouch(); + for (AActor* Actor : AIActors) + { + USphereComponent* SphereComponent = Actor->FindComponentByClass(); + if (SphereComponent != nullptr) + { + SphereComponent->SetSphereRadius(15.0f); + } + } PostProcessVolume->Settings.VignetteIntensity = 0.8f; } @@ -185,11 +203,7 @@ void ATempCharacter::InputDisabler() PlayerController->bShowMouseCursor = true; disableTab = true; - if (ThisCamera == nullptr) - { - return; - } - else + if (ThisCamera != nullptr) { OriginalCameraLocation = ThisCamera->GetComponentLocation(); OriginalCameraRotation = ThisCamera->GetComponentRotation(); @@ -213,11 +227,7 @@ void ATempCharacter::InputEnabler() UE_LOG(LogTemp, Display, TEXT("Enabling Inputs")); disableTab = true; TraceDistance = 300; - if (ThisCamera == nullptr) - { - return; - } - else + if (ThisCamera != nullptr) { ThisCamera->SetWorldLocation(OriginalCameraLocation); ThisCamera->SetWorldRotation(OriginalCameraRotation); diff --git a/Source/the_twilight_abyss/PlayerTemp/TempCharacter.h b/Source/the_twilight_abyss/PlayerTemp/TempCharacter.h index 4c6c866..44ba91e 100644 --- a/Source/the_twilight_abyss/PlayerTemp/TempCharacter.h +++ b/Source/the_twilight_abyss/PlayerTemp/TempCharacter.h @@ -6,7 +6,6 @@ #include "GameFramework/Character.h" #include "the_twilight_abyss/BaseItems/Items/BaseItem.h" #include "Camera/CameraComponent.h" -#include "Kismet/KismetMathLibrary.h" #include "Engine/PostProcessVolume.h" #include "TempCharacter.generated.h" From 3c2d0579515402632b344f15b5b16f9dd070b2b0 Mon Sep 17 00:00:00 2001 From: MH261677 Date: Sun, 19 Feb 2023 15:28:34 +0000 Subject: [PATCH 27/30] Updated TempCharacter to destory ammo ore destroys ammo ore when the player presses e on it --- Source/the_twilight_abyss/PlayerTemp/TempCharacter.cpp | 6 ++++++ Source/the_twilight_abyss/PlayerTemp/TempCharacter.h | 2 ++ 2 files changed, 8 insertions(+) diff --git a/Source/the_twilight_abyss/PlayerTemp/TempCharacter.cpp b/Source/the_twilight_abyss/PlayerTemp/TempCharacter.cpp index 6a7ace7..6710218 100644 --- a/Source/the_twilight_abyss/PlayerTemp/TempCharacter.cpp +++ b/Source/the_twilight_abyss/PlayerTemp/TempCharacter.cpp @@ -40,6 +40,8 @@ void ATempCharacter::BeginPlay() Enemy = TEXT("Enemy"); UGameplayStatics::GetAllActorsWithTag(GetWorld(), Enemy, AIActors); + + Ammo = TEXT("Ammo"); } //Binds the input we made in the setup player component to the forward vector @@ -150,6 +152,10 @@ void ATempCharacter::LineTraceLogic() { UE_LOG(LogTemp, Display, TEXT("Not Enough Gold")); } + if(OutHit.GetActor()->ActorHasTag(Ammo)) + { + OutHit.GetActor()->Destroy(); + } } // if the actor hit has the interaction component/script then it will activate the code diff --git a/Source/the_twilight_abyss/PlayerTemp/TempCharacter.h b/Source/the_twilight_abyss/PlayerTemp/TempCharacter.h index 44ba91e..57675b2 100644 --- a/Source/the_twilight_abyss/PlayerTemp/TempCharacter.h +++ b/Source/the_twilight_abyss/PlayerTemp/TempCharacter.h @@ -93,4 +93,6 @@ public: FName Enemy; + FName Ammo; + }; From 618a9509cabf01f97be0b9108653ef5b9bab86d8 Mon Sep 17 00:00:00 2001 From: MH261677 Date: Sun, 19 Feb 2023 15:29:16 +0000 Subject: [PATCH 28/30] Updated EatableItems to add ammo {UNSTABLE} Added functionality to the ammo count currently unstable as need to wait for other programmer to understand why it crashes. --- Content/Blueprints/Player/BP_MyTempCharacter.uasset | 4 ++-- Content/Levels/Top_layer_level.umap | 4 ++-- .../the_twilight_abyss/BaseItems/Items/EatableItems.cpp | 9 ++++++++- Source/the_twilight_abyss/BaseItems/Items/EatableItems.h | 6 ++++++ 4 files changed, 18 insertions(+), 5 deletions(-) diff --git a/Content/Blueprints/Player/BP_MyTempCharacter.uasset b/Content/Blueprints/Player/BP_MyTempCharacter.uasset index 26ace7f..b161173 100644 --- a/Content/Blueprints/Player/BP_MyTempCharacter.uasset +++ b/Content/Blueprints/Player/BP_MyTempCharacter.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:8cbb4fe454e40e00845b7b268c15000891cfc86bf0afba299b127f6634fc5edc -size 55495 +oid sha256:8e348a27c5a931226dba531ec739fec1e28b9f912e91b46078ed811fe50f06bd +size 54956 diff --git a/Content/Levels/Top_layer_level.umap b/Content/Levels/Top_layer_level.umap index a836a5f..dbb4467 100644 --- a/Content/Levels/Top_layer_level.umap +++ b/Content/Levels/Top_layer_level.umap @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:483069f41683db60a67e1b2417c5f3cd17005922d2a67500997ebbc20cb3cbba -size 247199 +oid sha256:3ddfcf9a4f7c3b3ab626893a0d6d13cac4483f9a471bbdba97d0d00efc563dd7 +size 248803 diff --git a/Source/the_twilight_abyss/BaseItems/Items/EatableItems.cpp b/Source/the_twilight_abyss/BaseItems/Items/EatableItems.cpp index dab88bc..94a308e 100644 --- a/Source/the_twilight_abyss/BaseItems/Items/EatableItems.cpp +++ b/Source/the_twilight_abyss/BaseItems/Items/EatableItems.cpp @@ -39,7 +39,14 @@ void UEatableItems::Use(ATempCharacter* Character) if (isAmmoItemType) { - UE_LOG(LogTemp, Display, TEXT("ADD AMMO FUNCTIONALITY HERE")); + if (TurnBaseCombat->IronResource > 10) + { + TurnBaseCombat->IronResource += 5; + } + if (TurnBaseCombat->SulfurResource > 10) + { + TurnBaseCombat->SulfurResource += 5; + } Character->Inventory->RemoveItem(this); } } diff --git a/Source/the_twilight_abyss/BaseItems/Items/EatableItems.h b/Source/the_twilight_abyss/BaseItems/Items/EatableItems.h index d636bcd..dadfc27 100644 --- a/Source/the_twilight_abyss/BaseItems/Items/EatableItems.h +++ b/Source/the_twilight_abyss/BaseItems/Items/EatableItems.h @@ -4,6 +4,7 @@ #include "CoreMinimal.h" #include "BaseItem.h" +#include "the_twilight_abyss/TurnBasedCombatV2/TurnBaseCombatV2.h" #include "EatableItems.generated.h" /** @@ -19,4 +20,9 @@ class THE_TWILIGHT_ABYSS_API UEatableItems : public UBaseItem protected: virtual void Use(class ATempCharacter* Character) override; + + +private: + + ATurnBaseCombatV2* TurnBaseCombat; }; From e9af8b713fa2964169d0e68835d273ca4d3411e0 Mon Sep 17 00:00:00 2001 From: MARCEL HARA Date: Mon, 20 Feb 2023 14:49:05 +0000 Subject: [PATCH 29/30] Updated EatableItems to fix Ammo Consuming Fixed ammo consuming crashing the client --- Source/the_twilight_abyss/BaseItems/Items/BaseItem.cpp | 1 + Source/the_twilight_abyss/BaseItems/Items/BaseItem.h | 1 + Source/the_twilight_abyss/BaseItems/Items/EatableItems.cpp | 1 + 3 files changed, 3 insertions(+) diff --git a/Source/the_twilight_abyss/BaseItems/Items/BaseItem.cpp b/Source/the_twilight_abyss/BaseItems/Items/BaseItem.cpp index 2fac2d1..40ea61b 100644 --- a/Source/the_twilight_abyss/BaseItems/Items/BaseItem.cpp +++ b/Source/the_twilight_abyss/BaseItems/Items/BaseItem.cpp @@ -14,3 +14,4 @@ void UBaseItem::Use(ATempCharacter* Character) { } + diff --git a/Source/the_twilight_abyss/BaseItems/Items/BaseItem.h b/Source/the_twilight_abyss/BaseItems/Items/BaseItem.h index 4ff62dd..613c763 100644 --- a/Source/the_twilight_abyss/BaseItems/Items/BaseItem.h +++ b/Source/the_twilight_abyss/BaseItems/Items/BaseItem.h @@ -72,4 +72,5 @@ public: //This is the same as the use item class but its in BP instead UFUNCTION(BlueprintImplementableEvent) void OnUse(class ATempCharacter* Character); + }; diff --git a/Source/the_twilight_abyss/BaseItems/Items/EatableItems.cpp b/Source/the_twilight_abyss/BaseItems/Items/EatableItems.cpp index 94a308e..c481d7b 100644 --- a/Source/the_twilight_abyss/BaseItems/Items/EatableItems.cpp +++ b/Source/the_twilight_abyss/BaseItems/Items/EatableItems.cpp @@ -39,6 +39,7 @@ void UEatableItems::Use(ATempCharacter* Character) if (isAmmoItemType) { + TurnBaseCombat = GetWorld()->GetGameState(); if (TurnBaseCombat->IronResource > 10) { TurnBaseCombat->IronResource += 5; From 5e448c897d20c5d8465d9d73c26a269fb7693aa6 Mon Sep 17 00:00:00 2001 From: MARCEL HARA Date: Mon, 20 Feb 2023 16:03:25 +0000 Subject: [PATCH 30/30] Updated Widgets to fix scaling issue Fixed scaling issue on all widgets to fit all monitor types --- Content/Blueprints/Inventory_UI/WBP_ItemDisplay.uasset | 4 ++-- Content/Blueprints/Inventory_UI/WBP_PlayerInventory.uasset | 4 ++-- Content/Blueprints/Merchant/Merchant_UI/BP_OPENDIAL.uasset | 4 ++-- .../Blueprints/Merchant/Merchant_UI/BP_ShopSelector.uasset | 4 ++-- Content/Blueprints/Merchant/Merchant_UI/WBP_BuyBuff.uasset | 4 ++-- Content/Blueprints/Merchant/Merchant_UI/WBP_BuyHealing.uasset | 4 ++-- 6 files changed, 12 insertions(+), 12 deletions(-) diff --git a/Content/Blueprints/Inventory_UI/WBP_ItemDisplay.uasset b/Content/Blueprints/Inventory_UI/WBP_ItemDisplay.uasset index 708a5d3..ccfcb16 100644 --- a/Content/Blueprints/Inventory_UI/WBP_ItemDisplay.uasset +++ b/Content/Blueprints/Inventory_UI/WBP_ItemDisplay.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:1d2dacba46200972bd3ed39b2e006c6f815eed957e4cb57009fd850d3565dd6f -size 99076 +oid sha256:3d9a901fca1810f64a4b9a9db9287ad7a5bc3f1567e7d778c72d94d0cf2e45ff +size 100059 diff --git a/Content/Blueprints/Inventory_UI/WBP_PlayerInventory.uasset b/Content/Blueprints/Inventory_UI/WBP_PlayerInventory.uasset index 138ec00..984f8e0 100644 --- a/Content/Blueprints/Inventory_UI/WBP_PlayerInventory.uasset +++ b/Content/Blueprints/Inventory_UI/WBP_PlayerInventory.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:6077e113d99db0e0e7e66e52dc856fe1cf0473f23377f7d00f4e9ca187069ee1 -size 111320 +oid sha256:3940f6af26ff8d95d3e97b80d27b253544786ead926e582015eb17fb8da42daf +size 111618 diff --git a/Content/Blueprints/Merchant/Merchant_UI/BP_OPENDIAL.uasset b/Content/Blueprints/Merchant/Merchant_UI/BP_OPENDIAL.uasset index 239df23..def3d97 100644 --- a/Content/Blueprints/Merchant/Merchant_UI/BP_OPENDIAL.uasset +++ b/Content/Blueprints/Merchant/Merchant_UI/BP_OPENDIAL.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:dd57bdf81793aa6f3b76784e3be306fef5ca81c5e2fa7065a29abadd420c4e0b -size 75420 +oid sha256:ea25a76832a591caa677a97dfac6c30e410974dd3c705d8923f3eea49dd79699 +size 74712 diff --git a/Content/Blueprints/Merchant/Merchant_UI/BP_ShopSelector.uasset b/Content/Blueprints/Merchant/Merchant_UI/BP_ShopSelector.uasset index 0c1f862..66e45ff 100644 --- a/Content/Blueprints/Merchant/Merchant_UI/BP_ShopSelector.uasset +++ b/Content/Blueprints/Merchant/Merchant_UI/BP_ShopSelector.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:0fe126443f981aa1875e8efe299d76c4f0f570aff93f9313cc9503bb811365a5 -size 51324 +oid sha256:c2ca75bf7097c26b9d40760320303c440a1559518901fd42ca6f384fbff6ea2a +size 52542 diff --git a/Content/Blueprints/Merchant/Merchant_UI/WBP_BuyBuff.uasset b/Content/Blueprints/Merchant/Merchant_UI/WBP_BuyBuff.uasset index 7eecebb..a711020 100644 --- a/Content/Blueprints/Merchant/Merchant_UI/WBP_BuyBuff.uasset +++ b/Content/Blueprints/Merchant/Merchant_UI/WBP_BuyBuff.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:abe53946825159c2220acd237c3cc7360478b63836d52e3cbe000876e43eb5d5 -size 63822 +oid sha256:f02d6f1b555bbb983a74a2a4534e22e262373f525b0f96234c48aa8a77c11f68 +size 64594 diff --git a/Content/Blueprints/Merchant/Merchant_UI/WBP_BuyHealing.uasset b/Content/Blueprints/Merchant/Merchant_UI/WBP_BuyHealing.uasset index 8e7650a..cb3480f 100644 --- a/Content/Blueprints/Merchant/Merchant_UI/WBP_BuyHealing.uasset +++ b/Content/Blueprints/Merchant/Merchant_UI/WBP_BuyHealing.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:936f77df55a4f4c1baca361f8ca9384f1af821ab6c0e8c9b016a3ede25c9f8d1 -size 63821 +oid sha256:d21c0fb7a79d5390327eb841a5f67304a2ee6b13b68f3faa0c75ed276b1bf2f5 +size 64844