Don't count refunds as income and deduct them from expenses.

Author: darkademic

OpenRA.Mods.Common/Traits/Buildings/ProductionAirdrop.cs

@@ -100,7 +100,7 @@ public override bool Produce(Actor self, ActorInfo producee, string productionTy
 			{
 				if (!self.IsInWorld || self.IsDead)
 				{
-					owner.PlayerActor.Trait<PlayerResources>().GiveCash(refundableValue);
+					owner.PlayerActor.Trait<PlayerResources>().RefundCash(refundableValue);
 					return;
 				}
 
@@ -119,7 +119,7 @@ public override bool Produce(Actor self, ActorInfo producee, string productionTy
 				{
 					if (!self.IsInWorld || self.IsDead)
 					{
-						owner.PlayerActor.Trait<PlayerResources>().GiveCash(refundableValue);
+						owner.PlayerActor.Trait<PlayerResources>().RefundCash(refundableValue);
 						return;
 					}
 

OpenRA.Mods.Common/Traits/Player/PlayerResources.cs

@@ -127,18 +127,27 @@ public bool CanGiveResources(int amount)
 			return Resources + amount <= ResourceCapacity;
 		}
 
-		public void GiveResources(int num)
+		public void GiveResources(int num, bool isRefund = false)
 		{
 			Resources += num;
-			Earned += num;
+
+			if (!isRefund)
+				Earned += num;
 
 			if (Resources > ResourceCapacity)
 			{
-				Earned -= Resources - ResourceCapacity;
+				if (!isRefund)
+					Earned -= Resources - ResourceCapacity;
+
 				Resources = ResourceCapacity;
 			}
 		}
 
+		public void RefundResources(int num)
+		{
+			GiveResources(num, isRefund: true);
+		}
+
 		public bool TakeResources(int num)
 		{
 			if (Resources < num) return false;
@@ -148,7 +157,7 @@ public bool TakeResources(int num)
 			return true;
 		}
 
-		public void GiveCash(int num)
+		public void GiveCash(int num, bool isRefund = false)
 		{
 			if (Cash < int.MaxValue)
 			{
@@ -165,7 +174,7 @@ public void GiveCash(int num)
 				}
 			}
 
-			if (Earned < int.MaxValue)
+			if (!isRefund && Earned < int.MaxValue)
 			{
 				try
 				{
@@ -179,6 +188,25 @@ public void GiveCash(int num)
 					Earned = int.MaxValue;
 				}
 			}
+			else if (isRefund && Spent > int.MinValue)
+			{
+				try
+				{
+					checked
+					{
+						Spent -= num;
+					}
+				}
+				catch (OverflowException)
+				{
+					Spent = int.MinValue;
+				}
+			}
+		}
+
+		public void RefundCash(int num)
+		{
+			GiveCash(num, isRefund: true);
 		}
 
 		public bool TakeCash(int num, bool notifyLowFunds = false)

OpenRA.Mods.Common/Traits/Player/ProductionQueue.cs

@@ -199,11 +199,11 @@ protected void ClearQueue()
 			{
 				if (item.ResourcesPaid > 0)
 				{
-					playerResources.GiveResources(item.ResourcesPaid);
+					playerResources.RefundResources(item.ResourcesPaid);
 					item.RemainingCost += item.ResourcesPaid;
 				}
 
-				playerResources.GiveCash(item.TotalCost - item.RemainingCost);
+				playerResources.RefundCash(item.TotalCost - item.RemainingCost);
 			}
 
 			Queue.Clear();
@@ -409,12 +409,12 @@ protected void CancelUnbuildableItems()
 				// Refund spended resources
 				if (Queue[i].ResourcesPaid > 0)
 				{
-					playerResources.GiveResources(Queue[i].ResourcesPaid);
+					playerResources.RefundResources(Queue[i].ResourcesPaid);
 					Queue[i].RemainingCost += Queue[i].ResourcesPaid;
 				}
 
 				// Refund what's been paid so far
-				playerResources.GiveCash(Queue[i].TotalCost - Queue[i].RemainingCost);
+				playerResources.RefundCash(Queue[i].TotalCost - Queue[i].RemainingCost);
 				EndProduction(Queue[i]);
 			}
 
@@ -610,11 +610,11 @@ protected bool CancelProductionInner(string itemName)
 					// Refund what has been paid
 					if (item.ResourcesPaid > 0)
 					{
-						playerResources.GiveResources(item.ResourcesPaid);
+						playerResources.RefundResources(item.ResourcesPaid);
 						item.RemainingCost += item.ResourcesPaid;
 					}
 
-					playerResources.GiveCash(item.TotalCost - item.RemainingCost);
+					playerResources.RefundCash(item.TotalCost - item.RemainingCost);
 					EndProduction(item);
 				}
 
@@ -671,11 +671,11 @@ protected virtual void BeginProduction(ProductionItem item, bool hasPriority)
 				// Refund what has been paid
 				if (queued[i].ResourcesPaid > 0)
 				{
-					playerResources.GiveResources(queued[i].ResourcesPaid);
+					playerResources.RefundResources(queued[i].ResourcesPaid);
 					queued[i].RemainingCost += queued[i].ResourcesPaid;
 				}
 
-				playerResources.GiveCash(queued[i].TotalCost - queued[i].RemainingCost);
+				playerResources.RefundCash(queued[i].TotalCost - queued[i].RemainingCost);
 				EndProduction(queued[i]);
 			}
 		}

OpenRA.Mods.Common/Traits/ProductionParadrop.cs

@@ -74,7 +74,7 @@ public override bool Produce(Actor self, ActorInfo producee, string productionTy
 			{
 				if (!self.IsInWorld || self.IsDead)
 				{
-					owner.PlayerActor.Trait<PlayerResources>().GiveCash(refundableValue);
+					owner.PlayerActor.Trait<PlayerResources>().RefundCash(refundableValue);
 					return;
 				}
 
@@ -91,7 +91,7 @@ public override bool Produce(Actor self, ActorInfo producee, string productionTy
 				{
 					if (!self.IsInWorld || self.IsDead)
 					{
-						owner.PlayerActor.Trait<PlayerResources>().GiveCash(refundableValue);
+						owner.PlayerActor.Trait<PlayerResources>().RefundCash(refundableValue);
 						return;
 					}