From 0e268c28f9babf470b999dfb2b36f7e3a8c717fc Mon Sep 17 00:00:00 2001 From: PHILIP WHITE Date: Mon, 5 Feb 2024 17:04:03 +0000 Subject: [PATCH 01/25] Bugfix Game Mode Not Correctly Being Set On Dialogue End --- .../CinematicFrmaes/TimothyEliminatedSequence1.uasset | 4 ++-- .../CinematicFrmaes/TimothyEliminatedSequence2.uasset | 4 ++-- .../CinematicFrmaes/TimothyEliminatedSequence3.uasset | 4 ++-- EndlessVendetta/Content/Dialogue/Testing/BP_Mayor.uasset | 4 ++-- .../Content/Dialogue/Testing/mccreescetchfab.uasset | 3 +++ EndlessVendetta/Content/MainMenu/Music/Menu_maybe_1.uasset | 2 +- EndlessVendetta/Content/MainMenu/Music/Menu_maybe_2.uasset | 2 +- .../DialogueSystem/AC_PlayerDialogueInterpreter.cpp | 2 +- 8 files changed, 14 insertions(+), 11 deletions(-) create mode 100644 EndlessVendetta/Content/Dialogue/Testing/mccreescetchfab.uasset diff --git a/EndlessVendetta/Content/BountySystem/ApartmentBounty/CinematicFrmaes/TimothyEliminatedSequence1.uasset b/EndlessVendetta/Content/BountySystem/ApartmentBounty/CinematicFrmaes/TimothyEliminatedSequence1.uasset index c61f6f3d..2fefa4b1 100644 --- a/EndlessVendetta/Content/BountySystem/ApartmentBounty/CinematicFrmaes/TimothyEliminatedSequence1.uasset +++ b/EndlessVendetta/Content/BountySystem/ApartmentBounty/CinematicFrmaes/TimothyEliminatedSequence1.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:9a9afa23ae558b83cb702459c867762949f69aef33c0f2f8a56e183deef52932 -size 194758 +oid sha256:fd48ed44b7418ebe41e2ecfa34fc5255516804e276a362a70ed254c94d1f5948 +size 194853 diff --git a/EndlessVendetta/Content/BountySystem/ApartmentBounty/CinematicFrmaes/TimothyEliminatedSequence2.uasset b/EndlessVendetta/Content/BountySystem/ApartmentBounty/CinematicFrmaes/TimothyEliminatedSequence2.uasset index 6f47784b..46345e7c 100644 --- a/EndlessVendetta/Content/BountySystem/ApartmentBounty/CinematicFrmaes/TimothyEliminatedSequence2.uasset +++ b/EndlessVendetta/Content/BountySystem/ApartmentBounty/CinematicFrmaes/TimothyEliminatedSequence2.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:b42f7563773dec9db697b0e2621bf9ce0f4f66c973f77ef24e3ffec0f633e14a -size 187754 +oid sha256:3e831a54780e268243e807dba5db877a6e4a11de39c0cf215bf7a80a4ebd8ae8 +size 187849 diff --git a/EndlessVendetta/Content/BountySystem/ApartmentBounty/CinematicFrmaes/TimothyEliminatedSequence3.uasset b/EndlessVendetta/Content/BountySystem/ApartmentBounty/CinematicFrmaes/TimothyEliminatedSequence3.uasset index ac6f5814..5b7f3dc1 100644 --- a/EndlessVendetta/Content/BountySystem/ApartmentBounty/CinematicFrmaes/TimothyEliminatedSequence3.uasset +++ b/EndlessVendetta/Content/BountySystem/ApartmentBounty/CinematicFrmaes/TimothyEliminatedSequence3.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:161d5bd4b9ad1fd63d358155ca4612b125d7471c35dd39219bb0727fdf255cf0 -size 46015 +oid sha256:2e7637dc22779c553d568c5cba824c68f7adc5bb4d03bd2b05c441b047dd511e +size 46110 diff --git a/EndlessVendetta/Content/Dialogue/Testing/BP_Mayor.uasset b/EndlessVendetta/Content/Dialogue/Testing/BP_Mayor.uasset index 86869ecb..5b47134c 100644 --- a/EndlessVendetta/Content/Dialogue/Testing/BP_Mayor.uasset +++ b/EndlessVendetta/Content/Dialogue/Testing/BP_Mayor.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:4280fd261e4b0d85f410669264906255cdcc74e55477faa4fe5e46c3d33aeee4 -size 30273 +oid sha256:bff7d38f762b18dc8b6df862bf514792adbb9f6099f05cb80c736bfa0dccd5b8 +size 30562 diff --git a/EndlessVendetta/Content/Dialogue/Testing/mccreescetchfab.uasset b/EndlessVendetta/Content/Dialogue/Testing/mccreescetchfab.uasset new file mode 100644 index 00000000..a5638509 --- /dev/null +++ b/EndlessVendetta/Content/Dialogue/Testing/mccreescetchfab.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:dad03734a28fc42ba603a08122576da60906a7a06ccc74fe609c3ae6f5548c46 +size 96940 diff --git a/EndlessVendetta/Content/MainMenu/Music/Menu_maybe_1.uasset b/EndlessVendetta/Content/MainMenu/Music/Menu_maybe_1.uasset index 94c0b816..b1fdda66 100644 --- a/EndlessVendetta/Content/MainMenu/Music/Menu_maybe_1.uasset +++ b/EndlessVendetta/Content/MainMenu/Music/Menu_maybe_1.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:c45189d39477bb218b76eb906ade0e079d528c9b0bd97dcd91595d3d84c5498b +oid sha256:1e53da13134e860e42c8c1c5c5e8641e6ecc134686cc5bf58b366fdc40e331f4 size 10175168 diff --git a/EndlessVendetta/Content/MainMenu/Music/Menu_maybe_2.uasset b/EndlessVendetta/Content/MainMenu/Music/Menu_maybe_2.uasset index 02149b54..9751764d 100644 --- a/EndlessVendetta/Content/MainMenu/Music/Menu_maybe_2.uasset +++ b/EndlessVendetta/Content/MainMenu/Music/Menu_maybe_2.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:4ab7d47d6559b81d51e0575f55eb4a10aa96504500b0ab5ddce0fb4b9c40cc2e +oid sha256:e0096c0ffd77ec2c55ba562f83e4ffc4fbfbce7ac792ca28404db386be285cc8 size 4793489 diff --git a/EndlessVendetta/Source/EndlessVendetta/DialogueSystem/AC_PlayerDialogueInterpreter.cpp b/EndlessVendetta/Source/EndlessVendetta/DialogueSystem/AC_PlayerDialogueInterpreter.cpp index f11997ca..ee03cad5 100644 --- a/EndlessVendetta/Source/EndlessVendetta/DialogueSystem/AC_PlayerDialogueInterpreter.cpp +++ b/EndlessVendetta/Source/EndlessVendetta/DialogueSystem/AC_PlayerDialogueInterpreter.cpp @@ -116,7 +116,7 @@ void UAC_PlayerDialogueInterpreter::EndDialogue() if (APlayerController* PlayerController = GetWorld()->GetFirstPlayerController()) { - const FInputModeGameAndUI InputModeData; + const FInputModeGameOnly InputModeData; PlayerController->SetInputMode(InputModeData); PlayerController->bShowMouseCursor = false; } From 6b34ee2401ccfd198272b2e1db1bb28ae36c1f89 Mon Sep 17 00:00:00 2001 From: PHILIP WHITE Date: Mon, 5 Feb 2024 17:19:01 +0000 Subject: [PATCH 02/25] Update Dialogue to be Able to Click to Progress --- EndlessVendetta/Content/Dialogue/BP_DialogueUI.uasset | 4 ++-- EndlessVendetta/Content/MainMenu/Music/Manu_maybe_3.uasset | 2 +- EndlessVendetta/Content/MainMenu/Music/Menu_maybe_3_1.uasset | 2 +- EndlessVendetta/Content/PauseMenu/PauseMenuBackground.uasset | 4 ++-- .../DialogueSystem/AC_PlayerDialogueInterpreter.cpp | 1 + 5 files changed, 7 insertions(+), 6 deletions(-) diff --git a/EndlessVendetta/Content/Dialogue/BP_DialogueUI.uasset b/EndlessVendetta/Content/Dialogue/BP_DialogueUI.uasset index 085864ef..f2032bc7 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:35908c5dcdb5143afd98a83341d8cb46d90ab1430b3d365f1b4707d85c793c70 -size 224018 +oid sha256:18f25031baa2166bb6085631ad0d09eacb61140da74137347709274b8caac5ca +size 233135 diff --git a/EndlessVendetta/Content/MainMenu/Music/Manu_maybe_3.uasset b/EndlessVendetta/Content/MainMenu/Music/Manu_maybe_3.uasset index 4fc01cf4..bf26a840 100644 --- a/EndlessVendetta/Content/MainMenu/Music/Manu_maybe_3.uasset +++ b/EndlessVendetta/Content/MainMenu/Music/Manu_maybe_3.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:eb8f4c9f8b54f6f6bf65b0d41ff7f1ea5c8a9c25e494a0ceae061faa431279f9 +oid sha256:d6b53e65d1478291402898cdcc39158cedac1091873500d8429a0050ba4b6e40 size 6023064 diff --git a/EndlessVendetta/Content/MainMenu/Music/Menu_maybe_3_1.uasset b/EndlessVendetta/Content/MainMenu/Music/Menu_maybe_3_1.uasset index 41087f44..48b24b2a 100644 --- a/EndlessVendetta/Content/MainMenu/Music/Menu_maybe_3_1.uasset +++ b/EndlessVendetta/Content/MainMenu/Music/Menu_maybe_3_1.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:b1d6ac457cec4cc6d963b0522d8adbd8ce6e90f7e1d290c482c548cb596017c4 +oid sha256:a9a4773b9ec5db370898639bd618f51024a541b99b41ab8ea5b33b43ac341947 size 15907164 diff --git a/EndlessVendetta/Content/PauseMenu/PauseMenuBackground.uasset b/EndlessVendetta/Content/PauseMenu/PauseMenuBackground.uasset index 2cc1da9e..364b534b 100644 --- a/EndlessVendetta/Content/PauseMenu/PauseMenuBackground.uasset +++ b/EndlessVendetta/Content/PauseMenu/PauseMenuBackground.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:1f5ba48d09af24b7bd6d2265d08899b4e0237ac470f4b9d9326ed388289b5ce6 -size 47717 +oid sha256:e859baaadbcc2e64ec682e5450d17cca1b1d3040358c6ccce4366300054a29bf +size 47812 diff --git a/EndlessVendetta/Source/EndlessVendetta/DialogueSystem/AC_PlayerDialogueInterpreter.cpp b/EndlessVendetta/Source/EndlessVendetta/DialogueSystem/AC_PlayerDialogueInterpreter.cpp index ee03cad5..40096b70 100644 --- a/EndlessVendetta/Source/EndlessVendetta/DialogueSystem/AC_PlayerDialogueInterpreter.cpp +++ b/EndlessVendetta/Source/EndlessVendetta/DialogueSystem/AC_PlayerDialogueInterpreter.cpp @@ -69,6 +69,7 @@ void UAC_PlayerDialogueInterpreter::StartDialogue(UDialogueTree* DialogueTree) void UAC_PlayerDialogueInterpreter::NextDialogue() { if (!IsValid(CurrentTextNode)) return; + if (IsValid(CurrentChoiceNode)) return; if (CurrentTextNode->ChildrenNodes.Num() == 0) { EndDialogue(); From 61dfe7467bf186cc694cd777e30453e4f165253b Mon Sep 17 00:00:00 2001 From: PHILIP WHITE Date: Mon, 5 Feb 2024 20:12:29 +0000 Subject: [PATCH 03/25] Update Dialogue to Skip Typewriter Effect --- EndlessVendetta/Content/Dialogue/BP_DialogueUI.uasset | 4 ++-- .../FirstPerson/Blueprints/BP_FirstPersonCharacter.uasset | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/EndlessVendetta/Content/Dialogue/BP_DialogueUI.uasset b/EndlessVendetta/Content/Dialogue/BP_DialogueUI.uasset index f2032bc7..44c7551f 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:18f25031baa2166bb6085631ad0d09eacb61140da74137347709274b8caac5ca -size 233135 +oid sha256:2cd40ad218e1f5f1472eeaeceeeb174e200b78fa10e739e06b7284439ebdbfd1 +size 329748 diff --git a/EndlessVendetta/Content/FirstPerson/Blueprints/BP_FirstPersonCharacter.uasset b/EndlessVendetta/Content/FirstPerson/Blueprints/BP_FirstPersonCharacter.uasset index 56637590..93acb514 100644 --- a/EndlessVendetta/Content/FirstPerson/Blueprints/BP_FirstPersonCharacter.uasset +++ b/EndlessVendetta/Content/FirstPerson/Blueprints/BP_FirstPersonCharacter.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:8940bc41955ada96468ffc747fadce7e4ffd6e694118e4367d00dcf18407f17a -size 494513 +oid sha256:42ea885a3728084f3a0fc2945847391504503bbc7a8476c490624a90d35ad53b +size 468474 From f1b5e5068c9b64d3e21ca95e06de47e3e6877b3f Mon Sep 17 00:00:00 2001 From: Rafal Swierczek Date: Wed, 7 Feb 2024 21:51:46 +0000 Subject: [PATCH 04/25] Implemented Bounty Tab Functionality without Bounty Tracking --- .../.idea.EndlessVendetta/.idea/workspace.xml | 56 +++++++++++-------- .../ApartmentBounty/MB_Apartment.uasset | 4 +- .../Bounty/MB_Training.uasset | 4 +- .../Mayor_tutorial_dialogue_tree.uasset | 4 +- .../Content/Levels/MainMenuLevel.umap | 4 +- .../PauseMenu/Tabs/WBP_BountiesTab.uasset | 4 +- .../Content/PauseMenu/WBP_PauseMenu.uasset | 4 +- .../Blueprints/Blueprint_CeilingLight.uasset | 4 +- .../HDRI/HDRI_Epic_Courtyard_Daylight.uasset | 4 +- .../BountySystem/MainBountyClass.h | 36 +++++++++++- .../BountySystem/SideBountyClass.h | 15 +++++ .../Characters/BountyHunterCharacter.cpp | 2 + .../Characters/BountyHunterCharacter.h | 17 ++++++ .../EndlessVendetta/PauseMenu/BountiesTab.h | 5 +- .../PauseMenu/TabStructs/BountyTabInfo.cpp | 1 + .../PauseMenu/TabStructs/BountyTabInfo.h | 17 ++++++ 16 files changed, 137 insertions(+), 44 deletions(-) create mode 100644 EndlessVendetta/Source/EndlessVendetta/PauseMenu/TabStructs/BountyTabInfo.cpp create mode 100644 EndlessVendetta/Source/EndlessVendetta/PauseMenu/TabStructs/BountyTabInfo.h diff --git a/EndlessVendetta/.idea/.idea.EndlessVendetta/.idea/workspace.xml b/EndlessVendetta/.idea/.idea.EndlessVendetta/.idea/workspace.xml index 032408b5..8cf8769f 100644 --- a/EndlessVendetta/.idea/.idea.EndlessVendetta/.idea/workspace.xml +++ b/EndlessVendetta/.idea/.idea.EndlessVendetta/.idea/workspace.xml @@ -8,15 +8,22 @@ + + - + + + + + - - - + + + + - + - { - "keyToString": { - "C++ Project.EndlessVendetta.executor": "Run", - "RunOnceActivity.OpenProjectViewOnStart": "true", - "RunOnceActivity.ShowReadmeOnStart": "true", - "git-widget-placeholder": "PauseMenu", - "ignore.virus.scanning.warn.message": "true", - "node.js.detected.package.eslint": "true", - "node.js.detected.package.tslint": "true", - "node.js.selected.package.eslint": "(autodetect)", - "node.js.selected.package.tslint": "(autodetect)", - "nodejs_package_manager_path": "npm", - "vue.rearranger.settings.migration": "true" + +}]]> @@ -135,6 +142,7 @@ + diff --git a/EndlessVendetta/Content/BountySystem/ApartmentBounty/MB_Apartment.uasset b/EndlessVendetta/Content/BountySystem/ApartmentBounty/MB_Apartment.uasset index 9874fb3c..0aa1d885 100644 --- a/EndlessVendetta/Content/BountySystem/ApartmentBounty/MB_Apartment.uasset +++ b/EndlessVendetta/Content/BountySystem/ApartmentBounty/MB_Apartment.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:3f54596b2946a99060351c9a805c70203868db194b24f94a9999bc72847cb197 -size 23998 +oid sha256:6593629256e5444639af0a54a54707e4bb015e680ceeaba562e76909f9d55f10 +size 25322 diff --git a/EndlessVendetta/Content/BountySystem/ControlsTutorial/Bounty/MB_Training.uasset b/EndlessVendetta/Content/BountySystem/ControlsTutorial/Bounty/MB_Training.uasset index abd6b8f7..0d7669a7 100644 --- a/EndlessVendetta/Content/BountySystem/ControlsTutorial/Bounty/MB_Training.uasset +++ b/EndlessVendetta/Content/BountySystem/ControlsTutorial/Bounty/MB_Training.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:79ee7d751efb58c167bfd14d74bac82cb3c3b02094f86cd0ea000a807211d478 -size 26452 +oid sha256:b6661ae50a80b9e76b87079bc9f40c2f8474c5ebdba38753b5b9223c3fba2e96 +size 27992 diff --git a/EndlessVendetta/Content/Dialogue/Mayor_tutorial_dialogue_tree.uasset b/EndlessVendetta/Content/Dialogue/Mayor_tutorial_dialogue_tree.uasset index 94d07770..10924e47 100644 --- a/EndlessVendetta/Content/Dialogue/Mayor_tutorial_dialogue_tree.uasset +++ b/EndlessVendetta/Content/Dialogue/Mayor_tutorial_dialogue_tree.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:2ff24a84d1c042c20b8f3ec95ad35354f71120cae523ef67a0e54a129fb4c738 -size 106796 +oid sha256:2f80aa0f912419477dc9667f6ba9fb038ac46ded87477d07d81966e4db4008ae +size 105839 diff --git a/EndlessVendetta/Content/Levels/MainMenuLevel.umap b/EndlessVendetta/Content/Levels/MainMenuLevel.umap index 4fb787ef..41f224b2 100644 --- a/EndlessVendetta/Content/Levels/MainMenuLevel.umap +++ b/EndlessVendetta/Content/Levels/MainMenuLevel.umap @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:62323ec29b4a5d647b91a836041fb29cbac98efc420ff43db000bf63ba74e92d -size 308758 +oid sha256:77a3ca4ec175668d370773d936ab81f41ddc197ebe0841e24801910512c8dcd0 +size 308710 diff --git a/EndlessVendetta/Content/PauseMenu/Tabs/WBP_BountiesTab.uasset b/EndlessVendetta/Content/PauseMenu/Tabs/WBP_BountiesTab.uasset index 425b5d7f..fcf2da3e 100644 --- a/EndlessVendetta/Content/PauseMenu/Tabs/WBP_BountiesTab.uasset +++ b/EndlessVendetta/Content/PauseMenu/Tabs/WBP_BountiesTab.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:51dce130f9a950a96cc11a6d0ce5c7da112f49d961edb944ec9cf866a00b46a2 -size 25564 +oid sha256:4dd8fb12b1bf5ebd10c41083bc1aff236c5daf1d26a1a18aef5e8a07a8975ac6 +size 133345 diff --git a/EndlessVendetta/Content/PauseMenu/WBP_PauseMenu.uasset b/EndlessVendetta/Content/PauseMenu/WBP_PauseMenu.uasset index 74180af7..3d0c7902 100644 --- a/EndlessVendetta/Content/PauseMenu/WBP_PauseMenu.uasset +++ b/EndlessVendetta/Content/PauseMenu/WBP_PauseMenu.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:6da7938ededede015f593c24d848d94faca0e6fa502cf28e3ec3a57fb3627c58 -size 485775 +oid sha256:d08d2c22363938e76543ee9960bc2292c176ac79355269a17911ef0bbd3dc67b +size 484766 diff --git a/EndlessVendetta/Content/StarterContent/Blueprints/Blueprint_CeilingLight.uasset b/EndlessVendetta/Content/StarterContent/Blueprints/Blueprint_CeilingLight.uasset index c5c3b84e..0fb612e5 100644 --- a/EndlessVendetta/Content/StarterContent/Blueprints/Blueprint_CeilingLight.uasset +++ b/EndlessVendetta/Content/StarterContent/Blueprints/Blueprint_CeilingLight.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:4a60a29ad596546d481e43dfb8698842a78cc07f4a4b1000fa397cfba4e72331 -size 158206 +oid sha256:b4b77d0bb4418c2e9b324fb5d23e90ecd64ddd13698533659b6fbf435da206e9 +size 43745 diff --git a/EndlessVendetta/Content/StarterContent/HDRI/HDRI_Epic_Courtyard_Daylight.uasset b/EndlessVendetta/Content/StarterContent/HDRI/HDRI_Epic_Courtyard_Daylight.uasset index b715cd47..0f990580 100644 --- a/EndlessVendetta/Content/StarterContent/HDRI/HDRI_Epic_Courtyard_Daylight.uasset +++ b/EndlessVendetta/Content/StarterContent/HDRI/HDRI_Epic_Courtyard_Daylight.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:d029060e9a20598861faa739272c3bbf75646095f4811df3347556cdf8606199 -size 66790690 +oid sha256:bc35eb2d43a47427d30aba0196f9eac90d089dd3abca319528c5d25c83510d0d +size 72364642 diff --git a/EndlessVendetta/Source/EndlessVendetta/BountySystem/MainBountyClass.h b/EndlessVendetta/Source/EndlessVendetta/BountySystem/MainBountyClass.h index cb403d15..912449f4 100644 --- a/EndlessVendetta/Source/EndlessVendetta/BountySystem/MainBountyClass.h +++ b/EndlessVendetta/Source/EndlessVendetta/BountySystem/MainBountyClass.h @@ -7,9 +7,36 @@ #include "SideBountyClass.h" #include "MainBountyClass.generated.h" -/** - * - */ +USTRUCT(BlueprintType) +struct FMainBountyStruct +{ + GENERATED_BODY(); + + UPROPERTY(BlueprintReadOnly, EditDefaultsOnly) + FString TargetName = ""; + + UPROPERTY(BlueprintReadOnly, EditDefaultsOnly) + FString TargetDOB = ""; + + UPROPERTY(BlueprintReadOnly, EditDefaultsOnly) + FString TargetOccupation = ""; + + UPROPERTY(BlueprintReadOnly, EditDefaultsOnly) + FString TargetLocation = ""; + + UPROPERTY(BlueprintReadOnly, EditDefaultsOnly) + FString BountyDescription = ""; + + UPROPERTY(BlueprintReadOnly, EditDefaultsOnly) + UTexture2D* TargetPhoto = nullptr; + + UPROPERTY(BlueprintReadOnly, EditDefaultsOnly) + UTexture2D* Floorplan = nullptr; + + UPROPERTY(BlueprintReadOnly) + bool Tracked = true; +}; + UCLASS() class ENDLESSVENDETTA_API AMainBountyClass : public ABountyClass { @@ -31,6 +58,9 @@ protected: public: + // Struct Containing all Data to be Displayed about the Main Bounty + UPROPERTY(EditDefaultsOnly, Category = "Bounty") + FMainBountyStruct MainBountyStruct; // ------------------- METHODS --------------------------------- private: diff --git a/EndlessVendetta/Source/EndlessVendetta/BountySystem/SideBountyClass.h b/EndlessVendetta/Source/EndlessVendetta/BountySystem/SideBountyClass.h index 758c1e77..12d66397 100644 --- a/EndlessVendetta/Source/EndlessVendetta/BountySystem/SideBountyClass.h +++ b/EndlessVendetta/Source/EndlessVendetta/BountySystem/SideBountyClass.h @@ -6,6 +6,21 @@ #include "BountyClass.h" #include "SideBountyClass.generated.h" +USTRUCT(BlueprintType) +struct FSideBountyStruct +{ + GENERATED_BODY(); + + UPROPERTY(BlueprintReadOnly, EditDefaultsOnly) + FString BountyTitle = ""; + + UPROPERTY(BlueprintReadOnly, EditDefaultsOnly) + FString BountyDesc = ""; + + UPROPERTY(BlueprintReadOnly) + bool Tracked = true; +}; + DECLARE_DYNAMIC_MULTICAST_DELEGATE_OneParam(FCompletedSideBounty, int, FavoursEarned); UCLASS() diff --git a/EndlessVendetta/Source/EndlessVendetta/Characters/BountyHunterCharacter.cpp b/EndlessVendetta/Source/EndlessVendetta/Characters/BountyHunterCharacter.cpp index d6363f4b..742aab23 100644 --- a/EndlessVendetta/Source/EndlessVendetta/Characters/BountyHunterCharacter.cpp +++ b/EndlessVendetta/Source/EndlessVendetta/Characters/BountyHunterCharacter.cpp @@ -26,6 +26,7 @@ void ABountyHunterCharacter::SpawnMainBounty(UEVGameInstance* GI) CurrentMainBounty->AttachToComponent(GetRootComponent(), AttachmentTransformRules); UGameplayStatics::GetCurrentLevelName(GetWorld()) == OpenWorldLevelName ? CurrentMainBounty->SpawnOpenWorldCheckpoint() : CurrentMainBounty->SpawnCheckpoints(); + MainBountyStruct = CurrentMainBounty->MainBountyStruct; } void ABountyHunterCharacter::CompleteCurrentMainBounty(UEVGameInstance* GI) @@ -107,6 +108,7 @@ void ABountyHunterCharacter::EndPlay(const EEndPlayReason::Type EndPlayReason) void ABountyHunterCharacter::CreatePauseMenuTabs() { BountiesTab = CreateWidget(GetWorld(), BountyTabWidgetClass); + UpdateBountyTabInfo(); FavoursTab = CreateWidget(GetWorld(), FavoursTabWidgetClass); NavigationTab = CreateWidget(GetWorld(), NavigationTabWidgetClass); SettingsTab = CreateWidget(GetWorld(), SettingsTabWidgetClass); diff --git a/EndlessVendetta/Source/EndlessVendetta/Characters/BountyHunterCharacter.h b/EndlessVendetta/Source/EndlessVendetta/Characters/BountyHunterCharacter.h index 50695cba..c125d168 100644 --- a/EndlessVendetta/Source/EndlessVendetta/Characters/BountyHunterCharacter.h +++ b/EndlessVendetta/Source/EndlessVendetta/Characters/BountyHunterCharacter.h @@ -6,7 +6,9 @@ #include "EndlessVendetta/EndlessVendettaCharacter.h" #include "EndlessVendetta/EVGameInstance.h" #include "EndlessVendetta/MainSaveGameClass.h" +#include "EndlessVendetta/PauseMenu/TabStructs/BountyTabInfo.h" #include "EndlessVendetta/BountySystem/MainBountyClass.h" +#include "EndlessVendetta/BountySystem/SideBountyClass.h" #include "EndlessVendetta/PauseMenu/BountiesTab.h" #include "EndlessVendetta/PauseMenu/PauseMenuClass.h" #include "EndlessVendetta/PauseMenu/QuitTab.h" @@ -160,4 +162,19 @@ private: { PauseMenu->OpenNewTab(QuitTab); } + + FBountyTabInfo BountyTabInfo; + + FMainBountyStruct MainBountyStruct; + + TArray SideBountyStruct; + + void UpdateBountyTabInfo() + { + if (!IsValid(BountiesTab)) return; + BountyTabInfo.MainBountyStruct = MainBountyStruct; + BountyTabInfo.SideBountyStructs = SideBountyStruct; + + BountiesTab->UpdateBountyTab(BountyTabInfo); + } }; diff --git a/EndlessVendetta/Source/EndlessVendetta/PauseMenu/BountiesTab.h b/EndlessVendetta/Source/EndlessVendetta/PauseMenu/BountiesTab.h index 85878167..5fe2279b 100644 --- a/EndlessVendetta/Source/EndlessVendetta/PauseMenu/BountiesTab.h +++ b/EndlessVendetta/Source/EndlessVendetta/PauseMenu/BountiesTab.h @@ -3,6 +3,7 @@ #pragma once #include "CoreMinimal.h" +#include "TabStructs/BountyTabInfo.h" #include "TabWidget.h" #include "EndlessVendetta/BountySystem/BountyClass.h" #include "BountiesTab.generated.h" @@ -27,5 +28,7 @@ private: protected: -public: +public: + UFUNCTION(BlueprintImplementableEvent) + void UpdateBountyTab(FBountyTabInfo BountyTabInfo); }; diff --git a/EndlessVendetta/Source/EndlessVendetta/PauseMenu/TabStructs/BountyTabInfo.cpp b/EndlessVendetta/Source/EndlessVendetta/PauseMenu/TabStructs/BountyTabInfo.cpp new file mode 100644 index 00000000..1a8ea118 --- /dev/null +++ b/EndlessVendetta/Source/EndlessVendetta/PauseMenu/TabStructs/BountyTabInfo.cpp @@ -0,0 +1 @@ +#include "BountyTabInfo.h" diff --git a/EndlessVendetta/Source/EndlessVendetta/PauseMenu/TabStructs/BountyTabInfo.h b/EndlessVendetta/Source/EndlessVendetta/PauseMenu/TabStructs/BountyTabInfo.h new file mode 100644 index 00000000..560f7816 --- /dev/null +++ b/EndlessVendetta/Source/EndlessVendetta/PauseMenu/TabStructs/BountyTabInfo.h @@ -0,0 +1,17 @@ +#pragma once + +#include "EndlessVendetta/BountySystem/MainBountyClass.h" +#include "EndlessVendetta/BountySystem/SideBountyClass.h" +#include "BountyTabInfo.generated.h" + +USTRUCT(BlueprintType) +struct FBountyTabInfo +{ + GENERATED_BODY(); + + UPROPERTY(BlueprintReadOnly) + FMainBountyStruct MainBountyStruct; + + UPROPERTY(BlueprintReadOnly) + TArray SideBountyStructs; +}; From 543c20ea510523289e11f1041db14f16bb813636 Mon Sep 17 00:00:00 2001 From: Rafal Swierczek Date: Thu, 8 Feb 2024 17:40:33 +0000 Subject: [PATCH 05/25] Implemented Bounty Tabs for in Progress Bounties --- .../.idea.EndlessVendetta/.idea/workspace.xml | 51 ++++++++----------- .../Blueprints/BP_FirstPersonCharacter.uasset | 4 +- .../Tabs/BountyTabs/WBP_BountiesTab.uasset | 3 ++ .../Tabs/BountyTabs/WBP_InProgressTab.uasset | 3 ++ .../BountyTabs/WBP_TutorialBountiesTab.uasset | 3 ++ .../PauseMenu/Tabs/WBP_BountiesTab.uasset | 3 -- .../Blueprints/Blueprint_CeilingLight.uasset | 4 +- .../Props/MaterialSphere.uasset | 4 +- .../Characters/BountyHunterCharacter.cpp | 34 ++++++++++--- .../Characters/BountyHunterCharacter.h | 11 ++++ .../EndlessVendetta/PauseMenu/BountiesTab.h | 4 ++ 11 files changed, 79 insertions(+), 45 deletions(-) create mode 100644 EndlessVendetta/Content/PauseMenu/Tabs/BountyTabs/WBP_BountiesTab.uasset create mode 100644 EndlessVendetta/Content/PauseMenu/Tabs/BountyTabs/WBP_InProgressTab.uasset create mode 100644 EndlessVendetta/Content/PauseMenu/Tabs/BountyTabs/WBP_TutorialBountiesTab.uasset delete mode 100644 EndlessVendetta/Content/PauseMenu/Tabs/WBP_BountiesTab.uasset diff --git a/EndlessVendetta/.idea/.idea.EndlessVendetta/.idea/workspace.xml b/EndlessVendetta/.idea/.idea.EndlessVendetta/.idea/workspace.xml index 8cf8769f..d530d550 100644 --- a/EndlessVendetta/.idea/.idea.EndlessVendetta/.idea/workspace.xml +++ b/EndlessVendetta/.idea/.idea.EndlessVendetta/.idea/workspace.xml @@ -8,19 +8,11 @@ - - - - - - - - + + - - @@ -45,28 +37,28 @@ - { + "keyToString": { + "C++ Project.EndlessVendetta.executor": "Run", + "RunOnceActivity.OpenProjectViewOnStart": "true", + "RunOnceActivity.ShowReadmeOnStart": "true", + "git-widget-placeholder": "PuaseMenuTabs", + "ignore.virus.scanning.warn.message": "true", + "node.js.detected.package.eslint": "true", + "node.js.detected.package.tslint": "true", + "node.js.selected.package.eslint": "(autodetect)", + "node.js.selected.package.tslint": "(autodetect)", + "nodejs_package_manager_path": "npm", + "vue.rearranger.settings.migration": "true" }, - "keyToStringList": { - "rider.external.source.directories": [ - "C:\\Users\\Rafal\\AppData\\Roaming\\JetBrains\\Rider2023.3\\resharper-host\\DecompilerCache", - "C:\\Users\\Rafal\\AppData\\Roaming\\JetBrains\\Rider2023.3\\resharper-host\\SourcesCache", - "C:\\Users\\Rafal\\AppData\\Local\\Symbols\\src" + "keyToStringList": { + "rider.external.source.directories": [ + "C:\\Users\\Rafal\\AppData\\Roaming\\JetBrains\\Rider2023.3\\resharper-host\\DecompilerCache", + "C:\\Users\\Rafal\\AppData\\Roaming\\JetBrains\\Rider2023.3\\resharper-host\\SourcesCache", + "C:\\Users\\Rafal\\AppData\\Local\\Symbols\\src" ] } -}]]> +} @@ -143,6 +135,7 @@ + diff --git a/EndlessVendetta/Content/FirstPerson/Blueprints/BP_FirstPersonCharacter.uasset b/EndlessVendetta/Content/FirstPerson/Blueprints/BP_FirstPersonCharacter.uasset index 56637590..98254401 100644 --- a/EndlessVendetta/Content/FirstPerson/Blueprints/BP_FirstPersonCharacter.uasset +++ b/EndlessVendetta/Content/FirstPerson/Blueprints/BP_FirstPersonCharacter.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:8940bc41955ada96468ffc747fadce7e4ffd6e694118e4367d00dcf18407f17a -size 494513 +oid sha256:d1e82512f58222609355f190b818512aca42bd72377a314bd938c93737d67013 +size 488555 diff --git a/EndlessVendetta/Content/PauseMenu/Tabs/BountyTabs/WBP_BountiesTab.uasset b/EndlessVendetta/Content/PauseMenu/Tabs/BountyTabs/WBP_BountiesTab.uasset new file mode 100644 index 00000000..e0b0170f --- /dev/null +++ b/EndlessVendetta/Content/PauseMenu/Tabs/BountyTabs/WBP_BountiesTab.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:73c562cd7614a47d3e9c8504b3f67104b4ce07cbf83c4f6ea95a72ac600b3664 +size 132511 diff --git a/EndlessVendetta/Content/PauseMenu/Tabs/BountyTabs/WBP_InProgressTab.uasset b/EndlessVendetta/Content/PauseMenu/Tabs/BountyTabs/WBP_InProgressTab.uasset new file mode 100644 index 00000000..be773711 --- /dev/null +++ b/EndlessVendetta/Content/PauseMenu/Tabs/BountyTabs/WBP_InProgressTab.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:59190025f1005df0289f316350ff872ab5196312dd5446a0b74375b00bac3a67 +size 28821 diff --git a/EndlessVendetta/Content/PauseMenu/Tabs/BountyTabs/WBP_TutorialBountiesTab.uasset b/EndlessVendetta/Content/PauseMenu/Tabs/BountyTabs/WBP_TutorialBountiesTab.uasset new file mode 100644 index 00000000..db1f0e94 --- /dev/null +++ b/EndlessVendetta/Content/PauseMenu/Tabs/BountyTabs/WBP_TutorialBountiesTab.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:99cde5382b36e7940d39b88e4aa1ec50d77759185a35362b8834919ec983f13e +size 26273 diff --git a/EndlessVendetta/Content/PauseMenu/Tabs/WBP_BountiesTab.uasset b/EndlessVendetta/Content/PauseMenu/Tabs/WBP_BountiesTab.uasset deleted file mode 100644 index fcf2da3e..00000000 --- a/EndlessVendetta/Content/PauseMenu/Tabs/WBP_BountiesTab.uasset +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:4dd8fb12b1bf5ebd10c41083bc1aff236c5daf1d26a1a18aef5e8a07a8975ac6 -size 133345 diff --git a/EndlessVendetta/Content/StarterContent/Blueprints/Blueprint_CeilingLight.uasset b/EndlessVendetta/Content/StarterContent/Blueprints/Blueprint_CeilingLight.uasset index 0fb612e5..c5c3b84e 100644 --- a/EndlessVendetta/Content/StarterContent/Blueprints/Blueprint_CeilingLight.uasset +++ b/EndlessVendetta/Content/StarterContent/Blueprints/Blueprint_CeilingLight.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:b4b77d0bb4418c2e9b324fb5d23e90ecd64ddd13698533659b6fbf435da206e9 -size 43745 +oid sha256:4a60a29ad596546d481e43dfb8698842a78cc07f4a4b1000fa397cfba4e72331 +size 158206 diff --git a/EndlessVendetta/Content/StarterContent/Props/MaterialSphere.uasset b/EndlessVendetta/Content/StarterContent/Props/MaterialSphere.uasset index 56bddfc9..1d8c9235 100644 --- a/EndlessVendetta/Content/StarterContent/Props/MaterialSphere.uasset +++ b/EndlessVendetta/Content/StarterContent/Props/MaterialSphere.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:3a8777c01491888bba9f40eda9d2bed76a611f0e80f75917501ce69c1a321342 -size 47333 +oid sha256:89eb1506e508685a1af663376434dabce0e1bcd54ea2832f7870a91eebf13749 +size 47710 diff --git a/EndlessVendetta/Source/EndlessVendetta/Characters/BountyHunterCharacter.cpp b/EndlessVendetta/Source/EndlessVendetta/Characters/BountyHunterCharacter.cpp index 742aab23..899cbd9f 100644 --- a/EndlessVendetta/Source/EndlessVendetta/Characters/BountyHunterCharacter.cpp +++ b/EndlessVendetta/Source/EndlessVendetta/Characters/BountyHunterCharacter.cpp @@ -34,10 +34,11 @@ void ABountyHunterCharacter::CompleteCurrentMainBounty(UEVGameInstance* GI) // Collect rewards for bounty and move onto next UE_LOG(LogTemp, Warning, TEXT("Would be collecting reward for completing bounty %d"), CurrentMainBountyIndex); - FTransform PostBountySpawnTransform = MainBountyClasses[CurrentMainBountyIndex]->GetDefaultObject()->GetPlayerSpawnTransform(); - SetActorTransform(PostBountySpawnTransform); - Cast(GetController())->SetControlRotation(PostBountySpawnTransform.GetRotation().Rotator()); - + // FTransform PostBountySpawnTransform = MainBountyClasses[CurrentMainBountyIndex]->GetDefaultObject()->GetPlayerSpawnTransform(); + // SetActorTransform(PostBountySpawnTransform); + // Cast(GetController())->SetControlRotation(PostBountySpawnTransform.GetRotation().Rotator()); + + GI->MainSaveGameInstanceRef->PlayerOpenWorldSpawnTransformSave = MainBountyClasses[CurrentMainBountyIndex]->GetDefaultObject()->GetPlayerSpawnTransform(); CurrentMainBountyIndex = GI->MainSaveGameInstanceRef->CurrentMainBountyIndexSave; GI->MainSaveGameInstanceRef->LastMainBountyIndexInOpenWorld = CurrentMainBountyIndex; UGameplayStatics::SaveGameToSlot(GI->MainSaveGameInstanceRef, "MainSave", 0); @@ -59,7 +60,7 @@ void ABountyHunterCharacter::BeginPlay() { SetActorTransform(GI->MainSaveGameInstanceRef->PlayerOpenWorldSpawnTransformSave); Cast(GetController())->SetControlRotation(GI->MainSaveGameInstanceRef->PlayerOpenWorldSpawnTransformSave.GetRotation().Rotator()); - } + } } CreatePauseMenuTabs(); Super::BeginPlay(); @@ -107,7 +108,15 @@ void ABountyHunterCharacter::EndPlay(const EEndPlayReason::Type EndPlayReason) void ABountyHunterCharacter::CreatePauseMenuTabs() { - BountiesTab = CreateWidget(GetWorld(), BountyTabWidgetClass); + if (CurrentMainBountyIndex <= 0) + { + BountiesTab = CreateWidget(GetWorld(), TutorialBountyTabWidgetClass); + } + else + { + BountiesTab = CreateWidget(GetWorld(), UGameplayStatics::GetCurrentLevelName(GetWorld()) == OpenWorldLevelName ? BountyTabWidgetClass : BountyInProgressTabWidgetClass); + BountiesTab->ReturnToOpenWorldEarlyDelegate.AddDynamic(this, &ABountyHunterCharacter::ReturnToOpenWorldEarly); + } UpdateBountyTabInfo(); FavoursTab = CreateWidget(GetWorld(), FavoursTabWidgetClass); NavigationTab = CreateWidget(GetWorld(), NavigationTabWidgetClass); @@ -140,4 +149,15 @@ void ABountyHunterCharacter::TogglePauseMenu() PauseMenu->OpenedNavigationTab.AddDynamic(this, &ABountyHunterCharacter::OpenNavigationTab); PauseMenu->OpenedSettingsTab.AddDynamic(this, &ABountyHunterCharacter::OpenSettingsTab); PauseMenu->OpenedQuitTab.AddDynamic(this, &ABountyHunterCharacter::OpenQuitTab); -} \ No newline at end of file +} + +void ABountyHunterCharacter::ReturnToOpenWorldEarly() +{ + UEVGameInstance* GI = Cast(GetGameInstance()); + if (!IsValid(GI->MainSaveGameInstanceRef)) return; + FTransform SpawnTransform = MainBountyClasses[CurrentMainBountyIndex]->GetDefaultObject()->GetPlayerSpawnTransform(); + + GI->MainSaveGameInstanceRef->PlayerOpenWorldSpawnTransformSave = SpawnTransform; + UGameplayStatics::SaveGameToSlot(GI->MainSaveGameInstanceRef, "MainSave", 0); + UGameplayStatics::OpenLevel(GetWorld(), FName(OpenWorldLevelName)); +} diff --git a/EndlessVendetta/Source/EndlessVendetta/Characters/BountyHunterCharacter.h b/EndlessVendetta/Source/EndlessVendetta/Characters/BountyHunterCharacter.h index c125d168..fe0ea38c 100644 --- a/EndlessVendetta/Source/EndlessVendetta/Characters/BountyHunterCharacter.h +++ b/EndlessVendetta/Source/EndlessVendetta/Characters/BountyHunterCharacter.h @@ -85,6 +85,14 @@ private: // Widget Class used to Spawn Bounties Tab Widget UPROPERTY(EditDefaultsOnly, Category = "Pause Menu") TSubclassOf BountyTabWidgetClass; + + // Widget Class used to Spawn Bounties Tab Widget + UPROPERTY(EditDefaultsOnly, Category = "Pause Menu") + TSubclassOf BountyInProgressTabWidgetClass; + + // Widget Class used to Spawn Bounties Tab Widget + UPROPERTY(EditDefaultsOnly, Category = "Pause Menu") + TSubclassOf TutorialBountyTabWidgetClass; // Reference to Bounty Tab Widget UPROPERTY() @@ -177,4 +185,7 @@ private: BountiesTab->UpdateBountyTab(BountyTabInfo); } + + UFUNCTION() + void ReturnToOpenWorldEarly(); }; diff --git a/EndlessVendetta/Source/EndlessVendetta/PauseMenu/BountiesTab.h b/EndlessVendetta/Source/EndlessVendetta/PauseMenu/BountiesTab.h index 5fe2279b..56f3d49c 100644 --- a/EndlessVendetta/Source/EndlessVendetta/PauseMenu/BountiesTab.h +++ b/EndlessVendetta/Source/EndlessVendetta/PauseMenu/BountiesTab.h @@ -9,6 +9,7 @@ #include "BountiesTab.generated.h" DECLARE_DYNAMIC_MULTICAST_DELEGATE_OneParam(FTrackBounty, ABountyClass*, BountyToTrack); +DECLARE_DYNAMIC_MULTICAST_DELEGATE(FReturnToOpenWorldEarly); UCLASS() class ENDLESSVENDETTA_API UBountiesTab : public UTabWidget @@ -23,6 +24,9 @@ public: UPROPERTY(BlueprintAssignable) FTrackBounty TrackBountyDelegate; + UPROPERTY(BlueprintCallable) + FReturnToOpenWorldEarly ReturnToOpenWorldEarlyDelegate; + // ------------------- METHODS --------------------------------- private: From 50d017caa574f3889d883c1ec9f96b8e2f3aad30 Mon Sep 17 00:00:00 2001 From: Rafal Swierczek Date: Thu, 8 Feb 2024 19:50:04 +0000 Subject: [PATCH 06/25] Bugfix Pause Menu not Focusing upon Construction --- .../.idea/.idea.EndlessVendetta/.idea/workspace.xml | 12 +++++------- .../Content/Dialogue/BP_DialogueUI.uasset | 4 ++-- .../Content/PauseMenu/WBP_PauseMenu.uasset | 4 ++-- .../StarterContent/Architecture/Floor_400x400.uasset | 4 ++-- .../StarterContent/Props/MaterialSphere.uasset | 4 ++-- .../Characters/BountyHunterCharacter.cpp | 11 ++++++++--- 6 files changed, 21 insertions(+), 18 deletions(-) diff --git a/EndlessVendetta/.idea/.idea.EndlessVendetta/.idea/workspace.xml b/EndlessVendetta/.idea/.idea.EndlessVendetta/.idea/workspace.xml index d530d550..1bade766 100644 --- a/EndlessVendetta/.idea/.idea.EndlessVendetta/.idea/workspace.xml +++ b/EndlessVendetta/.idea/.idea.EndlessVendetta/.idea/workspace.xml @@ -9,13 +9,11 @@ - - - - + + + + - - diff --git a/EndlessVendetta/Content/Dialogue/BP_DialogueUI.uasset b/EndlessVendetta/Content/Dialogue/BP_DialogueUI.uasset index 085864ef..a0bce40f 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:35908c5dcdb5143afd98a83341d8cb46d90ab1430b3d365f1b4707d85c793c70 -size 224018 +oid sha256:288e87e29a4363ba187db4f6d9793a7d562d3e1b8f98917cf2aa06afcd296453 +size 222171 diff --git a/EndlessVendetta/Content/PauseMenu/WBP_PauseMenu.uasset b/EndlessVendetta/Content/PauseMenu/WBP_PauseMenu.uasset index 3d0c7902..d9e34568 100644 --- a/EndlessVendetta/Content/PauseMenu/WBP_PauseMenu.uasset +++ b/EndlessVendetta/Content/PauseMenu/WBP_PauseMenu.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:d08d2c22363938e76543ee9960bc2292c176ac79355269a17911ef0bbd3dc67b -size 484766 +oid sha256:64ca05e586e2efad00caccb8877e80ff186de099c7271b368fea7ed544606929 +size 485440 diff --git a/EndlessVendetta/Content/StarterContent/Architecture/Floor_400x400.uasset b/EndlessVendetta/Content/StarterContent/Architecture/Floor_400x400.uasset index c2a34afc..12f5fcc3 100644 --- a/EndlessVendetta/Content/StarterContent/Architecture/Floor_400x400.uasset +++ b/EndlessVendetta/Content/StarterContent/Architecture/Floor_400x400.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:4c0ecf0ac0702cc2bd355ec050232a61c49e10f102448efbeb735a51824adef6 -size 14948 +oid sha256:a12f8ebb6bae23e00bebb19dc55243af89bcd8a40ec7c0de4fb6435e30c0ddb0 +size 14831 diff --git a/EndlessVendetta/Content/StarterContent/Props/MaterialSphere.uasset b/EndlessVendetta/Content/StarterContent/Props/MaterialSphere.uasset index 1d8c9235..56bddfc9 100644 --- a/EndlessVendetta/Content/StarterContent/Props/MaterialSphere.uasset +++ b/EndlessVendetta/Content/StarterContent/Props/MaterialSphere.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:89eb1506e508685a1af663376434dabce0e1bcd54ea2832f7870a91eebf13749 -size 47710 +oid sha256:3a8777c01491888bba9f40eda9d2bed76a611f0e80f75917501ce69c1a321342 +size 47333 diff --git a/EndlessVendetta/Source/EndlessVendetta/Characters/BountyHunterCharacter.cpp b/EndlessVendetta/Source/EndlessVendetta/Characters/BountyHunterCharacter.cpp index 899cbd9f..b65da36f 100644 --- a/EndlessVendetta/Source/EndlessVendetta/Characters/BountyHunterCharacter.cpp +++ b/EndlessVendetta/Source/EndlessVendetta/Characters/BountyHunterCharacter.cpp @@ -127,21 +127,24 @@ void ABountyHunterCharacter::CreatePauseMenuTabs() void ABountyHunterCharacter::TogglePauseMenu() { const bool bOpenNewPauseMenu = !IsValid(PauseMenu); - FInputModeUIOnly UIOnly; + FInputModeGameAndUI UIAndGameOnly; FInputModeGameOnly GameOnly; APlayerController* PC = Cast(GetController()); - + InPauseMenu = bOpenNewPauseMenu; + + bOpenNewPauseMenu ? PC->SetInputMode(UIAndGameOnly) : PC->SetInputMode(GameOnly); PC->SetIgnoreMoveInput(bOpenNewPauseMenu); PC->SetIgnoreLookInput(bOpenNewPauseMenu); PC->SetShowMouseCursor(bOpenNewPauseMenu); + if (!bOpenNewPauseMenu) { PauseMenu->RemoveFromParent(); PauseMenu = nullptr; return; } - PauseMenu = CreateWidget(GetWorld(), PauseMenuWidgetClass); + PauseMenu = CreateWidget(GetWorld(), PauseMenuWidgetClass, FName("PauseMenu")); PauseMenu->AddToViewport(50); PauseMenu->OpenNewTab(BountiesTab); PauseMenu->OpenedBountiesTab.AddDynamic(this, &ABountyHunterCharacter::OpenBountiesTab); @@ -149,6 +152,8 @@ void ABountyHunterCharacter::TogglePauseMenu() PauseMenu->OpenedNavigationTab.AddDynamic(this, &ABountyHunterCharacter::OpenNavigationTab); PauseMenu->OpenedSettingsTab.AddDynamic(this, &ABountyHunterCharacter::OpenSettingsTab); PauseMenu->OpenedQuitTab.AddDynamic(this, &ABountyHunterCharacter::OpenQuitTab); + PauseMenu->SetVisibility(ESlateVisibility::Visible); + PauseMenu->SetFocus(); } void ABountyHunterCharacter::ReturnToOpenWorldEarly() From 4621c3d9a64d4ce1345e97bd8735fe3982584c95 Mon Sep 17 00:00:00 2001 From: Rafal Swierczek Date: Sat, 10 Feb 2024 14:44:36 +0000 Subject: [PATCH 07/25] Bugfix Merge Conflicts with Dev --- .../.idea/.idea.EndlessVendetta/.idea/workspace.xml | 7 +++---- .../FirstPerson/Blueprints/BP_FirstPersonCharacter.uasset | 4 ++-- .../StarterContent/Architecture/Floor_400x400.uasset | 4 ++-- .../HDRI/HDRI_Epic_Courtyard_Daylight.uasset | 4 ++-- 4 files changed, 9 insertions(+), 10 deletions(-) diff --git a/EndlessVendetta/.idea/.idea.EndlessVendetta/.idea/workspace.xml b/EndlessVendetta/.idea/.idea.EndlessVendetta/.idea/workspace.xml index 1bade766..17e2d619 100644 --- a/EndlessVendetta/.idea/.idea.EndlessVendetta/.idea/workspace.xml +++ b/EndlessVendetta/.idea/.idea.EndlessVendetta/.idea/workspace.xml @@ -9,11 +9,9 @@ - - + - - + diff --git a/EndlessVendetta/Content/FirstPerson/Blueprints/BP_FirstPersonCharacter.uasset b/EndlessVendetta/Content/FirstPerson/Blueprints/BP_FirstPersonCharacter.uasset index 93acb514..6bca8da0 100644 --- a/EndlessVendetta/Content/FirstPerson/Blueprints/BP_FirstPersonCharacter.uasset +++ b/EndlessVendetta/Content/FirstPerson/Blueprints/BP_FirstPersonCharacter.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:42ea885a3728084f3a0fc2945847391504503bbc7a8476c490624a90d35ad53b -size 468474 +oid sha256:3694f536232bf3750318bbed8aaa9f5ef454bc0ab781c44d71dfce238190b7ef +size 465881 diff --git a/EndlessVendetta/Content/StarterContent/Architecture/Floor_400x400.uasset b/EndlessVendetta/Content/StarterContent/Architecture/Floor_400x400.uasset index 12f5fcc3..c2a34afc 100644 --- a/EndlessVendetta/Content/StarterContent/Architecture/Floor_400x400.uasset +++ b/EndlessVendetta/Content/StarterContent/Architecture/Floor_400x400.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:a12f8ebb6bae23e00bebb19dc55243af89bcd8a40ec7c0de4fb6435e30c0ddb0 -size 14831 +oid sha256:4c0ecf0ac0702cc2bd355ec050232a61c49e10f102448efbeb735a51824adef6 +size 14948 diff --git a/EndlessVendetta/Content/StarterContent/HDRI/HDRI_Epic_Courtyard_Daylight.uasset b/EndlessVendetta/Content/StarterContent/HDRI/HDRI_Epic_Courtyard_Daylight.uasset index 0f990580..e86e7301 100644 --- a/EndlessVendetta/Content/StarterContent/HDRI/HDRI_Epic_Courtyard_Daylight.uasset +++ b/EndlessVendetta/Content/StarterContent/HDRI/HDRI_Epic_Courtyard_Daylight.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:bc35eb2d43a47427d30aba0196f9eac90d089dd3abca319528c5d25c83510d0d -size 72364642 +oid sha256:239ef48ba56a9ad2be8dbba09ec5c54affebabdc535173bc421788faf05f7afa +size 66790690 From b7f376e9df840eede4c6dbfc42c113b1b23dddf2 Mon Sep 17 00:00:00 2001 From: Rafal Swierczek Date: Sun, 11 Feb 2024 14:21:45 +0000 Subject: [PATCH 08/25] Implemented Side Bounties Spawning --- .../.idea.EndlessVendetta/.idea/workspace.xml | 31 ++++++++-- .../ApartmentBounty/BP_Elevator.uasset | 4 +- .../TimothyEliminatedSequence1.png | 0 .../TimothyEliminatedSequence1.uasset | 3 + .../TimothyEliminatedSequence2.png | 0 .../TimothyEliminatedSequence2.uasset | 3 + .../TimothyEliminatedSequence3.png | 0 .../TimothyEliminatedSequence3.uasset | 3 + .../TargetEliminatedSequence.uasset | 3 + .../WBP_TimothyEliminated.uasset | 3 + .../BountySpecificActors/BP_Elevator.uasset | 3 + .../CP_ElimTImothyHuntsmer.uasset | 3 - .../Checkpoints/CP_ElimTImothyHuntsmer.uasset | 3 + .../Checkpoints/OWCP_Apartment.uasset | 3 + .../TimothyEliminatedSequence1.uasset | 3 - .../TimothyEliminatedSequence2.uasset | 3 - .../TimothyEliminatedSequence3.uasset | 3 - .../ApartmentBounty/MB_Apartment.uasset | 4 +- .../ApartmentBounty/OWCP_Apartment.uasset | 3 - .../CP_GoToSecurityOffice.uasset | 3 + .../SB_SecuritySpecialists.uasset | 3 + .../TargetEliminatedSequence.uasset | 3 - .../WBP_TimothyEliminated.uasset | 3 - .../Content/Levels/MainMenuLevel.umap | 4 +- .../Content/Levels/TempOpenWorld.umap | 4 +- .../HDRI/HDRI_Epic_Courtyard_Daylight.uasset | 2 +- .../BountySystem/BountyClass.cpp | 38 +++--------- .../BountySystem/BountyClass.h | 13 ++-- .../BountySystem/CheckpointClass.cpp | 36 ++++------- .../BountySystem/CheckpointClass.h | 59 +++++++++++++------ .../BountySystem/MainBountyClass.cpp | 21 ++++++- .../BountySystem/MainBountyClass.h | 11 +++- .../BountySystem/SideBountyClass.cpp | 15 ++--- .../BountySystem/SideBountyClass.h | 31 ++++++++-- .../Characters/BountyHunterCharacter.cpp | 18 ++++-- .../Characters/BountyHunterCharacter.h | 6 +- 36 files changed, 205 insertions(+), 143 deletions(-) rename EndlessVendetta/Content/BountySystem/ApartmentBounty/{ => BountyCompleted}/CinematicFrmaes/TimothyEliminatedSequence1.png (100%) create mode 100644 EndlessVendetta/Content/BountySystem/ApartmentBounty/BountyCompleted/CinematicFrmaes/TimothyEliminatedSequence1.uasset rename EndlessVendetta/Content/BountySystem/ApartmentBounty/{ => BountyCompleted}/CinematicFrmaes/TimothyEliminatedSequence2.png (100%) create mode 100644 EndlessVendetta/Content/BountySystem/ApartmentBounty/BountyCompleted/CinematicFrmaes/TimothyEliminatedSequence2.uasset rename EndlessVendetta/Content/BountySystem/ApartmentBounty/{ => BountyCompleted}/CinematicFrmaes/TimothyEliminatedSequence3.png (100%) create mode 100644 EndlessVendetta/Content/BountySystem/ApartmentBounty/BountyCompleted/CinematicFrmaes/TimothyEliminatedSequence3.uasset create mode 100644 EndlessVendetta/Content/BountySystem/ApartmentBounty/BountyCompleted/TargetEliminatedSequence.uasset create mode 100644 EndlessVendetta/Content/BountySystem/ApartmentBounty/BountyCompleted/WBP_TimothyEliminated.uasset create mode 100644 EndlessVendetta/Content/BountySystem/ApartmentBounty/BountySpecificActors/BP_Elevator.uasset delete mode 100644 EndlessVendetta/Content/BountySystem/ApartmentBounty/CP_ElimTImothyHuntsmer.uasset create mode 100644 EndlessVendetta/Content/BountySystem/ApartmentBounty/Checkpoints/CP_ElimTImothyHuntsmer.uasset create mode 100644 EndlessVendetta/Content/BountySystem/ApartmentBounty/Checkpoints/OWCP_Apartment.uasset delete mode 100644 EndlessVendetta/Content/BountySystem/ApartmentBounty/CinematicFrmaes/TimothyEliminatedSequence1.uasset delete mode 100644 EndlessVendetta/Content/BountySystem/ApartmentBounty/CinematicFrmaes/TimothyEliminatedSequence2.uasset delete mode 100644 EndlessVendetta/Content/BountySystem/ApartmentBounty/CinematicFrmaes/TimothyEliminatedSequence3.uasset delete mode 100644 EndlessVendetta/Content/BountySystem/ApartmentBounty/OWCP_Apartment.uasset create mode 100644 EndlessVendetta/Content/BountySystem/ApartmentBounty/SideBounties/SecuritySpecialists/CP_GoToSecurityOffice.uasset create mode 100644 EndlessVendetta/Content/BountySystem/ApartmentBounty/SideBounties/SecuritySpecialists/SB_SecuritySpecialists.uasset delete mode 100644 EndlessVendetta/Content/BountySystem/ApartmentBounty/TargetEliminatedSequence.uasset delete mode 100644 EndlessVendetta/Content/BountySystem/ApartmentBounty/WBP_TimothyEliminated.uasset diff --git a/EndlessVendetta/.idea/.idea.EndlessVendetta/.idea/workspace.xml b/EndlessVendetta/.idea/.idea.EndlessVendetta/.idea/workspace.xml index 17e2d619..c9b7b27e 100644 --- a/EndlessVendetta/.idea/.idea.EndlessVendetta/.idea/workspace.xml +++ b/EndlessVendetta/.idea/.idea.EndlessVendetta/.idea/workspace.xml @@ -9,9 +9,31 @@ - - + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/EndlessVendetta/Content/BountySystem/ApartmentBounty/BP_Elevator.uasset b/EndlessVendetta/Content/BountySystem/ApartmentBounty/BP_Elevator.uasset index f6e4a525..0d93d61b 100644 --- a/EndlessVendetta/Content/BountySystem/ApartmentBounty/BP_Elevator.uasset +++ b/EndlessVendetta/Content/BountySystem/ApartmentBounty/BP_Elevator.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:a28c44c09d3ee396d17502b08ad02f029c01b5f0927fa3ec295dc77621a87dbf -size 101367 +oid sha256:5beff82bbe966a5aa37576021879acfec5f987482509ebe993e4e6707b215053 +size 2560 diff --git a/EndlessVendetta/Content/BountySystem/ApartmentBounty/CinematicFrmaes/TimothyEliminatedSequence1.png b/EndlessVendetta/Content/BountySystem/ApartmentBounty/BountyCompleted/CinematicFrmaes/TimothyEliminatedSequence1.png similarity index 100% rename from EndlessVendetta/Content/BountySystem/ApartmentBounty/CinematicFrmaes/TimothyEliminatedSequence1.png rename to EndlessVendetta/Content/BountySystem/ApartmentBounty/BountyCompleted/CinematicFrmaes/TimothyEliminatedSequence1.png diff --git a/EndlessVendetta/Content/BountySystem/ApartmentBounty/BountyCompleted/CinematicFrmaes/TimothyEliminatedSequence1.uasset b/EndlessVendetta/Content/BountySystem/ApartmentBounty/BountyCompleted/CinematicFrmaes/TimothyEliminatedSequence1.uasset new file mode 100644 index 00000000..b4d252db --- /dev/null +++ b/EndlessVendetta/Content/BountySystem/ApartmentBounty/BountyCompleted/CinematicFrmaes/TimothyEliminatedSequence1.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:3e81e2f7d112bcd4e902f403c4d849a3354c1017a83dea4ecaf21c53748f0488 +size 194885 diff --git a/EndlessVendetta/Content/BountySystem/ApartmentBounty/CinematicFrmaes/TimothyEliminatedSequence2.png b/EndlessVendetta/Content/BountySystem/ApartmentBounty/BountyCompleted/CinematicFrmaes/TimothyEliminatedSequence2.png similarity index 100% rename from EndlessVendetta/Content/BountySystem/ApartmentBounty/CinematicFrmaes/TimothyEliminatedSequence2.png rename to EndlessVendetta/Content/BountySystem/ApartmentBounty/BountyCompleted/CinematicFrmaes/TimothyEliminatedSequence2.png diff --git a/EndlessVendetta/Content/BountySystem/ApartmentBounty/BountyCompleted/CinematicFrmaes/TimothyEliminatedSequence2.uasset b/EndlessVendetta/Content/BountySystem/ApartmentBounty/BountyCompleted/CinematicFrmaes/TimothyEliminatedSequence2.uasset new file mode 100644 index 00000000..cc517bed --- /dev/null +++ b/EndlessVendetta/Content/BountySystem/ApartmentBounty/BountyCompleted/CinematicFrmaes/TimothyEliminatedSequence2.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:872b9cc8108863e79df9c968dcdcadf919ecbb0d24c359f0c062c62acc56ec4f +size 187881 diff --git a/EndlessVendetta/Content/BountySystem/ApartmentBounty/CinematicFrmaes/TimothyEliminatedSequence3.png b/EndlessVendetta/Content/BountySystem/ApartmentBounty/BountyCompleted/CinematicFrmaes/TimothyEliminatedSequence3.png similarity index 100% rename from EndlessVendetta/Content/BountySystem/ApartmentBounty/CinematicFrmaes/TimothyEliminatedSequence3.png rename to EndlessVendetta/Content/BountySystem/ApartmentBounty/BountyCompleted/CinematicFrmaes/TimothyEliminatedSequence3.png diff --git a/EndlessVendetta/Content/BountySystem/ApartmentBounty/BountyCompleted/CinematicFrmaes/TimothyEliminatedSequence3.uasset b/EndlessVendetta/Content/BountySystem/ApartmentBounty/BountyCompleted/CinematicFrmaes/TimothyEliminatedSequence3.uasset new file mode 100644 index 00000000..76517284 --- /dev/null +++ b/EndlessVendetta/Content/BountySystem/ApartmentBounty/BountyCompleted/CinematicFrmaes/TimothyEliminatedSequence3.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:cbce5d68cef6f7648a69c4ab0b49c0718be7e4f827de65f43483df72b4fb7635 +size 46142 diff --git a/EndlessVendetta/Content/BountySystem/ApartmentBounty/BountyCompleted/TargetEliminatedSequence.uasset b/EndlessVendetta/Content/BountySystem/ApartmentBounty/BountyCompleted/TargetEliminatedSequence.uasset new file mode 100644 index 00000000..354a8d03 --- /dev/null +++ b/EndlessVendetta/Content/BountySystem/ApartmentBounty/BountyCompleted/TargetEliminatedSequence.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:2160ce11a03f95044c4aed50c60ef16ba6bf30cfd3a775ea5bf577a0bebc8c4c +size 15353 diff --git a/EndlessVendetta/Content/BountySystem/ApartmentBounty/BountyCompleted/WBP_TimothyEliminated.uasset b/EndlessVendetta/Content/BountySystem/ApartmentBounty/BountyCompleted/WBP_TimothyEliminated.uasset new file mode 100644 index 00000000..a59440e3 --- /dev/null +++ b/EndlessVendetta/Content/BountySystem/ApartmentBounty/BountyCompleted/WBP_TimothyEliminated.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:149144b6fd8ca68c9504252e87e3dea76145a975072f5f950a31628b7265bc5d +size 93434 diff --git a/EndlessVendetta/Content/BountySystem/ApartmentBounty/BountySpecificActors/BP_Elevator.uasset b/EndlessVendetta/Content/BountySystem/ApartmentBounty/BountySpecificActors/BP_Elevator.uasset new file mode 100644 index 00000000..f454dd0e --- /dev/null +++ b/EndlessVendetta/Content/BountySystem/ApartmentBounty/BountySpecificActors/BP_Elevator.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:74b407ea0f81176dd53e06508517de1e46f8bd5bb028ef4ff4c240fb16855da5 +size 97327 diff --git a/EndlessVendetta/Content/BountySystem/ApartmentBounty/CP_ElimTImothyHuntsmer.uasset b/EndlessVendetta/Content/BountySystem/ApartmentBounty/CP_ElimTImothyHuntsmer.uasset deleted file mode 100644 index 13650e05..00000000 --- a/EndlessVendetta/Content/BountySystem/ApartmentBounty/CP_ElimTImothyHuntsmer.uasset +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:402b1927aa8568280268ea72ed9a74d119cfb7f90b15aea33b51e2c77d676638 -size 98725 diff --git a/EndlessVendetta/Content/BountySystem/ApartmentBounty/Checkpoints/CP_ElimTImothyHuntsmer.uasset b/EndlessVendetta/Content/BountySystem/ApartmentBounty/Checkpoints/CP_ElimTImothyHuntsmer.uasset new file mode 100644 index 00000000..e1163602 --- /dev/null +++ b/EndlessVendetta/Content/BountySystem/ApartmentBounty/Checkpoints/CP_ElimTImothyHuntsmer.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:4011687f5e23d06e47c3eb26866081d1272cf73a2692252cd57fd4b3483a884d +size 95250 diff --git a/EndlessVendetta/Content/BountySystem/ApartmentBounty/Checkpoints/OWCP_Apartment.uasset b/EndlessVendetta/Content/BountySystem/ApartmentBounty/Checkpoints/OWCP_Apartment.uasset new file mode 100644 index 00000000..fe336fcd --- /dev/null +++ b/EndlessVendetta/Content/BountySystem/ApartmentBounty/Checkpoints/OWCP_Apartment.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:0b75c5541122da7d86dde09ffc1dca38739137c6fed09f31f953578392aa8e4c +size 24261 diff --git a/EndlessVendetta/Content/BountySystem/ApartmentBounty/CinematicFrmaes/TimothyEliminatedSequence1.uasset b/EndlessVendetta/Content/BountySystem/ApartmentBounty/CinematicFrmaes/TimothyEliminatedSequence1.uasset deleted file mode 100644 index 2fefa4b1..00000000 --- a/EndlessVendetta/Content/BountySystem/ApartmentBounty/CinematicFrmaes/TimothyEliminatedSequence1.uasset +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:fd48ed44b7418ebe41e2ecfa34fc5255516804e276a362a70ed254c94d1f5948 -size 194853 diff --git a/EndlessVendetta/Content/BountySystem/ApartmentBounty/CinematicFrmaes/TimothyEliminatedSequence2.uasset b/EndlessVendetta/Content/BountySystem/ApartmentBounty/CinematicFrmaes/TimothyEliminatedSequence2.uasset deleted file mode 100644 index 46345e7c..00000000 --- a/EndlessVendetta/Content/BountySystem/ApartmentBounty/CinematicFrmaes/TimothyEliminatedSequence2.uasset +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:3e831a54780e268243e807dba5db877a6e4a11de39c0cf215bf7a80a4ebd8ae8 -size 187849 diff --git a/EndlessVendetta/Content/BountySystem/ApartmentBounty/CinematicFrmaes/TimothyEliminatedSequence3.uasset b/EndlessVendetta/Content/BountySystem/ApartmentBounty/CinematicFrmaes/TimothyEliminatedSequence3.uasset deleted file mode 100644 index 5b7f3dc1..00000000 --- a/EndlessVendetta/Content/BountySystem/ApartmentBounty/CinematicFrmaes/TimothyEliminatedSequence3.uasset +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:2e7637dc22779c553d568c5cba824c68f7adc5bb4d03bd2b05c441b047dd511e -size 46110 diff --git a/EndlessVendetta/Content/BountySystem/ApartmentBounty/MB_Apartment.uasset b/EndlessVendetta/Content/BountySystem/ApartmentBounty/MB_Apartment.uasset index 0aa1d885..966102a7 100644 --- a/EndlessVendetta/Content/BountySystem/ApartmentBounty/MB_Apartment.uasset +++ b/EndlessVendetta/Content/BountySystem/ApartmentBounty/MB_Apartment.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:6593629256e5444639af0a54a54707e4bb015e680ceeaba562e76909f9d55f10 -size 25322 +oid sha256:0799a3c8d18c8c3ac88ea74f2106eff00d2f768db80dd3890e59eb95c2a5e09c +size 25631 diff --git a/EndlessVendetta/Content/BountySystem/ApartmentBounty/OWCP_Apartment.uasset b/EndlessVendetta/Content/BountySystem/ApartmentBounty/OWCP_Apartment.uasset deleted file mode 100644 index 69c1e83d..00000000 --- a/EndlessVendetta/Content/BountySystem/ApartmentBounty/OWCP_Apartment.uasset +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:f671cf047ef64679d0a306f563a38958bb751c78b68c615d63c539ec1cf84b92 -size 24453 diff --git a/EndlessVendetta/Content/BountySystem/ApartmentBounty/SideBounties/SecuritySpecialists/CP_GoToSecurityOffice.uasset b/EndlessVendetta/Content/BountySystem/ApartmentBounty/SideBounties/SecuritySpecialists/CP_GoToSecurityOffice.uasset new file mode 100644 index 00000000..cdb1bb70 --- /dev/null +++ b/EndlessVendetta/Content/BountySystem/ApartmentBounty/SideBounties/SecuritySpecialists/CP_GoToSecurityOffice.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:5e4033216548f6200b2265883ed20f8c859b0ad6b628540b7cc58c8bdb2da091 +size 81558 diff --git a/EndlessVendetta/Content/BountySystem/ApartmentBounty/SideBounties/SecuritySpecialists/SB_SecuritySpecialists.uasset b/EndlessVendetta/Content/BountySystem/ApartmentBounty/SideBounties/SecuritySpecialists/SB_SecuritySpecialists.uasset new file mode 100644 index 00000000..23d82ca3 --- /dev/null +++ b/EndlessVendetta/Content/BountySystem/ApartmentBounty/SideBounties/SecuritySpecialists/SB_SecuritySpecialists.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:7424cf05690138802d592e05e23d7ee74ff2e5c680d943715f51dfc8c985552b +size 23371 diff --git a/EndlessVendetta/Content/BountySystem/ApartmentBounty/TargetEliminatedSequence.uasset b/EndlessVendetta/Content/BountySystem/ApartmentBounty/TargetEliminatedSequence.uasset deleted file mode 100644 index cc5c5772..00000000 --- a/EndlessVendetta/Content/BountySystem/ApartmentBounty/TargetEliminatedSequence.uasset +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:59b317daaff6320cb349f0431e5afd1dda081e7ccd94c85e1410a79acb309b5c -size 15321 diff --git a/EndlessVendetta/Content/BountySystem/ApartmentBounty/WBP_TimothyEliminated.uasset b/EndlessVendetta/Content/BountySystem/ApartmentBounty/WBP_TimothyEliminated.uasset deleted file mode 100644 index 7288e08b..00000000 --- a/EndlessVendetta/Content/BountySystem/ApartmentBounty/WBP_TimothyEliminated.uasset +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:0cf418c167f49075338deb5047703b031ac61ed014b691277846e62a97bca97e -size 105471 diff --git a/EndlessVendetta/Content/Levels/MainMenuLevel.umap b/EndlessVendetta/Content/Levels/MainMenuLevel.umap index 41f224b2..594eec13 100644 --- a/EndlessVendetta/Content/Levels/MainMenuLevel.umap +++ b/EndlessVendetta/Content/Levels/MainMenuLevel.umap @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:77a3ca4ec175668d370773d936ab81f41ddc197ebe0841e24801910512c8dcd0 -size 308710 +oid sha256:ecab0f671c308960a2881e050ca07a1300f04e97819e1f47203ca1ca652f4ccf +size 308758 diff --git a/EndlessVendetta/Content/Levels/TempOpenWorld.umap b/EndlessVendetta/Content/Levels/TempOpenWorld.umap index 4cead22c..d46f6d9e 100644 --- a/EndlessVendetta/Content/Levels/TempOpenWorld.umap +++ b/EndlessVendetta/Content/Levels/TempOpenWorld.umap @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:c23c9614eb11e162386c9a60456be49ab400d443ccb643d2defaa76bb8435a5d -size 13865992 +oid sha256:1d77716f252adb75b590d1a27ae726ae52e139032cceb876fc497f4125619a79 +size 13867288 diff --git a/EndlessVendetta/Content/StarterContent/HDRI/HDRI_Epic_Courtyard_Daylight.uasset b/EndlessVendetta/Content/StarterContent/HDRI/HDRI_Epic_Courtyard_Daylight.uasset index e86e7301..80f4790a 100644 --- a/EndlessVendetta/Content/StarterContent/HDRI/HDRI_Epic_Courtyard_Daylight.uasset +++ b/EndlessVendetta/Content/StarterContent/HDRI/HDRI_Epic_Courtyard_Daylight.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:239ef48ba56a9ad2be8dbba09ec5c54affebabdc535173bc421788faf05f7afa +oid sha256:6764172277cd1d5812197441d69c3897c757be02854b03b5e4a0ddf6cfa563fb size 66790690 diff --git a/EndlessVendetta/Source/EndlessVendetta/BountySystem/BountyClass.cpp b/EndlessVendetta/Source/EndlessVendetta/BountySystem/BountyClass.cpp index e96b02ca..977f9ed0 100644 --- a/EndlessVendetta/Source/EndlessVendetta/BountySystem/BountyClass.cpp +++ b/EndlessVendetta/Source/EndlessVendetta/BountySystem/BountyClass.cpp @@ -17,10 +17,18 @@ void ABountyClass::ActivateFirstCheckpoint() BountyCheckpoints[0]->Active = true; BountyCheckpoints[0]->SpawnWaypoint(BountyTitle); - BountyCheckpoints[0]->CheckpointActivated(); + // BountyCheckpoints[0]->CheckpointActivated(); BountyCheckpoints[0]->CompletedCheckpoint.AddDynamic(this, &ABountyClass::IncrementBountyCheckpoint); } +void ABountyClass::DeActivateFirstCheckpoint() +{ + if (BountyCheckpoints.IsEmpty() || BountyCheckpoints[0] == nullptr) return; + + BountyCheckpoints[0]->Active = false; + BountyCheckpoints[0]->DestroyWaypoint(); +} + void ABountyClass::SpawnCheckpoints() { // Spawn all checkpoints associated with this bounty and store them in order @@ -41,38 +49,10 @@ void ABountyClass::SpawnCheckpoints() ACheckpointClass* SpawnedCheckpoint = Cast(GetWorld()->SpawnActor(CheckpointClass, Loc, Rot, SpawnParameters)); BountyCheckpoints.Add(SpawnedCheckpoint); } - - ActivateFirstCheckpoint(); } void ABountyClass::IncrementBountyCheckpoint() { - // --------------------------------------------------------------------------------------------------------------------- - // Broadcast that the first Checkpoint has been completed so that side bounties can be destroyed - // if (!BountyStarted) - // { - // BountyStarted = true; - // CompletedFirstCheckpoint.Broadcast(); - // } - // - // // Bounty Completion Condition - // if (BountyCheckpoints.Num() <= 1) - // { - // Completed = true; - // BountyCheckpoints[0]->Active = false; - // BountyCheckpoints[0]->Destroy(); - // BountyCheckpoints.RemoveAt(0); - // UE_LOG(LogTemp, Warning, TEXT(" You've Completed the Bounty!! Well done")); - // return; - // } - // - // if (BountyCheckpoints[0] == nullptr) - // { - // UE_LOG(LogTemp, Fatal, TEXT("Missing checkpoint in bounty checkpoints, could've failed to spawn or cast")); - // return; - // } - //--------------------------------------------------------------------------------------------------------------------- - if (BountyCheckpoints.IsEmpty() || BountyCheckpoints[0] == nullptr) return; // Destroy Actor and Shrink Array diff --git a/EndlessVendetta/Source/EndlessVendetta/BountySystem/BountyClass.h b/EndlessVendetta/Source/EndlessVendetta/BountySystem/BountyClass.h index 94cb313b..d0039300 100644 --- a/EndlessVendetta/Source/EndlessVendetta/BountySystem/BountyClass.h +++ b/EndlessVendetta/Source/EndlessVendetta/BountySystem/BountyClass.h @@ -31,8 +31,7 @@ public: // ------------------- METHODS --------------------------------- private: - // Activate the First Checkpoint in Bounty Checkpoints and Listen for its Completion - void ActivateFirstCheckpoint(); + protected: // Called when a checkpoint is completed, handles moving onto next checkpoint and discarding the old one @@ -44,9 +43,13 @@ public: ABountyClass(); // Spawns and stores this Bounties Checkpoints in order - void SpawnCheckpoints(); + virtual void SpawnCheckpoints(); + // Activate the First Checkpoint in Bounty Checkpoints and Listen for its Completion + void ActivateFirstCheckpoint(); + // De-Activate the First Checkpoint in Bounty Checkpoints + void DeActivateFirstCheckpoint(); @@ -71,10 +74,6 @@ protected: FString BountyDesc; // ----------------------------------------------- - - - - public: // Broadcast when first checkpoint from this bounty is completed FCompletedFirstCheckpoint CompletedFirstCheckpoint; diff --git a/EndlessVendetta/Source/EndlessVendetta/BountySystem/CheckpointClass.cpp b/EndlessVendetta/Source/EndlessVendetta/BountySystem/CheckpointClass.cpp index b2938653..34d4d8c8 100644 --- a/EndlessVendetta/Source/EndlessVendetta/BountySystem/CheckpointClass.cpp +++ b/EndlessVendetta/Source/EndlessVendetta/BountySystem/CheckpointClass.cpp @@ -9,24 +9,6 @@ ACheckpointClass::ACheckpointClass() // Set this actor to call Tick() every frame. You can turn this off to improve performance if you don't need it. PrimaryActorTick.bCanEverTick = true; BountyTitle = ""; - -} - -// Called when the game starts or when spawned -void ACheckpointClass::BeginPlay() -{ - Super::BeginPlay(); -} - -void ACheckpointClass::SpawnWaypoint(const FString& CurrentBountyTitle) -{ - if (!IsValid(WaypointActorClass) || HideWaypoint) return; - - BountyTitle = CurrentBountyTitle; - FActorSpawnParameters SpawnParams; - SpawnParams.SpawnCollisionHandlingOverride = ESpawnActorCollisionHandlingMethod::AlwaysSpawn; - WaypointActor = Cast(GetWorld()->SpawnActor(WaypointActorClass, WaypointLoc, GetActorRotation(), SpawnParams)); - WaypointActor->SetupWaypoint(WaypointIcon, BountyTitle); } void ACheckpointClass::UpdateCheckpointWaypoint(FVector WaypointNewLoc) @@ -40,17 +22,19 @@ void ACheckpointClass::UpdateCheckpointWaypoint(FVector WaypointNewLoc) WaypointActor->SetupWaypoint(WaypointIcon, BountyTitle); } -// Called every frame -void ACheckpointClass::Tick(float DeltaTime) -{ - Super::Tick(DeltaTime); - -} - void ACheckpointClass::Destroyed() { - if (WaypointActor) WaypointActor->Destroy(); + DestroyWaypoint(); Super::Destroyed(); } +void ACheckpointClass::SpawnWaypoint(const FString& CurrentBountyTitle) +{ + if (!IsValid(WaypointActorClass) || HideWaypoint) return; + BountyTitle = CurrentBountyTitle; + FActorSpawnParameters SpawnParams; + SpawnParams.SpawnCollisionHandlingOverride = ESpawnActorCollisionHandlingMethod::AlwaysSpawn; + WaypointActor = Cast(GetWorld()->SpawnActor(WaypointActorClass, WaypointLoc, GetActorRotation(), SpawnParams)); + WaypointActor->SetupWaypoint(WaypointIcon, BountyTitle); +} diff --git a/EndlessVendetta/Source/EndlessVendetta/BountySystem/CheckpointClass.h b/EndlessVendetta/Source/EndlessVendetta/BountySystem/CheckpointClass.h index 09462ebf..2f541e61 100644 --- a/EndlessVendetta/Source/EndlessVendetta/BountySystem/CheckpointClass.h +++ b/EndlessVendetta/Source/EndlessVendetta/BountySystem/CheckpointClass.h @@ -16,8 +16,7 @@ class ENDLESSVENDETTA_API ACheckpointClass : public AActor { GENERATED_BODY() - FString BountyTitle; - +// ------------------- ATTRIBUTES ------------------------------ // ------ Properties set from Editor ------ UPROPERTY(EditDefaultsOnly, Category = "Checkpoint") FString CheckpointTip; @@ -32,9 +31,25 @@ class ENDLESSVENDETTA_API ACheckpointClass : public AActor UPROPERTY(EditDefaultsOnly, Category = "Checkpoint") bool HideWaypoint = false; + // Stored Title of Bounty, used by Update Checkpoint Waypoint Func + FString BountyTitle; + + // Ref to Waypoint Actor AWaypointActor* WaypointActor; - // ---------------------------------------- protected: + +public: + // Delegate called when Checkpoint is Completed + FCompletedCheckpoint CompletedCheckpoint; + + // Used by Checkpoint BPs to Determine weather to Run Checkpoint Logic + UPROPERTY(BlueprintReadOnly, Category = "Checkpoint") + bool Active = false; +// ------------------- METHODS --------------------------------- +private: + +protected: + // Used by Checkpoints BPs to broadcast that they're Completed UFUNCTION(BlueprintCallable, Category = "Checkpoint") void BroadcastCompletion() { @@ -42,21 +57,34 @@ protected: Cast(GetWorld()->GetAuthGameMode())->SendEvent("Check", CheckpointTip); } + // Used by Checkpoint BPs to update Checkpoint Loc without Finishing Checkpoint itself UFUNCTION(BlueprintCallable) - void UpdateCheckpointWaypoint(FVector WaypointNewLoc); - // Called when the game starts or when spawned - virtual void BeginPlay() override; + void UpdateCheckpointWaypoint(FVector WaypointNewLoc); + // Used to Destroy any Waypoint Actor Associated with this Checkpoint when it's Destroyed virtual void Destroyed() override; - public: - FCompletedCheckpoint CompletedCheckpoint; - - UPROPERTY(BlueprintReadOnly, Category = "Checkpoint") - bool Active = false; + // Sets default values for this actor's properties + ACheckpointClass(); + // Used by Bounties to Spawn Waypoint for this Checkpoint when it's Activated void SpawnWaypoint(const FString& BountyTitle); + // Destroys Waypoint Associated with this Checkpoint if one Exists + void DestroyWaypoint() + { + if (WaypointActor) WaypointActor->Destroy(); + } + + + + + + + +// ------------------- LEGACY --------------------------------- + +public: UFUNCTION(BlueprintImplementableEvent) void CheckpointActivated(); @@ -81,12 +109,5 @@ public: { return CheckpointSpawnTransform; } - - // --------------------------------------- - - // Sets default values for this actor's properties - ACheckpointClass(); - - // Called every frame - virtual void Tick(float DeltaTime) override; + }; diff --git a/EndlessVendetta/Source/EndlessVendetta/BountySystem/MainBountyClass.cpp b/EndlessVendetta/Source/EndlessVendetta/BountySystem/MainBountyClass.cpp index 1af830e7..72ca600b 100644 --- a/EndlessVendetta/Source/EndlessVendetta/BountySystem/MainBountyClass.cpp +++ b/EndlessVendetta/Source/EndlessVendetta/BountySystem/MainBountyClass.cpp @@ -25,9 +25,26 @@ void AMainBountyClass::SpawnOpenWorldCheckpoint() OpenWorldcheckpoint->SpawnWaypoint(BountyTitle); } + void AMainBountyClass::SpawnCheckpoints() + { + Super::SpawnCheckpoints(); + ActivateFirstCheckpoint(); + } - - + TArray AMainBountyClass::SpawnAndReturnSideBounties() +{ + TArray SpawnedSideBounties; + for (auto SideBountyClass : SideBountiesToSpawn) + { + if (!IsValid(SideBountyClass)) continue; + ASideBountyClass* SpawnedSideBounty = GetWorld()->SpawnActor(SideBountyClass); + const FAttachmentTransformRules AttachmentTransformRules(EAttachmentRule::SnapToTarget, true); + SpawnedSideBounty->AttachToComponent(GetRootComponent(), AttachmentTransformRules); + SpawnedSideBounty->SpawnCheckpoints(); + SpawnedSideBounties.Add(SpawnedSideBounty); + } + return SpawnedSideBounties; +} void AMainBountyClass::SpawnAmmoDrops() diff --git a/EndlessVendetta/Source/EndlessVendetta/BountySystem/MainBountyClass.h b/EndlessVendetta/Source/EndlessVendetta/BountySystem/MainBountyClass.h index 912449f4..f3ddc5b1 100644 --- a/EndlessVendetta/Source/EndlessVendetta/BountySystem/MainBountyClass.h +++ b/EndlessVendetta/Source/EndlessVendetta/BountySystem/MainBountyClass.h @@ -54,6 +54,9 @@ class ENDLESSVENDETTA_API AMainBountyClass : public ABountyClass UPROPERTY(EditDefaultsOnly, Category = "Bounty") FTransform PlayerSpawnTransform; + // Used to Spawn Side Bounties Associated with this Main Bounty + UPROPERTY(EditDefaultsOnly, Category = "Bounty") + TArray> SideBountiesToSpawn; protected: @@ -74,6 +77,11 @@ public: // Spawns the Single Checkpoint in the Open World for this Main Bounty void SpawnOpenWorldCheckpoint(); + void SpawnCheckpoints() override; + + // Used by Bounty Character to Spawn and Store Side Bounty Refs when Main Bounty is Updated + TArray SpawnAndReturnSideBounties(); + // Used by Players Character to Determine where to Spawn in the Open World after Completing Main Bounty FTransform GetPlayerSpawnTransform() { @@ -86,8 +94,7 @@ public: // ------------------- LEGACY CODE TO BE REWORKED --------------------------------- protected: - UPROPERTY(EditDefaultsOnly, Category = "Bounty") - TArray> SideBountiesToSpawn; + // ---------------- Bounty Alterations ---------------- UPROPERTY(EditDefaultsOnly, Category = "Bounty") diff --git a/EndlessVendetta/Source/EndlessVendetta/BountySystem/SideBountyClass.cpp b/EndlessVendetta/Source/EndlessVendetta/BountySystem/SideBountyClass.cpp index 6daec97b..7ad9409d 100644 --- a/EndlessVendetta/Source/EndlessVendetta/BountySystem/SideBountyClass.cpp +++ b/EndlessVendetta/Source/EndlessVendetta/BountySystem/SideBountyClass.cpp @@ -3,22 +3,15 @@ #include "SideBountyClass.h" -void ASideBountyClass::BeginPlay() -{ - Super::BeginPlay(); - -} void ASideBountyClass::IncrementBountyCheckpoint() { Super::IncrementBountyCheckpoint(); - // Rework!!!! - - // if (Completed) - // { - // CompletedSideBounty.Broadcast(FavoursEarnedForCompletion); - // } + if (BountyCheckpoints.IsEmpty()) + { + CompletedSideBounty.Broadcast(FavoursEarnedForCompletion); + } } void ASideBountyClass::DestroyCheckpoints() diff --git a/EndlessVendetta/Source/EndlessVendetta/BountySystem/SideBountyClass.h b/EndlessVendetta/Source/EndlessVendetta/BountySystem/SideBountyClass.h index 12d66397..2f4118e1 100644 --- a/EndlessVendetta/Source/EndlessVendetta/BountySystem/SideBountyClass.h +++ b/EndlessVendetta/Source/EndlessVendetta/BountySystem/SideBountyClass.h @@ -27,17 +27,36 @@ UCLASS() class ENDLESSVENDETTA_API ASideBountyClass : public ABountyClass { GENERATED_BODY() - -protected: + +// ------------------- ATTRIBUTES ------------------------------ + // Amount of Favours the Player will earn for Completing this Side Bounty UPROPERTY(EditDefaultsOnly, Category = "Side Bounty") int FavoursEarnedForCompletion = 1; - virtual void BeginPlay() override; +protected: + +public: + // Delegate Broadcast when Side Bounty is Completed, Listened to by Bounty Character + FCompletedSideBounty CompletedSideBounty; + + // Struct Containing all Data to be Displayed about the Side Bounty + UPROPERTY(EditDefaultsOnly, Category = "Side Bounty") + FSideBountyStruct SideBountyStruct; + +// ------------------- METHODS --------------------------------- + +private: + +protected: + // Overrides to check if Side Bounty has been Completed + virtual void IncrementBountyCheckpoint() override; +public: + + + + // ------------------- LEGACY --------------------------------- public: - FCompletedSideBounty CompletedSideBounty; - - virtual void IncrementBountyCheckpoint() override; void DestroyCheckpoints(); int GetRewardInFavours() { diff --git a/EndlessVendetta/Source/EndlessVendetta/Characters/BountyHunterCharacter.cpp b/EndlessVendetta/Source/EndlessVendetta/Characters/BountyHunterCharacter.cpp index b65da36f..64b93688 100644 --- a/EndlessVendetta/Source/EndlessVendetta/Characters/BountyHunterCharacter.cpp +++ b/EndlessVendetta/Source/EndlessVendetta/Characters/BountyHunterCharacter.cpp @@ -14,10 +14,6 @@ void ABountyHunterCharacter::SpawnMainBounty(UEVGameInstance* GI) if (MainBountyClasses.IsEmpty() || MainBountyClasses.Num() <= CurrentMainBountyIndex|| !IsValid(MainBountyClasses[CurrentMainBountyIndex])) { AllBountiesCompleted(); - if (CurrentMainBountyIndex >= 2 && !(UGameplayStatics::GetCurrentLevelName(GetWorld()) == "EnemyAITest")) - { - UGameplayStatics::OpenLevel(GetWorld(), FName("EnemyAITest")); - } return; } @@ -25,8 +21,20 @@ void ABountyHunterCharacter::SpawnMainBounty(UEVGameInstance* GI) const FAttachmentTransformRules AttachmentTransformRules(EAttachmentRule::SnapToTarget, true); CurrentMainBounty->AttachToComponent(GetRootComponent(), AttachmentTransformRules); - UGameplayStatics::GetCurrentLevelName(GetWorld()) == OpenWorldLevelName ? CurrentMainBounty->SpawnOpenWorldCheckpoint() : CurrentMainBounty->SpawnCheckpoints(); MainBountyStruct = CurrentMainBounty->MainBountyStruct; + if (UGameplayStatics::GetCurrentLevelName(GetWorld()) != OpenWorldLevelName) + { + CurrentMainBounty->SpawnCheckpoints(); + return; + } + CurrentMainBounty->SpawnOpenWorldCheckpoint(); + CurrentSideBounties = CurrentMainBounty->SpawnAndReturnSideBounties(); + + SideBountyStructs.Empty(); + for (auto SideBounty : CurrentSideBounties) + { + SideBountyStructs.Add(SideBounty->SideBountyStruct); + } } void ABountyHunterCharacter::CompleteCurrentMainBounty(UEVGameInstance* GI) diff --git a/EndlessVendetta/Source/EndlessVendetta/Characters/BountyHunterCharacter.h b/EndlessVendetta/Source/EndlessVendetta/Characters/BountyHunterCharacter.h index fe0ea38c..0ec2bc2a 100644 --- a/EndlessVendetta/Source/EndlessVendetta/Characters/BountyHunterCharacter.h +++ b/EndlessVendetta/Source/EndlessVendetta/Characters/BountyHunterCharacter.h @@ -30,6 +30,8 @@ class ENDLESSVENDETTA_API ABountyHunterCharacter : public AEndlessVendettaCharac // Reference to the Currently Active Main Bounty AMainBountyClass* CurrentMainBounty; + TArray CurrentSideBounties; + // Index of Currently Active Main Bounty, Used for MainBountyClasses int CurrentMainBountyIndex = 0; @@ -175,13 +177,13 @@ private: FMainBountyStruct MainBountyStruct; - TArray SideBountyStruct; + TArray SideBountyStructs; void UpdateBountyTabInfo() { if (!IsValid(BountiesTab)) return; BountyTabInfo.MainBountyStruct = MainBountyStruct; - BountyTabInfo.SideBountyStructs = SideBountyStruct; + BountyTabInfo.SideBountyStructs = SideBountyStructs; BountiesTab->UpdateBountyTab(BountyTabInfo); } From 1849db221904c750089db465ca692d5e204c208c Mon Sep 17 00:00:00 2001 From: Rafal Swierczek Date: Mon, 12 Feb 2024 23:41:02 +0000 Subject: [PATCH 09/25] Implemented Side Bounties Appearing in Pause Menu with Tracking Functionality --- .../.idea.EndlessVendetta/.idea/workspace.xml | 22 ++++---------- .../CP_GoToSecurityOffice.uasset | 4 +-- .../Content/Levels/MainMenuLevel.umap | 2 +- .../SideBounties/WBP_SideBountyInfoBox.uasset | 3 ++ .../Tabs/BountyTabs/WBP_BountiesTab.uasset | 4 +-- .../Blueprints/Blueprint_CeilingLight.uasset | 4 +-- .../HDRI/HDRI_Epic_Courtyard_Daylight.uasset | 4 +-- .../BountySystem/BountyClass.cpp | 1 - .../BountySystem/BountyClass.h | 2 +- .../BountySystem/MainBountyClass.cpp | 21 ++++++++----- .../BountySystem/MainBountyClass.h | 5 ++-- .../BountySystem/SideBountyClass.cpp | 13 ++++++++ .../BountySystem/SideBountyClass.h | 8 ++++- .../Characters/BountyHunterCharacter.cpp | 2 ++ .../Characters/BountyHunterCharacter.h | 30 +++++++++++++++++++ .../EndlessVendetta/PauseMenu/BountiesTab.h | 8 +++-- 16 files changed, 94 insertions(+), 39 deletions(-) create mode 100644 EndlessVendetta/Content/PauseMenu/Tabs/BountyTabs/SideBounties/WBP_SideBountyInfoBox.uasset diff --git a/EndlessVendetta/.idea/.idea.EndlessVendetta/.idea/workspace.xml b/EndlessVendetta/.idea/.idea.EndlessVendetta/.idea/workspace.xml index c9b7b27e..5beca5d8 100644 --- a/EndlessVendetta/.idea/.idea.EndlessVendetta/.idea/workspace.xml +++ b/EndlessVendetta/.idea/.idea.EndlessVendetta/.idea/workspace.xml @@ -9,31 +9,19 @@ - - - - - - - - - - - - + - + - - + diff --git a/EndlessVendetta/Content/BountySystem/ApartmentBounty/SideBounties/SecuritySpecialists/CP_GoToSecurityOffice.uasset b/EndlessVendetta/Content/BountySystem/ApartmentBounty/SideBounties/SecuritySpecialists/CP_GoToSecurityOffice.uasset index cdb1bb70..2208a9df 100644 --- a/EndlessVendetta/Content/BountySystem/ApartmentBounty/SideBounties/SecuritySpecialists/CP_GoToSecurityOffice.uasset +++ b/EndlessVendetta/Content/BountySystem/ApartmentBounty/SideBounties/SecuritySpecialists/CP_GoToSecurityOffice.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:5e4033216548f6200b2265883ed20f8c859b0ad6b628540b7cc58c8bdb2da091 -size 81558 +oid sha256:071d80db1611f406955a931fe236052cfc769eeb14eee2d02206536f4fc40d8c +size 80228 diff --git a/EndlessVendetta/Content/Levels/MainMenuLevel.umap b/EndlessVendetta/Content/Levels/MainMenuLevel.umap index 594eec13..88c665cd 100644 --- a/EndlessVendetta/Content/Levels/MainMenuLevel.umap +++ b/EndlessVendetta/Content/Levels/MainMenuLevel.umap @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:ecab0f671c308960a2881e050ca07a1300f04e97819e1f47203ca1ca652f4ccf +oid sha256:5015076ef46a0b0a06bef84fadb67659cdaad3127c3834256c74d4464b8646f6 size 308758 diff --git a/EndlessVendetta/Content/PauseMenu/Tabs/BountyTabs/SideBounties/WBP_SideBountyInfoBox.uasset b/EndlessVendetta/Content/PauseMenu/Tabs/BountyTabs/SideBounties/WBP_SideBountyInfoBox.uasset new file mode 100644 index 00000000..6aa5690d --- /dev/null +++ b/EndlessVendetta/Content/PauseMenu/Tabs/BountyTabs/SideBounties/WBP_SideBountyInfoBox.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:ba4468af77fcd913248cbbd33159c6dddb4bbb547ec17d373297b823f66d2595 +size 91777 diff --git a/EndlessVendetta/Content/PauseMenu/Tabs/BountyTabs/WBP_BountiesTab.uasset b/EndlessVendetta/Content/PauseMenu/Tabs/BountyTabs/WBP_BountiesTab.uasset index e0b0170f..76459198 100644 --- a/EndlessVendetta/Content/PauseMenu/Tabs/BountyTabs/WBP_BountiesTab.uasset +++ b/EndlessVendetta/Content/PauseMenu/Tabs/BountyTabs/WBP_BountiesTab.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:73c562cd7614a47d3e9c8504b3f67104b4ce07cbf83c4f6ea95a72ac600b3664 -size 132511 +oid sha256:a75ed9e73aad0c4027780bef39dcfbe27fb913aa91e4601e432bb0ec7db5a469 +size 252349 diff --git a/EndlessVendetta/Content/StarterContent/Blueprints/Blueprint_CeilingLight.uasset b/EndlessVendetta/Content/StarterContent/Blueprints/Blueprint_CeilingLight.uasset index c5c3b84e..a660aa52 100644 --- a/EndlessVendetta/Content/StarterContent/Blueprints/Blueprint_CeilingLight.uasset +++ b/EndlessVendetta/Content/StarterContent/Blueprints/Blueprint_CeilingLight.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:4a60a29ad596546d481e43dfb8698842a78cc07f4a4b1000fa397cfba4e72331 -size 158206 +oid sha256:08b978a616cb421c699b3c0aaf8e8e0a4d12614c8c99eb79c6debb1a030313ee +size 43745 diff --git a/EndlessVendetta/Content/StarterContent/HDRI/HDRI_Epic_Courtyard_Daylight.uasset b/EndlessVendetta/Content/StarterContent/HDRI/HDRI_Epic_Courtyard_Daylight.uasset index 80f4790a..0f990580 100644 --- a/EndlessVendetta/Content/StarterContent/HDRI/HDRI_Epic_Courtyard_Daylight.uasset +++ b/EndlessVendetta/Content/StarterContent/HDRI/HDRI_Epic_Courtyard_Daylight.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:6764172277cd1d5812197441d69c3897c757be02854b03b5e4a0ddf6cfa563fb -size 66790690 +oid sha256:bc35eb2d43a47427d30aba0196f9eac90d089dd3abca319528c5d25c83510d0d +size 72364642 diff --git a/EndlessVendetta/Source/EndlessVendetta/BountySystem/BountyClass.cpp b/EndlessVendetta/Source/EndlessVendetta/BountySystem/BountyClass.cpp index 977f9ed0..576cab76 100644 --- a/EndlessVendetta/Source/EndlessVendetta/BountySystem/BountyClass.cpp +++ b/EndlessVendetta/Source/EndlessVendetta/BountySystem/BountyClass.cpp @@ -16,7 +16,6 @@ void ABountyClass::ActivateFirstCheckpoint() if (BountyCheckpoints.IsEmpty() || BountyCheckpoints[0] == nullptr) return; BountyCheckpoints[0]->Active = true; - BountyCheckpoints[0]->SpawnWaypoint(BountyTitle); // BountyCheckpoints[0]->CheckpointActivated(); BountyCheckpoints[0]->CompletedCheckpoint.AddDynamic(this, &ABountyClass::IncrementBountyCheckpoint); } diff --git a/EndlessVendetta/Source/EndlessVendetta/BountySystem/BountyClass.h b/EndlessVendetta/Source/EndlessVendetta/BountySystem/BountyClass.h index d0039300..b0d84bf5 100644 --- a/EndlessVendetta/Source/EndlessVendetta/BountySystem/BountyClass.h +++ b/EndlessVendetta/Source/EndlessVendetta/BountySystem/BountyClass.h @@ -46,7 +46,7 @@ public: virtual void SpawnCheckpoints(); // Activate the First Checkpoint in Bounty Checkpoints and Listen for its Completion - void ActivateFirstCheckpoint(); + virtual void ActivateFirstCheckpoint(); // De-Activate the First Checkpoint in Bounty Checkpoints void DeActivateFirstCheckpoint(); diff --git a/EndlessVendetta/Source/EndlessVendetta/BountySystem/MainBountyClass.cpp b/EndlessVendetta/Source/EndlessVendetta/BountySystem/MainBountyClass.cpp index 72ca600b..aff7de9b 100644 --- a/EndlessVendetta/Source/EndlessVendetta/BountySystem/MainBountyClass.cpp +++ b/EndlessVendetta/Source/EndlessVendetta/BountySystem/MainBountyClass.cpp @@ -12,6 +12,13 @@ void AMainBountyClass::IncrementBountyCheckpoint() // Cast(GetWorld()->GetFirstPlayerController()->GetPawn())->CheckpointCompletedUI("", false); } +void AMainBountyClass::ActivateFirstCheckpoint() +{ + Super::ActivateFirstCheckpoint(); + if (BountyCheckpoints.IsEmpty() || BountyCheckpoints[0] == nullptr) return; + BountyCheckpoints[0]->SpawnWaypoint(MainBountyStruct.TargetName); +} + void AMainBountyClass::SpawnOpenWorldCheckpoint() { if (!IsValid(OpenWorldCheckpointClass)) return; @@ -25,13 +32,13 @@ void AMainBountyClass::SpawnOpenWorldCheckpoint() OpenWorldcheckpoint->SpawnWaypoint(BountyTitle); } - void AMainBountyClass::SpawnCheckpoints() - { - Super::SpawnCheckpoints(); - ActivateFirstCheckpoint(); - } +void AMainBountyClass::SpawnCheckpoints() +{ + Super::SpawnCheckpoints(); + ActivateFirstCheckpoint(); +} - TArray AMainBountyClass::SpawnAndReturnSideBounties() +TArray AMainBountyClass::SpawnAndReturnSideBounties() { TArray SpawnedSideBounties; for (auto SideBountyClass : SideBountiesToSpawn) @@ -47,7 +54,7 @@ void AMainBountyClass::SpawnOpenWorldCheckpoint() } - void AMainBountyClass::SpawnAmmoDrops() +void AMainBountyClass::SpawnAmmoDrops() { UE_LOG(LogTemp, Display, TEXT("Bought Ammo Drops, but its not implemented yet")); // FActorSpawnParameters SpawnParameters; diff --git a/EndlessVendetta/Source/EndlessVendetta/BountySystem/MainBountyClass.h b/EndlessVendetta/Source/EndlessVendetta/BountySystem/MainBountyClass.h index f3ddc5b1..e41b6fab 100644 --- a/EndlessVendetta/Source/EndlessVendetta/BountySystem/MainBountyClass.h +++ b/EndlessVendetta/Source/EndlessVendetta/BountySystem/MainBountyClass.h @@ -71,8 +71,8 @@ private: void IncrementBountyCheckpoint() override; protected: - + public: // Spawns the Single Checkpoint in the Open World for this Main Bounty void SpawnOpenWorldCheckpoint(); @@ -88,7 +88,8 @@ public: return PlayerSpawnTransform; } - + // Overrides to Set Title of Waypoint + void ActivateFirstCheckpoint() override; diff --git a/EndlessVendetta/Source/EndlessVendetta/BountySystem/SideBountyClass.cpp b/EndlessVendetta/Source/EndlessVendetta/BountySystem/SideBountyClass.cpp index 7ad9409d..bca92d12 100644 --- a/EndlessVendetta/Source/EndlessVendetta/BountySystem/SideBountyClass.cpp +++ b/EndlessVendetta/Source/EndlessVendetta/BountySystem/SideBountyClass.cpp @@ -4,6 +4,19 @@ #include "SideBountyClass.h" +void ASideBountyClass::BeginPlay() +{ + SideBountyStruct.SideBountyUID = GetUniqueID(); + Super::BeginPlay(); +} + +void ASideBountyClass::ActivateFirstCheckpoint() +{ + Super::ActivateFirstCheckpoint(); + if (BountyCheckpoints.IsEmpty() || BountyCheckpoints[0] == nullptr) return; + BountyCheckpoints[0]->SpawnWaypoint(SideBountyStruct.BountyTitle); +} + void ASideBountyClass::IncrementBountyCheckpoint() { Super::IncrementBountyCheckpoint(); diff --git a/EndlessVendetta/Source/EndlessVendetta/BountySystem/SideBountyClass.h b/EndlessVendetta/Source/EndlessVendetta/BountySystem/SideBountyClass.h index 2f4118e1..24187c7d 100644 --- a/EndlessVendetta/Source/EndlessVendetta/BountySystem/SideBountyClass.h +++ b/EndlessVendetta/Source/EndlessVendetta/BountySystem/SideBountyClass.h @@ -19,6 +19,9 @@ struct FSideBountyStruct UPROPERTY(BlueprintReadOnly) bool Tracked = true; + + UPROPERTY(BlueprintReadOnly) + int SideBountyUID = 0; }; DECLARE_DYNAMIC_MULTICAST_DELEGATE_OneParam(FCompletedSideBounty, int, FavoursEarned); @@ -46,12 +49,15 @@ public: // ------------------- METHODS --------------------------------- private: + virtual void BeginPlay() override; protected: // Overrides to check if Side Bounty has been Completed virtual void IncrementBountyCheckpoint() override; -public: +public: + // Overrides to Set Title of Waypoint + void ActivateFirstCheckpoint() override; // ------------------- LEGACY --------------------------------- diff --git a/EndlessVendetta/Source/EndlessVendetta/Characters/BountyHunterCharacter.cpp b/EndlessVendetta/Source/EndlessVendetta/Characters/BountyHunterCharacter.cpp index 64b93688..fcb5d58a 100644 --- a/EndlessVendetta/Source/EndlessVendetta/Characters/BountyHunterCharacter.cpp +++ b/EndlessVendetta/Source/EndlessVendetta/Characters/BountyHunterCharacter.cpp @@ -124,6 +124,8 @@ void ABountyHunterCharacter::CreatePauseMenuTabs() { BountiesTab = CreateWidget(GetWorld(), UGameplayStatics::GetCurrentLevelName(GetWorld()) == OpenWorldLevelName ? BountyTabWidgetClass : BountyInProgressTabWidgetClass); BountiesTab->ReturnToOpenWorldEarlyDelegate.AddDynamic(this, &ABountyHunterCharacter::ReturnToOpenWorldEarly); + BountiesTab->TrackBountyDelegate.AddDynamic(this, &ABountyHunterCharacter::TrackMainBounty); + BountiesTab->TrackSideBountyDelegate.AddDynamic(this, &ABountyHunterCharacter::TrackSideBounty); } UpdateBountyTabInfo(); FavoursTab = CreateWidget(GetWorld(), FavoursTabWidgetClass); diff --git a/EndlessVendetta/Source/EndlessVendetta/Characters/BountyHunterCharacter.h b/EndlessVendetta/Source/EndlessVendetta/Characters/BountyHunterCharacter.h index 0ec2bc2a..1784fed4 100644 --- a/EndlessVendetta/Source/EndlessVendetta/Characters/BountyHunterCharacter.h +++ b/EndlessVendetta/Source/EndlessVendetta/Characters/BountyHunterCharacter.h @@ -190,4 +190,34 @@ private: UFUNCTION() void ReturnToOpenWorldEarly(); + + void DeActivateAllBounties() + { + CurrentMainBounty->DeActivateFirstCheckpoint(); + for (auto SideBounty : CurrentSideBounties) + { + SideBounty->DeActivateFirstCheckpoint(); + } + } + + UFUNCTION() + void TrackMainBounty() + { + DeActivateAllBounties(); + CurrentMainBounty->ActivateFirstCheckpoint(); + } + + UFUNCTION() + void TrackSideBounty(int SideBountyUID) + { + DeActivateAllBounties(); + for (auto SideBounty : CurrentSideBounties) + { + if (SideBounty->GetUniqueID() == SideBountyUID) + { + SideBounty->ActivateFirstCheckpoint(); + break; + } + } + } }; diff --git a/EndlessVendetta/Source/EndlessVendetta/PauseMenu/BountiesTab.h b/EndlessVendetta/Source/EndlessVendetta/PauseMenu/BountiesTab.h index 56f3d49c..5b0ef8c2 100644 --- a/EndlessVendetta/Source/EndlessVendetta/PauseMenu/BountiesTab.h +++ b/EndlessVendetta/Source/EndlessVendetta/PauseMenu/BountiesTab.h @@ -8,8 +8,9 @@ #include "EndlessVendetta/BountySystem/BountyClass.h" #include "BountiesTab.generated.h" -DECLARE_DYNAMIC_MULTICAST_DELEGATE_OneParam(FTrackBounty, ABountyClass*, BountyToTrack); +DECLARE_DYNAMIC_MULTICAST_DELEGATE(FTrackBounty); DECLARE_DYNAMIC_MULTICAST_DELEGATE(FReturnToOpenWorldEarly); +DECLARE_DYNAMIC_MULTICAST_DELEGATE_OneParam(FTrackSideBounty, int, BountyID); UCLASS() class ENDLESSVENDETTA_API UBountiesTab : public UTabWidget @@ -21,9 +22,12 @@ class ENDLESSVENDETTA_API UBountiesTab : public UTabWidget protected: public: - UPROPERTY(BlueprintAssignable) + UPROPERTY(BlueprintCallable) FTrackBounty TrackBountyDelegate; + UPROPERTY(BlueprintCallable) + FTrackSideBounty TrackSideBountyDelegate; + UPROPERTY(BlueprintCallable) FReturnToOpenWorldEarly ReturnToOpenWorldEarlyDelegate; From eba19193b69f4d01c00a96999e3420473ace3f75 Mon Sep 17 00:00:00 2001 From: Rafal Swierczek Date: Wed, 14 Feb 2024 15:26:39 +0000 Subject: [PATCH 10/25] Bugfix Bounty Tracking not Working with Main Bounties Open World Checkpoint --- .../.idea/.idea.EndlessVendetta/.idea/workspace.xml | 11 ++++------- .../Content/BountySystem/Waypoint/BP_Waypoint.uasset | 4 ++-- EndlessVendetta/Content/Levels/MainMenuLevel.umap | 4 ++-- .../StarterContent/Architecture/Floor_400x400.uasset | 4 ++-- .../Blueprints/Blueprint_CeilingLight.uasset | 4 ++-- .../EndlessVendetta/BountySystem/BountyClass.cpp | 4 ++-- .../Source/EndlessVendetta/BountySystem/BountyClass.h | 2 +- .../EndlessVendetta/BountySystem/MainBountyClass.cpp | 11 +++++++++-- .../EndlessVendetta/BountySystem/MainBountyClass.h | 5 ++++- .../Characters/BountyHunterCharacter.h | 2 ++ 10 files changed, 30 insertions(+), 21 deletions(-) diff --git a/EndlessVendetta/.idea/.idea.EndlessVendetta/.idea/workspace.xml b/EndlessVendetta/.idea/.idea.EndlessVendetta/.idea/workspace.xml index 5beca5d8..9e1d1585 100644 --- a/EndlessVendetta/.idea/.idea.EndlessVendetta/.idea/workspace.xml +++ b/EndlessVendetta/.idea/.idea.EndlessVendetta/.idea/workspace.xml @@ -9,19 +9,15 @@ - + - - + + - - - - diff --git a/EndlessVendetta/Content/BountySystem/Waypoint/BP_Waypoint.uasset b/EndlessVendetta/Content/BountySystem/Waypoint/BP_Waypoint.uasset index 784cbe0b..3b21973c 100644 --- a/EndlessVendetta/Content/BountySystem/Waypoint/BP_Waypoint.uasset +++ b/EndlessVendetta/Content/BountySystem/Waypoint/BP_Waypoint.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:a406c3c753428efd22e472351a913e042fd0653a7430e4ee29ae7149559d92b4 -size 62287 +oid sha256:b6511ca4db97e4492dced6793261a1362cc37f48b4cbc534142af930d394cbdc +size 62240 diff --git a/EndlessVendetta/Content/Levels/MainMenuLevel.umap b/EndlessVendetta/Content/Levels/MainMenuLevel.umap index 88c665cd..6dd6c40d 100644 --- a/EndlessVendetta/Content/Levels/MainMenuLevel.umap +++ b/EndlessVendetta/Content/Levels/MainMenuLevel.umap @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:5015076ef46a0b0a06bef84fadb67659cdaad3127c3834256c74d4464b8646f6 -size 308758 +oid sha256:baf9403b33d7855cad2195c4d017e92a79de594c89dc87205e7c3c5e7fa9f6e6 +size 308710 diff --git a/EndlessVendetta/Content/StarterContent/Architecture/Floor_400x400.uasset b/EndlessVendetta/Content/StarterContent/Architecture/Floor_400x400.uasset index c2a34afc..68b6d69a 100644 --- a/EndlessVendetta/Content/StarterContent/Architecture/Floor_400x400.uasset +++ b/EndlessVendetta/Content/StarterContent/Architecture/Floor_400x400.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:4c0ecf0ac0702cc2bd355ec050232a61c49e10f102448efbeb735a51824adef6 -size 14948 +oid sha256:26450b67609a17b75a4f99e729b760006ea8860ab33e56e4a8bfcc4eefdb7b73 +size 14831 diff --git a/EndlessVendetta/Content/StarterContent/Blueprints/Blueprint_CeilingLight.uasset b/EndlessVendetta/Content/StarterContent/Blueprints/Blueprint_CeilingLight.uasset index a660aa52..c5c3b84e 100644 --- a/EndlessVendetta/Content/StarterContent/Blueprints/Blueprint_CeilingLight.uasset +++ b/EndlessVendetta/Content/StarterContent/Blueprints/Blueprint_CeilingLight.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:08b978a616cb421c699b3c0aaf8e8e0a4d12614c8c99eb79c6debb1a030313ee -size 43745 +oid sha256:4a60a29ad596546d481e43dfb8698842a78cc07f4a4b1000fa397cfba4e72331 +size 158206 diff --git a/EndlessVendetta/Source/EndlessVendetta/BountySystem/BountyClass.cpp b/EndlessVendetta/Source/EndlessVendetta/BountySystem/BountyClass.cpp index 576cab76..b6678d31 100644 --- a/EndlessVendetta/Source/EndlessVendetta/BountySystem/BountyClass.cpp +++ b/EndlessVendetta/Source/EndlessVendetta/BountySystem/BountyClass.cpp @@ -16,7 +16,6 @@ void ABountyClass::ActivateFirstCheckpoint() if (BountyCheckpoints.IsEmpty() || BountyCheckpoints[0] == nullptr) return; BountyCheckpoints[0]->Active = true; - // BountyCheckpoints[0]->CheckpointActivated(); BountyCheckpoints[0]->CompletedCheckpoint.AddDynamic(this, &ABountyClass::IncrementBountyCheckpoint); } @@ -24,8 +23,9 @@ void ABountyClass::DeActivateFirstCheckpoint() { if (BountyCheckpoints.IsEmpty() || BountyCheckpoints[0] == nullptr) return; + BountyCheckpoints[0]->CompletedCheckpoint.RemoveDynamic(this, &ABountyClass::IncrementBountyCheckpoint); BountyCheckpoints[0]->Active = false; - BountyCheckpoints[0]->DestroyWaypoint(); + BountyCheckpoints[0]->DestroyWaypoint(); } void ABountyClass::SpawnCheckpoints() diff --git a/EndlessVendetta/Source/EndlessVendetta/BountySystem/BountyClass.h b/EndlessVendetta/Source/EndlessVendetta/BountySystem/BountyClass.h index b0d84bf5..d34e4c77 100644 --- a/EndlessVendetta/Source/EndlessVendetta/BountySystem/BountyClass.h +++ b/EndlessVendetta/Source/EndlessVendetta/BountySystem/BountyClass.h @@ -49,7 +49,7 @@ public: virtual void ActivateFirstCheckpoint(); // De-Activate the First Checkpoint in Bounty Checkpoints - void DeActivateFirstCheckpoint(); + virtual void DeActivateFirstCheckpoint(); diff --git a/EndlessVendetta/Source/EndlessVendetta/BountySystem/MainBountyClass.cpp b/EndlessVendetta/Source/EndlessVendetta/BountySystem/MainBountyClass.cpp index aff7de9b..b4d65338 100644 --- a/EndlessVendetta/Source/EndlessVendetta/BountySystem/MainBountyClass.cpp +++ b/EndlessVendetta/Source/EndlessVendetta/BountySystem/MainBountyClass.cpp @@ -15,11 +15,18 @@ void AMainBountyClass::IncrementBountyCheckpoint() void AMainBountyClass::ActivateFirstCheckpoint() { Super::ActivateFirstCheckpoint(); + if (IsValid(OpenWorldcheckpoint)) OpenWorldcheckpoint->SpawnWaypoint(MainBountyStruct.TargetName); if (BountyCheckpoints.IsEmpty() || BountyCheckpoints[0] == nullptr) return; BountyCheckpoints[0]->SpawnWaypoint(MainBountyStruct.TargetName); } -void AMainBountyClass::SpawnOpenWorldCheckpoint() +void AMainBountyClass::DeActivateFirstCheckpoint() +{ + Super::DeActivateFirstCheckpoint(); + if (IsValid(OpenWorldcheckpoint)) OpenWorldcheckpoint->DestroyWaypoint(); +} + + void AMainBountyClass::SpawnOpenWorldCheckpoint() { if (!IsValid(OpenWorldCheckpointClass)) return; @@ -29,7 +36,7 @@ void AMainBountyClass::SpawnOpenWorldCheckpoint() FRotator Rot = OpenWorldCheckpointClass.GetDefaultObject()->GetCheckpointSpawnTransform().GetRotation().Rotator(); OpenWorldcheckpoint = GetWorld()->SpawnActor(OpenWorldCheckpointClass, Loc, Rot, SpawnParameters); - OpenWorldcheckpoint->SpawnWaypoint(BountyTitle); + ActivateFirstCheckpoint(); } void AMainBountyClass::SpawnCheckpoints() diff --git a/EndlessVendetta/Source/EndlessVendetta/BountySystem/MainBountyClass.h b/EndlessVendetta/Source/EndlessVendetta/BountySystem/MainBountyClass.h index e41b6fab..933c4a28 100644 --- a/EndlessVendetta/Source/EndlessVendetta/BountySystem/MainBountyClass.h +++ b/EndlessVendetta/Source/EndlessVendetta/BountySystem/MainBountyClass.h @@ -89,7 +89,10 @@ public: } // Overrides to Set Title of Waypoint - void ActivateFirstCheckpoint() override; + void ActivateFirstCheckpoint() override; + + // Overrides to Desapwn Waypoint from OpenWorld Checkpoint + void DeActivateFirstCheckpoint() override; diff --git a/EndlessVendetta/Source/EndlessVendetta/Characters/BountyHunterCharacter.h b/EndlessVendetta/Source/EndlessVendetta/Characters/BountyHunterCharacter.h index 1784fed4..8f4d0797 100644 --- a/EndlessVendetta/Source/EndlessVendetta/Characters/BountyHunterCharacter.h +++ b/EndlessVendetta/Source/EndlessVendetta/Characters/BountyHunterCharacter.h @@ -28,8 +28,10 @@ class ENDLESSVENDETTA_API ABountyHunterCharacter : public AEndlessVendettaCharac TArray> MainBountyClasses; // Reference to the Currently Active Main Bounty + UPROPERTY() AMainBountyClass* CurrentMainBounty; + UPROPERTY() TArray CurrentSideBounties; // Index of Currently Active Main Bounty, Used for MainBountyClasses From d689c179736edded91b11ae274e257484edbf38c Mon Sep 17 00:00:00 2001 From: Rafal Swierczek Date: Wed, 14 Feb 2024 15:32:28 +0000 Subject: [PATCH 11/25] Bugfix Main Bounty Track Button Starts Enabled Despite Bounty being Tracked --- .../Content/PauseMenu/Tabs/BountyTabs/WBP_BountiesTab.uasset | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/EndlessVendetta/Content/PauseMenu/Tabs/BountyTabs/WBP_BountiesTab.uasset b/EndlessVendetta/Content/PauseMenu/Tabs/BountyTabs/WBP_BountiesTab.uasset index 76459198..6ef35004 100644 --- a/EndlessVendetta/Content/PauseMenu/Tabs/BountyTabs/WBP_BountiesTab.uasset +++ b/EndlessVendetta/Content/PauseMenu/Tabs/BountyTabs/WBP_BountiesTab.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:a75ed9e73aad0c4027780bef39dcfbe27fb913aa91e4601e432bb0ec7db5a469 -size 252349 +oid sha256:df4da6ce3565772c8ca641c321ad8a34ad0f982bc7fdb4e05817253ace6b43b1 +size 263210 From d4fe69ec2c22ee2e59cdcc7bddd7309cc8b41634 Mon Sep 17 00:00:00 2001 From: Rafal Swierczek Date: Wed, 14 Feb 2024 16:21:25 +0000 Subject: [PATCH 12/25] Added Bounty Floorplan --- .../.idea/.idea.EndlessVendetta/.idea/workspace.xml | 12 ++---------- .../BountyDisplay/ApartmentHitFloorPlan.PNG | 3 +++ .../BountyDisplay/ApartmentHitFloorPlan.uasset | 3 +++ .../BountySystem/ApartmentBounty/MB_Apartment.uasset | 4 ++-- EndlessVendetta/Content/Levels/MainMenuLevel.umap | 4 ++-- 5 files changed, 12 insertions(+), 14 deletions(-) create mode 100644 EndlessVendetta/Content/BountySystem/ApartmentBounty/BountyDisplay/ApartmentHitFloorPlan.PNG create mode 100644 EndlessVendetta/Content/BountySystem/ApartmentBounty/BountyDisplay/ApartmentHitFloorPlan.uasset diff --git a/EndlessVendetta/.idea/.idea.EndlessVendetta/.idea/workspace.xml b/EndlessVendetta/.idea/.idea.EndlessVendetta/.idea/workspace.xml index 9e1d1585..4d1ff9a4 100644 --- a/EndlessVendetta/.idea/.idea.EndlessVendetta/.idea/workspace.xml +++ b/EndlessVendetta/.idea/.idea.EndlessVendetta/.idea/workspace.xml @@ -8,16 +8,8 @@ - - + - - - - - - - diff --git a/EndlessVendetta/Content/BountySystem/ApartmentBounty/BountyDisplay/ApartmentHitFloorPlan.PNG b/EndlessVendetta/Content/BountySystem/ApartmentBounty/BountyDisplay/ApartmentHitFloorPlan.PNG new file mode 100644 index 00000000..1c2d4ce9 --- /dev/null +++ b/EndlessVendetta/Content/BountySystem/ApartmentBounty/BountyDisplay/ApartmentHitFloorPlan.PNG @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:6e90d1b72e51ce4831e91d79a40098d5bea1628cb99b848ddf3f98bbf8e8bb97 +size 255117 diff --git a/EndlessVendetta/Content/BountySystem/ApartmentBounty/BountyDisplay/ApartmentHitFloorPlan.uasset b/EndlessVendetta/Content/BountySystem/ApartmentBounty/BountyDisplay/ApartmentHitFloorPlan.uasset new file mode 100644 index 00000000..1311c061 --- /dev/null +++ b/EndlessVendetta/Content/BountySystem/ApartmentBounty/BountyDisplay/ApartmentHitFloorPlan.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:af78619c66a38463c39e173e8d6efed2b2f962425f31f7d448c431e874482ceb +size 218325 diff --git a/EndlessVendetta/Content/BountySystem/ApartmentBounty/MB_Apartment.uasset b/EndlessVendetta/Content/BountySystem/ApartmentBounty/MB_Apartment.uasset index 966102a7..f703e54a 100644 --- a/EndlessVendetta/Content/BountySystem/ApartmentBounty/MB_Apartment.uasset +++ b/EndlessVendetta/Content/BountySystem/ApartmentBounty/MB_Apartment.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:0799a3c8d18c8c3ac88ea74f2106eff00d2f768db80dd3890e59eb95c2a5e09c -size 25631 +oid sha256:3e48de241e8613c2ecca5b80edbfca3fc8feb8877be03fc6c305139b56722423 +size 25871 diff --git a/EndlessVendetta/Content/Levels/MainMenuLevel.umap b/EndlessVendetta/Content/Levels/MainMenuLevel.umap index 6dd6c40d..9333c78d 100644 --- a/EndlessVendetta/Content/Levels/MainMenuLevel.umap +++ b/EndlessVendetta/Content/Levels/MainMenuLevel.umap @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:baf9403b33d7855cad2195c4d017e92a79de594c89dc87205e7c3c5e7fa9f6e6 -size 308710 +oid sha256:c47beeba2669dedff200bc860957e7e7c44317fa30b7810973c101a5f23b6810 +size 308758 From 49ab926b4c5358395c011bd17c9cc58c18ac4c19 Mon Sep 17 00:00:00 2001 From: Rafal Swierczek Date: Thu, 15 Feb 2024 10:07:09 +0000 Subject: [PATCH 13/25] Added Bounty Face Profile --- .../.idea/.idea.EndlessVendetta/.idea/workspace.xml | 5 +++-- .../ApartmentBounty/BountyDisplay/VinnyBoy.uasset | 3 +++ .../Content/BountySystem/ApartmentBounty/MB_Apartment.uasset | 4 ++-- .../Content/StarterContent/Architecture/Floor_400x400.uasset | 4 ++-- .../StarterContent/HDRI/HDRI_Epic_Courtyard_Daylight.uasset | 4 ++-- 5 files changed, 12 insertions(+), 8 deletions(-) create mode 100644 EndlessVendetta/Content/BountySystem/ApartmentBounty/BountyDisplay/VinnyBoy.uasset diff --git a/EndlessVendetta/.idea/.idea.EndlessVendetta/.idea/workspace.xml b/EndlessVendetta/.idea/.idea.EndlessVendetta/.idea/workspace.xml index 4d1ff9a4..f6f396a8 100644 --- a/EndlessVendetta/.idea/.idea.EndlessVendetta/.idea/workspace.xml +++ b/EndlessVendetta/.idea/.idea.EndlessVendetta/.idea/workspace.xml @@ -8,8 +8,7 @@ - - + diff --git a/EndlessVendetta/Content/BountySystem/ApartmentBounty/BountyDisplay/VinnyBoy.uasset b/EndlessVendetta/Content/BountySystem/ApartmentBounty/BountyDisplay/VinnyBoy.uasset new file mode 100644 index 00000000..e434f0a1 --- /dev/null +++ b/EndlessVendetta/Content/BountySystem/ApartmentBounty/BountyDisplay/VinnyBoy.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:283fa1529e5e78e67bc2035ec61078dc12afed1a1c70e4a61d7a710d0af7cd9f +size 9215983 diff --git a/EndlessVendetta/Content/BountySystem/ApartmentBounty/MB_Apartment.uasset b/EndlessVendetta/Content/BountySystem/ApartmentBounty/MB_Apartment.uasset index f703e54a..9d953676 100644 --- a/EndlessVendetta/Content/BountySystem/ApartmentBounty/MB_Apartment.uasset +++ b/EndlessVendetta/Content/BountySystem/ApartmentBounty/MB_Apartment.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:3e48de241e8613c2ecca5b80edbfca3fc8feb8877be03fc6c305139b56722423 -size 25871 +oid sha256:f6700026f8b4d6fbf0f4541e67444deca14243e3f11c9f8caeb45ead93656e85 +size 25880 diff --git a/EndlessVendetta/Content/StarterContent/Architecture/Floor_400x400.uasset b/EndlessVendetta/Content/StarterContent/Architecture/Floor_400x400.uasset index 68b6d69a..c2a34afc 100644 --- a/EndlessVendetta/Content/StarterContent/Architecture/Floor_400x400.uasset +++ b/EndlessVendetta/Content/StarterContent/Architecture/Floor_400x400.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:26450b67609a17b75a4f99e729b760006ea8860ab33e56e4a8bfcc4eefdb7b73 -size 14831 +oid sha256:4c0ecf0ac0702cc2bd355ec050232a61c49e10f102448efbeb735a51824adef6 +size 14948 diff --git a/EndlessVendetta/Content/StarterContent/HDRI/HDRI_Epic_Courtyard_Daylight.uasset b/EndlessVendetta/Content/StarterContent/HDRI/HDRI_Epic_Courtyard_Daylight.uasset index 0f990580..afe8a177 100644 --- a/EndlessVendetta/Content/StarterContent/HDRI/HDRI_Epic_Courtyard_Daylight.uasset +++ b/EndlessVendetta/Content/StarterContent/HDRI/HDRI_Epic_Courtyard_Daylight.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:bc35eb2d43a47427d30aba0196f9eac90d089dd3abca319528c5d25c83510d0d -size 72364642 +oid sha256:283c744b993655f923d3a42c6190fc8ee68adde37653dcf3a79659cd5011f4ed +size 66790690 From c33044ae26946e4132fdaeb262dec1327b3dec71 Mon Sep 17 00:00:00 2001 From: Rafal Swierczek Date: Fri, 16 Feb 2024 14:09:10 +0000 Subject: [PATCH 14/25] New Tutorial Intro --- .../ControlsTutorial/Bounty/Checkpoints/CP_BeginPlay.uasset | 4 ++-- .../ControlsTutorial/Bounty/Cutscenes/WBP_GameIntro.uasset | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/EndlessVendetta/Content/BountySystem/ControlsTutorial/Bounty/Checkpoints/CP_BeginPlay.uasset b/EndlessVendetta/Content/BountySystem/ControlsTutorial/Bounty/Checkpoints/CP_BeginPlay.uasset index cb98668e..a0a183ea 100644 --- a/EndlessVendetta/Content/BountySystem/ControlsTutorial/Bounty/Checkpoints/CP_BeginPlay.uasset +++ b/EndlessVendetta/Content/BountySystem/ControlsTutorial/Bounty/Checkpoints/CP_BeginPlay.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:3cc9d57fa13895cf12ef2b16c2fc357c7251c429519d0d4ced1973aa95cc2877 -size 63667 +oid sha256:b0786d2dd7ee867d9150d709b4b856c2679c0430a54c2e4faf2f1b4a848c5263 +size 61009 diff --git a/EndlessVendetta/Content/BountySystem/ControlsTutorial/Bounty/Cutscenes/WBP_GameIntro.uasset b/EndlessVendetta/Content/BountySystem/ControlsTutorial/Bounty/Cutscenes/WBP_GameIntro.uasset index c3ee7b1f..e1ac8eec 100644 --- a/EndlessVendetta/Content/BountySystem/ControlsTutorial/Bounty/Cutscenes/WBP_GameIntro.uasset +++ b/EndlessVendetta/Content/BountySystem/ControlsTutorial/Bounty/Cutscenes/WBP_GameIntro.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:d46e59922d5c6c22e421303807855e757a2de879cb81e482ab4e5329e3cf1b38 -size 93040 +oid sha256:5a411ffb84711aeb93e84dc8ff173e9e2d305eb02617b42ce4f59ae36afcabd0 +size 140281 From 40a50cc62ca11337cf2483ce5b4181aaf76ebacb Mon Sep 17 00:00:00 2001 From: Rafal Swierczek Date: Fri, 16 Feb 2024 14:10:00 +0000 Subject: [PATCH 15/25] Added Standin Pest Control Side Bounty and Checkpoint --- .../.idea/.idea.EndlessVendetta/.idea/workspace.xml | 6 +++++- .../Content/AI/Enemy/Basic/BP_BasicEnemyCharacter.uasset | 4 ++-- .../BountySystem/ApartmentBounty/MB_Apartment.uasset | 4 ++-- .../SideBounties/PestControl/CP_GoToPestControl.uasset | 3 +++ .../SideBounties/PestControl/SB_PestControl.uasset | 3 +++ EndlessVendetta/Content/Levels/TempOpenWorld.umap | 4 ++-- .../StarterContent/Blueprints/Blueprint_CeilingLight.uasset | 4 ++-- .../StarterContent/HDRI/HDRI_Epic_Courtyard_Daylight.uasset | 4 ++-- 8 files changed, 21 insertions(+), 11 deletions(-) create mode 100644 EndlessVendetta/Content/BountySystem/ApartmentBounty/SideBounties/PestControl/CP_GoToPestControl.uasset create mode 100644 EndlessVendetta/Content/BountySystem/ApartmentBounty/SideBounties/PestControl/SB_PestControl.uasset diff --git a/EndlessVendetta/.idea/.idea.EndlessVendetta/.idea/workspace.xml b/EndlessVendetta/.idea/.idea.EndlessVendetta/.idea/workspace.xml index f6f396a8..51a92ed4 100644 --- a/EndlessVendetta/.idea/.idea.EndlessVendetta/.idea/workspace.xml +++ b/EndlessVendetta/.idea/.idea.EndlessVendetta/.idea/workspace.xml @@ -9,6 +9,10 @@ + + + + diff --git a/EndlessVendetta/Content/AI/Enemy/Basic/BP_BasicEnemyCharacter.uasset b/EndlessVendetta/Content/AI/Enemy/Basic/BP_BasicEnemyCharacter.uasset index 0f87096b..1d2734e4 100644 --- a/EndlessVendetta/Content/AI/Enemy/Basic/BP_BasicEnemyCharacter.uasset +++ b/EndlessVendetta/Content/AI/Enemy/Basic/BP_BasicEnemyCharacter.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:346694815d27351a11689716978cc2e0ab8c95dd696d0424da732423e1ea0cec -size 88074 +oid sha256:bbfb60916a9c0c6eb0b0c22c4fbf890ea502ce090da3c24aff038297078ef9b8 +size 86630 diff --git a/EndlessVendetta/Content/BountySystem/ApartmentBounty/MB_Apartment.uasset b/EndlessVendetta/Content/BountySystem/ApartmentBounty/MB_Apartment.uasset index 9d953676..04328b41 100644 --- a/EndlessVendetta/Content/BountySystem/ApartmentBounty/MB_Apartment.uasset +++ b/EndlessVendetta/Content/BountySystem/ApartmentBounty/MB_Apartment.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:f6700026f8b4d6fbf0f4541e67444deca14243e3f11c9f8caeb45ead93656e85 -size 25880 +oid sha256:a59e7e17a5255b9301cd54ee398e1f5c482c2ff710aa52f96f672b0d1ac50de4 +size 26080 diff --git a/EndlessVendetta/Content/BountySystem/ApartmentBounty/SideBounties/PestControl/CP_GoToPestControl.uasset b/EndlessVendetta/Content/BountySystem/ApartmentBounty/SideBounties/PestControl/CP_GoToPestControl.uasset new file mode 100644 index 00000000..560c1ad3 --- /dev/null +++ b/EndlessVendetta/Content/BountySystem/ApartmentBounty/SideBounties/PestControl/CP_GoToPestControl.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:108afc519ba00c092a39433ef8f34d772b87c57f42b104241e4e7f1ff32c247f +size 81279 diff --git a/EndlessVendetta/Content/BountySystem/ApartmentBounty/SideBounties/PestControl/SB_PestControl.uasset b/EndlessVendetta/Content/BountySystem/ApartmentBounty/SideBounties/PestControl/SB_PestControl.uasset new file mode 100644 index 00000000..1e492a40 --- /dev/null +++ b/EndlessVendetta/Content/BountySystem/ApartmentBounty/SideBounties/PestControl/SB_PestControl.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:7144181beeee94537a648584103abed567bd5c5849263e034fea4ac326895829 +size 22941 diff --git a/EndlessVendetta/Content/Levels/TempOpenWorld.umap b/EndlessVendetta/Content/Levels/TempOpenWorld.umap index d46f6d9e..2ac2aff9 100644 --- a/EndlessVendetta/Content/Levels/TempOpenWorld.umap +++ b/EndlessVendetta/Content/Levels/TempOpenWorld.umap @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:1d77716f252adb75b590d1a27ae726ae52e139032cceb876fc497f4125619a79 -size 13867288 +oid sha256:4d7ca6377d1eab1c529cd4be6dd17d1c73033e6ba9cbfd201cad240134580c1f +size 13914548 diff --git a/EndlessVendetta/Content/StarterContent/Blueprints/Blueprint_CeilingLight.uasset b/EndlessVendetta/Content/StarterContent/Blueprints/Blueprint_CeilingLight.uasset index c5c3b84e..bbd4d209 100644 --- a/EndlessVendetta/Content/StarterContent/Blueprints/Blueprint_CeilingLight.uasset +++ b/EndlessVendetta/Content/StarterContent/Blueprints/Blueprint_CeilingLight.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:4a60a29ad596546d481e43dfb8698842a78cc07f4a4b1000fa397cfba4e72331 -size 158206 +oid sha256:a9e9b8a73b98b46c9d4c21d92c64f77e88aad2cfe199d4c9e16a6d4a662a3204 +size 43745 diff --git a/EndlessVendetta/Content/StarterContent/HDRI/HDRI_Epic_Courtyard_Daylight.uasset b/EndlessVendetta/Content/StarterContent/HDRI/HDRI_Epic_Courtyard_Daylight.uasset index afe8a177..0f990580 100644 --- a/EndlessVendetta/Content/StarterContent/HDRI/HDRI_Epic_Courtyard_Daylight.uasset +++ b/EndlessVendetta/Content/StarterContent/HDRI/HDRI_Epic_Courtyard_Daylight.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:283c744b993655f923d3a42c6190fc8ee68adde37653dcf3a79659cd5011f4ed -size 66790690 +oid sha256:bc35eb2d43a47427d30aba0196f9eac90d089dd3abca319528c5d25c83510d0d +size 72364642 From 3e37bbcc6a0e94739611487f05a08ebc1b8d70f9 Mon Sep 17 00:00:00 2001 From: Rafal Swierczek Date: Fri, 16 Feb 2024 14:12:36 +0000 Subject: [PATCH 16/25] Bugfix Main Bounty Button Being Disabled Upon Opening Pause Menu --- .../Content/PauseMenu/Tabs/BountyTabs/WBP_BountiesTab.uasset | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/EndlessVendetta/Content/PauseMenu/Tabs/BountyTabs/WBP_BountiesTab.uasset b/EndlessVendetta/Content/PauseMenu/Tabs/BountyTabs/WBP_BountiesTab.uasset index 6ef35004..31d07a40 100644 --- a/EndlessVendetta/Content/PauseMenu/Tabs/BountyTabs/WBP_BountiesTab.uasset +++ b/EndlessVendetta/Content/PauseMenu/Tabs/BountyTabs/WBP_BountiesTab.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:df4da6ce3565772c8ca641c321ad8a34ad0f982bc7fdb4e05817253ace6b43b1 -size 263210 +oid sha256:0eabe94afd4d0ed0714040bb9e4cb78dac1690091a79824373b9153923ca8707 +size 263209 From 6a8e5a98c21005af3bc2f890a6aa81786ce82fa7 Mon Sep 17 00:00:00 2001 From: Rafal Swierczek Date: Sat, 17 Feb 2024 16:44:01 +0000 Subject: [PATCH 17/25] Added Wave Survival Side Bounty Stand In --- .../.idea/.idea.EndlessVendetta/.idea/workspace.xml | 5 +++-- .../Checkpoints/CP_ElimTImothyHuntsmer.uasset | 4 ++-- .../ApartmentBounty/Checkpoints/OWCP_Apartment.uasset | 4 ++-- .../Content/BountySystem/ApartmentBounty/MB_Apartment.uasset | 4 ++-- .../SideBounties/MoneyProblems/CP_GoToFinanceCentre.uasset | 3 +++ .../SideBounties/MoneyProblems/SB_MoneyProblems.uasset | 3 +++ .../SideBounties/PestControl/CP_GoToPestControl.uasset | 4 ++-- .../SecuritySpecialists/CP_GoToSecurityOffice.uasset | 4 ++-- .../Content/BountySystem/CP_FinalCheckpoint.uasset | 4 ++-- .../ControlsTutorial/Bounty/Checkpoints/CP_ARTargets.uasset | 4 ++-- .../ControlsTutorial/Bounty/Checkpoints/CP_BeginPlay.uasset | 4 ++-- .../Bounty/Checkpoints/CP_CrouchTutorial.uasset | 4 ++-- .../Bounty/Checkpoints/CP_EnterApartment.uasset | 4 ++-- .../Bounty/Checkpoints/CP_EnterSpaceShip.uasset | 4 ++-- .../Bounty/Checkpoints/CP_GoToParkourRoom.uasset | 4 ++-- .../ControlsTutorial/Bounty/Checkpoints/CP_JumpAcross.uasset | 4 ++-- .../Bounty/Checkpoints/CP_LandAtTheLZ.uasset | 4 ++-- .../ControlsTutorial/Bounty/Checkpoints/CP_PickAGun.uasset | 4 ++-- .../ControlsTutorial/Bounty/Checkpoints/CP_PickUpAR.uasset | 4 ++-- .../Bounty/Checkpoints/CP_PickUpPistol.uasset | 4 ++-- .../Bounty/Checkpoints/CP_PickUpShotgun.uasset | 4 ++-- .../Bounty/Checkpoints/CP_PickUpSniper.uasset | 4 ++-- .../Bounty/Checkpoints/CP_PickupShipKeys.uasset | 4 ++-- .../Bounty/Checkpoints/CP_PistolTargets.uasset | 4 ++-- .../Bounty/Checkpoints/CP_ShotgunTargets.uasset | 4 ++-- .../ControlsTutorial/Bounty/Checkpoints/CP_SignPapers.uasset | 4 ++-- .../Bounty/Checkpoints/CP_SniperTargets.uasset | 4 ++-- .../Bounty/Checkpoints/CP_SprintAcross.uasset | 4 ++-- .../ControlsTutorial/Bounty/Checkpoints/CP_VaultOver.uasset | 4 ++-- .../BountySystem/ControlsTutorial/Bounty/MB_Training.uasset | 4 ++-- .../BountySimulation/CP_ElimTutorialTarget.uasset | 4 ++-- .../BountySimulation/CP_EnterBountySimulationFacility.uasset | 4 ++-- .../BountySimulation/CP_ExitBountySimulationFacility.uasset | 4 ++-- .../TutorialFacility/Checkpoints/CP_ParkourTutorial.uasset | 4 ++-- .../TutorialFacility/Checkpoints/CP_PickUpWeapon.uasset | 4 ++-- .../Checkpoints/FiringRanges/CP_CheckOutCQCRange.uasset | 4 ++-- .../Checkpoints/FiringRanges/CP_CheckOutLongRange.uasset | 4 ++-- .../GadgetTutorial/Combat/CP_CombatTraining.uasset | 4 ++-- .../Checkpoints/GadgetTutorial/Recon/CP_GoDownstairs.uasset | 4 ++-- .../Checkpoints/GadgetTutorial/Recon/CP_ReconTraining.uasset | 4 ++-- .../Content/BountySystem/Waypoint/MainBountyIcon.uasset | 3 --- .../Content/BountySystem/Waypoint/TempMainBountyIcon.uasset | 3 --- .../Content/BountySystem/Waypoint/WBP_MiniWaypoint.uasset | 4 ++-- .../Content/BountySystem/Waypoint/WBP_WaypointWidget.uasset | 4 ++-- .../Content/BountySystem/Waypoint/WaypointArrow_Spare.uasset | 3 --- .../BountySystem/Waypoint/WaypointIcons/Exclamation_mark.png | 3 +++ .../Waypoint/WaypointIcons/Exclamation_mark_3.png | 3 +++ .../Waypoint/{ => WaypointIcons}/MainBountyIcon.png | 0 .../Waypoint/WaypointIcons/MainBountyIcon.uasset | 3 +++ .../Waypoint/{ => WaypointIcons}/TempMainBountyIcon.png | 0 .../Waypoint/WaypointIcons/TempMainBountyIcon.uasset | 3 +++ .../Waypoint/{ => WaypointIcons}/WaypointArrow.png | 0 .../Waypoint/WaypointIcons/WaypointArrow_Spare.uasset | 3 +++ .../Waypoint/WaypointIcons/exclamation_mark_2.png | 3 +++ EndlessVendetta/Content/Levels/MainMenuLevel.umap | 4 ++-- EndlessVendetta/Content/Levels/TempOpenWorld.umap | 4 ++-- .../Content/StarterContent/Architecture/Floor_400x400.uasset | 4 ++-- .../StarterContent/Blueprints/Blueprint_CeilingLight.uasset | 4 ++-- 58 files changed, 113 insertions(+), 97 deletions(-) create mode 100644 EndlessVendetta/Content/BountySystem/ApartmentBounty/SideBounties/MoneyProblems/CP_GoToFinanceCentre.uasset create mode 100644 EndlessVendetta/Content/BountySystem/ApartmentBounty/SideBounties/MoneyProblems/SB_MoneyProblems.uasset delete mode 100644 EndlessVendetta/Content/BountySystem/Waypoint/MainBountyIcon.uasset delete mode 100644 EndlessVendetta/Content/BountySystem/Waypoint/TempMainBountyIcon.uasset delete mode 100644 EndlessVendetta/Content/BountySystem/Waypoint/WaypointArrow_Spare.uasset create mode 100644 EndlessVendetta/Content/BountySystem/Waypoint/WaypointIcons/Exclamation_mark.png create mode 100644 EndlessVendetta/Content/BountySystem/Waypoint/WaypointIcons/Exclamation_mark_3.png rename EndlessVendetta/Content/BountySystem/Waypoint/{ => WaypointIcons}/MainBountyIcon.png (100%) create mode 100644 EndlessVendetta/Content/BountySystem/Waypoint/WaypointIcons/MainBountyIcon.uasset rename EndlessVendetta/Content/BountySystem/Waypoint/{ => WaypointIcons}/TempMainBountyIcon.png (100%) create mode 100644 EndlessVendetta/Content/BountySystem/Waypoint/WaypointIcons/TempMainBountyIcon.uasset rename EndlessVendetta/Content/BountySystem/Waypoint/{ => WaypointIcons}/WaypointArrow.png (100%) create mode 100644 EndlessVendetta/Content/BountySystem/Waypoint/WaypointIcons/WaypointArrow_Spare.uasset create mode 100644 EndlessVendetta/Content/BountySystem/Waypoint/WaypointIcons/exclamation_mark_2.png diff --git a/EndlessVendetta/.idea/.idea.EndlessVendetta/.idea/workspace.xml b/EndlessVendetta/.idea/.idea.EndlessVendetta/.idea/workspace.xml index 51a92ed4..5cc0abdd 100644 --- a/EndlessVendetta/.idea/.idea.EndlessVendetta/.idea/workspace.xml +++ b/EndlessVendetta/.idea/.idea.EndlessVendetta/.idea/workspace.xml @@ -9,10 +9,9 @@ - - + diff --git a/EndlessVendetta/Content/BountySystem/ApartmentBounty/Checkpoints/CP_ElimTImothyHuntsmer.uasset b/EndlessVendetta/Content/BountySystem/ApartmentBounty/Checkpoints/CP_ElimTImothyHuntsmer.uasset index e1163602..9b9fedd0 100644 --- a/EndlessVendetta/Content/BountySystem/ApartmentBounty/Checkpoints/CP_ElimTImothyHuntsmer.uasset +++ b/EndlessVendetta/Content/BountySystem/ApartmentBounty/Checkpoints/CP_ElimTImothyHuntsmer.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:4011687f5e23d06e47c3eb26866081d1272cf73a2692252cd57fd4b3483a884d -size 95250 +oid sha256:ddb60583fbb6b0b0d7585064d3fd73f390fcc6725128befe5c008911e3be47a2 +size 94548 diff --git a/EndlessVendetta/Content/BountySystem/ApartmentBounty/Checkpoints/OWCP_Apartment.uasset b/EndlessVendetta/Content/BountySystem/ApartmentBounty/Checkpoints/OWCP_Apartment.uasset index fe336fcd..6830b6dc 100644 --- a/EndlessVendetta/Content/BountySystem/ApartmentBounty/Checkpoints/OWCP_Apartment.uasset +++ b/EndlessVendetta/Content/BountySystem/ApartmentBounty/Checkpoints/OWCP_Apartment.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:0b75c5541122da7d86dde09ffc1dca38739137c6fed09f31f953578392aa8e4c -size 24261 +oid sha256:9c30dc7dfc2549038de26a3f6f656ad7cddc8a7dec98c67b35153f508b5ae1fd +size 23545 diff --git a/EndlessVendetta/Content/BountySystem/ApartmentBounty/MB_Apartment.uasset b/EndlessVendetta/Content/BountySystem/ApartmentBounty/MB_Apartment.uasset index 04328b41..553d5bc1 100644 --- a/EndlessVendetta/Content/BountySystem/ApartmentBounty/MB_Apartment.uasset +++ b/EndlessVendetta/Content/BountySystem/ApartmentBounty/MB_Apartment.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:a59e7e17a5255b9301cd54ee398e1f5c482c2ff710aa52f96f672b0d1ac50de4 -size 26080 +oid sha256:73e6c20146c481d6a4cf832e1a2fb26642c01a73fcff2a27033fb78671fbedfc +size 26282 diff --git a/EndlessVendetta/Content/BountySystem/ApartmentBounty/SideBounties/MoneyProblems/CP_GoToFinanceCentre.uasset b/EndlessVendetta/Content/BountySystem/ApartmentBounty/SideBounties/MoneyProblems/CP_GoToFinanceCentre.uasset new file mode 100644 index 00000000..5779f4c9 --- /dev/null +++ b/EndlessVendetta/Content/BountySystem/ApartmentBounty/SideBounties/MoneyProblems/CP_GoToFinanceCentre.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:474599332f82e0e18990902c5a79b7de5dd80a4e9c7fe016b22fd4280f96936e +size 80064 diff --git a/EndlessVendetta/Content/BountySystem/ApartmentBounty/SideBounties/MoneyProblems/SB_MoneyProblems.uasset b/EndlessVendetta/Content/BountySystem/ApartmentBounty/SideBounties/MoneyProblems/SB_MoneyProblems.uasset new file mode 100644 index 00000000..df80c1fb --- /dev/null +++ b/EndlessVendetta/Content/BountySystem/ApartmentBounty/SideBounties/MoneyProblems/SB_MoneyProblems.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:e10c7eef9ffc82523eb772b5a1b467de0c1f56d4014ded77da9c3dbba11b3296 +size 22940 diff --git a/EndlessVendetta/Content/BountySystem/ApartmentBounty/SideBounties/PestControl/CP_GoToPestControl.uasset b/EndlessVendetta/Content/BountySystem/ApartmentBounty/SideBounties/PestControl/CP_GoToPestControl.uasset index 560c1ad3..9c6b7915 100644 --- a/EndlessVendetta/Content/BountySystem/ApartmentBounty/SideBounties/PestControl/CP_GoToPestControl.uasset +++ b/EndlessVendetta/Content/BountySystem/ApartmentBounty/SideBounties/PestControl/CP_GoToPestControl.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:108afc519ba00c092a39433ef8f34d772b87c57f42b104241e4e7f1ff32c247f -size 81279 +oid sha256:959122f74f46879a6a4bfcc566d1e0e5922cc9f8b41434c01adcd0eff4816799 +size 80041 diff --git a/EndlessVendetta/Content/BountySystem/ApartmentBounty/SideBounties/SecuritySpecialists/CP_GoToSecurityOffice.uasset b/EndlessVendetta/Content/BountySystem/ApartmentBounty/SideBounties/SecuritySpecialists/CP_GoToSecurityOffice.uasset index 2208a9df..eda21263 100644 --- a/EndlessVendetta/Content/BountySystem/ApartmentBounty/SideBounties/SecuritySpecialists/CP_GoToSecurityOffice.uasset +++ b/EndlessVendetta/Content/BountySystem/ApartmentBounty/SideBounties/SecuritySpecialists/CP_GoToSecurityOffice.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:071d80db1611f406955a931fe236052cfc769eeb14eee2d02206536f4fc40d8c -size 80228 +oid sha256:cece20a7f675064323765472291b23955250f70ff92441a6fc5ffdbb9ff0a51f +size 80119 diff --git a/EndlessVendetta/Content/BountySystem/CP_FinalCheckpoint.uasset b/EndlessVendetta/Content/BountySystem/CP_FinalCheckpoint.uasset index 069dbaf8..183c8e30 100644 --- a/EndlessVendetta/Content/BountySystem/CP_FinalCheckpoint.uasset +++ b/EndlessVendetta/Content/BountySystem/CP_FinalCheckpoint.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:b4def4c35207288e74d661944c22141894dab91956f6460bf59c67373a2732c4 -size 26814 +oid sha256:baaa9c7abfa37ce9b4750b201db4e0f015c5f223561a7c5142c82e91247af086 +size 26775 diff --git a/EndlessVendetta/Content/BountySystem/ControlsTutorial/Bounty/Checkpoints/CP_ARTargets.uasset b/EndlessVendetta/Content/BountySystem/ControlsTutorial/Bounty/Checkpoints/CP_ARTargets.uasset index 36650dc1..73219745 100644 --- a/EndlessVendetta/Content/BountySystem/ControlsTutorial/Bounty/Checkpoints/CP_ARTargets.uasset +++ b/EndlessVendetta/Content/BountySystem/ControlsTutorial/Bounty/Checkpoints/CP_ARTargets.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:fb666c3b8ece874e8ed766a2044f48dcd90c90c92d91544dfd7c63e1cd5ed1be -size 137365 +oid sha256:35ce8d47c1b3a6d50d74ed20e203533e57b052db626e659558cf9e291a874d1e +size 136794 diff --git a/EndlessVendetta/Content/BountySystem/ControlsTutorial/Bounty/Checkpoints/CP_BeginPlay.uasset b/EndlessVendetta/Content/BountySystem/ControlsTutorial/Bounty/Checkpoints/CP_BeginPlay.uasset index a0a183ea..85ded646 100644 --- a/EndlessVendetta/Content/BountySystem/ControlsTutorial/Bounty/Checkpoints/CP_BeginPlay.uasset +++ b/EndlessVendetta/Content/BountySystem/ControlsTutorial/Bounty/Checkpoints/CP_BeginPlay.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:b0786d2dd7ee867d9150d709b4b856c2679c0430a54c2e4faf2f1b4a848c5263 -size 61009 +oid sha256:e1c7685a6430a2949f4069cfb937aae73d01757ad6bc64d399ee74404c8a408d +size 60384 diff --git a/EndlessVendetta/Content/BountySystem/ControlsTutorial/Bounty/Checkpoints/CP_CrouchTutorial.uasset b/EndlessVendetta/Content/BountySystem/ControlsTutorial/Bounty/Checkpoints/CP_CrouchTutorial.uasset index 841de14e..8e7e2c04 100644 --- a/EndlessVendetta/Content/BountySystem/ControlsTutorial/Bounty/Checkpoints/CP_CrouchTutorial.uasset +++ b/EndlessVendetta/Content/BountySystem/ControlsTutorial/Bounty/Checkpoints/CP_CrouchTutorial.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:d4efb7c1ba1f73f8a28af056a62999ebe516fb9a5417d67e0b923527c73106fd -size 32191 +oid sha256:e8367a68ee75a44a61cb4da286db85fc492df9163087b934657c0cd68c9db89e +size 32199 diff --git a/EndlessVendetta/Content/BountySystem/ControlsTutorial/Bounty/Checkpoints/CP_EnterApartment.uasset b/EndlessVendetta/Content/BountySystem/ControlsTutorial/Bounty/Checkpoints/CP_EnterApartment.uasset index 94fbb18f..e7cfb850 100644 --- a/EndlessVendetta/Content/BountySystem/ControlsTutorial/Bounty/Checkpoints/CP_EnterApartment.uasset +++ b/EndlessVendetta/Content/BountySystem/ControlsTutorial/Bounty/Checkpoints/CP_EnterApartment.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:a2462cc97e58b98796201e445f71d8ea88b65a47c49ee1df949d76eb37bc3892 -size 24165 +oid sha256:f2c0a4d444f43d552e4c63848440cbd4ebb7353da4cebd26e69236fc2cf28e04 +size 24253 diff --git a/EndlessVendetta/Content/BountySystem/ControlsTutorial/Bounty/Checkpoints/CP_EnterSpaceShip.uasset b/EndlessVendetta/Content/BountySystem/ControlsTutorial/Bounty/Checkpoints/CP_EnterSpaceShip.uasset index 460acb58..e04fe47d 100644 --- a/EndlessVendetta/Content/BountySystem/ControlsTutorial/Bounty/Checkpoints/CP_EnterSpaceShip.uasset +++ b/EndlessVendetta/Content/BountySystem/ControlsTutorial/Bounty/Checkpoints/CP_EnterSpaceShip.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:bbfb03b3eb01f922dc51f468218f2c718d79033b5e79d14852c5e158937c6a5f -size 30816 +oid sha256:e77223cd768ba25dd89b216b29499e709103518323c30edc2707b0efb39ea974 +size 30830 diff --git a/EndlessVendetta/Content/BountySystem/ControlsTutorial/Bounty/Checkpoints/CP_GoToParkourRoom.uasset b/EndlessVendetta/Content/BountySystem/ControlsTutorial/Bounty/Checkpoints/CP_GoToParkourRoom.uasset index 610ddb92..fa225549 100644 --- a/EndlessVendetta/Content/BountySystem/ControlsTutorial/Bounty/Checkpoints/CP_GoToParkourRoom.uasset +++ b/EndlessVendetta/Content/BountySystem/ControlsTutorial/Bounty/Checkpoints/CP_GoToParkourRoom.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:7708afcb260864d1ea1c68dc91bc59b9112809ad42a1aed2319505dbc9b1eb4a -size 78283 +oid sha256:b6202e5fe5908e6a7d8e083b04ea5090f736d707af43958f02c5079dcc098f47 +size 78279 diff --git a/EndlessVendetta/Content/BountySystem/ControlsTutorial/Bounty/Checkpoints/CP_JumpAcross.uasset b/EndlessVendetta/Content/BountySystem/ControlsTutorial/Bounty/Checkpoints/CP_JumpAcross.uasset index 2cc8f74d..6ee7b253 100644 --- a/EndlessVendetta/Content/BountySystem/ControlsTutorial/Bounty/Checkpoints/CP_JumpAcross.uasset +++ b/EndlessVendetta/Content/BountySystem/ControlsTutorial/Bounty/Checkpoints/CP_JumpAcross.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:36d12b8f4022742a62116cf0f9331774ae808a1c5823aad5c7deb88d6bc8e95a -size 32097 +oid sha256:f6e133335dcedeb4c3927d58dbfce4a168d2bf40026996a736ba586f1f398241 +size 32105 diff --git a/EndlessVendetta/Content/BountySystem/ControlsTutorial/Bounty/Checkpoints/CP_LandAtTheLZ.uasset b/EndlessVendetta/Content/BountySystem/ControlsTutorial/Bounty/Checkpoints/CP_LandAtTheLZ.uasset index 6b6b9f3d..50799c96 100644 --- a/EndlessVendetta/Content/BountySystem/ControlsTutorial/Bounty/Checkpoints/CP_LandAtTheLZ.uasset +++ b/EndlessVendetta/Content/BountySystem/ControlsTutorial/Bounty/Checkpoints/CP_LandAtTheLZ.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:d750a1fb59aa72b306a51d728cb5f030fd6ba160bac08bc8d243f8333e34105c -size 32186 +oid sha256:4c2376a886209630915cccb04296facbb5526b20b3c74c5c5f344e398aed062f +size 32200 diff --git a/EndlessVendetta/Content/BountySystem/ControlsTutorial/Bounty/Checkpoints/CP_PickAGun.uasset b/EndlessVendetta/Content/BountySystem/ControlsTutorial/Bounty/Checkpoints/CP_PickAGun.uasset index 701a0043..4e439d1b 100644 --- a/EndlessVendetta/Content/BountySystem/ControlsTutorial/Bounty/Checkpoints/CP_PickAGun.uasset +++ b/EndlessVendetta/Content/BountySystem/ControlsTutorial/Bounty/Checkpoints/CP_PickAGun.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:d9958f2c1c8bce46aee31989458737e7ce1b0b77c89ec4e77945addcbaa202e0 -size 98464 +oid sha256:96925990e32a5a9832d66041d81a93216749eacc7b9dfd90eb518712866a6e0b +size 98477 diff --git a/EndlessVendetta/Content/BountySystem/ControlsTutorial/Bounty/Checkpoints/CP_PickUpAR.uasset b/EndlessVendetta/Content/BountySystem/ControlsTutorial/Bounty/Checkpoints/CP_PickUpAR.uasset index abf4d3ec..15940b00 100644 --- a/EndlessVendetta/Content/BountySystem/ControlsTutorial/Bounty/Checkpoints/CP_PickUpAR.uasset +++ b/EndlessVendetta/Content/BountySystem/ControlsTutorial/Bounty/Checkpoints/CP_PickUpAR.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:e0d22b524ec3ba6a4f487a053cb0c30d797f7ad84a68eaf2a4e1520117b206cc -size 108582 +oid sha256:dfc203364a99faec388f5fecb2c64c008d780733dae44ecf9ce280f42e6e2c86 +size 108041 diff --git a/EndlessVendetta/Content/BountySystem/ControlsTutorial/Bounty/Checkpoints/CP_PickUpPistol.uasset b/EndlessVendetta/Content/BountySystem/ControlsTutorial/Bounty/Checkpoints/CP_PickUpPistol.uasset index e2287dc0..b94909a2 100644 --- a/EndlessVendetta/Content/BountySystem/ControlsTutorial/Bounty/Checkpoints/CP_PickUpPistol.uasset +++ b/EndlessVendetta/Content/BountySystem/ControlsTutorial/Bounty/Checkpoints/CP_PickUpPistol.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:225ebd8974c59ad97fd7432439ff1b1b38a823ecece0aa37cd90204ac9d7d5b9 -size 108723 +oid sha256:8ca2fa181da7634d2aa6d280b956731f4cae873b326a803b5534d8100792b7d4 +size 108079 diff --git a/EndlessVendetta/Content/BountySystem/ControlsTutorial/Bounty/Checkpoints/CP_PickUpShotgun.uasset b/EndlessVendetta/Content/BountySystem/ControlsTutorial/Bounty/Checkpoints/CP_PickUpShotgun.uasset index e7143b86..be18e517 100644 --- a/EndlessVendetta/Content/BountySystem/ControlsTutorial/Bounty/Checkpoints/CP_PickUpShotgun.uasset +++ b/EndlessVendetta/Content/BountySystem/ControlsTutorial/Bounty/Checkpoints/CP_PickUpShotgun.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:477cc99dfadffda504188c966a3ae4ea9b3c46a9854ef1f910ded5830d14a15d -size 107851 +oid sha256:fe5f8569f4b785df5a46095e152266131a0765b477d91b56688094084d437b6a +size 107738 diff --git a/EndlessVendetta/Content/BountySystem/ControlsTutorial/Bounty/Checkpoints/CP_PickUpSniper.uasset b/EndlessVendetta/Content/BountySystem/ControlsTutorial/Bounty/Checkpoints/CP_PickUpSniper.uasset index 59579cc7..ac6521ca 100644 --- a/EndlessVendetta/Content/BountySystem/ControlsTutorial/Bounty/Checkpoints/CP_PickUpSniper.uasset +++ b/EndlessVendetta/Content/BountySystem/ControlsTutorial/Bounty/Checkpoints/CP_PickUpSniper.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:804d570352178c6a3c98388a67c672b2dfff00831c4f4239c9626223609de69f -size 107716 +oid sha256:d2ce4fd5a71cafe639e466139119662e440b1b39541420a7606a36ca02eec02a +size 107729 diff --git a/EndlessVendetta/Content/BountySystem/ControlsTutorial/Bounty/Checkpoints/CP_PickupShipKeys.uasset b/EndlessVendetta/Content/BountySystem/ControlsTutorial/Bounty/Checkpoints/CP_PickupShipKeys.uasset index b07c55b8..cba09fb6 100644 --- a/EndlessVendetta/Content/BountySystem/ControlsTutorial/Bounty/Checkpoints/CP_PickupShipKeys.uasset +++ b/EndlessVendetta/Content/BountySystem/ControlsTutorial/Bounty/Checkpoints/CP_PickupShipKeys.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:7382be6426cf944bdf11682efcefb49bf1da004ef678716def3a234cf4e9bd6e -size 35513 +oid sha256:065116d15515cb03fa71cbeb951631b86e5807673b48fd6f642ae1c95db9f2f1 +size 35416 diff --git a/EndlessVendetta/Content/BountySystem/ControlsTutorial/Bounty/Checkpoints/CP_PistolTargets.uasset b/EndlessVendetta/Content/BountySystem/ControlsTutorial/Bounty/Checkpoints/CP_PistolTargets.uasset index a4b439fe..17e9540b 100644 --- a/EndlessVendetta/Content/BountySystem/ControlsTutorial/Bounty/Checkpoints/CP_PistolTargets.uasset +++ b/EndlessVendetta/Content/BountySystem/ControlsTutorial/Bounty/Checkpoints/CP_PistolTargets.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:bee00855718a89c9ffc159bd2a4e95ce9c5538d2570649e79ee3248c088fb631 -size 137451 +oid sha256:3ab3baaa40c6ee6d442db37d7ab4a2739c1afe5debaaacaa5a98bd12f3fcb68a +size 136880 diff --git a/EndlessVendetta/Content/BountySystem/ControlsTutorial/Bounty/Checkpoints/CP_ShotgunTargets.uasset b/EndlessVendetta/Content/BountySystem/ControlsTutorial/Bounty/Checkpoints/CP_ShotgunTargets.uasset index be2dc5f1..3d550692 100644 --- a/EndlessVendetta/Content/BountySystem/ControlsTutorial/Bounty/Checkpoints/CP_ShotgunTargets.uasset +++ b/EndlessVendetta/Content/BountySystem/ControlsTutorial/Bounty/Checkpoints/CP_ShotgunTargets.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:7d56f6fa8da408d61da9b2e6b354dd90e3e34d1ecfe05d2ccc5563314b12341d -size 137495 +oid sha256:0f2592da2540fd39788ec8a08ece0a368b0c3fad76a2c2b2dc770dc272bfea06 +size 136924 diff --git a/EndlessVendetta/Content/BountySystem/ControlsTutorial/Bounty/Checkpoints/CP_SignPapers.uasset b/EndlessVendetta/Content/BountySystem/ControlsTutorial/Bounty/Checkpoints/CP_SignPapers.uasset index eef16353..a2f9b686 100644 --- a/EndlessVendetta/Content/BountySystem/ControlsTutorial/Bounty/Checkpoints/CP_SignPapers.uasset +++ b/EndlessVendetta/Content/BountySystem/ControlsTutorial/Bounty/Checkpoints/CP_SignPapers.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:789a0ed560bafea9492c5f9e8b8f4081c7113620cec63e13623c8dbdb78fb33a -size 41619 +oid sha256:fe95bd4939dbc04c6ca0805c0af1e35ea361658143302a1e89ea1f231821a9c3 +size 41391 diff --git a/EndlessVendetta/Content/BountySystem/ControlsTutorial/Bounty/Checkpoints/CP_SniperTargets.uasset b/EndlessVendetta/Content/BountySystem/ControlsTutorial/Bounty/Checkpoints/CP_SniperTargets.uasset index 1d92c881..7e0d5272 100644 --- a/EndlessVendetta/Content/BountySystem/ControlsTutorial/Bounty/Checkpoints/CP_SniperTargets.uasset +++ b/EndlessVendetta/Content/BountySystem/ControlsTutorial/Bounty/Checkpoints/CP_SniperTargets.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:9d0d70db58a092d9889facf2c50a62628132278b35214692c0895166e169379b -size 131406 +oid sha256:87d3984e11f78fb7de9232cc8b1cee42f6fdc2c581f91963f735c0c5352e6129 +size 130835 diff --git a/EndlessVendetta/Content/BountySystem/ControlsTutorial/Bounty/Checkpoints/CP_SprintAcross.uasset b/EndlessVendetta/Content/BountySystem/ControlsTutorial/Bounty/Checkpoints/CP_SprintAcross.uasset index c247b51f..53a597d1 100644 --- a/EndlessVendetta/Content/BountySystem/ControlsTutorial/Bounty/Checkpoints/CP_SprintAcross.uasset +++ b/EndlessVendetta/Content/BountySystem/ControlsTutorial/Bounty/Checkpoints/CP_SprintAcross.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:6499e8e62f26382870864eed81685520f4e8cc09dd44cb344dfbd73e71e1df3d -size 32170 +oid sha256:7e2c138b4f1fd4064b2181a9ebb58e21cc2f06a8879b8d5ba667276d8aa42ed7 +size 32178 diff --git a/EndlessVendetta/Content/BountySystem/ControlsTutorial/Bounty/Checkpoints/CP_VaultOver.uasset b/EndlessVendetta/Content/BountySystem/ControlsTutorial/Bounty/Checkpoints/CP_VaultOver.uasset index 6f90c07b..c8843c79 100644 --- a/EndlessVendetta/Content/BountySystem/ControlsTutorial/Bounty/Checkpoints/CP_VaultOver.uasset +++ b/EndlessVendetta/Content/BountySystem/ControlsTutorial/Bounty/Checkpoints/CP_VaultOver.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:63e22888a9cdb2f057306006eb4ad8d4276b68c438627d0fc7176f5058fd13a9 -size 32097 +oid sha256:07b6ec4cc1622c6b225bcb7b018ed6c0320ad4636ca5fd78958352a9f1bcb5f9 +size 32105 diff --git a/EndlessVendetta/Content/BountySystem/ControlsTutorial/Bounty/MB_Training.uasset b/EndlessVendetta/Content/BountySystem/ControlsTutorial/Bounty/MB_Training.uasset index 0d7669a7..79f24720 100644 --- a/EndlessVendetta/Content/BountySystem/ControlsTutorial/Bounty/MB_Training.uasset +++ b/EndlessVendetta/Content/BountySystem/ControlsTutorial/Bounty/MB_Training.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:b6661ae50a80b9e76b87079bc9f40c2f8474c5ebdba38753b5b9223c3fba2e96 -size 27992 +oid sha256:e7c0eee778caa45c4640871d924966e7415272eff04a16cc96e3056c7f5b488b +size 28006 diff --git a/EndlessVendetta/Content/BountySystem/Legacy/TutorialFacility/Checkpoints/BountySimulation/CP_ElimTutorialTarget.uasset b/EndlessVendetta/Content/BountySystem/Legacy/TutorialFacility/Checkpoints/BountySimulation/CP_ElimTutorialTarget.uasset index 4af01071..598ae56b 100644 --- a/EndlessVendetta/Content/BountySystem/Legacy/TutorialFacility/Checkpoints/BountySimulation/CP_ElimTutorialTarget.uasset +++ b/EndlessVendetta/Content/BountySystem/Legacy/TutorialFacility/Checkpoints/BountySimulation/CP_ElimTutorialTarget.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:2be049b806cbf608d0062def11a2c31313a7c8fa7db8a235361060540e67d810 -size 139491 +oid sha256:5287207640326c19ffd50981ecf77c635a24cde690a46dce42da8112c1a87157 +size 137367 diff --git a/EndlessVendetta/Content/BountySystem/Legacy/TutorialFacility/Checkpoints/BountySimulation/CP_EnterBountySimulationFacility.uasset b/EndlessVendetta/Content/BountySystem/Legacy/TutorialFacility/Checkpoints/BountySimulation/CP_EnterBountySimulationFacility.uasset index 4555e49e..9443a378 100644 --- a/EndlessVendetta/Content/BountySystem/Legacy/TutorialFacility/Checkpoints/BountySimulation/CP_EnterBountySimulationFacility.uasset +++ b/EndlessVendetta/Content/BountySystem/Legacy/TutorialFacility/Checkpoints/BountySimulation/CP_EnterBountySimulationFacility.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:91bb76daaa241739e84cd8e5475db967b7a090ed397749872e0eed9e67751764 -size 81995 +oid sha256:f13d201d643e7f7c81f286f5a8ac79ef00a43ac9f3b0324a3bab6b6b8c6e8a9c +size 81305 diff --git a/EndlessVendetta/Content/BountySystem/Legacy/TutorialFacility/Checkpoints/BountySimulation/CP_ExitBountySimulationFacility.uasset b/EndlessVendetta/Content/BountySystem/Legacy/TutorialFacility/Checkpoints/BountySimulation/CP_ExitBountySimulationFacility.uasset index f894918b..60539d04 100644 --- a/EndlessVendetta/Content/BountySystem/Legacy/TutorialFacility/Checkpoints/BountySimulation/CP_ExitBountySimulationFacility.uasset +++ b/EndlessVendetta/Content/BountySystem/Legacy/TutorialFacility/Checkpoints/BountySimulation/CP_ExitBountySimulationFacility.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:57e44aea22dc6a0679b5520909b3141f93767849078b00f61981ec60edc6e236 -size 58101 +oid sha256:c5db1e022c06c83bdf95900f0ef359b2a0884f088fb8cdaca63cc72dd73ddf3b +size 57412 diff --git a/EndlessVendetta/Content/BountySystem/Legacy/TutorialFacility/Checkpoints/CP_ParkourTutorial.uasset b/EndlessVendetta/Content/BountySystem/Legacy/TutorialFacility/Checkpoints/CP_ParkourTutorial.uasset index 7f54a4f4..c7993348 100644 --- a/EndlessVendetta/Content/BountySystem/Legacy/TutorialFacility/Checkpoints/CP_ParkourTutorial.uasset +++ b/EndlessVendetta/Content/BountySystem/Legacy/TutorialFacility/Checkpoints/CP_ParkourTutorial.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:574b8e6737057c2a38c3d914e37fdad923d8afca96cd8ccf8eb409680ca4703c -size 38502 +oid sha256:bf4312e0185652902c7e822c6c8625a66b7e771fb325e215db33e71ab3592712 +size 37769 diff --git a/EndlessVendetta/Content/BountySystem/Legacy/TutorialFacility/Checkpoints/CP_PickUpWeapon.uasset b/EndlessVendetta/Content/BountySystem/Legacy/TutorialFacility/Checkpoints/CP_PickUpWeapon.uasset index 891c1a92..5f5bbd8b 100644 --- a/EndlessVendetta/Content/BountySystem/Legacy/TutorialFacility/Checkpoints/CP_PickUpWeapon.uasset +++ b/EndlessVendetta/Content/BountySystem/Legacy/TutorialFacility/Checkpoints/CP_PickUpWeapon.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:efd4f218e1269d71aa2fd5504af0d75233d5fc305cfe12463918af6092496b84 -size 60195 +oid sha256:894c8a8cc2977b299987bc84a7976d8589dc1ec79b63f698ea3e72cab3a71b86 +size 59862 diff --git a/EndlessVendetta/Content/BountySystem/Legacy/TutorialFacility/Checkpoints/FiringRanges/CP_CheckOutCQCRange.uasset b/EndlessVendetta/Content/BountySystem/Legacy/TutorialFacility/Checkpoints/FiringRanges/CP_CheckOutCQCRange.uasset index 7c8c9649..8e7d6eb8 100644 --- a/EndlessVendetta/Content/BountySystem/Legacy/TutorialFacility/Checkpoints/FiringRanges/CP_CheckOutCQCRange.uasset +++ b/EndlessVendetta/Content/BountySystem/Legacy/TutorialFacility/Checkpoints/FiringRanges/CP_CheckOutCQCRange.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:fbcab427c8e1bfdd423b6991820145e68bd892fdbc202185ef34f4a561444f90 -size 147980 +oid sha256:8a72636db65b81801055fb4d678131330486530edf5a08a25d05bec23d2e04c2 +size 147630 diff --git a/EndlessVendetta/Content/BountySystem/Legacy/TutorialFacility/Checkpoints/FiringRanges/CP_CheckOutLongRange.uasset b/EndlessVendetta/Content/BountySystem/Legacy/TutorialFacility/Checkpoints/FiringRanges/CP_CheckOutLongRange.uasset index 03a31093..b99e76c9 100644 --- a/EndlessVendetta/Content/BountySystem/Legacy/TutorialFacility/Checkpoints/FiringRanges/CP_CheckOutLongRange.uasset +++ b/EndlessVendetta/Content/BountySystem/Legacy/TutorialFacility/Checkpoints/FiringRanges/CP_CheckOutLongRange.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:3503aa4e773a374ef6d4175005f3e6d1e5c4e40f673e326b52211824ff3f1449 -size 156494 +oid sha256:23edcd222ed599673944ab094207c4eea888311c9f5471c4a7af5fe0519ce194 +size 156143 diff --git a/EndlessVendetta/Content/BountySystem/Legacy/TutorialFacility/Checkpoints/GadgetTutorial/Combat/CP_CombatTraining.uasset b/EndlessVendetta/Content/BountySystem/Legacy/TutorialFacility/Checkpoints/GadgetTutorial/Combat/CP_CombatTraining.uasset index b1804e89..2e9008f1 100644 --- a/EndlessVendetta/Content/BountySystem/Legacy/TutorialFacility/Checkpoints/GadgetTutorial/Combat/CP_CombatTraining.uasset +++ b/EndlessVendetta/Content/BountySystem/Legacy/TutorialFacility/Checkpoints/GadgetTutorial/Combat/CP_CombatTraining.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:14ee8aa50aaae227912d0a7f0c9f309bd04bc49400bff4dbe8d5ceb95605f740 -size 46647 +oid sha256:baadacf864ce058af289d5408041993196bdaeadc089b92033ffaa8d1897ba72 +size 45893 diff --git a/EndlessVendetta/Content/BountySystem/Legacy/TutorialFacility/Checkpoints/GadgetTutorial/Recon/CP_GoDownstairs.uasset b/EndlessVendetta/Content/BountySystem/Legacy/TutorialFacility/Checkpoints/GadgetTutorial/Recon/CP_GoDownstairs.uasset index 61428964..4ed50c75 100644 --- a/EndlessVendetta/Content/BountySystem/Legacy/TutorialFacility/Checkpoints/GadgetTutorial/Recon/CP_GoDownstairs.uasset +++ b/EndlessVendetta/Content/BountySystem/Legacy/TutorialFacility/Checkpoints/GadgetTutorial/Recon/CP_GoDownstairs.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:f6db8fa7f0cf34e90e33d18300222b4169b78ed334ecd145f440512360b5940b -size 38604 +oid sha256:3805e8b4a794a9075ae07c48675d9407a7b77048c4baddc75e872a603fc64da5 +size 37853 diff --git a/EndlessVendetta/Content/BountySystem/Legacy/TutorialFacility/Checkpoints/GadgetTutorial/Recon/CP_ReconTraining.uasset b/EndlessVendetta/Content/BountySystem/Legacy/TutorialFacility/Checkpoints/GadgetTutorial/Recon/CP_ReconTraining.uasset index a167a1f2..b1212742 100644 --- a/EndlessVendetta/Content/BountySystem/Legacy/TutorialFacility/Checkpoints/GadgetTutorial/Recon/CP_ReconTraining.uasset +++ b/EndlessVendetta/Content/BountySystem/Legacy/TutorialFacility/Checkpoints/GadgetTutorial/Recon/CP_ReconTraining.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:7cd387fbda243514dd8bd7a03a29a782dd87ef9a6ac0d5c9ccbfcd5a33b14501 -size 46677 +oid sha256:2b236e4ab754efb28e44c1aa3e854cf2eb1d154a28bcfab8008aee14413ee8d8 +size 45925 diff --git a/EndlessVendetta/Content/BountySystem/Waypoint/MainBountyIcon.uasset b/EndlessVendetta/Content/BountySystem/Waypoint/MainBountyIcon.uasset deleted file mode 100644 index 805b8a75..00000000 --- a/EndlessVendetta/Content/BountySystem/Waypoint/MainBountyIcon.uasset +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:47deb8998ce928b6448dcbd1a22e3309e144cf43cc5440ac286024dd3aa83167 -size 84616 diff --git a/EndlessVendetta/Content/BountySystem/Waypoint/TempMainBountyIcon.uasset b/EndlessVendetta/Content/BountySystem/Waypoint/TempMainBountyIcon.uasset deleted file mode 100644 index 38b6f5e2..00000000 --- a/EndlessVendetta/Content/BountySystem/Waypoint/TempMainBountyIcon.uasset +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:5338d603d1c815c109aa7a386ddda7b3eaeffc49c729d3c3bb39c8d01fed048c -size 211777 diff --git a/EndlessVendetta/Content/BountySystem/Waypoint/WBP_MiniWaypoint.uasset b/EndlessVendetta/Content/BountySystem/Waypoint/WBP_MiniWaypoint.uasset index 8a6d4924..5fd0a13d 100644 --- a/EndlessVendetta/Content/BountySystem/Waypoint/WBP_MiniWaypoint.uasset +++ b/EndlessVendetta/Content/BountySystem/Waypoint/WBP_MiniWaypoint.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:09d390aed28cadeb787d80dd32b81bbf6067cc1616136ea99c308f8cea054777 -size 48240 +oid sha256:a1950de228dfcd328fd72874eda965785ec4083f40f4d2c06c4890ec19c4c2b1 +size 48253 diff --git a/EndlessVendetta/Content/BountySystem/Waypoint/WBP_WaypointWidget.uasset b/EndlessVendetta/Content/BountySystem/Waypoint/WBP_WaypointWidget.uasset index 422cc68a..774e5d89 100644 --- a/EndlessVendetta/Content/BountySystem/Waypoint/WBP_WaypointWidget.uasset +++ b/EndlessVendetta/Content/BountySystem/Waypoint/WBP_WaypointWidget.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:4e4ae871d6733efb0886ca57157da73fc25729f229891052238a7b280868e241 -size 31076 +oid sha256:7ad8e92feadf8aced172d7716c2e63bca5660d8108b2561d755c79abad6b048e +size 30201 diff --git a/EndlessVendetta/Content/BountySystem/Waypoint/WaypointArrow_Spare.uasset b/EndlessVendetta/Content/BountySystem/Waypoint/WaypointArrow_Spare.uasset deleted file mode 100644 index 5615bcf8..00000000 --- a/EndlessVendetta/Content/BountySystem/Waypoint/WaypointArrow_Spare.uasset +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:6b708b6b30eb850215814c477dde66f4a44cfcb6ab341740def05e06fa0789c3 -size 33744 diff --git a/EndlessVendetta/Content/BountySystem/Waypoint/WaypointIcons/Exclamation_mark.png b/EndlessVendetta/Content/BountySystem/Waypoint/WaypointIcons/Exclamation_mark.png new file mode 100644 index 00000000..1d2973dc --- /dev/null +++ b/EndlessVendetta/Content/BountySystem/Waypoint/WaypointIcons/Exclamation_mark.png @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:00af367dcb6e9c0b771c56341d1931d8e43cc17417cb2b42d00d0a937a73f592 +size 769820 diff --git a/EndlessVendetta/Content/BountySystem/Waypoint/WaypointIcons/Exclamation_mark_3.png b/EndlessVendetta/Content/BountySystem/Waypoint/WaypointIcons/Exclamation_mark_3.png new file mode 100644 index 00000000..f3fb6ba7 --- /dev/null +++ b/EndlessVendetta/Content/BountySystem/Waypoint/WaypointIcons/Exclamation_mark_3.png @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:04609d5518882ce04e20ed49e67cfa73fb3ea6462a1c1686a13f1c9e4eae9605 +size 739472 diff --git a/EndlessVendetta/Content/BountySystem/Waypoint/MainBountyIcon.png b/EndlessVendetta/Content/BountySystem/Waypoint/WaypointIcons/MainBountyIcon.png similarity index 100% rename from EndlessVendetta/Content/BountySystem/Waypoint/MainBountyIcon.png rename to EndlessVendetta/Content/BountySystem/Waypoint/WaypointIcons/MainBountyIcon.png diff --git a/EndlessVendetta/Content/BountySystem/Waypoint/WaypointIcons/MainBountyIcon.uasset b/EndlessVendetta/Content/BountySystem/Waypoint/WaypointIcons/MainBountyIcon.uasset new file mode 100644 index 00000000..71b97394 --- /dev/null +++ b/EndlessVendetta/Content/BountySystem/Waypoint/WaypointIcons/MainBountyIcon.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:d7d5b9c6ed12c1232ed8bdef7de45bbabcffd50807793aa312ad7e78252b3a0b +size 84644 diff --git a/EndlessVendetta/Content/BountySystem/Waypoint/TempMainBountyIcon.png b/EndlessVendetta/Content/BountySystem/Waypoint/WaypointIcons/TempMainBountyIcon.png similarity index 100% rename from EndlessVendetta/Content/BountySystem/Waypoint/TempMainBountyIcon.png rename to EndlessVendetta/Content/BountySystem/Waypoint/WaypointIcons/TempMainBountyIcon.png diff --git a/EndlessVendetta/Content/BountySystem/Waypoint/WaypointIcons/TempMainBountyIcon.uasset b/EndlessVendetta/Content/BountySystem/Waypoint/WaypointIcons/TempMainBountyIcon.uasset new file mode 100644 index 00000000..92214793 --- /dev/null +++ b/EndlessVendetta/Content/BountySystem/Waypoint/WaypointIcons/TempMainBountyIcon.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:c170947c81cbfdeccd306e291a96d32d860ce79c85b83e7dc1e5adda439a943f +size 211805 diff --git a/EndlessVendetta/Content/BountySystem/Waypoint/WaypointArrow.png b/EndlessVendetta/Content/BountySystem/Waypoint/WaypointIcons/WaypointArrow.png similarity index 100% rename from EndlessVendetta/Content/BountySystem/Waypoint/WaypointArrow.png rename to EndlessVendetta/Content/BountySystem/Waypoint/WaypointIcons/WaypointArrow.png diff --git a/EndlessVendetta/Content/BountySystem/Waypoint/WaypointIcons/WaypointArrow_Spare.uasset b/EndlessVendetta/Content/BountySystem/Waypoint/WaypointIcons/WaypointArrow_Spare.uasset new file mode 100644 index 00000000..a5d44718 --- /dev/null +++ b/EndlessVendetta/Content/BountySystem/Waypoint/WaypointIcons/WaypointArrow_Spare.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:e33278de3bb683f356f69ce86198a1ac965efd566ed38d4dd530353f8de103f6 +size 33772 diff --git a/EndlessVendetta/Content/BountySystem/Waypoint/WaypointIcons/exclamation_mark_2.png b/EndlessVendetta/Content/BountySystem/Waypoint/WaypointIcons/exclamation_mark_2.png new file mode 100644 index 00000000..2f3ca4f9 --- /dev/null +++ b/EndlessVendetta/Content/BountySystem/Waypoint/WaypointIcons/exclamation_mark_2.png @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:c756d4dc02cdab4aa6905bf7c9f1ea7e5327ef1ade16b06f937ace3ae5cb72b0 +size 671442 diff --git a/EndlessVendetta/Content/Levels/MainMenuLevel.umap b/EndlessVendetta/Content/Levels/MainMenuLevel.umap index 9333c78d..bd4d0a4e 100644 --- a/EndlessVendetta/Content/Levels/MainMenuLevel.umap +++ b/EndlessVendetta/Content/Levels/MainMenuLevel.umap @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:c47beeba2669dedff200bc860957e7e7c44317fa30b7810973c101a5f23b6810 -size 308758 +oid sha256:7f9eeb93d9528280841ebfa552cc29d769515d093467e822741471ff85488699 +size 308710 diff --git a/EndlessVendetta/Content/Levels/TempOpenWorld.umap b/EndlessVendetta/Content/Levels/TempOpenWorld.umap index 2ac2aff9..741f7375 100644 --- a/EndlessVendetta/Content/Levels/TempOpenWorld.umap +++ b/EndlessVendetta/Content/Levels/TempOpenWorld.umap @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:4d7ca6377d1eab1c529cd4be6dd17d1c73033e6ba9cbfd201cad240134580c1f -size 13914548 +oid sha256:ec8f6a062e98d7a1ce1bfb8b8c68441cfb2e60c40d609c8b1572adbacbc3ba79 +size 13914596 diff --git a/EndlessVendetta/Content/StarterContent/Architecture/Floor_400x400.uasset b/EndlessVendetta/Content/StarterContent/Architecture/Floor_400x400.uasset index c2a34afc..41df6b83 100644 --- a/EndlessVendetta/Content/StarterContent/Architecture/Floor_400x400.uasset +++ b/EndlessVendetta/Content/StarterContent/Architecture/Floor_400x400.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:4c0ecf0ac0702cc2bd355ec050232a61c49e10f102448efbeb735a51824adef6 -size 14948 +oid sha256:2323ff7b602d5c5ba8fabfde5e135cff8ef59601c45e57b68f702bc0ad75214f +size 14831 diff --git a/EndlessVendetta/Content/StarterContent/Blueprints/Blueprint_CeilingLight.uasset b/EndlessVendetta/Content/StarterContent/Blueprints/Blueprint_CeilingLight.uasset index bbd4d209..c5c3b84e 100644 --- a/EndlessVendetta/Content/StarterContent/Blueprints/Blueprint_CeilingLight.uasset +++ b/EndlessVendetta/Content/StarterContent/Blueprints/Blueprint_CeilingLight.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:a9e9b8a73b98b46c9d4c21d92c64f77e88aad2cfe199d4c9e16a6d4a662a3204 -size 43745 +oid sha256:4a60a29ad596546d481e43dfb8698842a78cc07f4a4b1000fa397cfba4e72331 +size 158206 From 1cdaea777e9b1f45f8760e618b60194728c0d962 Mon Sep 17 00:00:00 2001 From: Rafal Swierczek Date: Sun, 18 Feb 2024 19:51:22 +0000 Subject: [PATCH 18/25] WIP Completing Side Bounties and Receiving Rewards --- .../.idea.EndlessVendetta/.idea/workspace.xml | 13 +++++++++---- .../EndlessVendetta/BountySystem/BountyClass.h | 9 ++++++--- .../BountySystem/BountyDirector.cpp | 2 +- .../BountySystem/MainBountyClass.h | 3 --- .../BountySystem/SideBountyClass.cpp | 2 +- .../BountySystem/SideBountyClass.h | 16 +++++++--------- .../Characters/BountyHunterCharacter.cpp | 15 +++++++++++---- .../Characters/BountyHunterCharacter.h | 10 +++++++--- 8 files changed, 42 insertions(+), 28 deletions(-) diff --git a/EndlessVendetta/.idea/.idea.EndlessVendetta/.idea/workspace.xml b/EndlessVendetta/.idea/.idea.EndlessVendetta/.idea/workspace.xml index 5cc0abdd..932bc015 100644 --- a/EndlessVendetta/.idea/.idea.EndlessVendetta/.idea/workspace.xml +++ b/EndlessVendetta/.idea/.idea.EndlessVendetta/.idea/workspace.xml @@ -9,9 +9,13 @@ - - - + + + + + + + diff --git a/EndlessVendetta/Source/EndlessVendetta/BountySystem/BountyClass.h b/EndlessVendetta/Source/EndlessVendetta/BountySystem/BountyClass.h index d34e4c77..06bcc3bb 100644 --- a/EndlessVendetta/Source/EndlessVendetta/BountySystem/BountyClass.h +++ b/EndlessVendetta/Source/EndlessVendetta/BountySystem/BountyClass.h @@ -24,7 +24,11 @@ class ENDLESSVENDETTA_API ABountyClass : public AActor protected: // Array of References to the Spawned in Checkpoints for this Bounty TArray BountyCheckpoints; - + + // Money Rewarded to Player for Completing this Bounty + UPROPERTY(EditDefaultsOnly, Category = "Bounty") + int RewardMoney = 0; + public: FCompletedACheckpoint CompletedACheckpoint; @@ -64,8 +68,7 @@ protected: // ------- Properties Set in Editor -------------- - UPROPERTY(EditDefaultsOnly, Category = "Bounty") - int RewardMoney = 0; + UPROPERTY(EditDefaultsOnly, Category = "Bounty") FString BountyTitle; diff --git a/EndlessVendetta/Source/EndlessVendetta/BountySystem/BountyDirector.cpp b/EndlessVendetta/Source/EndlessVendetta/BountySystem/BountyDirector.cpp index 834c7fb5..d9745afb 100644 --- a/EndlessVendetta/Source/EndlessVendetta/BountySystem/BountyDirector.cpp +++ b/EndlessVendetta/Source/EndlessVendetta/BountySystem/BountyDirector.cpp @@ -68,7 +68,7 @@ void ABountyDirector::SpawnBountyAndItsSideBounties() ASideBountyClass* SideBounty = Cast(SideBountyActor); if (!IsValid(SideBounty)) UE_LOG(LogTemp, Fatal, TEXT("A SideBounty for %s has been set to a wrong type"), *ActiveBounty->GetBountyTitle()); int i = ActiveSideBounties.Add(SideBounty); - ActiveSideBounties[i]->CompletedSideBounty.AddDynamic(this, &ABountyDirector::EarnFavours); + // ActiveSideBounties[i]->CompletedSideBounty.AddDynamic(this, &ABountyDirector::EarnFavours); // ONCE AGAIN WHEN MARCEL STOPS PLAYING WITH THE CHARACTER, ADD THIS SIDE BOUNTY TO PLAYERS ARRAY OF ACTIVE BOUNTIES!!!!! } } diff --git a/EndlessVendetta/Source/EndlessVendetta/BountySystem/MainBountyClass.h b/EndlessVendetta/Source/EndlessVendetta/BountySystem/MainBountyClass.h index 933c4a28..7500fc29 100644 --- a/EndlessVendetta/Source/EndlessVendetta/BountySystem/MainBountyClass.h +++ b/EndlessVendetta/Source/EndlessVendetta/BountySystem/MainBountyClass.h @@ -32,9 +32,6 @@ struct FMainBountyStruct UPROPERTY(BlueprintReadOnly, EditDefaultsOnly) UTexture2D* Floorplan = nullptr; - - UPROPERTY(BlueprintReadOnly) - bool Tracked = true; }; UCLASS() diff --git a/EndlessVendetta/Source/EndlessVendetta/BountySystem/SideBountyClass.cpp b/EndlessVendetta/Source/EndlessVendetta/BountySystem/SideBountyClass.cpp index bca92d12..d6227ac5 100644 --- a/EndlessVendetta/Source/EndlessVendetta/BountySystem/SideBountyClass.cpp +++ b/EndlessVendetta/Source/EndlessVendetta/BountySystem/SideBountyClass.cpp @@ -23,7 +23,7 @@ void ASideBountyClass::IncrementBountyCheckpoint() if (BountyCheckpoints.IsEmpty()) { - CompletedSideBounty.Broadcast(FavoursEarnedForCompletion); + CompletedSideBounty.Broadcast(GetUniqueID()); } } diff --git a/EndlessVendetta/Source/EndlessVendetta/BountySystem/SideBountyClass.h b/EndlessVendetta/Source/EndlessVendetta/BountySystem/SideBountyClass.h index 24187c7d..d71cafc8 100644 --- a/EndlessVendetta/Source/EndlessVendetta/BountySystem/SideBountyClass.h +++ b/EndlessVendetta/Source/EndlessVendetta/BountySystem/SideBountyClass.h @@ -17,14 +17,15 @@ struct FSideBountyStruct UPROPERTY(BlueprintReadOnly, EditDefaultsOnly) FString BountyDesc = ""; - UPROPERTY(BlueprintReadOnly) - bool Tracked = true; - UPROPERTY(BlueprintReadOnly) int SideBountyUID = 0; + + // Amount of Favours the Player will earn for Completing this Side Bounty + UPROPERTY(EditDefaultsOnly) + int FavoursEarnedForCompletion = 1; }; -DECLARE_DYNAMIC_MULTICAST_DELEGATE_OneParam(FCompletedSideBounty, int, FavoursEarned); +DECLARE_DYNAMIC_MULTICAST_DELEGATE_OneParam(FCompletedSideBounty, int, SB_UID); UCLASS() class ENDLESSVENDETTA_API ASideBountyClass : public ABountyClass @@ -32,9 +33,7 @@ class ENDLESSVENDETTA_API ASideBountyClass : public ABountyClass GENERATED_BODY() // ------------------- ATTRIBUTES ------------------------------ - // Amount of Favours the Player will earn for Completing this Side Bounty - UPROPERTY(EditDefaultsOnly, Category = "Side Bounty") - int FavoursEarnedForCompletion = 1; + protected: @@ -47,7 +46,6 @@ public: FSideBountyStruct SideBountyStruct; // ------------------- METHODS --------------------------------- - private: virtual void BeginPlay() override; @@ -66,6 +64,6 @@ public: void DestroyCheckpoints(); int GetRewardInFavours() { - return FavoursEarnedForCompletion; + return 0; } }; diff --git a/EndlessVendetta/Source/EndlessVendetta/Characters/BountyHunterCharacter.cpp b/EndlessVendetta/Source/EndlessVendetta/Characters/BountyHunterCharacter.cpp index fcb5d58a..9e97f363 100644 --- a/EndlessVendetta/Source/EndlessVendetta/Characters/BountyHunterCharacter.cpp +++ b/EndlessVendetta/Source/EndlessVendetta/Characters/BountyHunterCharacter.cpp @@ -34,6 +34,7 @@ void ABountyHunterCharacter::SpawnMainBounty(UEVGameInstance* GI) for (auto SideBounty : CurrentSideBounties) { SideBountyStructs.Add(SideBounty->SideBountyStruct); + SideBounty->CompletedSideBounty.AddDynamic(this, &CompletedASideBounty); } } @@ -42,16 +43,22 @@ void ABountyHunterCharacter::CompleteCurrentMainBounty(UEVGameInstance* GI) // Collect rewards for bounty and move onto next UE_LOG(LogTemp, Warning, TEXT("Would be collecting reward for completing bounty %d"), CurrentMainBountyIndex); - // FTransform PostBountySpawnTransform = MainBountyClasses[CurrentMainBountyIndex]->GetDefaultObject()->GetPlayerSpawnTransform(); - // SetActorTransform(PostBountySpawnTransform); - // Cast(GetController())->SetControlRotation(PostBountySpawnTransform.GetRotation().Rotator()); - + // Saves players spawn now as players location is set after spawn main bounty finishes running in begin play GI->MainSaveGameInstanceRef->PlayerOpenWorldSpawnTransformSave = MainBountyClasses[CurrentMainBountyIndex]->GetDefaultObject()->GetPlayerSpawnTransform(); CurrentMainBountyIndex = GI->MainSaveGameInstanceRef->CurrentMainBountyIndexSave; GI->MainSaveGameInstanceRef->LastMainBountyIndexInOpenWorld = CurrentMainBountyIndex; UGameplayStatics::SaveGameToSlot(GI->MainSaveGameInstanceRef, "MainSave", 0); } +void ABountyHunterCharacter::CompletedASideBounty(int CompletedSideBountiesUID) +{ + for (auto SBStruct : SideBountyStructs) + { + if (SBStruct.SideBountyUID != CompletedSideBountiesUID) continue; + //Continue writing code here about gaining money and favours + } +} + void ABountyHunterCharacter::AllBountiesCompleted() { UE_LOG(LogTemp, Warning, TEXT("Game Completed!!!! No more Bounties left... or you forgot to set a bounty at one of the indexes oof")); diff --git a/EndlessVendetta/Source/EndlessVendetta/Characters/BountyHunterCharacter.h b/EndlessVendetta/Source/EndlessVendetta/Characters/BountyHunterCharacter.h index 8f4d0797..f9092fd1 100644 --- a/EndlessVendetta/Source/EndlessVendetta/Characters/BountyHunterCharacter.h +++ b/EndlessVendetta/Source/EndlessVendetta/Characters/BountyHunterCharacter.h @@ -31,11 +31,11 @@ class ENDLESSVENDETTA_API ABountyHunterCharacter : public AEndlessVendettaCharac UPROPERTY() AMainBountyClass* CurrentMainBounty; - UPROPERTY() - TArray CurrentSideBounties; - // Index of Currently Active Main Bounty, Used for MainBountyClasses int CurrentMainBountyIndex = 0; + + // References to Currently Active Side Bounties + TArray CurrentSideBounties; // Name of open world, so that the correct bounties can be spawned based on level UPROPERTY(EditDefaultsOnly, Category = "Bounty Hunter") @@ -53,6 +53,10 @@ private: // Collects Reward for Current Main Bounty and Increments the Main Bounty Index void CompleteCurrentMainBounty(UEVGameInstance* GI); + // Collects Reward for Completing a Side Bounty + UFUNCTION() + void CompletedASideBounty(int CompletedSideBountiesUID); + // Replaces Normal Bounty Info UI with Unique Game Over UI void AllBountiesCompleted(); From 20c331e8a3f26f674cd44074b237237f45d19760 Mon Sep 17 00:00:00 2001 From: Rafal Swierczek Date: Thu, 22 Feb 2024 13:52:20 +0000 Subject: [PATCH 19/25] Implemented Receiving Bounty Awards for Completing Bounties --- .../.idea.EndlessVendetta/.idea/workspace.xml | 11 ++++- .../MoneyProblems/CP_GoToFinanceCentre.uasset | 4 +- .../MoneyProblems/SB_MoneyProblems.uasset | 4 +- .../Bounty/MB_Training.uasset | 4 +- .../Content/Levels/MainMenuLevel.umap | 4 +- .../Content/PauseMenu/WBP_PauseMenu.uasset | 4 +- .../Architecture/Floor_400x400.uasset | 4 +- .../Blueprints/Blueprint_CeilingLight.uasset | 4 +- .../BountySystem/BountyClass.h | 6 +++ .../BountySystem/SideBountyClass.cpp | 1 + .../BountySystem/SideBountyClass.h | 2 + .../Characters/BountyHunterCharacter.cpp | 21 +++++++-- .../Characters/BountyHunterCharacter.h | 47 +++++++++++++++++++ .../Source/EndlessVendetta/EVGameInstance.cpp | 2 + .../EndlessVendetta/MainSaveGameClass.h | 6 +++ .../PauseMenu/PauseMenuClass.h | 6 ++- 16 files changed, 110 insertions(+), 20 deletions(-) diff --git a/EndlessVendetta/.idea/.idea.EndlessVendetta/.idea/workspace.xml b/EndlessVendetta/.idea/.idea.EndlessVendetta/.idea/workspace.xml index 932bc015..e4812422 100644 --- a/EndlessVendetta/.idea/.idea.EndlessVendetta/.idea/workspace.xml +++ b/EndlessVendetta/.idea/.idea.EndlessVendetta/.idea/workspace.xml @@ -9,13 +9,18 @@ + + + + - - + + + diff --git a/EndlessVendetta/Content/BountySystem/ApartmentBounty/SideBounties/MoneyProblems/CP_GoToFinanceCentre.uasset b/EndlessVendetta/Content/BountySystem/ApartmentBounty/SideBounties/MoneyProblems/CP_GoToFinanceCentre.uasset index 5779f4c9..441f3685 100644 --- a/EndlessVendetta/Content/BountySystem/ApartmentBounty/SideBounties/MoneyProblems/CP_GoToFinanceCentre.uasset +++ b/EndlessVendetta/Content/BountySystem/ApartmentBounty/SideBounties/MoneyProblems/CP_GoToFinanceCentre.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:474599332f82e0e18990902c5a79b7de5dd80a4e9c7fe016b22fd4280f96936e -size 80064 +oid sha256:6cdc863b9bd4477a188dfba127b747fad85d5a2be2adba1663696d88db0ca63c +size 82240 diff --git a/EndlessVendetta/Content/BountySystem/ApartmentBounty/SideBounties/MoneyProblems/SB_MoneyProblems.uasset b/EndlessVendetta/Content/BountySystem/ApartmentBounty/SideBounties/MoneyProblems/SB_MoneyProblems.uasset index df80c1fb..b4b69fd6 100644 --- a/EndlessVendetta/Content/BountySystem/ApartmentBounty/SideBounties/MoneyProblems/SB_MoneyProblems.uasset +++ b/EndlessVendetta/Content/BountySystem/ApartmentBounty/SideBounties/MoneyProblems/SB_MoneyProblems.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:e10c7eef9ffc82523eb772b5a1b467de0c1f56d4014ded77da9c3dbba11b3296 -size 22940 +oid sha256:1c446d428c4db33e1efa43f9aef00a8c8196d48158436b7d93d128805ee2347c +size 23052 diff --git a/EndlessVendetta/Content/BountySystem/ControlsTutorial/Bounty/MB_Training.uasset b/EndlessVendetta/Content/BountySystem/ControlsTutorial/Bounty/MB_Training.uasset index 79f24720..2540de5f 100644 --- a/EndlessVendetta/Content/BountySystem/ControlsTutorial/Bounty/MB_Training.uasset +++ b/EndlessVendetta/Content/BountySystem/ControlsTutorial/Bounty/MB_Training.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:e7c0eee778caa45c4640871d924966e7415272eff04a16cc96e3056c7f5b488b -size 28006 +oid sha256:3911424435eeeeba61add4579c324414dafe7fdac48d660bac6dbf9de909e9eb +size 28055 diff --git a/EndlessVendetta/Content/Levels/MainMenuLevel.umap b/EndlessVendetta/Content/Levels/MainMenuLevel.umap index bd4d0a4e..ee4486ce 100644 --- a/EndlessVendetta/Content/Levels/MainMenuLevel.umap +++ b/EndlessVendetta/Content/Levels/MainMenuLevel.umap @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:7f9eeb93d9528280841ebfa552cc29d769515d093467e822741471ff85488699 -size 308710 +oid sha256:0d4289da6b9ff9cbe01059bf37b1d3a758f45d2609be2e75283085f0f135d978 +size 308758 diff --git a/EndlessVendetta/Content/PauseMenu/WBP_PauseMenu.uasset b/EndlessVendetta/Content/PauseMenu/WBP_PauseMenu.uasset index d9e34568..016a7344 100644 --- a/EndlessVendetta/Content/PauseMenu/WBP_PauseMenu.uasset +++ b/EndlessVendetta/Content/PauseMenu/WBP_PauseMenu.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:64ca05e586e2efad00caccb8877e80ff186de099c7271b368fea7ed544606929 -size 485440 +oid sha256:ff738c6b1ccafb79a8381f4e2ae3b6015ba59a191a0f50db49b6864f0426489f +size 508962 diff --git a/EndlessVendetta/Content/StarterContent/Architecture/Floor_400x400.uasset b/EndlessVendetta/Content/StarterContent/Architecture/Floor_400x400.uasset index 41df6b83..c2a34afc 100644 --- a/EndlessVendetta/Content/StarterContent/Architecture/Floor_400x400.uasset +++ b/EndlessVendetta/Content/StarterContent/Architecture/Floor_400x400.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:2323ff7b602d5c5ba8fabfde5e135cff8ef59601c45e57b68f702bc0ad75214f -size 14831 +oid sha256:4c0ecf0ac0702cc2bd355ec050232a61c49e10f102448efbeb735a51824adef6 +size 14948 diff --git a/EndlessVendetta/Content/StarterContent/Blueprints/Blueprint_CeilingLight.uasset b/EndlessVendetta/Content/StarterContent/Blueprints/Blueprint_CeilingLight.uasset index c5c3b84e..1c96a46a 100644 --- a/EndlessVendetta/Content/StarterContent/Blueprints/Blueprint_CeilingLight.uasset +++ b/EndlessVendetta/Content/StarterContent/Blueprints/Blueprint_CeilingLight.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:4a60a29ad596546d481e43dfb8698842a78cc07f4a4b1000fa397cfba4e72331 -size 158206 +oid sha256:8881ec1ec0d7d6bc38838abb480029b4fd720e7ed108e487f6cb348f21386a66 +size 43745 diff --git a/EndlessVendetta/Source/EndlessVendetta/BountySystem/BountyClass.h b/EndlessVendetta/Source/EndlessVendetta/BountySystem/BountyClass.h index 06bcc3bb..84dfe612 100644 --- a/EndlessVendetta/Source/EndlessVendetta/BountySystem/BountyClass.h +++ b/EndlessVendetta/Source/EndlessVendetta/BountySystem/BountyClass.h @@ -31,6 +31,12 @@ protected: public: FCompletedACheckpoint CompletedACheckpoint; + + // Gets the Reward Money for Completing this Bounty, used by Players Character + int GetRewardMoney() + { + return RewardMoney; + } // ------------------- METHODS --------------------------------- diff --git a/EndlessVendetta/Source/EndlessVendetta/BountySystem/SideBountyClass.cpp b/EndlessVendetta/Source/EndlessVendetta/BountySystem/SideBountyClass.cpp index d6227ac5..291b3499 100644 --- a/EndlessVendetta/Source/EndlessVendetta/BountySystem/SideBountyClass.cpp +++ b/EndlessVendetta/Source/EndlessVendetta/BountySystem/SideBountyClass.cpp @@ -7,6 +7,7 @@ void ASideBountyClass::BeginPlay() { SideBountyStruct.SideBountyUID = GetUniqueID(); + SideBountyStruct.MoneyEarnedForCompletion = RewardMoney; Super::BeginPlay(); } diff --git a/EndlessVendetta/Source/EndlessVendetta/BountySystem/SideBountyClass.h b/EndlessVendetta/Source/EndlessVendetta/BountySystem/SideBountyClass.h index d71cafc8..67c0cf2b 100644 --- a/EndlessVendetta/Source/EndlessVendetta/BountySystem/SideBountyClass.h +++ b/EndlessVendetta/Source/EndlessVendetta/BountySystem/SideBountyClass.h @@ -23,6 +23,8 @@ struct FSideBountyStruct // Amount of Favours the Player will earn for Completing this Side Bounty UPROPERTY(EditDefaultsOnly) int FavoursEarnedForCompletion = 1; + + int MoneyEarnedForCompletion = 0; }; DECLARE_DYNAMIC_MULTICAST_DELEGATE_OneParam(FCompletedSideBounty, int, SB_UID); diff --git a/EndlessVendetta/Source/EndlessVendetta/Characters/BountyHunterCharacter.cpp b/EndlessVendetta/Source/EndlessVendetta/Characters/BountyHunterCharacter.cpp index 9e97f363..d5e67fe1 100644 --- a/EndlessVendetta/Source/EndlessVendetta/Characters/BountyHunterCharacter.cpp +++ b/EndlessVendetta/Source/EndlessVendetta/Characters/BountyHunterCharacter.cpp @@ -34,13 +34,14 @@ void ABountyHunterCharacter::SpawnMainBounty(UEVGameInstance* GI) for (auto SideBounty : CurrentSideBounties) { SideBountyStructs.Add(SideBounty->SideBountyStruct); - SideBounty->CompletedSideBounty.AddDynamic(this, &CompletedASideBounty); + SideBounty->CompletedSideBounty.AddDynamic(this, &ABountyHunterCharacter::CompletedASideBounty); } } void ABountyHunterCharacter::CompleteCurrentMainBounty(UEVGameInstance* GI) { - // Collect rewards for bounty and move onto next + EarnMoney(MainBountyClasses[CurrentMainBountyIndex]->GetDefaultObject()->GetRewardMoney()); + if (IsValid(PauseMenu)) PauseMenu->UpdatePlayerStatistics(Money, Favours); UE_LOG(LogTemp, Warning, TEXT("Would be collecting reward for completing bounty %d"), CurrentMainBountyIndex); // Saves players spawn now as players location is set after spawn main bounty finishes running in begin play @@ -55,7 +56,9 @@ void ABountyHunterCharacter::CompletedASideBounty(int CompletedSideBountiesUID) for (auto SBStruct : SideBountyStructs) { if (SBStruct.SideBountyUID != CompletedSideBountiesUID) continue; - //Continue writing code here about gaining money and favours + EarnMoney(SBStruct.MoneyEarnedForCompletion); + EarnFavours(SBStruct.FavoursEarnedForCompletion); + if (IsValid(PauseMenu)) PauseMenu->UpdatePlayerStatistics(Money, Favours); } } @@ -64,11 +67,22 @@ void ABountyHunterCharacter::AllBountiesCompleted() UE_LOG(LogTemp, Warning, TEXT("Game Completed!!!! No more Bounties left... or you forgot to set a bounty at one of the indexes oof")); } +void ABountyHunterCharacter::SavePlayerMoneyAndFavours() +{ + UEVGameInstance* GI = Cast(GetGameInstance()); + if (!IsValid(GI->MainSaveGameInstanceRef)) return; + GI->MainSaveGameInstanceRef->MoneySave = Money; + GI->MainSaveGameInstanceRef->FavourSave = Favours; + UGameplayStatics::SaveGameToSlot(GI->MainSaveGameInstanceRef, "MainSave", 0); +} + void ABountyHunterCharacter::BeginPlay() { UEVGameInstance* GI = Cast(GetGameInstance()); if (IsValid(GI->MainSaveGameInstanceRef)) { + Money = GI->MainSaveGameInstanceRef->MoneySave; + Favours = GI->MainSaveGameInstanceRef->FavourSave; SpawnMainBounty(GI); FTransform SpawnLoc = GI->MainSaveGameInstanceRef->PlayerOpenWorldSpawnTransformSave; if (SpawnLoc.GetLocation() != FVector(0, 0, 0) && UGameplayStatics::GetCurrentLevelName(GetWorld()) == OpenWorldLevelName) @@ -162,6 +176,7 @@ void ABountyHunterCharacter::TogglePauseMenu() return; } PauseMenu = CreateWidget(GetWorld(), PauseMenuWidgetClass, FName("PauseMenu")); + PauseMenu->UpdatePlayerStatistics(Money, Favours); PauseMenu->AddToViewport(50); PauseMenu->OpenNewTab(BountiesTab); PauseMenu->OpenedBountiesTab.AddDynamic(this, &ABountyHunterCharacter::OpenBountiesTab); diff --git a/EndlessVendetta/Source/EndlessVendetta/Characters/BountyHunterCharacter.h b/EndlessVendetta/Source/EndlessVendetta/Characters/BountyHunterCharacter.h index f9092fd1..1662f003 100644 --- a/EndlessVendetta/Source/EndlessVendetta/Characters/BountyHunterCharacter.h +++ b/EndlessVendetta/Source/EndlessVendetta/Characters/BountyHunterCharacter.h @@ -23,6 +23,12 @@ class ENDLESSVENDETTA_API ABountyHunterCharacter : public AEndlessVendettaCharac GENERATED_BODY() // ------------------- ATTRIBUTES ------------------------------ + // Money Used for Buying things + int Money = 0; + + // Favours used for making bounties easier + int Favours = 0; + // Array of Main Bounties' Classes in Order UPROPERTY(EditDefaultsOnly, Category = "Bounty Hunter") TArray> MainBountyClasses; @@ -45,6 +51,9 @@ protected: public: + + + // ------------------- METHODS --------------------------------- private: // Spawns Current Main Bounty along with its Side Bounties, and spawns its appropriate CP's based on level @@ -60,6 +69,8 @@ private: // Replaces Normal Bounty Info UI with Unique Game Over UI void AllBountiesCompleted(); + void SavePlayerMoneyAndFavours(); + protected: // Called When Player Spawns virtual void BeginPlay() override; @@ -77,6 +88,42 @@ public: return OpenWorldLevelName; } + // Public incase Money can be earned through outside sources in the future + void EarnMoney(int MoneyEarned) + { + Money += MoneyEarned; + SavePlayerMoneyAndFavours(); + } + + // Checks if player has enough money to spend, if true then spend money and return true + bool SpendMoney(int MoneySpent) + { + if (MoneySpent > Money) return false; + Money -= MoneySpent; + SavePlayerMoneyAndFavours(); + return true; + } + + // Public incase favours can be earned through outside sources in the future + void EarnFavours(int FavoursEarned) + { + Favours += FavoursEarned; + SavePlayerMoneyAndFavours(); + } + + // Checks if player has enough favours to spend, if true then spend favours and return true + bool SpendFavours(int FavoursSpent) + { + if (FavoursSpent > Favours) return false; + Favours -= FavoursSpent; + SavePlayerMoneyAndFavours(); + return true; + } + + + + + // ------------------- Pause Menu --------------------------------- private: // Input Action for Opening and Closing Pause Menu diff --git a/EndlessVendetta/Source/EndlessVendetta/EVGameInstance.cpp b/EndlessVendetta/Source/EndlessVendetta/EVGameInstance.cpp index 05044761..e42561a3 100644 --- a/EndlessVendetta/Source/EndlessVendetta/EVGameInstance.cpp +++ b/EndlessVendetta/Source/EndlessVendetta/EVGameInstance.cpp @@ -12,6 +12,8 @@ void UEVGameInstance::CreateNewSaveGameInstance() MainSaveGameInstanceRef = Cast(UGameplayStatics::CreateSaveGameObject(UMainSaveGameClass::StaticClass())); MainSaveGameInstanceRef->CurrentMainBountyIndexSave = 0; MainSaveGameInstanceRef->LastMainBountyIndexInOpenWorld = 0; + MainSaveGameInstanceRef->MoneySave = 0; + MainSaveGameInstanceRef->FavourSave = 0; UGameplayStatics::SaveGameToSlot(MainSaveGameInstanceRef, "MainSave", 0); } diff --git a/EndlessVendetta/Source/EndlessVendetta/MainSaveGameClass.h b/EndlessVendetta/Source/EndlessVendetta/MainSaveGameClass.h index ccd11131..507f3c19 100644 --- a/EndlessVendetta/Source/EndlessVendetta/MainSaveGameClass.h +++ b/EndlessVendetta/Source/EndlessVendetta/MainSaveGameClass.h @@ -30,4 +30,10 @@ public: UPROPERTY() FTransform PlayerOpenWorldSpawnTransformSave; + + UPROPERTY() + int MoneySave; + + UPROPERTY() + int FavourSave; }; diff --git a/EndlessVendetta/Source/EndlessVendetta/PauseMenu/PauseMenuClass.h b/EndlessVendetta/Source/EndlessVendetta/PauseMenu/PauseMenuClass.h index fff8ea82..f65cacf2 100644 --- a/EndlessVendetta/Source/EndlessVendetta/PauseMenu/PauseMenuClass.h +++ b/EndlessVendetta/Source/EndlessVendetta/PauseMenu/PauseMenuClass.h @@ -37,5 +37,9 @@ public: public: // Closes any Previously Opened Tab and Opens the Given new Tab UFUNCTION(BlueprintImplementableEvent) - void OpenNewTab(UTabWidget* TabWidget); + void OpenNewTab(UTabWidget* TabWidget); + + // Updates Displayed Player Statistics, aka Money and Favours + UFUNCTION(BlueprintImplementableEvent) + void UpdatePlayerStatistics(int NewMoney, int NewFavours); }; From b6fb2da0ca69366d6844bfa0ec9cfa1dab7201e5 Mon Sep 17 00:00:00 2001 From: Rafal Swierczek Date: Thu, 22 Feb 2024 16:07:03 +0000 Subject: [PATCH 20/25] Added New Bounty Tab for Game Over State --- .../.idea.EndlessVendetta/.idea/workspace.xml | 14 ++------------ .../Blueprints/BP_FirstPersonCharacter.uasset | 4 ++-- .../Tabs/BountyTabs/WBP_BountiesTab.uasset | 4 ++-- .../Tabs/BountyTabs/WBP_GameOverBountiesTab.uasset | 3 +++ .../Blueprints/Blueprint_CeilingLight.uasset | 4 ++-- .../HDRI/HDRI_Epic_Courtyard_Daylight.uasset | 4 ++-- .../Characters/BountyHunterCharacter.cpp | 12 ++++++------ .../Characters/BountyHunterCharacter.h | 12 +++++++++++- 8 files changed, 30 insertions(+), 27 deletions(-) create mode 100644 EndlessVendetta/Content/PauseMenu/Tabs/BountyTabs/WBP_GameOverBountiesTab.uasset diff --git a/EndlessVendetta/.idea/.idea.EndlessVendetta/.idea/workspace.xml b/EndlessVendetta/.idea/.idea.EndlessVendetta/.idea/workspace.xml index e4812422..6d55a51c 100644 --- a/EndlessVendetta/.idea/.idea.EndlessVendetta/.idea/workspace.xml +++ b/EndlessVendetta/.idea/.idea.EndlessVendetta/.idea/workspace.xml @@ -8,19 +8,9 @@ - - - - - - - - + - - - diff --git a/EndlessVendetta/Content/FirstPerson/Blueprints/BP_FirstPersonCharacter.uasset b/EndlessVendetta/Content/FirstPerson/Blueprints/BP_FirstPersonCharacter.uasset index 6bca8da0..87ad6007 100644 --- a/EndlessVendetta/Content/FirstPerson/Blueprints/BP_FirstPersonCharacter.uasset +++ b/EndlessVendetta/Content/FirstPerson/Blueprints/BP_FirstPersonCharacter.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:3694f536232bf3750318bbed8aaa9f5ef454bc0ab781c44d71dfce238190b7ef -size 465881 +oid sha256:6e2442a58e7951896cedb4ae2893b6a7fbb5744b2065839f55e19e6b5068d64a +size 466129 diff --git a/EndlessVendetta/Content/PauseMenu/Tabs/BountyTabs/WBP_BountiesTab.uasset b/EndlessVendetta/Content/PauseMenu/Tabs/BountyTabs/WBP_BountiesTab.uasset index 31d07a40..f8b985f6 100644 --- a/EndlessVendetta/Content/PauseMenu/Tabs/BountyTabs/WBP_BountiesTab.uasset +++ b/EndlessVendetta/Content/PauseMenu/Tabs/BountyTabs/WBP_BountiesTab.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:0eabe94afd4d0ed0714040bb9e4cb78dac1690091a79824373b9153923ca8707 -size 263209 +oid sha256:94e3c498fcbc9f637d1601f0db6d73a10187278939d87f1726bde8639f39f51d +size 262166 diff --git a/EndlessVendetta/Content/PauseMenu/Tabs/BountyTabs/WBP_GameOverBountiesTab.uasset b/EndlessVendetta/Content/PauseMenu/Tabs/BountyTabs/WBP_GameOverBountiesTab.uasset new file mode 100644 index 00000000..ae417c6c --- /dev/null +++ b/EndlessVendetta/Content/PauseMenu/Tabs/BountyTabs/WBP_GameOverBountiesTab.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:ad4f17e3d6213bec771bc4dabb5a29ec90224cb11271d025c17727de47ff249e +size 141428 diff --git a/EndlessVendetta/Content/StarterContent/Blueprints/Blueprint_CeilingLight.uasset b/EndlessVendetta/Content/StarterContent/Blueprints/Blueprint_CeilingLight.uasset index 1c96a46a..c5c3b84e 100644 --- a/EndlessVendetta/Content/StarterContent/Blueprints/Blueprint_CeilingLight.uasset +++ b/EndlessVendetta/Content/StarterContent/Blueprints/Blueprint_CeilingLight.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:8881ec1ec0d7d6bc38838abb480029b4fd720e7ed108e487f6cb348f21386a66 -size 43745 +oid sha256:4a60a29ad596546d481e43dfb8698842a78cc07f4a4b1000fa397cfba4e72331 +size 158206 diff --git a/EndlessVendetta/Content/StarterContent/HDRI/HDRI_Epic_Courtyard_Daylight.uasset b/EndlessVendetta/Content/StarterContent/HDRI/HDRI_Epic_Courtyard_Daylight.uasset index 0f990580..d26afd80 100644 --- a/EndlessVendetta/Content/StarterContent/HDRI/HDRI_Epic_Courtyard_Daylight.uasset +++ b/EndlessVendetta/Content/StarterContent/HDRI/HDRI_Epic_Courtyard_Daylight.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:bc35eb2d43a47427d30aba0196f9eac90d089dd3abca319528c5d25c83510d0d -size 72364642 +oid sha256:367361338a1c76287e54fbef9427304264dd3c2ee473ba8017256cf917de1dc9 +size 66790690 diff --git a/EndlessVendetta/Source/EndlessVendetta/Characters/BountyHunterCharacter.cpp b/EndlessVendetta/Source/EndlessVendetta/Characters/BountyHunterCharacter.cpp index d5e67fe1..e9cf2b52 100644 --- a/EndlessVendetta/Source/EndlessVendetta/Characters/BountyHunterCharacter.cpp +++ b/EndlessVendetta/Source/EndlessVendetta/Characters/BountyHunterCharacter.cpp @@ -62,11 +62,6 @@ void ABountyHunterCharacter::CompletedASideBounty(int CompletedSideBountiesUID) } } -void ABountyHunterCharacter::AllBountiesCompleted() -{ - UE_LOG(LogTemp, Warning, TEXT("Game Completed!!!! No more Bounties left... or you forgot to set a bounty at one of the indexes oof")); -} - void ABountyHunterCharacter::SavePlayerMoneyAndFavours() { UEVGameInstance* GI = Cast(GetGameInstance()); @@ -137,7 +132,12 @@ void ABountyHunterCharacter::EndPlay(const EEndPlayReason::Type EndPlayReason) void ABountyHunterCharacter::CreatePauseMenuTabs() { - if (CurrentMainBountyIndex <= 0) + if (CompletedMainBounties) + { + BountiesTab = CreateWidget(GetWorld(), GameOverBountyTabWidgetClass); + BountiesTab->TrackSideBountyDelegate.AddDynamic(this, &ABountyHunterCharacter::TrackSideBounty); + } + else if (CurrentMainBountyIndex <= 0) { BountiesTab = CreateWidget(GetWorld(), TutorialBountyTabWidgetClass); } diff --git a/EndlessVendetta/Source/EndlessVendetta/Characters/BountyHunterCharacter.h b/EndlessVendetta/Source/EndlessVendetta/Characters/BountyHunterCharacter.h index 1662f003..a58d1586 100644 --- a/EndlessVendetta/Source/EndlessVendetta/Characters/BountyHunterCharacter.h +++ b/EndlessVendetta/Source/EndlessVendetta/Characters/BountyHunterCharacter.h @@ -47,6 +47,9 @@ class ENDLESSVENDETTA_API ABountyHunterCharacter : public AEndlessVendettaCharac UPROPERTY(EditDefaultsOnly, Category = "Bounty Hunter") FString OpenWorldLevelName = "ControlTutorialLevel"; + // Used to Check if all Main Bounties have been completed by the Bounties Tab + bool CompletedMainBounties = false; + protected: public: @@ -67,7 +70,10 @@ private: void CompletedASideBounty(int CompletedSideBountiesUID); // Replaces Normal Bounty Info UI with Unique Game Over UI - void AllBountiesCompleted(); + void AllBountiesCompleted() + { + CompletedMainBounties = true; + } void SavePlayerMoneyAndFavours(); @@ -148,6 +154,10 @@ private: // Widget Class used to Spawn Bounties Tab Widget UPROPERTY(EditDefaultsOnly, Category = "Pause Menu") TSubclassOf TutorialBountyTabWidgetClass; + + // Widget Class used to Spawn Bounties Tab Widget + UPROPERTY(EditDefaultsOnly, Category = "Pause Menu") + TSubclassOf GameOverBountyTabWidgetClass; // Reference to Bounty Tab Widget UPROPERTY() From c166aa1cdb8483d1288f2b9b70a83ec259381bea Mon Sep 17 00:00:00 2001 From: Rafal Swierczek Date: Thu, 22 Feb 2024 16:18:08 +0000 Subject: [PATCH 21/25] Bugfix Side Bounties Stayed in Pause Menu after Completion --- .../.idea/.idea.EndlessVendetta/.idea/workspace.xml | 4 +--- .../Characters/BountyHunterCharacter.cpp | 11 +++++++---- 2 files changed, 8 insertions(+), 7 deletions(-) diff --git a/EndlessVendetta/.idea/.idea.EndlessVendetta/.idea/workspace.xml b/EndlessVendetta/.idea/.idea.EndlessVendetta/.idea/workspace.xml index 6d55a51c..609593f7 100644 --- a/EndlessVendetta/.idea/.idea.EndlessVendetta/.idea/workspace.xml +++ b/EndlessVendetta/.idea/.idea.EndlessVendetta/.idea/workspace.xml @@ -8,9 +8,7 @@ - - diff --git a/EndlessVendetta/Source/EndlessVendetta/Characters/BountyHunterCharacter.cpp b/EndlessVendetta/Source/EndlessVendetta/Characters/BountyHunterCharacter.cpp index e9cf2b52..44257234 100644 --- a/EndlessVendetta/Source/EndlessVendetta/Characters/BountyHunterCharacter.cpp +++ b/EndlessVendetta/Source/EndlessVendetta/Characters/BountyHunterCharacter.cpp @@ -53,12 +53,15 @@ void ABountyHunterCharacter::CompleteCurrentMainBounty(UEVGameInstance* GI) void ABountyHunterCharacter::CompletedASideBounty(int CompletedSideBountiesUID) { - for (auto SBStruct : SideBountyStructs) + for (int i = 0; i < SideBountyStructs.Num(); i++) { - if (SBStruct.SideBountyUID != CompletedSideBountiesUID) continue; - EarnMoney(SBStruct.MoneyEarnedForCompletion); - EarnFavours(SBStruct.FavoursEarnedForCompletion); + if (SideBountyStructs[i].SideBountyUID != CompletedSideBountiesUID) continue; + EarnMoney(SideBountyStructs[i].MoneyEarnedForCompletion); + EarnFavours(SideBountyStructs[i].FavoursEarnedForCompletion); if (IsValid(PauseMenu)) PauseMenu->UpdatePlayerStatistics(Money, Favours); + + SideBountyStructs.RemoveAt(i); + UpdateBountyTabInfo(); } } From 9a2a365528a1fa19577c944c51ddabbfa6b31dfb Mon Sep 17 00:00:00 2001 From: Rafal Swierczek Date: Thu, 22 Feb 2024 23:28:08 +0000 Subject: [PATCH 22/25] Added Side Bounties to Save System --- .../.idea.EndlessVendetta/.idea/workspace.xml | 8 +++- .../Content/Levels/MainMenuLevel.umap | 4 +- .../Architecture/Floor_400x400.uasset | 4 +- .../HDRI/HDRI_Epic_Courtyard_Daylight.uasset | 4 +- .../BountySystem/MainBountyClass.cpp | 19 ++------ .../BountySystem/MainBountyClass.h | 9 ++-- .../Characters/BountyHunterCharacter.cpp | 46 ++++++++++++++++--- .../Characters/BountyHunterCharacter.h | 7 ++- .../EndlessVendetta/MainSaveGameClass.h | 4 ++ 9 files changed, 72 insertions(+), 33 deletions(-) diff --git a/EndlessVendetta/.idea/.idea.EndlessVendetta/.idea/workspace.xml b/EndlessVendetta/.idea/.idea.EndlessVendetta/.idea/workspace.xml index 609593f7..106f5ef3 100644 --- a/EndlessVendetta/.idea/.idea.EndlessVendetta/.idea/workspace.xml +++ b/EndlessVendetta/.idea/.idea.EndlessVendetta/.idea/workspace.xml @@ -8,7 +8,13 @@ + + + + + + diff --git a/EndlessVendetta/Content/Levels/MainMenuLevel.umap b/EndlessVendetta/Content/Levels/MainMenuLevel.umap index ee4486ce..04cdefe0 100644 --- a/EndlessVendetta/Content/Levels/MainMenuLevel.umap +++ b/EndlessVendetta/Content/Levels/MainMenuLevel.umap @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:0d4289da6b9ff9cbe01059bf37b1d3a758f45d2609be2e75283085f0f135d978 -size 308758 +oid sha256:fa952eb25972ab6e6dca1d46cf254f62d1684ba665ee45a7c3d6a8e3527ffac1 +size 308710 diff --git a/EndlessVendetta/Content/StarterContent/Architecture/Floor_400x400.uasset b/EndlessVendetta/Content/StarterContent/Architecture/Floor_400x400.uasset index c2a34afc..64bcf76d 100644 --- a/EndlessVendetta/Content/StarterContent/Architecture/Floor_400x400.uasset +++ b/EndlessVendetta/Content/StarterContent/Architecture/Floor_400x400.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:4c0ecf0ac0702cc2bd355ec050232a61c49e10f102448efbeb735a51824adef6 -size 14948 +oid sha256:769c1886c9631ccadb663c8fad5e3454f361f5bd99f6a49cf1646f88e0f267a9 +size 14831 diff --git a/EndlessVendetta/Content/StarterContent/HDRI/HDRI_Epic_Courtyard_Daylight.uasset b/EndlessVendetta/Content/StarterContent/HDRI/HDRI_Epic_Courtyard_Daylight.uasset index d26afd80..0f990580 100644 --- a/EndlessVendetta/Content/StarterContent/HDRI/HDRI_Epic_Courtyard_Daylight.uasset +++ b/EndlessVendetta/Content/StarterContent/HDRI/HDRI_Epic_Courtyard_Daylight.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:367361338a1c76287e54fbef9427304264dd3c2ee473ba8017256cf917de1dc9 -size 66790690 +oid sha256:bc35eb2d43a47427d30aba0196f9eac90d089dd3abca319528c5d25c83510d0d +size 72364642 diff --git a/EndlessVendetta/Source/EndlessVendetta/BountySystem/MainBountyClass.cpp b/EndlessVendetta/Source/EndlessVendetta/BountySystem/MainBountyClass.cpp index b4d65338..18b1e56e 100644 --- a/EndlessVendetta/Source/EndlessVendetta/BountySystem/MainBountyClass.cpp +++ b/EndlessVendetta/Source/EndlessVendetta/BountySystem/MainBountyClass.cpp @@ -45,20 +45,11 @@ void AMainBountyClass::SpawnCheckpoints() ActivateFirstCheckpoint(); } -TArray AMainBountyClass::SpawnAndReturnSideBounties() -{ - TArray SpawnedSideBounties; - for (auto SideBountyClass : SideBountiesToSpawn) - { - if (!IsValid(SideBountyClass)) continue; - ASideBountyClass* SpawnedSideBounty = GetWorld()->SpawnActor(SideBountyClass); - const FAttachmentTransformRules AttachmentTransformRules(EAttachmentRule::SnapToTarget, true); - SpawnedSideBounty->AttachToComponent(GetRootComponent(), AttachmentTransformRules); - SpawnedSideBounty->SpawnCheckpoints(); - SpawnedSideBounties.Add(SpawnedSideBounty); - } - return SpawnedSideBounties; -} + + + + + void AMainBountyClass::SpawnAmmoDrops() diff --git a/EndlessVendetta/Source/EndlessVendetta/BountySystem/MainBountyClass.h b/EndlessVendetta/Source/EndlessVendetta/BountySystem/MainBountyClass.h index 7500fc29..9908df07 100644 --- a/EndlessVendetta/Source/EndlessVendetta/BountySystem/MainBountyClass.h +++ b/EndlessVendetta/Source/EndlessVendetta/BountySystem/MainBountyClass.h @@ -71,14 +71,17 @@ protected: public: + // Used by Bounty Char to Save and Spawn Side Bounties Unlocked by Activating this Main Bounty + TArray> GetAssociatedSideBounties() + { + return SideBountiesToSpawn; + } + // Spawns the Single Checkpoint in the Open World for this Main Bounty void SpawnOpenWorldCheckpoint(); void SpawnCheckpoints() override; - // Used by Bounty Character to Spawn and Store Side Bounty Refs when Main Bounty is Updated - TArray SpawnAndReturnSideBounties(); - // Used by Players Character to Determine where to Spawn in the Open World after Completing Main Bounty FTransform GetPlayerSpawnTransform() { diff --git a/EndlessVendetta/Source/EndlessVendetta/Characters/BountyHunterCharacter.cpp b/EndlessVendetta/Source/EndlessVendetta/Characters/BountyHunterCharacter.cpp index 44257234..fc7a38ea 100644 --- a/EndlessVendetta/Source/EndlessVendetta/Characters/BountyHunterCharacter.cpp +++ b/EndlessVendetta/Source/EndlessVendetta/Characters/BountyHunterCharacter.cpp @@ -20,16 +20,27 @@ void ABountyHunterCharacter::SpawnMainBounty(UEVGameInstance* GI) CurrentMainBounty = GetWorld()->SpawnActor(MainBountyClasses[CurrentMainBountyIndex]); const FAttachmentTransformRules AttachmentTransformRules(EAttachmentRule::SnapToTarget, true); CurrentMainBounty->AttachToComponent(GetRootComponent(), AttachmentTransformRules); - MainBountyStruct = CurrentMainBounty->MainBountyStruct; if (UGameplayStatics::GetCurrentLevelName(GetWorld()) != OpenWorldLevelName) { CurrentMainBounty->SpawnCheckpoints(); return; } - CurrentMainBounty->SpawnOpenWorldCheckpoint(); - CurrentSideBounties = CurrentMainBounty->SpawnAndReturnSideBounties(); + CurrentMainBounty->SpawnOpenWorldCheckpoint(); +} +void ABountyHunterCharacter::SpawnSideBounties(UEVGameInstance* GI) +{ + for (auto SideBountyClass : GI->MainSaveGameInstanceRef->SideBountiesToSpawnSave) + { + if (!IsValid(SideBountyClass)) continue; + ASideBountyClass* SpawnedSideBounty = GetWorld()->SpawnActor(SideBountyClass); + const FAttachmentTransformRules AttachmentTransformRules(EAttachmentRule::SnapToTarget, true); + SpawnedSideBounty->AttachToComponent(GetRootComponent(), AttachmentTransformRules); + SpawnedSideBounty->SpawnCheckpoints(); + CurrentSideBounties.Add(SpawnedSideBounty); + } + SideBountyStructs.Empty(); for (auto SideBounty : CurrentSideBounties) { @@ -48,11 +59,18 @@ void ABountyHunterCharacter::CompleteCurrentMainBounty(UEVGameInstance* GI) GI->MainSaveGameInstanceRef->PlayerOpenWorldSpawnTransformSave = MainBountyClasses[CurrentMainBountyIndex]->GetDefaultObject()->GetPlayerSpawnTransform(); CurrentMainBountyIndex = GI->MainSaveGameInstanceRef->CurrentMainBountyIndexSave; GI->MainSaveGameInstanceRef->LastMainBountyIndexInOpenWorld = CurrentMainBountyIndex; + + if (!(MainBountyClasses.IsEmpty() || MainBountyClasses.Num() <= CurrentMainBountyIndex|| !IsValid(MainBountyClasses[CurrentMainBountyIndex]))) + { + GI->MainSaveGameInstanceRef->SideBountiesToSpawnSave.Append(MainBountyClasses[CurrentMainBountyIndex]->GetDefaultObject()->GetAssociatedSideBounties()); + } + UGameplayStatics::SaveGameToSlot(GI->MainSaveGameInstanceRef, "MainSave", 0); } void ABountyHunterCharacter::CompletedASideBounty(int CompletedSideBountiesUID) { + FString TitleOfSideBountyToRemove = ""; for (int i = 0; i < SideBountyStructs.Num(); i++) { if (SideBountyStructs[i].SideBountyUID != CompletedSideBountiesUID) continue; @@ -60,8 +78,21 @@ void ABountyHunterCharacter::CompletedASideBounty(int CompletedSideBountiesUID) EarnFavours(SideBountyStructs[i].FavoursEarnedForCompletion); if (IsValid(PauseMenu)) PauseMenu->UpdatePlayerStatistics(Money, Favours); + TitleOfSideBountyToRemove = SideBountyStructs[i].BountyTitle; SideBountyStructs.RemoveAt(i); UpdateBountyTabInfo(); + break; + } + + // Remove completed side bounty from save system + UEVGameInstance* GI = Cast(GetGameInstance()); + TArray> CopyOfSideBountiesToSpawnSave = GI->MainSaveGameInstanceRef->SideBountiesToSpawnSave; + for (int i = 0; i < CopyOfSideBountiesToSpawnSave.Num(); i++) + { + if (CopyOfSideBountiesToSpawnSave[i]->GetDefaultObject()->SideBountyStruct.BountyTitle != TitleOfSideBountyToRemove) continue; + GI->MainSaveGameInstanceRef->SideBountiesToSpawnSave.RemoveAt(i); + UGameplayStatics::SaveGameToSlot(GI->MainSaveGameInstanceRef, "MainSave", 0); + break; } } @@ -82,11 +113,12 @@ void ABountyHunterCharacter::BeginPlay() Money = GI->MainSaveGameInstanceRef->MoneySave; Favours = GI->MainSaveGameInstanceRef->FavourSave; SpawnMainBounty(GI); - FTransform SpawnLoc = GI->MainSaveGameInstanceRef->PlayerOpenWorldSpawnTransformSave; - if (SpawnLoc.GetLocation() != FVector(0, 0, 0) && UGameplayStatics::GetCurrentLevelName(GetWorld()) == OpenWorldLevelName) + if (UGameplayStatics::GetCurrentLevelName(GetWorld()) == OpenWorldLevelName) { - SetActorTransform(GI->MainSaveGameInstanceRef->PlayerOpenWorldSpawnTransformSave); - Cast(GetController())->SetControlRotation(GI->MainSaveGameInstanceRef->PlayerOpenWorldSpawnTransformSave.GetRotation().Rotator()); + SpawnSideBounties(GI); + FTransform SpawnTransfrom = GI->MainSaveGameInstanceRef->PlayerOpenWorldSpawnTransformSave; + SetActorTransform(SpawnTransfrom); + Cast(GetController())->SetControlRotation(SpawnTransfrom.GetRotation().Rotator()); } } CreatePauseMenuTabs(); diff --git a/EndlessVendetta/Source/EndlessVendetta/Characters/BountyHunterCharacter.h b/EndlessVendetta/Source/EndlessVendetta/Characters/BountyHunterCharacter.h index a58d1586..8329c1dc 100644 --- a/EndlessVendetta/Source/EndlessVendetta/Characters/BountyHunterCharacter.h +++ b/EndlessVendetta/Source/EndlessVendetta/Characters/BountyHunterCharacter.h @@ -59,8 +59,11 @@ public: // ------------------- METHODS --------------------------------- private: - // Spawns Current Main Bounty along with its Side Bounties, and spawns its appropriate CP's based on level + // Spawns Current Main Bounty and spawns its appropriate CP's based on level void SpawnMainBounty(UEVGameInstance* GI); + + // Spawns Side Bounties from save system + void SpawnSideBounties(UEVGameInstance* GI); // Collects Reward for Current Main Bounty and Increments the Main Bounty Index void CompleteCurrentMainBounty(UEVGameInstance* GI); @@ -256,7 +259,7 @@ private: void DeActivateAllBounties() { - CurrentMainBounty->DeActivateFirstCheckpoint(); + if (IsValid(CurrentMainBounty)) CurrentMainBounty->DeActivateFirstCheckpoint(); for (auto SideBounty : CurrentSideBounties) { SideBounty->DeActivateFirstCheckpoint(); diff --git a/EndlessVendetta/Source/EndlessVendetta/MainSaveGameClass.h b/EndlessVendetta/Source/EndlessVendetta/MainSaveGameClass.h index 507f3c19..eeba662c 100644 --- a/EndlessVendetta/Source/EndlessVendetta/MainSaveGameClass.h +++ b/EndlessVendetta/Source/EndlessVendetta/MainSaveGameClass.h @@ -3,6 +3,7 @@ #pragma once #include "CoreMinimal.h" +#include "BountySystem/SideBountyClass.h" #include "GameFramework/SaveGame.h" #include "WeaponSystem/BaseWeaponClass.h" #include "MainSaveGameClass.generated.h" @@ -36,4 +37,7 @@ public: UPROPERTY() int FavourSave; + + UPROPERTY() + TArray> SideBountiesToSpawnSave; }; From d46bc7e45f0b4148a827a95b5619f27ca7f9a260 Mon Sep 17 00:00:00 2001 From: Rafal Swierczek Date: Fri, 23 Feb 2024 05:11:17 +0000 Subject: [PATCH 23/25] Reworked and Reimplemented Checkpoint Tips --- .../.idea/.idea.EndlessVendetta/.idea/workspace.xml | 13 +++++++++---- .../BountySystem/CheckpointTips/TipDisplay.png | 3 +++ .../BountySystem/CheckpointTips/TipDisplay.uasset | 3 +++ .../BountySystem/CheckpointTips/TipDisplay2.png | 3 +++ .../BountySystem/CheckpointTips/TipDisplay2.uasset | 3 +++ .../CheckpointTips/WBP_CheckpointTip.uasset | 3 +++ .../Blueprints/BP_FirstPersonCharacter.uasset | 4 ++-- EndlessVendetta/Content/Levels/MainMenuLevel.umap | 2 +- .../Architecture/Floor_400x400.uasset | 4 ++-- .../Blueprints/Blueprint_CeilingLight.uasset | 4 ++-- .../EndlessVendetta/BountySystem/BountyClass.cpp | 1 + .../EndlessVendetta/BountySystem/BountyClass.h | 3 +++ .../EndlessVendetta/BountySystem/CheckpointClass.h | 11 ++++++----- .../EndlessVendetta/BountySystem/MainBountyClass.h | 6 ++++++ .../Characters/BountyHunterCharacter.cpp | 10 ++++++++-- .../Characters/BountyHunterCharacter.h | 4 ++++ 16 files changed, 59 insertions(+), 18 deletions(-) create mode 100644 EndlessVendetta/Content/BountySystem/CheckpointTips/TipDisplay.png create mode 100644 EndlessVendetta/Content/BountySystem/CheckpointTips/TipDisplay.uasset create mode 100644 EndlessVendetta/Content/BountySystem/CheckpointTips/TipDisplay2.png create mode 100644 EndlessVendetta/Content/BountySystem/CheckpointTips/TipDisplay2.uasset create mode 100644 EndlessVendetta/Content/BountySystem/CheckpointTips/WBP_CheckpointTip.uasset diff --git a/EndlessVendetta/.idea/.idea.EndlessVendetta/.idea/workspace.xml b/EndlessVendetta/.idea/.idea.EndlessVendetta/.idea/workspace.xml index 106f5ef3..f34626d0 100644 --- a/EndlessVendetta/.idea/.idea.EndlessVendetta/.idea/workspace.xml +++ b/EndlessVendetta/.idea/.idea.EndlessVendetta/.idea/workspace.xml @@ -9,12 +9,16 @@ - - + + + + + + + - diff --git a/EndlessVendetta/Content/BountySystem/CheckpointTips/TipDisplay.png b/EndlessVendetta/Content/BountySystem/CheckpointTips/TipDisplay.png new file mode 100644 index 00000000..4566c52c --- /dev/null +++ b/EndlessVendetta/Content/BountySystem/CheckpointTips/TipDisplay.png @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:07f654e9dadc7d84b853ddbb1d02b449733e292aef7ab06c1d9464edd16c4777 +size 155694 diff --git a/EndlessVendetta/Content/BountySystem/CheckpointTips/TipDisplay.uasset b/EndlessVendetta/Content/BountySystem/CheckpointTips/TipDisplay.uasset new file mode 100644 index 00000000..156f653e --- /dev/null +++ b/EndlessVendetta/Content/BountySystem/CheckpointTips/TipDisplay.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:df5972b4e2ba2c91707cf0680d471eb4b706c0714054f1f796fa6c177794daae +size 104438 diff --git a/EndlessVendetta/Content/BountySystem/CheckpointTips/TipDisplay2.png b/EndlessVendetta/Content/BountySystem/CheckpointTips/TipDisplay2.png new file mode 100644 index 00000000..29317118 --- /dev/null +++ b/EndlessVendetta/Content/BountySystem/CheckpointTips/TipDisplay2.png @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:dd4713c9e8580e2bec40b43596878bdd0ebbd63bcf07ff0ab0700d0dc460f16e +size 224309 diff --git a/EndlessVendetta/Content/BountySystem/CheckpointTips/TipDisplay2.uasset b/EndlessVendetta/Content/BountySystem/CheckpointTips/TipDisplay2.uasset new file mode 100644 index 00000000..a749afad --- /dev/null +++ b/EndlessVendetta/Content/BountySystem/CheckpointTips/TipDisplay2.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:7528286ed5f4e17abfd0ce87f135d4d28f9bf8ee1c0e24fcb9e16302502b39cf +size 157733 diff --git a/EndlessVendetta/Content/BountySystem/CheckpointTips/WBP_CheckpointTip.uasset b/EndlessVendetta/Content/BountySystem/CheckpointTips/WBP_CheckpointTip.uasset new file mode 100644 index 00000000..f9c9caf2 --- /dev/null +++ b/EndlessVendetta/Content/BountySystem/CheckpointTips/WBP_CheckpointTip.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:589ad499ba939572354532cd8b28455b66311ce122f4b1ffa5429204533b6d19 +size 101358 diff --git a/EndlessVendetta/Content/FirstPerson/Blueprints/BP_FirstPersonCharacter.uasset b/EndlessVendetta/Content/FirstPerson/Blueprints/BP_FirstPersonCharacter.uasset index 87ad6007..722ba7d9 100644 --- a/EndlessVendetta/Content/FirstPerson/Blueprints/BP_FirstPersonCharacter.uasset +++ b/EndlessVendetta/Content/FirstPerson/Blueprints/BP_FirstPersonCharacter.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:6e2442a58e7951896cedb4ae2893b6a7fbb5744b2065839f55e19e6b5068d64a -size 466129 +oid sha256:2e738a26375c1724f07f3c945925628d9338c28057abedad8ec11cadc6198dae +size 475901 diff --git a/EndlessVendetta/Content/Levels/MainMenuLevel.umap b/EndlessVendetta/Content/Levels/MainMenuLevel.umap index 04cdefe0..f406c7a6 100644 --- a/EndlessVendetta/Content/Levels/MainMenuLevel.umap +++ b/EndlessVendetta/Content/Levels/MainMenuLevel.umap @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:fa952eb25972ab6e6dca1d46cf254f62d1684ba665ee45a7c3d6a8e3527ffac1 +oid sha256:ce714c1367e0d2d8ef9fce14d5f34b7544d6b549f014dc1059dd51a3375ee080 size 308710 diff --git a/EndlessVendetta/Content/StarterContent/Architecture/Floor_400x400.uasset b/EndlessVendetta/Content/StarterContent/Architecture/Floor_400x400.uasset index 64bcf76d..c2a34afc 100644 --- a/EndlessVendetta/Content/StarterContent/Architecture/Floor_400x400.uasset +++ b/EndlessVendetta/Content/StarterContent/Architecture/Floor_400x400.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:769c1886c9631ccadb663c8fad5e3454f361f5bd99f6a49cf1646f88e0f267a9 -size 14831 +oid sha256:4c0ecf0ac0702cc2bd355ec050232a61c49e10f102448efbeb735a51824adef6 +size 14948 diff --git a/EndlessVendetta/Content/StarterContent/Blueprints/Blueprint_CeilingLight.uasset b/EndlessVendetta/Content/StarterContent/Blueprints/Blueprint_CeilingLight.uasset index c5c3b84e..8539fe9d 100644 --- a/EndlessVendetta/Content/StarterContent/Blueprints/Blueprint_CeilingLight.uasset +++ b/EndlessVendetta/Content/StarterContent/Blueprints/Blueprint_CeilingLight.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:4a60a29ad596546d481e43dfb8698842a78cc07f4a4b1000fa397cfba4e72331 -size 158206 +oid sha256:7f70d740d293e87406d7c302da36f402b94ab1e47c9d8ea4e00333d62df59a1f +size 43745 diff --git a/EndlessVendetta/Source/EndlessVendetta/BountySystem/BountyClass.cpp b/EndlessVendetta/Source/EndlessVendetta/BountySystem/BountyClass.cpp index b6678d31..c431d94a 100644 --- a/EndlessVendetta/Source/EndlessVendetta/BountySystem/BountyClass.cpp +++ b/EndlessVendetta/Source/EndlessVendetta/BountySystem/BountyClass.cpp @@ -17,6 +17,7 @@ void ABountyClass::ActivateFirstCheckpoint() BountyCheckpoints[0]->Active = true; BountyCheckpoints[0]->CompletedCheckpoint.AddDynamic(this, &ABountyClass::IncrementBountyCheckpoint); + CheckpointActivated.Broadcast(BountyCheckpoints[0]->GetCheckpointTip()); } void ABountyClass::DeActivateFirstCheckpoint() diff --git a/EndlessVendetta/Source/EndlessVendetta/BountySystem/BountyClass.h b/EndlessVendetta/Source/EndlessVendetta/BountySystem/BountyClass.h index 84dfe612..3720876c 100644 --- a/EndlessVendetta/Source/EndlessVendetta/BountySystem/BountyClass.h +++ b/EndlessVendetta/Source/EndlessVendetta/BountySystem/BountyClass.h @@ -9,6 +9,7 @@ DECLARE_DYNAMIC_MULTICAST_DELEGATE(FCompletedFirstCheckpoint); DECLARE_DYNAMIC_MULTICAST_DELEGATE(FCompletedACheckpoint); +DECLARE_DYNAMIC_MULTICAST_DELEGATE_OneParam(FCheckpointActivated, const FString&, CheckpointTip); UCLASS() class ENDLESSVENDETTA_API ABountyClass : public AActor @@ -32,6 +33,8 @@ protected: public: FCompletedACheckpoint CompletedACheckpoint; + FCheckpointActivated CheckpointActivated; + // Gets the Reward Money for Completing this Bounty, used by Players Character int GetRewardMoney() { diff --git a/EndlessVendetta/Source/EndlessVendetta/BountySystem/CheckpointClass.h b/EndlessVendetta/Source/EndlessVendetta/BountySystem/CheckpointClass.h index 2f541e61..348f042d 100644 --- a/EndlessVendetta/Source/EndlessVendetta/BountySystem/CheckpointClass.h +++ b/EndlessVendetta/Source/EndlessVendetta/BountySystem/CheckpointClass.h @@ -76,7 +76,11 @@ public: if (WaypointActor) WaypointActor->Destroy(); } - + // Used by Bounty Class to broadcast checkpoint tip for current checkpoint + FString GetCheckpointTip() + { + return CheckpointTip; + } @@ -90,10 +94,7 @@ public: // ------ Getters for CP Properties ------ - FString GetCheckpointTip() - { - return CheckpointTip; - } + FVector GetWaypointLoc() { diff --git a/EndlessVendetta/Source/EndlessVendetta/BountySystem/MainBountyClass.h b/EndlessVendetta/Source/EndlessVendetta/BountySystem/MainBountyClass.h index 9908df07..8e1c99af 100644 --- a/EndlessVendetta/Source/EndlessVendetta/BountySystem/MainBountyClass.h +++ b/EndlessVendetta/Source/EndlessVendetta/BountySystem/MainBountyClass.h @@ -94,6 +94,12 @@ public: // Overrides to Desapwn Waypoint from OpenWorld Checkpoint void DeActivateFirstCheckpoint() override; + // Returns open world checkpoints tip + FString GetOpenWorldCheckpointTip() + { + return OpenWorldcheckpoint->GetCheckpointTip(); + } + // ------------------- LEGACY CODE TO BE REWORKED --------------------------------- diff --git a/EndlessVendetta/Source/EndlessVendetta/Characters/BountyHunterCharacter.cpp b/EndlessVendetta/Source/EndlessVendetta/Characters/BountyHunterCharacter.cpp index fc7a38ea..de3835f4 100644 --- a/EndlessVendetta/Source/EndlessVendetta/Characters/BountyHunterCharacter.cpp +++ b/EndlessVendetta/Source/EndlessVendetta/Characters/BountyHunterCharacter.cpp @@ -20,13 +20,15 @@ void ABountyHunterCharacter::SpawnMainBounty(UEVGameInstance* GI) CurrentMainBounty = GetWorld()->SpawnActor(MainBountyClasses[CurrentMainBountyIndex]); const FAttachmentTransformRules AttachmentTransformRules(EAttachmentRule::SnapToTarget, true); CurrentMainBounty->AttachToComponent(GetRootComponent(), AttachmentTransformRules); + CurrentMainBounty->CheckpointActivated.AddDynamic(this, &ABountyHunterCharacter::DisplayCheckpointTip); MainBountyStruct = CurrentMainBounty->MainBountyStruct; if (UGameplayStatics::GetCurrentLevelName(GetWorld()) != OpenWorldLevelName) { CurrentMainBounty->SpawnCheckpoints(); return; } - CurrentMainBounty->SpawnOpenWorldCheckpoint(); + CurrentMainBounty->SpawnOpenWorldCheckpoint(); + TrackMainBounty(); } void ABountyHunterCharacter::SpawnSideBounties(UEVGameInstance* GI) @@ -39,6 +41,7 @@ void ABountyHunterCharacter::SpawnSideBounties(UEVGameInstance* GI) SpawnedSideBounty->AttachToComponent(GetRootComponent(), AttachmentTransformRules); SpawnedSideBounty->SpawnCheckpoints(); CurrentSideBounties.Add(SpawnedSideBounty); + SpawnedSideBounty->CheckpointActivated.AddDynamic(this, &ABountyHunterCharacter::DisplayCheckpointTip); } SideBountyStructs.Empty(); @@ -47,6 +50,8 @@ void ABountyHunterCharacter::SpawnSideBounties(UEVGameInstance* GI) SideBountyStructs.Add(SideBounty->SideBountyStruct); SideBounty->CompletedSideBounty.AddDynamic(this, &ABountyHunterCharacter::CompletedASideBounty); } + + if (!IsValid(CurrentMainBounty)) DisplayCheckpointTip("SELECT A NEW BOUNTY IN PAUSE MENU"); } void ABountyHunterCharacter::CompleteCurrentMainBounty(UEVGameInstance* GI) @@ -81,6 +86,7 @@ void ABountyHunterCharacter::CompletedASideBounty(int CompletedSideBountiesUID) TitleOfSideBountyToRemove = SideBountyStructs[i].BountyTitle; SideBountyStructs.RemoveAt(i); UpdateBountyTabInfo(); + DisplayCheckpointTip("SELECT A NEW BOUNTY IN PAUSE MENU"); break; } @@ -107,6 +113,7 @@ void ABountyHunterCharacter::SavePlayerMoneyAndFavours() void ABountyHunterCharacter::BeginPlay() { + Super::BeginPlay(); UEVGameInstance* GI = Cast(GetGameInstance()); if (IsValid(GI->MainSaveGameInstanceRef)) { @@ -122,7 +129,6 @@ void ABountyHunterCharacter::BeginPlay() } } CreatePauseMenuTabs(); - Super::BeginPlay(); } void ABountyHunterCharacter::SetupPlayerInputComponent(UInputComponent* PlayerInputComponent) diff --git a/EndlessVendetta/Source/EndlessVendetta/Characters/BountyHunterCharacter.h b/EndlessVendetta/Source/EndlessVendetta/Characters/BountyHunterCharacter.h index 8329c1dc..f0636f5d 100644 --- a/EndlessVendetta/Source/EndlessVendetta/Characters/BountyHunterCharacter.h +++ b/EndlessVendetta/Source/EndlessVendetta/Characters/BountyHunterCharacter.h @@ -84,6 +84,9 @@ protected: // Called When Player Spawns virtual void BeginPlay() override; + UFUNCTION(BlueprintImplementableEvent) + void DisplayCheckpointTip(const FString& NewCheckpointTip); + // Overridden to Setup up Pause Menu Inputs virtual void SetupPlayerInputComponent(UInputComponent* PlayerInputComponent) override; @@ -271,6 +274,7 @@ private: { DeActivateAllBounties(); CurrentMainBounty->ActivateFirstCheckpoint(); + DisplayCheckpointTip(CurrentMainBounty->GetOpenWorldCheckpointTip()); } UFUNCTION() From ae3f2f449545b3f2e3be07bd95437284e74321e9 Mon Sep 17 00:00:00 2001 From: Rafal Swierczek Date: Fri, 23 Feb 2024 05:27:10 +0000 Subject: [PATCH 24/25] Added Pause Menu Side Bounty Tab for No Remaining Side Bounties --- .../SideBounties/PestControl/CP_GoToPestControl.uasset | 4 ++-- .../SecuritySpecialists/CP_GoToSecurityOffice.uasset | 4 ++-- EndlessVendetta/Content/Levels/MainMenuLevel.umap | 2 +- .../BountyTabs/SideBounties/WBP_NoMoreSideBounties.uasset | 3 +++ .../Content/PauseMenu/Tabs/BountyTabs/WBP_BountiesTab.uasset | 4 ++-- .../PauseMenu/Tabs/BountyTabs/WBP_GameOverBountiesTab.uasset | 4 ++-- 6 files changed, 12 insertions(+), 9 deletions(-) create mode 100644 EndlessVendetta/Content/PauseMenu/Tabs/BountyTabs/SideBounties/WBP_NoMoreSideBounties.uasset diff --git a/EndlessVendetta/Content/BountySystem/ApartmentBounty/SideBounties/PestControl/CP_GoToPestControl.uasset b/EndlessVendetta/Content/BountySystem/ApartmentBounty/SideBounties/PestControl/CP_GoToPestControl.uasset index 9c6b7915..8eb26d41 100644 --- a/EndlessVendetta/Content/BountySystem/ApartmentBounty/SideBounties/PestControl/CP_GoToPestControl.uasset +++ b/EndlessVendetta/Content/BountySystem/ApartmentBounty/SideBounties/PestControl/CP_GoToPestControl.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:959122f74f46879a6a4bfcc566d1e0e5922cc9f8b41434c01adcd0eff4816799 -size 80041 +oid sha256:4c61c7be3b5bfb8787d07a8369868d47a4ef23cdcc039c7a7f00a2855b760d07 +size 82282 diff --git a/EndlessVendetta/Content/BountySystem/ApartmentBounty/SideBounties/SecuritySpecialists/CP_GoToSecurityOffice.uasset b/EndlessVendetta/Content/BountySystem/ApartmentBounty/SideBounties/SecuritySpecialists/CP_GoToSecurityOffice.uasset index eda21263..35796c93 100644 --- a/EndlessVendetta/Content/BountySystem/ApartmentBounty/SideBounties/SecuritySpecialists/CP_GoToSecurityOffice.uasset +++ b/EndlessVendetta/Content/BountySystem/ApartmentBounty/SideBounties/SecuritySpecialists/CP_GoToSecurityOffice.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:cece20a7f675064323765472291b23955250f70ff92441a6fc5ffdbb9ff0a51f -size 80119 +oid sha256:0c42e48d402afcc78131a966682c5d5d13a7cfc53542332e5ccb52703274ff5f +size 82990 diff --git a/EndlessVendetta/Content/Levels/MainMenuLevel.umap b/EndlessVendetta/Content/Levels/MainMenuLevel.umap index f406c7a6..f932b95a 100644 --- a/EndlessVendetta/Content/Levels/MainMenuLevel.umap +++ b/EndlessVendetta/Content/Levels/MainMenuLevel.umap @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:ce714c1367e0d2d8ef9fce14d5f34b7544d6b549f014dc1059dd51a3375ee080 +oid sha256:1de1b51cfc1520295dfe0b22aed4ce5c2f5a7e8a60a993fc0dd1f24855610243 size 308710 diff --git a/EndlessVendetta/Content/PauseMenu/Tabs/BountyTabs/SideBounties/WBP_NoMoreSideBounties.uasset b/EndlessVendetta/Content/PauseMenu/Tabs/BountyTabs/SideBounties/WBP_NoMoreSideBounties.uasset new file mode 100644 index 00000000..2eca654a --- /dev/null +++ b/EndlessVendetta/Content/PauseMenu/Tabs/BountyTabs/SideBounties/WBP_NoMoreSideBounties.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:c184ceef71e66d97f9b7f158d529f63e065b78577753fb6d02f4a9e836e5edf3 +size 14380 diff --git a/EndlessVendetta/Content/PauseMenu/Tabs/BountyTabs/WBP_BountiesTab.uasset b/EndlessVendetta/Content/PauseMenu/Tabs/BountyTabs/WBP_BountiesTab.uasset index f8b985f6..f2b06ea4 100644 --- a/EndlessVendetta/Content/PauseMenu/Tabs/BountyTabs/WBP_BountiesTab.uasset +++ b/EndlessVendetta/Content/PauseMenu/Tabs/BountyTabs/WBP_BountiesTab.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:94e3c498fcbc9f637d1601f0db6d73a10187278939d87f1726bde8639f39f51d -size 262166 +oid sha256:56bfd633afbf9f6933e40e63a29239ed83300ccb747ebb098902f941ecdecce2 +size 284708 diff --git a/EndlessVendetta/Content/PauseMenu/Tabs/BountyTabs/WBP_GameOverBountiesTab.uasset b/EndlessVendetta/Content/PauseMenu/Tabs/BountyTabs/WBP_GameOverBountiesTab.uasset index ae417c6c..fc68e3cd 100644 --- a/EndlessVendetta/Content/PauseMenu/Tabs/BountyTabs/WBP_GameOverBountiesTab.uasset +++ b/EndlessVendetta/Content/PauseMenu/Tabs/BountyTabs/WBP_GameOverBountiesTab.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:ad4f17e3d6213bec771bc4dabb5a29ec90224cb11271d025c17727de47ff249e -size 141428 +oid sha256:b044c23e2037722bbb3a6cfafcf387505ffe9569c549b9a441589898165f00a1 +size 162497 From d1b1826f129b81710c21cb377bccdef34857a220 Mon Sep 17 00:00:00 2001 From: Rafal Swierczek Date: Fri, 23 Feb 2024 05:50:59 +0000 Subject: [PATCH 25/25] Updated all Current Checkpoint Tips --- .../ApartmentBounty/Checkpoints/CP_ElimTImothyHuntsmer.uasset | 4 ++-- .../ApartmentBounty/Checkpoints/OWCP_Apartment.uasset | 4 ++-- .../SideBounties/MoneyProblems/CP_GoToFinanceCentre.uasset | 4 ++-- .../SideBounties/PestControl/CP_GoToPestControl.uasset | 4 ++-- .../SecuritySpecialists/CP_GoToSecurityOffice.uasset | 4 ++-- .../ControlsTutorial/Bounty/Checkpoints/CP_ARTargets.uasset | 4 ++-- .../Bounty/Checkpoints/CP_CrouchTutorial.uasset | 4 ++-- .../Bounty/Checkpoints/CP_GoToParkourRoom.uasset | 4 ++-- .../ControlsTutorial/Bounty/Checkpoints/CP_JumpAcross.uasset | 4 ++-- .../ControlsTutorial/Bounty/Checkpoints/CP_PickAGun.uasset | 4 ++-- .../ControlsTutorial/Bounty/Checkpoints/CP_PickUpAR.uasset | 4 ++-- .../Bounty/Checkpoints/CP_PickUpPistol.uasset | 4 ++-- .../Bounty/Checkpoints/CP_PickUpShotgun.uasset | 4 ++-- .../Bounty/Checkpoints/CP_PickUpSniper.uasset | 4 ++-- .../Bounty/Checkpoints/CP_PickupShipKeys.uasset | 4 ++-- .../Bounty/Checkpoints/CP_PistolTargets.uasset | 4 ++-- .../Bounty/Checkpoints/CP_ShotgunTargets.uasset | 4 ++-- .../ControlsTutorial/Bounty/Checkpoints/CP_SignPapers.uasset | 4 ++-- .../Bounty/Checkpoints/CP_SniperTargets.uasset | 4 ++-- .../Bounty/Checkpoints/CP_SprintAcross.uasset | 4 ++-- .../ControlsTutorial/Bounty/Checkpoints/CP_VaultOver.uasset | 4 ++-- EndlessVendetta/Content/Levels/MainMenuLevel.umap | 2 +- 22 files changed, 43 insertions(+), 43 deletions(-) diff --git a/EndlessVendetta/Content/BountySystem/ApartmentBounty/Checkpoints/CP_ElimTImothyHuntsmer.uasset b/EndlessVendetta/Content/BountySystem/ApartmentBounty/Checkpoints/CP_ElimTImothyHuntsmer.uasset index 9b9fedd0..39e60bb8 100644 --- a/EndlessVendetta/Content/BountySystem/ApartmentBounty/Checkpoints/CP_ElimTImothyHuntsmer.uasset +++ b/EndlessVendetta/Content/BountySystem/ApartmentBounty/Checkpoints/CP_ElimTImothyHuntsmer.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:ddb60583fbb6b0b0d7585064d3fd73f390fcc6725128befe5c008911e3be47a2 -size 94548 +oid sha256:c2cc3c7dde1ca8dab3d29103703e9b36cef900da2ac12d5fb20364c42eac0cf0 +size 96341 diff --git a/EndlessVendetta/Content/BountySystem/ApartmentBounty/Checkpoints/OWCP_Apartment.uasset b/EndlessVendetta/Content/BountySystem/ApartmentBounty/Checkpoints/OWCP_Apartment.uasset index 6830b6dc..21668b29 100644 --- a/EndlessVendetta/Content/BountySystem/ApartmentBounty/Checkpoints/OWCP_Apartment.uasset +++ b/EndlessVendetta/Content/BountySystem/ApartmentBounty/Checkpoints/OWCP_Apartment.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:9c30dc7dfc2549038de26a3f6f656ad7cddc8a7dec98c67b35153f508b5ae1fd -size 23545 +oid sha256:64a9142bb27971434854e3a5eb15e6087ff1115bcc5fb8b64e5396ae6fa917f5 +size 24217 diff --git a/EndlessVendetta/Content/BountySystem/ApartmentBounty/SideBounties/MoneyProblems/CP_GoToFinanceCentre.uasset b/EndlessVendetta/Content/BountySystem/ApartmentBounty/SideBounties/MoneyProblems/CP_GoToFinanceCentre.uasset index 441f3685..53bb8c30 100644 --- a/EndlessVendetta/Content/BountySystem/ApartmentBounty/SideBounties/MoneyProblems/CP_GoToFinanceCentre.uasset +++ b/EndlessVendetta/Content/BountySystem/ApartmentBounty/SideBounties/MoneyProblems/CP_GoToFinanceCentre.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:6cdc863b9bd4477a188dfba127b747fad85d5a2be2adba1663696d88db0ca63c -size 82240 +oid sha256:0a36dd16ac656b4f87bb2136bef99ce6191dc2b0741d7d9f87fab1a82f81512a +size 82075 diff --git a/EndlessVendetta/Content/BountySystem/ApartmentBounty/SideBounties/PestControl/CP_GoToPestControl.uasset b/EndlessVendetta/Content/BountySystem/ApartmentBounty/SideBounties/PestControl/CP_GoToPestControl.uasset index 8eb26d41..0720a650 100644 --- a/EndlessVendetta/Content/BountySystem/ApartmentBounty/SideBounties/PestControl/CP_GoToPestControl.uasset +++ b/EndlessVendetta/Content/BountySystem/ApartmentBounty/SideBounties/PestControl/CP_GoToPestControl.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:4c61c7be3b5bfb8787d07a8369868d47a4ef23cdcc039c7a7f00a2855b760d07 -size 82282 +oid sha256:c40b50987952e3649d15b797c6fdf44122f790f27fe43cd7ae8b414fe04d6efd +size 82281 diff --git a/EndlessVendetta/Content/BountySystem/ApartmentBounty/SideBounties/SecuritySpecialists/CP_GoToSecurityOffice.uasset b/EndlessVendetta/Content/BountySystem/ApartmentBounty/SideBounties/SecuritySpecialists/CP_GoToSecurityOffice.uasset index 35796c93..ef6944a3 100644 --- a/EndlessVendetta/Content/BountySystem/ApartmentBounty/SideBounties/SecuritySpecialists/CP_GoToSecurityOffice.uasset +++ b/EndlessVendetta/Content/BountySystem/ApartmentBounty/SideBounties/SecuritySpecialists/CP_GoToSecurityOffice.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:0c42e48d402afcc78131a966682c5d5d13a7cfc53542332e5ccb52703274ff5f -size 82990 +oid sha256:f049d72541eef233d1523a0dc9d1b75182ac06a292b61c474e936052679d178a +size 82994 diff --git a/EndlessVendetta/Content/BountySystem/ControlsTutorial/Bounty/Checkpoints/CP_ARTargets.uasset b/EndlessVendetta/Content/BountySystem/ControlsTutorial/Bounty/Checkpoints/CP_ARTargets.uasset index 73219745..f3977aa2 100644 --- a/EndlessVendetta/Content/BountySystem/ControlsTutorial/Bounty/Checkpoints/CP_ARTargets.uasset +++ b/EndlessVendetta/Content/BountySystem/ControlsTutorial/Bounty/Checkpoints/CP_ARTargets.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:35ce8d47c1b3a6d50d74ed20e203533e57b052db626e659558cf9e291a874d1e -size 136794 +oid sha256:0b4abf990fa3a2a760dd48e50e8b5c9ef3b1d8d132b7b455eb3ff8b3d3419648 +size 137660 diff --git a/EndlessVendetta/Content/BountySystem/ControlsTutorial/Bounty/Checkpoints/CP_CrouchTutorial.uasset b/EndlessVendetta/Content/BountySystem/ControlsTutorial/Bounty/Checkpoints/CP_CrouchTutorial.uasset index 8e7e2c04..ef12c2ac 100644 --- a/EndlessVendetta/Content/BountySystem/ControlsTutorial/Bounty/Checkpoints/CP_CrouchTutorial.uasset +++ b/EndlessVendetta/Content/BountySystem/ControlsTutorial/Bounty/Checkpoints/CP_CrouchTutorial.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:e8367a68ee75a44a61cb4da286db85fc492df9163087b934657c0cd68c9db89e -size 32199 +oid sha256:61e0a1b2a1ea01738080b8159b40e26090e51af2628c3b9449cbcfa39e3b11ec +size 32178 diff --git a/EndlessVendetta/Content/BountySystem/ControlsTutorial/Bounty/Checkpoints/CP_GoToParkourRoom.uasset b/EndlessVendetta/Content/BountySystem/ControlsTutorial/Bounty/Checkpoints/CP_GoToParkourRoom.uasset index fa225549..3a1c57a2 100644 --- a/EndlessVendetta/Content/BountySystem/ControlsTutorial/Bounty/Checkpoints/CP_GoToParkourRoom.uasset +++ b/EndlessVendetta/Content/BountySystem/ControlsTutorial/Bounty/Checkpoints/CP_GoToParkourRoom.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:b6202e5fe5908e6a7d8e083b04ea5090f736d707af43958f02c5079dcc098f47 -size 78279 +oid sha256:4bd18172812ea01d592e23488940888ec98233118a661388a8de2e0daac5d0e6 +size 78327 diff --git a/EndlessVendetta/Content/BountySystem/ControlsTutorial/Bounty/Checkpoints/CP_JumpAcross.uasset b/EndlessVendetta/Content/BountySystem/ControlsTutorial/Bounty/Checkpoints/CP_JumpAcross.uasset index 6ee7b253..f62cb3fc 100644 --- a/EndlessVendetta/Content/BountySystem/ControlsTutorial/Bounty/Checkpoints/CP_JumpAcross.uasset +++ b/EndlessVendetta/Content/BountySystem/ControlsTutorial/Bounty/Checkpoints/CP_JumpAcross.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:f6e133335dcedeb4c3927d58dbfce4a168d2bf40026996a736ba586f1f398241 -size 32105 +oid sha256:cc604221635ced2af4043bb9357a75712f7b737bc247dfc9ee117215a6772eec +size 32056 diff --git a/EndlessVendetta/Content/BountySystem/ControlsTutorial/Bounty/Checkpoints/CP_PickAGun.uasset b/EndlessVendetta/Content/BountySystem/ControlsTutorial/Bounty/Checkpoints/CP_PickAGun.uasset index 4e439d1b..54373c15 100644 --- a/EndlessVendetta/Content/BountySystem/ControlsTutorial/Bounty/Checkpoints/CP_PickAGun.uasset +++ b/EndlessVendetta/Content/BountySystem/ControlsTutorial/Bounty/Checkpoints/CP_PickAGun.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:96925990e32a5a9832d66041d81a93216749eacc7b9dfd90eb518712866a6e0b -size 98477 +oid sha256:ebb02126d3571f6a09a8fd791d19834cbc6e5a61b22cbf12773d1d4f717d03c1 +size 98709 diff --git a/EndlessVendetta/Content/BountySystem/ControlsTutorial/Bounty/Checkpoints/CP_PickUpAR.uasset b/EndlessVendetta/Content/BountySystem/ControlsTutorial/Bounty/Checkpoints/CP_PickUpAR.uasset index 15940b00..9c4b857f 100644 --- a/EndlessVendetta/Content/BountySystem/ControlsTutorial/Bounty/Checkpoints/CP_PickUpAR.uasset +++ b/EndlessVendetta/Content/BountySystem/ControlsTutorial/Bounty/Checkpoints/CP_PickUpAR.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:dfc203364a99faec388f5fecb2c64c008d780733dae44ecf9ce280f42e6e2c86 -size 108041 +oid sha256:d1aa374b3e03604bd068b28f260ce9cbe5ba2185ac6a980493b3734cee3c425d +size 107943 diff --git a/EndlessVendetta/Content/BountySystem/ControlsTutorial/Bounty/Checkpoints/CP_PickUpPistol.uasset b/EndlessVendetta/Content/BountySystem/ControlsTutorial/Bounty/Checkpoints/CP_PickUpPistol.uasset index b94909a2..9007c579 100644 --- a/EndlessVendetta/Content/BountySystem/ControlsTutorial/Bounty/Checkpoints/CP_PickUpPistol.uasset +++ b/EndlessVendetta/Content/BountySystem/ControlsTutorial/Bounty/Checkpoints/CP_PickUpPistol.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:8ca2fa181da7634d2aa6d280b956731f4cae873b326a803b5534d8100792b7d4 -size 108079 +oid sha256:5a518c3f616a1fb46a8a8c636b5319b10b036bbc73b03df672225d43bfe5f511 +size 107994 diff --git a/EndlessVendetta/Content/BountySystem/ControlsTutorial/Bounty/Checkpoints/CP_PickUpShotgun.uasset b/EndlessVendetta/Content/BountySystem/ControlsTutorial/Bounty/Checkpoints/CP_PickUpShotgun.uasset index be18e517..ebd495e0 100644 --- a/EndlessVendetta/Content/BountySystem/ControlsTutorial/Bounty/Checkpoints/CP_PickUpShotgun.uasset +++ b/EndlessVendetta/Content/BountySystem/ControlsTutorial/Bounty/Checkpoints/CP_PickUpShotgun.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:fe5f8569f4b785df5a46095e152266131a0765b477d91b56688094084d437b6a -size 107738 +oid sha256:f32dfaa26477f34560aeb3f76edac3823335aaac3dfbdf1b861f26993122270a +size 109282 diff --git a/EndlessVendetta/Content/BountySystem/ControlsTutorial/Bounty/Checkpoints/CP_PickUpSniper.uasset b/EndlessVendetta/Content/BountySystem/ControlsTutorial/Bounty/Checkpoints/CP_PickUpSniper.uasset index ac6521ca..9d363394 100644 --- a/EndlessVendetta/Content/BountySystem/ControlsTutorial/Bounty/Checkpoints/CP_PickUpSniper.uasset +++ b/EndlessVendetta/Content/BountySystem/ControlsTutorial/Bounty/Checkpoints/CP_PickUpSniper.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:d2ce4fd5a71cafe639e466139119662e440b1b39541420a7606a36ca02eec02a -size 107729 +oid sha256:d73de69bfcb4d77a0a448979e6a333ae40ac8acb1b7d0187a367c9510c6fb5c9 +size 107956 diff --git a/EndlessVendetta/Content/BountySystem/ControlsTutorial/Bounty/Checkpoints/CP_PickupShipKeys.uasset b/EndlessVendetta/Content/BountySystem/ControlsTutorial/Bounty/Checkpoints/CP_PickupShipKeys.uasset index cba09fb6..a3049937 100644 --- a/EndlessVendetta/Content/BountySystem/ControlsTutorial/Bounty/Checkpoints/CP_PickupShipKeys.uasset +++ b/EndlessVendetta/Content/BountySystem/ControlsTutorial/Bounty/Checkpoints/CP_PickupShipKeys.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:065116d15515cb03fa71cbeb951631b86e5807673b48fd6f642ae1c95db9f2f1 -size 35416 +oid sha256:7b3c2392f8c079b33516e1a4209ad3cccf2373b2c168390444cfb8cf465b5eb3 +size 35489 diff --git a/EndlessVendetta/Content/BountySystem/ControlsTutorial/Bounty/Checkpoints/CP_PistolTargets.uasset b/EndlessVendetta/Content/BountySystem/ControlsTutorial/Bounty/Checkpoints/CP_PistolTargets.uasset index 17e9540b..ec19ade6 100644 --- a/EndlessVendetta/Content/BountySystem/ControlsTutorial/Bounty/Checkpoints/CP_PistolTargets.uasset +++ b/EndlessVendetta/Content/BountySystem/ControlsTutorial/Bounty/Checkpoints/CP_PistolTargets.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:3ab3baaa40c6ee6d442db37d7ab4a2739c1afe5debaaacaa5a98bd12f3fcb68a -size 136880 +oid sha256:bba0521315e1a8e9116865814bf60fc41ff659c4119b852ee6666593c71b96e6 +size 137392 diff --git a/EndlessVendetta/Content/BountySystem/ControlsTutorial/Bounty/Checkpoints/CP_ShotgunTargets.uasset b/EndlessVendetta/Content/BountySystem/ControlsTutorial/Bounty/Checkpoints/CP_ShotgunTargets.uasset index 3d550692..4658dc17 100644 --- a/EndlessVendetta/Content/BountySystem/ControlsTutorial/Bounty/Checkpoints/CP_ShotgunTargets.uasset +++ b/EndlessVendetta/Content/BountySystem/ControlsTutorial/Bounty/Checkpoints/CP_ShotgunTargets.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:0f2592da2540fd39788ec8a08ece0a368b0c3fad76a2c2b2dc770dc272bfea06 -size 136924 +oid sha256:6855ef58250df1580c1ad174f9df62c2840b25ebba72ed6861938b90a851bd9f +size 137723 diff --git a/EndlessVendetta/Content/BountySystem/ControlsTutorial/Bounty/Checkpoints/CP_SignPapers.uasset b/EndlessVendetta/Content/BountySystem/ControlsTutorial/Bounty/Checkpoints/CP_SignPapers.uasset index a2f9b686..31de2a70 100644 --- a/EndlessVendetta/Content/BountySystem/ControlsTutorial/Bounty/Checkpoints/CP_SignPapers.uasset +++ b/EndlessVendetta/Content/BountySystem/ControlsTutorial/Bounty/Checkpoints/CP_SignPapers.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:fe95bd4939dbc04c6ca0805c0af1e35ea361658143302a1e89ea1f231821a9c3 -size 41391 +oid sha256:1e6ac928ed04caddea00c5488a1dde0caa6463486a3026f5ac9f54db594d698f +size 41365 diff --git a/EndlessVendetta/Content/BountySystem/ControlsTutorial/Bounty/Checkpoints/CP_SniperTargets.uasset b/EndlessVendetta/Content/BountySystem/ControlsTutorial/Bounty/Checkpoints/CP_SniperTargets.uasset index 7e0d5272..b425c8ae 100644 --- a/EndlessVendetta/Content/BountySystem/ControlsTutorial/Bounty/Checkpoints/CP_SniperTargets.uasset +++ b/EndlessVendetta/Content/BountySystem/ControlsTutorial/Bounty/Checkpoints/CP_SniperTargets.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:87d3984e11f78fb7de9232cc8b1cee42f6fdc2c581f91963f735c0c5352e6129 -size 130835 +oid sha256:a72d8678fb409008ebfdb692f65354b5d4d6645cc9b93c3b220ab7b8563d9dbe +size 131357 diff --git a/EndlessVendetta/Content/BountySystem/ControlsTutorial/Bounty/Checkpoints/CP_SprintAcross.uasset b/EndlessVendetta/Content/BountySystem/ControlsTutorial/Bounty/Checkpoints/CP_SprintAcross.uasset index 53a597d1..ede39d9a 100644 --- a/EndlessVendetta/Content/BountySystem/ControlsTutorial/Bounty/Checkpoints/CP_SprintAcross.uasset +++ b/EndlessVendetta/Content/BountySystem/ControlsTutorial/Bounty/Checkpoints/CP_SprintAcross.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:7e2c138b4f1fd4064b2181a9ebb58e21cc2f06a8879b8d5ba667276d8aa42ed7 -size 32178 +oid sha256:bfb41b7b4dea4ba6f8f027d4ca487f6a543f9fa26c477c6963873ed95c7d08b9 +size 32136 diff --git a/EndlessVendetta/Content/BountySystem/ControlsTutorial/Bounty/Checkpoints/CP_VaultOver.uasset b/EndlessVendetta/Content/BountySystem/ControlsTutorial/Bounty/Checkpoints/CP_VaultOver.uasset index c8843c79..52acbce2 100644 --- a/EndlessVendetta/Content/BountySystem/ControlsTutorial/Bounty/Checkpoints/CP_VaultOver.uasset +++ b/EndlessVendetta/Content/BountySystem/ControlsTutorial/Bounty/Checkpoints/CP_VaultOver.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:07b6ec4cc1622c6b225bcb7b018ed6c0320ad4636ca5fd78958352a9f1bcb5f9 -size 32105 +oid sha256:a829833848495a08131726e968877eedab82f43af97a4a7bcb879ff92e695c41 +size 32041 diff --git a/EndlessVendetta/Content/Levels/MainMenuLevel.umap b/EndlessVendetta/Content/Levels/MainMenuLevel.umap index f932b95a..218e46df 100644 --- a/EndlessVendetta/Content/Levels/MainMenuLevel.umap +++ b/EndlessVendetta/Content/Levels/MainMenuLevel.umap @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:1de1b51cfc1520295dfe0b22aed4ce5c2f5a7e8a60a993fc0dd1f24855610243 +oid sha256:fa0c5d08371a6d9b5c29fe02a21d7586fa2a4d6e60ef980b640431c23a8628ea size 308710