diff --git a/EndlessVendetta/Content/Dialogue/BP_ChoiceButton.uasset b/EndlessVendetta/Content/Dialogue/BP_ChoiceButton.uasset new file mode 100644 index 00000000..99fe8f57 --- /dev/null +++ b/EndlessVendetta/Content/Dialogue/BP_ChoiceButton.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:92491ea67e7c30c15a81fb5f3f5ea677337f308489c06b92509a99b0fc6ad5bb +size 47654 diff --git a/EndlessVendetta/Content/Dialogue/BP_DialogueUI.uasset b/EndlessVendetta/Content/Dialogue/BP_DialogueUI.uasset index 9f3915c0..085864ef 100644 --- a/EndlessVendetta/Content/Dialogue/BP_DialogueUI.uasset +++ b/EndlessVendetta/Content/Dialogue/BP_DialogueUI.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:047d1379f4ccba4e09d8a17663400ec72aa8143be0404993b4195c6e707683ed -size 294565 +oid sha256:35908c5dcdb5143afd98a83341d8cb46d90ab1430b3d365f1b4707d85c793c70 +size 224018 diff --git a/EndlessVendetta/Content/Dialogue/Testing/TestDialogueTree.uasset b/EndlessVendetta/Content/Dialogue/Testing/TestDialogueTree.uasset index f225d161..7fb3c240 100644 --- a/EndlessVendetta/Content/Dialogue/Testing/TestDialogueTree.uasset +++ b/EndlessVendetta/Content/Dialogue/Testing/TestDialogueTree.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:85744af1e8b9b15150bb480251591069d637cca3792bb42111744a77347ddc06 -size 17581 +oid sha256:bc2cc9b626876c809e9b28673d8aefcf1a83071621cd270863751b61c5b2ae53 +size 22144 diff --git a/EndlessVendetta/Source/EndlessVendetta/DialogueSystem/DialogueChoiceNode.cpp b/EndlessVendetta/Source/EndlessVendetta/DialogueSystem/DialogueChoiceNode.cpp index a36202da..6fa8ff9d 100644 --- a/EndlessVendetta/Source/EndlessVendetta/DialogueSystem/DialogueChoiceNode.cpp +++ b/EndlessVendetta/Source/EndlessVendetta/DialogueSystem/DialogueChoiceNode.cpp @@ -16,7 +16,8 @@ UDialogueChoiceNode::UDialogueChoiceNode() FText UDialogueChoiceNode::GetNodeTitle() const { - return NodeTitle.IsEmpty() ? LOCTEXT("Choice Node", "Choice Node") : NodeTitle; + const FText ChoiceNodeTitle = NodeTitle.IsEmpty() ? LOCTEXT("Choice Node", "Choice Node") : NodeTitle; + return FText::Format(LOCTEXT("Choice Node Title", "{0} [{1}]"), ChoiceNodeTitle, FText::AsNumber(Choices.Num())); } FLinearColor UDialogueChoiceNode::GetBackgroundColor() const diff --git a/EndlessVendetta/Source/EndlessVendetta/DialogueSystem/DialogueChoiceNode.h b/EndlessVendetta/Source/EndlessVendetta/DialogueSystem/DialogueChoiceNode.h index e0d0512c..9f38ede7 100644 --- a/EndlessVendetta/Source/EndlessVendetta/DialogueSystem/DialogueChoiceNode.h +++ b/EndlessVendetta/Source/EndlessVendetta/DialogueSystem/DialogueChoiceNode.h @@ -13,11 +13,7 @@ public: UDialogueChoiceNode(); UPROPERTY(EditDefaultsOnly, BlueprintReadOnly, Category = "Dialogue") - FString Choice1Text = "None"; - UPROPERTY(EditDefaultsOnly, BlueprintReadOnly, Category = "Dialogue") - FString Choice2Text = "None"; - UPROPERTY(EditDefaultsOnly, BlueprintReadOnly, Category = "Dialogue") - FString Choice3Text = "None"; + TArray Choices; #if WITH_EDITOR virtual FText GetNodeTitle() const override;