Rafal/EndlessVendetta
Rafal/EndlessVendetta
1
0
Fork 0
Code Issues Pull Requests Releases 1 Activity

Fixed Text Formatting Issues for PC_Display Widget

Browse Source
This commit is contained in:
Rafal Swierczek 2023-10-14 17:10:29 +01:00
parent 7296353c73
commit d2481e79b8
11 changed files with 25 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
EndlessVendetta/Content/BountySystem/BountyDirector/PC_Background.uasset
View File

@ -1,3 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:e2a0411ac8a6f3df1704187cfb5d62a200088e7d4605f05666b65e18645351d7
oid sha256:69b27343598f650b7535e6394e8f71edd12579339b4bbf6a5530e2058f984463
size 247653

4
EndlessVendetta/Content/BountySystem/BountyDirector/WBP_PC_Display.uasset
View File

@ -1,3 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:7fa3dc6f87da5e22b1363a0276b090306de54d36ac05c86024a47d05c8d92ae3
size 1088257
oid sha256:13c33ca82184ce691baedd731c38c0cb26674a52fa498cfeed21268ef352e0c2
size 1059571

4
EndlessVendetta/Content/BountySystem/TestBounties/FavourSystemBountyTest/MainBounty/MB_TestBounty.uasset
View File

@ -1,3 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:2c8679edb7c4684bced79a1e13965b2d538b29f62e18877f90a6db950e9a0075
size 23646
oid sha256:5ebf04e857c15279c330ed46442aed92c243b554eb5f28b4fc387cca379a866e
size 23639

BIN
EndlessVendetta/Content/BountySystem/TestBounties/FavourSystemBountyTest/SideBounties/SB_1.uasset (Stored with Git LFS)
View File

Binary file not shown.

BIN
EndlessVendetta/Content/BountySystem/TestBounties/FavourSystemBountyTest/SideBounties/SB_2.uasset (Stored with Git LFS)
View File

Binary file not shown.

BIN
EndlessVendetta/Content/BountySystem/TestBounties/FavourSystemBountyTest/SideBounties/SB_3.uasset (Stored with Git LFS)
View File

Binary file not shown.

BIN
EndlessVendetta/Content/StarterContent/Blueprints/Blueprint_CeilingLight.uasset (Stored with Git LFS)
View File

Binary file not shown.

BIN
EndlessVendetta/Content/StarterContent/Props/MaterialSphere.uasset (Stored with Git LFS)
View File

Binary file not shown.

4
EndlessVendetta/Source/EndlessVendetta/BountySystem/BountyDirector.cpp
View File

@ -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

8
EndlessVendetta/Source/EndlessVendetta/BountySystem/MainBountyClass.h
View File

@ -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 -------------

4
EndlessVendetta/Source/EndlessVendetta/BountySystem/SideBountyClass.h
View File

@ -24,4 +24,8 @@ public:
virtual void IncrementBountyCheckpoint() override;
void DestroyCheckpoints();
int GetRewardInFavours()
{
return FavoursEarnedForCompletion;
}
};