Ticket #1724: collectiveBehavior.patch

binaries/data/mods/public/simulation/templates/gaia/fauna_elephant_african_bush.xml

@@ -44 +44 @@
   <Identity>
     <Civ>gaia</Civ>
     <Classes datatype="tokens">Elephant</Classes>
+    <Species>Elephant</Species>
     <SpecificName>African Bush Elephant</SpecificName>
     <Icon>gaia/fauna_elephant_african_bush.png</Icon>
   </Identity>

binaries/data/mods/public/simulation/templates/gaia/fauna_elephant.xml

@@ -11 +11 @@
   <Identity>
     <Civ>gaia</Civ>
     <Classes datatype="tokens">Elephant</Classes>
+    <Species>Elephant</Species>
     <SpecificName>Elephant</SpecificName>
     <Icon>gaia/fauna_elephant.png</Icon>
   </Identity>

binaries/data/mods/public/simulation/templates/gaia/fauna_elephant_north_african.xml

@@ -31 +31 @@
   <Identity>
     <Civ>gaia</Civ>
     <Classes datatype="tokens">Elephant</Classes>
+    <Species>Elephant</Species>
     <SpecificName>North African Elephant</SpecificName>
     <Icon>gaia/fauna_elephant_north_african.png</Icon>
   </Identity>

binaries/data/mods/public/simulation/templates/gaia/fauna_elephant_asian.xml

@@ -44 +44 @@
   <Identity>
     <Civ>gaia</Civ>
     <Classes datatype="tokens">Elephant</Classes>
+    <Species>Elephant</Species>
     <SpecificName>Asian Elephant</SpecificName>
     <Icon>gaia/fauna_elephant_african_bush.png</Icon>
   </Identity>

binaries/data/mods/public/simulation/templates/gaia/fauna_elephant_african_infant.xml

@@ -12 +12 @@
   <Identity>
     <Civ>gaia</Civ>
     <Classes datatype="tokens">Elephant</Classes>
+    <Species>Elephant</Species>
     <SpecificName>African Elephant (Infant)</SpecificName>
     <Icon>gaia/fauna_elephant_african_infant.png</Icon>
   </Identity>

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

@@ -15 +15 @@
         "<text/>" +
     "</element>" +
     "<optional>" +
+        "<element name='Species' a:help='Species for this class of unit'>" +
+            "<text/>" +
+        "</element>" +
+    "</optional>" +
+    "<optional>" +
         "<element name='SpecificName' a:help='Specific native-language name for this unit type'>" +
             "<text/>" +
         "</element>" +

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

@@ -2096 +2096 @@
                 this.template.NaturalBehaviour == "passive")
             {
                 this.Flee(msg.data.attacker, false);
+                this.NearbyAnimalsRespondToAttack(msg.data.attacker);
             }
             else if (this.IsDangerousAnimal() || this.template.NaturalBehaviour == "defensive")
             {
                 if (this.CanAttack(msg.data.attacker))
                     this.Attack(msg.data.attacker, false);
+                this.NearbyAnimalsRespondToAttack(msg.data.attacker);
             }
             else if (this.template.NaturalBehaviour == "domestic")
             {
@@ -4207 +4209 @@
     );
 };
 
+/**
+ * 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.NearbyAnimalsRespondToAttack = function(attacker)
+{
+    var thisIdentity = Engine.QueryInterface(this.entity, IID_Identity);
+    // Look for other animal (gaia player = 0) nearby (dist=24, to be tuned)
+    var cmpRangeManager = Engine.QueryInterface(SYSTEM_ENTITY, IID_RangeManager);
+    var nearby = cmpRangeManager.ExecuteQuery(this.entity, 0, 24, [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")
+        {
+            cmpUnitAI.Flee(attacker, false);
+        }
+        else if (cmpUnitAI.IsDangerousAnimal() || cmpUnitAI.template.NaturalBehaviour == "defensive")
+        {
+            var cmpIdentity = Engine.QueryInterface(ent, IID_Identity);
+            if ((cmpIdentity.template.Species && cmpIdentity.template.Species == thisIdentity.template.Species) ||
+                (cmpIdentity.template.SpecificName && cmpIdentity.template.SpecificName == thisIdentity.template.SpecificName))
+            {
+                if(cmpUnitAI.CanAttack(attacker))
+                    cmpUnitAI.Attack(attacker, false);
+            }
+        }
+    }
+};
+
 Engine.RegisterComponentType(IID_UnitAI, "UnitAI", UnitAI);