Ticket #1839: tribute-insufficient-resources.2.patch

simulation/components/Player.js

@@ -174 +174 @@
     return amountsNeeded;
 };
 
-Player.prototype.TrySubtractResources = function(amounts)
+Player.prototype.HasResourcesOrNotify = function(amounts)
 {
     var amountsNeeded = this.GetNeededResources(amounts);
 
@@ -189 +189 @@
         cmpGUIInterface.PushNotification(notification);
         return false;
     }
-    else
+
+    // Subtract the resources
+    for (var type in amounts)
     {
+        this.resourceCount[type] -= amounts[type];
+    }
+
+    return true;
+};
+
+Player.prototype.TrySubtractResources = function(amounts)
+{
+    var hasResources = this.HasResourcesOrNotify(amounts);
+
+    // If we don't have enough resources, send a notification to the player
+    if (hasResources)
+    {
         // Subtract the resources
         var cmpStatisticsTracker = QueryPlayerIDInterface(this.playerID, IID_StatisticsTracker);
-        for (var type in amounts)
-        {
-            this.resourceCount[type] -= amounts[type];
-            if (cmpStatisticsTracker)
-                cmpStatisticsTracker.IncreaseResourceUsedCounter(type, amounts[type]);
-        }
+        if (cmpStatisticsTracker)
+            cmpStatisticsTracker.IncreaseResourceUsedCounter(type, amounts[type]);
     }
 
-    return true;
+    return hasResources;
 };
 
 Player.prototype.GetState = function()
@@ -533 +544 @@
     if (this.state != "active" || cmpPlayer.state != "active")
         return;
 
-    if (!this.GetNeededResources(amounts))
+    if (this.HasResourcesOrNotify(amounts))
     {
-        for (var type in amounts)
-            this.resourceCount[type] -= amounts[type];
-
         cmpPlayer.AddResources(amounts);
-
+        
         var total = Object.keys(amounts).reduce(function (sum, type){ return sum + amounts[type]; }, 0);
         var cmpOurStatisticsTracker = QueryPlayerIDInterface(this.playerID, IID_StatisticsTracker);
         if (cmpOurStatisticsTracker)
@@ -552 +560 @@
         var cmpGUIInterface = Engine.QueryInterface(SYSTEM_ENTITY, IID_GuiInterface);
         cmpGUIInterface.PushNotification(notification);
     }
-    // else not enough resources... TODO: send gui notification
 };
 
 Engine.RegisterComponentType(IID_Player, "Player", Player);