Ticket #3176: livestock_attack_notification_r16549.diff

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

@@ -119 +119 @@
         addChatMessage({
             "type": "attack",
             "player": player,
-            "attacker": notification.attacker
+            "attacker": notification.attacker,
+            "target": notification.target
         });
     },
     "dialog": function(notification, player)
@@ -509 +510 @@
             return;
 
         [username, playerColor] = getUsernameAndColor(msg.attacker);
-        formatted = sprintf(translate("You have been attacked by %(attacker)s!"), { attacker: "[color=\"" + playerColor + "\"]" + username + "[/color]" });
+        var targetEntState = GetExtendedEntityState(msg.target);
+        // Since livestock can be attacked/gathered by allied players,
+        // we display a more specific notification in this case to not confuse the player
+        if (targetEntState.resourceSupply)
+            var message = translate("Your livestock have been attacked by %(attacker)s!");
+        else
+            var message = translate("You have been attacked by %(attacker)s!");
+        formatted = sprintf(message, { attacker: "[color=\"" + playerColor + "\"]" + username + "[/color]" });
         break;
     case "message":
         // May have been hidden by the 'team' command.

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

@@ -78 +78 @@
     this.AddSuppression(event);
     Engine.PostMessage(this.entity, MT_AttackDetected, { "player": cmpPlayer.GetPlayerID(), "event": event });
     var cmpGuiInterface = Engine.QueryInterface(SYSTEM_ENTITY, IID_GuiInterface);
-    cmpGuiInterface.PushNotification({"type": "attack", "players": [cmpPlayer.GetPlayerID()], "attacker": cmpAttackerOwnership.GetOwner() });
+    cmpGuiInterface.PushNotification({"type": "attack", "players": [cmpPlayer.GetPlayerID()], "attacker": cmpAttackerOwnership.GetOwner(), "target": target });
     PlaySound("attacked", target);
 };