From 3aca076981bec945bf57f08e90d8085d76ee16cd Mon Sep 17 00:00:00 2001 From: PHILIP White Date: Fri, 12 May 2023 13:08:00 +0100 Subject: [PATCH] Updated Sisters Quest & Wrapped Text on Selections --- Content/Assets/Characters/Merchant/AMerchant.uasset | 4 ++-- Content/Blueprints/Quests/Quest_SistersPendant.uasset | 4 ++-- Content/Dialogue/SM_Merchant_Blueprint.uasset | 4 ++-- Content/Dialogue/TextPrompt.uasset | 4 ++-- Source/the_twilight_abyss/Dialogue/DialogueNPC.cpp | 2 +- .../the_twilight_abyss/MerchantInteraction/Interaction.cpp | 7 +++---- 6 files changed, 12 insertions(+), 13 deletions(-) diff --git a/Content/Assets/Characters/Merchant/AMerchant.uasset b/Content/Assets/Characters/Merchant/AMerchant.uasset index 9a36ca4..270809b 100644 --- a/Content/Assets/Characters/Merchant/AMerchant.uasset +++ b/Content/Assets/Characters/Merchant/AMerchant.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:89570e03c33a6f45c4bb9e5304c526929035264d67e03f44e13548e06aee4392 -size 131048 +oid sha256:2c2a7a3a7840c1af4218d510e1c2130299598d16f5a728f1e3a0a49fd580a879 +size 154699 diff --git a/Content/Blueprints/Quests/Quest_SistersPendant.uasset b/Content/Blueprints/Quests/Quest_SistersPendant.uasset index f2c5d50..7bc91d3 100644 --- a/Content/Blueprints/Quests/Quest_SistersPendant.uasset +++ b/Content/Blueprints/Quests/Quest_SistersPendant.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:721b604f0a5c80f562cb7a86636e8a36898a580c3c8bb7ebc39104a41159c2fe -size 6976 +oid sha256:50ba273939fb143e26b621f996bc0699a4402b1744733af7fca9b3fba6a7952a +size 7366 diff --git a/Content/Dialogue/SM_Merchant_Blueprint.uasset b/Content/Dialogue/SM_Merchant_Blueprint.uasset index b4fd246..df21704 100644 --- a/Content/Dialogue/SM_Merchant_Blueprint.uasset +++ b/Content/Dialogue/SM_Merchant_Blueprint.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:3b6be7b129b9972ac16f78d74e1f4ef2d78b51ef35d5c8db7bb074f7d855ddcb -size 138852 +oid sha256:a9d0bee94712b58cd1bb70fedf013d226a7f6f1cb4d383ceff8fb24210e7a20f +size 144157 diff --git a/Content/Dialogue/TextPrompt.uasset b/Content/Dialogue/TextPrompt.uasset index 8ec7355..1f42113 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:9edb55ee6a2bdfd64c0e209421e750e840a4b71146cc49409e7e4a774160dbb0 -size 60170 +oid sha256:83692ece4e17e312f60d0a66835228abf5be0489fb60c3d2821e6f4c3e1519f1 +size 60587 diff --git a/Source/the_twilight_abyss/Dialogue/DialogueNPC.cpp b/Source/the_twilight_abyss/Dialogue/DialogueNPC.cpp index 4004a22..88fcbe3 100644 --- a/Source/the_twilight_abyss/Dialogue/DialogueNPC.cpp +++ b/Source/the_twilight_abyss/Dialogue/DialogueNPC.cpp @@ -96,7 +96,7 @@ void UDialogueNPC::NextDialogue() GetWorld()->GetTimerManager().PauseTimer(TextAnimationTimerHandle); DialogueText->SetText(FText::FromString("")); Choice1Button->SetVisibility(ESlateVisibility::Visible); - Choice2Button->SetVisibility(ESlateVisibility::Visible); + if (Choice2Text->GetText().ToString() != "") Choice2Button->SetVisibility(ESlateVisibility::Visible); if (Choice3Text->GetText().ToString() != "") Choice3Button->SetVisibility(ESlateVisibility::Visible); NextArrow->SetVisibility(ESlateVisibility::Hidden); return; diff --git a/Source/the_twilight_abyss/MerchantInteraction/Interaction.cpp b/Source/the_twilight_abyss/MerchantInteraction/Interaction.cpp index 2ce2fdd..48c4db6 100644 --- a/Source/the_twilight_abyss/MerchantInteraction/Interaction.cpp +++ b/Source/the_twilight_abyss/MerchantInteraction/Interaction.cpp @@ -24,10 +24,6 @@ AInteraction::AInteraction() void AInteraction::BeginPlay() { Super::BeginPlay(); - - //Character & Camera refs - TempCharacterRef = Cast(GetWorld()->GetFirstPlayerController()->GetCharacter()); - MainCamera = Cast(TempCharacterRef->FindComponentByClass()); //Item refs TargetHealingLocation = HealingItem->GetActorLocation(); @@ -91,6 +87,9 @@ void AInteraction::OnInteract() void AInteraction::RemoveWidget() { + //Character & Camera refs + TempCharacterRef = Cast(GetWorld()->GetFirstPlayerController()->GetCharacter()); + MainCamera = Cast(TempCharacterRef->FindComponentByClass()); bDisableShopDialMove = true; bisDisabled = true; //Setting ShopWidgetText back to hidden