diff --git a/Content/Assets/Characters/Merchant/AMerchant.uasset b/Content/Assets/Characters/Merchant/AMerchant.uasset index c8f8712..f9b94a8 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:efbb0d8ac773c7e350f029a8d24f16b1f1ef60a91dbb8660189b4d5272c5703a -size 276767 +oid sha256:b65987a7547f7c9498869d2dd49a4ee3b646fc20b6b82cc24bd3c8f9fea83fac +size 276352 diff --git a/Content/Blueprints/Combat_UI/CombatCharacter.uasset b/Content/Blueprints/Combat_UI/CombatCharacter.uasset index 91d03ce..3f01fba 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:879d2ea464cd053d202470c0d41de6a680434643871727ac22b9d3b66a3dc67a -size 256873 +oid sha256:e1f61ee11c1c818422cdc50628b28b3d3d20c6955797c75dd431f06d99b712ad +size 251440 diff --git a/Content/Blueprints/Quests/Quest_SistersPendant.uasset b/Content/Blueprints/Quests/Quest_SistersPendant.uasset index d488a3a..2d6e1c1 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:38a05202e8a33b9abc6eece4fd720ae8000cab2c09b378469574bd27ebe8af1e +oid sha256:c6109828703da22749feb98c47a7c08b9dcbb55ca27ef8d601c6d6237a400c04 size 7392 diff --git a/Content/Blueprints/Quests/Quest_SistersPendant_PT2.uasset b/Content/Blueprints/Quests/Quest_SistersPendant_PT2.uasset index 3848a65..7285d07 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:7ea9c6f8e8e054d197c737f634b1423ed387bac88ba3730cffa1361d8e6f0341 -size 7395 +oid sha256:1dac57808dcbb5ae333b1fd1f9515ac6a4930307037161479f1b3e6ea43b725d +size 6902 diff --git a/Content/Dialogue/SM_Merchant_Blueprint.uasset b/Content/Dialogue/SM_Merchant_Blueprint.uasset index ba4fb19..9e0ec28 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:dc9c565610d98d5feccf5c41152ea0bb6d6c897e7538d6f2be3ffda0e64f01fa -size 172314 +oid sha256:f431c0ceab4dd59cdeaa6dc5b5c4d27c7e3d56cab331ab254d1288a85a60c7a0 +size 172406 diff --git a/Content/Levels/Build.umap b/Content/Levels/Build.umap index e1cec48..8ce5844 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:4f452f3d126fe74e356ff524c9f5787e4e49ba9c990fe813822e38cdafbae805 -size 5613995 +oid sha256:5f59de7e89754000f9dbada785b97f086bed859770e7b15ab8beb9a813c2e848 +size 5613543 diff --git a/Source/the_twilight_abyss/Dialogue/DialogueNPC.cpp b/Source/the_twilight_abyss/Dialogue/DialogueNPC.cpp index ba2fae6..14b498b 100644 --- a/Source/the_twilight_abyss/Dialogue/DialogueNPC.cpp +++ b/Source/the_twilight_abyss/Dialogue/DialogueNPC.cpp @@ -60,8 +60,9 @@ void UDialogueNPC::NextDialogue() NextArrow->SetVisibility(ESlateVisibility::SelfHitTestInvisible); return; } - if (CurrentDialogueStringPath[FMath::Clamp(DialogueIndex + 1, 0, CurrentDialogueStringPath.Num() - 1)].Mid(0, 2) == "##") + if (CurrentDialogueStringPath[FMath::Clamp(DialogueIndex + 1, 0, CurrentDialogueStringPath.Num() - 1)].Mid(0, 2) == "--") { + UE_LOG(LogTemp, Warning, TEXT("DialogueIndex: %d"), UKismetStringLibrary::Conv_StringToInt(CurrentDialogueStringPath[DialogueIndex].RightChop(3))); Cast(GetWorld()->GetFirstPlayerController()->GetPawn()->GetComponentByClass(UQuestSystem::StaticClass()))->AddQuest(Quests[UKismetStringLibrary::Conv_StringToInt(CurrentDialogueStringPath[DialogueIndex].RightChop(3))]); DialogueIndex++; } @@ -142,6 +143,9 @@ void UDialogueNPC::TickComponent(float DeltaTime, ELevelTick TickType, FActorCom void UDialogueNPC::StartDialogue() { Quests.Empty(); + BlueprintFunctions.Empty(); + ItemIndexes.Empty(); + QuestFlags.Empty(); FOutputDeviceNull AR; const FString Command = FString::Printf(TEXT("SetRootDialoguePath")); GetOwner()->CallFunctionByNameWithArguments(*Command, AR, nullptr, true); @@ -216,7 +220,7 @@ void UDialogueNPC::AddChoices(UDialoguePath* ParentPath, FText ChoiceText1, FTex UDialoguePath* UDialogueNPC::AddQuest(UDialoguePath* DialoguePath, UQuest* Quest) { - DialoguePath->Dialogue.Add(FText::FromString("## " + Quests.Num()).ToString()); + DialoguePath->Dialogue.Add(FText::FromString("-- " + FString::FromInt(Quests.Num())).ToString()); Quests.Add(Quests.Num(), Quest); return DialoguePath; }