Ticket #563: AnimalAImm-16-02-2011.patch

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

@@ -90 +90 @@
                     if (cmpUnitAI)
                         cmpUnitAI.LeaveFoundation(this.entity);
 
-                    var cmpAnimalAI = Engine.QueryInterface(ent, IID_AnimalAI);
-                    if (cmpAnimalAI)
-                        cmpAnimalAI.LeaveFoundation(this.entity);
-
-                    // TODO: What if an obstruction has no UnitAI/AnimalAI?
+                    // TODO: What if an obstruction has no UnitAI?
                 }
 
                 // TODO: maybe we should tell the builder to use a special

binaries/data/mods/public/simulation/components/interfaces/AnimalAI.js

@@ -1 @@
-Engine.RegisterInterface("AnimalAI");

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

@@ -2 +2 @@
 
 UnitAI.prototype.Schema =
     "<a:help>Controls the unit's movement, attacks, etc, in response to commands from the player.</a:help>" +
-    "<a:example/>" +
+    "<a:example/>" +    
     "<element name='FormationController'>" +
         "<data type='boolean'/>" +
-    "</element>";
+    "</element>" +
+    "<optional>" +
+        "<interleave>" +
+            "<element name='NaturalBehaviour' a:help='Behaviour of the unit in the absence of player commands (intended for animals)'>" +
+                "<choice>" +
+                    "<value a:help='Will actively attack any unit it encounters, even if not threatened'>violent</value>" +
+                    "<value a:help='Will attack nearby units if it feels threatened (if they linger within LOS for too long)'>aggressive</value>" +
+                    "<value a:help='Will attack nearby units if attacked'>defensive</value>" +
+                    "<value a:help='Will never attack units'>passive</value>" +
+                    "<value a:help='Will never attack units. Will typically attempt to flee for short distances when units approach'>skittish</value>" +
+                "</choice>" +
+            "</element>" +
+            "<element name='RoamDistance'>" +
+                "<ref name='positiveDecimal'/>" +
+            "</element>" +
+            "<element name='FleeDistance'>" +
+                "<ref name='positiveDecimal'/>" +
+            "</element>" +
+            "<element name='RoamTimeMin'>" +
+                "<ref name='positiveDecimal'/>" +
+            "</element>" +
+            "<element name='RoamTimeMax'>" +
+                "<ref name='positiveDecimal'/>" +
+            "</element>" +
+            "<element name='FeedTimeMin'>" +
+                "<ref name='positiveDecimal'/>" +
+            "</element>" +
+            "<element name='FeedTimeMax'>" +
+                "<ref name='positiveDecimal'/>" +
+            "</element>"+
+        "</interleave>" +
+    "</optional>";
 
 // Very basic stance support (currently just for test maps where we don't want
 // everyone killing each other immediately after loading)
@@ -42 +73 @@
 
     "Attacked": function(msg) {
         // ignore attacker
+    },  
+
+    "HealthChanged": function(msg) {
+        // ignore
     },
 
-
     // Formation handlers:
 
     "FormationLeave": function(msg) {
@@ -111 +145 @@
         if (this.MoveToTargetRange(this.order.data.target, IID_Attack, this.attackType))
         {
             // We've started walking to the given point
-            this.SetNextState("INDIVIDUAL.COMBAT.APPROACHING");
+            if (this.template.NaturalBehaviour)
+                this.SetNextState("ANIMAL.COMBAT.APPROACHING");
+            else
+                this.SetNextState("INDIVIDUAL.COMBAT.APPROACHING");
         }
         else
         {
             // We are already at the target, or can't move at all,
             // so try attacking it from here.
             // TODO: need better handling of the can't-reach-target case
-            this.SetNextState("INDIVIDUAL.COMBAT.ATTACKING");
+            if (this.template.NaturalBehaviour)
+                this.SetNextState("ANIMAL.COMBAT.ATTACKING");
+            else
+                this.SetNextState("INDIVIDUAL.COMBAT.ATTACKING");
         }
     },
 
@@ -454 +494 @@
 
                     // Can't reach it, or it doesn't exist any more - give up
                     this.FinishOrder();
-                            
+
                     // TODO: see if we can switch to a new nearby enemy
                 },
-
-                // TODO: respond to target deaths immediately, rather than waiting
-                // until the next Timer event
             },
 
             "CHASING": {
@@ -841 +878 @@
         },
 
     },
+
+    "ANIMAL": {
+
+        "HealthChanged": function(msg) {
+            // If we died (got reduced to 0 hitpoints), stop the AI and act like a corpse
+            if (msg.to == 0)
+                this.SetNextState("CORPSE");
+        },
+
+        "Attacked": function(msg) {
+            if (this.template.NaturalBehaviour == "skittish" || this.template.NaturalBehaviour == "passive")
+            {
+                this.MoveAwayFrom(msg.data.attacker, +this.template.FleeDistance);
+                this.SetNextState("FLEEING");
+                this.PlaySound("panic");
+            }
+            else if(this.template.NaturalBehaviour == "violent" || this.template.NaturalBehaviour == "aggressive" || this.template.NaturalBehaviour == "defensive")
+            {
+                print("violent attack\n");
+                if(this.CanAttack(msg.data.attacker))
+                    this.PushOrderFront("Attack", { "target": msg.data.attacker });
+            }
+        },
+
+        "LeaveFoundation": function(msg) {
+            // Run away from the foundation
+            this.MoveAwayFrom(msg.target, +this.template.FleeDistance);
+            this.SetNextState("FLEEING");
+            this.PlaySound("panic");
+        },
+
+        "CORPSE": {
+            "enter": function() {
+                this.StopMoving();
+            },
+
+            "Attacked": function(msg) {
+                // Do nothing, because we're dead already
+            },
+
+            "LeaveFoundation": function(msg) {
+                // We can't walk away from the foundation (since we're dead),
+                // but we mustn't block its construction (since the builders would get stuck),
+                // and we don't want to trick gatherers into trying to reach us when
+                // we're stuck in the middle of a building, so just delete our corpse.
+                Engine.DestroyEntity(this.entity);
+            },
+        },
+
+        "ROAMING": {
+            "enter": function() {
+                // Walk in a random direction
+                this.SelectAnimation("walk", false, this.GetWalkSpeed());
+                this.MoveRandomly(+this.template.RoamDistance);
+                // Set a random timer to switch to feeding state
+                this.StartTimer(RandomInt(+this.template.RoamTimeMin, +this.template.RoamTimeMax));
+            },
+
+            "leave": function() {
+                this.StopTimer();
+            },
+
+            "LosRangeUpdate": function(msg) {
+                if (this.template.NaturalBehaviour == "skittish")
+                {
+                    if (msg.data.added.length > 0)
+                    {
+                        this.MoveAwayFrom(msg.data.added[0], +this.template.FleeDistance);
+                        this.SetNextState("FLEEING");
+                        this.PlaySound("panic");
+                        return;
+                    }
+                }
+                // Start attacking one of the newly-seen enemy (if any)
+                else if (this.template.NaturalBehaviour == "violent" || this.template.NaturalBehaviour == "aggressive")
+                    this.AttackVisibleEntity(msg.data.added);
+            },
+
+            "Timer": function(msg) {
+                this.SetNextState("FEEDING");
+            },
+
+            "MoveCompleted": function() {
+                this.MoveRandomly(+this.template.RoamDistance);
+            },
+        },
+
+        "FEEDING": {
+            "enter": function() {
+                // Stop and eat for a while
+                this.SelectAnimation("feeding");
+                this.StopMoving();
+                this.StartTimer(RandomInt(+this.template.FeedTimeMin, +this.template.FeedTimeMax));
+            },
+
+            "leave": function() {
+                this.StopTimer();
+            },
+
+            "LosRangeUpdate": function(msg) {
+                if (this.template.NaturalBehaviour == "skittish")
+                {
+                    if (msg.data.added.length > 0)
+                    {
+                        this.MoveAwayFrom(msg.data.added[0], +this.template.FleeDistance);
+                        this.SetNextState("FLEEING");
+                        this.PlaySound("panic");
+                        return;
+                    }
+                }
+                // Start attacking one of the newly-seen enemy (if any)
+                else if (this.template.NaturalBehaviour == "violent")
+                    this.AttackVisibleEntity(msg.data.added);
+            },
+
+            "MoveCompleted": function() { },
+
+            "Timer": function(msg) {
+                this.SetNextState("ROAMING");
+            },
+        },
+
+        "FLEEING": {
+            "enter": function() {
+                // Run quickly
+                var speed = this.GetRunSpeed();
+                this.SelectAnimation("run", false, speed);
+                this.SetMoveSpeed(speed);
+            },
+
+            "leave": function() {
+                // Reset normal speed
+                this.SetMoveSpeed(this.GetWalkSpeed());
+            },
+
+            "MoveCompleted": function() {
+                // When we've run far enough, go back to the roaming state
+                this.SetNextState("ROAMING");
+            },
+        },
+
+        "COMBAT": {
+            "Attacked": function(msg) {
+                // If we're already in combat mode, ignore anyone else
+                // who's attacking us
+            },
+
+            "APPROACHING": {
+                "enter": function () {
+                    this.SelectAnimation("move");
+                },
+
+                "MoveCompleted": function() {
+                    this.SetNextState("ATTACKING");
+                },
+            },
+
+            "ATTACKING": {
+                "enter": function() {
+                    var cmpAttack = Engine.QueryInterface(this.entity, IID_Attack);
+                    this.attackTimers = cmpAttack.GetTimers(this.attackType);
+
+                    this.SelectAnimation("melee", false, 1.0, "attack");
+                    this.SetAnimationSync(this.attackTimers.prepare, this.attackTimers.repeat);
+                    this.StartTimer(this.attackTimers.prepare, this.attackTimers.repeat);
+                },
+
+                "leave": function() {
+                    this.StopTimer();
+                },
+
+                "Timer": function(msg) {
+                    // Check the target is still alive
+                    if (this.TargetIsAlive(this.order.data.target))
+                    {
+                        // Check we can still reach the target
+                        if (this.CheckTargetRange(this.order.data.target, IID_Attack, this.attackType))
+                        {
+                            var cmpAttack = Engine.QueryInterface(this.entity, IID_Attack);
+                            cmpAttack.PerformAttack(this.attackType, this.order.data.target);
+                            return;
+                        }
+
+                        // Can't reach it - try to chase after it
+                        if (this.MoveToTargetRange(this.order.data.target, IID_Attack, this.attackType))
+                        {
+                            this.SetNextState("COMBAT.CHASING");
+                            return;
+                        }
+                    }
+
+                    // Can't reach it, or it doesn't exist any more - give up
+                    this.SetNextState("ANIMAL.ROAMING");
+                },
+
+                // TODO: respond to target deaths immediately, rather than waiting
+                // until the next Timer event
+            },
+
+            "CHASING": {
+                "enter": function () {
+                    this.SelectAnimation("move");
+                },
+
+                "MoveCompleted": function() {
+                    this.SetNextState("ATTACKING");
+                },
+            },
+        },
+
+
+    },
 };
 
 var UnitFsm = new FSM(UnitFsmSpec);
@@ -860 +1109 @@
     return (this.template.FormationController == "true");
 };
 
+UnitAI.prototype.IsAnAnimal = function()
+{
+return (this.template.NaturalBehaviour ? true : false);
+};
+
 UnitAI.prototype.IsIdle = function()
 {
     return this.isIdle;
@@ -867 +1121 @@
 
 UnitAI.prototype.OnCreate = function()
 {
-    if (this.IsFormationController())
+    if(this.IsAnAnimal())
+        UnitFsm.Init(this, "ANIMAL.FEEDING");
+    else if (this.IsFormationController())
         UnitFsm.Init(this, "FORMATIONCONTROLLER.IDLE");
     else
         UnitFsm.Init(this, "INDIVIDUAL.IDLE");
@@ -921 +1177 @@
         {
             // Exclude gaia, allies, and self
             // TODO: How to handle neutral players - Special query to attack military only?
-            if (i != owner && diplomacy[i - 1] < 0)
+            if (i != owner && (diplomacy[i - 1] < 0 || owner == 0))
                 players.push(i);
         }
     }
@@ -1614 +1870 @@
     return true;
 };
 
+//Animal specific functions
+UnitAI.prototype.OnHealthChanged = function(msg)
+{
+    UnitFsm.ProcessMessage(this, {"type": "HealthChanged", "from": msg.from, "to": msg.to});
+};
 
+UnitAI.prototype.MoveRandomly = function(distance)
+{
+    // We want to walk in a random direction, but avoid getting stuck
+    // in obstacles or narrow spaces.
+    // So pick a circular range from approximately our current position,
+    // and move outwards to the nearest point on that circle, which will
+    // lead to us avoiding obstacles and moving towards free space.
+
+    // TODO: we probably ought to have a 'home' point, and drift towards
+    // that, so we don't spread out all across the whole map
+
+    var cmpPosition = Engine.QueryInterface(this.entity, IID_Position);
+    if (!cmpPosition)
+        return;
+
+    if (!cmpPosition.IsInWorld())
+        return;
+
+    var pos = cmpPosition.GetPosition();
+
+    var jitter = 0.5;
+
+    // Randomly adjust the range's center a bit, so we tend to prefer
+    // moving in random directions (if there's nothing in the way)
+    var tx = pos.x + (2*Math.random()-1)*jitter;
+    var tz = pos.z + (2*Math.random()-1)*jitter;
+
+    var cmpMotion = Engine.QueryInterface(this.entity, IID_UnitMotion);
+    cmpMotion.MoveToPointRange(tx, tz, distance, distance);
+};
+
+UnitAI.prototype.MoveAwayFrom = function(ent, distance)
+{
+    var cmpMotion = Engine.QueryInterface(this.entity, IID_UnitMotion);
+    cmpMotion.MoveToTargetRange(ent, distance, distance);
+};
+
+UnitAI.prototype.SetMoveSpeed = function(speed)
+{
+    var cmpMotion = Engine.QueryInterface(this.entity, IID_UnitMotion);
+    cmpMotion.SetSpeed(speed);
+};
+
+
+
+
 Engine.RegisterComponentType(IID_UnitAI, "UnitAI", UnitAI);

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

@@ -1 @@
-function AnimalAI() {}
-
-AnimalAI.prototype.Schema =
-    "<a:example/>" +
-    "<element name='NaturalBehaviour' a:help='Behaviour of the unit in the absence of player commands (intended for animals)'>" +
-        "<choice>" +
-            "<value a:help='Will actively attack any unit it encounters, even if not threatened'>violent</value>" +
-            "<value a:help='Will attack nearby units if it feels threatened (if they linger within LOS for too long)'>aggressive</value>" +
-            "<value a:help='Will attack nearby units if attacked'>defensive</value>" +
-            "<value a:help='Will never attack units'>passive</value>" +
-            "<value a:help='Will never attack units. Will typically attempt to flee for short distances when units approach'>skittish</value>" +
-        "</choice>" +
-    "</element>" +
-    "<element name='RoamDistance'>" +
-        "<ref name='positiveDecimal'/>" +
-    "</element>" +
-    "<element name='FleeDistance'>" +
-        "<ref name='positiveDecimal'/>" +
-    "</element>" +
-    "<element name='RoamTimeMin'>" +
-        "<ref name='positiveDecimal'/>" +
-    "</element>" +
-    "<element name='RoamTimeMax'>" +
-        "<ref name='positiveDecimal'/>" +
-    "</element>" +
-    "<element name='FeedTimeMin'>" +
-        "<ref name='positiveDecimal'/>" +
-    "</element>" +
-    "<element name='FeedTimeMax'>" +
-        "<ref name='positiveDecimal'/>" +
-    "</element>";
-
-var AnimalFsmSpec = {
-
-    "MoveCompleted": function() {
-        // ignore spurious movement messages
-        // (these can happen when stopping moving at the same time
-        // as switching states)
-    },
-
-    "MoveStarted": function() {
-        // ignore spurious movement messages
-    },
-
-    "HealthChanged": function(msg) {
-        // If we died (got reduced to 0 hitpoints), stop the AI and act like a corpse
-        if (msg.to == 0)
-            this.SetNextState("CORPSE");
-    },
-
-    "CORPSE": {
-        "enter": function() {
-            this.StopMoving();
-        },
-
-        "Attacked": function(msg) {
-            // Do nothing, because we're dead already
-        },
-
-        "LeaveFoundation": function(msg) {
-            // We can't walk away from the foundation (since we're dead),
-            // but we mustn't block its construction (since the builders would get stuck),
-            // and we don't want to trick gatherers into trying to reach us when
-            // we're stuck in the middle of a building, so just delete our corpse.
-            Engine.DestroyEntity(this.entity);
-        },
-    },
-
-    "SKITTISH": {
-
-        "Attacked": function(msg) {
-            // If someone's attacking us, then run away
-            this.MoveAwayFrom(msg.data.attacker, +this.template.FleeDistance);
-            this.SetNextState("FLEEING");
-            this.PlaySound("panic");
-        },
-
-        "LeaveFoundation": function(msg) {
-            // Run away from the foundation
-            this.MoveAwayFrom(msg.target, +this.template.FleeDistance);
-            this.SetNextState("FLEEING");
-            this.PlaySound("panic");
-        },
-
-        "ROAMING": {
-            "enter": function() {
-                // Walk in a random direction
-                this.SelectAnimation("walk", false, this.GetWalkSpeed());
-                this.MoveRandomly(+this.template.RoamDistance);
-                // Set a random timer to switch to feeding state
-                this.StartTimer(RandomInt(+this.template.RoamTimeMin, +this.template.RoamTimeMax));
-            },
-
-            "leave": function() {
-                this.StopTimer();
-            },
-
-            "Timer": function(msg) {
-                this.SetNextState("FEEDING");
-            },
-
-            "MoveCompleted": function() {
-                this.MoveRandomly(+this.template.RoamDistance);
-            },
-        },
-
-        "FEEDING": {
-            "enter": function() {
-                // Stop and eat for a while
-                this.SelectAnimation("feeding");
-                this.StopMoving();
-                this.StartTimer(RandomInt(+this.template.FeedTimeMin, +this.template.FeedTimeMax));
-            },
-            
-            "leave": function() {
-                this.StopTimer();
-            },
-
-            "MoveCompleted": function() { },
-
-            "Timer": function(msg) {
-                this.SetNextState("ROAMING");
-            },
-        },
-
-        "FLEEING": {
-            "enter": function() {
-                // Run quickly
-                var speed = this.GetRunSpeed();
-                this.SelectAnimation("run", false, speed);
-                this.SetMoveSpeed(speed);
-            },
-
-            "leave": function() {
-                // Reset normal speed
-                this.SetMoveSpeed(this.GetWalkSpeed());
-            },
-
-            "MoveCompleted": function() {
-                // When we've run far enough, go back to the roaming state
-                this.SetNextState("ROAMING");
-            },
-        },
-    },
-
-    "PASSIVE": {
-
-        "Attacked": function(msg) {
-            // Do nothing, just let them kill us
-        },
-    
-        "LeaveFoundation": function(msg) {
-            // Walk away from the foundation
-            this.MoveAwayFrom(msg.target, 4);
-            this.SetNextState("FLEEING");
-        },
-
-        "ROAMING": {
-            "enter": function() {
-                // Walk in a random direction
-                this.SelectAnimation("walk", false, this.GetWalkSpeed());
-                this.MoveRandomly(+this.template.RoamDistance);
-                // Set a random timer to switch to feeding state
-                this.StartTimer(RandomInt(+this.template.RoamTimeMin, +this.template.RoamTimeMax));
-            },
-
-            "leave": function() {
-                this.StopTimer();
-            },
-
-            "Timer": function(msg) {
-                this.SetNextState("FEEDING");
-            },
-
-            "MoveCompleted": function() {
-                this.MoveRandomly(+this.template.RoamDistance);
-            },
-        },
-
-        "FEEDING": {
-            "enter": function() {
-                // Stop and eat for a while
-                this.SelectAnimation("feeding");
-                this.StopMoving();
-                this.StartTimer(RandomInt(+this.template.FeedTimeMin, +this.template.FeedTimeMax));
-            },
-            
-            "leave": function() {
-                this.StopTimer();
-            },
-
-            "MoveCompleted": function() { },
-
-            "Timer": function(msg) {
-                this.SetNextState("ROAMING");
-            },
-        },
-
-        "FLEEING": {
-            "enter": function() {
-                this.SelectAnimation("walk", false, this.GetWalkSpeed());
-            },
-
-            "MoveCompleted": function() {
-                this.SetNextState("ROAMING");
-            },
-        },
-    },
-
-};
-
-var AnimalFsm = new FSM(AnimalFsmSpec);
-
-AnimalAI.prototype.Init = function()
-{
-};
-
-// FSM linkage functions:
-
-AnimalAI.prototype.OnCreate = function()
-{
-    var startingState = this.template.NaturalBehaviour;
-    startingState = startingState.toUpperCase(startingState);
-
-    if (startingState == "SKITTISH")
-        startingState = startingState + ".FEEDING";
-    else
-        startingState = "PASSIVE.FEEDING";
-
-    AnimalFsm.Init(this, startingState);
-};
-
-AnimalAI.prototype.SetNextState = function(state)
-{
-    AnimalFsm.SetNextState(this, state);
-};
-
-AnimalAI.prototype.DeferMessage = function(msg)
-{
-    AnimalFsm.DeferMessage(this, msg);
-};
-
-AnimalAI.prototype.OnMotionChanged = function(msg)
-{
-    if (msg.starting && !msg.error)
-    {
-        AnimalFsm.ProcessMessage(this, {"type": "MoveStarted", "data": msg});
-    }
-    else if (!msg.starting || msg.error)
-    {
-        AnimalFsm.ProcessMessage(this, {"type": "MoveCompleted", "data": msg});
-    }
-};
-
-AnimalAI.prototype.OnAttacked = function(msg)
-{
-    AnimalFsm.ProcessMessage(this, {"type": "Attacked", "data": msg});
-};
-
-AnimalAI.prototype.OnHealthChanged = function(msg)
-{
-    AnimalFsm.ProcessMessage(this, {"type": "HealthChanged", "from": msg.from, "to": msg.to});
-};
-
-AnimalAI.prototype.TimerHandler = function(data, lateness)
-{
-    AnimalFsm.ProcessMessage(this, {"type": "Timer", "data": data, "lateness": lateness});
-};
-
-AnimalAI.prototype.LeaveFoundation = function(target)
-{
-    AnimalFsm.ProcessMessage(this, {"type": "LeaveFoundation", "target": target});
-};
-
-// Functions to be called by the FSM:
-
-AnimalAI.prototype.GetWalkSpeed = function()
-{
-    var cmpMotion = Engine.QueryInterface(this.entity, IID_UnitMotion);
-    return cmpMotion.GetWalkSpeed();
-};
-
-AnimalAI.prototype.GetRunSpeed = function()
-{
-    var cmpMotion = Engine.QueryInterface(this.entity, IID_UnitMotion);
-    return cmpMotion.GetRunSpeed();
-};
-
-AnimalAI.prototype.PlaySound = function(name)
-{
-    PlaySound(name, this.entity);
-};
-
-AnimalAI.prototype.SelectAnimation = function(name, once, speed, sound)
-{
-    var cmpVisual = Engine.QueryInterface(this.entity, IID_Visual);
-    if (!cmpVisual)
-        return;
-
-    var soundgroup;
-    if (sound)
-    {
-        var cmpSound = Engine.QueryInterface(this.entity, IID_Sound);
-        if (cmpSound)
-            soundgroup = cmpSound.GetSoundGroup(sound);
-    }
-
-    // Set default values if unspecified
-    if (typeof once == "undefined")
-        once = false;
-    if (typeof speed == "undefined")
-        speed = 1.0;
-    if (typeof soundgroup == "undefined")
-        soundgroup = "";
-
-    cmpVisual.SelectAnimation(name, once, speed, soundgroup);
-};
-
-AnimalAI.prototype.MoveRandomly = function(distance)
-{
-    // We want to walk in a random direction, but avoid getting stuck
-    // in obstacles or narrow spaces.
-    // So pick a circular range from approximately our current position,
-    // and move outwards to the nearest point on that circle, which will
-    // lead to us avoiding obstacles and moving towards free space.
-
-    // TODO: we probably ought to have a 'home' point, and drift towards
-    // that, so we don't spread out all across the whole map
-
-    var cmpPosition = Engine.QueryInterface(this.entity, IID_Position);
-    if (!cmpPosition)
-        return;
-
-    if (!cmpPosition.IsInWorld())
-        return;
-
-    var pos = cmpPosition.GetPosition();
-
-    var jitter = 0.5;
-
-    // Randomly adjust the range's center a bit, so we tend to prefer
-    // moving in random directions (if there's nothing in the way)
-    var tx = pos.x + (2*Math.random()-1)*jitter;
-    var tz = pos.z + (2*Math.random()-1)*jitter;
-
-    var cmpMotion = Engine.QueryInterface(this.entity, IID_UnitMotion);
-    cmpMotion.MoveToPointRange(tx, tz, distance, distance);
-};
-
-AnimalAI.prototype.MoveAwayFrom = function(ent, distance)
-{
-    var cmpMotion = Engine.QueryInterface(this.entity, IID_UnitMotion);
-    cmpMotion.MoveToTargetRange(ent, distance, distance);
-};
-
-AnimalAI.prototype.StopMoving = function()
-{
-    var cmpMotion = Engine.QueryInterface(this.entity, IID_UnitMotion);
-    cmpMotion.StopMoving();
-};
-
-AnimalAI.prototype.SetMoveSpeed = function(speed)
-{
-    var cmpMotion = Engine.QueryInterface(this.entity, IID_UnitMotion);
-    cmpMotion.SetSpeed(speed);
-};
-
-AnimalAI.prototype.StartTimer = function(interval, data)
-{
-    if (this.timer)
-        error("Called StartTimer when there's already an active timer");
-
-    var cmpTimer = Engine.QueryInterface(SYSTEM_ENTITY, IID_Timer);
-    this.timer = cmpTimer.SetTimeout(this.entity, IID_AnimalAI, "TimerHandler", interval, data);
-};
-
-AnimalAI.prototype.StopTimer = function()
-{
-    if (!this.timer)
-        return;
-
-    var cmpTimer = Engine.QueryInterface(SYSTEM_ENTITY, IID_Timer);
-    cmpTimer.CancelTimer(this.timer);
-    this.timer = undefined;
-};
-
-Engine.RegisterComponentType(IID_AnimalAI, "AnimalAI", AnimalAI);

binaries/data/mods/public/simulation/templates/template_unit_fauna_wild_defensive.xml

@@ -2 +2 @@
 <Entity parent="template_unit_fauna_wild">
   <Identity>
   </Identity>
-  <AnimalAI>
+  <UnitAI>
     <NaturalBehaviour>defensive</NaturalBehaviour>
-  </AnimalAI>
+  </UnitAI>
 </Entity>

binaries/data/mods/public/simulation/templates/template_unit_fauna_hunt_aggressive.xml

@@ -2 +2 @@
 <Entity parent="template_unit_fauna_hunt">
   <Identity>
   </Identity>
-  <AnimalAI>
+  <UnitAI>
     <NaturalBehaviour>aggressive</NaturalBehaviour>
-  </AnimalAI>
+  </UnitAI>
+  <Attack>
+    <Melee>
+      <Hack>1.0</Hack>
+      <Pierce>1.0</Pierce>
+      <Crush>0.0</Crush>
+      <MaxRange>4.0</MaxRange>
+      <RepeatTime>1000</RepeatTime>
+    </Melee>
+  </Attack>
 </Entity>

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

@@ -22 +22 @@
     <Circle radius="0.75"/>
     <Height>1.5</Height>
   </Footprint>
-  <AnimalAI>
+  <UnitAI>
     <RoamDistance>4.0</RoamDistance>
     <FleeDistance>12.0</FleeDistance>
     <RoamTimeMin>2000</RoamTimeMin>
     <RoamTimeMax>8000</RoamTimeMax>
     <FeedTimeMin>10000</FeedTimeMin>
     <FeedTimeMax>40000</FeedTimeMax>
-  </AnimalAI>
+  </UnitAI>
   <UnitMotion>
     <WalkSpeed>1.0</WalkSpeed>
     <Run>

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

@@ -35 +35 @@
     <Altitude>-4.0</Altitude>
     <Floating>true</Floating>
   </Position>
-  <AnimalAI>
+  <UnitAI>
     <NaturalBehaviour>skittish</NaturalBehaviour>
     <RoamDistance>20.0</RoamDistance>
     <FleeDistance>40.0</FleeDistance>
@@ -43 +43 @@
     <RoamTimeMax>30000</RoamTimeMax>
     <FeedTimeMin>1000</FeedTimeMin>
     <FeedTimeMax>2000</FeedTimeMax>
-  </AnimalAI>
+  </UnitAI>
   <ResourceSupply>
     <KillBeforeGather>true</KillBeforeGather>
     <Amount>2000</Amount>

binaries/data/mods/public/simulation/templates/template_unit_fauna_wild_violent.xml

@@ -2 +2 @@
 <Entity parent="template_unit_fauna_wild">
   <Identity>
   </Identity>
-  <AnimalAI>
+  <UnitAI>
     <NaturalBehaviour>violent</NaturalBehaviour>
-  </AnimalAI>
+  </UnitAI>
+  <Attack>
+    <Melee>
+      <Hack>1.0</Hack>
+      <Pierce>1.0</Pierce>
+      <Crush>0.0</Crush>
+      <MaxRange>4.0</MaxRange>
+      <RepeatTime>1000</RepeatTime>
+    </Melee>
+  </Attack>
 </Entity>

binaries/data/mods/public/simulation/templates/template_unit_fauna_wild_passive.xml

@@ -2 +2 @@
 <Entity parent="template_unit_fauna_wild">
   <Identity>
   </Identity>
-  <AnimalAI>
+  <UnitAI>
     <NaturalBehaviour>passive</NaturalBehaviour>
-  </AnimalAI>
+  </UnitAI>
 </Entity>

binaries/data/mods/public/simulation/templates/template_unit_fauna_breed_passive.xml

@@ -2 +2 @@
 <Entity parent="template_unit_fauna_breed">
   <Identity>
   </Identity>
-  <AnimalAI>
+  <UnitAI>
     <NaturalBehaviour>passive</NaturalBehaviour>
-  </AnimalAI>
+  </UnitAI>
 </Entity>

binaries/data/mods/public/simulation/templates/template_unit_fauna_herd_passive.xml

@@ -2 +2 @@
 <Entity parent="template_unit_fauna_herd">
   <Identity>
   </Identity>
-  <AnimalAI>
+  <UnitAI>
     <NaturalBehaviour>passive</NaturalBehaviour>
-  </AnimalAI>
+  </UnitAI>
 </Entity>

binaries/data/mods/public/simulation/templates/template_unit_fauna_wild_aggressive.xml

@@ -2 +2 @@
 <Entity parent="template_unit_fauna_wild">
   <Identity>
   </Identity>
-  <AnimalAI>
-    <NaturalBehaviour>violent</NaturalBehaviour>
-  </AnimalAI>
+  <UnitAI>
+    <NaturalBehaviour>aggressive</NaturalBehaviour>
+  </UnitAI>
+  <Attack>
+    <Melee>
+      <Hack>1.0</Hack>
+      <Pierce>1.0</Pierce>
+      <Crush>0.0</Crush>
+      <MaxRange>4.0</MaxRange>
+      <RepeatTime>1000</RepeatTime>
+    </Melee>
+  </Attack>
 </Entity>

binaries/data/mods/public/simulation/templates/template_unit_fauna_hunt_violent.xml

@@ -2 +2 @@
 <Entity parent="template_unit_fauna_hunt">
   <Identity>
   </Identity>
-  <AnimalAI>
+  <UnitAI>
     <NaturalBehaviour>violent</NaturalBehaviour>
-  </AnimalAI>
+  </UnitAI>
+  <Attack>
+    <Melee>
+      <Hack>1.0</Hack>
+      <Pierce>1.0</Pierce>
+      <Crush>0.0</Crush>
+      <MaxRange>4.0</MaxRange>
+      <RepeatTime>1000</RepeatTime>
+    </Melee>
+  </Attack>
 </Entity>

binaries/data/mods/public/simulation/templates/template_unit_fauna_hunt_passive.xml

@@ -2 +2 @@
 <Entity parent="template_unit_fauna_hunt">
   <Identity>
   </Identity>
-  <AnimalAI>
+  <UnitAI>
     <NaturalBehaviour>passive</NaturalBehaviour>
-  </AnimalAI>
+  </UnitAI>
 </Entity>

binaries/data/mods/public/simulation/templates/template_unit_fauna.xml

@@ -25 +25 @@
       <Speed>6.0</Speed>
     </Run>
   </UnitMotion>
-  <UnitAI disable=""/>
-  <AnimalAI>
+  <UnitAI>
     <RoamDistance>8.0</RoamDistance>
     <FleeDistance>32.0</FleeDistance>
     <RoamTimeMin>2000</RoamTimeMin>
     <RoamTimeMax>8000</RoamTimeMax>
     <FeedTimeMin>15000</FeedTimeMin>
     <FeedTimeMax>60000</FeedTimeMax>
-  </AnimalAI>
+  </UnitAI>
 </Entity>

binaries/data/mods/public/simulation/templates/template_unit_fauna_fish.xml

@@ -18 +18 @@
     <Floating>true</Floating>
   </Position>
   <UnitMotion disable=""/>
-  <AnimalAI disable=""/>
+  <UnitAI disable=""/>
   <ResourceSupply>
     <KillBeforeGather>false</KillBeforeGather>
     <Amount>1000</Amount>

binaries/data/mods/public/simulation/templates/template_unit_fauna_hunt_skittish.xml

@@ -2 +2 @@
 <Entity parent="template_unit_fauna_hunt">
   <Identity>
   </Identity>
-  <AnimalAI>
+  <UnitAI>
     <NaturalBehaviour>skittish</NaturalBehaviour>
-  </AnimalAI>
+  </UnitAI>
 </Entity>

binaries/data/mods/public/simulation/templates/template_unit_fauna_hunt_defensive.xml

@@ -2 +2 @@
 <Entity parent="template_unit_fauna_hunt">
   <Identity>
   </Identity>
-  <AnimalAI>
+  <UnitAI>
     <NaturalBehaviour>defensive</NaturalBehaviour>
-  </AnimalAI>
+  </UnitAI>
 </Entity>