Use npc sprite names in all scripts.

18 files changed, 56 insertions, 56 deletions

diff --git a/npc/001-1/artaxe.txt b/npc/001-1/artaxe.txt
index fad84bc1..3d81f709 100644
--- a/npc/001-1/artaxe.txt
+++ b/npc/001-1/artaxe.txt
@@ -5,7 +5,7 @@
 // Description:
 //    Helping NPC.
 
-001-1,92,43,0	script	Artaxe	109,{
+001-1,92,43,0	script	Artaxe	NPC_SHOP_BAG,{
     mesn;
     mesq l("Do you feel too weak even if trying to hit the surrounding wildlife?");
     next;
diff --git a/npc/001-1/beuss.txt b/npc/001-1/beuss.txt
index da2d2d79..96898549 100644
--- a/npc/001-1/beuss.txt
+++ b/npc/001-1/beuss.txt
@@ -4,7 +4,7 @@
 // Description:
 //    Angry member of the legion of Aemil.
 
-001-1,45,52,0	script	Beuss	424,{
+001-1,45,52,0	script	Beuss	NPC_BEUSS,{
     stopnpctimer;
     initnpctimer;
     setnpcdir 4;
diff --git a/npc/001-1/chelios.txt b/npc/001-1/chelios.txt
index 8c937820..c07af9de 100644
--- a/npc/001-1/chelios.txt
+++ b/npc/001-1/chelios.txt
@@ -4,7 +4,7 @@
 // Description:
 //    Blacksmith's assistant of Artis
 
-001-1,95,109,0	script	Chelios	429,{
+001-1,95,109,0	script	Chelios	NPC_CHELIOS,{
     mesn;
     mesq l("Can I be of any help?");
 
diff --git a/npc/001-1/cookiemaster.txt b/npc/001-1/cookiemaster.txt
index 774d0c85..b5c93ad5 100644
--- a/npc/001-1/cookiemaster.txt
+++ b/npc/001-1/cookiemaster.txt
@@ -10,7 +10,7 @@
 //    0   Default, didn't get a cookie.
 //    1   Get a cookie.
 
-001-1,39,38,0	script	Cookie Master	419,{
+001-1,39,38,0	script	Cookie Master	NPC_COOKIE_MASTER,{
     if ((countitemcolor(517) == 0) && (getq(General_Cookies) == 1))
         goto L_LostCookie;
     if (getq(General_Cookies) == 1)
diff --git a/npc/001-1/doors.txt b/npc/001-1/doors.txt
index a9452a74..d75d4d1f 100644
--- a/npc/001-1/doors.txt
+++ b/npc/001-1/doors.txt
@@ -5,7 +5,7 @@
 //    Doors warp and animations in map 001-1
 //
 
-001-1,55,71,0	script	#Warp1	32767,0,0,{
+001-1,55,71,0	script	#Warp1	NPC_HIDDEN,0,0,{
 OnTouch:
     warp "001-2-0", 37, 45;
     close;
@@ -14,7 +14,7 @@ OnUnTouch:
     doevent "#Door1::OnUnTouch";
 }
 
-001-1,55,71,0	script	#Door1	906,2,3,{
+001-1,55,71,0	script	#Door1	NPC_ARTIS_DOOR,2,3,{
     close;
 
 OnTouch:
@@ -32,7 +32,7 @@ OnInit:
     end;
 }
 
-001-1,51,65,0	script	#Warp2	32767,0,0,{
+001-1,51,65,0	script	#Warp2	NPC_HIDDEN,0,0,{
 OnTouch:
     warp "001-2-0", 30, 34;
     close;
@@ -41,7 +41,7 @@ OnUnTouch:
     doevent "#Door2::OnUnTouch";
 }
 
-001-1,51,65,0	script	#Door2	906,3,3,{
+001-1,51,65,0	script	#Door2	NPC_ARTIS_DOOR,3,3,{
     close;
 
 OnTouch:
@@ -59,7 +59,7 @@ OnInit:
     end;
 }
 
-001-1,70,77,0	script	#Warp3	32767,0,0,{
+001-1,70,77,0	script	#Warp3	NPC_HIDDEN,0,0,{
 OnTouch:
     warp "001-2-2", 38, 38;
     close;
@@ -68,7 +68,7 @@ OnUnTouch:
     doevent "#Door3::OnUnTouch";
 }
 
-001-1,70,77,0	script	#Door3	906,3,3,{
+001-1,70,77,0	script	#Door3	NPC_ARTIS_DOOR,3,3,{
     close;
 
 OnTouch:
@@ -86,7 +86,7 @@ OnInit:
     end;
 }
 
-001-1,51,80,0	script	#Warp4	32767,0,0,{
+001-1,51,80,0	script	#Warp4	NPC_HIDDEN,0,0,{
 OnTouch:
     warp "001-2-4", 48, 40;
     close;
@@ -95,7 +95,7 @@ OnUnTouch:
     doevent "#Door4::OnUnTouch";
 }
 
-001-1,51,80,0	script	#Door4	906,3,3,{
+001-1,51,80,0	script	#Door4	NPC_ARTIS_DOOR,3,3,{
     close;
 
 OnTouch:
@@ -113,7 +113,7 @@ OnInit:
     end;
 }
 
-001-1,89,65,0	script	#Warp5	32767,0,0,{
+001-1,89,65,0	script	#Warp5	NPC_HIDDEN,0,0,{
 OnTouch:
     warp "001-2-7", 36, 45;
     close;
@@ -122,7 +122,7 @@ OnUnTouch:
     doevent "#Door5::OnUnTouch";
 }
 
-001-1,89,65,0	script	#Door5	906,3,3,{
+001-1,89,65,0	script	#Door5	NPC_ARTIS_DOOR,3,3,{
     close;
 
 OnTouch:
@@ -140,7 +140,7 @@ OnInit:
     end;
 }
 
-001-1,142,30,0	script	#Warp6	32767,0,0,{
+001-1,142,30,0	script	#Warp6	NPC_HIDDEN,0,0,{
 OnTouch:
     warp "001-2-12", 34, 35;
     close;
@@ -149,7 +149,7 @@ OnUnTouch:
     doevent "#Door6::OnUnTouch";
 }
 
-001-1,142,30,0	script	#Door6	906,3,3,{
+001-1,142,30,0	script	#Door6	NPC_ARTIS_DOOR,3,3,{
     close;
 
 OnTouch:
@@ -167,7 +167,7 @@ OnInit:
     end;
 }
 
-001-1,132,67,0	script	#Warp7	32767,0,0,{
+001-1,132,67,0	script	#Warp7	NPC_HIDDEN,0,0,{
 OnTouch:
     warp "001-2-15", 34, 45;
     close;
@@ -176,7 +176,7 @@ OnUnTouch:
     doevent "#Door7::OnUnTouch";
 }
 
-001-1,132,67,0	script	#Door7	906,3,3,{
+001-1,132,67,0	script	#Door7	NPC_ARTIS_DOOR,3,3,{
     close;
 
 OnTouch:
@@ -194,7 +194,7 @@ OnInit:
     end;
 }
 
-001-1,128,30,0	script	#Warp8	32767,0,0,{
+001-1,128,30,0	script	#Warp8	NPC_HIDDEN,0,0,{
 OnTouch:
     warp "001-2-1", 37, 40;
     close;
@@ -203,7 +203,7 @@ OnUnTouch:
     doevent "#Door8::OnUnTouch";
 }
 
-001-1,128,30,0	script	#Door8	906,3,3,{
+001-1,128,30,0	script	#Door8	NPC_ARTIS_DOOR,3,3,{
     close;
 
 OnTouch:
@@ -221,7 +221,7 @@ OnInit:
     end;
 }
 
-001-1,168,98,0	script	#Warp9	32767,0,0,{
+001-1,168,98,0	script	#Warp9	NPC_HIDDEN,0,0,{
 OnTouch:
     warp "001-2-16", 32, 35;
     close;
@@ -230,7 +230,7 @@ OnUnTouch:
     doevent "#Door9::OnUnTouch";
 }
 
-001-1,168,98,0	script	#Door9	906,2,3,{
+001-1,168,98,0	script	#Door9	NPC_ARTIS_DOOR,2,3,{
     close;
 
 OnTouch:
@@ -248,7 +248,7 @@ OnInit:
     end;
 }
 
-001-1,118,49,0	script	#Warp10	32767,0,0,{
+001-1,118,49,0	script	#Warp10	NPC_HIDDEN,0,0,{
 OnTouch:
     warp "001-2-10", 27, 44;
     close;
@@ -257,7 +257,7 @@ OnUnTouch:
     doevent "#Door10::OnUnTouch";
 }
 
-001-1,118,49,0	script	#Door10	906,2,3,{
+001-1,118,49,0	script	#Door10	NPC_ARTIS_DOOR,2,3,{
     close;
 
 OnTouch:
@@ -275,7 +275,7 @@ OnInit:
     end;
 }
 
-001-1,135,49,0	script	#Warp11	32767,0,0,{
+001-1,135,49,0	script	#Warp11	NPC_HIDDEN,0,0,{
 OnTouch:
     warp "001-2-10", 51, 44;
     close;
@@ -284,7 +284,7 @@ OnUnTouch:
     doevent "#Door11::OnUnTouch";
 }
 
-001-1,135,49,0	script	#Door11	906,2,3,{
+001-1,135,49,0	script	#Door11	NPC_ARTIS_DOOR,2,3,{
     close;
 
 OnTouch:
@@ -302,7 +302,7 @@ OnInit:
     end;
 }
 
-001-1,148,54,0	script	#Warp12	32767,0,0,{
+001-1,148,54,0	script	#Warp12	NPC_HIDDEN,0,0,{
 OnTouch:
     warp "001-2-11", 46, 45;
     close;
@@ -311,7 +311,7 @@ OnUnTouch:
     doevent "#Door12::OnUnTouch";
 }
 
-001-1,148,54,0	script	#Door12	906,2,3,{
+001-1,148,54,0	script	#Door12	NPC_ARTIS_DOOR,2,3,{
     close;
 
 OnTouch:
@@ -329,7 +329,7 @@ OnInit:
     end;
 }
 
-001-1,163,70,0	script	#Warp13	32767,0,0,{
+001-1,163,70,0	script	#Warp13	NPC_HIDDEN,0,0,{
 OnTouch:
     warp "001-2-26", 28, 42;
     close;
@@ -338,7 +338,7 @@ OnUnTouch:
     doevent "#Door13::OnUnTouch";
 }
 
-001-1,163,70,0	script	#Door13	906,2,3,{
+001-1,163,70,0	script	#Door13	NPC_ARTIS_DOOR,2,3,{
     close;
 
 OnTouch:
@@ -356,7 +356,7 @@ OnInit:
     end;
 }
 
-001-1,101,107,0	script	#Warp14	32767,0,0,{
+001-1,101,107,0	script	#Warp14	NPC_HIDDEN,0,0,{
 OnTouch:
     warp "001-2-27", 35, 35;
     close;
@@ -365,7 +365,7 @@ OnUnTouch:
     doevent "#Door14::OnUnTouch";
 }
 
-001-1,101,107,0	script	#Door14	906,2,3,{
+001-1,101,107,0	script	#Door14	NPC_ARTIS_DOOR,2,3,{
     close;
 
 OnTouch:
@@ -383,7 +383,7 @@ OnInit:
     end;
 }
 
-001-1,107,49,0	script	#Warp15	32767,0,0,{
+001-1,107,49,0	script	#Warp15	NPC_HIDDEN,0,0,{
 OnTouch:
     warp "001-2-20", 33, 34;
     close;
@@ -392,7 +392,7 @@ OnUnTouch:
     doevent "#Door15::OnUnTouch";
 }
 
-001-1,107,49,0	script	#Door15	906,2,3,{
+001-1,107,49,0	script	#Door15	NPC_ARTIS_DOOR,2,3,{
     close;
 
 OnTouch:
@@ -410,7 +410,7 @@ OnInit:
     end;
 }
 
-001-1,104,32,0	script	#Warp16	32767,0,0,{
+001-1,104,32,0	script	#Warp16	NPC_HIDDEN,0,0,{
 OnTouch:
     warp "001-2-19", 41, 30;
     close;
@@ -419,7 +419,7 @@ OnUnTouch:
     doevent "#Door16::OnUnTouch";
 }
 
-001-1,104,32,0	script	#Door16	906,2,3,{
+001-1,104,32,0	script	#Door16	NPC_ARTIS_DOOR,2,3,{
     close;
 
 OnTouch:
@@ -437,7 +437,7 @@ OnInit:
     end;
 }
 
-001-1,182,74,0	script	#Warp17	32767,0,0,{
+001-1,182,74,0	script	#Warp17	NPC_HIDDEN,0,0,{
 OnTouch:
     warp "001-2-18", 39, 35;
     close;
@@ -446,7 +446,7 @@ OnUnTouch:
     doevent "#Door17::OnUnTouch";
 }
 
-001-1,182,74,0	script	#Door17	906,2,3,{
+001-1,182,74,0	script	#Door17	NPC_ARTIS_DOOR,2,3,{
     close;
 
 OnTouch:
diff --git a/npc/001-1/edouard.txt b/npc/001-1/edouard.txt
index 2d364c25..a3992601 100644
--- a/npc/001-1/edouard.txt
+++ b/npc/001-1/edouard.txt
@@ -4,7 +4,7 @@
 // Description:
 //    Barber of Aemil, should be placed on the 29th indoor but it's still a WIP
 
-001-1,133,87,0	script	Edouard#001-2-29	430,{
+001-1,133,87,0	script	Edouard#001-2-29	NPC_EDOUARD,{
     mesn;
     mesq lg("Hello dear, what do you want today?");
     next;
diff --git a/npc/001-1/elmo.txt b/npc/001-1/elmo.txt
index eb01cbd6..1a71aa5d 100644
--- a/npc/001-1/elmo.txt
+++ b/npc/001-1/elmo.txt
@@ -4,7 +4,7 @@
 // Description:
 //    Sailor of Nard's La Johanne ship.
 
-001-1,185,107,0	script	Elmo#001-1	425,{
+001-1,185,107,0	script	Elmo#001-1	NPC_ELMO_ARTIS,{
     mesn;
     mesq l("Oh hey!");
 
diff --git a/npc/001-1/enora.txt b/npc/001-1/enora.txt
index 3f1509e3..439ca765 100644
--- a/npc/001-1/enora.txt
+++ b/npc/001-1/enora.txt
@@ -4,7 +4,7 @@
 // Description:
 //    Newbie guide for Artis.
 
-001-1,176,113,0	script	Enora#001-1	119,{
+001-1,176,113,0	script	Enora#001-1	NPC_HUMAN_FEMALE_NOOB,{
     mesn;
     mesq l("Welcome!");
 
diff --git a/npc/001-1/eugene.txt b/npc/001-1/eugene.txt
index 6a03a534..5300074b 100644
--- a/npc/001-1/eugene.txt
+++ b/npc/001-1/eugene.txt
@@ -4,7 +4,7 @@
 // Description:
 //    Fishman NPC
 
-001-1,113,120,0	script	Eugene	428,{
+001-1,113,120,0	script	Eugene	NPC_EUGENE,{
     mesn;
     mesq l("Ahoi.");
 
diff --git a/npc/001-1/harbours.txt b/npc/001-1/harbours.txt
index a0623584..3f541430 100644
--- a/npc/001-1/harbours.txt
+++ b/npc/001-1/harbours.txt
@@ -11,7 +11,7 @@
 //    6   Hook down.
 //    8   Hook up.
 
-001-1,192,82,0	script	#Harbour0	420,{
+001-1,192,82,0	script	#Harbour0	NPC_HARBOUR_WHEEL,{
     harbourClic;
 
 OnTimer1670:
@@ -22,7 +22,7 @@ OnInit:
     end;
 }
 
-001-1,183,85,0	script	#Harbour1	421,{
+001-1,183,85,0	script	#Harbour1	NPC_HARBOUR_WHEEL_BOX,{
     harbourClic;
 
 OnTimer1670:
@@ -33,7 +33,7 @@ OnInit:
     end;
 }
 
-001-1,183,89,0	script	#Harbour2	420,{
+001-1,183,89,0	script	#Harbour2	NPC_HARBOUR_WHEEL,{
     harbourClic;
 
 OnTimer1670:
@@ -44,7 +44,7 @@ OnInit:
     end;
 }
 
-001-1,198,115,0	script	#Harbour3	421,{
+001-1,198,115,0	script	#Harbour3	NPC_HARBOUR_WHEEL_BOX,{
     harbourClic;
 
 OnTimer1670:
@@ -55,7 +55,7 @@ OnInit:
     end;
 }
 
-001-1,177,117,0	script	#Harbour4	421,{
+001-1,177,117,0	script	#Harbour4	NPC_HARBOUR_WHEEL_BOX,{
     harbourClic;
 
 OnTimer1670:
@@ -66,7 +66,7 @@ OnInit:
     end;
 }
 
-001-1,198,92,0	script	#Harbour5	421,{
+001-1,198,92,0	script	#Harbour5	NPC_HARBOUR_WHEEL_BOX,{
     harbourClic;
 
 OnTimer1670:
diff --git a/npc/001-1/katja.txt b/npc/001-1/katja.txt
index fe23f444..bd422140 100644
--- a/npc/001-1/katja.txt
+++ b/npc/001-1/katja.txt
@@ -4,7 +4,7 @@
 // Description:
 //    Little girl playing around the hill on top of the port.
 
-001-1,164,44,0	script	Katja#001-1	123,{
+001-1,164,44,0	script	Katja#001-1	NPC_RAIJIN_GIRL,{
     mesn;
     mesq l("Hey");
     next;
diff --git a/npc/001-1/lozerk.txt b/npc/001-1/lozerk.txt
index 04ae4d19..1ed7b539 100644
--- a/npc/001-1/lozerk.txt
+++ b/npc/001-1/lozerk.txt
@@ -4,7 +4,7 @@
 // Description:
 //    Sword trainer from the Legion of Aemil guild.
 
-001-1,56,43,0	script	Lozerk	120,{
+001-1,56,43,0	script	Lozerk	NPC_DEMON_MALE_SWORD,{
     mesn;
     mesq l("You can't join the sword training clothed that way.");
 
diff --git a/npc/001-1/panels.txt b/npc/001-1/panels.txt
index fc1bb7a0..c83db257 100644
--- a/npc/001-1/panels.txt
+++ b/npc/001-1/panels.txt
@@ -4,7 +4,7 @@
 // Description:
 //    Panels to give advice and some random information to players.
 
-001-1,180,25,0	script	#ArtisPanel1	999,{
+001-1,180,25,0	script	#ArtisPanel1	NPC_NO_SPRITE,{
     mesn "Narrator";
     mes col(l("A weeds covered panel draws your attention, a message is visible concealed behind the leaves..."), 9);
     next;
diff --git a/npc/001-1/qonan.txt b/npc/001-1/qonan.txt
index 42cb74b6..6f46c20f 100644
--- a/npc/001-1/qonan.txt
+++ b/npc/001-1/qonan.txt
@@ -4,7 +4,7 @@
 // Description:
 //    Sailor of Nard's La Johanne ship.
 
-001-1,186,107,0	script	Q'Onan#001-1	426,{
+001-1,186,107,0	script	Q'Onan#001-1	NPC_QONAN,{
     mesn;
     mesq l("We didn't meet, right?");
 
diff --git a/npc/001-1/taree.txt b/npc/001-1/taree.txt
index da0e5a89..15a01711 100644
--- a/npc/001-1/taree.txt
+++ b/npc/001-1/taree.txt
@@ -4,7 +4,7 @@
 // Description:
 //    Mouboo farmer.
 
-001-1,68,79,0	script	Taree	118,{
+001-1,68,79,0	script	Taree	NPC_ELVEN_MAN_MOUBOO_SHOP,{
     mesn;
     mesq l("Moo!");
 
diff --git a/npc/001-1/treeleaf.txt b/npc/001-1/treeleaf.txt
index 22afc9ca..1eefda2e 100644
--- a/npc/001-1/treeleaf.txt
+++ b/npc/001-1/treeleaf.txt
@@ -4,7 +4,7 @@
 // Description:
 //    Falling tree leaf
 
-001-1,39,54,4	script	#treeleaf0	909,{
+001-1,39,54,4	script	#treeleaf0	NPC_TREE_LEAF,{
     setnpcdir 2;
     stopnpctimer;
     initnpctimer;
diff --git a/npc/001-1/trozz.txt b/npc/001-1/trozz.txt
index b3b51634..07468b89 100644
--- a/npc/001-1/trozz.txt
+++ b/npc/001-1/trozz.txt
@@ -4,7 +4,7 @@
 // Description:
 //    Chief of the Legion of Aemil of the city of Artis.
 
-001-1,56,45,0	script	Trozz#001-1	124,{
+001-1,56,45,0	script	Trozz#001-1	NPC_HUMAN_MALE_CHIEF_ARTIS_LEGION,{
     mesn;
     mesq l("Hi.");
 
diff --git a/npc/001-1/xilaxa.txt b/npc/001-1/xilaxa.txt
index 48002881..27239ea3 100644
--- a/npc/001-1/xilaxa.txt
+++ b/npc/001-1/xilaxa.txt
@@ -4,7 +4,7 @@
 // Description:
 //    Moon, main NPC for the urchin quest.
 
-001-1,52,44,0	script	Xilaxa#001-1	431,{
+001-1,52,44,0	script	Xilaxa#001-1	NPC_UKAR_MALE,{
     npctalk3 l("You're on my way.");
     close;