From d2481e79b8f8da380d60d12c7eff85441aafc37b Mon Sep 17 00:00:00 2001 From: Rafal Swierczek <34179rs@gmail.com> Date: Sat, 14 Oct 2023 17:10:29 +0100 Subject: [PATCH] Fixed Text Formatting Issues for PC_Display Widget --- .../BountySystem/BountyDirector/PC_Background.uasset | 2 +- .../BountySystem/BountyDirector/WBP_PC_Display.uasset | 4 ++-- .../MainBounty/MB_TestBounty.uasset | 4 ++-- .../FavourSystemBountyTest/SideBounties/SB_1.uasset | 4 ++-- .../FavourSystemBountyTest/SideBounties/SB_2.uasset | 4 ++-- .../FavourSystemBountyTest/SideBounties/SB_3.uasset | 4 ++-- .../Blueprints/Blueprint_CeilingLight.uasset | 4 ++-- .../Content/StarterContent/Props/MaterialSphere.uasset | 4 ++-- .../EndlessVendetta/BountySystem/BountyDirector.cpp | 4 ++-- .../Source/EndlessVendetta/BountySystem/MainBountyClass.h | 8 ++++---- .../Source/EndlessVendetta/BountySystem/SideBountyClass.h | 4 ++++ 11 files changed, 25 insertions(+), 21 deletions(-) diff --git a/EndlessVendetta/Content/BountySystem/BountyDirector/PC_Background.uasset b/EndlessVendetta/Content/BountySystem/BountyDirector/PC_Background.uasset index 9c10c987..0e0a8514 100644 --- a/EndlessVendetta/Content/BountySystem/BountyDirector/PC_Background.uasset +++ b/EndlessVendetta/Content/BountySystem/BountyDirector/PC_Background.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:e2a0411ac8a6f3df1704187cfb5d62a200088e7d4605f05666b65e18645351d7 +oid sha256:69b27343598f650b7535e6394e8f71edd12579339b4bbf6a5530e2058f984463 size 247653 diff --git a/EndlessVendetta/Content/BountySystem/BountyDirector/WBP_PC_Display.uasset b/EndlessVendetta/Content/BountySystem/BountyDirector/WBP_PC_Display.uasset index 20b851f2..d93799c6 100644 --- a/EndlessVendetta/Content/BountySystem/BountyDirector/WBP_PC_Display.uasset +++ b/EndlessVendetta/Content/BountySystem/BountyDirector/WBP_PC_Display.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:7fa3dc6f87da5e22b1363a0276b090306de54d36ac05c86024a47d05c8d92ae3 -size 1088257 +oid sha256:13c33ca82184ce691baedd731c38c0cb26674a52fa498cfeed21268ef352e0c2 +size 1059571 diff --git a/EndlessVendetta/Content/BountySystem/TestBounties/FavourSystemBountyTest/MainBounty/MB_TestBounty.uasset b/EndlessVendetta/Content/BountySystem/TestBounties/FavourSystemBountyTest/MainBounty/MB_TestBounty.uasset index 6f761952..0a5cc2ff 100644 --- a/EndlessVendetta/Content/BountySystem/TestBounties/FavourSystemBountyTest/MainBounty/MB_TestBounty.uasset +++ b/EndlessVendetta/Content/BountySystem/TestBounties/FavourSystemBountyTest/MainBounty/MB_TestBounty.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:2c8679edb7c4684bced79a1e13965b2d538b29f62e18877f90a6db950e9a0075 -size 23646 +oid sha256:5ebf04e857c15279c330ed46442aed92c243b554eb5f28b4fc387cca379a866e +size 23639 diff --git a/EndlessVendetta/Content/BountySystem/TestBounties/FavourSystemBountyTest/SideBounties/SB_1.uasset b/EndlessVendetta/Content/BountySystem/TestBounties/FavourSystemBountyTest/SideBounties/SB_1.uasset index 73fae848..d88016a5 100644 --- a/EndlessVendetta/Content/BountySystem/TestBounties/FavourSystemBountyTest/SideBounties/SB_1.uasset +++ b/EndlessVendetta/Content/BountySystem/TestBounties/FavourSystemBountyTest/SideBounties/SB_1.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:6b4f7e4727df3fdaa5f0429402569cf93c1d04ebc346334354e6fa4bbd3488fb -size 22713 +oid sha256:e89aba9e6af5b1bd48b5b2b48242eb1d057a63f552b22ea6122091a81556d9d6 +size 22765 diff --git a/EndlessVendetta/Content/BountySystem/TestBounties/FavourSystemBountyTest/SideBounties/SB_2.uasset b/EndlessVendetta/Content/BountySystem/TestBounties/FavourSystemBountyTest/SideBounties/SB_2.uasset index 5660d5fb..f61482fd 100644 --- a/EndlessVendetta/Content/BountySystem/TestBounties/FavourSystemBountyTest/SideBounties/SB_2.uasset +++ b/EndlessVendetta/Content/BountySystem/TestBounties/FavourSystemBountyTest/SideBounties/SB_2.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:e06809196ddcbfe04fb42919352cccbc820ce09c2163c572a7b9feea87587750 -size 22775 +oid sha256:8ae78ca79d0f944fd9ae21df42c30f3993f595e6a750455a5960cd0e4b890143 +size 22827 diff --git a/EndlessVendetta/Content/BountySystem/TestBounties/FavourSystemBountyTest/SideBounties/SB_3.uasset b/EndlessVendetta/Content/BountySystem/TestBounties/FavourSystemBountyTest/SideBounties/SB_3.uasset index 32c81b99..f575b5b1 100644 --- a/EndlessVendetta/Content/BountySystem/TestBounties/FavourSystemBountyTest/SideBounties/SB_3.uasset +++ b/EndlessVendetta/Content/BountySystem/TestBounties/FavourSystemBountyTest/SideBounties/SB_3.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:b86280d1949eeb45d49b83a6e7a55b2c843444ad84b5ffb639e9be3218b6035e -size 22708 +oid sha256:736bb99394a031e33b1a14f712b0ad0b6540cc047153933347b449746f46ffc5 +size 22761 diff --git a/EndlessVendetta/Content/StarterContent/Blueprints/Blueprint_CeilingLight.uasset b/EndlessVendetta/Content/StarterContent/Blueprints/Blueprint_CeilingLight.uasset index 84700dde..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:f28941ae2bfc99b505a220cbcfbed1524eee0b1c03d1b387ae857d2d94a94356 -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..34eb8e6b 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:8fe02baa138e086ccfe9f77f87f3898fb489e4e132a4164798fbbb9a6680bef2 +size 47710 diff --git a/EndlessVendetta/Source/EndlessVendetta/BountySystem/BountyDirector.cpp b/EndlessVendetta/Source/EndlessVendetta/BountySystem/BountyDirector.cpp index d94226dc..e549ad7a 100644 --- a/EndlessVendetta/Source/EndlessVendetta/BountySystem/BountyDirector.cpp +++ b/EndlessVendetta/Source/EndlessVendetta/BountySystem/BountyDirector.cpp @@ -225,11 +225,11 @@ void ABountyDirector::Interact() PC_Display->PC_Display_Info.SB_Reward.Reset(); for (ASideBountyClass* SideBounty : ActiveSideBounties) { - if (!IsValid(SideBounty)) continue; + if (!IsValid(SideBounty) || SideBounty->IsCompleted()) continue; PC_Display->PC_Display_Info.SB_Title.Add(SideBounty->GetBountyTitle()); PC_Display->PC_Display_Info.SB_Icon.Add(SideBounty->GetActiveWaypointIcon()); PC_Display->PC_Display_Info.SB_Desc.Add(SideBounty->GetBountyDesc()); - PC_Display->PC_Display_Info.SB_Reward.Add(SideBounty->GetBountyrewardMoney()); + PC_Display->PC_Display_Info.SB_Reward.Add(SideBounty->GetRewardInFavours()); } // Info about main bounty alterations diff --git a/EndlessVendetta/Source/EndlessVendetta/BountySystem/MainBountyClass.h b/EndlessVendetta/Source/EndlessVendetta/BountySystem/MainBountyClass.h index f2a3aca3..2ca99a55 100644 --- a/EndlessVendetta/Source/EndlessVendetta/BountySystem/MainBountyClass.h +++ b/EndlessVendetta/Source/EndlessVendetta/BountySystem/MainBountyClass.h @@ -65,13 +65,13 @@ public: UFUNCTION(BlueprintCallable, Category = "Bounty") FString GetCustomBountyAlteration_2_Description() { - return CustomBountyAlteration_Description.Num() < 1 ? FString("") : CustomBountyAlteration_Description[1]; + return CustomBountyAlteration_Description.Num() <= 1 ? FString("") : CustomBountyAlteration_Description[1]; } UFUNCTION(BlueprintCallable, Category = "Bounty") FString GetCustomBountyAlteration_3_Description() { - return CustomBountyAlteration_Description.Num() < 2 ? FString("") : CustomBountyAlteration_Description[2]; + return CustomBountyAlteration_Description.Num() <= 2 ? FString("") : CustomBountyAlteration_Description[2]; } UFUNCTION(BlueprintCallable, Category = "Bounty") @@ -83,13 +83,13 @@ public: UFUNCTION(BlueprintCallable, Category = "Bounty") int GetCustomBountyAlteration_2_Cost() { - return CustomBountyAlteration_Cost.Num() < 1 ? 0 : CustomBountyAlteration_Cost[1]; + return CustomBountyAlteration_Cost.Num() <= 1 ? 0 : CustomBountyAlteration_Cost[1]; } UFUNCTION(BlueprintCallable, Category = "Bounty") int GetCustomBountyAlteration_3_Cost() { - return CustomBountyAlteration_Cost.Num() < 2 ? 0 : CustomBountyAlteration_Cost[2]; + return CustomBountyAlteration_Cost.Num() <= 2 ? 0 : CustomBountyAlteration_Cost[2]; } // ------------- Simple Bounty Alterations ------------- diff --git a/EndlessVendetta/Source/EndlessVendetta/BountySystem/SideBountyClass.h b/EndlessVendetta/Source/EndlessVendetta/BountySystem/SideBountyClass.h index 35d481fd..758c1e77 100644 --- a/EndlessVendetta/Source/EndlessVendetta/BountySystem/SideBountyClass.h +++ b/EndlessVendetta/Source/EndlessVendetta/BountySystem/SideBountyClass.h @@ -24,4 +24,8 @@ public: virtual void IncrementBountyCheckpoint() override; void DestroyCheckpoints(); + int GetRewardInFavours() + { + return FavoursEarnedForCompletion; + } };