Use npc sprite names in all scripts.

8 files changed, 23 insertions, 23 deletions

diff --git a/npc/001-2-22/alige.txt b/npc/001-2-22/alige.txt
index 16891fdb..2f07641e 100644
--- a/npc/001-2-22/alige.txt
+++ b/npc/001-2-22/alige.txt
@@ -17,7 +17,7 @@
 //    2   Accept the task.
 //    3   Bring first food.
 
-001-2-22,43,32,0	script	AligeTrigger#Artis	32767,1,1,{
+001-2-22,43,32,0	script	AligeTrigger#Artis	NPC_HIDDEN,1,1,{
 
 OnTouch:
     if (getareausers() <= 1)
@@ -50,7 +50,7 @@ OnTimer190:
     end;
 }
 
-001-2-22,43,31,0	script	Alige#Artis	401,{
+001-2-22,43,31,0	script	Alige#Artis	NPC_ALIGE,{
     .@q = getq(ShipQuests_Alige);
     if (.@q > 1) goto L_AskForFood;
 
diff --git a/npc/001-2-22/chefgado.txt b/npc/001-2-22/chefgado.txt
index f03f9cd3..6868009d 100644
--- a/npc/001-2-22/chefgado.txt
+++ b/npc/001-2-22/chefgado.txt
@@ -5,7 +5,7 @@
 // Description:
 //    La Johanne Chef.
 
-001-2-22,27,28,0	script	Chef Gado#Artis	418,{
+001-2-22,27,28,0	script	Chef Gado#Artis	NPC_CHEF_GADO,{
 
     mesn;
     .@r = rand(3);
diff --git a/npc/001-2-22/chest.txt b/npc/001-2-22/chest.txt
index 3ec4ecc2..bd5a0049 100644
--- a/npc/001-2-22/chest.txt
+++ b/npc/001-2-22/chest.txt
@@ -5,7 +5,7 @@
 // Description:
 //    A box with clothes for new players.
 
-001-2-22,51,37,0	script	Chest#Artis	417,{
+001-2-22,51,37,0	script	Chest#Artis	NPC_CHEST_BIG,{
 
     setnpcdir 2;
     initnpctimer;
diff --git a/npc/001-2-22/hammock.txt b/npc/001-2-22/hammock.txt
index 68ed3951..f6f70044 100644
--- a/npc/001-2-22/hammock.txt
+++ b/npc/001-2-22/hammock.txt
@@ -4,7 +4,7 @@
 // Description:
 //    Animated hammock at the mid level of the ship.
 
-001-2-22,32,27,0	script	#hammockArtis1	904,1,0,{
+001-2-22,32,27,0	script	#hammockArtis1	NPC_LEFT_HAMMOCK,1,0,{
 
 OnTouch:
     hamTouchLeft;
@@ -16,7 +16,7 @@ OnTimer5440:
     hamTimerLeft;
 }
 
-001-2-22,32,25,0	script	#hammockArtis2	904,1,0,{
+001-2-22,32,25,0	script	#hammockArtis2	NPC_LEFT_HAMMOCK,1,0,{
 
 OnTouch:
     hamTouchLeft;
@@ -28,7 +28,7 @@ OnTimer5440:
     hamTimerLeft;
 }
 
-001-2-22,37,25,0	script	#hammockArtis3	905,1,0,{
+001-2-22,37,25,0	script	#hammockArtis3	NPC_RIGHT_HAMMOCK,1,0,{
 
 OnTouch:
     hamTouchLeft;
@@ -40,7 +40,7 @@ OnTimer5440:
     hamTimerLeft;
 }
 
-001-2-22,37,27,0	script	#hammockArtis4	905,1,0,{
+001-2-22,37,27,0	script	#hammockArtis4	NPC_RIGHT_HAMMOCK,1,0,{
 
 OnTouch:
     hamTouchLeft;
@@ -52,7 +52,7 @@ OnTimer5440:
     hamTimerLeft;
 }
 
-001-2-22,37,29,0	script	#hammockArtis5	905,1,0,{
+001-2-22,37,29,0	script	#hammockArtis5	NPC_RIGHT_HAMMOCK,1,0,{
 
 OnTouch:
     hamTouchLeft;
@@ -64,7 +64,7 @@ OnTimer5440:
     hamTimerLeft;
 }
 
-001-2-22,37,34,0	script	#hammockArtis6	905,1,0,{
+001-2-22,37,34,0	script	#hammockArtis6	NPC_RIGHT_HAMMOCK,1,0,{
 
 OnTouch:
     hamTouchLeft;
@@ -76,7 +76,7 @@ OnTimer5440:
     hamTimerLeft;
 }
 
-001-2-22,37,36,0	script	#hammockArtis7	905,1,0,{
+001-2-22,37,36,0	script	#hammockArtis7	NPC_RIGHT_HAMMOCK,1,0,{
 
 OnTouch:
     hamTouchLeft;
@@ -88,7 +88,7 @@ OnTimer5440:
     hamTimerLeft;
 }
 
-001-2-22,37,38,0	script	#hammockArtis8	905,1,0,{
+001-2-22,37,38,0	script	#hammockArtis8	NPC_RIGHT_HAMMOCK,1,0,{
 
 OnTouch:
     hamTouchLeft;
@@ -100,7 +100,7 @@ OnTimer5440:
     hamTimerLeft;
 }
 
-001-2-22,37,40,0	script	#hammockArtis9	905,1,0,{
+001-2-22,37,40,0	script	#hammockArtis9	NPC_RIGHT_HAMMOCK,1,0,{
 
 OnTouch:
     hamTouchLeft;
@@ -112,7 +112,7 @@ OnTimer5440:
     hamTimerLeft;
 }
 
-001-2-22,32,38,0	script	#hammockArtis10	904,1,0,{
+001-2-22,32,38,0	script	#hammockArtis10	NPC_LEFT_HAMMOCK,1,0,{
 
 OnTouch:
     hamTouchLeft;
@@ -124,7 +124,7 @@ OnTimer5440:
     hamTimerLeft;
 }
 
-001-2-22,32,40,0	script	#hammockArtis11	904,1,0,{
+001-2-22,32,40,0	script	#hammockArtis11	NPC_LEFT_HAMMOCK,1,0,{
 
 OnTouch:
     hamTouchLeft;
diff --git a/npc/001-2-22/knife.txt b/npc/001-2-22/knife.txt
index 7f380309..748d90b5 100644
--- a/npc/001-2-22/knife.txt
+++ b/npc/001-2-22/knife.txt
@@ -10,7 +10,7 @@
 //    0   Default, not taken.
 //    1   Knife taken.
 
-000-2-1,50,24,0	script	#Artisknife	100,{
+000-2-1,50,24,0	script	#Artisknife	NPC_KNIVES,{
     .@q = getq(ShipQuests_Knife);
     if (.@q) close;
 
diff --git a/npc/001-2-22/note.txt b/npc/001-2-22/note.txt
index a3ba38bf..9abaeb18 100644
--- a/npc/001-2-22/note.txt
+++ b/npc/001-2-22/note.txt
@@ -4,7 +4,7 @@
 // Description:
 //    
 
-001-2-1.gat,22,33,0	script	Note	999,{
+001-2-1.gat,22,33,0	script	Note	NPC_NO_SPRITE,{
     mesn;
     mesq l("This note was left by somebody.");
     next;
diff --git a/npc/001-2-22/peter.txt b/npc/001-2-22/peter.txt
index 977d1ce0..009eb940 100644
--- a/npc/001-2-22/peter.txt
+++ b/npc/001-2-22/peter.txt
@@ -39,7 +39,7 @@
 // [9] = Shows how many seconds passed since the player started the quest.
 // [10] = Shows how many seconds passed since the player done the quest.
 
-001-2-22,72,34,0	script	AreaNPC#001-2-22	32767,0,1,{
+001-2-22,72,34,0	script	AreaNPC#001-2-22	NPC_HIDDEN,0,1,{
 
 OnTouch:
     if (BaseLevel < 5) goto L_Stop;
@@ -89,7 +89,7 @@ L_NoGoodTick:
     close;
 }
 
-001-2-22,70,35,0	script	Peter#001-2-22	403,{
+001-2-22,70,35,0	script	Peter#001-2-22	NPC_RATTO_SAILOR,{
     if (BaseLevel < 5) goto OnTooWeak;
     if ($@ARTIS_RAT1_COUNTDOWN == 0) goto L_NoCountDown;
     if ((gettimetick(2) - $@ARTIS_RAT1_COUNTDOWN) < 10) goto OnNoGoodTick;
diff --git a/npc/001-2-22/savepoint.txt b/npc/001-2-22/savepoint.txt
index 9baf995c..2fe83388 100644
--- a/npc/001-2-22/savepoint.txt
+++ b/npc/001-2-22/savepoint.txt
@@ -4,7 +4,7 @@
 // Description:
 //    Saves locations in 001-2-22 map.
 
-001-2-22,40,37,0	script	#001-2-22-1	901,{
+001-2-22,40,37,0	script	#001-2-22-1	NPC_SAVE_POINT,{
     savepoint "001-2-22.gat", 40, 37;
     close;
 
@@ -13,7 +13,7 @@ OnInit:
     end;
 }
 
-001-2-22,46,37,0	script	#001-2-22-2	901,{
+001-2-22,46,37,0	script	#001-2-22-2	NPC_SAVE_POINT,{
     savepoint "001-2-22.gat", 46, 37;
     close;
 
@@ -22,7 +22,7 @@ OnInit:
     end;
 }
 
-001-2-22,50,38,0	script	#001-2-22-3	901,{
+001-2-22,50,38,0	script	#001-2-22-3	NPC_SAVE_POINT,{
     savepoint "001-2-22.gat", 50, 38;
     close;
 
@@ -31,7 +31,7 @@ OnInit:
     end;
 }
 
-001-2-22,55,40,0	script	#001-2-22-4	901,{
+001-2-22,55,40,0	script	#001-2-22-4	NPC_SAVE_POINT,{
     savepoint "001-2-22.gat", 55, 40;
     close;