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

1 files changed, 104 insertions, 104 deletions

diff --git a/npc/quests/dandelion_request.txt b/npc/quests/dandelion_request.txt
index a5c7f0149..47d9964f7 100644
--- a/npc/quests/dandelion_request.txt
+++ b/npc/quests/dandelion_request.txt
@@ -12,7 +12,7 @@
 //= 1.3 Added GM management function. [Euphy]
 //============================================================
 
-izlude,103,106,3	script	Guildsman#1	48,3,3,{
+izlude,103,106,3	script	Guildsman#1	1_M_02,3,3,{
 
 	if(checkweight(7416,1) != 1)
 	{
@@ -442,7 +442,7 @@ OnTouch:
 	}
 }
 
-prontera,237,313,3	script	Nun#moc	79,3,3,{
+prontera,237,313,3	script	Nun#moc	1_F_PRIEST,3,3,{
 
 	if(checkweight(7416,1) != 1)
 	{
@@ -637,7 +637,7 @@ OnTouch:
 	}
 }
 
-alberta,129,59,3	script	Guildsman#2	49,3,3,{
+alberta,129,59,3	script	Guildsman#2	1_M_03,3,3,{
 
 	if(checkweight(7416,1) != 1)
 	{
@@ -1172,7 +1172,7 @@ OnTouch:
 	}
 }
 
-geffen,123,109,3	script	Academy Staff	742,3,3,{
+geffen,123,109,3	script	Academy Staff	2_M_SAGE_B,3,3,{
 
 	if(checkweight(7416,1) != 1)
 	{
@@ -1332,7 +1332,7 @@ OnTouch:
 	}
 }
 
-morocc,155,56,3	script	Miya	93,3,3,{
+morocc,155,56,3	script	Miya	4_F_04,3,3,{
 
 	if(checkweight(7416,1) != 1)
 	{
@@ -1621,7 +1621,7 @@ OnTouch:
 	}
 }
 
-payon,231,323,3	script	Guildsman#3	59,3,3,{
+payon,231,323,3	script	Guildsman#3	1_M_ORIENT01,3,3,{
 
 	if(checkweight(7416,1) != 1)
 	{
@@ -2080,7 +2080,7 @@ OnTouch:
 	}
 }
 
-morocc,43,108,5	script	Sharp-Looking Kid	82,{
+morocc,43,108,5	script	Sharp-Looking Kid	4_KID01,{
 
 	if((Class == Job_Assassin) || (Class == Job_Assassin_Cross))
 	{
@@ -2156,7 +2156,7 @@ morocc,43,108,5	script	Sharp-Looking Kid	82,{
 	}
 }
 
-morocc,45,110,1	script	#maobar1	45,2,2,{
+morocc,45,110,1	script	#maobar1	WARPNPC,2,2,{
 
 OnTouch:
 	if(mao_request || Class == Job_Assassin || Class == Job_Assassin_Cross) warp "que_job01",9,94;
@@ -2228,28 +2228,28 @@ OnTouch:
 	}
 }
 
-que_job01,6,94,1	script	#maobar2	45,2,2,{
+que_job01,6,94,1	script	#maobar2	WARPNPC,2,2,{
 
 OnTouch:
 	warp "morocc",45,103;
 	end;
 }
 
-que_job01,17,48,1	script	#maobar3	45,2,2,{
+que_job01,17,48,1	script	#maobar3	WARPNPC,2,2,{
 
 OnTouch:
 	warp "que_job01",68,92;
 	end;
 }
 
-que_job01,68,96,1	script	#maobar4	45,2,2,{
+que_job01,68,96,1	script	#maobar4	WARPNPC,2,2,{
 
 OnTouch:
 	warp "que_job01",17,53;
 	end;
 }
 
-que_job01,80,77,1	script	#maobar5	45,2,2,{
+que_job01,80,77,1	script	#maobar5	WARPNPC,2,2,{
 
 OnTouch:
 	if(mao_request > 1) warp "que_job01",61,50;
@@ -2360,14 +2360,14 @@ OnTouch:
 	}
 }
 
-que_job01,65,50,1	script	#maobar4-2	45,2,2,{
+que_job01,65,50,1	script	#maobar4-2	WARPNPC,2,2,{
 
 OnTouch:
 	warp "que_job01",84,77;
 	end;
 }
 
-que_job01,81,79,5	script	Idle Knight	733,{
+que_job01,81,79,5	script	Idle Knight	4_M_JOB_KNIGHT1,{
 
 	mes "[Litheron]";
 	mes "What's the matter?";
@@ -2387,7 +2387,7 @@ que_job01,81,79,5	script	Idle Knight	733,{
 	close;
 }
 
-que_job01,82,95,3	script	Bar Master	46,{
+que_job01,82,95,3	script	Bar Master	1_ETC_01,{
 
 	if(checkweight(12112,1) != 1)
 	{
@@ -2667,7 +2667,7 @@ que_job01,82,95,3	script	Bar Master	46,{
 	}
 }
 
-que_job01,49,49,5	script	Tao	877,{
+que_job01,49,49,5	script	Tao	4_F_YUNYANG,{
 
 	if(mao_request == 28 || mao_request == 29 || mao_request == 126 || mao_request == 127)
 	{
@@ -2722,7 +2722,7 @@ que_job01,49,49,5	script	Tao	877,{
 	}
 }
 
-que_job01,51,55,1	script	#roombar1	45,1,1,{
+que_job01,51,55,1	script	#roombar1	WARPNPC,1,1,{
 
 OnTouch:
 	if(mao_request == 2 || mao_request == 24 || mao_request == 28 || mao_request == 29 || mao_request == 123 || mao_request == 126 || mao_request == 127 || prt_curse == 24)
@@ -2825,7 +2825,7 @@ OnTimer250000:
 	end;
 }
 
-que_job01,12,13,1	script	#maobar6	139,1,1,{
+que_job01,12,13,1	script	#maobar6	HIDDEN_WARP_NPC,1,1,{
 
 OnInit:
 	disablenpc "#maobar7";
@@ -2840,7 +2840,7 @@ OnTouch:
 	end;
 }
 
-que_job01,51,44,1	script	#roombar2	45,1,1,{
+que_job01,51,44,1	script	#roombar2	WARPNPC,1,1,{
 
 OnTouch:
 	if(mao_request == 25 || (mao_request > 102 && mao_request < 123))
@@ -2954,7 +2954,7 @@ OnTimer250000:
 	end;
 }
 
-que_job01,80,17,1	script	#maobar7	45,1,1,{
+que_job01,80,17,1	script	#maobar7	WARPNPC,1,1,{
 
 OnInit:
 	disablenpc "#maobar7";
@@ -2969,7 +2969,7 @@ OnTouch:
 	end;
 }
 
-que_job01,144,51,1	script	#maobar8	45,1,1,{
+que_job01,144,51,1	script	#maobar8	WARPNPC,1,1,{
 
 OnInit:
 	disablenpc "#maobar8";
@@ -2984,7 +2984,7 @@ OnTouch:
 	end;
 }
 
-que_job01,11,4,1	script	#maoexit1	45,1,1,{
+que_job01,11,4,1	script	#maoexit1	WARPNPC,1,1,{
 
 OnTouch:
 	warp "que_job01",52,50;
@@ -2992,7 +2992,7 @@ OnTouch:
 	end;
 }
 
-que_job01,80,27,1	script	#maoexit2	45,1,1,{
+que_job01,80,27,1	script	#maoexit2	WARPNPC,1,1,{
 
 OnTouch:
 	warp "que_job01",52,50;
@@ -3000,7 +3000,7 @@ OnTouch:
 	end;
 }
 
-que_job01,144,61,1	script	#maoexit3	45,1,1,{
+que_job01,144,61,1	script	#maoexit3	WARPNPC,1,1,{
 
 OnTouch:
 	warp "que_job01",52,50;
@@ -3008,7 +3008,7 @@ OnTouch:
 	end;
 }
 
-que_job01,16,21,5	script	Valdes#1	55,{
+que_job01,16,21,5	script	Valdes#1	1_M_JOBTESTER,{
 
 	if(checkweight(7417,1) != 1)
 	{
@@ -3500,7 +3500,7 @@ OnEnter:
 	end;
 }
 
-que_job01,17,11,3	script	Valdes#2	55,{
+que_job01,17,11,3	script	Valdes#2	1_M_JOBTESTER,{
 
 OnInit:
 	disablenpc "Valdes#2";
@@ -3511,7 +3511,7 @@ OnEnter:
 	end;
 }
 
-que_job01,142,56,5	script	Valdes#3	55,{
+que_job01,142,56,5	script	Valdes#3	1_M_JOBTESTER,{
 
 OnInit:
 	disablenpc "Valdes#3";
@@ -3522,7 +3522,7 @@ OnEnter:
 	end;
 }
 
-que_job01,19,18,3	script	Lin#1	885,{
+que_job01,19,18,3	script	Lin#1	4_F_ACROSS,{
 
 	cutin "mocseal_rin01.bmp",2;
 	if (mao_request < 3)
@@ -3593,7 +3593,7 @@ OnEnter:
 	end;
 }
 
-que_job01,13,9,7	script	Lin#2	885,{
+que_job01,13,9,7	script	Lin#2	4_F_ACROSS,{
 
 OnInit:
 	disablenpc "Lin#2";
@@ -3604,7 +3604,7 @@ OnEnter:
 	end;
 }
 
-que_job01,84,17,3	script	Lin#2-1	885,{
+que_job01,84,17,3	script	Lin#2-1	4_F_ACROSS,{
 
 	if (mao_request == 103)
 	{
@@ -4143,7 +4143,7 @@ que_job01,84,17,3	script	Lin#2-1	885,{
 	end;
 }
 
-que_job01,79,15,1	script	R	880,{
+que_job01,79,15,1	script	R	4_M_MASKMAN,{
 
 	if(mao_request == 103)
 	{
@@ -4588,7 +4588,7 @@ que_job01,79,15,1	script	R	880,{
 	end;
 }
 
-que_job01,147,54,3	script	Lin#3	885,{
+que_job01,147,54,3	script	Lin#3	4_F_ACROSS,{
 
 OnInit:
 	disablenpc "Lin#3";
@@ -4599,7 +4599,7 @@ OnEnter:
 	end;
 }
 
-que_job01,13,17,5	script	Kidd#1	884,{
+que_job01,13,17,5	script	Kidd#1	4_M_ACROSS,{
 
 	cutin "mocseal_kid01.bmp",2;
 	if (mao_request < 3)
@@ -4669,7 +4669,7 @@ OnEnter:
 	end;
 }
 
-que_job01,12,8,7	script	Kidd#2	884,{
+que_job01,12,8,7	script	Kidd#2	4_M_ACROSS,{
 
 OnInit:
 	disablenpc "Kidd#2";
@@ -4680,7 +4680,7 @@ OnEnter:
 	end;
 }
 
-que_job01,148,54,3	script	Kidd#3	884,{
+que_job01,148,54,3	script	Kidd#3	4_M_ACROSS,{
 
 OnInit:
 	disablenpc "Kidd#3";
@@ -4691,7 +4691,7 @@ OnEnter:
 	end;
 }
 
-que_job01,91,83,3	script	Kidd#hall	884,{
+que_job01,91,83,3	script	Kidd#hall	4_M_ACROSS,{
 
 	if (mao_request == 124)
 	{
@@ -5540,7 +5540,7 @@ que_job01,91,83,3	script	Kidd#hall	884,{
 	end;
 }
 
-que_job01,89,85,5	script	Dandelion Member	880,{
+que_job01,89,85,5	script	Dandelion Member	4_M_MASKMAN,{
 
 	if(checkweight(12112,1) != 1)
 	{
@@ -6028,7 +6028,7 @@ que_job01,89,85,5	script	Dandelion Member	880,{
 	end;
 }
 
-yuno_in04,180,106,3	script	Reading Girl	73,{
+yuno_in04,180,106,3	script	Reading Girl	1_F_MERCHANT_01,{
 
 	if (mao_request == 5)
 	{
@@ -6316,7 +6316,7 @@ yuno_in04,180,106,3	script	Reading Girl	73,{
 	}
 }
 
-yuno_in04,175,129,0	script	Workbook#mao	111,{
+yuno_in04,175,129,0	script	Workbook#mao	HIDDEN_NPC,{
 
 	if (mao_request == 7)
 	{
@@ -6426,7 +6426,7 @@ OnInit:
 	end;
 }
 
-yuno_in04,174,130,5	script	Kidd#book	884,{
+yuno_in04,174,130,5	script	Kidd#book	4_M_ACROSS,{
 
 	mes "[Kidd]";
 	mes "......";
@@ -6457,7 +6457,7 @@ OnTimer180000:
 	stopnpctimer;
 }
 
-que_job01,6,79,5	script	Lin#stairs	885,{
+que_job01,6,79,5	script	Lin#stairs	4_F_ACROSS,{
 
 OnInit:
 	disablenpc "Lin#stairs";
@@ -6468,7 +6468,7 @@ OnEnter:
 	end;
 }
 
-que_job01,8,77,1	script	#linstairs	139,3,3,{
+que_job01,8,77,1	script	#linstairs	HIDDEN_WARP_NPC,3,3,{
 
 	if (mao_request == 109)
 	{
@@ -6680,7 +6680,7 @@ que_job01,8,77,1	script	#linstairs	139,3,3,{
 	}
 }
 
-moc_fild10,281,148,1	script	Upturned Spot#water	111,{
+moc_fild10,281,148,1	script	Upturned Spot#water	HIDDEN_NPC,{
 
 	if (mao_request == 14)
 	{
@@ -6782,7 +6782,7 @@ moc_fild10,281,148,1	script	Upturned Spot#water	111,{
 	end;
 }
 
-moc_fild19,21,33,1	script	Unturned Spot#wind	111,{
+moc_fild19,21,33,1	script	Unturned Spot#wind	HIDDEN_NPC,{
 
 	if (mao_request == 10)
 	{
@@ -6991,7 +6991,7 @@ moc_fild19,21,33,1	script	Unturned Spot#wind	111,{
 	end;
 }
 
-moc_fild12,280,36,1	script	Unturned Spot#earth	111,{
+moc_fild12,280,36,1	script	Unturned Spot#earth	HIDDEN_NPC,{
 
 	if (mao_request == 13)
 	{
@@ -7106,7 +7106,7 @@ moc_fild12,280,36,1	script	Unturned Spot#earth	111,{
 	cutin "mocseal_earth02.bmp",255;
 }
 
-moc_fild07,192,166,1	script	Unturned Spot#fire	111,{
+moc_fild07,192,166,1	script	Unturned Spot#fire	HIDDEN_NPC,{
 
 	if (mao_request == 15)
 	{
@@ -7209,7 +7209,7 @@ moc_fild07,192,166,1	script	Unturned Spot#fire	111,{
 	cutin "mocseal_fire02.bmp",255;
 }
 
-morocc_in,46,125,5	script	Assistant	729,{
+morocc_in,46,125,5	script	Assistant	4_F_NOVICE,{
 
 	if (mao_request > 18 && mao_request < 100)
 	{
@@ -7493,7 +7493,7 @@ morocc_in,46,125,5	script	Assistant	729,{
 	}
 }
 
-que_job01,15,8,1	script	#mao_table	139,1,1,{
+que_job01,15,8,1	script	#mao_table	HIDDEN_WARP_NPC,1,1,{
 
 OnTouch:
 	if (mao_request == 24)
@@ -7640,7 +7640,7 @@ OnEnter:
 	end;
 }
 
-que_job01,147,55,1	script	#mao_empty	139,1,1,{
+que_job01,147,55,1	script	#mao_empty	HIDDEN_WARP_NPC,1,1,{
 
 OnTouch:
 	if (mao_request == 122)
@@ -7666,7 +7666,7 @@ OnEnter:
 	end;
 }
 
-que_job01,144,57,1	script	#Rabsent	139,1,1,{
+que_job01,144,57,1	script	#Rabsent	HIDDEN_WARP_NPC,1,1,{
 
 OnTouch:
 	if(mao_request == 25)
@@ -7739,7 +7739,7 @@ OnEnter:
 	end;
 }
 
-moc_castle,40,20,3	script	Man	849,{
+moc_castle,40,20,3	script	Man	4_M_DIEMAN,{
 
 	if ((mao_request > 27 && mao_request < 31) || (mao_request > 125 && mao_request < 129))
 	{
@@ -7796,7 +7796,7 @@ OnInit:
 	end;
 }
 
-que_job02,14,182,1	script	#maogate1	139,1,1,{
+que_job02,14,182,1	script	#maogate1	HIDDEN_WARP_NPC,1,1,{
 
 OnEnter:
 	enablenpc "#maogate1";
@@ -7868,7 +7868,7 @@ OnTimer597000:
 	end;
 }
 
-que_job02,14,181,1	script	#maogate1_talk1	139,2,2,{
+que_job02,14,181,1	script	#maogate1_talk1	HIDDEN_WARP_NPC,2,2,{
 
 OnInit:
 	disablenpc "#maogate1_talk1";
@@ -7909,7 +7909,7 @@ OnTouch:
 	end;
 }
 
-que_job02,17,150,1	script	#maogate1_talk2	139,2,2,{
+que_job02,17,150,1	script	#maogate1_talk2	HIDDEN_WARP_NPC,2,2,{
 
 OnStop:
 	disablenpc "#maogate1_talk2";
@@ -7955,7 +7955,7 @@ OnTouch:
 	end;
 }
 
-que_job02,16,97,1	script	#maogate1_talk3	139,2,2,{
+que_job02,16,97,1	script	#maogate1_talk3	HIDDEN_WARP_NPC,2,2,{
 
 OnStop:
 	disablenpc "#maogate1_talk3";
@@ -8012,7 +8012,7 @@ OnTouch:
 	end;
 }
 
-que_job02,44,33,1	script	#maogate1_talk4	139,2,2,{
+que_job02,44,33,1	script	#maogate1_talk4	HIDDEN_WARP_NPC,2,2,{
 
 OnStop:
 	disablenpc "#maogate1_talk4";
@@ -8064,7 +8064,7 @@ OnTouch:
 	end;
 }
 
-que_job02,93,21,1	script	#maogate1_talk5	139,2,2,{
+que_job02,93,21,1	script	#maogate1_talk5	HIDDEN_WARP_NPC,2,2,{
 
 OnStop:
 	disablenpc "#maogate1_talk5";
@@ -8101,7 +8101,7 @@ OnTouch:
 	end;
 }
 
-que_job02,93,21,1	script	#maogate1_talk6	139,3,3,{
+que_job02,93,21,1	script	#maogate1_talk6	HIDDEN_WARP_NPC,3,3,{
 
 OnStop:
 	disablenpc "#maogate1_talk6";
@@ -8174,7 +8174,7 @@ OnTouch:
 	end;
 }
 
-que_job02,180,144,1	script	#maogate1_talk7	139,2,2,{
+que_job02,180,144,1	script	#maogate1_talk7	HIDDEN_WARP_NPC,2,2,{
 
 OnStop:
 	disablenpc "#maogate1_talk7";
@@ -8228,7 +8228,7 @@ OnTouch:
 	end;
 }
 
-que_job02,77,179,1	script	#maogate1_talk8	139,2,2,{
+que_job02,77,179,1	script	#maogate1_talk8	HIDDEN_WARP_NPC,2,2,{
 
 OnStop:
 	disablenpc "#maogate1_talk8";
@@ -8276,7 +8276,7 @@ OnTimer20100:
 	end;
 }
 
-que_job02,73,82,1	script	#maogate1_battle	139,2,2,{
+que_job02,73,82,1	script	#maogate1_battle	HIDDEN_WARP_NPC,2,2,{
 
 OnStop:
 	disablenpc "#maogate1_battle";
@@ -8322,7 +8322,7 @@ OnMyMobDead:
 	end;
 }
 
-que_job02,66,85,5	script	Dandelion Member#1_bt	880,{
+que_job02,66,85,5	script	Dandelion Member#1_bt	4_M_MASKMAN,{
 
 	if(mao_request == 26 || mao_request == 27)
 	{
@@ -8384,7 +8384,7 @@ OnEnter:
 	end;
 }
 
-que_job02,87,83,1	script	#maogate1_setting	139,2,2,{
+que_job02,87,83,1	script	#maogate1_setting	HIDDEN_WARP_NPC,2,2,{
 
 OnStop:
 	disablenpc "#maogate1_setting";
@@ -8407,7 +8407,7 @@ OnTouch:
 	}
 }
 
-que_job02,117,101,1	script	#maogate1_end	139,3,3,{
+que_job02,117,101,1	script	#maogate1_end	HIDDEN_WARP_NPC,3,3,{
 
 OnInit:
 	disablenpc "#maogate1_end";
@@ -8600,7 +8600,7 @@ OnMyMobDead:
 	end;
 }
 
-que_job02,116,108,5	script	Kidd#maogate1_1	884,{
+que_job02,116,108,5	script	Kidd#maogate1_1	4_M_ACROSS,{
 
 OnInit:
 	disablenpc "Kidd#maogate1_1";
@@ -8611,7 +8611,7 @@ OnEnter:
 	end;
 }
 
-que_job02,126,103,5	script	Kidd#maogate1_2	884,{
+que_job02,126,103,5	script	Kidd#maogate1_2	4_M_ACROSS,{
 
 	end;
 
@@ -8629,7 +8629,7 @@ OnMyMobDead:
 	end;
 }
 
-que_job02,121,106,1	script	Lin#maogate1_1	885,{
+que_job02,121,106,1	script	Lin#maogate1_1	4_F_ACROSS,{
 
 OnInit:
 	disablenpc "Lin#maogate1_1";
@@ -8640,7 +8640,7 @@ OnEnter:
 	end;
 }
 
-que_job02,127,101,1	script	Lin#maogate1_2	885,{
+que_job02,127,101,1	script	Lin#maogate1_2	4_F_ACROSS,{
 
 OnInit:
 	disablenpc "Lin#maogate1_2";
@@ -8651,7 +8651,7 @@ OnEnter:
 	end;
 }
 
-que_job02,124,109,3	script	R#maogate1	880,{
+que_job02,124,109,3	script	R#maogate1	4_M_MASKMAN,{
 
 OnInit:
 	disablenpc "R#maogate1";
@@ -8666,7 +8666,7 @@ OnSpell:
 	end;
 }
 
-que_job02,113,107,5	script	Dandelion#maogate1_1	880,{
+que_job02,113,107,5	script	Dandelion#maogate1_1	4_M_MASKMAN,{
 
 OnInit:
 	disablenpc "Dandelion#maogate1_1";
@@ -8677,7 +8677,7 @@ OnEnter:
 	end;
 }
 
-que_job02,121,100,7	script	Dandelion#maogate1_2	880,{
+que_job02,121,100,7	script	Dandelion#maogate1_2	4_M_MASKMAN,{
 
 OnInit:
 	disablenpc "Dandelion#maogate1_2";
@@ -8696,7 +8696,7 @@ OnSpell2:
 	end;
 }
 
-que_job02,122,98,1	script	Dandelion#maogate1_3	880,{
+que_job02,122,98,1	script	Dandelion#maogate1_3	4_M_MASKMAN,{
 
 OnInit:
 	disablenpc "Dandelion#maogate1_3";
@@ -8711,7 +8711,7 @@ OnSpell:
 	end;
 }
 
-que_job02,122,111,5	script	Dandelion#maogate1_4	880,{
+que_job02,122,111,5	script	Dandelion#maogate1_4	4_M_MASKMAN,{
 
 OnInit:
 	disablenpc "Dandelion#maogate1_4";
@@ -8726,7 +8726,7 @@ OnSpell:
 	end;
 }
 
-que_job02,122,106,1	script	#maogate1_end2	139,15,15,{
+que_job02,122,106,1	script	#maogate1_end2	HIDDEN_WARP_NPC,15,15,{
 
 OnInit:
 	disablenpc "#maogate1_end2";
@@ -8779,7 +8779,7 @@ OnTouch:
 	}
 }
 
-que_job03,14,182,1	script	#maogate2	139,1,1,{
+que_job03,14,182,1	script	#maogate2	HIDDEN_WARP_NPC,1,1,{
 
 OnEnter:
 	enablenpc "#maogate2";
@@ -8851,7 +8851,7 @@ OnTimer597000:
 	end;
 }
 
-que_job03,14,181,1	script	#maogate2_talk1	139,2,2,{
+que_job03,14,181,1	script	#maogate2_talk1	HIDDEN_WARP_NPC,2,2,{
 
 OnInit:
 	disablenpc "#maogate2_talk1";
@@ -8892,7 +8892,7 @@ OnTouch:
 	end;
 }
 
-que_job03,17,150,1	script	#maogate2_talk2	139,2,2,{
+que_job03,17,150,1	script	#maogate2_talk2	HIDDEN_WARP_NPC,2,2,{
 
 OnStop:
 	disablenpc "#maogate2_talk2";
@@ -8938,7 +8938,7 @@ OnTouch:
 	end;
 }
 
-que_job03,16,97,1	script	#maogate2_talk3	139,2,2,{
+que_job03,16,97,1	script	#maogate2_talk3	HIDDEN_WARP_NPC,2,2,{
 
 OnStop:
 	disablenpc "#maogate2_talk3";
@@ -8995,7 +8995,7 @@ OnTouch:
 	end;
 }
 
-que_job03,44,33,1	script	#maogate2_talk4	139,2,2,{
+que_job03,44,33,1	script	#maogate2_talk4	HIDDEN_WARP_NPC,2,2,{
 
 OnStop:
 	disablenpc "#maogate2_talk4";
@@ -9047,7 +9047,7 @@ OnTouch:
 	end;
 }
 
-que_job03,93,21,1	script	#maogate2_talk5	139,2,2,{
+que_job03,93,21,1	script	#maogate2_talk5	HIDDEN_WARP_NPC,2,2,{
 
 OnStop:
 	disablenpc "#maogate2_talk5";
@@ -9084,7 +9084,7 @@ OnTouch:
 	end;
 }
 
-que_job03,93,21,1	script	#maogate2_talk6	139,3,3,{
+que_job03,93,21,1	script	#maogate2_talk6	HIDDEN_WARP_NPC,3,3,{
 
 OnStop:
 	disablenpc "#maogate2_talk6";
@@ -9157,7 +9157,7 @@ OnTouch:
 	end;
 }
 
-que_job03,180,144,1	script	#maogate2_talk7	139,2,2,{
+que_job03,180,144,1	script	#maogate2_talk7	HIDDEN_WARP_NPC,2,2,{
 
 OnStop:
 	disablenpc "#maogate2_talk7";
@@ -9211,7 +9211,7 @@ OnTouch:
 	end;
 }
 
-que_job03,77,179,1	script	#maogate2_talk8	139,2,2,{
+que_job03,77,179,1	script	#maogate2_talk8	HIDDEN_WARP_NPC,2,2,{
 
 OnStop:
 	disablenpc "#maogate2_talk8";
@@ -9259,7 +9259,7 @@ OnTimer20100:
 	end;
 }
 
-que_job03,73,82,1	script	#maogate2_battle	139,2,2,{
+que_job03,73,82,1	script	#maogate2_battle	HIDDEN_WARP_NPC,2,2,{
 
 OnStop:
 	disablenpc "#maogate2_battle";
@@ -9305,7 +9305,7 @@ OnMyMobDead:
 	end;
 }
 
-que_job03,66,85,5	script	Dandelion Member#2_bt	880,{
+que_job03,66,85,5	script	Dandelion Member#2_bt	4_M_MASKMAN,{
 
 	if(mao_request == 124 || mao_request == 125)
 	{
@@ -9377,7 +9377,7 @@ OnEnter:
 	end;
 }
 
-que_job03,87,83,1	script	#maogate2_setting	139,2,2,{
+que_job03,87,83,1	script	#maogate2_setting	HIDDEN_WARP_NPC,2,2,{
 
 OnStop:
 	disablenpc "#maogate2_setting";
@@ -9400,7 +9400,7 @@ OnTouch:
 	}
 }
 
-que_job03,117,101,1	script	#maogate2_end	139,3,3,{
+que_job03,117,101,1	script	#maogate2_end	HIDDEN_WARP_NPC,3,3,{
 
 OnInit:
 	disablenpc "#maogate2_end";
@@ -9594,7 +9594,7 @@ OnMyMobDead:
 	end;
 }
 
-que_job03,116,108,5	script	Kidd#maogate2_1	884,{
+que_job03,116,108,5	script	Kidd#maogate2_1	4_M_ACROSS,{
 
 OnInit:
 	disablenpc "Kidd#maogate2_1";
@@ -9605,7 +9605,7 @@ OnEnter:
 	end;
 }
 
-que_job03,126,103,5	script	Kidd#maogate2_2	884,{
+que_job03,126,103,5	script	Kidd#maogate2_2	4_M_ACROSS,{
 
 	end;
 
@@ -9623,7 +9623,7 @@ OnMyMobDead:
 	end;
 }
 
-que_job03,121,106,1	script	Lin#maogate2_1	885,{
+que_job03,121,106,1	script	Lin#maogate2_1	4_F_ACROSS,{
 
 OnInit:
 	disablenpc "Lin#maogate2_1";
@@ -9634,7 +9634,7 @@ OnEnter:
 	end;
 }
 
-que_job03,127,101,1	script	Lin#maogate2_2	885,{
+que_job03,127,101,1	script	Lin#maogate2_2	4_F_ACROSS,{
 
 OnInit:
 	disablenpc "Lin#maogate2_2";
@@ -9645,7 +9645,7 @@ OnEnter:
 	end;
 }
 
-que_job03,124,109,3	script	R#maogate2	880,{
+que_job03,124,109,3	script	R#maogate2	4_M_MASKMAN,{
 
 OnInit:
 	disablenpc "R#maogate2";
@@ -9660,7 +9660,7 @@ OnSpell:
 	end;
 }
 
-que_job03,113,107,5	script	Dandelion#maogate2_1	880,{
+que_job03,113,107,5	script	Dandelion#maogate2_1	4_M_MASKMAN,{
 
 OnInit:
 	disablenpc "Dandelion#maogate2_1";
@@ -9671,7 +9671,7 @@ OnEnter:
 	end;
 }
 
-que_job03,121,100,7	script	Dandelion#maogate2_2	880,{
+que_job03,121,100,7	script	Dandelion#maogate2_2	4_M_MASKMAN,{
 
 OnInit:
 	disablenpc "Dandelion#maogate2_2";
@@ -9690,7 +9690,7 @@ OnSpell2:
 	end;
 }
 
-que_job03,122,98,1	script	Dandelion#maogate2_3	880,{
+que_job03,122,98,1	script	Dandelion#maogate2_3	4_M_MASKMAN,{
 
 OnInit:
 	disablenpc "Dandelion#maogate2_3";
@@ -9705,7 +9705,7 @@ OnSpell:
 	end;
 }
 
-que_job03,122,111,5	script	Dandelion#maogate2_4	880,{
+que_job03,122,111,5	script	Dandelion#maogate2_4	4_M_MASKMAN,{
 
 OnInit:
 	disablenpc "Dandelion#maogate2_4";
@@ -9720,7 +9720,7 @@ OnSpell:
 	end;
 }
 
-que_job03,122,106,1	script	#maogate2_end2	139,15,15,{
+que_job03,122,106,1	script	#maogate2_end2	HIDDEN_WARP_NPC,15,15,{
 
 OnInit:
 	disablenpc "#maogate2_end2";
@@ -9772,7 +9772,7 @@ OnTouch:
 	}
 }
 
-morocc,30,29,5	script	Member#mao1	880,10,15,{
+morocc,30,29,5	script	Member#mao1	4_M_MASKMAN,10,15,{
 
 	mes "[Chairman]";
 	mes "So it's agreed.";
@@ -9855,7 +9855,7 @@ OnTouch:
 	}
 }
 
-morocc,29,26,0	script	Member#mao2	880,{
+morocc,29,26,0	script	Member#mao2	4_M_MASKMAN,{
 
 	mes "[Chairman]";
 	mes "So it's agreed.";
@@ -9892,7 +9892,7 @@ OnEnter:
 	end;
 }
 
-morocc,33,27,1	script	Member#mao3	880,{
+morocc,33,27,1	script	Member#mao3	4_M_MASKMAN,{
 
 	mes "[Chairman]";
 	mes "So it's agreed.";
@@ -9929,7 +9929,7 @@ OnEnter:
 	end;
 }
 
-morocc,34,30,3	script	Member#mao4	880,{
+morocc,34,30,3	script	Member#mao4	4_M_MASKMAN,{
 
 	mes "[Chairman]";
 	mes "So it's agreed.";
@@ -10166,7 +10166,7 @@ OnMyMobDead:
 	end;
 }
 
-que_job01,68,88,5	script	Simon#mao	881,{
+que_job01,68,88,5	script	Simon#mao	4_M_SITDOWN,{
 
 	mes "[Simon]";
 	mes "...No. How many";
@@ -10217,9 +10217,9 @@ que_job01,68,88,5	script	Simon#mao	881,{
 	close;
 }
 
-que_job01,70,84,1	duplicate(Simon#mao)	Kimmie	882,0,0
+que_job01,70,84,1	duplicate(Simon#mao)	Kimmie	4_F_SITDOWN,0,0
 
-sec_in02,38,162,0	script	Morroc Invasion Manager	882,{
+sec_in02,38,162,0	script	Morroc Invasion Manager	4_F_SITDOWN,{
 	callfunc "F_GM_NPC";
 	mes "A total of " + $maoattack + " users completed";
 	mes "the Satan Morroc: Lin Quest.";