From 9a2398d2d1a6b4d59403ba147e3d850eaff7ae97 Mon Sep 17 00:00:00 2001 From: PHILIP WHITE Date: Fri, 22 Mar 2024 14:08:16 +0000 Subject: [PATCH] Bugfix Dialogue Not Triggering Objective & Cosmetic Changes --- .../Blueprints/CharacterLogic/ALS_Base_CharacterBP.uasset | 4 ++-- .../Content/BountySystem/CP_FinalCheckpoint.uasset | 4 ++-- EndlessVendetta/Content/Dialogue/D_ApartmentBouncer.uasset | 4 ++-- .../Content/Dialogue/D_ApartmentLobbySecurity.uasset | 4 ++-- EndlessVendetta/Content/Levels/Apartment_hit.umap | 4 ++-- EndlessVendetta/Content/Levels/OpenWorldRework.umap | 4 ++-- .../DialogueSystem/AC_PlayerDialogueInterpreter.cpp | 3 ++- 7 files changed, 14 insertions(+), 13 deletions(-) diff --git a/EndlessVendetta/Content/AdvancedLocomotionV4/Blueprints/CharacterLogic/ALS_Base_CharacterBP.uasset b/EndlessVendetta/Content/AdvancedLocomotionV4/Blueprints/CharacterLogic/ALS_Base_CharacterBP.uasset index bdd35391..1f8687db 100644 --- a/EndlessVendetta/Content/AdvancedLocomotionV4/Blueprints/CharacterLogic/ALS_Base_CharacterBP.uasset +++ b/EndlessVendetta/Content/AdvancedLocomotionV4/Blueprints/CharacterLogic/ALS_Base_CharacterBP.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:88afb1fecfdd75e9e8f0d8899c9c7a76bf54475d2fceb71845279c80a577d3d4 -size 3710303 +oid sha256:e68e14d46663de8d2a85c46655239da5778a312a7d290a6b94938a695a481cfb +size 3708067 diff --git a/EndlessVendetta/Content/BountySystem/CP_FinalCheckpoint.uasset b/EndlessVendetta/Content/BountySystem/CP_FinalCheckpoint.uasset index e9b388cd..be6b5327 100644 --- a/EndlessVendetta/Content/BountySystem/CP_FinalCheckpoint.uasset +++ b/EndlessVendetta/Content/BountySystem/CP_FinalCheckpoint.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:b5e00dd4a5499f443a9ff4f8b9900339fd8f8aac50e4294c230406b5f097e1cc -size 26828 +oid sha256:4185e684ad7e4ce520f52ed5c9073939ca5efe65dd4b9a9a24ebdb777ca21d53 +size 27580 diff --git a/EndlessVendetta/Content/Dialogue/D_ApartmentBouncer.uasset b/EndlessVendetta/Content/Dialogue/D_ApartmentBouncer.uasset index d4f184e4..733a9402 100644 --- a/EndlessVendetta/Content/Dialogue/D_ApartmentBouncer.uasset +++ b/EndlessVendetta/Content/Dialogue/D_ApartmentBouncer.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:4227d45a162cb389745d9fb412acb942121392cc64e9fcc7ebe3d4de62f4fd8e -size 19699 +oid sha256:f231defd05bfc1c9e0286c1b2a06665414a13d4432ad8c2cc78a1402ef222ab8 +size 19687 diff --git a/EndlessVendetta/Content/Dialogue/D_ApartmentLobbySecurity.uasset b/EndlessVendetta/Content/Dialogue/D_ApartmentLobbySecurity.uasset index dd08f0ee..2345cd71 100644 --- a/EndlessVendetta/Content/Dialogue/D_ApartmentLobbySecurity.uasset +++ b/EndlessVendetta/Content/Dialogue/D_ApartmentLobbySecurity.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:08a6c843113fcfc22e64a6273063b838a040689bb48919415df7613a9b313853 -size 32640 +oid sha256:2e3f03247ea995690279ab71c6af13f65e8a1ac82ce67ed129259e0619c50ee4 +size 32655 diff --git a/EndlessVendetta/Content/Levels/Apartment_hit.umap b/EndlessVendetta/Content/Levels/Apartment_hit.umap index 22cbd1a3..23e4675a 100644 --- a/EndlessVendetta/Content/Levels/Apartment_hit.umap +++ b/EndlessVendetta/Content/Levels/Apartment_hit.umap @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:b532393ddfa10b878cefb356b36f61b4091de339599d1b5fb6d25e3b5455d6f2 -size 1007429 +oid sha256:e42701909212ab99f178cd170f754b183faf9fba6afce6cd5694ed21afecd87e +size 1024880 diff --git a/EndlessVendetta/Content/Levels/OpenWorldRework.umap b/EndlessVendetta/Content/Levels/OpenWorldRework.umap index c32c57f9..dd606f3d 100644 --- a/EndlessVendetta/Content/Levels/OpenWorldRework.umap +++ b/EndlessVendetta/Content/Levels/OpenWorldRework.umap @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:95986afd7ffabbcdf01c8ab2bd7c16b69b9b52890b92723176ee34fa83bcdba1 -size 293771914 +oid sha256:d69d0708dfe3a921ae72e50417246d153f77ec910d0b8ba9f4e316d411a58928 +size 293773577 diff --git a/EndlessVendetta/Source/EndlessVendetta/DialogueSystem/AC_PlayerDialogueInterpreter.cpp b/EndlessVendetta/Source/EndlessVendetta/DialogueSystem/AC_PlayerDialogueInterpreter.cpp index 2c499c93..2a9c3b09 100644 --- a/EndlessVendetta/Source/EndlessVendetta/DialogueSystem/AC_PlayerDialogueInterpreter.cpp +++ b/EndlessVendetta/Source/EndlessVendetta/DialogueSystem/AC_PlayerDialogueInterpreter.cpp @@ -160,7 +160,8 @@ void UAC_PlayerDialogueInterpreter::MakeChoiceDialogue(const int Choice) void UAC_PlayerDialogueInterpreter::EndDialogue() { - OnEndDialogue.Broadcast(FText::FromString("Dialogue Ended")); + if (IsValid(CurrentTextNode)) OnEndDialogue.Broadcast(CurrentTextNode->Text); + else OnEndDialogue.Broadcast(FText()); CurrentChoiceNode = nullptr; CurrentTextNode = nullptr; CurrentAddItemNode = nullptr;