From 0811f18dd72f86541f864699ac17c47ec47e042d Mon Sep 17 00:00:00 2001
From: Allanis <allanis@saracraft.net>
Date: Tue, 29 Apr 2014 17:25:54 +0100
Subject: [PATCH] [Change] Minor AI tweaks.

---
 scripts/ai/tpl/escort.lua  | 4 +++-
 scripts/ai/tpl/generic.lua | 5 +++++
 scripts/ai/tpl/scout.lua   | 2 +-
 3 files changed, 9 insertions(+), 2 deletions(-)

diff --git a/scripts/ai/tpl/escort.lua b/scripts/ai/tpl/escort.lua
index 64fbd7e..55f725f 100644
--- a/scripts/ai/tpl/escort.lua
+++ b/scripts/ai/tpl/escort.lua
@@ -85,7 +85,9 @@ end
 --Attack target.
 function e_attack(target)
   if command then
-    ai.pushtask(0, "attack", target)
+    if target ~= nil then
+      ai.pushtask(0, "attack", target)
+    end
   end
 end
 
diff --git a/scripts/ai/tpl/generic.lua b/scripts/ai/tpl/generic.lua
index d003263..3790211 100644
--- a/scripts/ai/tpl/generic.lua
+++ b/scripts/ai/tpl/generic.lua
@@ -83,6 +83,11 @@ function attacked(attacker)
     if ai.target() ~= attacker then
       ai.pushtask(0, "attack", attacker)
     end
+  elseif task == "runaway" then
+    if ai.target() ~= attacker then
+      ai.poptask()
+      ai.pushtask(0, "runaway", attacker)
+    end
   end
 end
 
diff --git a/scripts/ai/tpl/scout.lua b/scripts/ai/tpl/scout.lua
index 8ed888a..842589b 100644
--- a/scripts/ai/tpl/scout.lua
+++ b/scripts/ai/tpl/scout.lua
@@ -14,7 +14,7 @@ function control()
     enemy = ai.getenemy()
 
     -- There is an enemy.
-    if enemy ~= 0 then
+    if enemy ~= nil then
       if ai.dist(enemy) < enemy_dist or ai.haslockon() then
         ai.pushtask(0, "runaway", enemy)
         return