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

Re-implement the insufficient funds warning in a simpler manner

Browse Source
This commit is contained in:
Oliver Brakmann
2016-04-08 22:19:36 +02:00
parent 41388b9c63
commit 87e1acfc9f
4 changed files with 25 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -56,7 +56,7 @@ namespace OpenRA.Mods.Common.Activities
Game.Sound.PlayNotification(self.World.Map.Rules, self.Owner, "Speech", repairsUnits.StartRepairingNotification, self.Owner.Faction.InternalName);
}
if (!self.Owner.PlayerActor.Trait<PlayerResources>().TakeCash(cost))
if (!self.Owner.PlayerActor.Trait<PlayerResources>().TakeCash(cost, true))
{
remainingTicks = 1;
return this;

2
OpenRA.Mods.Common/Traits/Buildings/RepairableBuilding.cs
View File

@@ -115,7 +115,7 @@ namespace OpenRA.Mods.Common.Traits
var cost = Math.Max(1, (hpToRepair * Info.RepairPercent * buildingValue) / (health.MaxHP * 100));
// TakeCash will return false if the player can't pay, and will stop him from contributing this Tick
var activePlayers = Repairers.Count(player => player.PlayerActor.Trait<PlayerResources>().TakeCash(cost));
var activePlayers = Repairers.Count(player => player.PlayerActor.Trait<PlayerResources>().TakeCash(cost, true));
RepairActive = activePlayers > 0;

2
OpenRA.Mods.Common/Traits/Player/ProductionQueue.cs
View File

@@ -458,7 +458,7 @@ namespace OpenRA.Mods.Common.Traits
}
var costThisFrame = RemainingCost / RemainingTime;
if (costThisFrame != 0 && !pr.TakeCash(costThisFrame))
if (costThisFrame != 0 && !pr.TakeCash(costThisFrame, true))
return;
RemainingCost -= costThisFrame;