Ticket #1724: animal.patch

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

@@ -1722 +1722 @@
                 this.template.NaturalBehaviour == "passive")
             {
                 this.Flee(msg.data.attacker, false);
+                this.NearbyRespondToAttack(msg.data.attacker);
             }
             else if (this.IsDangerousAnimal() || this.template.NaturalBehaviour == "defensive")
             {
                 if (this.CanAttack(msg.data.attacker))
                     this.Attack(msg.data.attacker, false);
+                this.NearbyRespondToAttack(msg.data.attacker);
             }
             else if (this.template.NaturalBehaviour == "domestic")
             {
@@ -3674 +3676 @@
     );
 };
 
+/**
+ * All wild animals in a given distance respond to the attack :
+ * If skittish behaviour, they flee
+ * If defensive behaviour, they attack if it is a member of their specy which is involved
+ */
+UnitAI.prototype.NearbyRespondToAttack = function(attacker)
+{
+    var cmpTemplateManager = Engine.QueryInterface(SYSTEM_ENTITY, IID_TemplateManager);
+    var thisTemplateName = cmpTemplateManager.GetCurrentTemplateName(this.entity);
+    var thisSpecificName = (cmpTemplateManager.GetTemplate(thisTemplateName)).Identity.SpecificName;
+    // Look for other animal (gaia player = 0) nearby (dist=32, to be tuned)
+    var cmpRangeManager = Engine.QueryInterface(SYSTEM_ENTITY, IID_RangeManager);
+    var nearby = cmpRangeManager.ExecuteQuery(this.entity, 0, 32, [0], IID_UnitAI);
+    for each (var ent in nearby)
+    {
+        var cmpUnitAI = Engine.QueryInterface(ent, IID_UnitAI);
+        if (cmpUnitAI.template.NaturalBehaviour == "skittish" ||
+            cmpUnitAI.template.NaturalBehaviour == "passive")
+        {
+                    Engine.QueryInterface(ent, IID_UnitAI).Flee(attacker, false);
+        }
+        else if (cmpUnitAI.IsDangerousAnimal() || cmpUnitAI.template.NaturalBehaviour == "defensive")
+                {
+            var templateName = cmpTemplateManager.GetCurrentTemplateName(ent);
+            var template = cmpTemplateManager.GetTemplate(templateName);
+            if(thisSpecificName == template.Identity.SpecificName && cmpUnitAI.CanAttack(attacker))
+                cmpUnitAI.Attack(attacker, false);
+        }
+    }
+};
+
 Engine.RegisterComponentType(IID_UnitAI, "UnitAI", UnitAI);