Added ability to use constants instead of sprite IDs for NPCs. Converted all npcs to use this.

1 files changed, 105 insertions, 105 deletions

diff --git a/npc/quests/quests_veins.txt b/npc/quests/quests_veins.txt
index bfd7f7d51..4b35a132c 100644
--- a/npc/quests/quests_veins.txt
+++ b/npc/quests/quests_veins.txt
@@ -306,7 +306,7 @@
 	}
 }
 
-ve_in,169,310,6	script	Strange Old Man#ve	121,{
+ve_in,169,310,6	script	Strange Old Man#ve	2_M_MOLGENSTEIN,{
 	if (veins_stone == 0) {
 		mes "[Absar]";
 		mes "Bwahahaha!";
@@ -469,7 +469,7 @@ ve_in,169,310,6	script	Strange Old Man#ve	121,{
 	close;
 }
 
-ve_in02,37,28,4	script	Factory Manager	898,{
+ve_in02,37,28,4	script	Factory Manager	4_M_HUMAN_01,{
 	if (veins_stone && veins_stone < 5) {
 		mes "[Mirhen]";
 		mes "Hey, employees only beyond this point!";
@@ -532,7 +532,7 @@ ve_in02,37,28,4	script	Factory Manager	898,{
 	close;
 }
 
-ve_in02,54,49,2	script	Factory Worker#ve1	943,{
+ve_in02,54,49,2	script	Factory Worker#ve1	4_M_DESERT,{
 	if (veins_stone < 6) {
 		mes "[Bahed]";
 		mes "lately, I've been feeling so weak...";
@@ -633,7 +633,7 @@ ve_in02,54,49,2	script	Factory Worker#ve1	943,{
 	close;
 }
 
-ve_in02,68,39,7	script	Factory Worker#ve2	943,{
+ve_in02,68,39,7	script	Factory Worker#ve2	4_M_DESERT,{
 	mes "[Worker]";
 	mes "What the heck are these rocks?";
 	mes "They're ordinary stones, aren't they?";
@@ -643,7 +643,7 @@ ve_in02,68,39,7	script	Factory Worker#ve2	943,{
 
 // Spy Quest :: veins_secret
 //============================================================
-prontera,202,122,0	script	Kid#sch	703,{
+prontera,202,122,0	script	Kid#sch	4_F_KID2,{
 	if (que_sch == 0) {
 		mes "[Rooney]";
 		mes "Where the heck";
@@ -731,7 +731,7 @@ prontera,202,122,0	script	Kid#sch	703,{
 	close;
 }
 
-prt_church,89,108,6	script	Bard#sch	741,{
+prt_church,89,108,6	script	Bard#sch	2_M_BARD_ORIENT,{
 	if ((MaxWeight-Weight) < 2000 || checkweight(1201,1) == 0) {
 		mes "^3355FFWait a second!";
 		mes "Right now, you're carrying";
@@ -990,7 +990,7 @@ prt_church,89,108,6	script	Bard#sch	741,{
 	}
 }
 
-morocc,53,87,7	script	Prison Ward#sch	707,{
+morocc,53,87,7	script	Prison Ward#sch	4_M_MOC_SOLDIER,{
 	if (que_sch < 4) {
 		mes "[Jesse]";
 		mes "Only authorized";
@@ -1110,7 +1110,7 @@ morocc,53,87,7	script	Prison Ward#sch	707,{
 	close;
 }
 
-morocc_in,79,163,0	script	Public Security Officer	748,{
+morocc_in,79,163,0	script	Public Security Officer	4_M_ALCHE_A,{
 	if (que_sch < 7) {
 		mes "[Krieg]";
 		mes "I'm in charge of public";
@@ -1194,7 +1194,7 @@ morocc_in,79,163,0	script	Public Security Officer	748,{
 
 ra_in01,48,352,0	warp	que_sch_jail	1,1,morocc,56,89
 
-ra_in01,50,387,4	script	Upset Looking Bard#sch	51,{
+ra_in01,50,387,4	script	Upset Looking Bard#sch	1_M_BARD,{
 	if (que_sch < 10) {
 		mes "[Vitre]";
 		mes ".............";
@@ -1368,7 +1368,7 @@ ra_in01,50,387,4	script	Upset Looking Bard#sch	51,{
 	}
 }
 
-ra_in01,58,389,0	script	Jesse#sch	707,{
+ra_in01,58,389,0	script	Jesse#sch	4_M_MOC_SOLDIER,{
 	end;
 
 OnInit:
@@ -1376,7 +1376,7 @@ OnInit:
 	end;
 }
 
-ra_in01,58,389,0	script	Guant Prisoner#sch	929,{
+ra_in01,58,389,0	script	Guant Prisoner#sch	4_M_MIDDLE,{
 	if (que_sch < 11) {
 		mes "[Ruan]";
 		mes "This stinks. Why am";
@@ -1442,7 +1442,7 @@ ra_in01,58,389,0	script	Guant Prisoner#sch	929,{
 }
 
 // Escort Dancers to Schwaltzvalt Republic
-job_duncer,93,106,6	script	Dance Instructor#sch	892,{
+job_duncer,93,106,6	script	Dance Instructor#sch	4_F_HUGRANMA,{
 	if ((MaxWeight-Weight) < 2000 || checkweight(1201,1) == 0) {
 		mes "^3355FFWait a second!";
 		mes "Right now, you're carrying";
@@ -1652,7 +1652,7 @@ job_duncer,93,106,6	script	Dance Instructor#sch	892,{
 	close;
 }
 
-job_duncer,85,49,0	script	Young Dancer#sch1	724,{
+job_duncer,85,49,0	script	Young Dancer#sch1	4_F_07,{
 	if (que_sch < 12) {
 		mes "[Dancer]";
 		mes "Hi there~";
@@ -1690,7 +1690,7 @@ job_duncer,85,49,0	script	Young Dancer#sch1	724,{
 	close;
 }
 
-job_duncer,83,52,6	script	Cheerful Dancer#sch1	724,{
+job_duncer,83,52,6	script	Cheerful Dancer#sch1	4_F_07,{
 	if (que_sch < 12) {
 		mes "[Dancer]";
 		mes "Hi there~";
@@ -1727,7 +1727,7 @@ job_duncer,83,52,6	script	Cheerful Dancer#sch1	724,{
 	close;
 }
 
-job_duncer,87,50,2	script	Mature Looking Dancer#s1	724,{
+job_duncer,87,50,2	script	Mature Looking Dancer#s1	4_F_07,{
 	if (que_sch < 12) {
 		mes "[Dancer]";
 		mes "Hi there~";
@@ -1764,7 +1764,7 @@ job_duncer,87,50,2	script	Mature Looking Dancer#s1	724,{
 	close;
 }
 
-airplane,76,56,4	script	Young Dancer#sch2	724,{
+airplane,76,56,4	script	Young Dancer#sch2	4_F_07,{
 	if (que_sch < 13) {
 		mes "[Dancer]";
 		mes "Hi there~";
@@ -1788,7 +1788,7 @@ airplane,76,56,4	script	Young Dancer#sch2	724,{
 	close;
 }
 
-airplane,75,53,0	script	Cheerful Dancer#sch2	724,{
+airplane,75,53,0	script	Cheerful Dancer#sch2	4_F_07,{
 	if (que_sch < 13) {
 		mes "[Dancer]";
 		mes "Hi there~";
@@ -1813,7 +1813,7 @@ airplane,75,53,0	script	Cheerful Dancer#sch2	724,{
 	close;
 }
 
-airplane,79,55,2	script	Mature Looking Dancer#s2	724,{
+airplane,79,55,2	script	Mature Looking Dancer#s2	4_F_07,{
 	if (que_sch < 13) {
 		mes "[Dancer]";
 		mes "Hi there~";
@@ -1854,7 +1854,7 @@ airplane,79,55,2	script	Mature Looking Dancer#s2	724,{
 	close;
 }
 
-ein_in01,174,266,0	script	Young Dancer#sch3	724,{
+ein_in01,174,266,0	script	Young Dancer#sch3	4_F_07,{
 	if (que_sch < 17) {
 		mes "[Dancer]";
 		mes "Oh, the dinner";
@@ -1880,7 +1880,7 @@ ein_in01,174,266,0	script	Young Dancer#sch3	724,{
 	close;
 }
 
-ein_in01,172,266,0	script	Cheerful Dancer#sch3	724,{
+ein_in01,172,266,0	script	Cheerful Dancer#sch3	4_F_07,{
 	if (que_sch < 17) {
 		mes "[Dancer]";
 		mes "The dinner party isn't";
@@ -1905,7 +1905,7 @@ ein_in01,172,266,0	script	Cheerful Dancer#sch3	724,{
 	close;
 }
 
-ein_in01,170,266,0	script	Mature Looking Dancer#s3	724,{
+ein_in01,170,266,0	script	Mature Looking Dancer#s3	4_F_07,{
 	if (que_sch < 17) {
 		mes "[Dancer]";
 		mes "Oh, the dinner";
@@ -1933,7 +1933,7 @@ ein_in01,170,266,0	script	Mature Looking Dancer#s3	724,{
 	close;
 }
 
-ein_in01,279,221,0	script	Hotel Manager#sch	903,5,5,{
+ein_in01,279,221,0	script	Hotel Manager#sch	4_M_KHKYEL,5,5,{
 	if (que_sch < 15) {
 		mes "[Manager]";
 		mes "It'd be a really great";
@@ -1980,7 +1980,7 @@ OnTouch:
 	end;
 }
 
-ein_in01,166,282,4	script	Employee#sch	904,{
+ein_in01,166,282,4	script	Employee#sch	4_M_KHMAN,{
 	if (que_sch < 15) {
 		mes "[Employee]";
 		mes "We've been so busy lately!";
@@ -2099,7 +2099,7 @@ OnTouch:
 	end;
 }
 
-ein_in01,181,284,0	script	Corporate Figure	109,{
+ein_in01,181,284,0	script	Corporate Figure	4_M_MANAGER,{
 	end;
 
 OnInit:
@@ -2107,7 +2107,7 @@ OnInit:
 	end;
 }
 
-ein_in01,181,285,0	script	Arunafeltz Figure	920,{
+ein_in01,181,285,0	script	Arunafeltz Figure	4_F_TRAINEE,{
 	end;
 
 OnInit:
@@ -2115,7 +2115,7 @@ OnInit:
 	end;
 }
 
-ein_in01,168,274,0	script	Corporate Figure#sch	109,{
+ein_in01,168,274,0	script	Corporate Figure#sch	4_M_MANAGER,{
 	mes "[????]";
 	mes "Hmm... Good.";
 	mes "Everything looks";
@@ -2123,7 +2123,7 @@ ein_in01,168,274,0	script	Corporate Figure#sch	109,{
 	close;
 }
 
-ein_in01,170,284,4	script	Arunafeltz Figure#sch	920,{
+ein_in01,170,284,4	script	Arunafeltz Figure#sch	4_F_TRAINEE,{
 	mes "[??????]";
 	mes "I've got to say, only";
 	mes "Rekenber can host such";
@@ -2133,7 +2133,7 @@ ein_in01,170,284,4	script	Arunafeltz Figure#sch	920,{
 	close;
 }
 
-morocc,297,154,0	script	Thin-Faced Bard#sch	51,{
+morocc,297,154,0	script	Thin-Faced Bard#sch	1_M_BARD,{
 	if ((MaxWeight-Weight) < 2000 || checkweight(1201,1) == 0) {
 		mes "^3355FFWait a second!";
 		mes "Right now, you're carrying";
@@ -2400,7 +2400,7 @@ morocc,297,154,0	script	Thin-Faced Bard#sch	51,{
 	close;
 }
 
-morocc,294,152,0	script	????#sch1	899,{
+morocc,294,152,0	script	????#sch1	4_M_HUMAN_02,{
 	end;
 
 OnInit:
@@ -2408,7 +2408,7 @@ OnInit:
 	end;
 }
 
-morocc,293,155,6	script	????#sch2	899,{
+morocc,293,155,6	script	????#sch2	4_M_HUMAN_02,{
 	end;
 
 OnInit:
@@ -2416,7 +2416,7 @@ OnInit:
 	end;
 }
 
-morocc,298,150,1	script	????#sch3	899,{
+morocc,298,150,1	script	????#sch3	4_M_HUMAN_02,{
 	end;
 
 OnInit:
@@ -2424,7 +2424,7 @@ OnInit:
 	end;
 }
 
-prontera,109,161,6	script	Young Man#sch	83,{
+prontera,109,161,6	script	Young Man#sch	4_M_01,{
 	if (que_sch < 20) {
 		mes "[Chada]";
 		mes "What a boring day...";
@@ -2485,7 +2485,7 @@ prontera,109,161,6	script	Young Man#sch	83,{
 	}
 }
 
-geffen,196,167,4	script	Young Woman#sch	101,{
+geffen,196,167,4	script	Young Woman#sch	4W_F_01,{
 	if (que_sch < 21) {
 		mes "[Ghez]";
 		mes "When is he going";
@@ -2559,7 +2559,7 @@ geffen,196,167,4	script	Young Woman#sch	101,{
 	}
 }
 
-comodo,135,299,0	script	Young Man#sch2	809,{
+comodo,135,299,0	script	Young Man#sch2	1_M_SIGNMONK,{
 	if (que_sch < 22) {
 		mes "[Nosdan]";
 		mes "Have you come to hear";
@@ -2648,7 +2648,7 @@ comodo,135,299,0	script	Young Man#sch2	809,{
 	}
 }
 
-sec_in02,10,43,4	script	Extra Story Patch	809,{
+sec_in02,10,43,4	script	Extra Story Patch	1_M_SIGNMONK,{
 	callfunc "F_GM_NPC";
 	mes "[Patch]";
 	mes "Yeah, you can try.";
@@ -2664,7 +2664,7 @@ sec_in02,10,43,4	script	Extra Story Patch	809,{
 
 // Siblings Quest :: veins_camel
 //============================================================
-veins,327,185,3	script	Kid#camelcamel	944,{
+veins,327,185,3	script	Kid#camelcamel	4_M_DST_CHILD,{
 	if (MISC_QUEST & 8192) {
 		if (rachel_camel == 0) {
 			mes "[Kid Karyn]";
@@ -3174,7 +3174,7 @@ veins,327,185,3	script	Kid#camelcamel	944,{
 	}
 }
 
-que_thor,36,66,5	script	Little Curdie	941,{
+que_thor,36,66,5	script	Little Curdie	4_F_DST_CHILD,{
 	if (rachel_camel == 1) {
 		mes "^3355FFYou come across";
 		mes "a little girl lying on the";
@@ -3515,7 +3515,7 @@ que_thor,36,66,5	script	Little Curdie	941,{
 	}
 }
 
-veins,181,166,3	script	Lockenlock	900,{
+veins,181,166,3	script	Lockenlock	4_M_HUMERCHANT,{
 	if (rachel_camel && rachel_camel < 4) {
 		mes "^3355FFIt's a drunkard...";
 		mes "The scent of pure";
@@ -4072,7 +4072,7 @@ veins,181,166,3	script	Lockenlock	900,{
 	}
 }
 
-veins,227,127,5	script	Ivory	940,{
+veins,227,127,5	script	Ivory	4_F_DESERT,{
 	if (rachel_camel && rachel_camel < 5) {
 		mes "[Organic Soap Maker Ivory]";
 		mes "I need to make more of";
@@ -4395,7 +4395,7 @@ veins,227,127,5	script	Ivory	940,{
 	}
 }
 
-veins,115,59,5	script	Saraman	847,{
+veins,115,59,5	script	Saraman	4_M_EINOLD,{
 	if (rachel_camel && rachel_camel < 7) {
 		mes "[Saraman]";
 		mes "Zzzzz...";
@@ -4743,7 +4743,7 @@ veins,115,59,5	script	Saraman	847,{
 	}
 }
 
-veins,78,226,5	script	Camel#camelcc1::VeinsCamel	938,{
+veins,78,226,5	script	Camel#camelcc1::VeinsCamel	4_DST_CAMEL,{
 	if (rachel_camel == 9) {
 		mes "^3355FFThe camel sniffed the";
 		mes "appetite stimulant, but";
@@ -4770,13 +4770,13 @@ veins,78,226,5	script	Camel#camelcc1::VeinsCamel	938,{
 	}
 }
 
-veins,72,227,3	duplicate(VeinsCamel)	Camel#camelcc3	938
-veins,81,222,1	duplicate(VeinsCamel)	Camel#camelcc4	938
-veins,77,219,5	duplicate(VeinsCamel)	Camel#camelcc5	938
-veins,73,215,8	duplicate(VeinsCamel)	Camel#camelcc6	938
-veins,68,215,5	duplicate(VeinsCamel)	Camel#camelcc7	938
+veins,72,227,3	duplicate(VeinsCamel)	Camel#camelcc3	4_DST_CAMEL
+veins,81,222,1	duplicate(VeinsCamel)	Camel#camelcc4	4_DST_CAMEL
+veins,77,219,5	duplicate(VeinsCamel)	Camel#camelcc5	4_DST_CAMEL
+veins,73,215,8	duplicate(VeinsCamel)	Camel#camelcc6	4_DST_CAMEL
+veins,68,215,5	duplicate(VeinsCamel)	Camel#camelcc7	4_DST_CAMEL
 
-ve_fild07,235,42,3	script	Silk Sand Camel	938,{
+ve_fild07,235,42,3	script	Silk Sand Camel	4_DST_CAMEL,{
 	if (rachel_camel == 11) {
 		mes "^3355FFThis camel's leg is";
 		mes "wounded. Although it";
@@ -4978,7 +4978,7 @@ ve_fild07,235,42,3	script	Silk Sand Camel	938,{
 	}
 }
 
-veins,221,120,5	script	Young Town Native	943,{
+veins,221,120,5	script	Young Town Native	4_M_DESERT,{
 	if (rachel_camel == 3) {
 		mes "[Native Young Man]";
 		mes "My name is Toby.";
@@ -5073,7 +5073,7 @@ veins,221,120,5	script	Young Town Native	943,{
 
 // Thor Volcano Base Quest :: veins_camp
 //============================================================
-ra_temin,87,133,1	script	Rachel Guard#vol1	934,5,2,{
+ra_temin,87,133,1	script	Rachel Guard#vol1	4_M_RASWORD,5,2,{
 	if (aru_vol == 2) {
 		mes "[Guard Karlum]";
 		mes "High Priest Vildt isn't";
@@ -5214,7 +5214,7 @@ OnTouch:
 	end;
 }
 
-ra_temin,82,133,7	script	Rachel Guard#vol2	934,5,2,{
+ra_temin,82,133,7	script	Rachel Guard#vol2	4_M_RASWORD,5,2,{
 	mes "[Guard Krodger]";
 	mes "High Priest Vildt isn't";
 	mes "here right now. Please";
@@ -5231,7 +5231,7 @@ OnTouch:
 	close;
 }
 
-ra_temin,115,140,1	script	Flower Vase#vol	111,{
+ra_temin,115,140,1	script	Flower Vase#vol	HIDDEN_NPC,{
 	if ((aru_vol > 2) && (aru_vol < 5)) {
 		mes "^3355FFYou find a giant";
 		mes "vase full of beautiful";
@@ -5297,7 +5297,7 @@ OnTouch:
 	end;
 }
 
-ra_temin,40,124,3	script	Female Follower#vol	920,{
+ra_temin,40,124,3	script	Female Follower#vol	4_F_TRAINEE,{
 	mes "[Lamir]";
 	mes "^333333*Sigh*^000000 High Priest Vildt";
 	mes "left over so much food after";
@@ -5334,7 +5334,7 @@ ra_temin,40,124,3	script	Female Follower#vol	920,{
 	close;
 }
 
-ra_temin,42,124,3	script	Rachel Guard#vol1_1	934,{
+ra_temin,42,124,3	script	Rachel Guard#vol1_1	4_M_RASWORD,{
 	end;
 
 OnInit:
@@ -5342,7 +5342,7 @@ OnInit:
 	end;
 }
 
-ra_temin,5,5,3	script	vol_time	844,{
+ra_temin,5,5,3	script	vol_time	CLEAR_NPC,{
 OnInit:
 	stopnpctimer;
 	end;
@@ -5392,7 +5392,7 @@ OnTimer55000:
 	end;
 }
 
-ra_temin,113,140,1	script	Rachel Guard#vol2_1	934,{
+ra_temin,113,140,1	script	Rachel Guard#vol2_1	4_M_RASWORD,{
 	mes "[Guard Krodger]";
 	mes "What's with this vase?";
 	mes "They always send me out";
@@ -5407,7 +5407,7 @@ OnInit:
 	end;
 }
 
-ra_temin,5,5,1	script	vol_time2	844,{
+ra_temin,5,5,1	script	vol_time2	CLEAR_NPC,{
 OnInit:
 	stopnpctimer;
 	end;
@@ -5425,7 +5425,7 @@ OnTimer30000:
 	end;
 }
 
-ra_temin,87,118,3	script	Drawer#vol1::VeinsDrawer	111,{
+ra_temin,87,118,3	script	Drawer#vol1::VeinsDrawer	HIDDEN_NPC,{
 	mes "^3355FFThere are some neatly";
 	mes "printed and organized";
 	mes "documents inside";
@@ -5433,9 +5433,9 @@ ra_temin,87,118,3	script	Drawer#vol1::VeinsDrawer	111,{
 	close;
 }
 
-ra_temin,83,118,3	duplicate(VeinsDrawer)	Drawer#vol2	111
+ra_temin,83,118,3	duplicate(VeinsDrawer)	Drawer#vol2	HIDDEN_NPC
 
-ra_temin,85,118,3	script	Drawer#vol3	111,{
+ra_temin,85,118,3	script	Drawer#vol3	HIDDEN_NPC,{
 	if ((MaxWeight-Weight) < 2000 || checkweight(1201,1) == 0) {
 		mes "^3355FFWait a second!";
 		mes "Right now, you're carrying";
@@ -5507,14 +5507,14 @@ ra_temin,85,118,3	script	Drawer#vol3	111,{
 	close;
 }
 
-ra_temin,88,117,3	script	Goddess Statue#vol1	111,{
+ra_temin,88,117,3	script	Goddess Statue#vol1	HIDDEN_NPC,{
 	mes "^3355FFIt's a statue of Freya,";
 	mes "a goddess revered for her";
 	mes "clemency and wisdom.^000000";
 	close;
 }
 
-ra_temin,73,126,1	script	Ladder#vol1	111,{
+ra_temin,73,126,1	script	Ladder#vol1	HIDDEN_NPC,{
 	if (aru_vol == 5) {
 		mes "["+strcharinfo(0)+"]";
 		mes "Wait, I can use this";
@@ -5579,7 +5579,7 @@ OnTouch:
 	end;
 }
 
-veins,159,171,3	script	Towner#vol	945,{
+veins,159,171,3	script	Towner#vol	4_M_DST_GRAND,{
 	mes "[Towner]";
 	mes "The small office on the";
 	mes "2nd floor of this weapon";
@@ -5597,7 +5597,7 @@ veins,159,171,3	script	Towner#vol	945,{
 	close;
 }
 
-ve_in,233,116,3	script	Drunken Man#vol	901,{
+ve_in,233,116,3	script	Drunken Man#vol	4_M_HUOLDARMY,{
 	if ((MaxWeight-Weight) < 2000 || checkweight(1201,1) == 0) {
 		mes "^3355FFWait a second!";
 		mes "Right now, you're carrying";
@@ -5994,7 +5994,7 @@ ve_in,233,116,3	script	Drunken Man#vol	901,{
 	close;
 }
 
-ve_in,232,117,5	script	Drunken Lady#1	940,{
+ve_in,232,117,5	script	Drunken Lady#1	4_F_DESERT,{
 	mes "[Drunken Lady]";
 	mes "This guys' actually";
 	mes "pretty boring, but...";
@@ -6003,7 +6003,7 @@ ve_in,232,117,5	script	Drunken Lady#1	940,{
 	close;
 }
 
-ve_in,234,115,3	script	Drunken Lady#2	940,{
+ve_in,234,115,3	script	Drunken Lady#2	4_F_DESERT,{
 	mes "[Drunken Lady]";
 	mes "This tavern might look";
 	mes "luxurious and gorgeous,";
@@ -6013,7 +6013,7 @@ ve_in,234,115,3	script	Drunken Lady#2	940,{
 	close;
 }
 
-ve_in,277,229,3	script	Wall Closet#vol	111,{
+ve_in,277,229,3	script	Wall Closet#vol	HIDDEN_NPC,{
 	if ((MaxWeight-Weight) < 2000 || checkweight(1201,1) == 0) {
 		mes "^3355FFWait a second!";
 		mes "Right now, you're carrying";
@@ -6040,7 +6040,7 @@ ve_in,277,229,3	script	Wall Closet#vol	111,{
 	close;
 }
 
-ve_in,281,214,3	script	Bookshelf#vol	111,{
+ve_in,281,214,3	script	Bookshelf#vol	HIDDEN_NPC,{
 	if ((MaxWeight-Weight) < 2000 || checkweight(1201,1) == 0) {
 		mes "^3355FFWait a second!";
 		mes "Right now, you're carrying";
@@ -6114,7 +6114,7 @@ ve_in,281,214,3	script	Bookshelf#vol	111,{
 	close;
 }
 
-thor_v01,37,234,3	script	Hot Land Surface#1	111,{
+thor_v01,37,234,3	script	Hot Land Surface#1	HIDDEN_NPC,{
 	if (aru_vol == 8) {
 		if ((countitem(7704) > 0) && (countitem(7342) > 0)) {
 			mes "^3355FFYou use the pyrometer";
@@ -6152,7 +6152,7 @@ thor_v01,37,234,3	script	Hot Land Surface#1	111,{
 	close;
 }
 
-thor_v02,165,37,3	script	Hot Land Surface#2	111,{
+thor_v02,165,37,3	script	Hot Land Surface#2	HIDDEN_NPC,{
 	if (aru_vol == 9) {
 		if ((countitem(7704) > 0) && (countitem(7342) > 0)) {
 			mes "^3355FFYou use the pyrometer";
@@ -6184,7 +6184,7 @@ thor_v02,165,37,3	script	Hot Land Surface#2	111,{
 	close;
 }
 
-thor_v02,170,100,3	script	Hot Land Surface#3	111,{
+thor_v02,170,100,3	script	Hot Land Surface#3	HIDDEN_NPC,{
 	if (aru_vol == 10) {
 		if ((countitem(7704) > 0) && (countitem(7342) > 0)) {
 			mes "^3355FFYou use the pyrometer";
@@ -6230,7 +6230,7 @@ thor_v02,170,100,3	script	Hot Land Surface#3	111,{
 	close;
 }
 
-que_thor,145,66,3	script	Guard#vol::VeinsGuard	939,{
+que_thor,145,66,3	script	Guard#vol::VeinsGuard	4_DST_SOLDIER,{
 	if (aru_vol == 11) {
 		mes "[Guard]";
 		mes "Only authorized";
@@ -6285,10 +6285,10 @@ que_thor,145,66,3	script	Guard#vol::VeinsGuard	939,{
 	close;
 }
 
-que_thor,136,66,3	duplicate(VeinsGuard)	Guard#vol2	939
-que_thor,127,60,5	duplicate(VeinsGuard)	Guard#vol3	939
+que_thor,136,66,3	duplicate(VeinsGuard)	Guard#vol2	4_DST_SOLDIER
+que_thor,127,60,5	duplicate(VeinsGuard)	Guard#vol3	4_DST_SOLDIER
 
-thor_camp,250,104,3	script	Sahedi#vol	934,{
+thor_camp,250,104,3	script	Sahedi#vol	4_M_RASWORD,{
 	if ((MaxWeight-Weight) < 2000 || checkweight(1201,1) == 0) {
 		mes "^3355FFWait a second!";
 		mes "Right now, you're carrying";
@@ -6601,7 +6601,7 @@ OnTouch:
 	end;
 }
 
-thor_camp,187,228,5	script	Colonel Vito#1	946,{
+thor_camp,187,228,5	script	Colonel Vito#1	4_M_DST_MASTER,{
 	end;
 
 OnInit:
@@ -6609,7 +6609,7 @@ OnInit:
 	end;
 }
 
-thor_camp,155,175,7	script	Colonel Vito#2	946,{
+thor_camp,155,175,7	script	Colonel Vito#2	4_M_DST_MASTER,{
 	end;
 
 OnInit:
@@ -6617,7 +6617,7 @@ OnInit:
 	end;
 }
 
-thor_camp,159,74,3	script	Colonel Vito#3	946,{
+thor_camp,159,74,3	script	Colonel Vito#3	4_M_DST_MASTER,{
 	if (aru_vol == 14) {
 		mes "[Colonel Vito]";
 		mes "I am Colonel Vito,";
@@ -6985,7 +6985,7 @@ OnTouch:
 	end;
 }
 
-thor_camp,124,314,1	script	Soldier#vol1	939,{
+thor_camp,124,314,1	script	Soldier#vol1	4_DST_SOLDIER,{
 	mes "[Thor Volcano Camp Soldier]";
 	mes "Freya, I'm so exhausted!";
 	mes "I'm starving to death too!";
@@ -6993,7 +6993,7 @@ thor_camp,124,314,1	script	Soldier#vol1	939,{
 	close;
 }
 
-thor_camp,134,309,5	script	Soldier#vol2	939,{
+thor_camp,134,309,5	script	Soldier#vol2	4_DST_SOLDIER,{
 	mes "[Thor Volcano Camp Soldier]";
 	mes "I hear we'll be eating";
 	mes "chicken salad, fried chicken,";
@@ -7008,7 +7008,7 @@ thor_camp,134,309,5	script	Soldier#vol2	939,{
 	close;
 }
 
-thor_camp,109,167,3	script	Control Panel#vol	111,{
+thor_camp,109,167,3	script	Control Panel#vol	HIDDEN_NPC,{
 	if (aru_vol == 17) {
 		mes "^3355FFThis control panel";
 		mes "controls the main power";
@@ -7041,7 +7041,7 @@ thor_camp,109,167,3	script	Control Panel#vol	111,{
 	end;
 }
 
-thor_camp,150,65,3	script	Dummy#1::VeinsDummy	111,{
+thor_camp,150,65,3	script	Dummy#1::VeinsDummy	HIDDEN_NPC,{
 	if (aru_vol == 19) {
 		mes "^3355FFIt's a training dummy";
 		mes "that looks like it can";
@@ -7140,20 +7140,20 @@ thor_camp,150,65,3	script	Dummy#1::VeinsDummy	111,{
 	}
 }
 
-thor_camp,156,65,3	duplicate(VeinsDummy)	Dummy#2	111
-thor_camp,162,65,3	duplicate(VeinsDummy)	Dummy#3	111
-thor_camp,150,57,3	duplicate(VeinsDummy)	Dummy#4	111
-thor_camp,156,57,3	duplicate(VeinsDummy)	Dummy#5	111
-thor_camp,162,57,3	duplicate(VeinsDummy)	Dummy#6	111
+thor_camp,156,65,3	duplicate(VeinsDummy)	Dummy#2	HIDDEN_NPC
+thor_camp,162,65,3	duplicate(VeinsDummy)	Dummy#3	HIDDEN_NPC
+thor_camp,150,57,3	duplicate(VeinsDummy)	Dummy#4	HIDDEN_NPC
+thor_camp,156,57,3	duplicate(VeinsDummy)	Dummy#5	HIDDEN_NPC
+thor_camp,162,57,3	duplicate(VeinsDummy)	Dummy#6	HIDDEN_NPC
 
-thor_camp,248,104,5	script	Aitra#vol	939,{
+thor_camp,248,104,5	script	Aitra#vol	4_DST_SOLDIER,{
 	end;
 OnInit:
 	disablenpc "Aitra#vol";
 	end;
 }
 
-thor_camp,49,97,3	script	High Priest#vol	933,{
+thor_camp,49,97,3	script	High Priest#vol	4_M_RACHOLD,{
 	mes "^3355FFYou'd better not";
 	mes "do anything too";
 	mes "conspicuous in";
@@ -7161,7 +7161,7 @@ thor_camp,49,97,3	script	High Priest#vol	933,{
 	close;
 }
 
-thor_camp,49,122,1	script	Thor Volcano Soldier#vo1	939,{
+thor_camp,49,122,1	script	Thor Volcano Soldier#vo1	4_DST_SOLDIER,{
 	mes "^3355FFYou'd better not";
 	mes "do anything too";
 	mes "conspicuous in";
@@ -7169,7 +7169,7 @@ thor_camp,49,122,1	script	Thor Volcano Soldier#vo1	939,{
 	close;
 }
 
-thor_camp,31,93,1	script	Thor Volcano Soldier#vo2	939,{
+thor_camp,31,93,1	script	Thor Volcano Soldier#vo2	4_DST_SOLDIER,{
 	mes "^3355FFYou'd better not";
 	mes "do anything too";
 	mes "conspicuous in";
@@ -7177,7 +7177,7 @@ thor_camp,31,93,1	script	Thor Volcano Soldier#vo2	939,{
 	close;
 }
 
-thor_camp,59,79,1	script	Thor Volcano Soldier#vo3	939,{
+thor_camp,59,79,1	script	Thor Volcano Soldier#vo3	4_DST_SOLDIER,{
 	mes "^3355FFYou'd better not";
 	mes "do anything too";
 	mes "conspicuous in";
@@ -7185,7 +7185,7 @@ thor_camp,59,79,1	script	Thor Volcano Soldier#vo3	939,{
 	close;
 }
 
-thor_camp,143,114,1	script	Thor Volcano Soldier#vo4	939,{
+thor_camp,143,114,1	script	Thor Volcano Soldier#vo4	4_DST_SOLDIER,{
 	emotion e_sob;
 	mes "[Soldier]";
 	mes "Oh Freya...";
@@ -7196,7 +7196,7 @@ thor_camp,143,114,1	script	Thor Volcano Soldier#vo4	939,{
 	close;
 }
 
-thor_camp,206,92,3	script	Thor Volcano Soldier#vo5	939,{
+thor_camp,206,92,3	script	Thor Volcano Soldier#vo5	4_DST_SOLDIER,{
 	mes "[Soldier]";
 	mes "Ah, time to";
 	mes "go to work.";
@@ -7209,13 +7209,13 @@ thor_camp,206,92,3	script	Thor Volcano Soldier#vo5	939,{
 	close;
 }
 
-thor_camp,201,321,1	script	Thor Volcano Soldier#vo6	939,{
+thor_camp,201,321,1	script	Thor Volcano Soldier#vo6	4_DST_SOLDIER,{
 	mes "[Soldier]";
 	mes "Yo-ho! Yo-ho!";
 	close;
 }
 
-thor_camp,196,315,7	script	Thor Volcano Soldier#vo7	939,{
+thor_camp,196,315,7	script	Thor Volcano Soldier#vo7	4_DST_SOLDIER,{
 	mes "[Soldier]";
 	mes "I guess I need to go";
 	mes "on Guardian polishing";
@@ -7225,7 +7225,7 @@ thor_camp,196,315,7	script	Thor Volcano Soldier#vo7	939,{
 	close;
 }
 
-thor_camp,181,231,0	script	Guardian#vol_7	111,{
+thor_camp,181,231,0	script	Guardian#vol_7	HIDDEN_NPC,{
 	mes "^3355FFThere are many guardians";
 	mes "here in different stages";
 	mes "of disassembly. It looks";
@@ -7234,7 +7234,7 @@ thor_camp,181,231,0	script	Guardian#vol_7	111,{
 	close;
 }
 
-thor_camp,98,213,5	script	Thor Volcano Soldier#vo8	939,{
+thor_camp,98,213,5	script	Thor Volcano Soldier#vo8	4_DST_SOLDIER,{
 	mes "[Soldier]";
 	mes "Aren't you the one from";
 	mes "the geological research";
@@ -7245,7 +7245,7 @@ thor_camp,98,213,5	script	Thor Volcano Soldier#vo8	939,{
 	close;
 }
 
-thor_camp,98,209,5	script	Thor Volcano Soldier#vo9	939,{
+thor_camp,98,209,5	script	Thor Volcano Soldier#vo9	4_DST_SOLDIER,{
 	mes "[Soldier]";
 	mes "Why am I always";
 	mes "stationed here?!";
@@ -7254,7 +7254,7 @@ thor_camp,98,209,5	script	Thor Volcano Soldier#vo9	939,{
 	close;
 }
 
-thor_v02,143,78,0	script	#totcamp	45,2,2,{
+thor_v02,143,78,0	script	#totcamp	WARPNPC,2,2,{
 OnTouch_:
 	if (rachel_camel < 24) {
 		warp "que_thor",65,55;
@@ -7264,13 +7264,13 @@ OnTouch_:
 	end;
 }
 
-que_thor,69,56,0	script	#tov_1	45,2,2,{
+que_thor,69,56,0	script	#tov_1	WARPNPC,2,2,{
 OnTouch_:
 	warp "thor_v02",146,84;
 	end;
 }
 
-que_thor,187,56,0	script	#tov_2	45,2,2,{
+que_thor,187,56,0	script	#tov_2	WARPNPC,2,2,{
 OnTouch_:
 	warp "thor_v02",146,84;
 	end;
@@ -7289,7 +7289,7 @@ OnTouch:
 	close;
 }
 
-thor_camp,246,191,3	script	Guard#goto	939,{
+thor_camp,246,191,3	script	Guard#goto	4_DST_SOLDIER,{
 	mes "[Guard]";
 	mes "What now?";
 	mes "Can't you see I'm busy?";
@@ -7321,7 +7321,7 @@ OnTouch_:
 	close;
 }
 
-ve_in,235,135,5	script	Bartender#ve	947,{
+ve_in,235,135,5	script	Bartender#ve	4_M_DST_TOUGH,{
 	mes "[Bartender]";
 	mes "Welcome to our tavern.";
 	mes "Please, have a seat.";
@@ -7330,7 +7330,7 @@ ve_in,235,135,5	script	Bartender#ve	947,{
 	close;
 }
 
-ve_in,237,131,1	script	Female Customer#ve1	940,{
+ve_in,237,131,1	script	Female Customer#ve1	4_F_DESERT,{
 	mes "[Female Customer]";
 	mes "Bartender, aren't any of";
 	mes "your regulars nice young";
@@ -7371,7 +7371,7 @@ ve_in,237,131,1	script	Female Customer#ve1	940,{
 	close;
 }
 
-ve_in,239,107,1	script	Male Customer#ve2	943,{
+ve_in,239,107,1	script	Male Customer#ve2	4_M_DESERT,{
 	mes "[Male Customer]";
 	mes "How can that ugly old";
 	mes "man have girls hanging";