Use npc sprite names in all scripts.

11 files changed, 28 insertions, 28 deletions

diff --git a/npc/000-2-1/alige.txt b/npc/000-2-1/alige.txt
index f43ac1c5..12de2df2 100644
--- a/npc/000-2-1/alige.txt
+++ b/npc/000-2-1/alige.txt
@@ -17,7 +17,7 @@
 //    2   Accept the task.
 //    3   Bring first food.
 
-000-2-1,43,32,0	script	AligeTrigger	32767,1,1,{
+000-2-1,43,32,0	script	AligeTrigger	NPC_HIDDEN,1,1,{
 
 OnTouch:
     if (getareausers() <= 1)
@@ -50,7 +50,7 @@ OnTimer190:
     end;
 }
 
-000-2-1,43,31,0	script	Alige	401,{
+000-2-1,43,31,0	script	Alige	NPC_ALIGE,{
     .@q = getq(ShipQuests_Alige);
     if (.@q > 1) goto L_AskForFood;
 
diff --git a/npc/000-2-1/arpan.txt b/npc/000-2-1/arpan.txt
index 1548bdb0..6da37d20 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	32767,0,0,{
+000-2-1,49,36,0	script	LeftDoorCheck	NPC_HIDDEN,0,0,{
     .@q = getq(ShipQuests_Arpan);
     if (.@q == 0) doevent "Magic Arpan::OnTalk";
 
     close;
 }
 
-000-2-1,54,36,0	script	RightDoorCheck	32767,0,0,{
+000-2-1,54,36,0	script	RightDoorCheck	NPC_HIDDEN,0,0,{
     .@q = getq(ShipQuests_Arpan);
     if (.@q == 0) doevent "Magic Arpan::OnTalk";
 
     close;
 }
 
-000-2-1,47,32,0	script	LeftBarrierCheck	32767,0,2,{
+000-2-1,47,32,0	script	LeftBarrierCheck	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	32767,0,2,{
+000-2-1,56,32,0	script	RightBarrierCheck	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;
@@ -84,7 +84,7 @@ L_EquipDone:
     close;
 }
 
-000-2-1,49,33,0	script	Magic Arpan	407,{
+000-2-1,49,33,0	script	Magic Arpan	NPC_MAGIC_ARPAN,{
     .@q = getq(ShipQuests_Arpan);
     .@q_julia = getq(ShipQuests_Julia);
     if (.@q == 2 && getequipid(equip_torso) == 1300 && getequipid(equip_legs) == 2200) goto L_EquipDone;
diff --git a/npc/000-2-1/chefgado.txt b/npc/000-2-1/chefgado.txt
index e55cf5c0..d9e8a603 100644
--- a/npc/000-2-1/chefgado.txt
+++ b/npc/000-2-1/chefgado.txt
@@ -16,7 +16,7 @@
 //    5   Quest complete. Julia wins (poison dish returned).
 //    6   Quest complete. Julia wins.
 
-000-2-1,27,28,0	script	Chef Gado	418,{
+000-2-1,27,28,0	script	Chef Gado	NPC_CHEF_GADO,{
     .@q = getq(ShipQuests_ChefGado);
     .@n = getq(ShipQuests_Nard);
     if (.@q == 1) goto L_QuestAccepted;
diff --git a/npc/000-2-1/chest.txt b/npc/000-2-1/chest.txt
index 7abdd72c..2be851ba 100644
--- a/npc/000-2-1/chest.txt
+++ b/npc/000-2-1/chest.txt
@@ -10,7 +10,7 @@
 //    1   Talked to Arpan and needs to get clothes.
 //    2   Has the clothes.
 
-000-2-1,51,37,0	script	Chest	417,{
+000-2-1,51,37,0	script	Chest	NPC_CHEST_BIG,{
     .@q = getq(ShipQuests_Arpan);
 
     if (.@q == 0) goto L_Talk;
diff --git a/npc/000-2-1/dan.txt b/npc/000-2-1/dan.txt
index dc2da2c4..c894b8b2 100644
--- a/npc/000-2-1/dan.txt
+++ b/npc/000-2-1/dan.txt
@@ -6,7 +6,7 @@
 //    There are two kinds of dialogues in this script.
 //    Dan will randomly choose between a useless sentence, and a quest in Artis.
 
-000-2-1,32,31,0	script	Dan	101,{
+000-2-1,32,31,0	script	Dan	NPC_DEMON_MAN,{
     mesn;
     .@q = rand(3);
     if (.@q == 0) goto L_QuestStory;
diff --git a/npc/000-2-1/devis.txt b/npc/000-2-1/devis.txt
index 7de0058b..ac23cdd6 100644
--- a/npc/000-2-1/devis.txt
+++ b/npc/000-2-1/devis.txt
@@ -6,7 +6,7 @@
 // Description:
 //    Sleeping and grumbling NPC.
 
-000-2-1,32,38,0	script	Devis	410,{
+000-2-1,32,38,0	script	Devis	NPC_HAMMOC,{
     asleep;
     close;
 
diff --git a/npc/000-2-1/hammock.txt b/npc/000-2-1/hammock.txt
index 78339fd4..8e43ca38 100644
--- a/npc/000-2-1/hammock.txt
+++ b/npc/000-2-1/hammock.txt
@@ -4,7 +4,7 @@
 // Description:
 //    Animated hammock at the mid level of the ship.
 
-000-2-1,32,27,0	script	#hammock1	904,1,0,{
+000-2-1,32,27,0	script	#hammock1	NPC_LEFT_HAMMOCK,1,0,{
 
 OnTouch:
     hamTouchLeft;
@@ -16,7 +16,7 @@ OnTimer5440:
     hamTimerLeft;
 }
 
-000-2-1,32,25,0	script	#hammock2	904,1,0,{
+000-2-1,32,25,0	script	#hammock2	NPC_LEFT_HAMMOCK,1,0,{
 
 OnTouch:
     hamTouchLeft;
@@ -28,7 +28,7 @@ OnTimer5440:
     hamTimerLeft;
 }
 
-000-2-1,37,25,0	script	#hammock3	905,1,0,{
+000-2-1,37,25,0	script	#hammock3	NPC_RIGHT_HAMMOCK,1,0,{
 
 OnTouch:
     hamTouchLeft;
@@ -40,7 +40,7 @@ OnTimer5440:
     hamTimerLeft;
 }
 
-000-2-1,37,27,0	script	#hammock4	905,1,0,{
+000-2-1,37,27,0	script	#hammock4	NPC_RIGHT_HAMMOCK,1,0,{
 
 OnTouch:
     hamTouchLeft;
@@ -52,7 +52,7 @@ OnTimer5440:
     hamTimerLeft;
 }
 
-000-2-1,37,29,0	script	#hammock5	905,1,0,{
+000-2-1,37,29,0	script	#hammock5	NPC_RIGHT_HAMMOCK,1,0,{
 
 OnTouch:
     hamTouchLeft;
@@ -64,7 +64,7 @@ OnTimer5440:
     hamTimerLeft;
 }
 
-000-2-1,37,34,0	script	#hammock6	905,1,0,{
+000-2-1,37,34,0	script	#hammock6	NPC_RIGHT_HAMMOCK,1,0,{
 
 OnTouch:
     hamTouchLeft;
@@ -76,7 +76,7 @@ OnTimer5440:
     hamTimerLeft;
 }
 
-000-2-1,37,36,0	script	#hammock7	905,1,0,{
+000-2-1,37,36,0	script	#hammock7	NPC_RIGHT_HAMMOCK,1,0,{
 
 OnTouch:
     hamTouchLeft;
@@ -88,7 +88,7 @@ OnTimer5440:
     hamTimerLeft;
 }
 
-000-2-1,32,40,0	script	#hammock8	904,1,0,{
+000-2-1,32,40,0	script	#hammock8	NPC_LEFT_HAMMOCK,1,0,{
 
 OnTouch:
     hamTouchLeft;
@@ -100,7 +100,7 @@ OnTimer5440:
     hamTimerLeft;
 }
 
-000-2-1,37,40,0	script	#hammock9	905,1,0,{
+000-2-1,37,40,0	script	#hammock9	NPC_RIGHT_HAMMOCK,1,0,{
 
 OnTouch:
     hamTouchLeft;
diff --git a/npc/000-2-1/knife.txt b/npc/000-2-1/knife.txt
index eefe11ae..cb397493 100644
--- a/npc/000-2-1/knife.txt
+++ b/npc/000-2-1/knife.txt
@@ -10,7 +10,7 @@
 //    0   Default, not taken.
 //    1   Knife taken.
 
-000-2-1,50,24,0	script	#knife	100,{
+000-2-1,50,24,0	script	#knife	NPC_KNIVES,{
     .@q = getq(ShipQuests_Knife);
     if (.@q) close;
 
diff --git a/npc/000-2-1/peter.txt b/npc/000-2-1/peter.txt
index 681b6def..5e7bcd2f 100644
--- a/npc/000-2-1/peter.txt
+++ b/npc/000-2-1/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.
 
-000-2-1,72,34,0	script	AreaNPC	32767,0,1,{
+000-2-1,72,34,0	script	AreaNPC	NPC_HIDDEN,0,1,{
 
 OnTouch:
     if (BaseLevel < 5) goto L_Stop;
@@ -89,7 +89,7 @@ L_NoGoodTick:
     close;
 }
 
-000-2-1,70,35,0	script	Peter	403,{
+000-2-1,70,35,0	script	Peter	NPC_RATTO_SAILOR,{
     if (BaseLevel < 5) goto OnTooWeak;
     if ($@RAT_SAILOR_COUNTDOWN == 0) goto L_NoCountDown;
     if ((gettimetick(2) - $@RAT_SAILOR_COUNTDOWN) < 10) goto OnNoGoodTick;
diff --git a/npc/000-2-1/q'onan.txt b/npc/000-2-1/q'onan.txt
index f5ff8ee5..4e795504 100644
--- a/npc/000-2-1/q'onan.txt
+++ b/npc/000-2-1/q'onan.txt
@@ -5,7 +5,7 @@
 // Description:
 //    Sleeping and snoring NPC.
 
-000-2-1,53,38,0	script	Q'Onan#000-2-1	402,{
+000-2-1,53,38,0	script	Q'Onan#000-2-1	NPC_ORC_SAILOR,{
     asleep;
     close;
 
diff --git a/npc/000-2-1/savepoint.txt b/npc/000-2-1/savepoint.txt
index 3b81de39..258a905a 100644
--- a/npc/000-2-1/savepoint.txt
+++ b/npc/000-2-1/savepoint.txt
@@ -4,7 +4,7 @@
 // Description:
 //    Saves locations in 000-2-1 map.
 
-000-2-1,40,37,0	script	#name1	901,{
+000-2-1,40,37,0	script	#name1	NPC_SAVE_POINT,{
     savepointparticle "000-2-1.gat", 40, 37;
     close;
 
@@ -13,7 +13,7 @@ OnInit:
     end;
 }
 
-000-2-1,46,37,0	script	#name2	901,{
+000-2-1,46,37,0	script	#name2	NPC_SAVE_POINT,{
     savepointparticle "000-2-1.gat", 46, 37;
     close;
 
@@ -22,7 +22,7 @@ OnInit:
     end;
 }
 
-000-2-1,50,38,0	script	#name3	901,{
+000-2-1,50,38,0	script	#name3	NPC_SAVE_POINT,{
     savepointparticle "000-2-1.gat", 50, 38;
     close;
 
@@ -31,7 +31,7 @@ OnInit:
     end;
 }
 
-000-2-1,55,40,0	script	#name4	901,{
+000-2-1,55,40,0	script	#name4	NPC_SAVE_POINT,{
     savepointparticle "000-2-1.gat", 55, 40;
     close;