Ticket #3839: show_bartering_to_observers_v1.patch

binaries/data/mods/public/gui/session/messages.js

@@ -48 +48 @@
     "clientlist": msg => getUsernameList(),
     "message": msg => formatChatCommand(msg),
     "defeat": msg => formatDefeatMessage(msg),
     "diplomacy": msg => formatDiplomacyMessage(msg),
     "tribute": msg => formatTributeMessage(msg),
+    "barter": msg => formatBarterMessage(msg),
     "attack": msg => formatAttackMessage(msg)
 };
 
 /**
  * Show a label and grey overlay or hide both on connection change.
@@ -216 +217 @@
             "sourcePlayer": notification.donator,
             "targetPlayer": player,
             "amounts": notification.amounts
         });
     },
+    "barter": function(notification, player)
+    {
+        addChatMessage({
+            "type": "barter",
+            "player": player,
+            "amountsSold": notification.amountsSold,
+            "amountsBought": notification.amountsBought,
+            "resourceSold": notification.resourceSold,
+            "resourceBought": notification.resourceBought
+        });
+    },
     "attack": function(notification, player)
     {
         if (player != g_ViewedPlayer)
             return;
 
@@ -695 +707 @@
         "player2": colorizePlayernameByID(msg.targetPlayer),
         "amounts": getLocalizedResourceAmounts(msg.amounts)
     });
 }
 
+function formatBarterMessage(msg)
+{
+    if (!g_IsObserver)
+        return "";
+
+    let amountsSold = {};
+    amountsSold[msg.resourceSold] = msg.amountsSold;
+
+    let amountsBought = {};
+    amountsBought[msg.resourceBought] = msg.amountsBought;
+
+    return sprintf(translate("%(player)s bartered %(amountsBought)s for %(amountsSold)s."), {
+        "player": colorizePlayernameByID(msg.player),
+        "amountsBought": getLocalizedResourceAmounts(amountsBought),
+        "amountsSold": getLocalizedResourceAmounts(amountsSold)
+    });
+}
+
 function formatAttackMessage(msg)
 {
     if (msg.player != g_ViewedPlayer)
         return "";
 

binaries/data/mods/public/simulation/components/Barter.js

@@ -95 +95 @@
     {
         var amountToAdd = Math.round(prices["sell"][resourceToSell] / prices["buy"][resourceToBuy] * amount);
         cmpPlayer.AddResource(resourceToBuy, amountToAdd);
         var numberOfDeals = Math.round(amount / 100);
 
+        // Display chat message to observers
+        var cmpGUIInterface = Engine.QueryInterface(SYSTEM_ENTITY, IID_GuiInterface);
+        if (cmpGUIInterface)
+            cmpGUIInterface.PushNotification({
+                "type": "barter",
+                "players": [cmpPlayer.GetPlayerID()],
+                "amountsSold": amount,
+                "amountsBought": amountToAdd,
+                "resourceSold": resourceToSell,
+                "resourceBought": resourceToBuy
+            });
+
         var cmpStatisticsTracker = Engine.QueryInterface(playerEntity, IID_StatisticsTracker);
         if (cmpStatisticsTracker)
         {
             cmpStatisticsTracker.IncreaseResourcesSoldCounter(resourceToSell, amount);
             cmpStatisticsTracker.IncreaseResourcesBoughtCounter(resourceToBuy, amountToAdd);