From 3b828bb01c0411293f0133b86f115610142ce9a1 Mon Sep 17 00:00:00 2001 From: PHILIP White Date: Sun, 14 May 2023 23:02:09 +0100 Subject: [PATCH] Updated Quests for Final Kill Boss Quest --- Content/Assets/Characters/Merchant/AMerchant.uasset | 4 ++-- Content/Blueprints/Combat_UI/CombatCharacter.uasset | 4 ++-- Content/Blueprints/Combat_UI/EndDialogue.uasset | 4 ++-- Content/Blueprints/Quests/Quest_FinalMain.uasset | 4 ++-- Content/Blueprints/Quests/Quest_SistersPendant.uasset | 4 ++-- .../Blueprints/Quests/Quest_SistersPendant_PT2.uasset | 2 +- Content/Blueprints/Quests/Quest_Start.uasset | 4 ++-- Content/Blueprints/Quests/Quest_Start2.uasset | 4 ++-- Content/Dialogue/SM_Merchant_Blueprint.uasset | 4 ++-- Content/Levels/Build.umap | 4 ++-- Content/Levels/Testing/BreakableWall_BP_ExitCave.uasset | 4 ++-- Source/the_twilight_abyss/Dialogue/DialogueNPC.cpp | 9 ++++++--- Source/the_twilight_abyss/Dialogue/DialogueNPC.h | 7 +++++++ 13 files changed, 34 insertions(+), 24 deletions(-) diff --git a/Content/Assets/Characters/Merchant/AMerchant.uasset b/Content/Assets/Characters/Merchant/AMerchant.uasset index e7bc7d6..c8f8712 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:3a24304aaa446692e9c99114edceda2403c1ab4a294545ea333261b40b593fa1 -size 155770 +oid sha256:efbb0d8ac773c7e350f029a8d24f16b1f1ef60a91dbb8660189b4d5272c5703a +size 276767 diff --git a/Content/Blueprints/Combat_UI/CombatCharacter.uasset b/Content/Blueprints/Combat_UI/CombatCharacter.uasset index f310dc9..14e6fa7 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:75136eb19720b88bc667c69b68b0c1fc66fff84265e73d5a3d4ee17755a4f316 -size 192830 +oid sha256:c7e21246247a3ff02bff6b17bb1100a48f3448e3ad78b61f74d54dbbe7209c71 +size 191975 diff --git a/Content/Blueprints/Combat_UI/EndDialogue.uasset b/Content/Blueprints/Combat_UI/EndDialogue.uasset index 7d02b14..3f0635f 100644 --- a/Content/Blueprints/Combat_UI/EndDialogue.uasset +++ b/Content/Blueprints/Combat_UI/EndDialogue.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:ea690f35f2dd2c6cf001cfb103b739005ba417c2e1abb5224cdfcb1c599451fa -size 88099 +oid sha256:794001ef65e04e86c87006dcb751dd317cfd4c5c0adc4334fb1e3bf71c59def7 +size 89667 diff --git a/Content/Blueprints/Quests/Quest_FinalMain.uasset b/Content/Blueprints/Quests/Quest_FinalMain.uasset index d54db42..576781c 100644 --- a/Content/Blueprints/Quests/Quest_FinalMain.uasset +++ b/Content/Blueprints/Quests/Quest_FinalMain.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:412926346ea2d7508a4a0c169a69db4dd50d78caff6d5db37d797b9e9ee8d5f4 -size 6301 +oid sha256:b60abe890dc6e3314939d004b5d53227cff2003547881ca391189d28d68f8494 +size 6299 diff --git a/Content/Blueprints/Quests/Quest_SistersPendant.uasset b/Content/Blueprints/Quests/Quest_SistersPendant.uasset index acda857..d488a3a 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:4da04e45cd20a8f9d8176fc4547b11803d8d54bc26e7fe42060879d71d5b2839 -size 7300 +oid sha256:38a05202e8a33b9abc6eece4fd720ae8000cab2c09b378469574bd27ebe8af1e +size 7392 diff --git a/Content/Blueprints/Quests/Quest_SistersPendant_PT2.uasset b/Content/Blueprints/Quests/Quest_SistersPendant_PT2.uasset index a0b3aa5..3848a65 100644 --- a/Content/Blueprints/Quests/Quest_SistersPendant_PT2.uasset +++ b/Content/Blueprints/Quests/Quest_SistersPendant_PT2.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:5ab79e1a4414d42f9ca3a631cffff02a4d7a56525da555e7142e0240ce9ba58d +oid sha256:7ea9c6f8e8e054d197c737f634b1423ed387bac88ba3730cffa1361d8e6f0341 size 7395 diff --git a/Content/Blueprints/Quests/Quest_Start.uasset b/Content/Blueprints/Quests/Quest_Start.uasset index 86cfe37..9103b84 100644 --- a/Content/Blueprints/Quests/Quest_Start.uasset +++ b/Content/Blueprints/Quests/Quest_Start.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:597f8ac76c6720bb6a248bd054bbbf140195ecc35de39f84362006ca4329f4b9 -size 7455 +oid sha256:7ec5cbcd30def97b1471f3c83d6391ba2cdec09dfec6cdd904e12348713d3656 +size 7456 diff --git a/Content/Blueprints/Quests/Quest_Start2.uasset b/Content/Blueprints/Quests/Quest_Start2.uasset index d724049..f378f45 100644 --- a/Content/Blueprints/Quests/Quest_Start2.uasset +++ b/Content/Blueprints/Quests/Quest_Start2.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:95fd9444e554dc7ed27472cf595b68a774227853de50f20253e1edfb3008962b -size 7511 +oid sha256:68a56ef600791658b4d97f57f47282f5bd734b42e8e6830771b26cb470c5eb87 +size 6897 diff --git a/Content/Dialogue/SM_Merchant_Blueprint.uasset b/Content/Dialogue/SM_Merchant_Blueprint.uasset index 3fb5e99..ba4fb19 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:dff96e794bd30d333b6dece4456a7c4f168065d9371dea743edfe5530400a6f3 -size 174321 +oid sha256:dc9c565610d98d5feccf5c41152ea0bb6d6c897e7538d6f2be3ffda0e64f01fa +size 172314 diff --git a/Content/Levels/Build.umap b/Content/Levels/Build.umap index e3bb457..4b20db4 100644 --- a/Content/Levels/Build.umap +++ b/Content/Levels/Build.umap @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:b8403d04a39658a90f3b06e34ebc485c9caf2881800254974b3f35fd1a73aca5 -size 5553099 +oid sha256:fa6950486e53ea9fd8bd87bb961eb25d243737473f9f2bb584a1defd71a94fd9 +size 5555954 diff --git a/Content/Levels/Testing/BreakableWall_BP_ExitCave.uasset b/Content/Levels/Testing/BreakableWall_BP_ExitCave.uasset index 2d3a5ac..e34fc86 100644 --- a/Content/Levels/Testing/BreakableWall_BP_ExitCave.uasset +++ b/Content/Levels/Testing/BreakableWall_BP_ExitCave.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:45c231dbe52f8900e3c4942ee373fdd6629fc449f57ec2e4058cea59aa20f7f6 -size 91804 +oid sha256:14d3c9656b1c046637fbad46f011e8c539d4cf32a1c5236469142cdad664fd01 +size 91170 diff --git a/Source/the_twilight_abyss/Dialogue/DialogueNPC.cpp b/Source/the_twilight_abyss/Dialogue/DialogueNPC.cpp index e3c41eb..ba2fae6 100644 --- a/Source/the_twilight_abyss/Dialogue/DialogueNPC.cpp +++ b/Source/the_twilight_abyss/Dialogue/DialogueNPC.cpp @@ -95,6 +95,9 @@ void UDialogueNPC::NextDialogue() } GetWorld()->GetTimerManager().PauseTimer(TextAnimationTimerHandle); DialogueText->SetText(FText::FromString("")); + Choice1Text->SetText(CurrentDialoguePath->ChoiceText1); + Choice2Text->SetText(CurrentDialoguePath->ChoiceText2); + Choice3Text->SetText(CurrentDialoguePath->ChoiceText3); Choice1Button->SetVisibility(ESlateVisibility::Visible); if (Choice2Text->GetText().ToString() != "") Choice2Button->SetVisibility(ESlateVisibility::Visible); if (Choice3Text->GetText().ToString() != "") Choice3Button->SetVisibility(ESlateVisibility::Visible); @@ -206,9 +209,9 @@ void UDialogueNPC::AddChoices(UDialoguePath* ParentPath, FText ChoiceText1, FTex Out_ChoicePath1 = ParentPath->Choices[0]; Out_ChoicePath2 = ParentPath->Choices[1]; Out_ChoicePath3 = ParentPath->Choices[2]; - Choice1Text->SetText(ChoiceText1); - Choice2Text->SetText(ChoiceText2); - Choice3Text->SetText(ChoiceText3); + ParentPath->ChoiceText1 = ChoiceText1; + ParentPath->ChoiceText2 = ChoiceText2; + ParentPath->ChoiceText3 = ChoiceText3; } UDialoguePath* UDialogueNPC::AddQuest(UDialoguePath* DialoguePath, UQuest* Quest) diff --git a/Source/the_twilight_abyss/Dialogue/DialogueNPC.h b/Source/the_twilight_abyss/Dialogue/DialogueNPC.h index 6efcc32..862072d 100644 --- a/Source/the_twilight_abyss/Dialogue/DialogueNPC.h +++ b/Source/the_twilight_abyss/Dialogue/DialogueNPC.h @@ -21,6 +21,13 @@ public: UPROPERTY(BlueprintReadWrite) TArray Choices; + + UPROPERTY() + FText ChoiceText1; + UPROPERTY() + FText ChoiceText2; + UPROPERTY() + FText ChoiceText3; }; UCLASS(ClassGroup=(Custom), meta=(BlueprintSpawnableComponent))