Changeset 9601 for ps

Timestamp:

06/09/11 18:41:55 (14 years ago)

Author:

philip

Message:

Remove redundant code for animal fleeing, and don't omit expected arguments.

File:

• ps/trunk/binaries/data/mods/public/simulation/components/UnitAI.js (modified) (4 diffs)

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

@@ -1089 +1089 @@
                 this.template.NaturalBehaviour == "passive")
             {
-                this.MoveToTargetRangeExplicit(msg.data.attacker, +this.template.FleeDistance, +this.template.FleeDistance);
-                this.Flee(msg.data.attacker);
+                this.Flee(msg.data.attacker, false);
             }
             else if (this.template.NaturalBehaviour == "violent" ||
@@ -1097 +1096 @@
             {
                 if (this.CanAttack(msg.data.attacker))
-                    this.ReplaceOrder("Attack", { "target": msg.data.attacker });
+                    this.Attack(msg.data.attacker, false);
             }
         },
@@ -1159 +1158 @@
                     if (msg.data.added.length > 0)
                     {
-                        this.MoveToTargetRangeExplicit(msg.data.added[0], +this.template.FleeDistance, +this.template.FleeDistance);
-                        this.Flee(msg.data.added[0]);
+                        this.Flee(msg.data.added[0], false);
                         return;
                     }
@@ -1204 +1202 @@
                     if (msg.data.added.length > 0)
                     {
-                        this.MoveToTargetRangeExplicit(msg.data.added[0], +this.template.FleeDistance, +this.template.FleeDistance);
-                        this.Flee(msg.data.added[0]);
+                        this.Flee(msg.data.added[0], false);
                         return;
                     }