Ticket #3444: UnitAI_animal_behavior_with_Itms_suggestion.diff

UnitAI.js

@@ -1699 +1699 @@
                     this.SetGathererAnimationOverride(true);
 
                     this.SelectAnimation("move");
+                    if (this.IsAnimal())
+                    {
+                        // come on, no animal approaches intruders in a
+                        // walking pace
+                        var speed = this.GetRunSpeed();
+                        this.SetMoveSpeed(speed);
+                    }
+
                     this.StartTimer(1000, 1000);
                 },
 
+                "HealthChanged": function() {
+                    if (this.IsAnimal())
+                    {
+                        var speed = this.GetRunSpeed();
+                        this.SetMoveSpeed(speed);
+                    }
+                },
+
                 "leave": function() {
                     // Show carried resources when walking.
                     this.SetGathererAnimationOverride();
 
+                    if (this.IsAnimal())
+                    {
+                        var speed = this.GetWalkSpeed();
+                        this.SetMoveSpeed(speed);
+                    }
+
                     this.StopTimer();
                 },
 
@@ -1985 +2007 @@
 
                     this.SelectAnimation("move");
                     var cmpUnitAI = Engine.QueryInterface(this.order.data.target, IID_UnitAI);
-                    if (cmpUnitAI && cmpUnitAI.IsFleeing())
+                    if ((cmpUnitAI && cmpUnitAI.IsFleeing()) || this.IsAnimal())
                     {
                         // Run after a fleeing target
                         var speed = this.GetRunSpeed();