Philip/AzureAbyss
1
0
Fork 0
Code Issues Pull Requests Releases 1 Activity

Merge branch 'dev' of https://github.falmouth.ac.uk/Games-Academy-Student-Work-22-23/the-twilight-abyss into dev

Browse Source
This commit is contained in:
George Taylor 2023-05-11 12:17:06 +01:00
commit 62273aca77
6 changed files with 18 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

BIN
Content/Assets/Characters/Merchant/AMerchant.uasset (Stored with Git LFS)
View File

Binary file not shown.

BIN
Content/Assets/Objects/Updated_level_map/Level_1_Blockout_improvement_textured_Cylinder_004.uasset (Stored with Git LFS)
View File

Binary file not shown.

BIN
Content/Levels/Build.umap (Stored with Git LFS)
View File

Binary file not shown.

3
Content/Levels/Build1.umap Normal file
View File

@ -0,0 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:3dcd6725cae15728675778ef6b354e65afeac29b4d17244d19c27cf8db49d025
size 3394495

2
Source/the_twilight_abyss/PlayerTemp/TempCharacter.h
View File

@ -55,7 +55,9 @@ public:
UPROPERTY(EditAnyWhere) UPROPERTY(EditAnyWhere)
float TraceDistance = 200; float TraceDistance = 200;
UFUNCTION(BlueprintCallable)
void InputDisabler(); void InputDisabler();
void LineTraceLogic(); void LineTraceLogic();
UPROPERTY() UPROPERTY()

8
Source/the_twilight_abyss/Quest/QuestSystem.cpp
View File

@ -54,12 +54,13 @@ void UQuestSystem::TickComponent(float DeltaTime, ELevelTick TickType, FActorCom
void UQuestSystem::CheckActiveQuestConditions() void UQuestSystem::CheckActiveQuestConditions()
{ {
TArray<UQuest*> JustCompletedQuests;
for (UQuest* Quest : ActiveQuests) for (UQuest* Quest : ActiveQuests)
{ {
if (Quest->CheckConditions(GetWorldState())) if (Quest->CheckConditions(GetWorldState()))
{ {
CompletedQuests.Add(Quest); CompletedQuests.Add(Quest);
Quest->ApplyRewards(PlayerInventory); JustCompletedQuests.Add(Quest);
for (TTuple<FString, bool> QuestFlag : Quest->QuestFlagsOnComplete) for (TTuple<FString, bool> QuestFlag : Quest->QuestFlagsOnComplete)
{ {
QuestFlags.Add(QuestFlag.Key, QuestFlag.Value); QuestFlags.Add(QuestFlag.Key, QuestFlag.Value);
@ -79,6 +80,11 @@ void UQuestSystem::CheckActiveQuestConditions()
} }
UpdateQuestGoalsUI(Quest); UpdateQuestGoalsUI(Quest);
} }
for (UQuest* Quest : JustCompletedQuests)
{
ActiveQuests.Remove(Quest);
Quest->ApplyRewards(PlayerInventory);
}
} }
UWorldState* UQuestSystem::GetWorldState() const UWorldState* UQuestSystem::GetWorldState() const