epic/OpenRA
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Replace Cash + Resources with GetCashAndResources()

Browse Source
This commit is contained in:
dnqbob
2023-09-07 07:17:54 +08:00
committed by Gustas
parent 931118e1d8
commit 19c8c36030
5 changed files with 8 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
OpenRA.Mods.Common/Traits/Crates/GiveCashCrateAction.cs
View File

@@ -50,7 +50,7 @@ namespace OpenRA.Mods.Common.Traits
public override int GetSelectionShares(Actor collector)
{
var pr = collector.Owner.PlayerActor.Trait<PlayerResources>();
if (info.Amount < 0 && pr.Cash + pr.Resources == 0)
if (info.Amount < 0 && pr.GetCashAndResources() == 0)
return 0;
return base.GetSelectionShares(collector);

4
OpenRA.Mods.Common/Traits/Player/PlayerResources.cs
View File

@@ -113,7 +113,7 @@ namespace OpenRA.Mods.Common.Traits
else
{
// Don't put the player into negative funds
amount = Math.Max(-(Cash + Resources), amount);
amount = Math.Max(-GetCashAndResources(), amount);
TakeCash(-amount);
}
@@ -182,7 +182,7 @@ namespace OpenRA.Mods.Common.Traits
public bool TakeCash(int num, bool notifyLowFunds = false)
{
if (Cash + Resources < num)
if (GetCashAndResources() < num)
{
if (notifyLowFunds && Game.RunTime > lastNotificationTime + Info.InsufficientFundsNotificationInterval)
{