diff --git a/EndlessVendetta/Content/BountySystem/ApartmentBounty/SideBounties/MoneyProblems/CP_HackFinanceLaptop.uasset b/EndlessVendetta/Content/BountySystem/ApartmentBounty/SideBounties/MoneyProblems/CP_HackFinanceLaptop.uasset index 92d264b8..60f7f51f 100644 --- a/EndlessVendetta/Content/BountySystem/ApartmentBounty/SideBounties/MoneyProblems/CP_HackFinanceLaptop.uasset +++ b/EndlessVendetta/Content/BountySystem/ApartmentBounty/SideBounties/MoneyProblems/CP_HackFinanceLaptop.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:f8f3a6b5d2f597833df4809a9e34619d30c7c45a7e545ff23d4c388fabb51aee -size 80447 +oid sha256:96b8018f174d86c02dde27d411ce535f365a0fbf32319005b591eb038c4dcf91 +size 79717 diff --git a/EndlessVendetta/Content/BountySystem/WBP_BountyCompleted.uasset b/EndlessVendetta/Content/BountySystem/WBP_BountyCompleted.uasset new file mode 100644 index 00000000..385b4d36 --- /dev/null +++ b/EndlessVendetta/Content/BountySystem/WBP_BountyCompleted.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:0143f18667748bc7286ec775837c3fbe4713fe2e596ad8b743d8f28ef963e898 +size 147430 diff --git a/EndlessVendetta/Content/FirstPerson/Blueprints/BP_FirstPersonCharacter.uasset b/EndlessVendetta/Content/FirstPerson/Blueprints/BP_FirstPersonCharacter.uasset index 0aa4f470..2c663d49 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:c5f5f93dc4069790ac1279bfc1dbc24b241f2a133619d5818be629e28b7eab3d -size 526016 +oid sha256:488def0310e09a50405d033f3c814c547dd56c68ac2c909a3a2a88200ca0d477 +size 554299 diff --git a/EndlessVendetta/Content/FirstPerson/Blueprints/BaseWeapons/WBP_NeedReloadText.uasset b/EndlessVendetta/Content/FirstPerson/Blueprints/BaseWeapons/WBP_NeedReloadText.uasset index e4da925b..dcc2f9a2 100644 --- a/EndlessVendetta/Content/FirstPerson/Blueprints/BaseWeapons/WBP_NeedReloadText.uasset +++ b/EndlessVendetta/Content/FirstPerson/Blueprints/BaseWeapons/WBP_NeedReloadText.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:493e53f9d833ac8e2bc03cc86122efe0f1711e74e6258ea90016b907983ad84c -size 37938 +oid sha256:db519139be98b60c93661d3f713abebf65ca4f6b150b880737dc34987a5ff14f +size 38384 diff --git a/EndlessVendetta/Content/Levels/MainMenuLevel.umap b/EndlessVendetta/Content/Levels/MainMenuLevel.umap index 9290e469..97986986 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:6b09feb9b8d78b3675fb5159f5400d568ae871b260ad185dfc216d4e55de460f -size 308710 +oid sha256:78e28c42ac42a5669631ae881581ea94d84e5743b40145202a95def2a4bacebf +size 308758 diff --git a/EndlessVendetta/Content/StarterContent/HDRI/HDRI_Epic_Courtyard_Daylight.uasset b/EndlessVendetta/Content/StarterContent/HDRI/HDRI_Epic_Courtyard_Daylight.uasset index 01456a0c..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:26d8205689202d1a13cf865bd93e8e108c054d7bda89d9a19e5fb5810f528080 -size 66790690 +oid sha256:bc35eb2d43a47427d30aba0196f9eac90d089dd3abca319528c5d25c83510d0d +size 72364642 diff --git a/EndlessVendetta/Content/StarterContent/Particles/P_Ambient_Dust.uasset b/EndlessVendetta/Content/StarterContent/Particles/P_Ambient_Dust.uasset index bf2e4391..823890a4 100644 --- a/EndlessVendetta/Content/StarterContent/Particles/P_Ambient_Dust.uasset +++ b/EndlessVendetta/Content/StarterContent/Particles/P_Ambient_Dust.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:01ef616c7a8bd90cd1b7a13efb18a56f33346efbae51efa31f09804478b7621d -size 43456 +oid sha256:8412ae4d9095f189e865b547434e40c0a1bb6a6b01f77259b6a69e3bae4b074d +size 53268 diff --git a/EndlessVendetta/Source/EndlessVendetta/Characters/BountyHunterCharacter.cpp b/EndlessVendetta/Source/EndlessVendetta/Characters/BountyHunterCharacter.cpp index d1d77131..4eadaa2e 100644 --- a/EndlessVendetta/Source/EndlessVendetta/Characters/BountyHunterCharacter.cpp +++ b/EndlessVendetta/Source/EndlessVendetta/Characters/BountyHunterCharacter.cpp @@ -56,7 +56,9 @@ void ABountyHunterCharacter::SpawnSideBounties(UEVGameInstance* GI) void ABountyHunterCharacter::CompleteCurrentMainBounty(UEVGameInstance* GI) { - EarnMoney(MainBountyClasses[CurrentMainBountyIndex]->GetDefaultObject()->GetRewardMoney()); + int MoneyEarned = MainBountyClasses[CurrentMainBountyIndex]->GetDefaultObject()->GetRewardMoney(); + EarnMoney(MoneyEarned); + BountyCompletedDisplay(MoneyEarned, 0); if (IsValid(PauseMenu)) PauseMenu->UpdatePlayerStatistics(Money, Favours); UE_LOG(LogTemp, Warning, TEXT("Would be collecting reward for completing bounty %d"), CurrentMainBountyIndex); @@ -81,6 +83,7 @@ void ABountyHunterCharacter::CompletedASideBounty(int CompletedSideBountiesUID) if (SideBountyStructs[i].SideBountyUID != CompletedSideBountiesUID) continue; EarnMoney(SideBountyStructs[i].MoneyEarnedForCompletion); EarnFavours(SideBountyStructs[i].FavoursEarnedForCompletion); + BountyCompletedDisplay(SideBountyStructs[i].MoneyEarnedForCompletion, SideBountyStructs[i].FavoursEarnedForCompletion); if (IsValid(PauseMenu)) PauseMenu->UpdatePlayerStatistics(Money, Favours); TitleOfSideBountyToRemove = SideBountyStructs[i].BountyTitle; diff --git a/EndlessVendetta/Source/EndlessVendetta/Characters/BountyHunterCharacter.h b/EndlessVendetta/Source/EndlessVendetta/Characters/BountyHunterCharacter.h index bb36628b..a489d1d3 100644 --- a/EndlessVendetta/Source/EndlessVendetta/Characters/BountyHunterCharacter.h +++ b/EndlessVendetta/Source/EndlessVendetta/Characters/BountyHunterCharacter.h @@ -93,8 +93,14 @@ protected: // Called When Actor destroyed or Removed from Level virtual void EndPlay(const EEndPlayReason::Type EndPlayReason) override; + // Spawns Hold F to Access Bike UI in Open World Only UFUNCTION(BlueprintImplementableEvent) void SpawnBikeUI(); + + // Displays what rewards the player got after completing any bounty + UFUNCTION(BlueprintImplementableEvent) + void BountyCompletedDisplay(int MoneyEarned, int FavoursEarned); + public: // Used by Final Checkpoint to always load the Level set as the Open Level in here FString GetOpenWorldLevelName()