Ticket #1841: idle.diff

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

@@ -1108 +1108 @@
             },
 
             "LosRangeUpdate": function(msg) {
+                this.entitiesInLos = undefined;
                 if (this.GetStance().targetVisibleEnemies)
                 {
                     // Start attacking one of the newly-seen enemy (if any)
-                    this.AttackEntitiesByPreference(msg.data.added);
+                    var ok = this.AttackEntitiesByPreference(msg.data.added);
+                    // if !ok, the attacker is probably too far for our stance
+                    // but still we should keep an eye on him
+                    if (!ok && msg.data.added.length)
+                    {
+                        this.entitiesInLos = msg.data;
+                        if (!this.timer)
+                            this.StartTimer(1000);
+                    }
                 }
             },
 
             "LosGaiaRangeUpdate": function(msg) {
+                this.gaiaEntitiesInLos = undefined;
                 if (this.GetStance().targetVisibleEnemies)
                 {
                     // Start attacking one of the newly-seen enemy (if any)
-                    this.AttackGaiaEntitiesByPreference(msg.data.added);
+                    var ok = this.AttackGaiaEntitiesByPreference(msg.data.added);
+                    // if !ok, the attacker is probably too far for our stance
+                    // but still we should keep an eye on him
+                    if (!ok && msg.data.added.length)
+                    {
+                        this.gaiaEntitiesInLos = msg.data;
+                        if (!this.timer)
+                            this.StartTimer(1000);
+                    }
                 }
             },
 
@@ -1133 +1151 @@
                     this.isIdle = true;
                     Engine.PostMessage(this.entity, MT_UnitIdleChanged, { "idle": this.isIdle });
                 }
+                // then check if the detected attackers have come nearer
+                if (this.entitiesInLos)
+                    UnitFsm.ProcessMessage(this, {"type": "LosRangeUpdate", "data": this.entitiesInLos});
+                if (this.gaiaEntitiesInLos)
+                    UnitFsm.ProcessMessage(this, {"type": "LosGaiaRangeUpdate", "data": this.gaiaEntitiesInLos});
             },
         },