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()