We still have an issue here and there, but the main bulk is now gone.

26 files changed, 87 insertions, 138 deletions

diff --git a/npc/000-2-1/arpan.txt b/npc/000-2-1/arpan.txt
index 54f626028..353e2dc8e 100644
--- a/npc/000-2-1/arpan.txt
+++ b/npc/000-2-1/arpan.txt
@@ -16,21 +16,21 @@
 //    11   Need to see Julia
 //    12   Has been registered by Julia
 
-000-2-1,49,36,0	script	LeftDoorCheck#000-2-1	NPC_HIDDEN,0,0,{
+000-2-1,49,36,0	script	LeftDoorCheck#000-21	NPC_HIDDEN,0,0,{
     .@q = getq(ShipQuests_Arpan);
     if (.@q == 0) doevent "Magic Arpan#000-2-1::OnTalk";
 
     close;
 }
 
-000-2-1,54,36,0	script	RightDoorCheck#000-2-1	NPC_HIDDEN,0,0,{
+000-2-1,54,36,0	script	RightDoorCheck#000-21	NPC_HIDDEN,0,0,{
     .@q = getq(ShipQuests_Arpan);
     if (.@q == 0) doevent "Magic Arpan#000-2-1::OnTalk";
 
     close;
 }
 
-000-2-1,47,32,0	script	LeftBarrierCheck#000-2-1	NPC_HIDDEN,0,2,{
+000-2-1,47,32,0	script	LeftBarrierCheck#000-21	NPC_HIDDEN,0,2,{
     .@q = getq(ShipQuests_Arpan);
     if (.@q > 2) close;
     if (.@q == 2 && getequipid(equip_torso) == 1300 && getequipid(equip_legs) == 2200) goto L_EquipDone;
@@ -57,7 +57,7 @@ L_EquipDone:
     close;
 }
 
-000-2-1,56,32,0	script	RightBarrierCheck#000-2-1	NPC_HIDDEN,0,2,{
+000-2-1,56,32,0	script	RightBarrierCheck{::RightBC-000-2-1}	NPC_HIDDEN,0,2,{
     .@q = getq(ShipQuests_Arpan);
     if (.@q > 2) close;
     if (.@q == 2 && getequipid(equip_torso) == 1300 && getequipid(equip_legs) == 2200) goto L_EquipDone;
diff --git a/npc/003-1/ched.txt b/npc/003-1/ched.txt
index db824681f..1bb7d38bf 100644
--- a/npc/003-1/ched.txt
+++ b/npc/003-1/ched.txt
@@ -1,7 +1,7 @@
 // Author:
 //    Saulc
 
-003-1,40,49,0	script	Ched	450,{
+003-1,40,49,0	script	Ched	NPC_MONA,{
 
 hello;
 
@@ -9,4 +9,4 @@ OnInit:
     .sex = G_MALE;
     .distance = 3;
     end;
-}
\ No newline at end of file
+}
diff --git a/npc/003-1/constableperry.txt b/npc/003-1/constableperry.txt
index b2094dd79..64ab70e4d 100644
--- a/npc/003-1/constableperry.txt
+++ b/npc/003-1/constableperry.txt
@@ -1,7 +1,7 @@
 // Author:
 //    Saulc
 
-003-1,47,75,0	script	Constable Perry	449,{
+003-1,47,75,0	script	Constable Perry	NPC_MOUBOO,{
 
 hello;
 
diff --git a/npc/003-1/cyndala.txt b/npc/003-1/cyndala.txt
index c22f1446a..aeee8c7de 100644
--- a/npc/003-1/cyndala.txt
+++ b/npc/003-1/cyndala.txt
@@ -1,7 +1,7 @@
 // Author:
 //    Saulc
 
-003-1,41,80,0	script	Cyndala	450,{
+003-1,41,80,0	script	Cyndala	NPC_MONA,{
 
 hello;
 
@@ -9,4 +9,4 @@ OnInit:
     .sex = G_MALE;
     .distance = 3;
     end;
-}
\ No newline at end of file
+}
diff --git a/npc/003-1/eomie.txt b/npc/003-1/eomie.txt
index a2676728f..b566af4f5 100644
--- a/npc/003-1/eomie.txt
+++ b/npc/003-1/eomie.txt
@@ -1,7 +1,7 @@
 // Author:
 //    Saulc
 
-003-1,68,24,0	script	Eomie	450,{
+003-1,68,24,0	script	Eomie	NPC_MONA,{
 
 hello;
 
@@ -9,4 +9,4 @@ OnInit:
     .sex = G_MALE;
     .distance = 3;
     end;
-}
\ No newline at end of file
+}
diff --git a/npc/003-1/gladys.txt b/npc/003-1/gladys.txt
index bb49a0a36..19849edda 100644
--- a/npc/003-1/gladys.txt
+++ b/npc/003-1/gladys.txt
@@ -1,7 +1,7 @@
 // Author:
 //    Saulc
 
-003-1,63,105,0	script	Gladys	450,{
+003-1,63,105,0	script	Gladys	NPC_MONA,{
 
 
 hello;
@@ -10,4 +10,4 @@ OnInit:
     .sex = G_MALE;
     .distance = 3;
     end;
-}
\ No newline at end of file
+}
diff --git a/npc/003-1/inac.txt b/npc/003-1/inac.txt
index ffa7bcb7d..0358d01bf 100644
--- a/npc/003-1/inac.txt
+++ b/npc/003-1/inac.txt
@@ -1,7 +1,7 @@
 // Author:
 //    Saulc
 
-003-1,55,82,0	script	Inac	450,{
+003-1,55,82,0	script	Inac	NPC_MONA,{
 
 
 hello;
@@ -10,4 +10,4 @@ OnInit:
     .sex = G_MALE;
     .distance = 3;
     end;
-}
\ No newline at end of file
+}
diff --git a/npc/003-1/inar.txt b/npc/003-1/inar.txt
index 90197520d..c51aba60a 100644
--- a/npc/003-1/inar.txt
+++ b/npc/003-1/inar.txt
@@ -1,7 +1,7 @@
 // Author:
 //    Saulc
 
-003-1,109,109,0	script	Inar	450,{
+003-1,109,109,0	script	Inar	NPC_MONA,{
 
 
 hello;
@@ -10,4 +10,4 @@ OnInit:
     .sex = G_MALE;
     .distance = 3;
     end;
-}
\ No newline at end of file
+}
diff --git a/npc/003-1/itka.txt b/npc/003-1/itka.txt
index d8ec1d3cd..7db081dbc 100644
--- a/npc/003-1/itka.txt
+++ b/npc/003-1/itka.txt
@@ -1,7 +1,7 @@
 // Author:
 //    Saulc
 
-003-1,63,141,0	script	Itka	450,{
+003-1,63,141,0	script	Itka	NPC_MONA,{
 
 
 hello;
@@ -10,4 +10,4 @@ OnInit:
     .sex = G_MALE;
     .distance = 3;
     end;
-}
\ No newline at end of file
+}
diff --git a/npc/003-1/jakod.txt b/npc/003-1/jakod.txt
index 6d513d1dd..d1f7a12be 100644
--- a/npc/003-1/jakod.txt
+++ b/npc/003-1/jakod.txt
@@ -1,7 +1,7 @@
 // Author:
 //    Saulc
 
-003-1,62,76,0	script	Jakod	450,{
+003-1,62,76,0	script	Jakod	NPC_MONA,{
 
 
 hello;
diff --git a/npc/003-1/jerican.txt b/npc/003-1/jerican.txt
index 5a4a1cdb0..1ec7d8b48 100644
--- a/npc/003-1/jerican.txt
+++ b/npc/003-1/jerican.txt
@@ -1,7 +1,7 @@
 // Author:
 //    Saulc
 
-003-1,93,125,0	script	Jerican	450,{
+003-1,93,125,0	script	Jerican	NPC_MONA,{
 
 
 hello;
@@ -10,4 +10,4 @@ OnInit:
     .sex = G_MALE;
     .distance = 3;
     end;
-}
\ No newline at end of file
+}
diff --git a/npc/003-1/lieutenantdausen.txt b/npc/003-1/lieutenantdausen.txt
index 30b4cfdb0..9144aac2d 100644
--- a/npc/003-1/lieutenantdausen.txt
+++ b/npc/003-1/lieutenantdausen.txt
@@ -80,7 +80,7 @@ function	script	CheckGuard	{
     getexp 5,0;

     close;

 }

-003-1,98,100,0	script	Guard Philip	451,{

+003-1,98,100,0	script	Guard Philip	NPC_GUARD1,{

     if (getq(CandorQuest_HAS) == 1)

     {

         //CheckEnfant(); // FIXME and everywhere else: Missing Function

@@ -91,187 +91,136 @@ OnInit:
     .distance = 1;

     end;

 }

-003-1,98,121,0	script	Guard Defou	451,{

-    if (getq(CandorQuest_HAS) == 1)

-    {

-        //CheckEnfant();

-    }

+003-1,98,121,0	script	Guard Defou	NPC_GUARD1,{

+    legiontalk;

     end;

 OnInit:

     .sex = G_OTHER;

     .distance = 1;

     end;

 }

-003-1,102,121,0	script	Guard Avou	451,{

-    if (getq(CandorQuest_HAS) == 1)

-    {

-        //CheckEnfant();

-    }

+003-1,102,121,0	script	Guard Avou	NPC_GUARD1,{

+    legiontalk;

     end;

 OnInit:

     .sex = G_OTHER;

     .distance = 1;

     end;

 }

-003-1,58,158,0	script	Guard Benji	451,{

-    if (getq(CandorQuest_HAS) == 1)

-    {

-        //CheckEnfant();

-    }

+003-1,58,158,0	script	Guard Benji	NPC_GUARD1,{

+    legiontalk;

     end;

 OnInit:

     .sex = G_OTHER;

     .distance = 1;

     end;

 }

-003-1,62,158,0	script	Guard Valou	451,{

-    if (getq(CandorQuest_HAS) == 1)

-    {

-        //CheckEnfant();

-    }

+003-1,62,158,0	script	Guard Valou	NPC_GUARD1,{

+    legiontalk;

     end;

 OnInit:

     .sex = G_OTHER;

     .distance = 1;

     end;

 }

-003-1,71,138,0	script	Guard Nutelo	451,{

-    if (getq(CandorQuest_HAS) == 1)

-    {

-        //CheckEnfant();

-    }

+003-1,71,138,0	script	Guard Nutelo	NPC_GUARD1,{

+    legiontalk;

     end;

 OnInit:

     .sex = G_OTHER;

     .distance = 1;

     end;

 }

-003-1,58,128,0	script	Guard Moustacha	451,{

-    if (getq(CandorQuest_HAS) == 1)

-    {

-        //CheckEnfant();

-    }

+003-1,58,128,0	script	Guard Moustacha	NPC_GUARD1,{

+    legiontalk;

     end;

 OnInit:

     .sex = G_OTHER;

     .distance = 1;

     end;

 }

-003-1,58,100,0	script	Guard Popaul	451,{

-    if (getq(CandorQuest_HAS) == 1)

-    {

-        //CheckEnfant();

-    }

+003-1,58,100,0	script	Guard Popaul	NPC_GUARD1,{

+    legiontalk;

     end;

 OnInit:

     .sex = G_OTHER;

     .distance = 1;

     end;

 }

-003-1,51,73,0	script	Guard Yen	451,{

-    if (getq(CandorQuest_HAS) == 1)

-    {

-        //CheckEnfant();

-    }

+003-1,51,73,0	script	Guard Yen	NPC_GUARD1,{

+    legiontalk;

     end;

 OnInit:

     .sex = G_OTHER;

     .distance = 1;

     end;

 }

-003-2,41,37,0	script	Guard Youn	451,{

-    if (getq(CandorQuest_HAS) == 1)

-    {

-        //CheckEnfant();

-    }

+003-2,41,37,0	script	Guard Youn	NPC_GUARD1,{

+    legiontalk;

     end;

 OnInit:

     .sex = G_OTHER;

     .distance = 1;

     end;

 }

-003-1,54,52,0	script	Guard Maxim	451,{

-    if (getq(CandorQuest_HAS) == 1)

-    {

-        //CheckEnfant();

-    }

+003-1,54,52,0	script	Guard Maxim	NPC_GUARD1,{

+    legiontalk;

     end;

 OnInit:

     .sex = G_OTHER;

     .distance = 1;

     end;

 }

-003-1,50,36,0	script	Guard Totor	451,{

-    if (getq(CandorQuest_HAS) == 1)

-    {

-        //CheckEnfant();

-    }

+003-1,50,36,0	script	Guard Totor	NPC_GUARD1,{

+    legiontalk;

     end;

 OnInit:

     .sex = G_OTHER;

     .distance = 1;

     end;

 }

-003-1,53,36,0	script	Guard Roukin	451,{

-    if (getq(CandorQuest_HAS) == 1)

-    {

-        //CheckEnfant();

-    }

+003-1,53,36,0	script	Guard Roukin	NPC_GUARD1,{

+    legiontalk;

     end;

 OnInit:

     .sex = G_OTHER;

     .distance = 1;

     end;

 }

-003-1,35,34,0	script	Guard Falko	451,{

-    if (getq(CandorQuest_HAS) == 1)

-    {

-        //CheckEnfant();

-    }

+003-1,35,34,0	script	Guard Falko	NPC_GUARD1,{

+    legiontalk;

     end;

 OnInit:

     .sex = G_OTHER;

     .distance = 1;

     end;

 }

-003-3,39,37,0	script	Guard Malindax	451,{

-    if (getq(CandorQuest_HAS) == 1)

-    {

-        //CheckEnfant();

-    }

+003-3,39,37,0	script	Guard Malindax	NPC_GUARD1,{

+    legiontalk;

     end;

 OnInit:

     .sex = G_OTHER;

     .distance = 1;

     end;

 }

-003-1,111,101,0	script	Guard Fromag	451,{

-    if (getq(CandorQuest_HAS) == 1)

-    {

-        //CheckEnfant();

-    }

+003-1,111,101,0	script	Guard Fromag	NPC_GUARD1,{

+    legiontalk;

     end;

 OnInit:

     .sex = G_OTHER;

     .distance = 1;

     end;

 }

-003-1,102,80,0	script	Guard Tetric	451,{

-    if (getq(CandorQuest_HAS) == 1)

-    {

-        //CheckEnfant();

-    }

+003-1,102,80,0	script	Guard Tetric	NPC_GUARD1,{

+    legiontalk;

     end;

 OnInit:

     .sex = G_OTHER;

     .distance = 1;

     end;

 }

-003-1,107,80,0	script	Guard Biscop	451,{

-    if (getq(CandorQuest_HAS) == 1)

-    {

-        //CheckEnfant();

-    }

+003-1,107,80,0	script	Guard Biscop	NPC_GUARD1,{

+    legiontalk;

     end;

 OnInit:

     .sex = G_OTHER;

diff --git a/npc/003-1/luca.txt b/npc/003-1/luca.txt
index 8c090ae29..0b79ebb68 100644
--- a/npc/003-1/luca.txt
+++ b/npc/003-1/luca.txt
@@ -1,7 +1,7 @@
 // Author:
 //    Saulc
 
-003-1,109,129,0	script	Luca	450,{
+003-1,109,129,0	script	Luca	NPC_MONA,{
 
 
 hello;
@@ -10,4 +10,4 @@ OnInit:
     .sex = G_MALE;
     .distance = 3;
     end;
-}
\ No newline at end of file
+}
diff --git a/npc/003-1/mahoud.txt b/npc/003-1/mahoud.txt
index cadd72f34..ae169bbe5 100644
--- a/npc/003-1/mahoud.txt
+++ b/npc/003-1/mahoud.txt
@@ -1,7 +1,7 @@
 // Author:
 //    Saulc
 
-003-1,46,79,0	script	Mahoud	450,{
+003-1,46,79,0	script	Mahoud	NPC_MONA,{
 
 
 hello;
@@ -10,4 +10,4 @@ OnInit:
     .sex = G_MALE;
     .distance = 3;
     end;
-}
\ No newline at end of file
+}
diff --git a/npc/003-1/malivox.txt b/npc/003-1/malivox.txt
index 05a0ba6ca..bdb9d481c 100644
--- a/npc/003-1/malivox.txt
+++ b/npc/003-1/malivox.txt
@@ -1,7 +1,7 @@
 // Author:
 //    Saulc
 
-003-1,114,106,0	script	Malivox	450,{
+003-1,114,106,0	script	Malivox	NPC_MONA,{
 
  
 hello;
@@ -10,4 +10,4 @@ OnInit:
     .sex = G_MALE;
     .distance = 3;
     end;
-}
\ No newline at end of file
+}
diff --git a/npc/003-1/mariusthebard.txt b/npc/003-1/mariusthebard.txt
index 0296c7cdb..fe7169084 100644
--- a/npc/003-1/mariusthebard.txt
+++ b/npc/003-1/mariusthebard.txt
@@ -1,7 +1,7 @@
 // Author:
 //    Saulc
 
-003-1,88,135,0	script	Marius The Bard	441,{
+003-1,88,135,0	script	Marius The Bard	NPC_WATER_SPLASH,{
 
 
 hello;
@@ -10,4 +10,4 @@ OnInit:
     .sex = G_MALE;
     .distance = 3;
     end;
-}
\ No newline at end of file
+}
diff --git a/npc/003-1/michel.txt b/npc/003-1/michel.txt
index 3c70f7e81..c6665e932 100644
--- a/npc/003-1/michel.txt
+++ b/npc/003-1/michel.txt
@@ -1,7 +1,7 @@
 // Author:
 //    Saulc
 
-003-1,89,109,0	script	Michel	450,{
+003-1,89,109,0	script	Michel	NPC_MONA,{
 
 
 hello;
@@ -10,4 +10,4 @@ OnInit:
     .sex = G_MALE;
     .distance = 3;
     end;
-}
\ No newline at end of file
+}
diff --git a/npc/003-1/neko.txt b/npc/003-1/neko.txt
index f2d62df52..330fd03fc 100644
--- a/npc/003-1/neko.txt
+++ b/npc/003-1/neko.txt
@@ -1,7 +1,7 @@
 // Author:
 //    Saulc
 
-003-1,103,106,0	script	Neko	450,{
+003-1,103,106,0	script	Neko	NPC_MONA,{
 
 hello;
 
@@ -9,4 +9,4 @@ OnInit:
     .sex = G_MALE;
     .distance = 3;
     end;
-}
\ No newline at end of file
+}
diff --git a/npc/003-1/ninathetraveler.txt b/npc/003-1/ninathetraveler.txt
index 771a495ab..31180615d 100644
--- a/npc/003-1/ninathetraveler.txt
+++ b/npc/003-1/ninathetraveler.txt
@@ -1,7 +1,7 @@
 // Author:
 //    Saulc
 
-003-1,56,143,0	script	Nina The Traveler	451,{
+003-1,56,143,0	script	Nina The Traveler	NPC_GUARD1,{
 
     .cake = CherryCake;
     .reward = FancyHat;
diff --git a/npc/003-1/silvia.txt b/npc/003-1/silvia.txt
index 6798e360c..6acc4acb2 100644
--- a/npc/003-1/silvia.txt
+++ b/npc/003-1/silvia.txt
@@ -1,7 +1,7 @@
 // Author:
 //    Saulc
 
-003-1,109,150,0	script	Silvia	450,{
+003-1,109,150,0	script	Silvia	NPC_MONA,{
 
 hello;
 
@@ -9,4 +9,4 @@ OnInit:
     .sex = G_MALE;
     .distance = 3;
     end;
-}
\ No newline at end of file
+}
diff --git a/npc/003-1/swezanne.txt b/npc/003-1/swezanne.txt
index 99d85d001..04e2dde0a 100644
--- a/npc/003-1/swezanne.txt
+++ b/npc/003-1/swezanne.txt
@@ -1,7 +1,7 @@
 // Author:
 //    Saulc
 
-003-1,70,100,0	script	Swezanne	450,{
+003-1,70,100,0	script	Swezanne	NPC_MONA,{
 
 
 hello;
@@ -10,4 +10,4 @@ OnInit:
     .sex = G_MALE;
     .distance = 3;
     end;
-}
\ No newline at end of file
+}
diff --git a/npc/003-1/tinris.txt b/npc/003-1/tinris.txt
index d4d4434aa..de267dff8 100644
--- a/npc/003-1/tinris.txt
+++ b/npc/003-1/tinris.txt
@@ -1,7 +1,7 @@
 // Author:
 //    Saulc
 
-003-1,66,30,0	script	Tinris	450,{
+003-1,66,30,0	script	Tinris	NPC_MONA,{
 
 hello;
 
@@ -9,4 +9,4 @@ OnInit:
     .sex = G_MALE;
     .distance = 3;
     end;
-}
\ No newline at end of file
+}
diff --git a/npc/003-8/jhedia.txt b/npc/003-8/jhedia.txt
index 7994be439..9f661fa20 100644
--- a/npc/003-8/jhedia.txt
+++ b/npc/003-8/jhedia.txt
@@ -2,7 +2,7 @@
 // Author:
 //    Crazyfefe
 
-003-8,28,30,0	script	Jhedia	427,{
+003-8,28,30,0	script	Jhedia	NPC_ELVEN_FEMALE,{
 
     .Item1 = IronOre; //7
     .Item2 = Coal; //11
diff --git a/npc/005-1/ayasha.txt b/npc/005-1/ayasha.txt
index a59b586df..8a6338455 100644
--- a/npc/005-1/ayasha.txt
+++ b/npc/005-1/ayasha.txt
@@ -80,7 +80,7 @@ function	script	CheckEnfant	{
     getexp 5,0;

     close;

 }

-005-1,69,90,0	script	Charda	451,{

+005-1,69,90,0	script	Charda	NPC_GUARD1,{

     if (getq(CandorQuest_HAS) == 1)

     {

         CheckEnfant();

@@ -91,7 +91,7 @@ OnInit:
     .distance = 1;

     end;

 }

-005-1,23,84,0	script	Faris	451,{

+005-1,23,84,0	script	Faris	NPC_GUARD1,{

     if (getq(CandorQuest_HAS) == 1)

     {

         CheckEnfant();

@@ -102,7 +102,7 @@ OnInit:
     .distance = 1;

     end;

 }

-005-1,84,21,0	script	Ghada	445,{

+005-1,84,21,0	script	Ghada	NPC_HUMAN_M_ARTIS,{

     if (getq(CandorQuest_HAS) == 1)

     {

         CheckEnfant();

@@ -113,7 +113,7 @@ OnInit:
     .distance = 1;

     end;

 }

-005-1,38,58,0	script	Latif	445,{

+005-1,38,58,0	script	Latif	NPC_HUMAN_M_ARTIS,{

     if (getq(CandorQuest_HAS) == 1)

     {

         CheckEnfant();

@@ -124,7 +124,7 @@ OnInit:
     .distance = 1;

     end;

 }

-005-1,18,43,0	script	Rasin	445,{

+005-1,18,43,0	script	Rasin	NPC_HUMAN_M_ARTIS,{

     if (getq(CandorQuest_HAS) == 1)

     {

         CheckEnfant();

@@ -135,7 +135,7 @@ OnInit:
     .distance = 1;

     end;

 }

-005-1,38,65,0	script	Djinx	451,{

+005-1,38,65,0	script	Djinx	NPC_GUARD1,{

     if (getq(CandorQuest_HAS) == 1)

     {

         CheckEnfant();

diff --git a/npc/005-1/movetest.txt b/npc/005-1/movetest.txt
index 21868c2d9..dcec64459 100644
--- a/npc/005-1/movetest.txt
+++ b/npc/005-1/movetest.txt
@@ -12,13 +12,13 @@ OnTimer1000:
 
 OnInit:
     initpath "move", 44, 35,
-             //"dir", TOP, 0,
+             "dir", UP, 0,
              "wait", 2, 0,
              "move", 51, 81,
-             //"dir", DOWN, 0,
+             "dir", DOWN, 0,
              "wait", 2, 0,""
              "Mmove", 50, 88,
-             //"dir", DOWN, 0,
+             "dir", DOWN, 0,
              "wait", 2, 0;
 
     initialmove;
diff --git a/npc/005-4/rosen.txt b/npc/005-4/rosen.txt
index 958d74dee..e42e30bd2 100644
--- a/npc/005-4/rosen.txt
+++ b/npc/005-4/rosen.txt
@@ -14,7 +14,7 @@
 //    5    Light Armor Shop quest delivered.
 //    6    Light Armor Shop gave the cloths.
 
-005-4,29,36,0	script	Rosen	451,{
+005-4,29,36,0	script	Rosen	NPC_GUARD1,{
 
     function explain_ironingot {
         speech S_FIRST_BLANK_LINE | S_LAST_NEXT,