Ticket #1724: collectiveBehavior-edit.patch

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

@@ -15 +15 @@
         "<text/>" +
     "</element>" +
     "<optional>" +
+        "<element name='Species' a:help='Species this unit belongs to'>" +
+            "<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

@@ -2127 +2127 @@
                 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")
             {
@@ -4238 +4240 @@
     );
 };
 
+/**
+ * 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 species which is involved
+ */
+UnitAI.prototype.NearbyAnimalsRespondToAttack = function(attacker)
+{
+    var cmpOwnIdentity = Engine.QueryInterface(this.entity, IID_Identity);
+    var cmpRangeManager = Engine.QueryInterface(SYSTEM_ENTITY, IID_RangeManager);
+    // Get other animals ; range = 24 (TODO: what is a good value?), players = [0] (gaia only)
+    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 (cmpOwnIdentity && cmpOwnIdentity.template.Species &&
+                 (cmpUnitAI.IsDangerousAnimal() || cmpUnitAI.template.NaturalBehaviour == "defensive"))
+        {
+            var cmpIdentity = Engine.QueryInterface(ent, IID_Identity);
+            if (cmpIdentity && cmpIdentity.template.Species &&
+                cmpIdentity.template.Species == cmpOwnIdentity.template.Species)
+            {
+                if(cmpUnitAI.CanAttack(attacker))
+                    cmpUnitAI.Attack(attacker, false);
+            }
+        }
+    }
+};
+
 Engine.RegisterComponentType(IID_UnitAI, "UnitAI", UnitAI);

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_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_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/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_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_lion.xml

@@ -15 +15 @@
   </Footprint>
   <Identity>
     <Civ>gaia</Civ>
+    <Species>Panthera leo</Species>
     <SpecificName>Lion</SpecificName>
     <Icon>gaia/fauna_lion.png</Icon>
   </Identity>

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

@@ -15 +15 @@
   </Footprint>
   <Identity>
     <Civ>gaia</Civ>
+    <Species>Panthera leo</Species>
     <SpecificName>Lion</SpecificName>
     <Icon>gaia/fauna_lion.png</Icon>
   </Identity>

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

@@ -15 +15 @@
   </Footprint>
   <Identity>
     <Civ>gaia</Civ>
+    <Species>Canis lupus</Species>
     <SpecificName>Wolf</SpecificName>
     <Icon>gaia/fauna_wolf.png</Icon>
   </Identity>

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

@@ -15 +15 @@
   </Footprint>
   <Identity>
     <Civ>gaia</Civ>
+    <Species>Canis lupus</Species>
     <SpecificName>Snow Wolf</SpecificName>
     <Icon>gaia/fauna_wolf_snow.png</Icon>
   </Identity>