summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndrei Karas <akaras@inbox.ru>2015-08-11 13:38:56 +0300
committerAndrei Karas <akaras@inbox.ru>2015-08-11 13:38:56 +0300
commit0452e5c5f9dd7b166c8fe681c6fe64c03740716a (patch)
tree312ac955061ccddbaea670be8a0cf2b59d4e2341
parent19eaaca795ce2f0886bfb2f31a1c327bb419a441 (diff)
downloadserverdata-0452e5c5f9dd7b166c8fe681c6fe64c03740716a.tar.gz
serverdata-0452e5c5f9dd7b166c8fe681c6fe64c03740716a.tar.bz2
serverdata-0452e5c5f9dd7b166c8fe681c6fe64c03740716a.tar.xz
serverdata-0452e5c5f9dd7b166c8fe681c6fe64c03740716a.zip
Use npc sprite names in all scripts.
-rw-r--r--npc/000-0-0/q'onan.txt2
-rw-r--r--npc/000-0-0/sailors.txt4
-rw-r--r--npc/000-0/sailors.txt2
-rw-r--r--npc/000-1/ale.txt2
-rw-r--r--npc/000-1/astapolos.txt2
-rw-r--r--npc/000-1/chest.txt2
-rw-r--r--npc/000-1/couwan.txt2
-rw-r--r--npc/000-1/darlin.txt2
-rw-r--r--npc/000-1/fexil.txt2
-rw-r--r--npc/000-1/gugli.txt4
-rw-r--r--npc/000-1/gulukan.txt2
-rw-r--r--npc/000-1/jalad.txt2
-rw-r--r--npc/000-1/lean.txt2
-rw-r--r--npc/000-1/max.txt2
-rw-r--r--npc/000-1/muller.txt2
-rw-r--r--npc/000-1/panels.txt4
-rw-r--r--npc/000-1/sapartan.txt2
-rw-r--r--npc/000-1/shop.txt2
-rw-r--r--npc/000-1/silvio.txt2
-rw-r--r--npc/000-1/tarlan.txt2
-rw-r--r--npc/000-1/tibbo.txt2
-rw-r--r--npc/000-2-0/billybons.txt2
-rw-r--r--npc/000-2-0/doors.txt4
-rw-r--r--npc/000-2-0/julia.txt2
-rw-r--r--npc/000-2-0/note.txt2
-rw-r--r--npc/000-2-1/alige.txt4
-rw-r--r--npc/000-2-1/arpan.txt10
-rw-r--r--npc/000-2-1/chefgado.txt2
-rw-r--r--npc/000-2-1/chest.txt2
-rw-r--r--npc/000-2-1/dan.txt2
-rw-r--r--npc/000-2-1/devis.txt2
-rw-r--r--npc/000-2-1/hammock.txt18
-rw-r--r--npc/000-2-1/knife.txt2
-rw-r--r--npc/000-2-1/peter.txt4
-rw-r--r--npc/000-2-1/q'onan.txt2
-rw-r--r--npc/000-2-1/savepoint.txt8
-rw-r--r--npc/000-2-2/doors.txt4
-rw-r--r--npc/000-2-2/ratto.txt2
-rw-r--r--npc/000-2-3/box.txt2
-rw-r--r--npc/000-2-3/elmo.txt2
-rw-r--r--npc/000-2-3/hammock.txt2
-rw-r--r--npc/000-2-3/nard.txt2
-rw-r--r--npc/000-2-3/piourocket.txt2
-rw-r--r--npc/000-2-3/sailors.txt2
-rw-r--r--npc/001-1/artaxe.txt2
-rw-r--r--npc/001-1/beuss.txt2
-rw-r--r--npc/001-1/chelios.txt2
-rw-r--r--npc/001-1/cookiemaster.txt2
-rw-r--r--npc/001-1/doors.txt68
-rw-r--r--npc/001-1/edouard.txt2
-rw-r--r--npc/001-1/elmo.txt2
-rw-r--r--npc/001-1/enora.txt2
-rw-r--r--npc/001-1/eugene.txt2
-rw-r--r--npc/001-1/harbours.txt12
-rw-r--r--npc/001-1/katja.txt2
-rw-r--r--npc/001-1/lozerk.txt2
-rw-r--r--npc/001-1/panels.txt2
-rw-r--r--npc/001-1/qonan.txt2
-rw-r--r--npc/001-1/taree.txt2
-rw-r--r--npc/001-1/treeleaf.txt2
-rw-r--r--npc/001-1/trozz.txt2
-rw-r--r--npc/001-1/xilaxa.txt2
-rw-r--r--npc/001-2-0/resa.txt2
-rw-r--r--npc/001-2-19/doors.txt8
-rw-r--r--npc/001-2-2/moon.txt2
-rw-r--r--npc/001-2-20/doors.txt4
-rw-r--r--npc/001-2-21/julia.txt2
-rw-r--r--npc/001-2-21/note.txt2
-rw-r--r--npc/001-2-22/alige.txt4
-rw-r--r--npc/001-2-22/chefgado.txt2
-rw-r--r--npc/001-2-22/chest.txt2
-rw-r--r--npc/001-2-22/hammock.txt22
-rw-r--r--npc/001-2-22/knife.txt2
-rw-r--r--npc/001-2-22/note.txt2
-rw-r--r--npc/001-2-22/peter.txt4
-rw-r--r--npc/001-2-22/savepoint.txt8
-rw-r--r--npc/001-2-23/doors.txt4
-rw-r--r--npc/001-2-23/ratto.txt2
-rw-r--r--npc/001-2-24/hammock.txt2
-rw-r--r--npc/001-2-24/nard.txt2
-rw-r--r--npc/001-2-24/piourocket.txt2
-rw-r--r--npc/001-2-26/flask.txt2
-rw-r--r--npc/001-2-27/don.txt2
-rw-r--r--npc/001-2-4/doors.txt4
-rw-r--r--npc/001-2-4/terry.txt2
-rw-r--r--npc/001-2-6/dolfina.txt2
-rw-r--r--npc/items/croconut.txt2
-rw-r--r--npc/items/oldbook.txt2
-rw-r--r--npc/test/npc1.txt4
-rw-r--r--npc/test/npc2.txt2
-rw-r--r--npc/test/npc3.txt2
-rw-r--r--npc/test/npc4.txt2
92 files changed, 174 insertions, 174 deletions
diff --git a/npc/000-0-0/q'onan.txt b/npc/000-0-0/q'onan.txt
index fabf8c54..7cf558ee 100644
--- a/npc/000-0-0/q'onan.txt
+++ b/npc/000-0-0/q'onan.txt
@@ -5,7 +5,7 @@
// Description:
// Sleeping and snoring NPC.
-000-0-0,29,28,0 script Q'Onan#000-0-0 402,{
+000-0-0,29,28,0 script Q'Onan#000-0-0 NPC_ORC_SAILOR,{
asleep;
close;
diff --git a/npc/000-0-0/sailors.txt b/npc/000-0-0/sailors.txt
index c59c7c35..09a8d757 100644
--- a/npc/000-0-0/sailors.txt
+++ b/npc/000-0-0/sailors.txt
@@ -6,7 +6,7 @@
// Introduction scene where two sailors talk about how the player was found on his raft.
// Elmo will handle dialogs between both NPCs.
-000-0-0,26,23,0 script Elmo#sailors 409,{
+000-0-0,26,23,0 script Elmo#sailors NPC_ELMO,{
OnTalk:
setcamnpc;
@@ -74,7 +74,7 @@ OnInit:
end;
}
-000-0-0,25,23,0 script Magic Arpan#sailors 407,{
+000-0-0,25,23,0 script Magic Arpan#sailors NPC_MAGIC_ARPAN,{
doevent "Elmo#sailors::OnTalk";
close;
diff --git a/npc/000-0/sailors.txt b/npc/000-0/sailors.txt
index 5337b999..1c30cf9c 100644
--- a/npc/000-0/sailors.txt
+++ b/npc/000-0/sailors.txt
@@ -7,7 +7,7 @@
// Description:
// Starting script of Evol Online.
-000-0,23,20,0 script Sailors 405,6,6,{
+000-0,23,20,0 script Sailors NPC_SAILORS,6,6,{
OnTouch:
checkclientversion;
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;
diff --git a/npc/000-2-0/billybons.txt b/npc/000-2-0/billybons.txt
index 17915ca9..40badcf6 100644
--- a/npc/000-2-0/billybons.txt
+++ b/npc/000-2-0/billybons.txt
@@ -4,7 +4,7 @@
// Description:
// Drunk easteregg telling about the player's past.
-000-2-0,20,23,0 script Billy Bons 411,{
+000-2-0,20,23,0 script Billy Bons NPC_BILLY_BONS,{
if (rand(5) == 2) goto L_Hic;
mesn;
diff --git a/npc/000-2-0/doors.txt b/npc/000-2-0/doors.txt
index 0b9c8c30..108ee2c3 100644
--- a/npc/000-2-0/doors.txt
+++ b/npc/000-2-0/doors.txt
@@ -16,7 +16,7 @@
// 11 Need to see Julia
// 12 Has been registered by Julia
-000-2-0,20,28,0 script AreaNPC#doors1 32767,0,0,{
+000-2-0,20,28,0 script AreaNPC#doors1 NPC_HIDDEN,0,0,{
OnTouch:
.@nard = getq(ShipQuests_Nard);
@@ -55,7 +55,7 @@ L_End:
close;
}
-000-2-0,33,28,0 script AreaNPC#doors2 32767,0,0,{
+000-2-0,33,28,0 script AreaNPC#doors2 NPC_HIDDEN,0,0,{
OnTouch:
.@julia = getq(ShipQuests_Julia);
diff --git a/npc/000-2-0/julia.txt b/npc/000-2-0/julia.txt
index 0da3c5f4..9519c17d 100644
--- a/npc/000-2-0/julia.txt
+++ b/npc/000-2-0/julia.txt
@@ -32,7 +32,7 @@
// 24 ChefGado Quest completed and "Introduction" chapter finalized.
// 25 Reward taken from the box.
-000-2-0,27,24,0 script Julia 404,2,10,{
+000-2-0,27,24,0 script Julia NPC_JULIA,2,10,{
mesn;
mesq lg("Hello dear!");
next;
diff --git a/npc/000-2-0/note.txt b/npc/000-2-0/note.txt
index 29628d70..2f8112fa 100644
--- a/npc/000-2-0/note.txt
+++ b/npc/000-2-0/note.txt
@@ -6,7 +6,7 @@
// Description:
// A small note presenting the 6 main rules of Evol Online.
-000-2-0,29,25,0 script Note 116,{
+000-2-0,29,25,0 script Note NPC_PAPER_NOTE,{
mesn "Narrator";
mes col(l("There is a paper with some rules written on it."), 9);
next;
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;
diff --git a/npc/000-2-2/doors.txt b/npc/000-2-2/doors.txt
index 9c46fad4..e0093c09 100644
--- a/npc/000-2-2/doors.txt
+++ b/npc/000-2-2/doors.txt
@@ -6,7 +6,7 @@
// Description:
// Doors NPCs.
-000-2-2,48,29,0 script DoorUpwards 32767,0,0,{
+000-2-2,48,29,0 script DoorUpwards NPC_HIDDEN,0,0,{
OnTouch:
if (mobcount("000-2-2.gat","all") > 0) goto L_Warn;
@@ -35,7 +35,7 @@ L_Warp:
close;
}
-000-2-2,24,31,0 script LeftDoor 32767,0,0,{
+000-2-2,24,31,0 script LeftDoor NPC_HIDDEN,0,0,{
OnTouch:
mesn "Narrator";
diff --git a/npc/000-2-2/ratto.txt b/npc/000-2-2/ratto.txt
index ef4b5a40..2ff5c572 100644
--- a/npc/000-2-2/ratto.txt
+++ b/npc/000-2-2/ratto.txt
@@ -17,7 +17,7 @@
// [8] = Shows how many seconds passed since ratto number 4 died.
// [9] = Shows how many seconds passed since the player started the quest.
-000-2-2,47,30,0 script RattosControl 32767,{
+000-2-2,47,30,0 script RattosControl NPC_HIDDEN,{
OnSpawn:
areamonster "000-2-2.gat", 23, 19, 50, 40, "Ratto", 1005, 1, "RattosControl::OnRatto1Death";
diff --git a/npc/000-2-3/box.txt b/npc/000-2-3/box.txt
index 716f25cd..957bc3d6 100644
--- a/npc/000-2-3/box.txt
+++ b/npc/000-2-3/box.txt
@@ -18,7 +18,7 @@
// 4 ChefGado Quest completed and "Introduction" chapter finalized.
// 5 Reward taken from the box.
-000-2-3,25,24,0 script Box 102,{
+000-2-3,25,24,0 script Box NPC_HAT_BOX,{
.@q = getq(ShipQuests_Nard);
mesn "Narrator";
diff --git a/npc/000-2-3/elmo.txt b/npc/000-2-3/elmo.txt
index eaaf6010..0fd99f98 100644
--- a/npc/000-2-3/elmo.txt
+++ b/npc/000-2-3/elmo.txt
@@ -5,7 +5,7 @@
// Description:
// Elmo's second dialog.
-000-2-3,27,27,0 script Elmo 409,{
+000-2-3,27,27,0 script Elmo NPC_ELMO,{
.@q = getq(ShipQuests_ArpanMoney);
if (.@q == 1) goto L_GotMoney;
diff --git a/npc/000-2-3/hammock.txt b/npc/000-2-3/hammock.txt
index d5b6972e..0ceeadbf 100644
--- a/npc/000-2-3/hammock.txt
+++ b/npc/000-2-3/hammock.txt
@@ -4,7 +4,7 @@
// Description:
// Animated hammock at the top level of the ship.
-000-2-3,28,24,0 script #name5 904,1,0,{
+000-2-3,28,24,0 script #name5 NPC_LEFT_HAMMOCK,1,0,{
OnTouch:
hamTouchRight;
diff --git a/npc/000-2-3/nard.txt b/npc/000-2-3/nard.txt
index 8e301c3b..6dae01e6 100644
--- a/npc/000-2-3/nard.txt
+++ b/npc/000-2-3/nard.txt
@@ -23,7 +23,7 @@
// 11 Gugli gives you the task.
// 12 Gave all of the boxes to Gugli.
-000-2-3,25,26,0 script Nard 406,{
+000-2-3,25,26,0 script Nard NPC_NARD,{
.@nard = getq(ShipQuests_Nard);
.@gugli = getq(ShipQuests_Gugli);
.@gado = getq(ShipQuests_ChefGado);
diff --git a/npc/000-2-3/piourocket.txt b/npc/000-2-3/piourocket.txt
index 3e1f5b58..641be3f3 100644
--- a/npc/000-2-3/piourocket.txt
+++ b/npc/000-2-3/piourocket.txt
@@ -4,7 +4,7 @@
// Description:
// Jumping piou.
-000-2-3,27,23,4 script #piourocket 408,{
+000-2-3,27,23,4 script #piourocket NPC_PIOU_ROCKET,{
setnpcdir 2;
stopnpctimer;
initnpctimer;
diff --git a/npc/000-2-3/sailors.txt b/npc/000-2-3/sailors.txt
index 59dd39ab..33178b5c 100644
--- a/npc/000-2-3/sailors.txt
+++ b/npc/000-2-3/sailors.txt
@@ -6,7 +6,7 @@
// Description:
// End of introduction with Nard and Elmo talking about the player.
-000-2-3,21,28,0 script AreaTop 32767,0,5,{
+000-2-3,21,28,0 script AreaTop NPC_HIDDEN,0,5,{
OnTouch:
if (getq(ShipQuests_Door) == 1) end;
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;
diff --git a/npc/001-2-0/resa.txt b/npc/001-2-0/resa.txt
index 019bd50a..0ed2997f 100644
--- a/npc/001-2-0/resa.txt
+++ b/npc/001-2-0/resa.txt
@@ -4,7 +4,7 @@
// Description:
// Light Armor shop keeper.
-001-2-0,37,28,0 script Resa 117,{
+001-2-0,37,28,0 script Resa NPC_ELVEN_FEMALE_ARMOR_SHOP,{
mesn;
mesq l("Hi.");
close;
diff --git a/npc/001-2-19/doors.txt b/npc/001-2-19/doors.txt
index 0f9e7ea5..6c77eba6 100644
--- a/npc/001-2-19/doors.txt
+++ b/npc/001-2-19/doors.txt
@@ -5,7 +5,7 @@
// Doors warp and animations in map 001-1
//
-001-2-19,41,25,0 script #MerchantHallWarp1 32767,0,0,{
+001-2-19,41,25,0 script #MerchantHallWarp1 NPC_HIDDEN,0,0,{
OnTouch:
warp "001-2-25", 29, 30;
close;
@@ -14,7 +14,7 @@ OnUnTouch:
doevent "#MerchantHallDoor1::OnUnTouch";
}
-001-2-19,41,24,0 script #MerchantHallDoor1 908,2,3,{
+001-2-19,41,24,0 script #MerchantHallDoor1 NPC_ARTIS_DOOR_WOOD,2,3,{
close;
OnTouch:
@@ -32,7 +32,7 @@ OnInit:
end;
}
-001-2-19,41,48,0 script #MerchantHallWarp2 32767,0,0,{
+001-2-19,41,48,0 script #MerchantHallWarp2 NPC_HIDDEN,0,0,{
OnTouch:
warp "001-1", 104, 42;
close;
@@ -41,7 +41,7 @@ OnUnTouch:
doevent "#MerchantHallDoor2::OnUnTouch";
}
-001-2-19,41,46,0 script #MerchantHallDoor2 908,3,3,{
+001-2-19,41,46,0 script #MerchantHallDoor2 NPC_ARTIS_DOOR_WOOD,3,3,{
close;
OnTouch:
diff --git a/npc/001-2-2/moon.txt b/npc/001-2-2/moon.txt
index e3b04dd2..73061285 100644
--- a/npc/001-2-2/moon.txt
+++ b/npc/001-2-2/moon.txt
@@ -4,7 +4,7 @@
// Description:
// Moon, main NPC for the urchin quest.
-001-2-2,33,32,0 script Moon#001-2-2 427,{
+001-2-2,33,32,0 script Moon#001-2-2 NPC_ELVEN_FEMALE,{
npctalk3 l("Hi!");
close;
diff --git a/npc/001-2-20/doors.txt b/npc/001-2-20/doors.txt
index 391c9374..b7b98270 100644
--- a/npc/001-2-20/doors.txt
+++ b/npc/001-2-20/doors.txt
@@ -5,7 +5,7 @@
// Doors warp and animations in map 001-1
//
-001-2-20,29,26,0 script #MerchantRoomWarp1 32767,0,0,{
+001-2-20,29,26,0 script #MerchantRoomWarp1 NPC_HIDDEN,0,0,{
OnTouch:
warp "001-2-19", 41, 55;
close;
@@ -14,7 +14,7 @@ OnUnTouch:
doevent "#MerchantRoomDoor1::OnUnTouch";
}
-001-2-20,29,25,0 script #MerchantRoomDoor1 908,2,3,{
+001-2-20,29,25,0 script #MerchantRoomDoor1 NPC_ARTIS_DOOR_WOOD,2,3,{
close;
OnTouch:
diff --git a/npc/001-2-21/julia.txt b/npc/001-2-21/julia.txt
index c7613639..f288b9af 100644
--- a/npc/001-2-21/julia.txt
+++ b/npc/001-2-21/julia.txt
@@ -7,7 +7,7 @@
// Description:
// Allows to change language.
-001-2-21,27,24,0 script Julia#Artis 404,{
+001-2-21,27,24,0 script Julia#Artis NPC_JULIA,{
mesn;
mesq lg("Hello dear!");
next;
diff --git a/npc/001-2-21/note.txt b/npc/001-2-21/note.txt
index 9d939bdd..38ef7f84 100644
--- a/npc/001-2-21/note.txt
+++ b/npc/001-2-21/note.txt
@@ -6,7 +6,7 @@
// Description:
// A small note presenting the 6 main rules of Evol Online.
-001-2-21,29,25,0 script Note#Artis 116,{
+001-2-21,29,25,0 script Note#Artis NPC_PAPER_NOTE,{
mesn "Narrator";
mes col(l("There is a paper with some rules written on it."), 9);
next;
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;
diff --git a/npc/001-2-23/doors.txt b/npc/001-2-23/doors.txt
index 79e203ec..3d67291c 100644
--- a/npc/001-2-23/doors.txt
+++ b/npc/001-2-23/doors.txt
@@ -6,7 +6,7 @@
// Description:
// Doors NPCs.
-001-2-23,48,29,0 script DoorUpwards#001-2-23 32767,0,0,{
+001-2-23,48,29,0 script DoorUpwards#001-2-23 NPC_HIDDEN,0,0,{
OnTouch:
if (mobcount("001-2-23.gat","all") > 0) goto L_Warn;
@@ -35,7 +35,7 @@ L_Warp:
close;
}
-001-2-23,24,31,0 script LeftDoor#001-2-23 32767,0,0,{
+001-2-23,24,31,0 script LeftDoor#001-2-23 NPC_HIDDEN,0,0,{
OnTouch:
mesn "Narrator";
diff --git a/npc/001-2-23/ratto.txt b/npc/001-2-23/ratto.txt
index c3212778..3b5e6e8d 100644
--- a/npc/001-2-23/ratto.txt
+++ b/npc/001-2-23/ratto.txt
@@ -17,7 +17,7 @@
// [8] = Shows how many seconds passed since ratto number 4 died.
// [9] = Shows how many seconds passed since the player started the quest.
-001-2-23,47,30,0 script RattosControl#001-2-23 32767,{
+001-2-23,47,30,0 script RattosControl#001-2-23 NPC_HIDDEN,{
OnSpawn:
areamonster "001-2-23.gat", 23, 19, 50, 40, "Ratto", 1005, 1, "RattosControl#001-2-23::OnRatto1Death";
diff --git a/npc/001-2-24/hammock.txt b/npc/001-2-24/hammock.txt
index b88cb298..f4319358 100644
--- a/npc/001-2-24/hammock.txt
+++ b/npc/001-2-24/hammock.txt
@@ -4,7 +4,7 @@
// Description:
// Animated hammock at the top level of the ship.
-001-2-24,28,24,0 script #nardArtisHammock 904,1,0,{
+001-2-24,28,24,0 script #nardArtisHammock NPC_LEFT_HAMMOCK,1,0,{
OnTouch:
hamTouchRight;
diff --git a/npc/001-2-24/nard.txt b/npc/001-2-24/nard.txt
index 4b0c251f..5d744610 100644
--- a/npc/001-2-24/nard.txt
+++ b/npc/001-2-24/nard.txt
@@ -23,7 +23,7 @@
// 11 Gugli gives you the task.
// 12 Gave all of the boxes to Gugli.
-001-2-24,25,26,0 script Nard#Artis 406,{
+001-2-24,25,26,0 script Nard#Artis NPC_NARD,{
mesn;
mesq g(l("Good day miss."), l("Good day mister."));
diff --git a/npc/001-2-24/piourocket.txt b/npc/001-2-24/piourocket.txt
index d3b7e38e..9fef8988 100644
--- a/npc/001-2-24/piourocket.txt
+++ b/npc/001-2-24/piourocket.txt
@@ -4,7 +4,7 @@
// Description:
// Jumping piou.
-001-2-24,27,23,4 script #piourocketArtis 408,{
+001-2-24,27,23,4 script #piourocketArtis NPC_PIOU_ROCKET,{
setnpcdir 2;
stopnpctimer;
initnpctimer;
diff --git a/npc/001-2-26/flask.txt b/npc/001-2-26/flask.txt
index 1bee0344..a92d5a49 100644
--- a/npc/001-2-26/flask.txt
+++ b/npc/001-2-26/flask.txt
@@ -4,7 +4,7 @@
// Description:
// Alchemy animation.
-001-2-26,32,27,4 script #FlaskAlchemyLab 422,{
+001-2-26,32,27,4 script #FlaskAlchemyLab NPC_FLASK,{
setnpcdir 2;
stopnpctimer;
initnpctimer;
diff --git a/npc/001-2-27/don.txt b/npc/001-2-27/don.txt
index 2956fa2b..83369e84 100644
--- a/npc/001-2-27/don.txt
+++ b/npc/001-2-27/don.txt
@@ -4,7 +4,7 @@
// Description:
// Don the blacksmith of Artis
-001-2-27,35,29,0 script Don#001-2-27 122,{
+001-2-27,35,29,0 script Don#001-2-27 NPC_HUMAN_MALE_OLD,{
mesn;
mesq l("Hm...");
diff --git a/npc/001-2-4/doors.txt b/npc/001-2-4/doors.txt
index 45b7dbed..b910acbd 100644
--- a/npc/001-2-4/doors.txt
+++ b/npc/001-2-4/doors.txt
@@ -5,7 +5,7 @@
// Doors warp and animations in map 001-2-4
//
-001-2-4,52,28,0 script #LibraryWarp 32767,0,0,{
+001-2-4,52,28,0 script #LibraryWarp NPC_HIDDEN,0,0,{
OnTouch:
warp "001-2-5", 28, 37;
close;
@@ -14,7 +14,7 @@ OnUnTouch:
doevent "#LibraryDoor::OnUnTouch";
}
-001-2-4,52,27,0 script #LibraryDoor 907,3,3,{
+001-2-4,52,27,0 script #LibraryDoor NPC_ARTIS_IN_DOOR,3,3,{
close;
OnTouch:
diff --git a/npc/001-2-4/terry.txt b/npc/001-2-4/terry.txt
index 170f2226..16825331 100644
--- a/npc/001-2-4/terry.txt
+++ b/npc/001-2-4/terry.txt
@@ -4,7 +4,7 @@
// Description:
// Librarian
-001-2-4,51,35,4 script Terry 423,{
+001-2-4,51,35,4 script Terry NPC_TERRY,{
mesn;
mesq l("Hi.");
next;
diff --git a/npc/001-2-6/dolfina.txt b/npc/001-2-6/dolfina.txt
index 16119ad0..d00f6d8f 100644
--- a/npc/001-2-6/dolfina.txt
+++ b/npc/001-2-6/dolfina.txt
@@ -4,7 +4,7 @@
// Description:
// Aemil
-001-2-6,31,44,0 script Dolfina 121,{
+001-2-6,31,44,0 script Dolfina NPC_ELVEN_FEMALE_READING,{
mesn;
mesq l("Stop disturbing me, I already re-read that part twice because of you!");
diff --git a/npc/items/croconut.txt b/npc/items/croconut.txt
index f910cc44..f7f1d7e1 100644
--- a/npc/items/croconut.txt
+++ b/npc/items/croconut.txt
@@ -9,7 +9,7 @@
// rif(countitemcolor(35xx, 1), l(getitemname(xx))), L_Weak,
// rif(countitemcolor(35yy, 1), l(getitemname(yy))), L_Good,
-000-2-1,0,0,0 script Croconut 32767,{
+000-2-1,0,0,0 script Croconut NPC_HIDDEN,{
close;
OnUse:
diff --git a/npc/items/oldbook.txt b/npc/items/oldbook.txt
index 91ad46b2..92f44d2c 100644
--- a/npc/items/oldbook.txt
+++ b/npc/items/oldbook.txt
@@ -6,7 +6,7 @@
// Description:
// Reading the Old Book.
-000-2-1,0,0,1 script OldBook 32767,{
+- script OldBook -1,{
OnUse:
mesn "Narrator";
diff --git a/npc/test/npc1.txt b/npc/test/npc1.txt
index 33ed9978..f2471a63 100644
--- a/npc/test/npc1.txt
+++ b/npc/test/npc1.txt
@@ -4,7 +4,7 @@
// Description:
// test npc1
-test,10,10,0 script npc1#door 32767,0,1,{
+test,10,10,0 script npc1#door NPC_HIDDEN,0,1,{
OnTouch:
warp "test", 20, 20;
close;
@@ -12,7 +12,7 @@ OnUnTouch:
doevent "npc1::OnUnTouch";
}
-test,10,10,0 script npc1 800,3,3,{
+test,10,10,0 script npc1 NPC_TEST1,3,3,{
function areatest
{
mesn;
diff --git a/npc/test/npc2.txt b/npc/test/npc2.txt
index dd6eb937..b8e97141 100644
--- a/npc/test/npc2.txt
+++ b/npc/test/npc2.txt
@@ -4,7 +4,7 @@
// Description:
// test npc2
-test,20,10,0 trader npc2 102,{
+test,20,10,0 trader npc2 NPC_HAT_BOX,{
OnInit:
tradertype(NST_MARKET);
sellitem 505, -1, 10;
diff --git a/npc/test/npc3.txt b/npc/test/npc3.txt
index 9a186371..54c6bd26 100644
--- a/npc/test/npc3.txt
+++ b/npc/test/npc3.txt
@@ -4,4 +4,4 @@
// Description:
// test npc3
-test,25,10,0 cashshop npc3 109,505:100,502:-1,513:-1,509:-1,2000:-1,1800:-1,3501:-1
+test,25,10,0 cashshop npc3 NPC_SHOP_BAG,505:100,502:-1,513:-1,509:-1,2000:-1,1800:-1,3501:-1
diff --git a/npc/test/npc4.txt b/npc/test/npc4.txt
index a0558288..ba96b356 100644
--- a/npc/test/npc4.txt
+++ b/npc/test/npc4.txt
@@ -4,7 +4,7 @@
// Description:
// test npc4
-test,25,20,0 script npc4 801,{
+test,25,20,0 script npc4 NPC_PLAYER,{
close;
OnTimer1000:
if (isunitwalking())