From 2f1fe1c0ca0d2092a4f79583f282efe81f165302 Mon Sep 17 00:00:00 2001 From: PHILIP WHITE Date: Tue, 23 Jan 2024 21:21:56 +0000 Subject: [PATCH 1/5] Update Dialogue System for Changing Speaker --- .../Content/Dialogue/BP_DialogueUI.uasset | 4 ++-- .../Content/Dialogue/D_Mayor_Tutorial.uasset | 3 +++ .../Content/Dialogue/TestDialogueCube.uasset | 3 +++ .../Dialogue/Testing/TestDialogueCube.uasset | 3 +++ .../Dialogue/Testing/TestDialogueTree.uasset | 3 +++ EndlessVendetta/Content/Dialogue/test.uasset | 3 --- .../E/WM/7S8OEF1ALOX6NKI759UPUB.uasset | 3 +++ .../AC_PlayerDialogueInterpreter.cpp | 20 +++++++++++++++++++ .../AC_PlayerDialogueInterpreter.h | 3 +++ .../DialogueSystem/DialogueChoiceNode.cpp | 5 +++++ .../DialogueSystem/DialogueChoiceNode.h | 1 + .../DialogueSystem/DialogueRootNode.cpp | 2 +- .../DialogueSystem/DialogueTextNode.h | 2 -- .../DialogueSystem/DialogueTree.h | 4 ++-- 14 files changed, 49 insertions(+), 10 deletions(-) create mode 100644 EndlessVendetta/Content/Dialogue/D_Mayor_Tutorial.uasset create mode 100644 EndlessVendetta/Content/Dialogue/TestDialogueCube.uasset create mode 100644 EndlessVendetta/Content/Dialogue/Testing/TestDialogueCube.uasset create mode 100644 EndlessVendetta/Content/Dialogue/Testing/TestDialogueTree.uasset delete mode 100644 EndlessVendetta/Content/Dialogue/test.uasset create mode 100644 EndlessVendetta/Content/__ExternalActors__/Levels/EnemyAITest/E/WM/7S8OEF1ALOX6NKI759UPUB.uasset diff --git a/EndlessVendetta/Content/Dialogue/BP_DialogueUI.uasset b/EndlessVendetta/Content/Dialogue/BP_DialogueUI.uasset index 5a865577..9f3915c0 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:6d51f9881a6133d0034410344d0809ed18ed108981b46507868b51c2bcacd7b6 -size 287864 +oid sha256:047d1379f4ccba4e09d8a17663400ec72aa8143be0404993b4195c6e707683ed +size 294565 diff --git a/EndlessVendetta/Content/Dialogue/D_Mayor_Tutorial.uasset b/EndlessVendetta/Content/Dialogue/D_Mayor_Tutorial.uasset new file mode 100644 index 00000000..d4bbebf6 --- /dev/null +++ b/EndlessVendetta/Content/Dialogue/D_Mayor_Tutorial.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:ec928f3868dc58bd404ba1745a960d964039c2a2a4140ccad7f94b08ae1fd3a8 +size 4013 diff --git a/EndlessVendetta/Content/Dialogue/TestDialogueCube.uasset b/EndlessVendetta/Content/Dialogue/TestDialogueCube.uasset new file mode 100644 index 00000000..c527979a --- /dev/null +++ b/EndlessVendetta/Content/Dialogue/TestDialogueCube.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:1f02a139ca0765bc88152d89b253c76f11837193aaaaf1822f950d38578cc5e1 +size 2455 diff --git a/EndlessVendetta/Content/Dialogue/Testing/TestDialogueCube.uasset b/EndlessVendetta/Content/Dialogue/Testing/TestDialogueCube.uasset new file mode 100644 index 00000000..c12313ff --- /dev/null +++ b/EndlessVendetta/Content/Dialogue/Testing/TestDialogueCube.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:e7323a610767b1f1cc758dd6fa1c9cb34407545561ad153e0ad0ac12cb78f894 +size 28384 diff --git a/EndlessVendetta/Content/Dialogue/Testing/TestDialogueTree.uasset b/EndlessVendetta/Content/Dialogue/Testing/TestDialogueTree.uasset new file mode 100644 index 00000000..f225d161 --- /dev/null +++ b/EndlessVendetta/Content/Dialogue/Testing/TestDialogueTree.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:85744af1e8b9b15150bb480251591069d637cca3792bb42111744a77347ddc06 +size 17581 diff --git a/EndlessVendetta/Content/Dialogue/test.uasset b/EndlessVendetta/Content/Dialogue/test.uasset deleted file mode 100644 index c8e7f317..00000000 --- a/EndlessVendetta/Content/Dialogue/test.uasset +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:af6de724c9c9f4c366b93b385ebe76dc85d3dbfdde418ecc65fe7492d76c6c4f -size 16429 diff --git a/EndlessVendetta/Content/__ExternalActors__/Levels/EnemyAITest/E/WM/7S8OEF1ALOX6NKI759UPUB.uasset b/EndlessVendetta/Content/__ExternalActors__/Levels/EnemyAITest/E/WM/7S8OEF1ALOX6NKI759UPUB.uasset new file mode 100644 index 00000000..33189d8b --- /dev/null +++ b/EndlessVendetta/Content/__ExternalActors__/Levels/EnemyAITest/E/WM/7S8OEF1ALOX6NKI759UPUB.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:4e230c10405edc83911b7a264e397dfa14d304c5492cfdd64add703df2b758b6 +size 4769 diff --git a/EndlessVendetta/Source/EndlessVendetta/DialogueSystem/AC_PlayerDialogueInterpreter.cpp b/EndlessVendetta/Source/EndlessVendetta/DialogueSystem/AC_PlayerDialogueInterpreter.cpp index f87077dc..f11997ca 100644 --- a/EndlessVendetta/Source/EndlessVendetta/DialogueSystem/AC_PlayerDialogueInterpreter.cpp +++ b/EndlessVendetta/Source/EndlessVendetta/DialogueSystem/AC_PlayerDialogueInterpreter.cpp @@ -25,6 +25,21 @@ void UAC_PlayerDialogueInterpreter::BeginPlay() // ... } +FDialogueCharacter* UAC_PlayerDialogueInterpreter::GetCharacterSpeakingFromEnum(ECharacterSpeaking CharacterSpeakingEnum) const +{ + switch (CharacterSpeakingEnum) + { + case ECharacterSpeaking::Character1: + return &CurrentDialogueTree->Character1; + case ECharacterSpeaking::Character2: + return &CurrentDialogueTree->Character2; + case ECharacterSpeaking::Character3: + return &CurrentDialogueTree->Character3; + case ECharacterSpeaking::Character4: + return &CurrentDialogueTree->Character4; + } + return nullptr; +} // Called every frame void UAC_PlayerDialogueInterpreter::TickComponent(float DeltaTime, ELevelTick TickType, FActorComponentTickFunction* ThisTickFunction) @@ -38,6 +53,8 @@ void UAC_PlayerDialogueInterpreter::StartDialogue(UDialogueTree* DialogueTree) { CurrentDialogueTree = DialogueTree; CurrentTextNode = Cast(DialogueTree->RootNodes[0]->ChildrenNodes[0]); + if (!IsValid(CurrentTextNode)) return; + CurrentCharacterSpeaking = *GetCharacterSpeakingFromEnum(CurrentTextNode->DialogueCharacterSpeaking); OnStartDialogue.Broadcast(CurrentTextNode); if (APlayerController* PlayerController = GetWorld()->GetFirstPlayerController()) @@ -66,6 +83,7 @@ void UAC_PlayerDialogueInterpreter::NextDialogue() else { CurrentTextNode = Cast(CurrentTextNode->ChildrenNodes[0]); + CurrentCharacterSpeaking = *GetCharacterSpeakingFromEnum(CurrentTextNode->DialogueCharacterSpeaking); OnNextDialogue.Broadcast(CurrentTextNode); CurrentChoiceNode = nullptr; } @@ -83,6 +101,7 @@ void UAC_PlayerDialogueInterpreter::MakeChoiceDialogue(const int Choice) else { CurrentTextNode = Cast(CurrentChoiceNode->ChildrenNodes[Choice]); + CurrentCharacterSpeaking = *GetCharacterSpeakingFromEnum(CurrentTextNode->DialogueCharacterSpeaking); OnNextDialogue.Broadcast(CurrentTextNode); CurrentChoiceNode = nullptr; } @@ -92,6 +111,7 @@ void UAC_PlayerDialogueInterpreter::EndDialogue() { CurrentChoiceNode = nullptr; CurrentTextNode = nullptr; + CurrentCharacterSpeaking = FDialogueCharacter(); OnEndDialogue.Broadcast(); if (APlayerController* PlayerController = GetWorld()->GetFirstPlayerController()) diff --git a/EndlessVendetta/Source/EndlessVendetta/DialogueSystem/AC_PlayerDialogueInterpreter.h b/EndlessVendetta/Source/EndlessVendetta/DialogueSystem/AC_PlayerDialogueInterpreter.h index 31da0195..4da84a18 100644 --- a/EndlessVendetta/Source/EndlessVendetta/DialogueSystem/AC_PlayerDialogueInterpreter.h +++ b/EndlessVendetta/Source/EndlessVendetta/DialogueSystem/AC_PlayerDialogueInterpreter.h @@ -37,6 +37,8 @@ public: UPROPERTY(BlueprintReadOnly, VisibleAnywhere, Category = "Dialogue") UDialogueTree* CurrentDialogueTree; + UPROPERTY(BlueprintReadOnly, VisibleAnywhere, Category = "Dialogue") + FDialogueCharacter CurrentCharacterSpeaking; protected: // Called when the game starts @@ -47,6 +49,7 @@ private: UDialogueTextNode* CurrentTextNode; UPROPERTY() UDialogueChoiceNode* CurrentChoiceNode; + FDialogueCharacter* GetCharacterSpeakingFromEnum(ECharacterSpeaking CharacterSpeakingEnum) const; public: // Called every frame diff --git a/EndlessVendetta/Source/EndlessVendetta/DialogueSystem/DialogueChoiceNode.cpp b/EndlessVendetta/Source/EndlessVendetta/DialogueSystem/DialogueChoiceNode.cpp index 2758d6af..a36202da 100644 --- a/EndlessVendetta/Source/EndlessVendetta/DialogueSystem/DialogueChoiceNode.cpp +++ b/EndlessVendetta/Source/EndlessVendetta/DialogueSystem/DialogueChoiceNode.cpp @@ -14,6 +14,11 @@ UDialogueChoiceNode::UDialogueChoiceNode() #if WITH_EDITOR +FText UDialogueChoiceNode::GetNodeTitle() const +{ + return NodeTitle.IsEmpty() ? LOCTEXT("Choice Node", "Choice Node") : NodeTitle; +} + FLinearColor UDialogueChoiceNode::GetBackgroundColor() const { const UDialogueTree* DialogueTree = Cast(GetGraph()); diff --git a/EndlessVendetta/Source/EndlessVendetta/DialogueSystem/DialogueChoiceNode.h b/EndlessVendetta/Source/EndlessVendetta/DialogueSystem/DialogueChoiceNode.h index 0b0550b2..e0d0512c 100644 --- a/EndlessVendetta/Source/EndlessVendetta/DialogueSystem/DialogueChoiceNode.h +++ b/EndlessVendetta/Source/EndlessVendetta/DialogueSystem/DialogueChoiceNode.h @@ -20,6 +20,7 @@ public: FString Choice3Text = "None"; #if WITH_EDITOR + virtual FText GetNodeTitle() const override; virtual FLinearColor GetBackgroundColor() const override; #endif }; diff --git a/EndlessVendetta/Source/EndlessVendetta/DialogueSystem/DialogueRootNode.cpp b/EndlessVendetta/Source/EndlessVendetta/DialogueSystem/DialogueRootNode.cpp index 43a8ab4b..a4981347 100644 --- a/EndlessVendetta/Source/EndlessVendetta/DialogueSystem/DialogueRootNode.cpp +++ b/EndlessVendetta/Source/EndlessVendetta/DialogueSystem/DialogueRootNode.cpp @@ -23,7 +23,7 @@ FLinearColor UDialogueRootNode::GetBackgroundColor() const if (const UDialogueTree* DialogueTree = Cast(GetGraph()); DialogueTree == nullptr) return Super::GetBackgroundColor(); - return FLinearColor(1.f, 1.f, 1.f, 1.f); + return FLinearColor(0.f, 1.f, 0.f, 1.f); } #endif diff --git a/EndlessVendetta/Source/EndlessVendetta/DialogueSystem/DialogueTextNode.h b/EndlessVendetta/Source/EndlessVendetta/DialogueSystem/DialogueTextNode.h index af556e4b..4eb9f33d 100644 --- a/EndlessVendetta/Source/EndlessVendetta/DialogueSystem/DialogueTextNode.h +++ b/EndlessVendetta/Source/EndlessVendetta/DialogueSystem/DialogueTextNode.h @@ -30,9 +30,7 @@ public: #if WITH_EDITOR virtual FText GetNodeTitle() const override; - virtual void SetNodeTitle(const FText& NewTitle) override; - virtual FLinearColor GetBackgroundColor() const override; #endif }; diff --git a/EndlessVendetta/Source/EndlessVendetta/DialogueSystem/DialogueTree.h b/EndlessVendetta/Source/EndlessVendetta/DialogueSystem/DialogueTree.h index ed992455..92f3f1bd 100644 --- a/EndlessVendetta/Source/EndlessVendetta/DialogueSystem/DialogueTree.h +++ b/EndlessVendetta/Source/EndlessVendetta/DialogueSystem/DialogueTree.h @@ -12,9 +12,9 @@ struct FDialogueCharacter UPROPERTY(BlueprintReadOnly, EditDefaultsOnly, Category = "Dialogue") FName CharacterName; UPROPERTY(BlueprintReadOnly, EditDefaultsOnly, Category = "Dialogue") - FLinearColor DialogueNodeBgColor; - UPROPERTY(BlueprintReadOnly, EditDefaultsOnly, Category = "Dialogue") UTexture2D* DialogueCharacterPortrait; + UPROPERTY(BlueprintReadOnly, EditDefaultsOnly, Category = "Node") + FLinearColor DialogueNodeBgColor; }; UCLASS(Blueprintable) From 773c69a99bf6d34906758b2fe591d54630c855e8 Mon Sep 17 00:00:00 2001 From: PHILIP WHITE Date: Tue, 23 Jan 2024 22:03:06 +0000 Subject: [PATCH 2/5] Update Dialogue System for Unlimited Choices --- EndlessVendetta/Content/Dialogue/BP_ChoiceButton.uasset | 3 +++ EndlessVendetta/Content/Dialogue/BP_DialogueUI.uasset | 4 ++-- .../Content/Dialogue/Testing/TestDialogueTree.uasset | 4 ++-- .../EndlessVendetta/DialogueSystem/DialogueChoiceNode.cpp | 3 ++- .../EndlessVendetta/DialogueSystem/DialogueChoiceNode.h | 6 +----- 5 files changed, 10 insertions(+), 10 deletions(-) create mode 100644 EndlessVendetta/Content/Dialogue/BP_ChoiceButton.uasset 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; From dd9156e1fc1e462af17764645cd6654f4ac192e6 Mon Sep 17 00:00:00 2001 From: PHILIP WHITE Date: Fri, 26 Jan 2024 11:37:21 +0000 Subject: [PATCH 3/5] Update Dialogue to Validate Choice Structure --- .../Dialogue/Testing/TestDialogueTree.uasset | 4 ++-- .../DialogueSystem/DialogueChoiceNode.cpp | 23 +++++++++++++++++++ .../DialogueSystem/DialogueEdge.h | 13 +++++++---- 3 files changed, 33 insertions(+), 7 deletions(-) diff --git a/EndlessVendetta/Content/Dialogue/Testing/TestDialogueTree.uasset b/EndlessVendetta/Content/Dialogue/Testing/TestDialogueTree.uasset index 7fb3c240..edec184b 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:bc2cc9b626876c809e9b28673d8aefcf1a83071621cd270863751b61c5b2ae53 -size 22144 +oid sha256:ae77647d592ad3c7affe1b638ba623e02456851dcf3071f11565fdcec2a3d58d +size 23072 diff --git a/EndlessVendetta/Source/EndlessVendetta/DialogueSystem/DialogueChoiceNode.cpp b/EndlessVendetta/Source/EndlessVendetta/DialogueSystem/DialogueChoiceNode.cpp index 6fa8ff9d..00c3b94f 100644 --- a/EndlessVendetta/Source/EndlessVendetta/DialogueSystem/DialogueChoiceNode.cpp +++ b/EndlessVendetta/Source/EndlessVendetta/DialogueSystem/DialogueChoiceNode.cpp @@ -1,4 +1,6 @@ #include "DialogueChoiceNode.h" + +#include "DialogueEdge.h" #include "DialogueTree.h" #define LOCTEXT_NAMESPACE "UDialogueChoiceNode" @@ -16,6 +18,27 @@ UDialogueChoiceNode::UDialogueChoiceNode() FText UDialogueChoiceNode::GetNodeTitle() const { + bool bHasValidNumberOfChoices = false; + if (Choices.Num() == ChildrenNodes.Num()) bHasValidNumberOfChoices = true; + for (int i = 0; i < Edges.Num(); i++) + { + if (!bHasValidNumberOfChoices) + { + Cast(Edges[ChildrenNodes[i]])->EdgeColour = FLinearColor::Red; + Cast(Edges[ChildrenNodes[i]])->SetNodeTitle(FText::FromString("INVALID")); + } + else if (Choices[i].Len() > 15) + { + FString Substring = Choices[i].Left(15); + Substring.Append("..."); + Cast(Edges[ChildrenNodes[i]])->SetNodeTitle(FText::FromString(Substring)); + } + else + { + Cast(Edges[ChildrenNodes[i]])->SetNodeTitle(FText::FromString(Choices[i])); + Cast(Edges[ChildrenNodes[i]])->EdgeColour = FLinearColor::White; + } + } 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())); } diff --git a/EndlessVendetta/Source/EndlessVendetta/DialogueSystem/DialogueEdge.h b/EndlessVendetta/Source/EndlessVendetta/DialogueSystem/DialogueEdge.h index ef92beff..3613f00d 100644 --- a/EndlessVendetta/Source/EndlessVendetta/DialogueSystem/DialogueEdge.h +++ b/EndlessVendetta/Source/EndlessVendetta/DialogueSystem/DialogueEdge.h @@ -6,11 +6,14 @@ UCLASS(Blueprintable) -class UDialogueEdge: public UGenericGraphEdge +class UDialogueEdge : public UGenericGraphEdge { GENERATED_BODY() - // public: - // UPROPERTY(EditDefaultsOnly, BlueprintReadOnly, Category = "Dialogue") - // FText Selection; -}; \ No newline at end of file + UDialogueEdge(); +}; + +inline UDialogueEdge::UDialogueEdge() +{ + bShouldDrawTitle = true; +} From 022fc8445c9b84a2b1a3b4c79ab423edbe3c68d0 Mon Sep 17 00:00:00 2001 From: PHILIP WHITE Date: Fri, 2 Feb 2024 01:21:46 +0000 Subject: [PATCH 4/5] Reimplement Mayor Dialogue for Tutorial Level --- EndlessVendetta/Content/Dialogue/D_Mayor_Tutorial.uasset | 4 ++-- .../Content/Dialogue/Testing/TestDialogueTree.uasset | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/EndlessVendetta/Content/Dialogue/D_Mayor_Tutorial.uasset b/EndlessVendetta/Content/Dialogue/D_Mayor_Tutorial.uasset index d4bbebf6..c8a1e2e7 100644 --- a/EndlessVendetta/Content/Dialogue/D_Mayor_Tutorial.uasset +++ b/EndlessVendetta/Content/Dialogue/D_Mayor_Tutorial.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:ec928f3868dc58bd404ba1745a960d964039c2a2a4140ccad7f94b08ae1fd3a8 -size 4013 +oid sha256:5b1e0389b55c1a3619cc6d04739ca92ebf332e67c2f9fce20a7d9a240d7fc654 +size 87783 diff --git a/EndlessVendetta/Content/Dialogue/Testing/TestDialogueTree.uasset b/EndlessVendetta/Content/Dialogue/Testing/TestDialogueTree.uasset index edec184b..5f598325 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:ae77647d592ad3c7affe1b638ba623e02456851dcf3071f11565fdcec2a3d58d -size 23072 +oid sha256:ec1e794ed8e8a4409f4bc77584623c727508513bf407e4059ce1e4a41b8d90c1 +size 24487 From 92316bac9d53c4ffe668406dbddff1883b83fbae Mon Sep 17 00:00:00 2001 From: PHILIP WHITE Date: Fri, 2 Feb 2024 01:44:08 +0000 Subject: [PATCH 5/5] Add Mayor Blueprint for Blockout --- EndlessVendetta/Content/Dialogue/Testing/BP_Mayor.uasset | 3 +++ EndlessVendetta/Content/Dialogue/Testing/Catman_Idle.uasset | 3 +++ .../Content/Dialogue/Testing/Catman_Idle_PhysicsAsset.uasset | 3 +++ .../Content/Dialogue/Testing/Catman_Idle_Skeleton.uasset | 3 +++ EndlessVendetta/Content/Dialogue/Testing/Material.uasset | 3 +++ EndlessVendetta/Content/Dialogue/Testing/Material_001.uasset | 3 +++ EndlessVendetta/Content/Dialogue/Testing/Material_002.uasset | 3 +++ 7 files changed, 21 insertions(+) create mode 100644 EndlessVendetta/Content/Dialogue/Testing/BP_Mayor.uasset create mode 100644 EndlessVendetta/Content/Dialogue/Testing/Catman_Idle.uasset create mode 100644 EndlessVendetta/Content/Dialogue/Testing/Catman_Idle_PhysicsAsset.uasset create mode 100644 EndlessVendetta/Content/Dialogue/Testing/Catman_Idle_Skeleton.uasset create mode 100644 EndlessVendetta/Content/Dialogue/Testing/Material.uasset create mode 100644 EndlessVendetta/Content/Dialogue/Testing/Material_001.uasset create mode 100644 EndlessVendetta/Content/Dialogue/Testing/Material_002.uasset diff --git a/EndlessVendetta/Content/Dialogue/Testing/BP_Mayor.uasset b/EndlessVendetta/Content/Dialogue/Testing/BP_Mayor.uasset new file mode 100644 index 00000000..86869ecb --- /dev/null +++ b/EndlessVendetta/Content/Dialogue/Testing/BP_Mayor.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:4280fd261e4b0d85f410669264906255cdcc74e55477faa4fe5e46c3d33aeee4 +size 30273 diff --git a/EndlessVendetta/Content/Dialogue/Testing/Catman_Idle.uasset b/EndlessVendetta/Content/Dialogue/Testing/Catman_Idle.uasset new file mode 100644 index 00000000..5ad7be4d --- /dev/null +++ b/EndlessVendetta/Content/Dialogue/Testing/Catman_Idle.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:8f6e6d75f641a2e7dd11f95db5bfc72cde7bb66e942831962061901cf79f21b3 +size 785162 diff --git a/EndlessVendetta/Content/Dialogue/Testing/Catman_Idle_PhysicsAsset.uasset b/EndlessVendetta/Content/Dialogue/Testing/Catman_Idle_PhysicsAsset.uasset new file mode 100644 index 00000000..fb0f6134 --- /dev/null +++ b/EndlessVendetta/Content/Dialogue/Testing/Catman_Idle_PhysicsAsset.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:e7d59d593d60ea9144d8f0632eb29ee2d1ee92fcbe20e5fccb7a34505beb9a71 +size 16250 diff --git a/EndlessVendetta/Content/Dialogue/Testing/Catman_Idle_Skeleton.uasset b/EndlessVendetta/Content/Dialogue/Testing/Catman_Idle_Skeleton.uasset new file mode 100644 index 00000000..5a52dca2 --- /dev/null +++ b/EndlessVendetta/Content/Dialogue/Testing/Catman_Idle_Skeleton.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:97c387ee6c4607c9a841c13d5f309ce7e48158b7db0521f0f9c65549324c326e +size 13447 diff --git a/EndlessVendetta/Content/Dialogue/Testing/Material.uasset b/EndlessVendetta/Content/Dialogue/Testing/Material.uasset new file mode 100644 index 00000000..9eab430c --- /dev/null +++ b/EndlessVendetta/Content/Dialogue/Testing/Material.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:f3d1f8b1ff90eb9ba3ff2dc40dc19d0deef6e69dc213255bee4f7748e4b04346 +size 7914 diff --git a/EndlessVendetta/Content/Dialogue/Testing/Material_001.uasset b/EndlessVendetta/Content/Dialogue/Testing/Material_001.uasset new file mode 100644 index 00000000..bc52c384 --- /dev/null +++ b/EndlessVendetta/Content/Dialogue/Testing/Material_001.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:656790daef70f5db329953fe750bd011cc50dd34ff9b0ba51bb2e26476d85972 +size 8143 diff --git a/EndlessVendetta/Content/Dialogue/Testing/Material_002.uasset b/EndlessVendetta/Content/Dialogue/Testing/Material_002.uasset new file mode 100644 index 00000000..83dce43a --- /dev/null +++ b/EndlessVendetta/Content/Dialogue/Testing/Material_002.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:b041ea1092257c487bab6aef0483e5e6c950a6f90474bdaf4dd9976c5fee72bb +size 8143