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

Added checks to make sure cash can't be < 0.

Browse Source
This commit is contained in:
GSonderling
2018-05-07 10:42:38 +00:00
committed by reaperrr
parent b8fd4abc4a
commit bf4dbd9b80
9 changed files with 28 additions and 35 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
OpenRA.Mods.Common/Activities/DonateCash.cs
View File

@@ -34,14 +34,14 @@ namespace OpenRA.Mods.Common.Activities
if (target.IsDead)
return;
target.Owner.PlayerActor.Trait<PlayerResources>().GiveCash(payload);
var donated = target.Owner.PlayerActor.Trait<PlayerResources>().ChangeCash(payload);
var exp = self.Owner.PlayerActor.TraitOrDefault<PlayerExperience>();
if (exp != null && target.Owner != self.Owner)
exp.GiveExperience(experience);
if (self.Owner.IsAlliedWith(self.World.RenderPlayer))
self.World.AddFrameEndTask(w => w.Add(new FloatingText(target.CenterPosition, target.Owner.Color.RGB, FloatingText.FormatCashTick(payload), 30)));
self.World.AddFrameEndTask(w => w.Add(new FloatingText(target.CenterPosition, target.Owner.Color.RGB, FloatingText.FormatCashTick(donated), 30)));
foreach (var nct in target.TraitsImplementing<INotifyCashTransfer>())
nct.OnAcceptingCash(target, self);

2
OpenRA.Mods.Common/Activities/Sell.cs
View File

@@ -40,7 +40,7 @@ namespace OpenRA.Mods.Common.Activities
var hp = health != null ? (long)health.HP : 1L;
var maxHP = health != null ? (long)health.MaxHP : 1L;
var refund = (int)((sellValue * sellableInfo.RefundPercent * hp) / (100 * maxHP));
playerResources.GiveCash(refund);
refund = playerResources.ChangeCash(refund);
foreach (var ns in self.TraitsImplementing<INotifySold>())
ns.Sold(self);