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; +};