From e37699bf31cc37d55324e05b8c4bb508464cb040 Mon Sep 17 00:00:00 2001
From: Reid <reidyaro@gmail.com>
Date: Tue, 3 Feb 2015 03:22:32 +0100
Subject: Fix alige animation.

---
 npc/000-2-1/alige.txt  | 29 ++++++++++++++++-------------
 npc/001-2-22/alige.txt | 33 ++++++++++++++++++---------------
 2 files changed, 34 insertions(+), 28 deletions(-)

diff --git a/npc/000-2-1/alige.txt b/npc/000-2-1/alige.txt
index 8b6d82b1..39d88b3c 100644
--- a/npc/000-2-1/alige.txt
+++ b/npc/000-2-1/alige.txt
@@ -20,29 +20,32 @@
 000-2-1,43,32,0	script	AligeTrigger	32767,1,1,{
 
 OnTouch:
+    if (getareausers() <= 1)
+    {
+        setnpcdir "Alige", 2;
+        stopnpctimer;
+        initnpctimer;
+    }
+
     if (getq(ShipQuests_Alige) > 0) close;
     doevent "Alige::OnFirstEncounter";
 
     close;
 
-OnTouchFirst:
-    setnpcdir "Alige", 2;
-    stopnpctimer;
-    initnpctimer;
-
-    goto OnTouch;
-
-OnUnTouchAll:
-    setnpcdir "Alige", 4;
-    stopnpctimer;
-    initnpctimer;
-
+OnUnTouch:
+    if (getareausers() == 0)
+    {
+        setnpcdir "Alige", 4;
+        stopnpctimer;
+        initnpctimer;
+    }
     close;
 
 OnTimer190:
+    stopnpctimer;
+
     if (getnpcdir ("Alige") == 2) setnpcdir "Alige", 6;
     if (getnpcdir ("Alige") == 4) setnpcdir "Alige", 8;
-    stopnpctimer;
 
     end;
 }
diff --git a/npc/001-2-22/alige.txt b/npc/001-2-22/alige.txt
index 53cb9f80..24db2387 100644
--- a/npc/001-2-22/alige.txt
+++ b/npc/001-2-22/alige.txt
@@ -20,30 +20,33 @@
 001-2-22,43,32,0	script	AligeTrigger#Artis	32767,1,1,{
 
 OnTouch:
+    if (getareausers() <= 1)
+    {
+        setnpcdir "Alige#Artis", 2;
+        stopnpctimer;
+        initnpctimer;
+    }
+
     if (getq(ShipQuests_Alige) > 0) close;
-    doevent "Alige::OnFirstEncounter";
+    doevent "Alige#Artis::OnFirstEncounter";
 
     close;
 
-OnTouchFirst:
-    setnpcdir "Alige", 2;
-    stopnpctimer;
-    initnpctimer;
-
-    goto OnTouch;
-
-OnUnTouchAll:
-    setnpcdir "Alige", 4;
-    stopnpctimer;
-    initnpctimer;
-
+OnUnTouch:
+    if (getareausers() == 0)
+    {
+        setnpcdir "Alige#Artis", 4;
+        stopnpctimer;
+        initnpctimer;
+    }
     close;
 
 OnTimer190:
-    if (getnpcdir ("Alige") == 2) setnpcdir "Alige", 6;
-    if (getnpcdir ("Alige") == 4) setnpcdir "Alige", 8;
     stopnpctimer;
 
+    if (getnpcdir ("Alige#Artis") == 2) setnpcdir "Alige#Artis", 6;
+    if (getnpcdir ("Alige#Artis") == 4) setnpcdir "Alige#Artis", 8;
+
     end;
 }
 
-- 
cgit v1.2.3-60-g2f50