Use npc sprite names in all scripts.

18 files changed, 20 insertions, 20 deletions

diff --git a/npc/000-1/ale.txt b/npc/000-1/ale.txt
index f3349f8e..65ed86b0 100644
--- a/npc/000-1/ale.txt
+++ b/npc/000-1/ale.txt
@@ -6,7 +6,7 @@
 //    Sailor part of the Gugli's quest.
 //    Aquada box.
 
-000-1,55,23,0	script	Ale	105,{
+000-1,55,23,0	script	Ale	NPC_DEMON_MAN_SITTING,{
     .@g = getq(ShipQuests_Gugli);
     if (.@g == 0) goto L_NoTask;
 
diff --git a/npc/000-1/astapolos.txt b/npc/000-1/astapolos.txt
index 2f7cd91c..41630596 100644
--- a/npc/000-1/astapolos.txt
+++ b/npc/000-1/astapolos.txt
@@ -7,7 +7,7 @@
 //    Sailor part of the Gugli's quest.
 //    Croconut box.
 
-000-1,22,50,0	script	Astapolos	107,{
+000-1,22,50,0	script	Astapolos	NPC_ELVEN_MAN_RED,{
     .@g = getq(ShipQuests_Gugli);
     if (.@g == 0) goto L_NoTask;
 
diff --git a/npc/000-1/chest.txt b/npc/000-1/chest.txt
index 53276816..5cd8ed1a 100644
--- a/npc/000-1/chest.txt
+++ b/npc/000-1/chest.txt
@@ -11,7 +11,7 @@
 //    0   Treasure Chest has not been opened yet.
 //    1   Treasure Chest has been opened.
 
-000-1,83,70,0	script	#chest	416,{
+000-1,83,70,0	script	#chest	NPC_CHEST,{
 
     .@q = getq(ShipQuests_TreasureChest);
     if (getnpcdir ("") == 4) goto L_Give;
diff --git a/npc/000-1/couwan.txt b/npc/000-1/couwan.txt
index 55b09b5f..17cfb67c 100644
--- a/npc/000-1/couwan.txt
+++ b/npc/000-1/couwan.txt
@@ -12,7 +12,7 @@
 //    1   Spoke, and received the quest scam.
 //    2   Done quest scam.
 
-000-1,89,36,0	script	Couwan	111,{
+000-1,89,36,0	script	Couwan	NPC_TRITAN_MAN_SAILOR,{
     .@q = getq(ShipQuests_Couwan);
     if (.@q == 1) goto L_QuestGiven;
     if (.@q > 1) goto L_QuestDone;
diff --git a/npc/000-1/darlin.txt b/npc/000-1/darlin.txt
index c57826a7..b3bffa18 100644
--- a/npc/000-1/darlin.txt
+++ b/npc/000-1/darlin.txt
@@ -10,7 +10,7 @@
 //    0   Treasure Chest has not been opened yet.
 //    1   Treasure Chest has been opened.
 
-000-1,89,95,0	script	Darlin	103,{
+000-1,89,95,0	script	Darlin	NPC_RAIJIN_MAN,{
     .@q = getq(ShipQuests_TreasureChest);
 
     mesn;
diff --git a/npc/000-1/fexil.txt b/npc/000-1/fexil.txt
index 6ec14edc..65ae2161 100644
--- a/npc/000-1/fexil.txt
+++ b/npc/000-1/fexil.txt
@@ -4,7 +4,7 @@
 // Description:
 //    Newbie merchant.
 
-000-1,83,98,0	script	Fexil	108,{
+000-1,83,98,0	script	Fexil	NPC_ELVEN_MAN_TRADER,{
     mesn;
     mesq lg("Greetings traveler.");
     next;
diff --git a/npc/000-1/gugli.txt b/npc/000-1/gugli.txt
index f1cd3b6b..1cf22fe6 100644
--- a/npc/000-1/gugli.txt
+++ b/npc/000-1/gugli.txt
@@ -22,7 +22,7 @@
 //    21   Gugli gives you the task.
 //    22   Gave all of the box to Gugli.
 
-000-1,85,108,0	script	Gugli	413,{
+000-1,85,108,0	script	Gugli	NPC_GUGLI,{
 
 OnTalk:
     mesn;
@@ -229,7 +229,7 @@ OnInit:
     end;
 }
 
-000-1,83,107,0	script	GugliBarrierCheck	32767,2,0,{
+000-1,83,107,0	script	GugliBarrierCheck	NPC_HIDDEN,2,0,{
     .@gugli = getq(ShipQuests_Gugli);
     if (.@gugli > 0) close;
     doevent "Gugli::OnTalk";
diff --git a/npc/000-1/gulukan.txt b/npc/000-1/gulukan.txt
index e602417a..1826e8db 100644
--- a/npc/000-1/gulukan.txt
+++ b/npc/000-1/gulukan.txt
@@ -7,7 +7,7 @@
 //    Sailor part of the Gugli's quest.
 //    Croconut box.
 
-000-1,54,90,0	script	Gulukan	113,{
+000-1,54,90,0	script	Gulukan	NPC_TRITAN_MAN_SAILOR2,{
     .@g = getq(ShipQuests_Gugli);
     if (.@g == 0) goto L_NoTask;
 
diff --git a/npc/000-1/jalad.txt b/npc/000-1/jalad.txt
index f7ba491a..3c42777e 100644
--- a/npc/000-1/jalad.txt
+++ b/npc/000-1/jalad.txt
@@ -7,7 +7,7 @@
 //    Sailor part of the Gugli quest.
 //    Plushroom box.
 
-000-1,46,35,0	script	Jalad	112,{
+000-1,46,35,0	script	Jalad	NPC_ELVEN_MAN_TRADER_SITTING,{
     .@g = getq(ShipQuests_Gugli);
     if (.@g == 0) goto L_NoTask;
 
diff --git a/npc/000-1/lean.txt b/npc/000-1/lean.txt
index b4da0878..775787ed 100644
--- a/npc/000-1/lean.txt
+++ b/npc/000-1/lean.txt
@@ -6,7 +6,7 @@
 // Description:
 //    Sailor who gives some informations to the player.
 
-000-1,79,108,0	script	Lean	106,{
+000-1,79,108,0	script	Lean	NPC_ELVEN_MAN_BLONDE,{
     .@gugli = getq(ShipQuests_Gugli);
 
     mesn;
diff --git a/npc/000-1/max.txt b/npc/000-1/max.txt
index 8e7f5a71..d9941bb0 100644
--- a/npc/000-1/max.txt
+++ b/npc/000-1/max.txt
@@ -6,7 +6,7 @@
 // Description:
 //    Friend of Sapartan, he gives some information on how to find Gulukan, Astapolos and Q-Muller.
 
-000-1,72,110,0	script	Max	115,{
+000-1,72,110,0	script	Max	NPC_DEMON_MAN_SITTING_UNDER_TREE,{
     .@gugli = getq(ShipQuests_Gugli);
     .@knife = getq(ShipQuests_Knife);
 
diff --git a/npc/000-1/muller.txt b/npc/000-1/muller.txt
index cd8ade22..b51db535 100644
--- a/npc/000-1/muller.txt
+++ b/npc/000-1/muller.txt
@@ -6,7 +6,7 @@
 //    Sailor part of the Gugli's quest.
 //    Plushroom box.
 
-000-1,35,69,0	script	Q'Muller	104,{
+000-1,35,69,0	script	Q'Muller	NPC_ORC_MAN,{
     .@g = getq(ShipQuests_Gugli);
     if (.@g == 0) goto L_NoTask;
 
diff --git a/npc/000-1/panels.txt b/npc/000-1/panels.txt
index 9b72d5e0..c359debe 100644
--- a/npc/000-1/panels.txt
+++ b/npc/000-1/panels.txt
@@ -5,7 +5,7 @@
 // Description:
 //    Panels to give advice to the players.
 
-000-1,65,93,0	script	#panel1	999,{
+000-1,65,93,0	script	#panel1	NPC_NO_SPRITE,{
     mesn "Narrator";
     mes col(l("Your heart quickens as your gaze focuses upon a small wooden panel, partly obscured under a layer of wind-blown sand."), 9);
     next;
@@ -25,7 +25,7 @@ OnInit:
     end;
 }
 
-000-1,89,51,0	script	#panel2	999,{
+000-1,89,51,0	script	#panel2	NPC_NO_SPRITE,{
     mesn "Narrator";
     mes col(l("This panel looks in rather good shape, as though some people take care of it regularly. Maybe it has important information."), 9);
     next;
diff --git a/npc/000-1/sapartan.txt b/npc/000-1/sapartan.txt
index 96290776..fab65396 100644
--- a/npc/000-1/sapartan.txt
+++ b/npc/000-1/sapartan.txt
@@ -5,7 +5,7 @@
 // Description:
 //    Friend of Max, he gives some information on combat system.
 
-000-1,74,111,0	script	Sapartan	414,{
+000-1,74,111,0	script	Sapartan	NPC_SAPARTAN,{
     mesn;
     mesq l("Hey Max, it's @@!", strcharinfo(0));
     next;
diff --git a/npc/000-1/shop.txt b/npc/000-1/shop.txt
index 5b9c839d..2377c3ed 100644
--- a/npc/000-1/shop.txt
+++ b/npc/000-1/shop.txt
@@ -5,7 +5,7 @@
 // Description:
 //    Fexil's shop bag.
 
-000-1,84,98,0	trader	Bag#000-1	109,{
+000-1,84,98,0	trader	Bag#000-1	NPC_SHOP_BAG,{
 
 OnInit:
     tradertype(NST_MARKET);
diff --git a/npc/000-1/silvio.txt b/npc/000-1/silvio.txt
index 537c7e65..a54d0239 100644
--- a/npc/000-1/silvio.txt
+++ b/npc/000-1/silvio.txt
@@ -5,7 +5,7 @@
 // Description:
 //    Pervert and arrogant sailor.
 
-000-1,86,99,0	script	Silvio	412,{
+000-1,86,99,0	script	Silvio	NPC_SILVIO,{
     mesn;
     mesq l("Hey!");
     next;
diff --git a/npc/000-1/tarlan.txt b/npc/000-1/tarlan.txt
index 9b15b167..db60e1de 100644
--- a/npc/000-1/tarlan.txt
+++ b/npc/000-1/tarlan.txt
@@ -4,7 +4,7 @@
 // Description:
 //    Sailor hitting a crocotree, then being struck by a falling croconut.
 
-000-1,33,37,0	script	Tarlan	415,{
+000-1,33,37,0	script	Tarlan	NPC_TARLAN,{
     setnpcdir 2;
 
     mesn;
diff --git a/npc/000-1/tibbo.txt b/npc/000-1/tibbo.txt
index 39d89f16..8da1e286 100644
--- a/npc/000-1/tibbo.txt
+++ b/npc/000-1/tibbo.txt
@@ -7,7 +7,7 @@
 //    Sailor part of the Gugli's quest.
 //    Aquada box.
 
-000-1,34,111,0	script	Tibbo	110,{
+000-1,34,111,0	script	Tibbo	NPC_ELVEN_MAN_STANDING,{
     .@g = getq(ShipQuests_Gugli);
     if (.@g == 0) goto L_NoTask;