From 15e56412faff6cf6510c9bf53f79b89053a69bdb Mon Sep 17 00:00:00 2001 From: Rowland Rowland Date: Thu, 11 May 2023 11:18:24 +0100 Subject: [PATCH 1/4] Changed final room Changed final room to a circular arena --- .../Level_1_Blockout_improvement_textured_Cylinder_004.uasset | 4 ++-- Content/Levels/Build.umap | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/Content/Assets/Objects/Updated_level_map/Level_1_Blockout_improvement_textured_Cylinder_004.uasset b/Content/Assets/Objects/Updated_level_map/Level_1_Blockout_improvement_textured_Cylinder_004.uasset index fb08b32..77a0bcd 100644 --- a/Content/Assets/Objects/Updated_level_map/Level_1_Blockout_improvement_textured_Cylinder_004.uasset +++ b/Content/Assets/Objects/Updated_level_map/Level_1_Blockout_improvement_textured_Cylinder_004.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:4065a88d9e62dcad5b66c87f41376c8b542a2006597efdd155e812e93b589cbd -size 43335 +oid sha256:68bb67b87d8656eba9aa3a01e5abfa9629b4a506e1f1ee0a4458b2969d784e86 +size 27337 diff --git a/Content/Levels/Build.umap b/Content/Levels/Build.umap index c640827..e9b8e2e 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:68e971da64c020713e1a94799292bb7c0ea575bf17584b69b96714aa99c2ba9b -size 3466781 +oid sha256:ff98e10e6cf23061099c2518075d96c20903a54184f746077830207953c9ebe3 +size 3403556 From 067bb41820d24175fcfa22ac0c3d128589478668 Mon Sep 17 00:00:00 2001 From: PHILIP White Date: Thu, 11 May 2023 11:27:54 +0100 Subject: [PATCH 2/4] Bugfix Stack Overflow on Adding Reward Items --- Source/the_twilight_abyss/Quest/QuestSystem.cpp | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/Source/the_twilight_abyss/Quest/QuestSystem.cpp b/Source/the_twilight_abyss/Quest/QuestSystem.cpp index cf23d06..216d284 100644 --- a/Source/the_twilight_abyss/Quest/QuestSystem.cpp +++ b/Source/the_twilight_abyss/Quest/QuestSystem.cpp @@ -54,12 +54,13 @@ void UQuestSystem::TickComponent(float DeltaTime, ELevelTick TickType, FActorCom void UQuestSystem::CheckActiveQuestConditions() { + TArray JustCompletedQuests; for (UQuest* Quest : ActiveQuests) { if (Quest->CheckConditions(GetWorldState())) { CompletedQuests.Add(Quest); - Quest->ApplyRewards(PlayerInventory); + JustCompletedQuests.Add(Quest); for (TTuple QuestFlag : Quest->QuestFlagsOnComplete) { QuestFlags.Add(QuestFlag.Key, QuestFlag.Value); @@ -79,6 +80,11 @@ void UQuestSystem::CheckActiveQuestConditions() } UpdateQuestGoalsUI(Quest); } + for (UQuest* Quest : JustCompletedQuests) + { + ActiveQuests.Remove(Quest); + Quest->ApplyRewards(PlayerInventory); + } } UWorldState* UQuestSystem::GetWorldState() const From 5bf8d73d21f894fc6df80745b02c98bee277c971 Mon Sep 17 00:00:00 2001 From: MARCEL HARA Date: Thu, 11 May 2023 11:56:03 +0100 Subject: [PATCH 3/4] Fixed UI not being interactable --- Content/Assets/Characters/Merchant/AMerchant.uasset | 4 ++-- Source/the_twilight_abyss/PlayerTemp/TempCharacter.h | 2 ++ 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/Content/Assets/Characters/Merchant/AMerchant.uasset b/Content/Assets/Characters/Merchant/AMerchant.uasset index 926a431..56591b8 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:2f600ced864f7a102cf58d11ea26742ee91fb11649a561d28cce90d1044947b1 -size 122614 +oid sha256:c050a646fcf2a871733320d3444d94fa6ac57589c5aa378c353c2adc2d018698 +size 133467 diff --git a/Source/the_twilight_abyss/PlayerTemp/TempCharacter.h b/Source/the_twilight_abyss/PlayerTemp/TempCharacter.h index 1a8b284..3bb60c9 100644 --- a/Source/the_twilight_abyss/PlayerTemp/TempCharacter.h +++ b/Source/the_twilight_abyss/PlayerTemp/TempCharacter.h @@ -55,7 +55,9 @@ public: UPROPERTY(EditAnyWhere) float TraceDistance = 200; + UFUNCTION(BlueprintCallable) void InputDisabler(); + void LineTraceLogic(); UPROPERTY() From 2279582438fff52588cb529e773da1d084d2899f Mon Sep 17 00:00:00 2001 From: MARCEL HARA Date: Thu, 11 May 2023 12:11:44 +0100 Subject: [PATCH 4/4] Duplicated build to fix merge --- Content/Levels/Build1.umap | 3 +++ 1 file changed, 3 insertions(+) create mode 100644 Content/Levels/Build1.umap diff --git a/Content/Levels/Build1.umap b/Content/Levels/Build1.umap new file mode 100644 index 0000000..1cf4f72 --- /dev/null +++ b/Content/Levels/Build1.umap @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:3dcd6725cae15728675778ef6b354e65afeac29b4d17244d19c27cf8db49d025 +size 3394495