Corrected OnTouch/OnTouch_ in NPC script (#1548)

Some leftover from aegis convertion..

Skipped pre-re folder, I don't have old data.

npc/airports/airships.txt

@@ -32,7 +32,7 @@ OnUnhide:
 	specialeffect EF_SUMMONSLAVE;
 	end;
 
-OnTouch:
+OnTouch_:
 	switch ($@airplanelocation) {
 	case 0: warp "yuno",92,260; end;
 	case 1: warp "einbroch",92,278; end;
@@ -655,7 +655,7 @@ airplane,50,66,5	script	Apple Merchant#airplane	86,{
 airplane_01,243,73,0	script	#AirshipWarp-3	45,1,1,{
 	end;
 	
-OnTouch:
+OnTouch_:
 	switch ($@airplanelocation2) {
 	case 0: warp "ra_fild12",292,204; end;
 	case 1: 
@@ -1027,7 +1027,7 @@ airplane_01,83,61,2	script	Dianne#01airplane_01	72,2,2,{
 	mes "Do you think that...";
 	close;
 
-OnTouch:
+OnTouch_:
 	emotion e_sob;
 	end;
 }

npc/battleground/flavius/flavius01.txt

@@ -332,7 +332,7 @@ OnInit:
 	disablenpc "bat_b01_rp1_a_warp";
 	end;
 
-OnTouch:
+OnTouch_:
 	percentheal 100,100;
 	warp "bat_b01",87,73;
 	end;

npc/battleground/flavius/flavius02.txt

@@ -333,7 +333,7 @@ OnInit:
 	disablenpc "bat_b02_rp1_a_warp";
 	end;
 
-OnTouch:
+OnTouch_:
 	percentheal 100,100;
 	warp "bat_b02",87,73;
 	end;

npc/battleground/kvm/kvm01.txt

@@ -36,8 +36,12 @@ OnEnterBG:
 	set $@KvM01BG_id2, waitingroom2bg("bat_c01",147,55,"KvM01_BG::OnCroixQuit","KvM01_BG::OnCroixDie");
 	end;
 }
-bat_room,169,220,0	warp	#kvm801	2,2,bat_room,154,150
-bat_room,169,211,0	warp	#kvm802	2,2,bat_room,154,150
+bat_room,169,220,0	script	#kvm801	WARPNPC,2,2,{
+OnTouch:
+	warp "bat_room",154,150;
+	end;
+}
+bat_room,169,211,0	duplicate(#kvm801)	#kvm802	WARPNPC,2,2
 
 // Starting Line
 //============================================================

npc/battleground/kvm/kvm02.txt

@@ -36,8 +36,12 @@ OnEnterBG:
 	set $@KvM02BG_id2, waitingroom2bg("bat_c02",147,55,"KvM02_BG::OnCroixQuit","KvM02_BG::OnCroixDie");
 	end;
 }
-bat_room,197,220,0	warp	#kvm601	2,2,bat_room,154,150
-bat_room,197,211,0	warp	#kvm602	2,2,bat_room,154,150
+bat_room,197,220,0	script	#kvm601	WARPNPC,2,2,{
+OnTouch:
+	warp "bat_room",154,150;
+	end;
+}
+bat_room,197,21,0	duplicate(#kvm601)	#kvm602	WARPNPC,2,2
 
 // Starting Line
 //============================================================

npc/battleground/kvm/kvm03.txt

@@ -35,8 +35,12 @@ OnEnterBG:
 	set $@KvM03BG_id2, waitingroom2bg("bat_c03",147,55,"KvM03_BG::OnCroixQuit","KvM03_BG::OnCroixDie");
 	end;
 }
-bat_room,225,220,0	warp	#kvm701	2,2,bat_room,154,150
-bat_room,225,211,0	warp	#kvm702	2,2,bat_room,154,150
+bat_room,225,220,0	script	#kvm701	WARPNPC,2,2,{
+OnTouch:
+	warp "bat_room",154,150;
+	end;
+}
+bat_room,225,211,0	duplicate(#kvm701)	#kvm702	WARPNPC,2,2
 
 // Starting Line
 //============================================================

npc/cities/geffen.txt

@@ -219,7 +219,7 @@ geffen_in,34,170,0	script	Theodore	47,{
 geffen,146,148,4	script	Suspicious Guy	99,6,6,{
 	end;
 
-OnTouch:
+OnTouch_:
 	mes "[?]";
 	mes "^333333*Psssst!*";
 	mes "H-Hey you!";

npc/cities/jawaii.txt

@@ -694,7 +694,7 @@ OnSolo:
 }
 
 jawaii_in,28,96,0	script	jaw_em_order#Jawaii	-1,3,3,{
-OnTouch:
+OnTouch_:
 	if (getpartnerid()) {
 		donpcevent "Employee#jaw8::OnWelcome";
 		donpcevent "Employee#jaw7::OnWelcome";

npc/cities/lighthalzen.txt

@@ -1032,7 +1032,7 @@ lighthalzen,297,239,3	duplicate(Berru#lhz_01)	Pilia#lhz_01	818
 lighthalzen,312,233,3	script	Beggar#lhz_02	777,3,1,{
 	end;
 
-OnTouch:
+OnTouch_:
 	mes "[Beggar]";
 	mes "Please...";
 	mes "My child is starving...";
@@ -1818,7 +1818,7 @@ lhz_in01,35,226,5	script	Rekenber Guard#li01	867,{
 }
 
 lhz_in01,23,132,3	script	Rekenber Guard#li02	867,5,5,{
-OnTouch:
+OnTouch_:
 	if (isequipped(2241) && isequipped(2243)) {
 		mes "[Rekenber Guard]";
 		mes "Keep your eyes open.";
@@ -1924,7 +1924,7 @@ lhz_in01,199,137,3	script	Scientist#li_03	865,{
 }
 
 lhz_in01,46,125,3	script	Rekenber Guard#li03	867,5,5,{
-OnTouch:
+OnTouch_:
 	if (isequipped(2241) && isequipped(2243)) {
 		mes "[Rekenber Guard]";
 		mes "......................";
@@ -2901,7 +2901,7 @@ lighthalzen,40,107,4	script	Vergil#zen4	869,{
 }
 
 lhz_in01,144,53,3	script	Jorje#zero	98,1,1,{
-OnTouch:
+OnTouch_:
 	switch(rand(1,3)) {
 	case 1:
 		mes "[Jorje]";
@@ -2970,7 +2970,7 @@ lhz_in01,139,48,7	script	Leimi#mimir	73,{
 }
 
 lhz_in01,138,47,0	script	#mimir_camera	-1,2,2,{
-OnTouch:
+OnTouch_:
 	if (BaseJob == Job_Assassin) {
 		if (Sex) {
 			mes "^3355FF*Click*^000000";

npc/cities/morocc.txt

@@ -37,7 +37,7 @@ morocc,150,120,5	script	Soldier - Morroc#01::MocSoldier	707,3,3,{
 	mes "This is a restricted area. You can't come any further!";
 	close;
 
-OnTouch:
+OnTouch_:
 	mes "[Morroc Soldier]";
 	mes "Hey, you! Stop there.";
 	next;

npc/cities/niflheim.txt

@@ -61,7 +61,7 @@ niflheim,195,211,6	script	Gigantia#nif	796,3,3,{
 	mes "Death's sweet embrace.";
 	close;
 
-OnTouch:
+OnTouch_:
 	if (isequipped(5038) || isequipped(2257) || isequipped(2256)) {
 		mes "[Gigantia]";
 		mes "Hey, wait!";

npc/cities/payon.txt

@@ -115,7 +115,7 @@ payon,173,82,0	script	Young Man#2payon	88,{
 payon,158,246,3	script	Guardsman#payon	708,3,3,{
 	end;
 
-OnTouch:
+OnTouch_:
 	mes "[Guardsman]";
 	mes "This is the Central Palace of Payon. This place is open to the public, but in accordance with our laws, you must behave in an orderly fashion once inside.";
 	next;
@@ -468,7 +468,7 @@ payon_in01,180,7,2	script	Waitress#payon	90,{
 payon_in03,96,116,3	script	Chief Guardsman#payon	708,3,3,{
 	end;
 
-OnTouch:
+OnTouch_:
 	mes "[Chief Guardsman]";
 	mes "What brings";
 	mes "you here? ";
@@ -832,7 +832,7 @@ payon_in01,47,59,2	script	Archer Wolt#payon	88,{
 payon_in03,99,190,4	script	Chief#payon	107,2,2,{
 	end;
 
-OnTouch:
+OnTouch_:
 	if (BaseLevel < 30) {
 		mes "[Guard]";
 		mes "Hey...";

npc/cities/umbala.txt

@@ -1001,7 +1001,7 @@ um_in,158,71,3	script	Utan villager#um	787,{
 }
 
 umbala,140,197,1	script	Bungee Jump	-1,0,0,{
-OnTouch:
+OnTouch_:
 	switch(rand(1,3)) {
 	case 1:
 		percentheal -100,0;
@@ -1021,7 +1021,7 @@ OnTouch:
 }
 
 umbala,136,195,0	script	 #jump	-1,1,1,{
-OnTouch:
+OnTouch_:
 	warp "umbala",145,166;
 	end;
 }

npc/instances/OrcsMemory.txt

@@ -396,7 +396,7 @@ OnEnable:
 	areamonster instance_mapname("1@orcs"),103,105,109,111,"Enchanted Orc",1023,1,instance_npcname("B1 Area Mobs")+"::OnMyMobDead1";
 	end;
 
-OnTouch:
+OnTouch_:
 	warp instance_mapname("1@orcs"),168,130;
 	end;
 
@@ -425,7 +425,7 @@ OnEnable:
 	areamonster instance_mapname("1@orcs"),32,40,38,46,"Enchanted Orc",1023,1,instance_npcname("B1 Area Mobs")+"::OnMyMobDead2";
 	end;
 
-OnTouch:
+OnTouch_:
 	warp instance_mapname("1@orcs"),85,85;
 	end;
 
@@ -454,7 +454,7 @@ OnEnable:
 	areamonster instance_mapname("1@orcs"),19,177,25,183,"Enchanted Orc",1023,1,instance_npcname("B1 Area Mobs")+"::OnMyMobDead3";
 	end;
 
-OnTouch:
+OnTouch_:
 	warp instance_mapname("1@orcs"),38,110;
 	end;
 
@@ -486,7 +486,7 @@ OnEnable:
 	donpcevent instance_npcname("#Resurrect Monsters4")+"::OnDisable";
 	end;
 
-OnTouch:
+OnTouch_:
 	warp instance_mapname("2@orcs"),32,171;
 	end;
 }
@@ -731,7 +731,7 @@ OnTimer10000:
 	stopnpctimer;
 	end;
 
-OnTouch:
+OnTouch_:
 	warp instance_mapname("2@orcs"),47,93;
 	end;
 }
@@ -762,7 +762,7 @@ OnTimer10000:
 	stopnpctimer;
 	end;
 
-OnTouch:
+OnTouch_:
 	warp instance_mapname("2@orcs"),107,55;
 	end;
 }
@@ -807,7 +807,7 @@ OnTimer13110:
 	stopnpctimer;
 	end;
 
-OnTouch:
+OnTouch_:
 	warp instance_mapname("2@orcs"),167,95;
 	end;
 }
@@ -860,7 +860,7 @@ OnEnable:
 	enablenpc instance_npcname("#Warp Outside Orc Dun");
 	end;
 
-OnTouch:
+OnTouch_:
 	warp "gef_fild10",240,197;
 	end;
 }

npc/instances/SealedShrine.txt

@@ -972,7 +972,7 @@ OnTimer3500000:
 }
 
 2@cata,80,144,0	script	ins_2f_enter	-1,3,3,{
-OnTouch:
+OnTouch_:
 	donpcevent instance_npcname("ins_2f_enter_broad")+"::OnEnable";
 	disablenpc instance_npcname("ins_2f_enter");
 	end;
@@ -1009,7 +1009,7 @@ OnTimer18000:
 }
 
 2@cata,50,67,0	script	slave_left	-1,5,5,{
-OnTouch:
+OnTouch_:
 	set .@map$, instance_mapname("2@cata");
 	mapannounce .@map$, "Apostle of Baphomet : Kill the humans! Don't let them interrupt the revival of our Master!",bc_map,"0xFFFF00";
 	monster .@map$,55,67,"Apostle of Baphomet",1869,1;
@@ -1033,7 +1033,7 @@ OnTouch:
 }
 
 2@cata,109,67,0	script	slave_right	-1,5,5,{
-OnTouch:
+OnTouch_:
 	set .@map$, instance_mapname("2@cata");
 	mapannounce .@map$, "Apostle of Baphomet : Kill the humans! Don't let them interrupt the revival of our Master!",bc_map,"0xFFFF00";
 	monster .@map$,105,67,"Apostle of Baphomet",1869,1;
@@ -1057,7 +1057,7 @@ OnTouch:
 }
 
 2@cata,79,39,0	script	slave_down	-1,5,5,{
-OnTouch:
+OnTouch_:
 	set .@map$, instance_mapname("2@cata");
 	mapannounce .@map$, "Apostle of Baphomet : Kill the humans! Don't let them interrupt the revival of our Master!",bc_map,"0xFFFF00";
 	monster .@map$,78,41,"Apostle of Baphomet",1869,1;

npc/jobs/2-1/assassin.txt

@@ -304,7 +304,7 @@ in_moc_16,25,90,1	script	Guildsman#ASN2	730,2,2,{
 	mes "I feel irritated when somebody talks to me behind my back.";
 	close;
 
-OnTouch:
+OnTouch_:
 	if (ASSIN_Q2 == 4) {
 		mes "[Assassin 'Khai']";
 		mes "Ehhh?";
@@ -664,7 +664,7 @@ OnTouch:
 }
 
 in_moc_16,19,154,0	script	nameless_one	-1,8,2,{
-OnTouch:
+OnTouch_:
 	if (ASSIN_Q2 < 5) {
 		if (ASSIN_Q2 < 3) {
 			mes "[The Anonymous One]";
@@ -1128,7 +1128,7 @@ OnStart:
 in_moc_16,21,165,2	script	Test Guide#ASN	725,4,4,{
 	end;
 
-OnTouch:
+OnTouch_:
 	if (ASSIN_Q2 < 5) {
 		mes "[Barcardi]";
 		mes "You can't take the next trial without passing the written test first. You better speak to the Anonymous One...";
@@ -1353,7 +1353,7 @@ OnTimer187000:
 }
 
 in_moc_16,68,158,0	script	01_1::SinTrap	-1,0,0,{
-OnTouch:
+OnTouch_:
 	if (getvariableofnpc(.DisableTraps,"Beholder#ASNTEST")  < 1) {
 		mapannounce "in_moc_16",strcharinfo(0) + ", you're trapped. You will be sent back.",bc_map;
 		set ASSIN_Q,2;
@@ -1453,7 +1453,7 @@ OnInit:
 	disablenpc "Keeper of the Door#ASN";
 	end;
 
-OnTouch:
+OnTouch_:
 	donpcevent "Thomas#ASNTEST::OnDisable";
 	if (ASSIN_Q == 3)
 		set ASSIN_Q,3;
@@ -1499,7 +1499,7 @@ OnMyMobDead:
 in_moc_16,89,98,1	script	Thomas#ASNTEST	118,5,1,{
 	end;
 
-OnTouch:
+OnTouch_:
 	if (ASSIN_Q == 4) {
 		mes "[Thomas]";
 		mes "Damn...! You look like you're in a lot of pain. ^666666*Sigh*^000000 Give me a second, let me try to restore your HP and SP...";
@@ -1588,7 +1588,7 @@ OnDisable:
 
 in_moc_16,87,48,2	script	Barcardi#ASN	725,2,2,{
 	end;
-OnTouch:
+OnTouch_:
 	donpcevent "timestopper#1::OnDisable";
 	donpcevent "Thomas#ASNTEST::OnDisable";
 	mes "[Barcardi]";
@@ -1602,7 +1602,7 @@ OnTouch:
 }
 
 in_moc_16,182,169,0	script	Maze Assistant	45,1,1,{
-OnTouch:
+OnTouch_:
 	if (ASSIN_Q == 5 || ASSIN_Q == 6) {
 		warp "in_moc_16",181,183;
 		set ASSIN_Q,ASSIN_Q+1;
@@ -1618,7 +1618,7 @@ OnTouch:
 }
 
 in_moc_16,167,110,0	script	Guildmaster#ASN1	-1,3,1,{
-OnTouch:
+OnTouch_:
 	savepoint "in_moc_16",167,110;
 	mes "[Guildmaster]";
 	mes "Welcome. ";
@@ -1640,7 +1640,7 @@ OnCast:
 
 in_moc_16,149,80,4	script	Guildmaster#ASN2	106,1,1,{
 	end;
-OnTouch:
+OnTouch_:
 	savepoint "morocc",100,100;
 	if (ASSIN_Q == 7 && BaseJob == Job_Thief) {
 		set ASSIN_Q,8;
@@ -2185,7 +2185,7 @@ in_moc_16,186,81,1	script	Master Assist	55,1,1,{
 }
 
 in_moc_16,170,90,0	script	info 1	-1,{
-OnTouch:
+OnTouch_:
 	mes "[Guildmaster]";
 	mes "Huh.";
 	mes "Now, that place is blocked. You might want to check the other side.";
@@ -2193,14 +2193,14 @@ OnTouch:
 }
 
 in_moc_16,153,85,0	script	info 2	-1,1,1,{
-OnTouch:
+OnTouch_:
 	mes "[Guildmaster]";
 	mes "You're getting warmer. You're almost there. Just, turn around a little bit.";
 	close;
 }
 
 in_moc_16,160,85,0	script	info 3	-1,1,1,{
-OnTouch:
+OnTouch_:
 	mes "[Guildmaster]";
 	mes "Hmm.";
 	mes "Now, that place";
@@ -2209,7 +2209,7 @@ OnTouch:
 }
 
 in_moc_16,175,89,0	script	info 4	-1,1,1,{
-OnTouch:
+OnTouch_:
 	mes "[Guildmaster]";
 	mes "Umm...";
 	mes "You're heading for my assistant. Do you still need to talk to him?";
@@ -2217,7 +2217,7 @@ OnTouch:
 }
 
 in_moc_16,164,88,0	script	info 5	-1,{
-OnTouch:
+OnTouch_:
 	mes "[Guildmaster]";
 	mes "Well done...";
 	mes "I can feel your steps near me.";
@@ -2225,21 +2225,21 @@ OnTouch:
 }
 
 in_moc_16,149,95,0	script	info 6	-1,1,1,{
-OnTouch:
+OnTouch_:
 	mes "[Guildmaster]";
 	mes "Hm? Not bad. You're almost here.";
 	close;
 }
 
 in_moc_16,180,101,0	script	info 7	-1,1,1,{
-OnTouch:
+OnTouch_:
 	mes "[Guildmaster]";
 	mes "I don't think you're going the right way.";
 	close;
 }
 
 in_moc_16,186,107,0	script	info 8	-1,1,1,{
-OnTouch:
+OnTouch_:
 	mes "[Guildmaster]";
 	mes "No sense of direction, eh?";
 	close;

npc/jobs/2-1/hunter.txt

@@ -969,7 +969,7 @@ payon_in02,21,31,1	script	Hunter#htnGM2	59,{
 }
 
 job_hunte,178,32,1	script	Guide#hnt	107,5,2,{
-OnTouch:
+OnTouch_:
 	if (HNTR_Q == 12) {
 		mes "[Guide]";
 		mes "Good day. Welcome to the Hunter testing site. The test begins when you enter the next room.";
@@ -1206,7 +1206,7 @@ OnTimer197000:
 }
 
 job_hunte,93,101,1	script	Switch#hnt	723,1,1,{
-OnTouch:
+OnTouch_:
 	mes "^3355FFThere are 3 buttons";
 	mes "on the escape switch.^000000";
 	set HNTR_Q,15;
@@ -1253,7 +1253,7 @@ OnInit:
 	disablenpc "exit#hnttest";
 	end;
 
-OnTouch:
+OnTouch_:
 	donpcevent "Manager#hnt::OnReset";
 	donpcevent "Waiting Room#hnt::OnStart";
 	set HNTR_Q,16;
@@ -1269,7 +1269,7 @@ OnTouch:
 // Hunter Job test traps.
 //============================================================ 
 job_hunte,52,140,0	script	1-1::HntTrap	-1,0,1,{
-OnTouch:
+OnTouch_:
 	switch(rand(200)) {
 	default:
 	case 1: mapannounce "job_hunte",strcharinfo(0) + ", you have fallen into a trap. You will be returned to the starting point.",bc_map; break;
@@ -1638,7 +1638,7 @@ job_hunte,64,93,0	duplicate(HntTrap)	57-2	-1,0,0
 job_hunte,65,92,0	duplicate(HntTrap)	57-3	-1,0,0
 
 job_hunte,65,93,0	script	57-4::HntTrap2	-1,{
-OnTouch:
+OnTouch_:
 	mapannounce "job_hunte",strcharinfo(0) + ", has failed me! Go back to where you started!",bc_map;
 	set HNTR_Q,13;
 	warp "job_hunte",176,22;

npc/jobs/2-1/knight.txt

@@ -1989,11 +1989,11 @@ OnMyMobDead:
 	end;
 }
 
-job_knt,145,57,1	script	Warp#knt	107,22,22,{
+job_knt,143,57,1	script	Warp#knt	107,22,22,{
 OnInit:
 	disablenpc "Warp#knt";
 	end;
-OnTouch:
+OnTouch_:
 	set KNIGHT_Q,12;
 	changequest 9010,9011;
 	warp "prt_in",80,100;

npc/jobs/2-1/priest.txt

@@ -1163,7 +1163,7 @@ OnMyMobDead:
 }
 
 job_prist,24,44,0	script	Zombie Info	-1,1,1,{
-OnTouch:
+OnTouch_:
 	if (BaseJob == Job_Priest) {
 		mes "[Father Peter]";
 		mes "When the Priest applicant enters, 5 minutes will be given to complete this trial. Proceed slowly and help your Acolyte.";
@@ -1194,7 +1194,7 @@ OnInit:
 	disablenpc "Zombie1_1";
 	end;
 
-OnTouch:
+OnTouch_:
 	if (BaseJob == Job_Acolyte) {
 		donpcevent "Zombie_Generator#prst::Onm1";
 		donpcevent "Zombie1_1::OnDisable";
@@ -1215,7 +1215,7 @@ OnInit:
 	disablenpc "Zombie2_1";
 	end;
 
-OnTouch:
+OnTouch_:
 	if (BaseJob == Job_Acolyte) {
 		donpcevent "Zombie_Generator#prst::Onm2";
 		donpcevent "Zombie2_1::OnDisable";
@@ -1236,7 +1236,7 @@ OnInit:
 	disablenpc "Zombie3_1";
 	end;
 
-OnTouch:
+OnTouch_:
 	if (BaseJob == Job_Acolyte) {
 		donpcevent "Zombie_Generator#prst::Onm3";
 		donpcevent "Zombie3_1::OnDisable";
@@ -1257,7 +1257,7 @@ OnInit:
 	disablenpc "Zombie4_1";
 	end;
 
-OnTouch:
+OnTouch_:
 	if (BaseJob == Job_Acolyte) {
 		donpcevent "Zombie_Generator#prst::Onm4";
 		donpcevent "Zombie4_1::OnDisable";
@@ -1277,7 +1277,7 @@ OnInit:
 	disablenpc "Zombie5_1";
 	end;
 
-OnTouch:
+OnTouch_:
 	if (BaseJob == Job_Acolyte) {
 		donpcevent "Zombie_Generator#prst::Onm5";
 		donpcevent "Zombie5_1::OnDisable";
@@ -1293,7 +1293,7 @@ OnDisable:
 }
 
 job_prist,24,109,4	script	prst1_1	45,3,3,{
-OnTouch:
+OnTouch_:
 	set .@mobs,getvariableofnpc(.MyMobs,"Zombie_Generator#prst");
 	if (BaseJob == Job_Priest) warp "job_prist",168,17;
 	else if (BaseClass == Job_Acolyte && .@mobs < 1) {
@@ -1309,7 +1309,7 @@ OnTouch:
 // 3rd Test
 //==========================================================
 job_prist,168,45,4	script	Deviruchi#prst	1109,8,1,{
-OnTouch:
+OnTouch_:
 	if (BaseJob == Job_Priest) {
 		mes "[Deviruchi]";
 		mes "Whaaaaat...?";
@@ -1410,7 +1410,7 @@ OnTouch:
 }
 
 job_prist,168,80,4	script	Doppelganger#prst	1046,8,1,{
-OnTouch:
+OnTouch_:
 	if (BaseJob == Job_Priest) {
 		mes "[Doppelganger]";
 		mes "What are you doing here? You've already made your choice, there's no going back... Priest.";
@@ -1479,7 +1479,7 @@ OnTouch:
 }
 
 job_prist,168,115,4	script	Dark Lord#prst	1272,8,1,{
-OnTouch:
+OnTouch_:
 	if (BaseJob == Job_Priest) {
 		mes "[Dark Lord]";
 		mes "^330033All is doom, darkness and despair! Those who love you will betray you, and all that will be left is grieving and fury!^000000";
@@ -1536,7 +1536,7 @@ OnTouch:
 }
 
 job_prist,168,150,4	script	Baphomet#prst	736,8,1,{
-OnTouch:
+OnTouch_:
 	if (BaseJob == Job_Priest) {
 		mes "[Baphomet]";
 		mes "I hate";
@@ -1598,7 +1598,7 @@ OnTouch:
 }
 
 job_prist,168,180,4	script	prst2_1	45,3,3,{
-OnTouch:
+OnTouch_:
 	if (BaseJob == Job_Priest) warp "job_prist",98,40;
 	else if (BaseClass == Job_Acolyte) {
 		warp "job_prist",98,40;
@@ -1646,7 +1646,7 @@ OnInit:
 	disablenpc "Mummy1_1";
 	end;
 
-OnTouch:
+OnTouch_:
 	if (BaseJob == Job_Acolyte) {
 		donpcevent "Mummy_Generator::Onm1";
 		donpcevent "Mummy1_1::OnDisable";
@@ -1667,7 +1667,7 @@ OnInit:
 	disablenpc "Mummy2_1";
 	end;
 
-OnTouch:
+OnTouch_:
 	if (BaseJob == Job_Acolyte) {
 		donpcevent "Mummy_Generator::Onm2";
 		donpcevent "Mummy2_1::OnDisable";
@@ -1688,7 +1688,7 @@ OnInit:
 	disablenpc "Mummy3_1";
 	end;
 
-OnTouch:
+OnTouch_:
 	if (BaseJob == Job_Acolyte) {
 		donpcevent "Mummy_Generator::Onm3";
 		donpcevent "Mummy3_1::OnDisable";
@@ -1705,7 +1705,7 @@ OnDisable:
 }
 
 job_prist,98,105,4	script	prst3_1	45,3,3,{
-OnTouch:
+OnTouch_:
 	if (BaseJob == Job_Priest) {
 		warp "prt_church",15,36;
 		end; 

npc/jobs/2-1/wizard.txt

@@ -1253,7 +1253,7 @@ OnInit:
 	disablenpc "Room of Water#Failed";
 	end;
 
-OnTouch:
+OnTouch_:
 	mapannounce "job_wiz",strcharinfo(0)+" has not succeeded.",bc_map;
 	warp "geffen",120,110;
 	end;
@@ -1433,7 +1433,7 @@ OnInit:
 	disablenpc "Room of Earth#Failed";
 	end;
 
-OnTouch:
+OnTouch_:
 	mapannounce "job_wiz",strcharinfo(0) + " has not succeeded.",bc_map;
 	warp "geffen",120,110;
 	end;
@@ -1616,7 +1616,7 @@ OnInit:
 	disablenpc "Room of Fire#Failed";
 	end;
 
-OnTouch:
+OnTouch_:
 	warp "geffen",120,110;
 	end;
 }

npc/jobs/2-1e/StarGladiator.txt

@@ -327,7 +327,7 @@ payon,215,102,3	script	Moohyun#job_star	828,3,3,{
 	mes "they meet the right people~";
 	close;
 
-OnTouch:
+OnTouch_:
 	if (Class == Job_Taekwon) {
 		if (STGL_Q == 0) {
 			mes "[Moohyun]";

npc/jobs/2-2/crusader.txt

@@ -1205,7 +1205,7 @@ OnDead:
 
 
 job_cru,98,105,4	script	 Summoner#cr5	45,3,3,{
-OnTouch:
+OnTouch_:
 	set CRUS_Q,6;
 	changequest 3010,3011;
 	warp "prt_castle",164,28;
@@ -1253,7 +1253,7 @@ OnStart:
 }
 
 job_cru,168,17,0	script	Zombie Guide	-1,2,2,{
-OnTouch:
+OnTouch_:
 	mes "[Bliant Piyord]";
 	mes "Go forth and defeat all";
 	mes "the monsters that appear.";
@@ -1324,7 +1324,7 @@ OnInit:
 	disablenpc "Monster Summon#cr1";
 	end;
 
-OnTouch:
+OnTouch_:
 	donpcevent "Monster Summon#cr0::OnMonster1";
 	donpcevent "Monster Summon#cr1::OnEnd";
 	end;
@@ -1343,7 +1343,7 @@ OnInit:
 	disablenpc "Monster Summon#cr2";
 	end;
 
-OnTouch:
+OnTouch_:
 	donpcevent "Monster Summon#cr0::OnMonster2";
 	donpcevent "Monster Summon#cr2::OnEnd";
 	end;
@@ -1362,7 +1362,7 @@ OnInit:
 	disablenpc "Monster Summon#cr3";
 	end;
 
-OnTouch:
+OnTouch_:
 	donpcevent "Monster Summon#cr0::OnMonster3";
 	donpcevent "Monster Summon#cr3::OnEnd";
 	end;
@@ -1381,7 +1381,7 @@ OnInit:
 	disablenpc "Monster Summon#cr4";
 	end;
 
-OnTouch:
+OnTouch_:
 	monster "job_cru",168,150,strcharinfo(0),1036,1,"Monster Summon#cr4-a::OnDead";
 	donpcevent "Monster Summon#cr4::OnEnd";
 	end;
@@ -1415,7 +1415,7 @@ OnInit:
 	disablenpc "Monster Summon#cr5";
 	end;
 
-OnTouch:
+OnTouch_:
 	warp "prt_castle",35,147;
 	donpcevent "Monster Summon#cr0::OnReset";
 	donpcevent "Monster Summon#cr4::OnReset";

npc/jobs/2-2/dancer.txt

@@ -1236,7 +1236,7 @@ OnTimer89000:
 }
 
 job_duncer,69,110,0	script	dance#return	-1,1,4,{
-OnTouch:
+OnTouch_:
 	mapannounce "job_duncer","Good! Well done! Go back to Bijou!",bc_map;
 	set DANC_Q,9;
 	changequest 7005,7006;
@@ -1256,7 +1256,7 @@ OnEnable:
 }
 
 job_duncer,66,110,0	script	dance#return#2	-1,1,1,{
-OnTouch:
+OnTouch_:
 	set DANC_Q,9;
 	warp "comodo",188,162;
 	end;
@@ -1272,7 +1272,7 @@ OnEnable:
 }
 
 job_duncer,72,110,0	script	dance#return#3	-1,1,1,{
-OnTouch:
+OnTouch_:
 	set DANC_Q,9;
 	warp "comodo",188,162;
 	end;
@@ -1291,7 +1291,7 @@ OnEnable:
 // Dance Move Triggers
 //============================================================ 
 -	script	dancestep::StepTrigger	-1,1,1,{
-OnTouch:
+OnTouch_:
 	donpcevent "Backdancer#1::OnOmg";
 	mapannounce "job_duncer"," " + strcharinfo(0) + ", you lack rhythm... Your timing was too late!",bc_map;
 	set DANC_Q,8;

npc/jobs/2-2/monk.txt

@@ -292,7 +292,7 @@ prt_monk,59,247,1	script	Guarding Monk#mk	120,6,2,{
 		}
 	}
 
-OnTouch:
+OnTouch_:
 	if (MONK_Q == 0) {
 		mes "[Tohobu]";
 		mes "How dare you set foot in";
@@ -1968,7 +1968,7 @@ monk_test,386,388,4	script	Apprentice Monk#mk	110,{
 }
 
 monk_test,387,350,0	script	Supervisor#race_monk	45,2,2,{
-OnTouch:
+OnTouch_:
 	if (MONK_Q >= 15 && MONK_Q <= 23) {
 		set MONK_Q,MONK_Q+1;
 		warp "monk_test",385,388;
@@ -1993,7 +1993,7 @@ OnTouch:
 }
 
 monk_test,82,384,0	script	Trap#t_monk1_1::MonkTrap	-1,{
-OnTouch:
+OnTouch_:
 	mapannounce "monk_test",""+ strcharinfo(0) + ", you're trapped. You will be returned.",bc_map;
 	warp "monk_test",387,387;
 	end;
@@ -2262,7 +2262,7 @@ monk_test,82,85,1	script	Proctor#mk	95,{
 }
 
 monk_test,144,277,0	script	mob_monk#1_1	-1,1,1,{
-OnTouch:
+OnTouch_:
 	monster "monk_test",144,277,"Zombie",1015,1;
 	monster "monk_test",144,277,"Zombie",1015,1;
 	monster "monk_test",144,277,"Zombie",1015,1;
@@ -2275,7 +2275,7 @@ OnDisable:
 }
 
 monk_test,134,291,0	script	mob_monk#1_2	-1,1,1,{
-OnTouch:
+OnTouch_:
 	monster "monk_test",134,291,"Zombie",1015,1;
 	monster "monk_test",134,291,"Zombie",1015,1;
 	monster "monk_test",134,291,"Zombie",1015,1;
@@ -2288,7 +2288,7 @@ OnDisable:
 }
 
 monk_test,157,284,0	script	mob_monk#1_3	-1,1,1,{
-OnTouch:
+OnTouch_:
 	monster "monk_test",157,284,"Mummy",1041,1;
 	end;
 
@@ -2298,7 +2298,7 @@ OnDisable:
 }
 
 monk_test,156,261,0	script	mob_monk#1_4	-1,1,1,{
-OnTouch:
+OnTouch_:
 	monster "monk_test",156,261,"Mummy",1041,1;
 	end;
 
@@ -2308,7 +2308,7 @@ OnDisable:
 }
 
 monk_test,149,268,0	script	mob_monk#1_5	-1,1,1,{
-OnTouch:
+OnTouch_:
 	monster "monk_test",149,268,"Zombie",1015,1;
 	monster "monk_test",149,268,"Zombie",1015,1;
 	monster "monk_test",149,268,"Zombie",1015,1;
@@ -2322,7 +2322,7 @@ OnDisable:
 }
 
 monk_test,166,278,0	script	exit_monk#1	45,1,1,{
-OnTouch:
+OnTouch_:
 	mes "[Proctor]";
 	mes "You did well. Please return to Tomoon, he's waiting for you.";
 	set MONK_Q,27;
@@ -2369,7 +2369,7 @@ monk_test,88,91,1	script	Proctor#mk2	52,{
 }
 
 monk_test,140,181,0	script	mob_monk#2_1	-1,1,1,{
-OnTouch:
+OnTouch_:
 	monster "monk_test",140,181,"Zombie",1015,1;
 	monster "monk_test",140,181,"Zombie",1015,1;
 	monster "monk_test",140,181,"Zombie",1015,1;
@@ -2382,7 +2382,7 @@ OnDisable:
 }
 
 monk_test,150,164,0	script	mob_monk#2_2	-1,1,1,{
-OnTouch:
+OnTouch_:
 	monster "monk_test",150,164,"Zombie",1015,1;
 	monster "monk_test",150,164,"Zombie",1015,1;
 	monster "monk_test",150,164,"Zombie",1015,1;
@@ -2395,7 +2395,7 @@ OnDisable:
 }
 
 monk_test,158,192,0	script	mob_monk#2_3	-1,1,1,{
-OnTouch:
+OnTouch_:
 	monster "monk_test",158,192,"Mummy",1041,1;
 	end;
 
@@ -2405,7 +2405,7 @@ OnDisable:
 }
 
 monk_test,165,186,0	script	mob_monk#2_4	-1,1,1,{
-OnTouch:
+OnTouch_:
 	monster "monk_test",165,186,"Mummy",1041,1;
 	end;
 
@@ -2415,7 +2415,7 @@ OnDisable:
 }
 
 monk_test,162,182,0	script	mob_monk#2_5	-1,1,1,{
-OnTouch:
+OnTouch_:
 	monster "monk_test",162,182,"Zombie",1015,1;
 	monster "monk_test",162,182,"Zombie",1015,1;
 	monster "monk_test",162,182,"Zombie",1015,1;
@@ -2429,7 +2429,7 @@ OnDisable:
 }
 
 monk_test,166,178,0	script	exit_monk#2	45,1,1,{
-OnTouch:
+OnTouch_:
 	mes "[Proctor]";
 	mes "You did well. Please return to Tomoon, he's waiting for you.";
 	set MONK_Q,27;
@@ -2476,7 +2476,7 @@ monk_test,95,85,1	script	Proctor#btl#3	79,{
 }
 
 monk_test,249,277,0	script	mob_monk#3_1	-1,1,1,{
-OnTouch:
+OnTouch_:
 	monster "monk_test",249,277,"Zombie",1015,1;
 	monster "monk_test",249,277,"Zombie",1015,1;
 	monster "monk_test",249,277,"Zombie",1015,1;
@@ -2488,7 +2488,7 @@ OnDisable:
 }
 
 monk_test,231,296,0	script	mob_monk#3_2	-1,1,1,{
-OnTouch:
+OnTouch_:
 	monster "monk_test",231,296,"Zombie",1015,1;
 	monster "monk_test",231,296,"Zombie",1015,1;
 	monster "monk_test",231,296,"Zombie",1015,1;
@@ -2501,7 +2501,7 @@ OnDisable:
 }
 
 monk_test,264,292,0	script	mob_monk#3_3	-1,1,1,{
-OnTouch:
+OnTouch_:
 	monster "monk_test",264,292,"Mummy",1041,1;
 	end;
 
@@ -2511,7 +2511,7 @@ OnDisable:
 }
 
 monk_test,252,284,0	script	mob_monk#3_4	-1,1,1,{
-OnTouch:
+OnTouch_:
 	monster "monk_test",252,284,"Mummy",1041,1;
 	end;
 
@@ -2521,7 +2521,7 @@ OnDisable:
 }
 
 monk_test,257,285,0	script	mob_monk#3_5	-1,1,1,{
-OnTouch:
+OnTouch_:
 	monster "monk_test",257,285,"Zombie",1015,1;
 	monster "monk_test",257,285,"Zombie",1015,1;
 	monster "monk_test",257,285,"Zombie",1015,1;
@@ -2536,7 +2536,7 @@ OnDisable:
 }
 
 monk_test,270,278,0	script	exit_monk#3	45,1,1,{
-OnTouch:
+OnTouch_:
 	mes "[Proctor]";
 	mes "You did well. Please return to Tomoon, he's waiting for you.";
 	set MONK_Q,27;

npc/jobs/2-2/rogue.txt

@@ -1016,7 +1016,7 @@ S_CheckItems:
 }
 
 cmd_fild09,106,195,0	script	Warp#1	45,1,1,{
-OnTouch:
+OnTouch_:
 	mes "[???]";
 	mes "Who's there?!";
 	mes "Who would dare";
@@ -1086,7 +1086,7 @@ OnTouch:
 }
 
 cmd_fild09,335,143,0	script	Warp#2	45,1,1,{
-OnTouch:
+OnTouch_:
 	mes "[???]";
 	mes "Who's there?!";
 	mes "Who would dare";
@@ -1156,7 +1156,7 @@ OnTouch:
 }
 
 cmd_fild04,304,180,0	script	Warp#3	45,1,1,{
-OnTouch:
+OnTouch_:
 	mes "[???]";
 	mes "Who's there?!";
 	mes "Who would dare";
@@ -1276,7 +1276,7 @@ in_rogue,272,135,1	script	Hermanthorn Jr#rg	85,{
 }
 
 in_rogue,270,130,0	script	he_to_rogue#rg	45,1,1,{
-OnTouch:
+OnTouch_:
 	mes "^3355FFThe door is locked. You'll need to enter the four number combination to open it.^000000";
 	next;
 	input .@input;
@@ -1313,7 +1313,7 @@ OnTouch:
 }
 
 in_rogue,200,389,0	script	gen_ro#1	-1,3,3,{
-OnTouch:
+OnTouch_:
 	if (BaseJob == Job_Thief) {
 		monster "in_rogue",200,389,"Zombie",1015,1,"gen_ro#1::OnMyMobDead";
 		monster "in_rogue",201,389,"Zombie",1015,1,"gen_ro#1::OnMyMobDead";
@@ -1334,7 +1334,7 @@ OnMyMobDead:
 }
 
 in_rogue,100,389,0	script	gen_ro#2	-1,3,3,{
-OnTouch:
+OnTouch_:
 	if (BaseJob == Job_Thief) {
 		monster "in_rogue",100,389,"Mummy",1041,1,"gen_ro#2::OnMyMobDead";
 		donpcevent "gen_ro#1::OnDisable";
@@ -1352,7 +1352,7 @@ OnMyMobDead:
 }
 
 in_rogue,150,389,0	script	gen_ro#3	-1,3,3,{
-OnTouch:
+OnTouch_:
 	if (BaseJob == Job_Thief) {
 		monster "in_rogue",145,389,"Zombie",1015,1,"gen_ro#3::OnMyMobDead";
 		monster "in_rogue",143,389,"Mummy",1041,1,"gen_ro#3::OnMyMobDead";
@@ -1371,7 +1371,7 @@ OnMyMobDead:
 }
 
 in_rogue,250,389,0	script	gen_ro#4	-1,3,3,{
-OnTouch:
+OnTouch_:
 	if (BaseJob == Job_Thief) {
 		monster "in_rogue",200,389,"Abysmal Knight",1219,1,"gen_ro#4::OnMyMobDead";
 		donpcevent "gen_ro#3::OnDisable";
@@ -1389,7 +1389,7 @@ OnMyMobDead:
 }
 
 in_rogue,9,389,0	script	oneway_to_gu	45,1,1,{
-OnTouch:
+OnTouch_:
 	donpcevent "gen_ro#4::OnDisable";
 	set ROGUE_Q,17;
 	warp "in_rogue",367,10;
@@ -1654,14 +1654,14 @@ in_rogue,177,109,1	script	Antonio junior#rg	88,{
 }
 
 in_rogue,370,320,0	script	quest_out	45,1,1,{
-OnTouch:
+OnTouch_:
 	set ROGUE_Q,16;
 	warp "in_rogue",378,113;
 	end;
 }
 
 in_rogue,15,184,0	script	mob_rogue#1	-1,8,1,{
-OnTouch:
+OnTouch_:
 	if (BaseJob == Job_Thief) {
 		monster "in_rogue",14,187,"Zombie",1015,1,"mob_rogue#1::OnMyMobDead";
 		monster "in_rogue",15,188,"Zombie",1015,1,"mob_rogue#1::OnMyMobDead";
@@ -1683,7 +1683,7 @@ OnMyMobDead:
 }
 
 in_rogue,15,273,0	script	mob_rogue#2	-1,8,1,{
-OnTouch:
+OnTouch_:
 	if (BaseJob == Job_Thief) {
 		monster "in_rogue",15,276,"Mummy",1041,1,"mob_rogue#2::OnMyMobDead";
 		monster "in_rogue",13,276,"Mummy",1041,1,"mob_rogue#2::OnMyMobDead";
@@ -1702,7 +1702,7 @@ OnMyMobDead:
 }
 
 in_rogue,15,333,0	script	mob_rogue#3	-1,8,1,{
-OnTouch:
+OnTouch_:
 	if (BaseJob == Job_Thief) {
 		monster "in_rogue",15,336,"Zombie",1015,1,"mob_rogue#3::OnMyMobDead";
 		monster "in_rogue",15,336,"Zombie",1015,1,"mob_rogue#3::OnMyMobDead";
@@ -1725,7 +1725,7 @@ OnMyMobDead:
 }
 
 in_rogue,39,341,0	script	mob_rogue#4	-1,1,8,{
-OnTouch:
+OnTouch_:
 	if (BaseJob == Job_Thief) {
 		monster "in_rogue",39,341,"Mummy",1041,1,"mob_rogue#4::OnMyMobDead";
 		monster "in_rogue",40,341,"Ghoul",1036,1,"mob_rogue#4::OnMyMobDead";
@@ -1745,7 +1745,7 @@ OnMyMobDead:
 }
 
 in_rogue,102,334,0	script	mob_rogue#5	-1,1,4,{
-OnTouch:
+OnTouch_:
 	if (BaseJob == Job_Thief) {
 		monster "in_rogue",92,334,"Khalitzburg",1132,1,"mob_rogue#5::OnMyMobDead";
 		donpcevent "mob_rogue#1::OnDisable";
@@ -1765,7 +1765,7 @@ OnMyMobDead:
 }
 
 in_rogue,58,309,0	script	mob_rogue#6	-1,4,1,{
-OnTouch:
+OnTouch_:
 	if (BaseJob == Job_Thief) {
 		monster "in_rogue",57,301,"Khalitzburg",1132,1,"mob_rogue#6::OnMyMobDead";
 		donpcevent "mob_rogue#1::OnDisable";
@@ -1785,7 +1785,7 @@ OnMyMobDead:
 }
 
 in_rogue,101,264,0	script	mob_rogue#7	-1,5,5,{
-OnTouch:
+OnTouch_:
 	if (BaseJob == Job_Thief) {
 		monster "in_rogue",101,264,"Abysmal Knight",1219,1,"mob_rogue#7::OnMyMobDead";
 		monster "in_rogue",102,264,"Abysmal Knight",1219,1,"mob_rogue#7::OnMyMobDead";
@@ -1803,7 +1803,7 @@ OnMyMobDead:
 }
 
 in_rogue,140,312,0	script	mob_rogue#8	-1,5,5,{
-OnTouch:
+OnTouch_:
 	if (BaseJob == Job_Thief)
 		monster "in_rogue",140,312,"Abysmal Knight",1219,1,"mob_rogue#8::OnMyMobDead";
 	else
@@ -1819,7 +1819,7 @@ OnMyMobDead:
 }
 
 in_rogue,139,246,0	script	mob_rogue#9	-1,4,4,{
-OnTouch:
+OnTouch_:
 	if (BaseJob == Job_Thief) {
 		monster "in_rogue",139,246,"Zombie",1015,1,"mob_rogue#9::OnMyMobDead";
 		monster "in_rogue",149,246,"Zombie",1015,1,"mob_rogue#9::OnMyMobDead";
@@ -1841,7 +1841,7 @@ OnMyMobDead:
 }
 
 in_rogue,197,249,0	script	mob_rogue#10	-1,1,8,{
-OnTouch:
+OnTouch_:
 	if (BaseJob == Job_Thief) {
 		monster "in_rogue",176,211,"Ghoul",1036,1,"mob_rogue#10::OnMyMobDead";
 		monster "in_rogue",176,212,"Zombie",1015,1,"mob_rogue#10::OnMyMobDead";
@@ -1876,7 +1876,7 @@ OnMyMobDead:
 }
 
 in_rogue,96,205,0	script	mob_rogue#11	-1,1,8,{
-OnTouch:
+OnTouch_:
 	if (BaseJob == Job_Thief) {
 		donpcevent "mob_rogue#7::OnDisable";
 		donpcevent "mob_rogue#8::OnDisable";
@@ -1889,7 +1889,7 @@ OnTouch:
 }
 
 in_rogue,86,187,0	script	mob_rogue#12	-1,1,8,{
-OnTouch:
+OnTouch_:
 	if (BaseJob == Job_Thief) {
 		monster "in_rogue",90,187,"Mummy",1041,1,"mob_rogue#12::OnMyMobDead";
 		monster "in_rogue",90,183,"Mummy",1041,1,"mob_rogue#12::OnMyMobDead";
@@ -1908,7 +1908,7 @@ OnMyMobDead:
 }
 
 in_rogue,223,187,0	script	mob_rogue#13	-1,1,8,{
-OnTouch:
+OnTouch_:
 	if (BaseJob == Job_Thief) {
 		monster "in_rogue",236,186,"Abysmal Knight",1219,1,"mob_rogue#13::OnMyMobDead";
 		monster "in_rogue",238,186,"Abysmal Knight",1219,1,"mob_rogue#13::OnMyMobDead";
@@ -1928,7 +1928,7 @@ OnMyMobDead:
 }
 
 in_rogue,233,207,0	script	mob_rogue#14	-1,8,3,{
-OnTouch:
+OnTouch_:
 	if (BaseJob == Job_Thief)
 		donpcevent "mob_rogue#13::OnDisable";
 	else
@@ -1937,7 +1937,7 @@ OnTouch:
 }
 
 in_rogue,244,319,0	script	mob_rogue#15	-1,1,8,{
-OnTouch:
+OnTouch_:
 	if (BaseJob == Job_Thief) {
 		monster "in_rogue",240,319,"Mummy",1041,1,"mob_rogue#15::OnMyMobDead";
 		monster "in_rogue",259,319,"Archer Skeleton",1016,1,"mob_rogue#15::OnMyMobDead";
@@ -1959,7 +1959,7 @@ OnMyMobDead:
 }
 
 in_rogue,334,319,0	script	mob_rogue#16	-1,8,8,{
-OnTouch:
+OnTouch_:
 	if (BaseJob == Job_Thief)
 		donpcevent "mob_rogue#15::OnDisable";
 	else

npc/jobs/2-2e/SoulLinker.txt

@@ -334,7 +334,7 @@ OnInit:
 }
 
 job_soul,30,31,0	script	Maia#link2::SLTester	-1,3,3,{
-OnTouch:
+OnTouch_:
 	if (Class == Job_Taekwon) {
 		if (JobLevel < 40) {
 			set getvariableofnpc(.SoulLinkerTest,"Kid#link1"),0;

npc/other/arena/arena_aco.txt

@@ -18,7 +18,7 @@
 //============================================================
 
 arena_room,114,102,0	script	onlyaco#arena	45,1,1,{
-OnTouch:
+OnTouch_:
 	if (BaseClass == Job_Acolyte) {
 		warp "arena_room",135,129;
 		end;
@@ -49,7 +49,7 @@ OnStart:
 }
 
 force_5-1,100,12,0	script	arena#aco	-1,5,5,{
-OnTouch:
+OnTouch_:
 	donpcevent "allkill#aco::OnEnable";
 	if (BaseJob == Job_Acolyte) {
 		donpcevent "arena_aco1::OnStart";
@@ -274,7 +274,7 @@ On09_End:
 }
 
 force_5-1,40,26,0	script	force_01start#aco	-1,1,1,{
-OnTouch:
+OnTouch_:
 	donpcevent "force_01mob#aco::OnEnable";
 	disablenpc "force_01start#aco";
 	end;
@@ -303,7 +303,7 @@ OnMyMobDead:
 }
 
 force_5-1,25,69,0	script	force_02start#aco	-1,1,1,{
-OnTouch:
+OnTouch_:
 	set $@drop_gate,0;
 	donpcevent "force_02mob#aco::OnEnable";
 	disablenpc "force_02start#aco";
@@ -330,7 +330,7 @@ OnMyMobDead:
 }
 
 force_5-1,25,159,0	script	force_03start#aco	-1,1,1,{
-OnTouch:
+OnTouch_:
 	donpcevent "force_03mob#aco::OnEnable";
 	disablenpc "force_03start#aco";
 }
@@ -354,7 +354,7 @@ OnMyMobDead:
 }
 
 force_5-1,69,174,0	script	force_04start#aco	-1,1,1,{
-OnTouch:
+OnTouch_:
 	donpcevent "Trocco#aco1::On04_Start";
 	donpcevent "arena_aco1::OnReset_04";
 	percentheal 50,50;
@@ -363,7 +363,7 @@ OnTouch:
 }
 
 force_5-1,159,174,0	script	force_05start#aco	-1,1,1,{
-OnTouch:
+OnTouch_:
 	donpcevent "force_05mob#aco::OnEnable";
 	disablenpc "force_05start#aco";
 	end;
@@ -388,7 +388,7 @@ OnMyMobDead:
 }
 
 force_5-1,174,130,0	script	force_06start#aco	-1,1,1,{
-OnTouch:
+OnTouch_:
 	donpcevent "force_06mob#aco::OnEnable";
 	donpcevent "arena_aco1::OnReset_06";
 	disablenpc "force_06start#aco";
@@ -426,7 +426,7 @@ OnMyMobDead:
 }
 
 force_5-1,174,40,0	script	force_07start#aco	-1,1,1,{
-OnTouch:
+OnTouch_:
 	donpcevent "force_07mob#aco::OnEnable";
 	disablenpc "force_07start#aco";
 }
@@ -454,7 +454,7 @@ OnMyMobDead:
 }
 
 force_5-1,132,26,0	script	force_08start#aco	-1,1,1,{
-OnTouch:
+OnTouch_:
 	percentheal 50,50;
 	donpcevent "Trocco#aco1::On08_Start";
 	donpcevent "arena_aco1::OnReset_08";
@@ -463,7 +463,7 @@ OnTouch:
 }
 
 force_5-1,99,82,0	script	force_09start#aco	-1,1,1,{
-OnTouch:
+OnTouch_:
 	donpcevent "Trocco#aco1::On09_Start";
 	donpcevent "force_09mob#aco::OnEnable";
 	disablenpc "force_09start#aco";
@@ -710,7 +710,7 @@ On09_End:
 }
 
 force_5-1,40,26,0	script	force_01start#pri	-1,1,1,{
-OnTouch:
+OnTouch_:
 	donpcevent "force_01mob#pri::OnEnable";
 	disablenpc "force_01start#pri";
 	end;
@@ -735,7 +735,7 @@ OnMyMobDead:
 }
 
 force_5-1,25,69,0	script	force_02start#pri	-1,1,1,{
-OnTouch:
+OnTouch_:
 	if (BaseLevel < 70) {
 		donpcevent "force_02mob#pri::OnOn1";
 	}
@@ -770,7 +770,7 @@ OnMyMobDead:
 }
 
 force_5-1,25,159,0	script	force_03start#pri	-1,1,1,{
-OnTouch:
+OnTouch_:
 	donpcevent "force_03mob#pri::OnEnable";
 	disablenpc "force_03start#pri";
 	end;
@@ -795,7 +795,7 @@ OnMyMobDead:
 }
 
 force_5-1,69,174,0	script	force_04start#pri	-1,1,1,{
-OnTouch:
+OnTouch_:
 	if (BaseLevel < 90) {
 		donpcevent "force_04mob#pri::OnOn1";
 	}
@@ -836,7 +836,7 @@ OnMyMobDead:
 }
 
 force_5-1,159,174,0	script	force_05start#pri	-1,1,1,{
-OnTouch:
+OnTouch_:
 	donpcevent "force_05mob#pri::OnEnable";
 	if (BaseLevel < 70) {
 		donpcevent "force_05ex#pri::OnOn1";
@@ -885,7 +885,7 @@ OnMyMobDead:
 }
 
 force_5-1,174,130,0	script	force_06start#pri	-1,1,1,{
-OnTouch:
+OnTouch_:
 	donpcevent "force_06ex#pri::OnEnable";
 	if (BaseLevel < 70) {
 		donpcevent "force_06mob#pri::OnOn1";
@@ -943,7 +943,7 @@ OnMyMobDead:
 }
 
 force_5-1,174,40,0	script	force_07start#pri	-1,1,1,{
-OnTouch:
+OnTouch_:
 	donpcevent "force_07mob#pri::OnEnable";
 	disablenpc "force_07start#pri";
 	end;
@@ -968,7 +968,7 @@ OnMyMobDead:
 }
 
 force_5-1,132,26,0	script	force_08start#pri	-1,1,1,{
-OnTouch:
+OnTouch_:
 	donpcevent "Trocco#aco2::On08_Start";
 	donpcevent "arena_aco2::OnReset_08";
 	disablenpc "force_08start#pri";
@@ -976,7 +976,7 @@ OnTouch:
 }
 
 force_5-1,99,82,0	script	force_09start#pri	-1,1,1,{
-OnTouch:
+OnTouch_:
 	donpcevent "Trocco#aco2::On09_Start";
 	if (BaseLevel < 70) {
 		donpcevent "force_09mob#pri::OnOn4";
@@ -1027,7 +1027,7 @@ OnMyMobDead:
 }
 
 force_5-1,62,26,0	script	force_08_01#aco	45,1,1,{
-OnTouch:
+OnTouch_:
 	warp "force_5-1",40,26;
 	if (BaseJob == Job_Acolyte) {
 		enablenpc "force_01start#aco";
@@ -1039,7 +1039,7 @@ OnTouch:
 }
 
 force_5-1,99,124,0	script	force_exit#aco	45,1,1,{
-OnTouch:
+OnTouch_:
 	donpcevent "Trocco#aco1::OnTimerOff";
 	donpcevent "#arn_timer_aco::OnEnable";
 	mapwarp "force_5-1","prt_are_in",21,35;
@@ -1486,7 +1486,7 @@ OnHide:
 	disablenpc "arn_warp_aco";
 	end;
 
-OnTouch:
+OnTouch_:
 	warp "arena_room",100,75;
 	donpcevent "arn_warp_aco::OnHide";
 	end;

npc/other/arena/arena_lvl50.txt

@@ -292,21 +292,21 @@ OnReset_All:
 }
 
 force_1-1,62,26,1	script	force_08_01#50	45,1,1,{
-OnTouch:
+OnTouch_:
 	donpcevent "Heel and Toe#arena::On01_Start";
 	warp "force_1-1",40,26;
 	end;
 }
 
 force_1-1,25,44,1	script	force_01_02#50	45,1,1,{
-OnTouch:
+OnTouch_:
 	donpcevent "Heel and Toe#arena::On02_Start";
 	warp "force_1-1",25,69;
 	end;
 }
 
 force_1-1,25,134,1	script	force_02_03#50	45,1,1,{
-OnTouch:
+OnTouch_:
 	donpcevent "arena#50::OnReset_02";
 	donpcevent "Heel and Toe#arena::On03_Start";
 	warp "force_1-1",25,159;
@@ -314,35 +314,35 @@ OnTouch:
 }
 
 force_1-1,44,174,1	script	force_03_04#50	45,1,1,{
-OnTouch:
+OnTouch_:
 	donpcevent "Heel and Toe#arena::On04_Start";
 	warp "force_1-1",69,174;
 	end;
 }
 
 force_1-1,134,174,1	script	force_04_05#50	45,1,1,{
-OnTouch:
+OnTouch_:
 	donpcevent "Heel and Toe#arena::On05_Start";
 	warp "force_1-1",159,174;
 	end;
 }
 
 force_1-1,174,155,1	script	force_05_06#50	45,1,1,{
-OnTouch:
+OnTouch_:
 	donpcevent "Heel and Toe#arena::On06_Start";
 	warp "force_1-1",174,130;
 	end;
 }
 
 force_1-1,174,65,1	script	force_06_07#50	45,1,1,{
-OnTouch:
+OnTouch_:
 	donpcevent "Heel and Toe#arena::On07_Start";
 	warp "force_1-1",174,40;
 	end;
 }
 
 force_1-1,155,26,1	script	force_07_08#50	45,1,1,{
-OnTouch:
+OnTouch_:
 	donpcevent "Heel and Toe#arena::On08_Start";
 	warp "force_1-1",132,26;
 	enablenpc "force_08_09#50";
@@ -350,14 +350,14 @@ OnTouch:
 }
 
 force_1-1,99,54,1	script	force_08_09#50	45,1,1,{
-OnTouch:
+OnTouch_:
 	donpcevent "Heel and Toe#arena::On09_Start";
 	warp "force_1-1",99,82;
 	end;
 }
 
 force_1-1,99,124,1	script	force_exit#50	45,1,1,{
-OnTouch:
+OnTouch_:
 	donpcevent "Heel and Toe#arena::OnTimerOff";
 	donpcevent "#arn_timer_50::OnEnable";
 	mapwarp "force_1-1","prt_are_in",22,191,0,0;

npc/other/arena/arena_lvl60.txt

@@ -302,21 +302,21 @@ OnReset_All:
 }
 
 force_2-1,62,26,1	script	force_08_01#60	45,1,1,{
-OnTouch:
+OnTouch_:
 	donpcevent "Minilover#arena::On01_Start";
 	warp "force_2-1",40,26;
 	end;
 }
 
 force_2-1,25,44,1	script	force_01_02#60	45,1,1,{
-OnTouch:
+OnTouch_:
 	donpcevent "Minilover#arena::On02_Start";
 	warp "force_2-1",25,69;
 	end;
 }
 
 force_2-1,25,134,1	script	force_02_03#60	45,1,1,{
-OnTouch:
+OnTouch_:
 	donpcevent "arena#60::OnReset_02";
 	donpcevent "Minilover#arena::On03_Start";
 	warp "force_2-1",25,159;
@@ -324,35 +324,35 @@ OnTouch:
 }
 
 force_2-1,44,174,1	script	force_03_04#60	45,1,1,{
-OnTouch:
+OnTouch_:
 	donpcevent "Minilover#arena::On04_Start";
 	warp "force_2-1",69,174;
 	end;
 }
 
 force_2-1,134,174,1	script	force_04_05#60	45,1,1,{
-OnTouch:
+OnTouch_:
 	donpcevent "Minilover#arena::On05_Start";
 	warp "force_2-1",159,174;
 	end;
 }
 
 force_2-1,174,155,1	script	force_05_06#60	45,1,1,{
-OnTouch:
+OnTouch_:
 	donpcevent "Minilover#arena::On06_Start";
 	warp "force_2-1",174,130;
 	end;
 }
 
 force_2-1,174,65,1	script	force_06_07#60	45,1,1,{
-OnTouch:
+OnTouch_:
 	donpcevent "Minilover#arena::On07_Start";
 	warp "force_2-1",174,40;
 	end;
 }
 
 force_2-1,155,26,1	script	force_07_08#60	45,1,1,{
-OnTouch:
+OnTouch_:
 	donpcevent "Minilover#arena::On08_Start";
 	warp "force_2-1",132,26;
 	enablenpc "force_08_09#60";
@@ -360,14 +360,14 @@ OnTouch:
 }
 
 force_2-1,99,54,1	script	force_08_09#60	45,1,1,{
-OnTouch:
+OnTouch_:
 	donpcevent "Minilover#arena::On09_Start";
 	warp "force_2-1",99,82;
 	end;
 }
 
 force_2-1,99,124,1	script	force_exit#60	45,1,1,{
-OnTouch:
+OnTouch_:
 	donpcevent "Minilover#arena::OnTimerOff";
 	donpcevent "#arn_timer_60::OnEnable";
 	mapwarp "force_2-1","prt_are_in",22,139,0,0;

npc/other/arena/arena_lvl70.txt

@@ -310,56 +310,56 @@ OnReset_All:
 }
 
 force_3-1,62,26,1	script	force_08_01#70	45,1,1,{
-OnTouch:
+OnTouch_:
 	donpcevent "Cadillac#arena::On01_Start";
 	warp "force_3-1",40,26;
 	end;
 }
 
 force_3-1,25,44,1	script	force_01_02#70	45,1,1,{
-OnTouch:
+OnTouch_:
 	donpcevent "Cadillac#arena::On02_Start";
 	warp "force_3-1",25,69;
 	end;
 }
 
 force_3-1,25,134,1	script	force_02_03#70	45,1,1,{
-OnTouch:
+OnTouch_:
 	donpcevent "Cadillac#arena::On03_Start";
 	warp "force_3-1",25,159;
 	end;
 }
 
 force_3-1,44,174,1	script	force_03_04#70	45,1,1,{
-OnTouch:
+OnTouch_:
 	donpcevent "Cadillac#arena::On04_Start";
 	warp "force_3-1",69,174;
 	end;
 }
 
 force_3-1,134,174,1	script	force_04_05#70	45,1,1,{
-OnTouch:
+OnTouch_:
 	donpcevent "Cadillac#arena::On05_Start";
 	warp "force_3-1",159,174;
 	end;
 }
 
 force_3-1,174,155,1	script	force_05_06#70	45,1,1,{
-OnTouch:
+OnTouch_:
 	donpcevent "Cadillac#arena::On06_Start";
 	warp "force_3-1",174,130;
 	end;
 }
 
 force_3-1,174,65,1	script	force_06_07#70	45,1,1,{
-OnTouch:
+OnTouch_:
 	donpcevent "Cadillac#arena::On07_Start";
 	warp "force_3-1",174,40;
 	end;
 }
 
 force_3-1,155,26,1	script	force_07_08#70	45,1,1,{
-OnTouch:
+OnTouch_:
 	donpcevent "Cadillac#arena::On08_Start";
 	warp "force_3-1",132,26;
 	enablenpc "force_08_09#70";
@@ -367,14 +367,14 @@ OnTouch:
 }
 
 force_3-1,99,54,1	script	force_08_09#70	45,1,1,{
-OnTouch:
+OnTouch_:
 	donpcevent "Cadillac#arena::On09_Start";
 	warp "force_3-1",99,82;
 	end;
 }
 
 force_3-1,99,124,1	script	force_exit#70	45,1,1,{
-OnTouch:
+OnTouch_:
 	donpcevent "Cadillac#arena::OnTimerOff";
 	donpcevent "#arn_timer_70::OnEnable";
 	mapwarp "force_3-1","prt_are_in",22,87,0,0;

npc/other/arena/arena_lvl80.txt

@@ -313,28 +313,28 @@ OnReset_All:
 }
 
 force_4-1,62,26,1	script	force_08_01#80	45,1,1,{
-OnTouch:
+OnTouch_:
 	donpcevent "Octus#arena::On01_Start";
 	warp "force_4-1",40,26;
 	end;
 }
 
 force_4-1,25,44,1	script	force_01_02#80	45,1,1,{
-OnTouch:
+OnTouch_:
 	donpcevent "Octus#arena::On02_Start";
 	warp "force_4-1",25,69;
 	end;
 }
 
 force_4-1,25,134,1	script	force_02_03#80	45,1,1,{
-OnTouch:
+OnTouch_:
 	donpcevent "Octus#arena::On03_Start";
 	warp "force_4-1",25,159;
 	end;
 }
 
 force_4-1,44,174,1	script	force_03_04#80	45,1,1,{
-OnTouch:
+OnTouch_:
 	donpcevent "Octus#arena::On04_Start";
 	warp "force_4-1",69,174;
 	end;
@@ -342,28 +342,28 @@ OnTouch:
 }
 
 force_4-1,134,174,1	script	force_04_05#80	45,1,1,{
-OnTouch:
+OnTouch_:
 	donpcevent "Octus#arena::On05_Start";
 	warp "force_4-1",159,174;
 	end;
 }
 
 force_4-1,174,155,1	script	force_05_06#80	45,1,1,{
-OnTouch:
+OnTouch_:
 	donpcevent "Octus#arena::On06_Start";
 	warp "force_4-1",174,130;
 	end;
 }
 
 force_4-1,174,65,1	script	force_06_07#80	45,1,1,{
-OnTouch:
+OnTouch_:
 	donpcevent "Octus#arena::On07_Start";
 	warp "force_4-1",174,40;
 	end;
 }
 
 force_4-1,155,26,1	script	force_07_08#80	45,1,1,{
-OnTouch:
+OnTouch_:
 	donpcevent "Octus#arena::On08_Start";
 	warp "force_4-1",132,26;
 	enablenpc "force_08_09#80";
@@ -371,14 +371,14 @@ OnTouch:
 }
 
 force_4-1,99,54,1	script	force_08_09#80	45,1,1,{
-OnTouch:
+OnTouch_:
 	donpcevent "Octus#arena::On09_Start";
 	warp "force_4-1",99,82;
 	end;
 }
 
 force_4-1,99,124,1	script	force_exit#80	45,1,1,{
-OnTouch:
+OnTouch_:
 	donpcevent "Octus#arena::OnTimerOff";
 	donpcevent "#arn_timer_80::OnEnable";
 	mapwarp "force_4-1","prt_are_in",73,192,0,0;

npc/other/arena/arena_party.txt

@@ -91,7 +91,7 @@ OnInit:
 	disablenpc "toarena#party";
 	end;
 
-OnTouch:
+OnTouch_:
 	if(Zeny < 1000)
 		warp "arena_room",100,75;
 	else {
@@ -125,7 +125,7 @@ OnTimer70000:
 	donpcevent "Ponox::OnStart";
 	disablenpc "toout#party";
 
-OnTouch:
+OnTouch_:
 	set $arn_partywait,0;
 	warp "arena_room",100,75;
 
@@ -140,7 +140,7 @@ OnStop:
 }
 
 prt_are_in,73,74,0	script	arena_out	-1,1,1,{
-OnTouch:
+OnTouch_:
 	set $arn_partywait,0;
 	warp "arena_room",100,75;
 	end;
@@ -413,7 +413,7 @@ OnReset:
 }
 
 force_1-2,95,187,0	script	force_09_exit	45,1,1,{
-OnTouch:
+OnTouch_:
 	set $arena_minptend,gettime(2);
 	set $arena_secptend,gettime(1);
 	warp "prt_are_in",73,139;
@@ -424,7 +424,7 @@ OnTouch:
 }
 
 force_1-2,36,26,0	script	force_01start#party	-1,1,1,{
-OnTouch:
+OnTouch_:
 	donpcevent "force_01mob#party::OnEnable";
 	disablenpc "force_01start#party";
 	end;
@@ -479,7 +479,7 @@ OnMyMobDead:
 }
 
 force_1-2,162,26,0	script	force_02start#party	-1,1,1,{
-OnTouch:
+OnTouch_:
 	donpcevent "force_02mob#party::OnEnable";
 	disablenpc "force_02start#party";
 	end;
@@ -538,7 +538,7 @@ OnMyMobDead:
 }
 
 force_1-2,99,66,0	script	force_03start#party	-1,1,1,{
-OnTouch:
+OnTouch_:
 	donpcevent "force_03mob#party::OnEnable";
 	disablenpc "force_03start#party";
 	end;
@@ -593,7 +593,7 @@ OnMyMobDead:
 }
 
 force_1-2,162,78,0	script	force_04start#party	-1,3,3,{
-OnTouch:
+OnTouch_:
 	donpcevent "force_04mob#party::OnEnable";
 	disablenpc "force_04start#party";
 	end;
@@ -640,7 +640,7 @@ OnMyMobDead:
 }
 
 force_1-2,36,77,0	script	force_05start#party	-1,1,1,{
-OnTouch:
+OnTouch_:
 	donpcevent "force_05mob#party::OnEnable";
 	disablenpc "force_05start#party";
 	end;
@@ -687,7 +687,7 @@ OnMyMobDead:
 }
 
 force_1-2,26,118,0	script	force_06start#party	-1,1,1,{
-OnTouch:
+OnTouch_:
 	donpcevent "force_06mob#party::OnEnable";
 	disablenpc "force_06start#party";
 	end;
@@ -733,7 +733,7 @@ OnMyMobDead:
 }
 
 force_1-2,92,124,0	script	force_07start#party	-1,1,1,{
-OnTouch:
+OnTouch_:
 	donpcevent "force_07mob#party::OnEnable";
 	disablenpc "force_07start#party";
 	end;
@@ -769,7 +769,7 @@ OnMyMobDead:
 }
 
 force_1-2,173,118,0	script	force_08start#party	-1,1,1,{
-OnTouch:
+OnTouch_:
 	donpcevent "force_08mob#party::OnEnable";
 	disablenpc "force_08start#party";
 	end;
@@ -812,7 +812,7 @@ OnMyMobDead:
 }
 
 force_1-2,133,178,0	script	force_09start#party	-1,1,1,{
-OnTouch:
+OnTouch_:
 	donpcevent "force_09mob#party::OnEnable";
 	disablenpc "force_09start#party";
 	end;
@@ -852,7 +852,7 @@ OnMyMobDead:
 }
 
 force_1-2,29,178,0	script	force_10start#party	-1,1,1,{
-OnTouch:
+OnTouch_:
 	donpcevent "force_10mob-1#party::OnEnable";
 	disablenpc "force_10start#party";
 	end;
@@ -904,7 +904,7 @@ OnMyMobDead:
 }
 
 force_1-2,59,178,0	script	force_exit#party	-1,1,1,{
-OnTouch:
+OnTouch_:
 	donpcevent "force_exitmob#party::OnEnable";
 	disablenpc "force_exit#party";
 	end;

npc/other/fortune.txt

@@ -2643,7 +2643,7 @@ payon_in03,118,119,1	script	Ascetic	4W_F_01,2,2,{
 	mes "Kiss me~~";
 	close;
 
-OnTouch:
+OnTouch_:
 	mes "[Kissy-Kissy]";
 	mes "NyangNyangNyang~";
 	mes "NyaNyangNyaNyang~";

npc/other/hugel_bingo.txt

@@ -747,14 +747,14 @@ OnInit:
 	disablenpc "out3#bingo";
 	end;
 
-OnTouch:
+OnTouch_:
 	warp "que_bingo",40,121;
 	end;
 }
 
 que_bingo,49,136,0	script	go3#bingo	45,1,1,{
 
-OnTouch:
+OnTouch_:
 	switch($@hu_bingob) {
 		case 0: warp "que_bingo",49,125; break;
 		case 1: warp "que_bingo",53,121; break;

npc/other/msg_boards.txt

@@ -225,7 +225,7 @@ aldebaran,54,223,1	script	Billboard#Alde3	111,{
 }
 
 aldebaran,197,228,1	script	#Alde4	-1,1,1,{
-OnTouch:
+OnTouch_:
 	mes "[Home Owner]";
 	mes "Get off my roof you no good leecher!";
 	close;

npc/other/poring_war.txt

@@ -1045,7 +1045,7 @@ OnDisable:
 	disablenpc "#wop_warp_a";
 	end;
 
-OnTouch:
+OnTouch_:
 	set wop_team,1;
 	warp "poring_w02",57,82;
 	end;
@@ -1067,7 +1067,7 @@ OnDisable:
 	disablenpc "#wop_warp_d";
 	end;
 
-OnTouch:
+OnTouch_:
 	set wop_team,2;
 	warp "poring_w02",140,82;
 	end;
@@ -1522,7 +1522,7 @@ OnDisable:
 	disablenpc "#aroom_ingate_wop";
 	end;
 
-OnTouch:
+OnTouch_:
 	warp "poring_w02",99,49;
 	end;
 }
@@ -1542,7 +1542,7 @@ OnDisable:
 	disablenpc "#aroom_outgate_wop";
 	end;
 
-OnTouch:
+OnTouch_:
 	warp "poring_w02",99,54;
 	end;
 }
@@ -1619,7 +1619,7 @@ OnDisable:
 	disablenpc "#droom_ingate_wop";
 	end;
 
-OnTouch:
+OnTouch_:
 	warp "poring_w02",98,116;
 	end;
 }
@@ -1639,7 +1639,7 @@ OnDisable:
 	disablenpc "#droom_outgate_wop";
 	end;
 
-OnTouch:
+OnTouch_:
 	warp "poring_w02",98,111;
 	end;
 }

npc/other/pvp.txt

@@ -397,7 +397,7 @@ pvp_room,86,85,4	duplicate(PVPSpectator)	Spectator's Entrance#4	105
 // Spectator Warps
 //============================================================ 
 -	script	Combat Square Staff#dum::PVPSpecWarp	-1,{
-OnTouch:
+OnTouch_:
 	mes "[Combat Square Staff]";
 	mes "May I help you?";
 	if (select("To the center viewer seat.:Leave Combat Square.") == 1) {
@@ -432,7 +432,7 @@ pvp_2vs2,40,40,0	script	Combat Square Staff#5	45,1,1,{
 // PVP Area Exit warp
 //============================================================ 
 pvp_room,51,19,0	script	out#eventpvp	45,4,2,{
-OnTouch:
+OnTouch_:
 	mes "[Combat Square Staff]";
 	mes "Did you have fun in Combat Square?";
 	mes "May I ask where you want to go?";

npc/other/turbo_track.txt

@@ -90,7 +90,7 @@ turbo_n_1,298,167,3	duplicate(Helper#tt_main)	Helper#n1_F	124
 turbo_e_4,298,167,0	script	Point#tt_main	-1,15,15,{
 	end;
 
-OnTouch:
+OnTouch_:
 	if (tt_point < 28999) {
 		set tt_point,tt_point+2;
 		warp strnpcinfo(4),59,364;
@@ -415,7 +415,7 @@ turbo_n_8,167,3,0	duplicate(Master#tt_main)	Master#n16	-1
 turbo_n_1,167,3,0	duplicate(Master#tt_main)	Master#n1	-1
 
 -	script	NoUnfair#tt_main	-1,{
-OnTouch:
+OnTouch_:
 	warp strnpcinfo(4),59,364;
 	end;
 }
@@ -435,7 +435,7 @@ turbo_n_1,62,379,0	duplicate(NoUnfair#tt_main)	No_Unfair_Start#n1-1	-1,0,31
 turbo_n_1,68,379,5	duplicate(NoUnfair#tt_main)	No_Unfair_Start#n1-2	-1,5,31
 
 -	script	LogTrap#tt_main	-1,{
-OnTouch:
+OnTouch_:
 	switch (rand(1,3)) {
 		case 1: warp strnpcinfo(4),72,372; end;
 		case 2: warp strnpcinfo(4),72,365; end;
@@ -990,7 +990,7 @@ turbo_n_1,145,357,0	duplicate(LogTrap#tt_main)	trap_d#n1-14	-1,1,2
 turbo_n_1,148,357,0	duplicate(LogTrap#tt_main)	trap_d#n1-15	-1,1,2
 
 -	script	SandTrap#tt_main	-1,{
-OnTouch:
+OnTouch_:
 	switch(rand(1,10)) {
 		case 1:
 		case 9:
@@ -1178,7 +1178,7 @@ turbo_n_1,382,363,0	duplicate(SandTrap#tt_main)	#TBT_trap_n1-22	-1,2,2
 turbo_n_1,381,354,0	duplicate(SandTrap#tt_main)	#TBT_trap_n1-23	-1,1,1
 
 -	script	Trap#tt_main	-1,{
-OnTouch:
+OnTouch_:
 	if (rand(1,3) == 1) {
 		set .@w$,callfunc("F_tt");
 		cutin "kafra_03",2;
@@ -1248,7 +1248,7 @@ turbo_n_16,355,362,0	duplicate(Trap#tt_main)	#TBT_trap_n16-24	-1,3,3
 turbo_n_1,355,362,0	duplicate(Trap#tt_main)	#TBT_trap_n1-24	-1,3,3
 
 -	script	WaterTrap#tt_main	-1,{
-OnTouch:
+OnTouch_:
 	sc_start SC_BLIND,60000,0;
 	end;
 }
@@ -1611,7 +1611,7 @@ turbo_n_1,90,241,0	duplicate(WaterTrap#tt_main)	flasher#n1-48a	-1,1,0
 turbo_n_1,236,3,0	duplicate(WaterTrap#tt_main)	flasher#n1-48b	-1,3,0
 
 -	script	snake01#tt_main	-1,{
-OnTouch:
+OnTouch_:
 	set .@turbo2,rand(1,7);
 	if (.@turbo2 < 3) warp strnpcinfo(4),370,292;
 	if (.@turbo2 < 5) warp strnpcinfo(4),295,293;
@@ -1628,7 +1628,7 @@ turbo_n_16,324,279,0	duplicate(snake01#tt_main)	snake01#n16	45,1,1
 turbo_n_1,324,279,0	duplicate(snake01#tt_main)	snake01#n1	45,1,1
 
 -	script	snake02#tt_main	-1,{
-OnTouch:
+OnTouch_:
 	set .@turbo2,rand(1,8);
 	if (.@turbo2 < 3) warp strnpcinfo(4),287,256;
 	if (.@turbo2 < 5) warp strnpcinfo(4),303,256;
@@ -1646,7 +1646,7 @@ turbo_n_1,332,279,0	duplicate(snake02#tt_main)	snake02#n1	45,1,1
 
 
 -	script	snake03#tt_main	45,1,1,{
-OnTouch:
+OnTouch_:
 	set .@turbo2,rand(1,8);
 	if (.@turbo2 < 3) warp strnpcinfo(4),279,292;
 	if (.@turbo2 < 5) warp strnpcinfo(4),311,292;
@@ -1664,7 +1664,7 @@ turbo_n_1,324,270,0	duplicate(snake03#tt_main)	snake03#n1	45,1,1
 
 
 -	script	snake04#tt_main	45,1,1,{
-OnTouch:
+OnTouch_:
 	set .@turbo2,rand(1,7);
 	if (.@turbo2 < 3) warp strnpcinfo(4),363,256;
 	if (.@turbo2 < 5) warp strnpcinfo(4),295,293;
@@ -1720,7 +1720,7 @@ turbo_n_4,90,46,0	duplicate(SnakeHunt#tt_main)	hunting#n4	111
 turbo_n_1,90,46,0	duplicate(SnakeHunt#tt_main)	hunting#n1	111
 
 -	script	cos#tt_main	-1,{
-OnTouch:
+OnTouch_:
 	set .@n, charat(strnpcinfo(2),getstrlen(strnpcinfo(2))-1);
 	switch (.@n) {
 		case 1:
@@ -1806,7 +1806,7 @@ turbo_n_1,93,19,0	duplicate(cos#tt_main)	#cos_n1_7	45,1,1
 turbo_n_1,232,14,0	duplicate(cos#tt_main)	#cos_n1_8	45,1,1
 
 turbo_e_16,179,55,0	script	TurboHint_1#tt_main	-1,1,1,{
-OnTouch:
+OnTouch_:
 	emotion e_what,1;
 	end;
 }
@@ -1854,7 +1854,7 @@ turbo_n_1,209,61,0	duplicate(TurboHint_1#tt_main)	#n1Intersectionm	-1,1,1
 turbo_n_1,208,56,0	duplicate(TurboHint_1#tt_main)	#n1Intersectionn	-1,1,1
 
 -	script	TurboHint_2#tt_main	-1,{
-OnTouch:
+OnTouch_:
 	emotion e_gasp,1;
 	end;
 }
@@ -1887,7 +1887,7 @@ turbo_n_1,208,26,0	duplicate(TurboHint_2#tt_main)	#n1CorrectPath8	-1,1,1
 turbo_n_1,191,30,0	duplicate(TurboHint_2#tt_main)	#n1CorrectPath9	-1,1,1
 
 -	script	TurboHint_3#tt_main	-1,{
-OnTouch:
+OnTouch_:
 	emotion e_swt2,1;
 	if (rand(1,4) == 3)
 		emotion e_gasp;
@@ -1907,7 +1907,7 @@ turbo_n_1,222,26,0	duplicate(TurboHint_3#tt_main)	#n1NoWayOut3	-1,1,1
 turbo_n_1,219,39,0	duplicate(TurboHint_3#tt_main)	#n1NoWayOut4	-1,1,1
 
 -	script	TurboHint_4#tt_main	-1,1,1,{
-OnTouch:
+OnTouch_:
 	emotion e_swt2,1;
 	end;
 }
@@ -1923,7 +1923,7 @@ turbo_n_1,222,65,0	duplicate(TurboHint_4#tt_main)	#n1NoWayOut7	-1,1,1
 
 -	script	cos_end#tt_main	01,{
 	function	GetNumber;
-OnTouch:
+OnTouch_:
 	set .@w$,callfunc("F_tt");
 	if (.@w$ == "n1") set $@end_time,gettimetick(0);
 	mapannounce strnpcinfo(4),strcharinfo(0) +" has just arrived at the Finish Line! Congratulations!",bc_map,"0xFFFF00";
@@ -1973,7 +1973,7 @@ turbo_n_16,371,47,0	duplicate(cos_end#tt_main)	#cos_n16_end	45,1,1
 turbo_n_1,371,47,0	duplicate(cos_end#tt_main)	#cos_n1_end	45,1,1
 
 -	script	cos_end2#tt_main	45,1,1,{
-OnTouch:
+OnTouch_:
 	set .@w$,callfunc("F_tt");
 	mapannounce strnpcinfo(4),strcharinfo(0) +" is second to reach the Finish Line! Congratulations!",bc_map,"0xFFFF00";
 	if (.@w$ == "e8" || .@w$ == "n8") setarray .@pts, 28961,40;
@@ -1995,7 +1995,7 @@ turbo_n_8,371,51,0	duplicate(cos_end2#tt_main)	#cos_n8_end2	45,1,1
 turbo_n_16,371,51,0	duplicate(cos_end2#tt_main)	#cos_n16_end2	45,1,1
 
 -	script	cos_end3#tt_main	-1,{
-OnTouch:
+OnTouch_:
 	set .@w$,callfunc("F_tt");
 	mapannounce strnpcinfo(4),"" + strcharinfo(0) +" is third to reach the Finish Line! Congratulations!",bc_map,"0xFFFF00";
 	if (.@w$ == "e8" || .@w$ == "n8") setarray .@pts, 28971,30;
@@ -2019,7 +2019,7 @@ turbo_n_8,371,43,0	duplicate(cos_end3#tt_main)	#cos_n8_end3	45,1,1
 turbo_n_16,371,43,0	duplicate(cos_end3#tt_main)	#cos_n16_end3	45,1,1
 
 turbo_e_4,316,365,0	script	DSwitch#tt_main	-1,1,1,{
-OnTouch:
+OnTouch_:
 	set .@w$,callfunc("F_tt");
 	if (rand(1,2) == 1)
 		enablenpc "Flasher_Exit_1#"+.@w$;
@@ -2037,7 +2037,7 @@ turbo_n_16,316,365,0	duplicate(DSwitch#tt_main)	Disposable_Switch#n16	-1,1,1
 turbo_n_1,316,365,0	duplicate(DSwitch#tt_main)	Disposable_Switch#n1	-1,1,1
 
 -	script	Flasher#tt_main	-1,{
-OnTouch:
+OnTouch_:
 	mapannounce strnpcinfo(4),strcharinfo(0) +" has just passed the Flasher Maze!",bc_map,"0x70DBDB";
 	warp strnpcinfo(4),185,227;
 	end;
@@ -2764,7 +2764,7 @@ OnInit:
 }
 
 -	script	NMaker1#tt_main	-1,{
-OnTouch:
+OnTouch_:
 	set .@w$,callfunc("F_tt");
 	mapannounce strnpcinfo(4),strcharinfo(0) +" is now entering the Small Cave! " + strcharinfo(0) +" is now in the lead!",bc_map,"0xFFFF00";
 	donpcevent "Turbo Track Guide::OnEnd_"+.@w$;
@@ -2785,7 +2785,7 @@ turbo_n_16,11,91,0	duplicate(NMaker1#tt_main)	Notice_Maker1#TBT_n16	-1,3,3
 turbo_n_1,11,91,0	duplicate(NMaker1#tt_main)	Notice_Maker1#TBT_n1	-1,3,3
 
 -	script	NMaker3#tt_main	-1,{
-OnTouch:
+OnTouch_:
 	set .@w$,callfunc("F_tt");
 	mapannounce strnpcinfo(4),strcharinfo(0) +" is now entering the Single Snail! " + strcharinfo(0) +" is now in the lead!",bc_map,"0xFFFF00";
 	disablenpc "Notice_Maker3#TBT_"+.@w$;
@@ -2805,7 +2805,7 @@ turbo_n_16,234,223,0	duplicate(NMaker3#tt_main)	Notice_Maker3#TBT_n16	-1,3,3
 turbo_n_1,234,223,0	duplicate(NMaker3#tt_main)	Notice_Maker3#TBT_n1	-1,3,3
 
 -	script	NMaker4#tt_main	-1,{
-OnTouch:
+OnTouch_:
 	set .@w$,callfunc("F_tt");
 	mapannounce strnpcinfo(4),strcharinfo(0) +" is currently in First Place!",bc_map,"0xFFFF00";
 	disablenpc "Notice_Maker4#TBT_"+.@w$;
@@ -2826,7 +2826,7 @@ turbo_n_16,226,15,0	duplicate(NMaker4#tt_main)	Notice_Maker4#TBT_n16	-1,3,3
 turbo_n_1,226,15,0	duplicate(NMaker4#tt_main)	Notice_Maker4#TBT_n1	-1,3,3
 
 -	script	warp#tt_main	-1,{
-OnTouch:
+OnTouch_:
 	switch (rand(1,20)) {
 		case 1: warp strnpcinfo(4),216,378; break;
 		case 2: warp strnpcinfo(4),218,360; break;
@@ -2889,7 +2889,7 @@ turbo_n_1,253,364,0	duplicate(warp#tt_main)	Warp#n1_7	-1,2,2
 
 -	script	TurboTrap#tt_main	-1,{
 	end;
-OnTouch:
+OnTouch_:
 	specialeffect EF_BLASTMINEBOMB;
 	set .@HitTrap,10;
 	if (.@HitTrap > 0 && .@HitTrap < 4)
@@ -3526,7 +3526,7 @@ turbo_n_1,368,36,0	duplicate(TurboTrap#tt_main)	trap_n1#F95	139,1,1
 
 -	script	TurboTrap_2#tt_main	-1,{
 	end;
-OnTouch:
+OnTouch_:
 	specialeffect EF_FREEZING;
 	set .@HitTrap,10;
 	if (.@HitTrap > 0 && .@HitTrap < 4)
@@ -3592,7 +3592,7 @@ turbo_n_1,340,55,0	duplicate(TurboTrap_2#tt_main)	trap_n1#F48	139,1,1
 
 -	script	bing_1#tt_main	-1,{
 	end;
-OnTouch:
+OnTouch_:
 	set .@w$,callfunc("F_tt");
 	set .@bing1,rand(1,10);
 	if (.@bing1 > 0 && .@bing1 < 4)
@@ -3618,7 +3618,7 @@ turbo_n_16,217,214,0	duplicate(bing_1#tt_main)	bing#n16	45,3,3
 
 -	script	bing_2#tt_main	-1,{
 	end;
-OnTouch:
+OnTouch_:
 	switch (rand(1,10)) {
 		case 1: warp strnpcinfo(4),217,232; break;
 		case 2: warp strnpcinfo(4),233,207; break;
@@ -4594,7 +4594,7 @@ S_ExchangePoints:
 }
 
 alde_gld,183,204,0	script	en_turbo	45,1,1,{
-OnTouch:
+OnTouch_:
 	if (checkweight(1201,1) == 0) {
 		mes "^3355FFWait a second!";
 		mes "Right now, you're carrying";

npc/quests/dandelion_request.txt

@@ -2160,7 +2160,7 @@ morocc,43,108,5	script	Sharp-Looking Kid	82,{
 
 morocc,45,110,1	script	#maobar1	45,2,2,{
 
-OnTouch:
+OnTouch_:
 	if(mao_request || Class == Job_Assassin || Class == Job_Assassin_Cross) warp "que_job01",9,94;
 	else
 	{
@@ -2230,30 +2230,13 @@ OnTouch:
 	}
 }
 
-que_job01,6,94,1	script	#maobar2	45,2,2,{
-
-OnTouch:
-	warp "morocc",45,103;
-	end;
-}
-
-que_job01,17,48,1	script	#maobar3	45,2,2,{
-
-OnTouch:
-	warp "que_job01",68,92;
-	end;
-}
-
-que_job01,68,96,1	script	#maobar4	45,2,2,{
-
-OnTouch:
-	warp "que_job01",17,53;
-	end;
-}
+que_job01,6,94,1	warp	#maobar2	2,2,morocc,45,103
+que_job01,17,48,1	warp	#maobar3	2,2,que_job01,68,92
+que_job01,68,96,1	warp	#maobar4	2,2,que_job01,17,53
 
 que_job01,80,77,1	script	#maobar5	45,2,2,{
 
-OnTouch:
+OnTouch_:
 	if(mao_request > 1) warp "que_job01",61,50;
 	else
 	{
@@ -2362,12 +2345,7 @@ OnTouch:
 	}
 }
 
-que_job01,65,50,1	script	#maobar4-2	45,2,2,{
-
-OnTouch:
-	warp "que_job01",84,77;
-	end;
-}
+que_job01,65,50,1	warp	#maobar4-2	2,2,que_job01,84,77
 
 que_job01,81,79,5	script	Idle Knight	733,{
 
@@ -2726,7 +2704,7 @@ que_job01,49,49,5	script	Tao	877,{
 
 que_job01,51,55,1	script	#roombar1	45,1,1,{
 
-OnTouch:
+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)
 	{
 		if(!$@maobar_room)
@@ -2837,14 +2815,14 @@ OnEnter:
 	enablenpc "#maobar7";
 	end;
 	
-OnTouch:
+OnTouch_:
 	warp "que_job01",52,50;
 	end;
 }
 
 que_job01,51,44,1	script	#roombar2	45,1,1,{
 
-OnTouch:
+OnTouch_:
 	if(mao_request == 25 || (mao_request > 102 && mao_request < 123))
 	{
 		if(mao_request == 121)
@@ -2966,7 +2944,7 @@ OnEnter:
 	enablenpc "#maobar7";
 	end;
 	
-OnTouch:
+OnTouch_:
 	warp "que_job01",52,50;
 	end;
 }
@@ -2981,14 +2959,14 @@ OnEnter:
 	enablenpc "#maobar8";
 	end;
 	
-OnTouch:
+OnTouch_:
 	warp "que_job01",52,50;
 	end;
 }
 
 que_job01,11,4,1	script	#maoexit1	45,1,1,{
 
-OnTouch:
+OnTouch_:
 	warp "que_job01",52,50;
 	donpcevent "#maobartimer1::OnStop";
 	end;
@@ -2996,7 +2974,7 @@ OnTouch:
 
 que_job01,80,27,1	script	#maoexit2	45,1,1,{
 
-OnTouch:
+OnTouch_:
 	warp "que_job01",52,50;
 	donpcevent "#maobartimer2::OnStop";
 	end;
@@ -3004,7 +2982,7 @@ OnTouch:
 
 que_job01,144,61,1	script	#maoexit3	45,1,1,{
 
-OnTouch:
+OnTouch_:
 	warp "que_job01",52,50;
 	donpcevent "#maobartimer2::OnStop";
 	end;

npc/quests/eye_of_hellion.txt

@@ -661,7 +661,7 @@ morocc_in,116,101,3	script	Old Scholar Tyus#hellion	735,3,3,{
 	mes "... ... ...";
 	close;
 
-OnTouch:
+OnTouch_:
 	if (HELLIONQ == 57 && countitem(7334) > 0) {
 		specialeffect2 EF_HEAL2; 
 		specialeffect EF_HEAL2;
@@ -1075,7 +1075,7 @@ prontera,223,82,0	script	#prt_key-1	111,{
 }
 
 prontera,45,67,0	script	 #prt_key-1-1	111,1,1,{
-OnTouch:
+OnTouch_:
 	if (HELLIONQ == 40 || HELLIONQ == 41) {
 		mes "[" + strcharinfo(0) + "]";
 		mes "Well, according to the";
@@ -1604,7 +1604,7 @@ payon,182,132,3	script	Grout'he Tuccok#hellion	48,{
 }
 
 payon,101,190,0	script	 #paypuzz1	-1,1,1,{
-OnTouch:
+OnTouch_:
 	if (HELLIONQ == 48) {
 		mes "[" + strcharinfo(0) + "]";
 		mes "Well, this is where";
@@ -1878,7 +1878,7 @@ pay_arche,142,28,0	script	Buddha Statue#paypuzz6	111,5,5,{
 		}
 	}
 
-OnTouch:
+OnTouch_:
 	if (HELLIONQ == 56 && countitem(7333) > 0) {
 		specialeffect2 EF_HEAL2;
 		specialeffect EF_HEAL2;
@@ -2247,7 +2247,7 @@ geffen,110,200,3	script	Sage Welshyun#hellion	754,3,3,{
 		close;
 	}
 
-OnTouch:
+OnTouch_:
 	if (HELLIONQ == 58 && countitem(7335) > 0) {
 		specialeffect2 EF_HEAL2;
 		specialeffect EF_HEAL2;
@@ -2426,7 +2426,7 @@ gef_fild09,296,59,0	script	Hidden Cave#hellion	111,3,3,{
 		close;
 	}
 
-OnTouch:
+OnTouch_:
 	if (HELLIONQ == 68 && countitem(7332) > 0) {
 		specialeffect2 EF_HEAL2;
 		specialeffect EF_HEAL2;

npc/quests/first_class/tu_acolyte.txt

@@ -1275,7 +1275,7 @@ prt_monk,28,260,5	script	Hedrick	1_M_04,{
 // Weapon Merchant
 //============================================================
 prt_monk,136,261,0	script	Weapon Merchant#tu	HIDDEN_WARP_NPC,9,9,{
-OnTouch:
+OnTouch_:
 	if(tu_acolyte01 != 20 || countitem(1081) == 0) end;// Merchant_Box_1
 	mes "[Weapon Merchant]";
 	mes "The stuff I requested from the guild is finally here!";

npc/quests/kiel_hyre_quest.txt

@@ -808,7 +808,7 @@ kh_school,57,142,6	script	Student#kha	893,3,3,{
 	mes "a new faculty member, are you?";
 	close;
 
-OnTouch:
+OnTouch_:
 	mes "[Laci]";
 	mes "Hey, Nesha...!";
 	mes "have you heard why";
@@ -5158,8 +5158,8 @@ OnTouch:
 // - Anyone can enter
 // - After 30-40 seonds this NPC should be disabled.
 //----------------------------------------------------------------------------
-kh_mansion,29,27,0	script	Kiehl_Room_Warp	45,2,2,{
-OnTouch:
+kh_mansion,27,27,0	script	Kiehl_Room_Warp	45,2,2,{
+OnTouch_:
 	warp "kh_kiehl01",10,31;
 	end;
 
@@ -5445,7 +5445,7 @@ yuno,250,132,0	script	Old Lady#kh	711,{
 // Warp portal into Rosimier Mansion
 //----------------------------------------------------------------------------
 yuno,273,141,0	script	Rosimmir_Entrance	45,2,2,{
-OnTouch:
+OnTouch_:
 	if (countitem(7498) < 1) {
 		mes "That mansion seems to have";
 		mes "been destroyed by the time.";
@@ -6088,7 +6088,7 @@ OnTimer30000:
 	set getvariableofnpc(.KHDoor1Opened,"Big Door#BigDoorKHQ1"),0;
 	end;
 
-OnTouch:
+OnTouch_:
 	warp "kh_kiehl01",55,33;
 	end;
 }
@@ -6131,7 +6131,7 @@ kh_kiehl01,174,40,0	script	Big Door#BigDoorKHQ2	111,{
 	}
 }
 
-kh_kiehl01,174,39,0	script	Big_Door_2_Warp	45,1,1,{
+kh_kiehl01,173,39,0	script	Big_Door_2_Warp	45,1,1,{
 OnEnable:
 	initnpctimer;
 	specialeffect EF_SUMMONSLAVE;
@@ -6148,8 +6148,11 @@ OnTimer30000:
 	set getvariableofnpc(.KHDoor2Opened,"Big Door#BigDoorKHQ2"),0;
 	end;
 
-OnTouch:
-	warp "kh_kiehl01",173,52;
+OnTouch_:
+	if (KielHyreQuest == 48)
+		warp "kh_kiehl01",173,35;
+	else
+		warp "kh_kiehl01",173,52;
 	end;
 }
 
@@ -6191,7 +6194,7 @@ kh_kiehl01,77,108,0	script	Big Door#BigDoorKHQ3	111,{
 	}
 }
 
-kh_kiehl01,78,108,0	script	Big_Door_3_Warp	45,1,1,{
+kh_kiehl01,78,107,0	script	Big_Door_3_Warp	45,1,1,{
 OnEnable:
 	initnpctimer;
 	specialeffect EF_SUMMONSLAVE;
@@ -6208,8 +6211,11 @@ OnTimer30000:
 	set getvariableofnpc(.KHDoor3Opened,"Big Door#BigDoorKHQ3"),0;
 	end;
 
-OnTouch:
-	warp "kh_kiehl01",68,108;
+OnTouch_:
+	if (KielHyreQuest == 49)
+		warp "kh_kiehl01",82,108;
+	else
+		warp "kh_kiehl01",68,108;
 	end;
 }
 
@@ -6251,7 +6257,7 @@ kh_kiehl01,42,177,0	script	Big Door#BigDoorKHQ4	111,{
 	}
 }
 
-kh_kiehl01,41,177,0	script	Big_Door_4_Warp	45,1,1,{
+kh_kiehl01,41,178,0	script	Big_Door_4_Warp	45,1,1,{
 OnEnable:
 	initnpctimer;
 	specialeffect EF_SUMMONSLAVE;
@@ -6268,8 +6274,11 @@ OnTimer30000:
 	set getvariableofnpc(.KHDoor4Opened,"Big Door#BigDoorKHQ4"),0;
 	end;
 
-OnTouch:
-	warp "kh_kiehl01",49,177;
+OnTouch_:
+	if (KielHyreQuest == 50)
+		warp "kh_kiehl01",38,178;
+	else
+		warp "kh_kiehl01",47,171;
 	end;
 }
 
@@ -6479,7 +6488,7 @@ OnInit:
 	disablenpc "Big_Door_5_Warp";
 	end;
 
-OnTouch:
+OnTouch_:
 	if (KielHyreQuest >= 46)
 		warp "kh_kiehl02",50,7;
 	else
@@ -7095,11 +7104,11 @@ OnInit:
 //----------------------------------------------------------------------------
 // Kiehl's Room; Kiehl_Room_Exit
 //----------------------------------------------------------------------------
-kh_kiehl02,50,59,0	script	Kiehl_Room_Exit	45,1,1,{
-OnTouch:
+kh_kiehl02,49,56,0	script	Kiehl_Room_Exit	45,1,1,{
+OnTouch_:
 	if (getmapusers("kh_kiehl02") < 1)
 		donpcevent "KiehlRoom::OnReset";
-	warp "lighthalzen",193,202;
+	warp "lighthalzen",193,200;
 	end;
 
 OnEnable:

npc/quests/newgears/2004_headgears.txt

@@ -2462,7 +2462,7 @@ OnInit:
 	disablenpc "Nine Tails#Kitsune Mask";
 	end;
 
-OnTouch:
+OnTouch_:
 	mes "[Nine Tails]";
 	mes "Yelp! Yelp yelp!";
 	mes "Yelp! Yelp yelp!";
@@ -2633,7 +2633,7 @@ OnMyMobDead2:
 // Orc Hero Helmet
 //============================================================
 in_orcs01,31,93,1	script	Orc Warrior#1	1023,2,2,{
-OnTouch:
+OnTouch_:
 	disable_items;
 	if (checkweight(1201,1) == 0) {
 		mes "- Wait a minute !! -";
@@ -3504,7 +3504,7 @@ OnTouch:
 }
 
 in_orcs01,162,33,1	script	Orc Hero#1	1087,2,2,{
-OnTouch:
+OnTouch_:
 	if (checkweight(1201,1) == 0) {
 		mes "- Wait a minute !! -";
 		mes "- Currently you're carrying -";

npc/quests/okolnir.txt

@@ -370,7 +370,7 @@ que_qsch05,345,82,3	duplicate(Wish Maiden#gq_main)	Wish Maiden#gq_sch05	403
 	function	SMonster;
 	set .@sub$, callfunc("F_Okolnir");
 	
-OnTouch:
+OnTouch_:
 	set .@sub$, callfunc("F_Okolnir");
 	set .@saram,getmapusers("que_q"+.@sub$);
 	if (.@saram < 21) {
@@ -937,7 +937,7 @@ que_qsch05,2,3,0	duplicate(#miro_yf_main)	#miro_yf_sch05	844
 -	script	windpath01_main	-1,{
 	end;
 	
-OnTouch:
+OnTouch_:
 	set .@sub$,callfunc("F_Okolnir");
 	if (countitem(7839)) {
 		mes "The Warp Gate responds to the Crystal Key.";
@@ -1005,7 +1005,7 @@ OnDisable:
 	stopnpctimer;
 	end;
 
-OnTouch:
+OnTouch_:
 	initnpctimer;
 	set .@sub$,callfunc("F_Okolnir");
 	disablenpc "#event_start01_"+.@sub$;
@@ -1276,7 +1276,7 @@ OnDisable:
 	disablenpc "#getspell0"+.@c+"_"+.@sub$;
 	end;
 
-OnTouch:
+OnTouch_:
 	set .@sub$,callfunc("F_Okolnir");
 	sc_start SC_Stone,300000,0,10000;
 	switch (getd("$@gqse_"+.@sub$+"_gd")) {
@@ -1387,7 +1387,7 @@ que_qsch05,146,121,0	duplicate(#getspells_main)	#getspell08_sch05	-1,1,1
 -	script	#main_cages	-1,{
 	end;
 	
-OnTouch:
+OnTouch_:
 	set .@sub$,callfunc("F_Okolnir");
 	sc_end SC_Stone;
 	setarray .@n, 108,151,107,135,113,114,158,106,163,133,150,154;
@@ -1513,7 +1513,7 @@ que_qsch05,1,8,0	duplicate(#gd_main_mobctrl)	#gd_sch05_mobctrl	844
 -	script	windpaths_main	-1,{
 	end;
 	
-OnTouch:
+OnTouch_:
 	set .@sub$,callfunc("F_Okolnir");
 	if (compare(strnpcinfo(0),"windpath03")) {
 		warp "que_q"+.@sub$,119,103;
@@ -1553,7 +1553,7 @@ que_qsch05,128,104,0	duplicate(windpaths_main)	windpath04_sch05	45,1,1
 -	script	#nm_switch_main	-1,{
 	end;
 	
-OnTouch:
+OnTouch_:
 	set .@sub$,callfunc("F_Okolnir");
 	disablenpc "#nm_switch_"+.@sub$;
 	initnpctimer;
@@ -1886,7 +1886,7 @@ que_qsch05,2,10,0	duplicate(#main_stone03)	#sch05_stone03	844
 -	script	Guard of Shadow#main_all	-1,{
 	end;
 	
-OnTouch:
+OnTouch_:
 	set .@sub$,callfunc("F_Okolnir");
 	set .@in, charat(strnpcinfo(2),getstrlen(strnpcinfo(2))-1);
 	disablenpc "Guard of Shadow#"+.@sub$+"_0"+.@in;
@@ -1960,7 +1960,7 @@ que_qsch05,225,303,5	duplicate(Guard of Shadow#main_all)	Guard of Shadow#sch05_0
 -	script	Bloody Hunter#main_all	-1,{
 	end;
 	
-OnTouch:
+OnTouch_:
 	set .@sub$,callfunc("F_Okolnir");
 	set .@in, charat(strnpcinfo(2),getstrlen(strnpcinfo(2))-1);
 	disablenpc "Bloody Hunter#"+.@sub$+"_ac0"+.@in;
@@ -2034,7 +2034,7 @@ que_qsch05,279,300,3	duplicate(Bloody Hunter#main_all)	Bloody Hunter#sch05_ac04
 -	script	Temple Keeper#main_all	-1,{
 	end;
 	
-OnTouch:
+OnTouch_:
 	set .@sub$,callfunc("F_Okolnir");
 	set .@in, charat(strnpcinfo(2),getstrlen(strnpcinfo(2))-1);
 	disablenpc "Temple Keeper#"+.@sub$+"_ac0"+.@in;
@@ -2273,7 +2273,7 @@ que_qsch05,252,340,3	duplicate(Wish Maiden#main_gift)	Wish Maiden#sch05_gift	403
 -	script	#to_agit_main_gate	-1,{
 	end;
 	
-OnTouch:
+OnTouch_:
 	set .@t$, ((compare(strnpcinfo(4),"aru"))?"arug_cas0":"schg_cas0")+(charat(strnpcinfo(4),getstrlen(strnpcinfo(4))-1));
 	warp .@t$,157,369;
 	end;

npc/quests/quests_13_1.txt

@@ -3095,7 +3095,7 @@ mid_camp,264,263,4	script	Diego#ep13bs	931,{
 mid_campin,291,128,1	script	#ep13bs	111,1,1,{
 	end;
 
-OnTouch:
+OnTouch_:
 	if (ep13_newbs < 4) {
 		mes "- It's a neat and tidy bed -";
 		mes "- It seems that nobody used it. -";
@@ -4742,7 +4742,7 @@ mid_camp,52,148,1	script	Dirt#ep13	844,{
 }
 
 man_fild01,59,261,0	script	#evt_lumis	-1,5,5,{
-OnTouch:
+OnTouch_:
 	if (ep13_animal == 11) {
 		mes "[Rumis Block]";
 		mes "This is it! Come to the small tree in the southeast direction!";
@@ -4982,7 +4982,7 @@ mid_camp,212,237,5	script	Camp Guard Captain#man1	852,{
 // The Tripartite Union's Feud :: ep13_1_rhea
 //============================================================ 
 mid_campin,376,120,0	script	Research Official#ep131	754,3,3,{
-OnTouch:
+OnTouch_:
 	if (checkweight(1201,1) == 0 || MaxWeight - Weight < 3500) {
 		mes "[United Research Official]";
 		mes "How come you've got so much to carry?";
@@ -11978,7 +11978,7 @@ morocc,43,108,5	script	Sharp-Looking Boy#dan_07	82,{
 }
 
 morocc,45,110,0	script	que_job01#01	45,2,2,{
-OnTouch:
+OnTouch_:
 	if (BaseClass == Job_Assassin) {
 		warp "que_job01",9,94;
 		end;
@@ -12205,7 +12205,7 @@ que_job01,82,95,3	script	Bar Master#moc2_01	46,{
 }
 
 que_job01,80,77,0	script	que_job01#04	45,2,2,{
-OnTouch:
+OnTouch_:
 	if (BaseClass == Job_Assassin || mao_request > 0 || mao_morocc2 > 4) {
 		warp "que_job01",61,50;
 		end;
@@ -12413,7 +12413,7 @@ OnReset:
 	set $@moc_mao_room1,0; //Global Variable
 	end;
 
-OnTouch:
+OnTouch_:
 	mes "[Tao]";
 	if (prt_curse == 24) {
 		if ($@moc_mao_room1 == 0) {
@@ -12513,13 +12513,13 @@ OnEnable:
 	enablenpc "#room1_warp13";
 	end;
 
-OnTouch:
+OnTouch_:
 	warp "que_job01",52,50;
 	end;
 }
 
 que_job01,11,4,0	script	que_job01#room1_out	45,1,1,{
-OnTouch:
+OnTouch_:
 	warp "que_job01",52,50;
 	donpcevent " #room1timer::OnStop";
 	end;
@@ -12573,7 +12573,7 @@ OnReset:
 	set $@moc_mao_room2,0; //Global Variable
 	end;
 
-OnTouch:
+OnTouch_:
 	if ((mao_morocc2 > 4) && (mao_morocc2 < 10)) {
 		if ($@moc_mao_room2 == 0) {
 			set $@moc_mao_room2,1; //Global Variable
@@ -12696,7 +12696,7 @@ OnEnable:
 	enablenpc "#room2_1_warp";
 	end;
 
-OnTouch:
+OnTouch_:
 	warp "que_job01",52,50;
 	end;
 }
@@ -12711,20 +12711,20 @@ OnEnable:
 	enablenpc "#room2_2_warp";
 	end;
 
-OnTouch:
+OnTouch_:
 	warp "que_job01",52,50;
 	end;
 }
 
 que_job01,80,27,0	script	que_job01#room2_1_out	45,1,1,{
-OnTouch:
+OnTouch_:
 	warp "que_job01",52,50;
 	donpcevent " #room2timer::OnStop";
 	end;
 }
 
 que_job01,144,61,0	script	que_job01#room2_2_out	45,1,1,{
-OnTouch:
+OnTouch_:
 	warp "que_job01",52,50;
 	donpcevent " #room2timer::OnStop";
 	end;
@@ -13434,7 +13434,7 @@ OnStop:
 	stopnpctimer;
 	end;
 
-OnTouch:
+OnTouch_:
 	if (mao_morocc2 == 10) {
 		disablenpc "#moc2_event_on";
 		donpcevent "#moc2_event01::OnEnable";
@@ -13491,7 +13491,7 @@ OnEnable:
 	enablenpc "#moc2_event01";
 	end;
 
-OnTouch:
+OnTouch_:
 	soundeffect "wander_man_move.wav",1;
 	sc_start sc_blind,600000,0;
 	mes "As soon as you touched the crystal,";

npc/quests/quests_13_2.txt

@@ -2538,7 +2538,7 @@ spl_in02,236,92,5	script	Arc#ep13md_l02	447,{
 spl_in02,239,93,3	duplicate(Arc#ep13md_l02)	Terra#ep13md_l03	441
 
 splendide,287,140,0	script	terrashome_in	45,1,1,{
-OnTouch:
+OnTouch_:
 	if (ep13_mdrama > 25) {
 		warp "spl_in02",237,89;
 		end;
@@ -3385,7 +3385,7 @@ OnDisable:
 	disablenpc "Egg Keeper Draco#13_1";
 	end;
 
-OnTouch:
+OnTouch_:
 	disablenpc "Egg Keeper Draco#13_1";
 	monster "nyd_dun02",201,157,"Egg Keeper Draco",2013,1,"Egg Keeper Draco#13_3::OnMyMobDead";
 	end;
@@ -3402,7 +3402,7 @@ OnDisable:
 	disablenpc "Egg Keeper Draco#13_2";
 	end;
 
-OnTouch:
+OnTouch_:
 	disablenpc "Egg Keeper Draco#13_2";
 	monster "nyd_dun02",206,157,"Egg Keeper Draco",2013,1,"Egg Keeper Draco#13_4::OnMyMobDead";
 	end;
@@ -3453,7 +3453,7 @@ OnReset:
 	killmonster "nyd_dun02","Stranger#ep13_2_dan03::OnMyMobDead";
 	end;
 
-OnTouch:
+OnTouch_:
 	emotion e_gasp,1;
 	emotion e_omg;
 	disablenpc "Stranger#ep13_2_dan01";
@@ -3481,7 +3481,7 @@ OnReset:
 	killmonster "nyd_dun02","Stranger#ep13_2_dan04::OnMyMobDead";
 	end;
 
-OnTouch:
+OnTouch_:
 	emotion e_gasp,1;
 	emotion e_omg;
 	disablenpc "Stranger#ep13_2_dan02";
@@ -4858,7 +4858,7 @@ function	script	find_13_2	{
 -	script	mjo_no_find	-1,{
 	end;
 
-OnTouch:
+OnTouch_:
 	callfunc "find_13_2",0,0;
 	end;
 }
@@ -4930,7 +4930,7 @@ OnInit:
 	enablenpc strnpcinfo(0);
 	end;
 
-OnTouch:
+OnTouch_:
 	if (ep13_2_tre == 2 && countitem(6076) == 1 && countitem(6077) < 10)
 		specialeffect EF_COUPLECASTING;
 	end;
@@ -4948,7 +4948,7 @@ mjolnir_10,188,260,3	duplicate(mjo_find)	#mj10_01	111,10,10
 mjolnir_01,364,256,0	script	#mj01_find	-1,5,5,{
 	end;
 
-OnTouch:
+OnTouch_:
 	callfunc "find_13_2",0,1;
 	viewpoint 1,32,309,1,0x00FF00;
 	viewpoint 1,217,34,2,0x00FF00;
@@ -4982,7 +4982,7 @@ OnTimer60000:
 mjolnir_02,313,289,0	script	#mj02_find_1	-1,5,5,{
 	end;
 
-OnTouch:
+OnTouch_:
 	callfunc "find_13_2",0,1;
 	viewpoint 1,90,195,1,0x00FF00;
 	viewpoint 1,206,187,2,0x00FF00;
@@ -4992,7 +4992,7 @@ OnTouch:
 mjolnir_02,78,258,0	script	#mj02_find_2	-1,5,5,{
 	end;
 
-OnTouch:
+OnTouch_:
 	callfunc "find_13_2",0,1;
 	viewpoint 1,90,195,1,0x00FF00;
 	viewpoint 1,206,187,2,0x00FF00;
@@ -5025,7 +5025,7 @@ OnTimer60000:
 mjolnir_04,147,208,0	script	#mj04_find_1	-1,5,5,{
 	end;
 
-OnTouch:
+OnTouch_:
 	callfunc "find_13_2",0,1;
 	viewpoint 1,125,380,1,0x00FF00;
 	viewpoint 1,220,130,2,0x00FF00;
@@ -5035,7 +5035,7 @@ OnTouch:
 mjolnir_04,160,77,0	script	#mj04_find_2	-1,5,5,{
 	end;
 
-OnTouch:
+OnTouch_:
 	callfunc "find_13_2",0,1;
 	viewpoint 1,125,380,1,0x00FF00;
 	viewpoint 1,220,130,2,0x00FF00;
@@ -5045,7 +5045,7 @@ OnTouch:
 mjolnir_04,361,174,0	script	#mj04_find_3	-1,5,5,{
 	end;
 
-OnTouch:
+OnTouch_:
 	callfunc "find_13_2",0,1;
 	viewpoint 1,125,380,1,0x00FF00;
 	viewpoint 1,220,130,2,0x00FF00;
@@ -5077,7 +5077,7 @@ OnTimer60000:
 mjolnir_09,201,355,0	script	#mj09_find_1	-1,5,5,{
 	end;
 
-OnTouch:
+OnTouch_:
 	callfunc "find_13_2",0,1;
 	viewpoint 1,229,214,1,0x00FF00;
 	close;
@@ -5086,7 +5086,7 @@ OnTouch:
 mjolnir_09,38,243,0	script	#mj09_find_2	-1,5,5,{
 	end;
 
-OnTouch:
+OnTouch_:
 	callfunc "find_13_2",0,1;
 	viewpoint 1,229,214,1,0x00FF00;
 	close;
@@ -5095,7 +5095,7 @@ OnTouch:
 mjolnir_09,106,36,0	script	#mj09_find_3	-1,5,5,{
 	end;
 
-OnTouch:
+OnTouch_:
 	callfunc "find_13_2",0,1;
 	viewpoint 1,229,214,1,0x00FF00;
 	close;
@@ -5104,7 +5104,7 @@ OnTouch:
 mjolnir_09,306,36,0	script	#mj09_find_4	-1,5,5,{
 	end;
 
-OnTouch:
+OnTouch_:
 	callfunc "find_13_2",0,1;
 	viewpoint 1,229,214,1,0x00FF00;
 	close;
@@ -5113,7 +5113,7 @@ OnTouch:
 mjolnir_09,369,279,0	script	#mj09_find_5	-1,5,5,{
 	end;
 
-OnTouch:
+OnTouch_:
 	callfunc "find_13_2",0,1;
 	viewpoint 1,229,214,1,0x00FF00;
 	close;
@@ -5133,7 +5133,7 @@ OnTimer60000:
 mjolnir_10,201,355,0	script	#mj10_find_1	-1,5,5,{
 	end;
 
-OnTouch:
+OnTouch_:
 	callfunc "find_13_2",0,1;
 	viewpoint 1,188,260,1,0x00FF00;
 	close;
@@ -5142,7 +5142,7 @@ OnTouch:
 mjolnir_10,374,215,0	script	#mj10_find_2	-1,5,5,{
 	end;
 
-OnTouch:
+OnTouch_:
 	callfunc "find_13_2",0,1;
 	viewpoint 1,188,260,1,0x00FF00;
 	close;
@@ -5151,7 +5151,7 @@ OnTouch:
 mjolnir_10,272,20,0	script	#mj10_find_3	-1,5,5,{
 	end;
 
-OnTouch:
+OnTouch_:
 	callfunc "find_13_2",0,1;
 	viewpoint 1,188,260,1,0x00FF00;
 	close;
@@ -5160,7 +5160,7 @@ OnTouch:
 mjolnir_10,75,22,0	script	#mj10_find_4	-1,5,5,{
 	end;
 
-OnTouch:
+OnTouch_:
 	callfunc "find_13_2",0,1;
 	viewpoint 1,188,260,1,0x00FF00;
 	close;
@@ -5169,7 +5169,7 @@ OnTouch:
 mjolnir_10,27,258,0	script	#mj10_find_5	-1,5,5,{
 	end;
 
-OnTouch:
+OnTouch_:
 	callfunc "find_13_2",0,1;
 	viewpoint 1,229,214,1,0x00FF00;
 	close;
@@ -5189,7 +5189,7 @@ OnTimer60000:
 hu_fild05,335,152,0	script	#hu_find_1	-1,5,5,{
 	end;
 
-OnTouch:
+OnTouch_:
 	callfunc "find_13_2",1,1;
 	viewpoint 1,251,345,1,0x00FF00;
 	viewpoint 1,134,322,2,0x00FF00;
@@ -5202,7 +5202,7 @@ OnTouch:
 hu_fild05,89,52,0	script	#hu_find_2	-1,5,5,{
 	end;
 
-OnTouch:
+OnTouch_:
 	callfunc "find_13_2",1,1;
 	viewpoint 1,251,345,1,0x00FF00;
 	viewpoint 1,134,322,2,0x00FF00;
@@ -5215,7 +5215,7 @@ OnTouch:
 hu_fild05,42,205,0	script	#hu_find_3	-1,5,5,{
 	end;
 
-OnTouch:
+OnTouch_:
 	callfunc "find_13_2",1,1;
 	viewpoint 1,251,345,1,0x00FF00;
 	viewpoint 1,134,322,2,0x00FF00;
@@ -5228,7 +5228,7 @@ OnTouch:
 hu_fild05,276,349,0	script	#hu_find_4	-1,5,5,{
 	end;
 
-OnTouch:
+OnTouch_:
 	callfunc "find_13_2",1,1;
 	viewpoint 1,251,345,1,0x00FF00;
 	viewpoint 1,134,322,2,0x00FF00;
@@ -5280,7 +5280,7 @@ OnInit:
 	enablenpc strnpcinfo(0);
 	end;
 
-OnTouch:
+OnTouch_:
 	if (ep13_2_tre == 3 && countitem(6076) == 1 && countitem(6077) < 5)
 		specialeffect EF_COUPLECASTING;
 	end;
@@ -5350,7 +5350,7 @@ OnTimer60000:
 ve_fild03,351,219,0	script	#ve_find_1	-1,3,3,{
 	end;
 
-OnTouch:
+OnTouch_:
 	callfunc "find_13_2",2,1;
 	viewpoint 1,152,134,1,0x00FF00;
 	viewpoint 1,256,228,2,0x00FF00;
@@ -5362,7 +5362,7 @@ OnTouch:
 ve_fild03,223,51,0	script	#ve_find_2	-1,5,5,{
 	end;
 
-OnTouch:
+OnTouch_:
 	callfunc "find_13_2",2,1;
 	viewpoint 1,152,134,1,0x00FF00;
 	viewpoint 1,256,228,2,0x00FF00;
@@ -5413,7 +5413,7 @@ OnInit:
 	enablenpc strnpcinfo(0);
 	end;
 
-OnTouch:
+OnTouch_:
 	if (ep13_2_tre == 4 && countitem(6076) == 1 && countitem(6077) < 5)
 		specialeffect EF_COUPLECASTING;
 	end;
@@ -6915,7 +6915,7 @@ nyd_dun02,178,255,0	script	Strange Device#ep13_out	844,3,3,{
 			close;
 	}
 
-OnTouch:
+OnTouch_:
 	specialeffect EF_LEVEL99_4;
 	end;
 }
@@ -6971,7 +6971,7 @@ OnTimer70000:
 	stopnpctimer;
 	end;
 
-OnTouch:
+OnTouch_:
 	specialeffect EF_LEVEL99_4;
 	end;
 }
@@ -7055,7 +7055,7 @@ OnDisable:
 }
 
 -	script	ep13_warp_w_0	-1,{
-OnTouch:
+OnTouch_:
 	warp "nyd_dun01",214,68;
 	end;
 }
@@ -7132,7 +7132,7 @@ OnEnable:
 	enablenpc "ep13_warp_22_2";
 	end;
 
-OnTouch:
+OnTouch_:
 	donpcevent "ep13_warp_31::OnEnable";
 	donpcevent "ep13_warp_41::OnEnable";
 	donpcevent "ep13_warp_42::OnEnable";
@@ -7147,7 +7147,7 @@ OnEnable:
 	enablenpc "ep13_warp_24_2";
 	end;
 
-OnTouch:
+OnTouch_:
 	if (rand(2)) {
 		donpcevent "ep13_warp_33::OnEnable";
 		donpcevent "ep13_warp_43::OnEnable";
@@ -7176,7 +7176,7 @@ OnEnable:
 	enablenpc "ep13_warp_43_2";
 	end;
 
-OnTouch:
+OnTouch_:
 	donpcevent "ep13_warp_52::OnEnable";
 	donpcevent "ep13_warp_61::OnEnable";
 	donpcevent "ep13_warp_61_2::OnEnable";
@@ -7194,7 +7194,7 @@ OnEnable:
 	enablenpc "ep13_warp_45_2";
 	end;
 
-OnTouch:
+OnTouch_:
 	donpcevent "ep13_warp_46::OnEnable";
 	donpcevent "ep13_warp_55::OnEnable";
 	donpcevent "ep13_warp_56::OnEnable";
@@ -7214,7 +7214,7 @@ OnEnable:
 	enablenpc "ep13_warp_61_2";
 	end;
 
-OnTouch:
+OnTouch_:
 	donpcevent "ep13_warp_62::OnEnable";
 	donpcevent "ep13_warp_71::OnEnable";
 	donpcevent "ep13_warp_72::OnEnable";
@@ -7229,7 +7229,7 @@ OnEnable:
 	enablenpc "ep13_warp_65_2";
 	end;
 
-OnTouch:
+OnTouch_:
 	if (rand(2)) {
 		donpcevent "ep13_warp_64::OnEnable";
 		donpcevent "ep13_warp_73::OnEnable";
@@ -7260,7 +7260,7 @@ OnEnable:
 	enablenpc "ep13_warp_81_2";
 	end;
 
-OnTouch:
+OnTouch_:
 	donpcevent "ep13_warp_91::OnEnable";
 	donpcevent "ep13_warp_92::OnEnable";
 	donpcevent "ep13_warp_93::OnEnable";
@@ -7279,7 +7279,7 @@ OnEnable:
 	enablenpc "ep13_warp_83_2";
 	end;
 
-OnTouch:
+OnTouch_:
 	donpcevent "ep13_warp_84::OnEnable";
 	donpcevent "ep13_warp_94::OnEnable";
 	donpcevent "ep13_warp_e2::OnEnable";
@@ -7297,7 +7297,7 @@ OnEnable:
 	enablenpc "ep13_warp_85_2";
 	end;
 
-OnTouch:
+OnTouch_:
 	donpcevent "ep13_warp_95::OnEnable";
 	donpcevent "ep13_warp_e3::OnEnable";
 	donpcevent "ep13_warp_85_2::OnEnable";

npc/quests/quests_airship.txt

@@ -504,7 +504,7 @@ airplane,47,61,7	script	Crewman	4_M_ZONDAOYAJI,{
 // Empty Room 201
 //----------------------------------------------------------------------------
 ein_in01,227,279,3	script	#door_ein	-1,5,5,{
-OnTouch:
+OnTouch_:
 	if (kain_ticket == 5) {
 		kain_ticket = 6;
 		mes "["+strcharinfo(0)+"]";
@@ -554,7 +554,7 @@ OnTouch:
 // Elle Cherno
 //----------------------------------------------------------------------------
 ein_in01,261,241,3	script	Elle Cherno	4_F_KID2,3,3,{
-OnTouch:
+OnTouch_:
 	mes "[Elle Cherno]";
 	mes "Let's get to work";
 	mes "fear-less comraaades~!";
@@ -3136,7 +3136,7 @@ airplane,33,69,4	script	Kaci	1_F_MERCHANT_01,{
 
 ein_in01,279,25,0	script	#lab01_heart	HIDDEN_WARP_NPC,1,1,{
 	end;
-OnTouch:
+OnTouch_:
 	if (lhz_heart == 9) {
 		mes "["+strcharinfo(0)+"]";
 		mes "(^333333I've... I've just";
@@ -3150,7 +3150,7 @@ OnTouch:
 
 ein_in01,264,17,0	script	#lab02_heart	HIDDEN_WARP_NPC,1,1,{
 	end;
-OnTouch:
+OnTouch_:
 	if (lhz_heart == 9) {
 		mes "["+strcharinfo(0)+"]";
 		mes "What the...";
@@ -3186,7 +3186,7 @@ OnInit:
 
 ein_in01,261,35,0	script	lab03#heart	HIDDEN_WARP_NPC,1,1,{
 	end;
-OnTouch:
+OnTouch_:
 	if (lhz_heart == 9) {
 		mes "[Security System]";
 		mes "^FF0000Unauthorized person";

npc/quests/quests_alberta.txt

@@ -2047,7 +2047,7 @@ tur_dun03,105,76,4	script	Knight Leader#tur	110,5,5,{
 		close;
 	}
 
-OnTouch:
+OnTouch_:
 	mes "[Scared Voice]";
 	mes "Wh-wh-whaat?!";
 	next;

npc/quests/quests_amatsu.txt

@@ -387,7 +387,7 @@ OnReset:
 }
 
 ama_test,34,25,0	script	Hanako chan#ama	-1,2,2,{
-OnTouch:
+OnTouch_:
 	mes "[Hanako chan]";
 	mes ".......Eeeeheeheehee";
 	mes ".....................";
@@ -418,7 +418,7 @@ OnInit:
 	disablenpc "Grandma#ama1";
 	end;
 
-OnTouch:
+OnTouch_:
 	mes "[Grandma]";
 	mes "Arrrk!!!";
 	next;
@@ -662,7 +662,7 @@ OnInit:
 	disablenpc "Coach#ama";
 	end;
 
-OnTouch:
+OnTouch_:
 	mes "[Coach]";
 	mes "Boom bam Boooom!!!";
 	mes "Tada~~~ !";
@@ -713,7 +713,7 @@ OnInit:
 	disablenpc "Coach#after";
 	end;
 
-OnTouch:
+OnTouch_:
 	mes "[Coach]";
 	mes "( Clap- Clap- Clap- )";
 	next;
@@ -784,7 +784,7 @@ OnInit:
 	disablenpc "backwarp#ama";
 	end;
 
-OnTouch:
+OnTouch_:
 	warp "amatsu",115,95;
 	end;
 }

npc/quests/quests_ayothaya.txt

@@ -418,7 +418,7 @@ ayothaya,233,105,3	script	Powerful-Looking Woman	838,2,2,{
 		}
 	}
 
-OnTouch:
+OnTouch_:
 	if (thai_find == 0) {
 		mes "[Powerful-Looking Woman]";
 		mes "^666666*Sigh...*^000000";
@@ -544,7 +544,7 @@ if (!$@annonactive) {
 		close;
 	}
 
-OnTouch:
+OnTouch_:
 	if (thai_find == 12) {
 		if (!rand(0,2)) {
 			emotion e_gasp,1;
@@ -967,7 +967,7 @@ ayothaya,253,99,3	script	Fisherman	843,{
 }
 
 ayo_dun01,255,62,0	script	AyoFootprint1	139,2,0,{
-OnTouch:
+OnTouch_:
 	if (thai_find == 4) {
 		if (rand(1,3) < 2) {
 			emotion e_gasp,1;
@@ -981,7 +981,7 @@ OnTouch:
 }
 
 ayo_dun01,74,142,0	script	AyoFootprint2	139,2,0,{
-OnTouch:
+OnTouch_:
 	if (thai_find == 5) {
 		if (rand(1,3) < 2) {
 			emotion e_dots,1;
@@ -995,7 +995,7 @@ OnTouch:
 }
 
 ayo_dun01,244,256,2	script	AyoFootprint3	139,2,0,{
-OnTouch:
+OnTouch_:
 	if (thai_find == 6) {
 		if (rand(1,3) < 2) {
 			emotion e_no,1;
@@ -1009,7 +1009,7 @@ OnTouch:
 }
 
 ayo_dun01,17,257,0	script	AyoFootprint4	139,2,0,{
-OnTouch:
+OnTouch_:
 	if (thai_find == 7) {
 		if (rand(1,3) < 2) {
 			emotion e_ic,1;
@@ -1023,7 +1023,7 @@ OnTouch:
 }
 
 ayo_dun02,145,120,0	script	AyoFootprint5	139,2,0,{
-OnTouch:
+OnTouch_:
 	if (thai_find == 8) {
 		if (rand(1,3) < 2) {
 			mes "^3355FFYou find the same footprints";
@@ -1040,7 +1040,7 @@ OnTouch:
 }
 
 ayo_dun02,135,168,0	script	AyoFootprint6	139,0,2,{
-OnTouch:
+OnTouch_:
 	if (thai_find == 9) {
 		if (rand(1,3) == 1) {
 			emotion e_gasp,1;
@@ -1114,7 +1114,7 @@ OnTouch:
 }
 
 ayo_dun02,77,213,0	script	AyoFootprint7	139,1,1,{
-OnTouch:
+OnTouch_:
 	if (thai_find == 10) {
 		if (rand(1,3) < 2) {
 			emotion e_gasp,1;
@@ -1131,7 +1131,7 @@ OnTouch:
 }
 
 ayo_dun02,86,254,0	script	AyoFootprint8	139,1,1,{
-OnTouch:
+OnTouch_:
 	if (thai_find == 11) {
 		if (rand(1,3) < 2) {
 			emotion e_gasp,1;
@@ -1927,7 +1927,7 @@ ayo_dun01,273,26,0	script	 #th_dun1_1_1::AyoTrap1	111,0,4,{
 	mes "^2F2F4Fyou might get killed.^000000";
 	close;
 
-OnTouch:
+OnTouch_:
 	mes "^3355FFYou look down and see a pool";
 	mes "of water in the distance. It looks like a long drop to the bottom.^000000";
 	next;
@@ -1943,7 +1943,7 @@ ayo_dun01,272,27,0	duplicate(AyoTrap1)	 #th_dun1_1_3	111,0,4
 ayo_dun01,272,26,0	duplicate(AyoTrap1)	 #th_dun1_1_4	111
 
 ayo_dun01,26,27,0	script	 #th_dun1_1::AyoTrap2	-1,1,1,{
-OnTouch:
+OnTouch_:
 	percentheal -100,0;
 	end;
 }
@@ -1962,7 +1962,7 @@ ayo_dun01,25,271,0	duplicate(AyoTrap2)	 #th_dun1_12	-1
 
 // Hints
 ayo_dun01,156,148,0	script	 #hint01::AyoHint	-1,0,4,{
-OnTouch:
+OnTouch_:
 	if (rand(1,100) > 60 && ayodunquest < 11) {
 		mes "^3355FFThe Holy Thread in your pocket suddenly began to glow. You feel that something is near you...^000000";
 		close2;
@@ -2679,7 +2679,7 @@ ayothaya,121,240,7	script	Mr. Jun#ayo	842,1,1,{
 	mes "...";
 	close;
 
-OnTouch:
+OnTouch_:
 	if (MaxWeight - Weight < 2000 || checkweight(1201,1) == 0) {
 		mes "- Wait a minute! -";
 		mes "- Currently you're carrying -";

npc/quests/quests_ein.txt

@@ -3424,7 +3424,7 @@ einbroch,132,84,3	script	Liotzburg#ein	853,2,2,{
 	mes "assure you of that!";
 	close;
 
-OnTouch:
+OnTouch_:
 	if ($EinPolution > 9 && !$@AlrdEinPoll) {
 		mes "[Liotzburg]";
 		mes "What's going on?!";
@@ -5637,7 +5637,7 @@ airplane,31,77,5	script	Drunken Man#ein	853,{
 }
 
 ein_in01,231,170,0	script	#kenka	-1,2,2,{
-OnTouch:
+OnTouch_:
 	if (Shinokas_Quest > 8) {
 		mes "^3355FFThe open window rattles";
 		mes "as you enter the room and";
@@ -5682,7 +5682,7 @@ einbech,57,210,3	script	Young Man#Shinokas_Quest	855,{
 einbroch,51,52,0	script	Security#ein	45,1,1,{
 	end;
 
-OnTouch:
+OnTouch_:
 	if (((Shinokas_Quest == 7) || (lhz_heart == 9)) || (lhz_heart == 10)) {
 		mes "[Security System]";
 		mes "^8B0000*Beep Boop*^000000";
@@ -6517,7 +6517,7 @@ ein_in01,200,101,5	script	Klitzer#ein	854,{
 ein_in01,21,147,3	script	Megass#EIN	853,3,3,{
 	end;
 
-OnTouch:
+OnTouch_:
 	if ((EIN_LOVERQ == 4) && (EIN_LOVERQ == 5)) {
 		mes "[Megass]";
 		mes "You again?!";

npc/quests/quests_gonryun.txt

@@ -3676,7 +3676,7 @@ yuno_in01,99,101,4	script	Doctor#gnbs	744,{
 }
 
 yuno_in01,104,94,0	script	go away#gnbs	139,2,1,{
-OnTouch:
+OnTouch_:
 	if (b_sword < 22) {
 		mes "[??????]";
 		mes "^FF0000What are you doing here?";
@@ -3800,7 +3800,7 @@ gonryun,237,226,3	script	Han Ran Jiao#gon	776,{
 }
 
 gon_fild01,245,257,0	script	#gonknife	111,3,3,{
-OnTouch:
+OnTouch_:
 	if (nakha == 1) {
 		set nakha,2;
 		mes "^3355FFHm? What's this?";

npc/quests/quests_hugel.txt

@@ -391,7 +391,7 @@ hu_in01,387,245,0	script	Allen Schuwell	849,2,2,{
 		close;
 	}
 
-OnTouch:
+OnTouch_:
 	if (hg_herb == 4) {
 		mes "[Allen]";
 		mes "^333333*Cough cough!*^000000";
@@ -520,7 +520,7 @@ hu_fild06,34,123,3	script	Postell Schuwell	97,{
 }
 
 hu_in01,370,255,3	script	Upper Drawer#First	139,2,2,{
-OnTouch:
+OnTouch_:
 	set .@rand,rand(1,7);
 	if (hg_herb < 5) {
 		mes "^3355FFThere are several";
@@ -684,7 +684,7 @@ OnInit:
 	disablenpc "Upper Drawer#Second";
 	end;
 
-OnTouch:
+OnTouch_:
 	if (hg_herb == 5) {
 		mes "^3355FFYou take out one dose of";
 		mes "Withstander from the drawer.^000000";
@@ -7197,7 +7197,7 @@ hugel,56,104,3	script	Kurupe	709,3,3,{
 		close;
 	}
 
-OnTouch:
+OnTouch_:
 	if (BaseLevel > 49) {
 		if (!hg_milk) {
 			mes "[Kurupe]";
@@ -7343,7 +7343,7 @@ hu_fild06,217,270,3	script	Burupu	896,3,3,{
 		close;
 	}
 
-OnTouch:
+OnTouch_:
 	if (hg_milk == 2) {
 		mes "[Burupu]";
 		mes "Heeeyah!";
@@ -8954,7 +8954,7 @@ hu_in01,18,167,4	script	Julian	86,{
 }
 
 hu_in01,16,21,0	script	Ashe#5	139,2,2,{
-OnTouch:
+OnTouch_:
 	if (hg_odin == 18) {
 		mes "[Ashe]";
 		mes "......?";
@@ -9117,7 +9117,7 @@ hu_in01,16,20,4	script	Ashe	95,{
 }
 
 hu_in01,174,90,0	script	Entrance	139,2,2,{
-OnTouch:
+OnTouch_:
 	if (hg_odin == 22 || hg_odin == 23) {
 		mes "[Laura]";
 		mes "So it means that everyone fooled me!";
@@ -9344,7 +9344,7 @@ hu_in01,162,85,4	script	Ashe#2	95,{
 }
 
 hu_in01,171,90,0	script	Ashe#3	139,2,2,{
-OnTouch:
+OnTouch_:
 	if (hg_odin == 25) {
 		mes "^3355FFAshe picked up";
 		mes "the file that Laura";
@@ -9397,7 +9397,7 @@ moc_fild12,160,372,0	script	Hit	139,{
 }
 
 moc_fild12,160,365,0	script	Ashe#4	139,4,4,{
-OnTouch:
+OnTouch_:
 	if (hg_odin == 59) {
 		mes "[???]";
 		mes "...Silence.";
@@ -9602,7 +9602,7 @@ OnEnter:
 	enablenpc "warpinside#1";
 	end;
 
-OnTouch:
+OnTouch_:
 	if (hg_odin > 19 && hg_odin < 23) {
 		switch(rand(1,4)) {
 		case 1:
@@ -9634,7 +9634,7 @@ OnEnter:
 	enablenpc "warpinside#2";
 	end;
 
-OnTouch:
+OnTouch_:
 	if (hg_odin > 19 && hg_odin < 23) {
 		switch(rand(1,4)) {
 		case 1:
@@ -9666,7 +9666,7 @@ OnEnter:
 	enablenpc "warpinside#3";
 	end;
 
-OnTouch:
+OnTouch_:
 	if (hg_odin > 19 && hg_odin < 23) {
 		switch(rand(1,4)) {
 		case 1:
@@ -9698,7 +9698,7 @@ OnEnter:
 	enablenpc "warpinside#4";
 	end;
 
-OnTouch:
+OnTouch_:
 	if (hg_odin > 19 && hg_odin < 23) {
 		switch(rand(1,4)) {
 		case 1:
@@ -9730,7 +9730,7 @@ OnEnter:
 	enablenpc "warpinside#5";
 	end;
 
-OnTouch:
+OnTouch_:
 	if (hg_odin > 19 && hg_odin < 23) {
 		switch(rand(1,4)) {
 		case 1:
@@ -9754,7 +9754,7 @@ OnTouch:
 }
 
 hu_in01,99,90,0	script	Empty	139,3,3,{
-OnTouch:
+OnTouch_:
 	mes "^3355FFThis place is empty.";
 	mes "Everyone must";
 	mes "have already left.^000000";
@@ -9762,7 +9762,7 @@ OnTouch:
 }
 
 que_hugel,35,29,5	script	object#1	139,2,2,{
-OnTouch:
+OnTouch_:
 	if (hg_odin == 21) {
 		mes "^3355FFA weathered structure";
 		mes "of the Odin Shrine is";
@@ -9826,7 +9826,7 @@ OnTouch:
 }
 
 que_hugel,163,31,0	script	object#2	139,3,3,{
-OnTouch:
+OnTouch_:
 	mes "^3355FFWhen you come back";
 	mes "to your senses, you";
 	mes "find that nothing is";
@@ -9835,7 +9835,7 @@ OnTouch:
 }
 
 que_hugel,163,178,0	script	object#3	139,3,3,{
-OnTouch:
+OnTouch_:
 	if (hg_odin == 22) {
 		mes "["+strcharinfo(0)+"]";
 		mes "Huh?";
@@ -9851,7 +9851,7 @@ OnTouch:
 }
 
 hu_in01,15,108,0	script	alex#warp	45,1,1,{
-OnTouch:
+OnTouch_:
 	if (hg_odin == 17) {
 		mes "[Alex]";
 		mes "Haven't you found it yet?";
@@ -9941,7 +9941,7 @@ OnTouch:
 }
 
 hugel,52,90,0	script	alex#warp2	45,1,1,{
-OnTouch:
+OnTouch_:
 	if (hg_odin > 59) warp "hu_in01",102,90;
 	else if (hg_odin > 21 && hg_odin < 60) warp "hu_in01",173,90;
 	else warp "hu_in01",33,90;
@@ -9949,13 +9949,13 @@ OnTouch:
 }
 
 hu_in01,155,70,0	script	alex#warp3	45,1,1,{
-OnTouch:
+OnTouch_:
 	mes "^3355FFThe door is locked.^000000";
 	close;
 }
 
 hu_in01,155,108,0	script	alex#warp4	45,1,1,{
-OnTouch:
+OnTouch_:
 	mes "^3355FFThe door is locked.^000000";
 	close;
 }

npc/quests/quests_juperos.txt

@@ -1639,7 +1639,7 @@ juperos_01,215,127,4	script	Machine Statue	844,{
 juperos_01,100,91,0	script	jupe_goto#1	-1,2,2,{
 	end;
 
-OnTouch:
+OnTouch_:
 	initnpctimer "jupe_goto#1",1;
 	mes "^777777["+ strcharinfo(0) +"]^000000";
 	mes "This light...";
@@ -1689,7 +1689,7 @@ OnEnable:
 	initnpctimer;
 	end;
 
-OnTouch:
+OnTouch_:
 	warp "juperos_02",128,278;
 	end;
 
@@ -1819,7 +1819,7 @@ OnTimer1200000:
 	stopnpctimer;
 	end;
 
-OnTouch:
+OnTouch_:
 	warp "jupe_gate",50,167;
 	end;
 }
@@ -1947,7 +1947,7 @@ OnEnable:
 	initnpctimer;
 	end;
 
-OnTouch:
+OnTouch_:
 	warp "jupe_area1",47,259;
 	end;
 
@@ -1962,7 +1962,7 @@ OnInit:
 	disablenpc "Red Alarm#1-1";
 	end;
 
-OnTouch:
+OnTouch_:
 	donpcevent "Red Alarm On#1-1::OnEnable";
 	disablenpc "Red Alarm#1-1";
 	donpcevent "#hole#1-1::OnStop_Timer";
@@ -2241,7 +2241,7 @@ OnEnable:
 	initnpctimer;
 	end;
 
-OnTouch:
+OnTouch_:
 	warp "jupe_area1",21,191;
 	end;
 
@@ -2255,7 +2255,7 @@ OnInit:
 	disablenpc "Red Alarm#1-2";
 	end;
 
-OnTouch:
+OnTouch_:
 	set $@JupreArea1InUse,1;
 	donpcevent "Red Alarm On#1-2::OnEnable";
 	disablenpc "Red Alarm#1-2";
@@ -2528,7 +2528,7 @@ OnEnable:
 	initnpctimer;
 	end;
 
-OnTouch:
+OnTouch_:
 	warp "jupe_area1",33,105;
 	end;
 
@@ -2542,7 +2542,7 @@ OnInit:
 	disablenpc "Red Alarm#1-3";
 	end;
 
-OnTouch:
+OnTouch_:
 	set $@JupreArea1InUse,1;
 	donpcevent "Red Alarm On#1-3::OnEnable";
 	disablenpc "Red Alarm#1-3";
@@ -2817,7 +2817,7 @@ OnEnable:
 	initnpctimer;
 	end;
 
-OnTouch:
+OnTouch_:
 	warp "jupe_area1",83,157;
 	end;
 
@@ -2835,7 +2835,7 @@ OnEnable:
 	enablenpc "Red Alarm#1-4";
 	end;
 
-OnTouch:
+OnTouch_:
 	set $@JupreArea1InUse,1;
 	donpcevent "Red Alarm On#1-4::OnEnable";
 	disablenpc "Red Alarm#1-4";
@@ -3023,7 +3023,7 @@ OnEnable:
 	initnpctimer;
 	end;
 
-OnTouch:
+OnTouch_:
 	warp "jupe_gate",28,30;
 	end;
 
@@ -3156,7 +3156,7 @@ OnEnable:
 	initnpctimer;
 	end;
 
-OnTouch:
+OnTouch_:
 	warp "jupe_area2",116,259;
 	end;
 
@@ -3171,7 +3171,7 @@ OnInit:
 	disablenpc "Red Alarm#2-1";
 	end;
 
-OnTouch:
+OnTouch_:
 	donpcevent "Red Alarm On#2-1::OnEnable";
 	disablenpc "Red Alarm#2-1";
 	donpcevent "#hole#2-1::OnStop_Timer";
@@ -3450,7 +3450,7 @@ OnEnable:
 	initnpctimer;
 	end;
 
-OnTouch:
+OnTouch_:
 	warp "jupe_area2",142,191;
 	end;
 
@@ -3464,7 +3464,7 @@ OnInit:
 	disablenpc "Red Alarm#2-2";
 	end;
 
-OnTouch:
+OnTouch_:
 	set $@JupreArea2InUse,1;
 	donpcevent "Red Alarm On#2-2::OnEnable";
 	disablenpc "Red Alarm#2-2";
@@ -3737,7 +3737,7 @@ OnEnable:
 	initnpctimer;
 	end;
 
-OnTouch:
+OnTouch_:
 	warp "jupe_area2",130,105;
 	end;
 
@@ -3751,7 +3751,7 @@ OnInit:
 	disablenpc "Red Alarm#2-3";
 	end;
 
-OnTouch:
+OnTouch_:
 	set $@JupreArea2InUse,1;
 	donpcevent "Red Alarm On#2-3::OnEnable";
 	disablenpc "Red Alarm#2-3";
@@ -4028,7 +4028,7 @@ OnEnable:
 	initnpctimer;
 	end;
 
-OnTouch:
+OnTouch_:
 	warp "jupe_area2",80,157;
 	end;
 
@@ -4046,7 +4046,7 @@ OnEnable:
 	enablenpc "Red Alarm#2-4";
 	end;
 
-OnTouch:
+OnTouch_:
 	set $@JupreArea2InUse,1;
 	donpcevent "Red Alarm On#2-4::OnEnable";
 	disablenpc "Red Alarm#2-4";
@@ -4236,7 +4236,7 @@ OnEnable:
 	initnpctimer;
 	end;
 
-OnTouch:
+OnTouch_:
 	warp "jupe_gate",71,29;
 	end;
 
@@ -4518,7 +4518,7 @@ OnEnable:
 	initnpctimer;
 	end;
 
-OnTouch:
+OnTouch_:
 	percentheal -99,-100;
 	end;
 
@@ -4541,7 +4541,7 @@ OnInit:
 	disablenpc "Elevator Escape#ufe";
 	end;
 
-OnTouch:
+OnTouch_:
 	mapwarp "jupe_ele_r", "jupe_gate",49,138;
 	end;
 }
@@ -4921,7 +4921,7 @@ OnInit:
 	disablenpc "4F Enter#ufe";
 	end;
 
-OnTouch:
+OnTouch_:
 	warp "jupe_core",rand(149,151),286;
 	end;
 }
@@ -4932,7 +4932,7 @@ OnTouch:
 jupe_gate,50,173,0	script	gate#start	-1,2,3,{
 	end;
 
-OnTouch:
+OnTouch_:
 	initnpctimer "gate#start",1;
 	mes "^3355FFIt's a Warp Portal";
 	mes "that will teleport you";
@@ -4968,7 +4968,7 @@ OnInit:
 	disablenpc "gate#start#2";
 	end;
 
-OnTouch:
+OnTouch_:
 	warp "juperos_02",130,142;
 	end;
 
@@ -4979,7 +4979,7 @@ OnTimer2000:
 }
 
 juperos_02,33,59,0	script	jupe_goto2F	45,2,2,{
-OnTouch:
+OnTouch_:
 	switch(rand(1,4)) {
 	case 1: warp "juperos_01",120,72; end;
 	case 2: warp "juperos_01",120,112; end;

npc/quests/quests_lighthalzen.txt

@@ -1693,7 +1693,7 @@ lhz_cube,250,184,0	script	Door#cube	111,{
 }
 
 lhz_dun02,224,6,0	script	Exit1#lt	45,1,1,{
-OnTouch:
+OnTouch_:
 	if (MISC_QUEST&512) {
 		warp "lhz_cube",231,90;
 		end;
@@ -1710,7 +1710,7 @@ OnTouch:
 lighthalzen,240,216,4	script	Suspicious Guy#lhz_01	870,2,2,{
 	end;
 
-OnTouch:
+OnTouch_:
 	switch(rand(1,3)) {
 	case 1:
 		mes "^3355FF*SHHHHHHUK!*^000000";
@@ -1783,7 +1783,7 @@ OnInit:
 	disablenpc "Suspicious Guy#lhz_02";
 	end;
 
-OnTouch:
+OnTouch_:
 	switch(rand(1,3)) {
 	case 1:
 		mes "^3355FF*SHHHHHHUK!*^000000";
@@ -1855,7 +1855,7 @@ OnInit:
 	disablenpc "Suspicious Guy#lhz_03";
 	end;
 
-OnTouch:
+OnTouch_:
 	switch(rand(1,5)) {
 	case 1:
 	case 2:
@@ -6937,7 +6937,7 @@ lighthalzen,179,170,4	script	Ordinary Man	98,{
 
 lighthalzen,173,167,1	script	Switch	-1,2,4,{
 
-OnTouch:
+OnTouch_:
 	if(lhz_boss == 1)
 	{
 		mes "[??????]";
@@ -8526,7 +8526,7 @@ OnInit:
 
 yuno_pre,117,60,0	script	Eavesdrop	-1,10,5,{
 
-OnTouch:
+OnTouch_:
 	if(lhz_boss == 16)
 	{
 		mes "^3355FFWhat the...?";
@@ -9017,7 +9017,7 @@ OnInit:
 
 lhz_fild02,224,220,0	script	Wounded Man Switch	-1,3,3,{
 
-OnTouch:
+OnTouch_:
 	if(lhz_boss == 18)
 	{
 		mes "[?????]";
@@ -9031,7 +9031,7 @@ OnTouch:
 
 lhz_fild01,76,214,0	script	Esuna Trigger	-1,5,5,{
 
-OnTouch:
+OnTouch_:
 	if((lhz_boss == 26) || (lhz_boss == 36) || (lhz_boss == 38) || (lhz_boss == 40))
 	{
 		mes "[????]";
@@ -9519,7 +9519,7 @@ lhz_in01,187,31,0	script	#Sneak	111,4,3,{
 
 	end;
 
-OnTouch:
+OnTouch_:
 	if((lhz_boss > 27) && (lhz_boss < 35))
 	{
 		set @sneaktime,gettimetick(0) % 100;
@@ -9674,7 +9674,7 @@ L_Enter:
 
 lhz_in01,177,44,0	script	Timer_Sneak	-1,8,12,{
 
-OnTouch:
+OnTouch_:
 	warp "lhz_in01",191,49;
 	end;
 
@@ -11827,7 +11827,7 @@ OnEnter:
 	enablenpc "#packidentity";
 	end;
 
-OnTouch:
+OnTouch_:
 	if(lhz_rekenber == 19)
 	{
 		mes "^3355FFYou peek through the";
@@ -11857,7 +11857,7 @@ OnTimer120000:
 
 lhz_in01,187,247,3	script	#flashback1	139,2,2,{
 
-OnTouch:
+OnTouch_:
 	if(lhz_rekenber == 22)
 	{
 		cutin "lhz_kaz11",2;
@@ -11879,7 +11879,7 @@ OnTouch:
 
 lhz_in01,75,248,3	script	#flashback2	139,2,2,{
 
-OnTouch:
+OnTouch_:
 	if(lhz_rekenber == 22)
 	{
 		cutin "lhz_kaz11",2;

npc/quests/quests_louyang.txt

@@ -51,7 +51,7 @@ lou_in02,53,174,7	script	Employee#1	822,6,62,{
 	mes "^666666*Yawn...*^000000";
 	close;
 
-OnTouch:
+OnTouch_:
 	if (ch_tre == 2 || ch_tre == 3) {
 		if (gettime(3) >= 10 && gettime(3) < 14) {
 			if (rand(1,10) < 9) {
@@ -138,7 +138,7 @@ lou_in02,76,181,3	script	Employee#2	822,2,2,{
 	mes "...Zzzzz...Zzzz...";
 	close;
 
-OnTouch:
+OnTouch_:
 	if (ch_tre == 2 || ch_tre == 3) {
 		if (gettime(3) >= 10 && gettime(3) < 14) {
 			if (rand(1,10) < 9) {
@@ -234,7 +234,7 @@ lou_in02,61,175,3	script	Employee#3	818,2,2,{
 	mes "^666666*Yawn...*^000000";
 	close;
 
-OnTouch:
+OnTouch_:
 	if (ch_tre == 2 || ch_tre == 3) {
 		if (gettime(3) >= 10 && gettime(3) < 14) {
 			if (rand(1,10) < 9) {
@@ -367,7 +367,7 @@ lou_in02,62,183,3	script	Chef#1-2	820,2,2,{
 	mes "Dragon Soup is the best food for any appetite. I suggest that you try a bowl. You'll be quite pleased!";
 	close;
 
-OnTouch:
+OnTouch_:
 	if (ch_tre == 2 || ch_tre == 3) {
 		if (gettime(3) >= 10 && gettime(3) < 14) {
 			if (rand(1,10) < 9) {
@@ -894,7 +894,7 @@ lou_in02,58,183,5	script	Chef Assistant#lou1	823,5,5,{
 	mes "I will continue to hone my martial arts through cooking!";
 	close;
 
-OnTouch:
+OnTouch_:
 	if (ch_tre == 2 || ch_tre == 3) {
 		if (gettime(3) >= 10 && gettime(3) < 14) {
 			if (rand(1,10) < 9) {
@@ -4253,7 +4253,7 @@ lou_fild01,225,350,0	script	 #fire	139,{
 }
 
 lou_in01,101,125,0	script	Trap#lou_in1	-1,20,1,{
-OnTouch:
+OnTouch_:
 	if (ch_poison == 12 || ch_poison == 16) {
 		mes "[Soldier]";
 		mes "Who goes there!";
@@ -4267,7 +4267,7 @@ OnTouch:
 }
 
 lou_in01,101,129,0	script	Trap#lou_in2	-1,20,1,{
-OnTouch:
+OnTouch_:
 	if (ch_poison == 12 || ch_poison == 16) {
 		mes "[Soldier]";
 		mes "Huh...?";
@@ -4283,7 +4283,7 @@ OnTouch:
 }
 
 lou_in01,101,134,0	script	Trap#lou_in3	-1,20,1,{
-OnTouch:
+OnTouch_:
 	if (ch_poison == 12 || ch_poison == 16) {
 		mes "[Soldier]";
 		mes "Huh...?";
@@ -4298,7 +4298,7 @@ OnTouch:
 }
 
 lou_in01,114,163,0	script	Trap#lou_in4	-1,6,1,{
-OnTouch:
+OnTouch_:
 	if (ch_poison == 12 || ch_poison == 16) {
 		mes "[Soldier]";
 		mes "Hold it right there, Rune-Midgardian!";
@@ -4312,7 +4312,7 @@ OnTouch:
 }
 
 lou_in01,114,165,0	script	Trap#lou_in5	-1,1,0,{
-OnTouch:
+OnTouch_:
 	if (ch_poison == 12 || ch_poison == 16) {
 		mes "[Soldier]";
 		mes "Huh...?";

npc/quests/quests_morocc.txt

@@ -194,7 +194,7 @@ morocc,43,108,5	script	Sharp-Looking Kid#dan_07	82,{
 }
 
 morocc,45,110,0	script	que_job01#01	45,2,2,{
-OnTouch:
+OnTouch_:
 	if (BaseClass == Job_Assassin) {
 		warp "que_job01",9,94;
 		end;
@@ -219,7 +219,7 @@ que_job01,17,48,0	warp	que_job01#02	2,2,que_job01,68,92
 que_job01,68,96,0	warp	que_job01#03	2,2,que_job01,17,53
 
 que_job01,80,77,0	script	que_job01#04	45,2,2,{
-OnTouch:
+OnTouch_:
 	if (BaseClass == Job_Assassin) {
 		warp "que_job01",61,50;
 		end;
@@ -671,7 +671,7 @@ OnReset:
 	set $@maobar_room,0;
 	end;
 
-OnTouch:
+OnTouch_:
 	if (prt_curse == 24) {
 		if ($@maobar_room == 0) {
 			set $@maobar_room,1;
@@ -780,7 +780,7 @@ OnDisable:
 	disablenpc "#room1_warp";
 	end;
 
-OnTouch:
+OnTouch_:
 	warp "que_job01",52,50;
 	end;
 }
@@ -788,7 +788,7 @@ OnTouch:
 que_job01,51,44,0	warp	que_job01#room_2	1,1,que_job01,80,23
 
 que_job01,11,4,0	script	que_job01#room1_out	45,1,1,{
-OnTouch:
+OnTouch_:
 	warp "que_job01",52,50;
 	donpcevent " #room1timer::OnStop";
 	end;
@@ -1190,7 +1190,7 @@ moc_fild20,215,336,3	duplicate(MocConGuard)	Continental Guard#08	707,3,3
 		close;
 	}
 
-OnTouch:
+OnTouch_:
 	if (BaseLevel > 79) {
 		mes "[Continental Guard Messenger]";
 		mes "Are you... "+ strcharinfo(0) +"?";
@@ -1865,7 +1865,7 @@ moc_fild21,38,193,0	script	Morocc Timer#edq	-1,6,6,{
 //	set $@re_moc_time$,"";
 //	end;
 
-OnTouch:
+OnTouch_:
 	if ($@re_moc == 0) {
 		set $@re_moc,1;
 		donpcevent "Satan Broadcast#edq::OnEnable";
@@ -7646,7 +7646,7 @@ OnDisable:
 }
 
 prt_castle,318,276,0	script	#eisen	45,1,1,{
-OnTouch:
+OnTouch_:
 	if ((nkprince_eisen == 4) || (nkprince_eisen == 5)) {
 		donpcevent "Prince#another_ern::OnEnable";
 		set nkprince_eisen,5;
@@ -7738,7 +7738,7 @@ OnTouch:
 }
 
 prt_castle,336,276,0	script	#ern	45,1,1,{
-OnTouch:
+OnTouch_:
 	if (checkquest(10023) == 0 || checkquest(10023) == 1) {
 		donpcevent "Prince#eisen6::OnEnable";
 	}
@@ -7747,7 +7747,7 @@ OnTouch:
 }
 
 prt_castle,300,276,0	script	#erich	45,1,1,{
-OnTouch:
+OnTouch_:
 	if (checkquest(10020) == 0 || checkquest(10020) == 1) {
 		donpcevent "Prince#eisen1::OnEnable";
 	}
@@ -7756,7 +7756,7 @@ OnTouch:
 }
 
 prt_castle,330,271,0	script	#helmut	45,1,1,{
-OnTouch:
+OnTouch_:
 	if (checkquest(10022) == 0 || checkquest(10022) == 1) {
 		donpcevent "Prince#eisen3::OnEnable";
 	}
@@ -7765,7 +7765,7 @@ OnTouch:
 }
 
 prt_castle,348,271,0	script	#poe	45,1,1,{
-OnTouch:
+OnTouch_:
 	if (checkquest(10018) == 0 || checkquest(10018) == 1) {
 		donpcevent "Prince#eisen4::OnEnable";
 	}
@@ -7774,7 +7774,7 @@ OnTouch:
 }
 
 prt_castle,354,276,0	script	#peter	45,1,1,{
-OnTouch:;
+OnTouch_:
 	if (checkquest(10019) == 0 || checkquest(10019) == 1) {
 		donpcevent "Prince#eisen5::OnEnable";
 	}
@@ -7783,7 +7783,7 @@ OnTouch:;
 }
 
 prt_castle,310,271,0	script	#urgen	45,1,1,{
-OnTouch:
+OnTouch_:
 	if (checkquest(10021) == 0 || checkquest(10021) == 1) {
 		donpcevent "Prince#eisen2::OnEnable";
 	}

npc/quests/quests_moscovia.txt

@@ -8393,7 +8393,7 @@ mosk_fild02,101,200,0	duplicate(NoSwim)	Caution#rus02	2_BULLETIN_BOARD
 //----------------------------------------------------------------------------
 mosk_fild02,116,202,3	script	Lusalka#07russai_22	-1,3,3,{
 	end;
-OnTouch:
+OnTouch_:
 	if (rhea_rus_main != 8 || rhea_rus_hair < 2) {
 		emotion e_what,1;
 		end;
@@ -9015,7 +9015,7 @@ moc_pryd04,126,120,0	script	Soldier#rus26	4_M_RUSMAN1,{
 //----------------------------------------------------------------------------
 mosk_dun01,45,250,3	script	1#rus27	WARPNPC,3,3,{
 	end;
-OnTouch:
+OnTouch_:
 	warp "mosk_que",49,22;
 	end;
 
@@ -9037,7 +9037,7 @@ mosk_que,0,0,0,0	monster	Sasquatch	1243,15,10000,0,0
 
 mosk_que,49,22,3	script	#rus27	-1,3,3,{
 	end;
-OnTouch:
+OnTouch_:
 	if (rhea_rus_main == 8) {
 		if (!rhea_rus_quiz) {
 			mes "[Voice unidentified]";
@@ -9978,7 +9978,7 @@ OnMyMobDead:
 //----------------------------------------------------------------------------
 mosk_dun02,257,193,0	script	Cow#rus33	4_BULL,3,3,{
 	end;
-OnTouch:
+OnTouch_:
 	mes "[Cow]";
 	mes "Moo...";
 	if (rhea_rus_main == 11) {

npc/quests/quests_nameless.txt

@@ -1469,7 +1469,7 @@ OnTimer150000:
 
 nameless_n,145,162,0	script	AideAmi#Aru	139,2,2,{
 	end;
-OnTouch:
+OnTouch_:
 	if (aru_monas == 26) {
 		mes "[" + strcharinfo(0) + "]";
 		mes "There is a low wall here against the other wall, if I climb it I could reach the resting place of Tristan III...";
@@ -3157,7 +3157,7 @@ OnInit:
 	stopnpctimer;
 	end;
 
-OnTouch:
+OnTouch_:
 	if (aru_em == 22) {
 		initnpctimer;
 		disablenpc "#em_end";
@@ -3692,7 +3692,7 @@ alberta,127,143,3	script	Belder	85,{
 	mes "you came from. Jerk.";
 	close;
 
-OnTouch:
+OnTouch_:
 	if (diamond_edq < 3) {
 		mes "[Belder]";
 		mes "Cash flow problems?";
@@ -8213,7 +8213,7 @@ OnInit:
 	hideonnpc "Suspicious Man#2";
 	end;
 
-OnTouch:
+OnTouch_:
 	if (zdan_edq == 9 && $@zdan == 0)
 		callsub S_Quest;
 	end;
@@ -8458,7 +8458,7 @@ OnTouch:
 }
 
 z_agit,98,44,0	script	EntranceCheck#1	-1,10,10,{
-OnTouch:
+OnTouch_:
 	if (((zdan_edq == 15) || (zdan_edq == 16)) && ($@monster_zgang == 0)) {
 		set $@monster_zgang,1;
 		donpcevent "#zdan_broad::OnEnable";
@@ -8487,7 +8487,7 @@ OnTouch:
 }
 
 z_agit,98,92,0	script	EntranceCheck#2	-1,10,10,{
-OnTouch:
+OnTouch_:
 	if (((zdan_edq == 15) || (zdan_edq == 16)) && ($@monster_zgang == 0)) {
 		set $@monster_zgang,1;
 		donpcevent "#zdan_broad::OnEnable";

npc/quests/quests_niflheim.txt

@@ -178,7 +178,7 @@ nif_in,31,20,3	script	Kuzkahina#nif	794,{
 niflheim,208,103,1	script	#Graveyard1	111,1,1,{
 	end;
 
-OnTouch:
+OnTouch_:
 	if (nif_esc == 5 || nif_esc == 7 || nif_esc == 8 || nif_esc == 10) {
 		mes "^3355FFYou found something";
 		mes "half-buried near a grave.";
@@ -200,7 +200,7 @@ OnTouch:
 niflheim,169,71,1	script	#Graveyard2	111,1,1,{
 	end;
 
-OnTouch:
+OnTouch_:
 	if (nif_esc == 6 || nif_esc == 9) {
 		mes "^3355FFYou found something";
 		mes "half-buried near a grave.";
@@ -219,7 +219,7 @@ OnTouch:
 nif_in,115,181,0	script	#Piano	111,1,1,{
 	end;
 
-OnTouch:
+OnTouch_:
 	if (nif_esc == 0 && (MISC_QUEST & 32) == 0) {
 		mes "^3355FFYou see a big, heavy piano.";
 		mes "You get the feeling that";
@@ -252,7 +252,7 @@ OnTouch:
 nif_in,114,181,0	script	#Piano3	111,1,1,{
 	end;
 
-OnTouch:
+OnTouch_:
 	if (nif_esc == 12 || nif_esc == 13 || (MISC_QUEST & 32)) {
 		mes "^3355FFAs you bend towards";
 		mes "the final empty key space";

npc/quests/quests_rachel.txt

@@ -2477,7 +2477,7 @@ rachel,266,35,3	script	Grandma#rachel	918,{
 }
 
 lhz_in02,213,207,0	script	#ratrace1	111,4,4,{
-OnTouch:
+OnTouch_:
 	if (rach_vice == 5) {
 		mes "[" + strcharinfo(0) + "]";
 		mes "This...";
@@ -2498,7 +2498,7 @@ OnTouch:
 }
 
 rachel,265,47,0	script	#raevent1	111,2,2,{
-OnTouch:
+OnTouch_:
 	if (rach_vice == 23) {
 		mes "[" + strcharinfo(0) + "]";
 		mes "Just looking at this";
@@ -3388,7 +3388,7 @@ rachel,265,98,3	script	Hamion#aru	930,{
 	}
 }
 
-rachel,113,96,5	script	Mohadian	929,10,10,{
+rachel,113,97,5	script	Mohadian	929,10,10,{
 	if (ice_necklace_q == 6) {
 		mes "[Mohadian]";
 		mes "I work at the bar around";
@@ -3488,7 +3488,7 @@ rachel,113,96,5	script	Mohadian	929,10,10,{
 		close;
 	}
 
-OnTouch:
+OnTouch_:
 	if (ice_necklace_q == 6) {
 		mes "[Mohadian]";
 		mes "Welcome to--";
@@ -3736,7 +3736,7 @@ OnTimer60000:
 }
 
 ice_dun03,150,137,0	script	#ice_4f_1	45,2,2,{
-OnTouch:
+OnTouch_:
 	warp "ice_dun04",33,144;
 	end;
 
@@ -3746,7 +3746,7 @@ OnInit:
 }
 
 ice_dun03,138,148,0	script	#ice_4f_2	45,2,2,{
-OnTouch:
+OnTouch_:
 	warp "ice_dun04",33,144;
 	end;
 
@@ -3756,7 +3756,7 @@ OnInit:
 }
 
 ice_dun03,161,148,0	script	#ice_4f_3	45,2,2,{
-OnTouch:
+OnTouch_:
 	warp "ice_dun04",33,144;
 	end;
 
@@ -3766,7 +3766,7 @@ OnInit:
 }
 
 ice_dun03,151,162,0	script	#ice_4f_4	45,2,2,{
-OnTouch:
+OnTouch_:
 	warp "ice_dun04",33,144;
 	end;
 
@@ -4671,7 +4671,7 @@ OnTouch:
 }
 
 que_rachel,170,37,0	script	nemma01::nemma01	-1,5,5,{
-OnTouch:
+OnTouch_:
 	if (ra_tem_q == 8) {
 		mes "[???]";
 		mes "Only the goddess exists.";
@@ -6820,7 +6820,7 @@ OnTouch:
 
 ra_temin,275,226,0	script	#rachel33	45,1,1,{
 	end;
-OnTouch:
+OnTouch_:
 	if (aru_em == 21)
 		warp "que_temsky",99,11;
 	else

npc/quests/quests_umbala.txt

@@ -1267,7 +1267,7 @@ OnInit:
 	disablenpc "#!@#$%";
 	end;
 
-OnTouch:
+OnTouch_:
 	if (um_wind == 4) {
 		set um_wind,5;
 		mes "^3355FFAs you enter the house";
@@ -1296,7 +1296,7 @@ OnInit:
 	disablenpc "#unpc";
 	end;
 
-OnTouch:
+OnTouch_:
 	if (um_wind == 5) {
 		mes "^3355FFAs you realized what happened";
 		mes "after being kicked out of the";

npc/quests/seals/brisingamen_seal.txt

@@ -2707,7 +2707,7 @@ gef_dun01,89,192,0	script	#lowentrace	111,3,3,{
 		close;
 	}
 
-OnTouch:
+OnTouch_:
 	if ((god_brising > 9) && (god_brising < 34)) {
 		emotion e_gasp;
 	}
@@ -2839,7 +2839,7 @@ gef_dun01,203,48,0	script	#lowentrace1	111,3,3,{
 		close;
 	}
 
-OnTouch:
+OnTouch_:
 	if ((god_brising > 9) && (god_brising < 34)) {
 		emotion e_gasp;
 	}
@@ -2980,7 +2980,7 @@ que_god02,54,64,4	script	Soldier#1_brising	105,1,1,{
 		close;
 	}
 
-OnTouch:
+OnTouch_:
 	if (god_brising == 31) {
 		warp "que_god02",174,49;
 		donpcevent "#brisinsold::OnSold1Off";
@@ -3158,7 +3158,7 @@ que_god02,167,58,4	script	#knight3	752,{ end; }
 
 que_god02,174,49,0	script	#lowenone	139,0,0,{
 
-OnTouch:
+OnTouch_:
 	donpcevent "brisinsold2::OnSold2On";
 	mes "[" + strcharinfo(0) + "]";
 	mes "Where am I?";
@@ -3243,7 +3243,7 @@ que_god02,124,59,7	script	#hermite	798,{ end; }
  
 que_god02,120,52,0	script	#monologue	139,0,0,{
 
-OnTouch:
+OnTouch_:
 	mes "[" + strcharinfo(0) + "]";
 	mes "Where am I?";
 	mes "Isn't that...";
@@ -3676,7 +3676,7 @@ xmas,38,105,0	script	#brisindwarf1	111,3,3,{
 		close;
 	}
 
-OnTouch:
+OnTouch_:
 	if (god_brising > 39) {
 		emotion e_gasp,1;
 	}
@@ -4143,7 +4143,7 @@ prt_fild02,185,269,0	script	#brisindwarf2	111,3,3,{
 		close;
 	}
 
-OnTouch:
+OnTouch_:
 	if (god_brising > 41) {
 		emotion e_gasp,1;
 	}
@@ -4337,7 +4337,7 @@ mjolnir_09,85,129,0	script	#brisindwarf3	111,3,3,{
 		close;
 	}
 
-OnTouch:
+OnTouch_:
 	if (god_brising > 42) {
 		emotion e_gasp,1;
 	}
@@ -4577,7 +4577,7 @@ mjo_dun02,126,36,0	script	#brisindwarf4	111,3,3,{
 		close;
 	}
 
-OnTouch:
+OnTouch_:
 	if ($God2 < $@god_check1) {
 		mes "[" + strcharinfo(0) + "]";
 		mes "Beh, no way out.";

npc/quests/seals/god_weapon_creation.txt

@@ -813,7 +813,7 @@ que_god01,154,67,0	script	god_failwarp#1	-1,4,7,{
 OnInit:
 	disablenpc strnpcinfo(0);
 	end;
-OnTouch:
+OnTouch_:
 	warp "prontera",156,324;
 	end;
 }

npc/quests/seals/sleipnir_seal.txt

@@ -1837,7 +1837,7 @@ que_god01,84,95,0	script	Switch#God0	111,{
 }
 
 que_god01,84,92,0	script	god_sl_w0	45,1,1,{
-OnTouch:
+OnTouch_:
 	if ((god_sl_1 > 1) && (god_sl_1 < 51)) {
 		mes "^3355FFThe door is locked. You slide your temporary pass on the security device on the right side of the door, and the door unlocks.^000000";
 		next;
@@ -1864,7 +1864,7 @@ que_god01,49,97,0	script	Switch#God1	111,{
 }
 
 que_god01,46,97,0	script	god_sl_w1	45,1,1,{
-OnTouch:
+OnTouch_:
 	if ((god_sl_1 > 1) && (god_sl_1 < 51)) {
 		mes "^3355FFThe door is locked. You slide your temporary pass on the security device on the right side of the door, and the door unlocks.^000000";
 		next;
@@ -1891,7 +1891,7 @@ que_god01,19,97,0	script	Switch#God2	111,{
 }
 
 que_god01,16,97,0	script	god_sl_w2	45,1,1,{
-OnTouch:
+OnTouch_:
 	if ((god_sl_1 > 1) && (god_sl_1 < 51)) {
 		mes "^3355FFThe door is locked. You slide your temporary pass on the security device on the right side of the door, and the door unlocks.^000000";
 		next;
@@ -1918,7 +1918,7 @@ que_god01,14,80,0	script	Switch#God3	111,{
 }
 
 que_god01,17,80,0	script	god_sl_w3	45,1,1,{
-OnTouch:
+OnTouch_:
 	if ((god_sl_1 > 1) && (god_sl_1 < 51)) {
 		mes "^3355FFThe door is locked. You slide your temporary pass on the security device on the right side of the door, and the door unlocks.^000000";
 		next;
@@ -1945,7 +1945,7 @@ que_god01,44,80,0	script	Switch#God4	111,{
 }
 
 que_god01,47,80,0	script	god_sl_w4	45,1,1,{
-OnTouch:
+OnTouch_:
 	if ((god_sl_1 > 1) && (god_sl_1 < 51)) {
 		mes "^3355FFThe door is locked. You slide your temporary pass on the security device on the right side of the door, and the door unlocks.^000000";
 		next;

npc/quests/skills/archer_skills.txt

@@ -260,7 +260,7 @@ payon,103,63,3	script	Jason	88,3,3,{
 	mes "a lonely lad like me?";
 	close;
 
-OnTouch:
+OnTouch_:
 	mes "[???]";
 	mes "Errrrrrr...";
 	close;

npc/quests/skills/assassin_skills.txt

@@ -737,7 +737,7 @@ in_moc_16,23,27,5	script	Assassin#realgirl	885,{
 }
 
 in_sphinx2,259,213,0	script	Old Coffin#qsk_as	-1,7,8,{
-OnTouch:
+OnTouch_:
 	if (ASSN_SK == 2) {
 		mes "^3355FFIt's an ancient coffin";
 		mes "with a broken lid that";
@@ -801,7 +801,7 @@ OnTouch:
 }
 
 in_sphinx2,212,267,0	script	Old Coffin#qsk_as2	-1,5,6,{
-OnTouch:
+OnTouch_:
 	if (ASSN_SK == 2) {
 		mes "^3355FFIt's an ancient coffin";
 		mes "with a broken lid that";
@@ -884,7 +884,7 @@ OnTouch:
 }
 
 in_sphinx2,13,163,0	script	Stone Statue#qsk_as	-1,7,7,{
-OnTouch:
+OnTouch_:
 	if (ASSN_SK == 3) {
 		specialeffect EF_CONE;
 		mes "^3355FFThis ancient stone statue";
@@ -919,7 +919,7 @@ OnTouch:
 }
 
 in_sphinx2,13,146,0	script	Stone Statue#qsk_as2	-1,7,7,{
-OnTouch:
+OnTouch_:
 	if (ASSN_SK == 3) {
 		specialeffect EF_CONE;
 		mes "^3355FFThis ancient stone statue";
@@ -953,7 +953,7 @@ OnTouch:
 }
 
 moc_pryd04,85,96,0	script	¡¡#crypt	-1,3,3,{
-OnTouch:
+OnTouch_:
 	if (ASSN_SK == 4) {
 		specialeffect EF_CONE;
 		mes "^3355FFThere's something";

npc/quests/skills/merchant_skills.txt

@@ -172,7 +172,7 @@ alberta,83,96,5	script	Necko	98,7,7,{
 	mes "come again later. Hehe~";
 	close;
 
-OnTouch:
+OnTouch_:
 	mes "[!?]";
 	mes "Muahahahahahahahahahahahaha!!";
 	mes "Pukakakakakakakakakakakakaka!";

npc/quests/skills/rogue_skills.txt

@@ -53,7 +53,7 @@ OnInit:
 	disablenpc "Killer#Rogueguild";
 	end;
 
-OnTouch:
+OnTouch_:
 	if (ROG_SK == 10) {
 		specialeffect2 EF_CHANGECOLD;
 		specialeffect EF_CHANGEWIND;
@@ -1036,7 +1036,7 @@ in_rogue,181,114,3	script	Jay Greg#rogueguild	85,{
 }
 
 prt_are01,150,150,0	script	#1strecog	-1,10,10,{
-OnTouch:
+OnTouch_:
 	donpcevent "#1st5min::OnEnable";
 	donpcevent "#1stmove::OnEnable";
 	disablenpc "#1strecog";
@@ -1155,7 +1155,7 @@ OnDisable:
 
 prt_are01,149,162,0	script	Kienna#1st	700,1,1,{
 	end;
-OnTouch:
+OnTouch_:
 	callfunc "F_Kienna",strnpcinfo(2);
 	end;
 }

npc/quests/skills/swordman_skills.txt

@@ -295,7 +295,7 @@ prt_in,75,88,5	script	Leon Von Frich	85,3,3,{
 	mes "See you in a better world!";
 	close;
 
-OnTouch:
+OnTouch_:
 	mes "[Leon]";
 	mes "Hahahahahahaha!";
 	mes "Hahahahahahaha!";

npc/quests/thana_quest.txt

@@ -150,7 +150,7 @@ hu_fild01,140,163,5	script	Tower Keeper	852,3,3,{
 		close;
 	}
 
-OnTouch:
+OnTouch_:
 	mes "[Tower Keeper]";
 	mes "Excuse me, but you cannot";
 	mes "enter. This place is under";
@@ -876,7 +876,7 @@ tha_t02,227,163,0	script	3rdf_warp#tt	45,1,1,{
 OnInit:
 	disablenpc "3rdf_warp#tt";
 	end;
-OnTouch:
+OnTouch_:
 	if (thana_tower == 0) warp "tha_t02",227,158;
 	else warp "tha_t03",219,159;
 	end;
@@ -942,7 +942,7 @@ tha_t03,67,70,0	script	Rune Device#tt1	111,4,4,{
 	mes "You've acquired everything you need from this rune device.";
 	close;
 
-OnTouch:
+OnTouch_:
 	if ((countitem(7421) == 0) && (countitem(7426) == 0))
 		specialeffect EF_LEVEL99_4;
 	end;
@@ -1153,7 +1153,7 @@ tha_t04,195,195,0	script	Rune Device#tt2	111,3,3,{
 	mes "You've acquired everything you need from this rune device.";
 	close;
 
-OnTouch:
+OnTouch_:
 	if ((countitem(7422) == 0) && (countitem(7427) == 0))
 		specialeffect EF_LEVEL99_4;
 	end;
@@ -1238,7 +1238,7 @@ tha_t05,62,179,0	script	Brilliant Statue#tt3	111,3,3,{
 	mes "You've acquired everything you need from this statue.";
 	close;
 
-OnTouch:
+OnTouch_:
 	if ((countitem(7423) == 0) && (countitem(7428) == 0))
 		specialeffect EF_LEVEL99_4;
 	end;
@@ -1510,7 +1510,7 @@ tha_t06,226,230,0	script	Brilliant Statue#tt4	111,3,3,{
 	mes "The spell is already released. You've acquired everything you need from this statue.";
 	close;
 
-OnTouch:
+OnTouch_:
 	if ((countitem(7424) == 0) && (countitem(7429) == 0))
 		specialeffect EF_LEVEL99_4;
 	end;
@@ -1600,7 +1600,7 @@ tha_t06,204,181,0	script	Splendid Sword#tt5	111,3,3,{
 	mes "You've acquired everything you need from here.";
 	close;
 
-OnTouch:
+OnTouch_:
 	if ((countitem(7425) == 0) && (countitem(7430) == 0))
 		specialeffect EF_LEVEL99_4;
 	end;
@@ -2057,7 +2057,7 @@ OnEnable:
 OnOn2:
 	initnpctimer;
 	end;
-OnTouch:
+OnTouch_:
 	set .@touch,1;
 OnTimer6000:
 	if (($@thana_summon == 0) || ($@thana_summon == 6)) {
@@ -2091,7 +2091,7 @@ OnDisable:
 	hideonnpc strnpcinfo(0);
 	set .hide,0;
 	end;
-OnTouch:
+OnTouch_:
 	set .@seal, atoi(charat(strnpcinfo(2),2));
 	if (.hide & (1<<.@seal)) end;
 
@@ -2172,7 +2172,7 @@ OnEnable:
 OnDisable:
 	disablenpc "#thanatos_seal";
 	end;
-OnTouch:
+OnTouch_:
 	if ($@thana_summon2 == 4) {
 		initnpctimer;
 		donpcevent "Memory Seal#tt5::OnEnable";

npc/quests/the_sign_quest.txt

@@ -2924,7 +2924,7 @@ aldeba_in,155,101,3	script	Sir Jore#sign	805,7,7,{
 	}
 	close;
 
-OnTouch:
+OnTouch_:
 	if (rand(2)) {
 		emotion e_ic;
 		specialeffect EF_PHARMACY_OK;
@@ -3072,7 +3072,7 @@ prt_maze02,57,151,1	script	Pleur#warp	91,{
 }
 
 prt_maze02,58,150,0	script	#movesign	-1,5,5,{
-OnTouch:
+OnTouch_:
 	mes "^3355FFYou catch a glimpse";
 	mes "of a girl heading directly";
 	mes "into a deep forest. You decide";
@@ -3087,14 +3087,14 @@ OnTouch:
 }
 
 prt_maze02,18,126,0	script	#mazewarp	-1,3,3,{
-OnTouch:
+OnTouch_:
 	warp "prt_maze02",90,170;
 	end;
 }
 
 /* Currently broken.
 prt_maze02,25,161,0	script	#music	-1,7,7,{
-OnTouch:
+OnTouch_:
 	soundeffect "effect\\¼®¾çÀÇ ¾î½Ø½Å.wav",1;
 	end;
 }
@@ -5168,7 +5168,7 @@ OnReset:
 	set .s_up,0;
 	end;
 
-OnTouch:
+OnTouch_:
 	soundeffect "effect\\sign_up.wav",1;
 	if (.s_up == 1) {
 		donpcevent "Examiner#sd::OnUp";
@@ -5224,7 +5224,7 @@ OnReset:
 	set .s_down,0;
 	end;
 
-OnTouch:
+OnTouch_:
 	soundeffect "effect\\sign_down.wav",1;
 	if (.s_down == 1) {
 		donpcevent "Examiner#sd::OnUp";
@@ -5301,7 +5301,7 @@ OnReset:
 	set .s_left,0;
 	end;
 
-OnTouch:
+OnTouch_:
 	soundeffect "effect\\sign_left.wav",1;
 	if (.s_left == 1) {
 		donpcevent "Examiner#sd::OnUp";
@@ -5369,7 +5369,7 @@ OnReset:
 	set .s_right,0;
 	end;
 
-OnTouch:
+OnTouch_:
 	soundeffect "effect\\sign_right.wav",1;
 	if (.s_right == 1) {
 		donpcevent "Examiner#sd::OnUp";
@@ -5443,7 +5443,7 @@ OnReset:
 	set .s_center,0;
 	end;
 
-OnTouch:
+OnTouch_:
 	soundeffect "effect\\sign_center.wav",1;
 	if (.s_center == 1) {
 		donpcevent "Examiner#sd::OnUp";
@@ -5473,7 +5473,7 @@ OnInit:
 	disablenpc "Examiner#sd";
 	end;
 
-OnTouch:
+OnTouch_:
 	if (.s_check < 30) {
 		if (sign_q == 30) {
 			set sign_q,32;
@@ -8148,7 +8148,7 @@ gef_fild07,182,241,0	script	#Valkyrie Warp	111,1,1,{
 		close;
 	}
 
-OnTouch:
+OnTouch_:
 	if ((sign_q == 80) && (countitem(907) > 3) && (countitem(953) > 11) && (countitem(7013) > 364)) {
 		mes "["+strcharinfo(0)+"]";
 		mes "What the...?";
@@ -10428,7 +10428,7 @@ que_sign01,122,141,4	script	Witch#s	792,{
 }
 
 nif_in,186,168,1	script	#witch	-1,1,1,{
-OnTouch:
+OnTouch_:
 	callfunc "F_UpdateSignVars";
 	if (sign_q == 83) {
 		if (sign_sq == 2) {
@@ -11652,7 +11652,7 @@ niflheim,102,54,4	script	Mad Man#s	739,{
 }
 
 niflheim,348,257,1	script	#Cursed Soul	-1,1,1,{
-OnTouch:
+OnTouch_:
 	callfunc "F_UpdateSignVars";
 	if ((sign_q == 83) || (sign_q == 90)) {
 		if (sign_sq == 0) {
@@ -11767,7 +11767,7 @@ OnMyMobDead:
 }
 
 nif_in,102,81,1	script	#Crayu	-1,1,1,{
-OnTouch:
+OnTouch_:
 	callfunc "F_UpdateSignVars";
 	if (sign_q < 75) end;
 	else if (sign_q < 82) {
@@ -11859,7 +11859,7 @@ OnTouch:
 }
 
 nif_in,156,91,1	script	#kidniff	-1,1,1,{
-OnTouch:
+OnTouch_:
 	callfunc "F_UpdateSignVars";
 	if (sign_q == 83) {
 		if (sign_sq == 0) {
@@ -12239,7 +12239,7 @@ OnInit:
 	disablenpc "Geffenia Warp";
 	end;
 
-OnTouch:
+OnTouch_:
 	set geffenia_warp,rand(1,4);
 	if (geffenia_warp == 1) warp "gefenia01",58,169;
 	else if (geffenia_warp == 2) warp "gefenia02",116,115;
@@ -12304,7 +12304,7 @@ geffen,119,48,0	script	Fountain#s	111,{
 }
 
 que_sign01,196,44,0	script	Starter#serin	-1,32,32,{
-OnTouch:
+OnTouch_:
 	donpcevent "Timer#serin::OnStart";
 	disablenpc "Starter#serin";
 	end;
@@ -12320,7 +12320,7 @@ OnInit:
 	disablenpc "Warp#serin";
 	end;
 
-OnTouch:
+OnTouch_:
 	warp "niflheim",30,156;
 	end;
 
@@ -12365,7 +12365,7 @@ OnReset:
 }
 
 que_sign01,197,195,0	script	Starter#witch	-1,32,32,{
-OnTouch:
+OnTouch_:
 	donpcevent "Timer#witch::OnStart";
 	disablenpc "Starter#witch";
 	end;
@@ -12404,7 +12404,7 @@ OnEnable:
 	enablenpc "Warp#witch";
 	end;
 
-OnTouch:
+OnTouch_:
 	warp "niflheim",30,156;
 	end;
 }
@@ -12445,7 +12445,7 @@ que_sign02,0,0,0,0	monster	Wraith	1475,15,0,0,0
 que_sign02,0,0,0,0	monster	Wraith Dead	1566,8,0,0,0
 
 que_sign02,378,235,0	script	sign_w6	45,1,1,{
-OnTouch:
+OnTouch_:
 	callfunc "F_UpdateSignVars";
 	if ((countitem(7313) == 1) && ((sign_q != 124) || (sign_q != 125) || (sign_q != 126))) {
 		warp "que_sign01",197,190;

npc/re/cities/malaya.txt

@@ -167,7 +167,7 @@ OnBingx2:
 		donpcevent "Unidentified Creature#"+.@npc$[.@i]+"::"+((.@i == .@rand)?"OnEnable":"OnDisable");
 	donpcevent strnpcinfo(0)+"::OnDisable";
 	end;
-OnTouch:
+OnTouch_:
 	if (getcharid(1)) {
 		if ($ma_name04$ == strcharinfo(0) || $ma_name05$ == strcharinfo(0) || $ma_name06$ == strcharinfo(0)) {
 			donpcevent strnpcinfo(0)+"::OnBingx2";
@@ -218,7 +218,7 @@ OnBingx2:
 		donpcevent "Unidentified Creature#"+.@npc$[.@i]+"::"+((.@i == .@rand)?"OnEnable":"OnDisable");
 	donpcevent strnpcinfo(0)+"::OnDisable";
 	end;
-OnTouch:
+OnTouch_:
 	set .@i, atoi(strnpcinfo(2));
 	if (.@i%4 == 2) {
 		if (getcharid(0) == getpartyleader(getcharid(1),2))

npc/re/guides/guides_dicastes.txt

@@ -15,7 +15,7 @@
 //= 1.2 Navigation system update. [Euphy]
 //============================================================ 
 
-dicastes01,181,191,5	script	Traveler Ichack#info	481,2,2,{
+dicastes01,189,191,5	script	Traveler Ichack#info	481,2,2,{
 	mes "[Traveler Ichack]";
 	mes "Oh!! You are a stranger!";
 	mes "I'm Ichack, the first adventurer that arrived here in El Dicastes!";

npc/re/instances/BangungotHospital.txt

@@ -1041,59 +1041,85 @@ OnTimer30000:
 
 // Warp Portals
 //============================================================
-1@ma_h,35,156,0	warp	#Boss Room Exit	2,2,ma_dun01,150,9
-1@ma_h,105,157,0	warp	#Boss Room Door	2,2,1@ma_h,116,157
-1@ma_h,112,157,0	warp	#Boss Room Door1	2,2,1@ma_h,100,157
-1@ma_h,104,63,0	warp	#Boss Room Door2	2,2,1@ma_h,117,63
-1@ma_h,112,63,0	warp	#Boss Room Door3	2,2,1@ma_h,100,63
-1@ma_h,36,157,0	warp	#Patternwarp1	7,7,1@ma_h,117,63
-1@ma_h,46,157,0	warp	#Patternwarp2	7,7,1@ma_h,117,63
-1@ma_h,57,157,0	warp	#Patternwarp3	7,7,1@ma_h,117,63
-1@ma_h,67,157,0	warp	#Patternwarp4	7,7,1@ma_h,117,63
-1@ma_h,79,157,0	warp	#Patternwarp5	7,7,1@ma_h,117,63
-1@ma_h,89,157,0	warp	#Patternwarp6	7,7,1@ma_h,117,63
-1@ma_h,100,157,0	warp	#Patternwarp7	7,7,1@ma_h,117,63
-1@ma_h,51,173,0	warp	#Patternwarp8	10,10,1@ma_h,117,63
-1@ma_h,52,140,0	warp	#Patternwarp34	10,10,1@ma_h,117,63
-1@ma_h,73,173,0	warp	#Patternwarp35	10,10,1@ma_h,117,63
-1@ma_h,73,140,0	warp	#Patternwarp36	10,10,1@ma_h,117,63
-1@ma_h,95,173,0	warp	#Patternwarp37	10,10,1@ma_h,117,63
-1@ma_h,95,140,0	warp	#Patternwarp38	10,10,1@ma_h,117,63
-//1@ma_h,70,170,0	warp	#Patternwarp39	10,10,1@ma_h,117,63
-//1@ma_h,77,169,0	warp	#Patternwarp40	10,10,1@ma_h,117,63
-1@ma_h,117,171,0	warp	#Patternwarp41	10,10,1@ma_h,117,63
-1@ma_h,131,171,0	warp	#Patternwarp42	10,10,1@ma_h,117,63
-1@ma_h,146,171,0	warp	#Patternwarp43	10,10,1@ma_h,117,63
-1@ma_h,117,157,0	warp	#Patternwarp44	10,10,1@ma_h,117,63
-1@ma_h,131,157,0	warp	#Patternwarp45	10,10,1@ma_h,117,63
-1@ma_h,146,157,0	warp	#Patternwarp46	10,10,1@ma_h,117,63
-1@ma_h,117,143,0	warp	#Patternwarp47	10,10,1@ma_h,117,63
-1@ma_h,131,143,0	warp	#Patternwarp48	10,10,1@ma_h,117,63
-1@ma_h,146,143,0	warp	#Patternwarp49	10,10,1@ma_h,117,63
-1@ma_h,36,63,0	warp	#Patternwarp10	7,7,1@ma_h,116,157
-1@ma_h,46,63,0	warp	#Patternwarp11	7,7,1@ma_h,116,157
-1@ma_h,56,63,0	warp	#Patternwarp12	7,7,1@ma_h,116,157
-1@ma_h,67,63,0	warp	#Patternwarp13	7,7,1@ma_h,116,157
-1@ma_h,78,63,0	warp	#Patternwarp14	7,7,1@ma_h,116,157
-1@ma_h,89,63,0	warp	#Patternwarp15	7,7,1@ma_h,116,157
-1@ma_h,100,63,0	warp	#Patternwarp16	7,7,1@ma_h,116,157
-1@ma_h,51,79,0	warp	#Patternwarp17	10,10,1@ma_h,116,157
-1@ma_h,51,46,0	warp	#Patternwarp18	10,10,1@ma_h,116,157
-1@ma_h,73,80,0	warp	#Patternwarp19	10,10,1@ma_h,116,157
-1@ma_h,73,46,0	warp	#Patternwarp20	10,10,1@ma_h,116,157
-1@ma_h,95,79,0	warp	#Patternwarp21	10,10,1@ma_h,116,157
-1@ma_h,95,46,0	warp	#Patternwarp22	10,10,1@ma_h,116,157
-//1@ma_h,193,82,0	warp	#Patternwarp23	7,7,1@ma_h,116,157
-//1@ma_h,193,82,0	warp	#Patternwarp24	7,7,1@ma_h,116,157
-1@ma_h,117,77,0	warp	#Patternwarp25	10,10,1@ma_h,116,157
-1@ma_h,131,77,0	warp	#Patternwarp26	10,10,1@ma_h,116,157
-1@ma_h,146,77,0	warp	#Patternwarp27	10,10,1@ma_h,116,157
-1@ma_h,117,63,0	warp	#Patternwarp28	10,10,1@ma_h,116,157
-1@ma_h,131,63,0	warp	#Patternwarp29	10,10,1@ma_h,116,157
-1@ma_h,146,63,0	warp	#Patternwarp30	10,10,1@ma_h,116,157
-1@ma_h,117,49,0	warp	#Patternwarp31	10,10,1@ma_h,116,157
-1@ma_h,131,49,0	warp	#Patternwarp32	10,10,1@ma_h,116,157
-1@ma_h,146,49,0	warp	#Patternwarp33	10,10,1@ma_h,116,157
+1@ma_h,35,156,0	script	#Boss Room Exit	WARPNPC,2,2,{
+OnTouch:
+	warp "ma_dun01",150,9;
+	end;
+}
+1@ma_h,105,157,0	script	#Boss Room Door	WARPNPC,2,2,{
+OnTouch:
+	warp "1@ma_h",116,157;
+	end;
+}
+1@ma_h,112,157,0	script	#Boss Room Door1	WARPNPC,2,2,{
+OnTouch:
+	warp "1@ma_h",100,157;
+	end;
+}
+1@ma_h,112,63,0	script	#Boss Room Door3	WARPNPC,2,2,{
+OnTouch:
+	warp "1@ma_h",100,63;
+	end;
+}
+
+1@ma_h,104,63,0	script	#Boss Room Door2	WARPNPC,2,2,{
+OnTouch:
+	warp "1@ma_h",117,63;
+	end;
+}
+1@ma_h,36,157,0	duplicate(#Boss Room Door2)	#Patternwarp1	WARPNPC,7,7
+1@ma_h,46,157,0	duplicate(#Boss Room Door2)	#Patternwarp2	WARPNPC,7,7
+1@ma_h,57,157,0	duplicate(#Boss Room Door2)	#Patternwarp3	WARPNPC,7,7
+1@ma_h,67,157,0	duplicate(#Boss Room Door2)	#Patternwarp4	WARPNPC,7,7
+1@ma_h,79,157,0	duplicate(#Boss Room Door2)	#Patternwarp5	WARPNPC,7,7
+1@ma_h,89,157,0	duplicate(#Boss Room Door2)	#Patternwarp6	WARPNPC,7,7
+1@ma_h,100,157,0	duplicate(#Boss Room Door2)	#Patternwarp7	WARPNPC,7,7
+1@ma_h,51,173,0	duplicate(#Boss Room Door2)	#Patternwarp8	WARPNPC,10,10
+1@ma_h,52,140,0	duplicate(#Boss Room Door2)	#Patternwarp34	WARPNPC,10,10
+1@ma_h,73,173,0	duplicate(#Boss Room Door2)	#Patternwarp35	WARPNPC,10,10
+1@ma_h,73,140,0	duplicate(#Boss Room Door2)	#Patternwarp36	WARPNPC,10,10
+1@ma_h,95,173,0	duplicate(#Boss Room Door2)	#Patternwarp37	WARPNPC,10,10
+1@ma_h,95,140,0	duplicate(#Boss Room Door2)	#Patternwarp38	WARPNPC,10,10
+//1@ma_h,70,170,0	duplicate(#Boss Room Door2)	#Patternwarp39	WARPNPC,10,10
+//1@ma_h,77,169,0	duplicate(#Boss Room Door2)	#Patternwarp40	WARPNPC,10,10
+1@ma_h,117,171,0	duplicate(#Boss Room Door2)	#Patternwarp41	WARPNPC,10,10
+1@ma_h,131,171,0	duplicate(#Boss Room Door2)	#Patternwarp42	WARPNPC,10,10
+1@ma_h,146,171,0	duplicate(#Boss Room Door2)	#Patternwarp43	WARPNPC,10,10
+1@ma_h,117,157,0	duplicate(#Boss Room Door2)	#Patternwarp44	WARPNPC,10,10
+1@ma_h,131,157,0	duplicate(#Boss Room Door2)	#Patternwarp45	WARPNPC,10,10
+1@ma_h,146,157,0	duplicate(#Boss Room Door2)	#Patternwarp46	WARPNPC,10,10
+1@ma_h,117,143,0	duplicate(#Boss Room Door2)	#Patternwarp47	WARPNPC,10,10
+1@ma_h,131,143,0	duplicate(#Boss Room Door2)	#Patternwarp48	WARPNPC,10,10
+1@ma_h,146,143,0	duplicate(#Boss Room Door2)	#Patternwarp49	WARPNPC,10,10
+
+1@ma_h,36,63,0	script	#Patternwarp10	WARPNPC,7,7,{
+OnTouch:
+	warp "1@ma_h",116,157;
+	end;
+}
+1@ma_h,46,63,0	duplicate(#Patternwarp10)	#Patternwarp11	WARPNPC,7,7
+1@ma_h,56,63,0	duplicate(#Patternwarp10)	#Patternwarp12	WARPNPC,7,7
+1@ma_h,67,63,0	duplicate(#Patternwarp10)	#Patternwarp13	WARPNPC,7,7
+1@ma_h,78,63,0	duplicate(#Patternwarp10)	#Patternwarp14	WARPNPC,7,7
+1@ma_h,89,63,0	duplicate(#Patternwarp10)	#Patternwarp15	WARPNPC,7,7
+1@ma_h,100,63,0	duplicate(#Patternwarp10)	#Patternwarp16	WARPNPC,7,7
+1@ma_h,51,79,0	duplicate(#Patternwarp10)	#Patternwarp17	WARPNPC,10,10
+1@ma_h,51,46,0	duplicate(#Patternwarp10)	#Patternwarp18	WARPNPC,10,10
+1@ma_h,73,80,0	duplicate(#Patternwarp10)	#Patternwarp19	WARPNPC,10,10
+1@ma_h,73,46,0	duplicate(#Patternwarp10)	#Patternwarp20	WARPNPC,10,10
+1@ma_h,95,79,0	duplicate(#Patternwarp10)	#Patternwarp21	WARPNPC,10,10
+1@ma_h,95,46,0	duplicate(#Patternwarp10)	#Patternwarp22	WARPNPC,10,10
+//1@ma_h,193,82,0	duplicate(#Patternwarp10)	#Patternwarp23	WARPNPC,7,7
+//1@ma_h,193,82,0	duplicate(#Patternwarp10)	#Patternwarp24	WARPNPC,7,7
+1@ma_h,117,77,0	duplicate(#Patternwarp10)	#Patternwarp25	WARPNPC,10,10
+1@ma_h,131,77,0	duplicate(#Patternwarp10)	#Patternwarp26	WARPNPC,10,10
+1@ma_h,146,77,0	duplicate(#Patternwarp10)	#Patternwarp27	WARPNPC,10,10
+1@ma_h,117,63,0	duplicate(#Patternwarp10)	#Patternwarp28	WARPNPC,10,10
+1@ma_h,131,63,0	duplicate(#Patternwarp10)	#Patternwarp29	WARPNPC,10,10
+1@ma_h,146,63,0	duplicate(#Patternwarp10)	#Patternwarp30	WARPNPC,10,10
+1@ma_h,117,49,0	duplicate(#Patternwarp10)	#Patternwarp31	WARPNPC,10,10
+1@ma_h,131,49,0	duplicate(#Patternwarp10)	#Patternwarp32	WARPNPC,10,10
+1@ma_h,146,49,0	duplicate(#Patternwarp10)	#Patternwarp33	WARPNPC,10,10
 
 // Disable select warps.
 // Custom, but saves processing and lines.

npc/re/instances/BuwayaCave.txt

@@ -267,7 +267,7 @@ OnMyMobDead:
 	end;
 }
 
-1@ma_c,38,118,0	script	#box_out	45,2,2,{
+1@ma_c,33,118,0	script	#box_out	45,2,2,{
 OnInstanceInit:
 OnDisable:
 	disablenpc instance_npcname("#box_out");
@@ -308,7 +308,7 @@ OnTimer35000:
 	initnpctimer;
 	disablenpc instance_npcname("#box_call");
 	end;
-OnTouch:
+OnTouch_:
 	specialeffect2 EF_GUIDEDATTACK;
 	warp instance_mapname("1@ma_c"),33,112;
 	end;

npc/re/instances/HazyForest.txt

@@ -175,7 +175,7 @@ bif_fild01,161,355,0	script	Log Tunnel	844,{
 OnInstanceInit:
 	enablenpc instance_npcname("#Whisper_mist");
 	end;
-OnTouch:
+OnTouch_:
 	disablenpc instance_npcname("#Whisper_mist");
 	initnpctimer;
 	end;
@@ -1033,7 +1033,7 @@ bif_fild01,38,374,0	script	Mysterious Flower#ep14_1	844,{
 
 1@mist,109,70,0	script	a1_a2	45,1,1,{
 	end;
-OnTouch:
+OnTouch_:
 	if (checkquest(7211,PLAYTIME) == -1)
 		setquest 7211;
 	warp instance_mapname("1@mist"),116,40;

npc/re/instances/OctopusCave.txt

@@ -161,7 +161,7 @@ mal_dun01,153,237,5	script	Weird Entrance	844,{
 //============================================================
 1@cash,199,99,0	script	oct_enter	139,4,4,{
 	end;
-OnTouch:
+OnTouch_:
 	donpcevent instance_npcname("oct_enter_broad")+"::OnEnable";
 	specialeffect EF_BASH;
 	disablenpc instance_npcname("oct_enter");
@@ -297,7 +297,7 @@ OnDisable:
 	killmonster instance_mapname("1@cash"),instance_npcname(strnpcinfo(0))+"::OnMyMobDead"; // Not in official script.
 	disablenpc instance_npcname(strnpcinfo(0));
 	end;
-OnTouch:
+OnTouch_:
 	if (getd("."+strnpcinfo(0)+instance_id())) end;
 	setd "."+strnpcinfo(0)+instance_id(),1;
 	hideonnpc instance_npcname(strnpcinfo(0));
@@ -435,7 +435,7 @@ OnDisable:
 OnInstanceInit:
 	disablenpc instance_npcname("oct_backattack1");
 	end;
-OnTouch:
+OnTouch_:
 	set .@map$, instance_mapname("1@cash");
 	monster .@map$,39,59,"Hydra",1068,1;
 	monster .@map$,40,59,"Hydra",1068,1;
@@ -458,7 +458,7 @@ OnEnable:
 OnInstanceInit:
 	disablenpc instance_npcname("oct_backattack2");
 	end;
-OnTouch:
+OnTouch_:
 	if (getd("."+instance_id())) end;
 	setd "."+instance_id(),1;
 	initnpctimer;
@@ -498,7 +498,7 @@ OnEnable:
 OnInstanceInit:
 	disablenpc instance_npcname("oct_backattack3");
 	end;
-OnTouch:
+OnTouch_:
 	if (getd("."+instance_id())) end;
 	setd "."+instance_id(),1;
 	set .@map$, instance_mapname("1@cash");
@@ -525,7 +525,7 @@ OnEnable:
 OnInstanceInit:
 	disablenpc instance_npcname("oct_backattack4");
 	end;
-OnTouch:
+OnTouch_:
 	if (getd("."+instance_id())) end;
 	setd "."+instance_id(),1;
 	set .@map$, instance_mapname("1@cash");
@@ -699,11 +699,43 @@ OnTouch:
 
 // Warp Portals
 //============================================================
-1@cash,193,82,0	warp	oct_door1	2,2,1@cash,151,48
-1@cash,154,53,0	warp	oct_door2	2,2,1@cash,197,87
-1@cash,187,99,0	warp	oct_door3	2,2,1@cash,148,128
-1@cash,153,133,0	warp	oct_door4	2,2,1@cash,197,99
-1@cash,209,100,0	warp	oct_door5	2,2,1@cash,250,111
-1@cash,244,118,0	warp	oct_door6	2,2,1@cash,199,100
-1@cash,209,83,0	warp	oct_door7	2,2,1@cash,252,46
-1@cash,246,53,0	warp	oct_door8	2,2,1@cash,203,83
+1@cash,193,82,0	script	oct_door1	WARPNPC,2,2,{
+OnTouch:
+	warp "1@cash",151,48;
+	end;
+}
+1@cash,154,53,0	script	oct_door2	WARPNPC,2,2,{
+OnTouch:
+	warp "1@cash",197,87;
+	end;
+}
+1@cash,187,99,0	script	oct_door3	WARPNPC,2,2,{
+OnTouch:
+	warp "1@cash",148,128;
+	end;
+}
+1@cash,153,133,0	script	oct_door4	WARPNPC,2,2,{
+OnTouch:
+	warp "1@cash",197,99;
+	end;
+}
+1@cash,209,100,0	script	oct_door5	WARPNPC,2,2,{
+OnTouch:
+	warp "1@cash",250,111;
+	end;
+}
+1@cash,244,118,0	script	oct_door6	WARPNPC,2,2,{
+OnTouch:
+	warp "1@cash",199,100;
+	end;
+}
+1@cash,209,83,0	script	oct_door7	WARPNPC,2,2,{
+OnTouch:
+	warp "1@cash",252,46;
+	end;
+}
+1@cash,246,53,0	script	oct_door8	WARPNPC,2,2,{
+OnTouch:
+	warp "1@cash",203,83;
+	end;
+}

npc/re/instances/OldGlastHeim.txt

@@ -648,7 +648,7 @@ OnDisable:
 OnEnable:
 	enablenpc instance_npcname(strnpcinfo(0));
 	end;
-OnTouch:
+OnTouch_:
 	set .@map1$, instance_mapname("1@gl_k");
 	set .@map2$, instance_mapname("2@gl_k");
 	switch(atoi(replacestr(strnpcinfo(2),"ghinstancewarp",""))) {
@@ -848,7 +848,7 @@ OnMyMobDead:
 //============================================================
 1@gl_k,221,82,3	script	Breathless Man#GHtramp1	849,4,4,{
 	end;
-OnTouch:
+OnTouch_:
 	set .@i, rand(1,10);
 	if (.@i == 1) set .@mobs,3;
 	else if (.@i == 2) set .@mobs,4;
@@ -968,7 +968,7 @@ OnMyMobDead:
 
 1@gl_k,150,257,3	script	#GHMclear3	111,9,9,{
 	end;
-OnTouch:
+OnTouch_:
 	donpcevent instance_npcname("#controlGH3")+"::OnEnable";
 	specialeffect EF_BASH;
 	donpcevent instance_npcname("#GHMclear3")+"::OnDisable";
@@ -1144,7 +1144,7 @@ OnEnable:
 
 2@gl_k,150,67,0	script	#effectGH01	111,10,10,{
 	end;
-OnTouch:
+OnTouch_:
 	if (.touch) {
 		set .touch,0;
 		specialeffect EF_BASH;
@@ -1490,7 +1490,7 @@ OnEnable:
 
 2@gl_k,150,179,0	script	#controlGH6	111,2,2,{
 	end;
-OnTouch:
+OnTouch_:
 	mapannounce instance_mapname("2@gl_k"), "???: Do not come! There are traps everywhere here... Aaaaack!!!!",bc_map,"0xFF0000";
 	specialeffect EF_BASH;
 	donpcevent instance_npcname("Himmelmez#ghinstance3")+"::OnEnable";
@@ -1510,7 +1510,7 @@ OnEnable:
 
 2@gl_k,158,252,1	script	Himmelmez#ghinstance3	650,7,7,{
 	end;
-OnTouch:
+OnTouch_:
 	specialeffect EF_BASH;
 	donpcevent instance_npcname("#controlGH5")+"::OnEnable";
 	donpcevent instance_npcname("Himmelmez#ghinstance4")+"::OnEnable";

npc/re/instances/WolfchevLaboratory.txt

@@ -1205,7 +1205,7 @@ OnEnable:
 	enablenpc instance_npcname("#potal_01");
 	end;
 
-OnTouch:
+OnTouch_:
 	warp instance_mapname("1@lhz"), 151, 29;
 	end;
 }
@@ -1223,7 +1223,7 @@ OnDisable:
 	disablenpc instance_npcname("#2_0");
 	end;
 
-OnTouch:
+OnTouch_:
 	donpcevent instance_npcname("Lab2#2_1")+"::OnEnable";
 	donpcevent instance_npcname("#2_0")+"::OnDisable";
 	end;
@@ -1574,7 +1574,7 @@ OnEnable:
 	enablenpc instance_npcname("#potal_02");
 	end;
 
-OnTouch:
+OnTouch_:
 	warp instance_mapname("1@lhz"), 84, 28;
 	end;
 }
@@ -1592,7 +1592,7 @@ OnDisable:
 	disablenpc instance_npcname("#3_0");
 	end;
 
-OnTouch:
+OnTouch_:
 	donpcevent instance_npcname("Lab3#3_1")+"::OnEnable";
 	donpcevent instance_npcname("#3_0")+"::OnDisable";
 	end;
@@ -1776,7 +1776,7 @@ OnDisable:
 	disablenpc instance_npcname("#potal_03");
 	end;
 
-OnTouch:
+OnTouch_:
 	warp instance_mapname("1@lhz"), 137, 100;
 	end;
 }
@@ -1794,7 +1794,7 @@ OnDisable:
 	disablenpc instance_npcname("#4_0");
 	end;
 
-OnTouch:
+OnTouch_:
 	donpcevent instance_npcname("Lab4#4_1")+"::OnEnable";
 	donpcevent instance_npcname("#4_0")+"::OnDisable";
 	end;

npc/re/jobs/3-1/guillotine_cross.txt

@@ -2334,7 +2334,7 @@ veins,206,56,0	script	#3rdgc_battleroom01	139,1,1,{
 OnInit:
 	set $@3rdgc_room01, 0;
 	end;
-OnTouch:
+OnTouch_:
 	if (job_3rd_gc == 12) {
 		if (checkquest(7107,PLAYTIME) == 2) {
 			mes "This must be the place Estillda told me about.";
@@ -2379,7 +2379,7 @@ OnDisable:
 OnStop:
 	stopnpctimer;
 	end;
-OnTouch:
+OnTouch_:
 	if (job_3rd_gc == 12) {
 		initnpctimer;
 		donpcevent "A man with black clothes::OnEnable";
@@ -2427,7 +2427,7 @@ OnEnable:
 OnReset:
 	killmonster "job3_guil02","A man with black clothes::OnMyMobDead";
 	end;
-OnTouch:
+OnTouch_:
 	if (!.on) end;
 	mes "[A man with black clothes]";
 	mes "You just arrived here.";
@@ -2755,7 +2755,7 @@ OnDisable:
 OnStop:
 	stopnpctimer;
 	end;
-OnTouch:
+OnTouch_:
 	if (job_3rd_gc == 17) {
 		initnpctimer;
 		donpcevent "#3rdgc_event_master::OnEnable";
@@ -2838,7 +2838,7 @@ OnEnable:
 OnDisable:
 	disablenpc "Barbed-Wire Entanglement";
 	end;
-OnTouch:
+OnTouch_:
 	mes "There is space on the bottom of the old fence.";
 	next;
 	if(select("Find another way.:Climb into the space.") == 2) {
@@ -2858,7 +2858,7 @@ OnStop:
 	killmonster "job3_guil03","#3rdgc_hide01::OnMyMobDead";
 	stopnpctimer;
 	end;
-OnTouch:
+OnTouch_:
 	mapannounce "job3_guil03","Man's voice : Umm? Is that a shadow in the window?",bc_map,"0xA8A8A8"; //FW_NORMAL 12 0 0
 	initnpctimer;
 	end;
@@ -2885,7 +2885,7 @@ OnStop:
 	killmonster "job3_guil03","#3rdgc_hide02::OnMyMobDead";
 	stopnpctimer;
 	end;
-OnTouch:
+OnTouch_:
 	mapannounce "job3_guil03","Man's voice : There is something outside!",bc_map,"0xA8A8A8"; //FW_NORMAL 12 0 0
 	initnpctimer;
 	end;
@@ -2912,7 +2912,7 @@ OnStop:
 	killmonster "job3_guil03","#3rdgc_hide03::OnMyMobDead";
 	stopnpctimer;
 	end;
-OnTouch:
+OnTouch_:
 	mapannounce "job3_guil03","Man's voice : What is that?",bc_map,"0xA8A8A8"; //FW_NORMAL 12 0 0
 	initnpctimer;
 	end;
@@ -3061,7 +3061,7 @@ OnEnable:
 OnReset:
 	killmonster "job3_guil03","Front Gate Guard#g01::OnMyMobDead";
 	end;
-OnTouch:
+OnTouch_:
 	disablenpc "Front Gate Guard#g01";
 	disablenpc "Front Gate Guard#g03";
 	disablenpc "Front Gate Guard#g04";
@@ -3092,7 +3092,7 @@ OnEnable:
 OnReset:
 	killmonster "job3_guil03","Back Gate Guard#g01::OnMyMobDead";
 	end;
-OnTouch:
+OnTouch_:
 	disablenpc "Back Gate Guard#g01";
 	disablenpc "Back Gate Guard#g03";
 	disablenpc "Back Gate Guard#g04";
@@ -3123,7 +3123,7 @@ OnEnable:
 OnReset:
 	killmonster "job3_guil03","Interior Guard#g01::OnMyMobDead";
 	end;
-OnTouch:
+OnTouch_:
 	disablenpc "Interior Guard#g01";
 	disablenpc "Interior Guard#g03";
 	disablenpc "Interior Guard#g04";
@@ -3154,7 +3154,7 @@ OnEnable:
 OnReset:
 	killmonster "job3_guil03","Exterior Guard#g01::OnMyMobDead";
 	end;
-OnTouch:
+OnTouch_:
 	mapannounce "job3_guil03","Guards : Who are you?!",bc_map,"0xA8A8A8"; //FW_NORMAL 12 0 0
 	disablenpc "Exterior Guard#g01";
 	monster "job3_guil03",88,44,"Exterior Guard",1985,1,"Exterior Guard#g01::OnMyMobDead";
@@ -3177,7 +3177,7 @@ OnEnable:
 OnReset:
 	killmonster "job3_guil03","Exterior Guard#g02::OnMyMobDead";
 	end;
-OnTouch:
+OnTouch_:
 	mapannounce "job3_guil03","Guards : Enemy?!",bc_map,"0xA8A8A8"; //FW_NORMAL 12 0 0
 	disablenpc "Exterior Guard#g02";
 	monster "job3_guil03",88,55,"Exterior Guard",1985,1,"Exterior Guard#g02::OnMyMobDead";
@@ -3200,7 +3200,7 @@ OnEnable:
 OnReset:
 	killmonster "job3_guil03","Exterior Guard#g03::OnMyMobDead";
 	end;
-OnTouch:
+OnTouch_:
 	mapannounce "job3_guil03","Guards : An invader, remove!",bc_map,"0xA8A8A8"; //FW_NORMAL 12 0 0
 	disablenpc "Exterior Guard#g03";
 	monster "job3_guil03",88,64,"Exterior Guard",1985,1,"Exterior Guard#g03::OnMyMobDead";
@@ -3223,7 +3223,7 @@ OnEnable:
 OnReset:
 	killmonster "job3_guil03","Exterior Guard#g04::OnMyMobDead";
 	end;
-OnTouch:
+OnTouch_:
 	mapannounce "job3_guil03","Guards : Who are you?!",bc_map,"0xA8A8A8"; //FW_NORMAL 12 0 0
 	disablenpc "Exterior Guard#g04";
 	monster "job3_guil03",73,62,"Exterior Guard",1985,1,"Exterior Guard#g04::OnMyMobDead";
@@ -3246,7 +3246,7 @@ OnEnable:
 OnReset:
 	killmonster "job3_guil03","Exterior Guard#g05::OnMyMobDead";
 	end;
-OnTouch:
+OnTouch_:
 	mapannounce "job3_guil03","Guards : Who are you?!",bc_map,"0xA8A8A8"; //FW_NORMAL 12 0 0
 	disablenpc "Exterior Guard#g05";
 	monster "job3_guil03",77,51,"Exterior Guards",1985,1,"Exterior Guard#g05::OnMyMobDead";
@@ -3269,7 +3269,7 @@ OnEnable:
 OnReset:
 	killmonster "job3_guil03","Exterior Guard#g06::OnMyMobDead";
 	end;
-OnTouch:
+OnTouch_:
 	mapannounce "job3_guil03","Guard : Who are you?!",bc_map,"0xA8A8A8"; //FW_NORMAL 12 0 0
 	disablenpc "Exterior Guard#g06";
 	monster "job3_guil03",73,34,"Exterior Guards",1985,1,"Exterior Guard#g06::OnMyMobDead";
@@ -3291,7 +3291,7 @@ OnDisable:
 OnReset:
 	killmonster "job3_guil03","Guard Dog#dog01::OnMyMobDead";
 	end;
-OnTouch:
+OnTouch_:
 	mapannounce "job3_guil03","You have been detected by the guard dog.",bc_map,"0x00ff00"; //FW_NORMAL 12 0 0
 	disablenpc "Guard Dog#dog01";
 	monster "job3_guil03",110,27,"Guard Dog",1866,1,"Guard Dog#dog01::OnMyMobDead";
@@ -3314,7 +3314,7 @@ OnDisable:
 OnReset:
 	killmonster "job3_guil03","Guard Dog#dog02::OnMyMobDead";
 	end;
-OnTouch:
+OnTouch_:
 	mapannounce "job3_guil03","You have been detected by the guard dog.",bc_map,"0x00ff00"; //FW_NORMAL 12 0 0
 	disablenpc "Guard Dog#dog02";
 	monster "job3_guil03",124,27,"Guard Dog",1866,1,"Guard Dog#dog02::OnMyMobDead";
@@ -3411,7 +3411,7 @@ OnStop:
 OnReset:
 	killmonster "job3_guil03",strnpcinfo(0)+"::OnMyMobDead";
 	end;
-OnTouch:
+OnTouch_:
 	set .@i, atoi(charat(strnpcinfo(0),19));
 	setarray .@x[1],64,86,83;
 	setarray .@y[1],68,63,36;
@@ -3436,7 +3436,7 @@ job3_guil03,83,36,5	duplicate(#3rdgc_gojung_kill01)	#3rdgc_gojung_kill03	456,6,6
 
 job3_guil03,88,71,0	script	#3rdgc_safezone01	139,1,1,{
 	end;
-OnTouch:
+OnTouch_:
 	mes "It's a good bush to hide yourself.";
 	donpcevent strnpcinfo(0)+"::OnTimer";
 	close;

npc/re/jobs/3-1/mechanic.txt

@@ -583,7 +583,7 @@ jupe_core2,242,62,3	script	Ghostfire#3	802,{
 }
 
 jupe_core2,29,150,0	script	#Foothold	139,1,1,{
-OnTouch:
+OnTouch_:
 	if (job__mechanic == 8) {
 		percentheal 0,-30;
 		mes "-Suddenly I feel power is-";
@@ -622,7 +622,7 @@ OnTouch:
 }
 
 jupe_core2,272,149,0	script	#Foothold2	139,1,1,{
-OnTouch:
+OnTouch_:
 	if (job__mechanic == 9) {
 		mes "-I had a feeling that power-";
 		mes "-has been draining out,-";
@@ -670,7 +670,7 @@ OnEnable:
 OnTimer180000:
 	donpcevent "#Door::OnDisable";
 	end;
-OnTouch:
+OnTouch_:
 	mes "-Once again a voice rings out-";
 	mes "-in my head. This time it is-";
 	mes "-different than before, it is a-";
@@ -711,7 +711,7 @@ OnTouch:
 }
 
 jupe_core2,149,34,0	script	#Acquiring Knowledge	139,1,0,{
-OnTouch:
+OnTouch_:
 	if (job__mechanic == 9) {
 		mes "-The moment I stepped on-";
 		mes "-the foothold the voice-";

npc/re/jobs/3-1/ranger.txt

@@ -1260,7 +1260,7 @@ OnDisable:
 	killmonster "job3_rang02","Summon Monster#jr_10::OnMyMobDead";
 	disablenpc "Summon Monster#jr_10";
 	end;
-OnTouch:
+OnTouch_:
 	percentheal 10,0;
 	specialeffect2 EF_ABSORBSPIRITS;
 	mapannounce "job3_rang02","Test Supervisor, Caution : You are doing well! If you come closer a little more, you should be able to see me.",bc_map,"0x87ceeb"; //FW_NORMAL 12 0 0
@@ -1283,7 +1283,7 @@ OnDisable:
 	stopnpctimer;
 	disablenpc "Test Supervisor#jr_11";
 	end;
-OnTouch:
+OnTouch_:
 	if (job_ranger01 == 6) {
 		if (countitem(12258)) {
 			mes "[Test Supervisor, Caution]";

npc/re/jobs/3-1/warlock.txt

@@ -24,7 +24,7 @@
 //============================================================
 
 -	script	#distorted_space_	-1,{
-OnTouch:
+OnTouch_:
 	if (job_wl > 1) {
 		mes " - There is a strange distortion here - ";
 		if (strnpcinfo(0) == "#distorted_space_1" && (Class == Job_Warlock || Class == Job_Warlock_T || Class == Job_Baby_Warlock)) {

npc/re/jobs/3-2/genetic.txt

@@ -1019,7 +1019,7 @@ job3_gen01,85,25,1	script	Opened Book#gen	111,{
 }
 
 job3_gen01,81,81,0	script	#dbroom	139,2,2,{
-OnTouch:
+OnTouch_:
 	mes "- It's a room that looks like a storehouse, thanks to so many parcels piled up in the room. -";
 	close;
 }

npc/re/jobs/3-2/minstrel.txt

@@ -1091,7 +1091,7 @@ OnTouch:
 }
 
 ice_dun01,157,15,0	script	#Minsicecave1	139,2,2,{
-OnTouch:
+OnTouch_:
 	if (job_min == 13) {
 		mes "-A long time ago-";
 		close2;
@@ -1102,7 +1102,7 @@ OnTouch:
 }
 
 ice_dun01,157,23,0	script	#Minsicecave2	139,2,2,{
-OnTouch:
+OnTouch_:
 	if (job_min == 13) {
 		mes "-The giant born to ice-";
 		close2;
@@ -1113,7 +1113,7 @@ OnTouch:
 }
 
 ice_dun01,141,41,0	script	#Minsicecave3	139,2,2,{
-OnTouch:
+OnTouch_:
 	if (job_min == 13) {
 		mes "-died-";
 		close2;
@@ -1124,7 +1124,7 @@ OnTouch:
 }
 
 ice_dun01,120,35,0	script	#Minsicecave4	139,2,2,{
-OnTouch:
+OnTouch_:
 	if (job_min == 13) {
 		mes "-His body became the ground-";
 		close2;
@@ -1135,7 +1135,7 @@ OnTouch:
 }
 
 ice_dun01,104,30,0	script	#Minsicecave5	139,2,2,{
-OnTouch:
+OnTouch_:
 	if (job_min == 13) {
 		mes "-His bones became a mountain-";
 		close2;
@@ -1146,7 +1146,7 @@ OnTouch:
 }
 
 ice_dun01,86,23,0	script	#Minsicecave6	139,2,2,{
-OnTouch:
+OnTouch_:
 	if (job_min == 13) {
 		mes "-His skin became soil-";
 		close2;
@@ -1157,7 +1157,7 @@ OnTouch:
 }
 
 ice_dun01,75,19,0	script	#Minsicecave7	139,2,2,{
-OnTouch:
+OnTouch_:
 	if (job_min == 13) {
 		mes "-His blood became a river-";
 		close2;
@@ -1168,7 +1168,7 @@ OnTouch:
 }
 
 ice_dun01,56,12,0	script	#Minsicecave8	139,2,2,{
-OnTouch:
+OnTouch_:
 	if (job_min == 13) {
 		mes "-His hair became a plant-";
 		close2;
@@ -1179,7 +1179,7 @@ OnTouch:
 }
 
 ice_dun01,29,26,0	script	#Minsicecave9	139,2,2,{
-OnTouch:
+OnTouch_:
 	if (job_min == 13) {
 		mes "-His head became the sky-";
 		close2;
@@ -1190,7 +1190,7 @@ OnTouch:
 }
 
 ice_dun01,25,46,0	script	#Minsicecave10	139,2,2,{
-OnTouch:
+OnTouch_:
 	if (job_min == 13) {
 		mes "-His tears from his-";
 		close2;
@@ -1201,7 +1201,7 @@ OnTouch:
 }
 
 ice_dun01,20,66,0	script	#Minsicecave11	139,2,2,{
-OnTouch:
+OnTouch_:
 	if (job_min == 13) {
 		mes "-eyes became dew-";
 		close2;
@@ -1212,7 +1212,7 @@ OnTouch:
 }
 
 ice_dun01,22,85,0	script	#Minsicecave12	139,2,2,{
-OnTouch:
+OnTouch_:
 	if (job_min == 13) {
 		mes "-on the leaves-";
 		percentheal -90,0;

npc/re/jobs/3-2/royal_guard.txt

@@ -486,7 +486,7 @@ gl_church,105,115,0	duplicate(Delicate trace#01)	Delicate trace#11	844
 
 gl_church,158,100,0	script	#Clue of traces	111,4,4,{
 	end;
-OnTouch:
+OnTouch_:
 	if (job_royal == 4 && countitem(6274) == 0) {
 		specialeffect2 EF_FREEZE;
 		mes "I can feel strong power around here. It would be better to explore around here.";

npc/re/jobs/3-2/shadow_chaser.txt

@@ -66,7 +66,7 @@ morocc,156,70,3	script	Girl#sc00	93,3,3,{
 	mes "Eh?";
 	mes "I don't have anything for you...";
 	close;
-OnTouch:
+OnTouch_:
 	if (BaseJob == Job_Rogue && BaseLevel > 98 && JobLevel > 49 && job_sha == 0) {
 		mes "[Girl]";
 		mes "Hey? Stop!";

npc/re/jobs/3-2/sura.txt

@@ -678,7 +678,7 @@ OnEnable:
 }
 
 sword_2-1,223,205,0	script	#Sura_garajjom	139,10,10,{
-OnTouch:
+OnTouch_:
 	warp "sword_1-1",216,168;
 	end;
 OnInit:

npc/re/jobs/novice/academy.txt

@@ -3048,7 +3048,7 @@ iz_ac01,134,47,5	script	Trainer Mainz#ac	4_M_KY_KNT,4,4,{
 		}
 	}
 
-OnTouch:
+OnTouch_:
 	emotion e_otl;
 	end;
 }
@@ -8358,7 +8358,7 @@ iz_ac02_b,70,85,5	duplicate(Arang#ac)	Arang#ac_b	4_F_TAEKWON
 iz_ac02_c,70,85,5	duplicate(Arang#ac)	Arang#ac_c	4_F_TAEKWON
 iz_ac02_d,70,85,5	duplicate(Arang#ac)	Arang#ac_d	4_F_TAEKWON
 
-iz_ac01,53,49,0	script	#acKick	HIDDEN_NPC,5,5,{
+iz_ac01,54,49,0	script	#acKick	HIDDEN_NPC,5,5,{
 	end;
 
 OnTouch:
@@ -8373,10 +8373,10 @@ OnTouch:
 	}
 }
 
-iz_ac01_a,53,49,0	duplicate(#acKick)	#acKick_a	HIDDEN_NPC,5,5
-iz_ac01_b,53,49,0	duplicate(#acKick)	#acKick_b	HIDDEN_NPC,5,5
-iz_ac01_c,53,49,0	duplicate(#acKick)	#acKick_c	HIDDEN_NPC,5,5
-iz_ac01_d,53,49,0	duplicate(#acKick)	#acKick_d	HIDDEN_NPC,5,5
+iz_ac01_a,54,49,0	duplicate(#acKick)	#acKick_a	HIDDEN_NPC,5,5
+iz_ac01_b,54,49,0	duplicate(#acKick)	#acKick_b	HIDDEN_NPC,5,5
+iz_ac01_c,54,49,0	duplicate(#acKick)	#acKick_c	HIDDEN_NPC,5,5
+iz_ac01_d,54,49,0	duplicate(#acKick)	#acKick_d	HIDDEN_NPC,5,5
 
 // =============================================================================
 // = Archer

npc/re/quests/eden/eden_121_130.txt

@@ -552,7 +552,7 @@ S_Erasequest:
 		next;
 	}
 	return;
-OnTouch:
+OnTouch_:
 	if (para_120lv01 == 1) {
 		emotion e_gasp;
 		mes "[Melody-Jack]";

npc/re/quests/quests_dicastes.txt

@@ -307,7 +307,7 @@ dic_dun01,284,102,5	script	Dirty Vigilante#ep13_3	450,{
 
 mid_camp,216,246,0	script	#ep133_event03	139,2,2,{
 	end;
-OnTouch:
+OnTouch_:
 	if (ep13_3_secret == 23) {
 		donpcevent "Suspicious Guy#ep133_::OnEnable";
 		cutin "ep13_loki01",2;
@@ -1794,7 +1794,7 @@ dic_in01,300,280,5	script	Minister Ahat#ep133_21	493,{
 }
 
 dic_in01,138,188,0	script	#ep133_event02	139,4,4,{
-OnTouch:
+OnTouch_:
 	if (ep13_3_secret == 19) {
 		if (!isequipped(2782)) {
 			mes "[Quiet Voice]";

npc/re/quests/quests_eclage.txt

@@ -8382,7 +8382,7 @@ ecl_in02,98,32,3	script	Eclage Guard#tl1b	4_M_FAIRYSOLDIER2,{
 
 ecl_in02,133,115,0	script	#pa0829Prison Guard	HIDDEN_WARP_NPC,3,3,{
 	end;
-OnTouch:
+OnTouch_:
 	if (ep14_2_etran < 2) {
 		mes "[Clever]";
 		mes "Hey Guard~ I think the humidity here is too high. My skin is gonna be ruined. Is that ok? Huh?";
@@ -10017,7 +10017,7 @@ ecl_tdun01,60,56,4	script	#pa0829EtranInterio	HIDDEN_NPC,{
 
 ecl_tdun01,60,56,0	script	#pa0829EtranInterioTouch	HIDDEN_WARP_NPC,4,4,{
 	end;
-OnTouch:
+OnTouch_:
 	// disable_items;
 	 if (checkweight(1201,1) == 0) {
 		mes "It seems like there are too many types of items. Let's try again after reducing the number of types.";
@@ -10043,7 +10043,7 @@ OnTouch:
 
 ecl_fild01,183,94,0	script	#pa0829EtranExterioTouch	HIDDEN_WARP_NPC,3,3,{
 	end;
-OnTouch:
+OnTouch_:
 	if (checkweight(1201,1) == 0) {
 		mes "It seems like there are too many types of items. Let's try again after reducing the number of types.";
 		close;
@@ -10162,7 +10162,7 @@ OnTouch:
 
 eclage,291,301,0	script	#pa0829RobertExteriTouch	HIDDEN_WARP_NPC,3,3,{
 	end;
-OnTouch:
+OnTouch_:
 	// disable_items;
 	if (checkweight(1201,1) == 0) {
 		mes "It seems like there are too many types of items. Let's try again after reducing the number of types.";
@@ -10202,7 +10202,7 @@ OnTouch:
 
 ecl_fild01,110,240,0	script	#pa0829Reactor1	HIDDEN_WARP_NPC,3,3,{
 	end;
-OnTouch:
+OnTouch_:
 	// disable_items;
 	if (checkweight(1201,1) == 0) {
 		mes "It seems like there are too many types of items. Let's try again after reducing the number of types.";
@@ -10237,7 +10237,7 @@ ecl_fild01,234,266,0	duplicate(#pa0829Reactor1)	#pa0829Reactor6	HIDDEN_WARP_NPC,
 
 ecl_fild01,110,198,0	script	#pa0829Reactor2	HIDDEN_WARP_NPC,3,3,{
 	end;
-OnTouch:
+OnTouch_:
 	// disable_items;
 	 if (checkweight(1201,1) == 0) {
 		mes "It seems like there are too many types of items. Let's try again after reducing the number of types.";
@@ -10281,7 +10281,7 @@ ecl_fild01,179,125,0	duplicate(#pa0829Reactor2)	#pa0829Reactor7	HIDDEN_WARP_NPC,
 
 ecl_fild01,165,158,0	script	#pa0829Reactor3	HIDDEN_WARP_NPC,3,3,{
 	end;
-OnTouch:
+OnTouch_:
 	// disable_items;
 	if (checkweight(1201,1) == 0) {
 		mes "It seems like there are too many types of items. Let's try again after reducing the number of types.";
@@ -10325,7 +10325,7 @@ ecl_fild01,179,179,0	duplicate(#pa0829Reactor3)	#pa0829Reactor8	HIDDEN_WARP_NPC,
 
 ecl_fild01,237,166,0	script	#pa0829Reactor4	HIDDEN_WARP_NPC,3,3,{
 	end;
-OnTouch:
+OnTouch_:
 	// disable_items;
 	if (checkweight(1201,1) == 0) {
 		mes "It seems like there are too many types of items. Let's try again after reducing the number of types.";
@@ -10364,7 +10364,7 @@ ecl_fild01,187,243,0	duplicate(#pa0829Reactor4)	#pa0829Reactor9	HIDDEN_WARP_NPC,
 
 ecl_fild01,230,206,0	script	#pa0829Reactor5	HIDDEN_WARP_NPC,3,3,{
 	end;
-OnTouch:
+OnTouch_:
 	// disable_items;
 	if (checkweight(1201,1) == 0) {
 		mes "It seems like there are too many types of items. Let's try again after reducing the number of types.";
@@ -16120,7 +16120,7 @@ eclage,274,294,5	script	Laphines Conversation#tl	4_F_FAIRYKID,3,3,{
 	mes "So, you'd better not try to find out something from me, outsider!";
 	close;
 
-OnTouch:
+OnTouch_:
 	if (ep14_2_mylord == 10)
 		doevent "Eclage Resident#tl02::OnTalk";
 	else if (ep14_2_mylord == 11) {
@@ -16656,7 +16656,7 @@ ecl_tdun04,32,35,3	script	Hisie#tlord	4_M_FARIY_HISIE,{
 
 eclage,280,290,0	script	#Hisie01	HIDDEN_WARP_NPC,0,3,{
 	end;
-OnTouch:
+OnTouch_:
 	if (ep14_2_mylord == 19) {
 		cutin "hisie01",0;
 		mes "[Hisie]";
@@ -16813,7 +16813,7 @@ OnTimer400000:
 
 que_avan01,26,26,0	script	#tltimer	HIDDEN_WARP_NPC,0,1,{
 	end;
-OnTouch:
+OnTouch_:
 	mes "It was definitely a small Yai when first entered, but upon regaining consciousness after being very dizzy, a huge space appeared.";
 	initnpctimer;
 	hideonnpc "#tltimer";
@@ -17139,7 +17139,7 @@ OnInit:
 	hideonnpc "Hisie#tlspt";
 	end;
 
-OnTouch:
+OnTouch_:
 	if (ep14_2_mylord == 22) {
 		switch(rand(1,5)) {
 		case 2:
@@ -17157,7 +17157,7 @@ OnTouch:
 }
 
 que_avan01,25,41,5	script	Hisie#tlhunt	4_M_FARIY_HISIE,10,10,{
-OnTouch:
+OnTouch_:
 	cutin "hisie01",0;
 	mes "[Hisie]";
 	if (ep14_2_mylord == 22) {

npc/re/quests/quests_malaya.txt

@@ -1515,7 +1515,7 @@ ma_fild01,178,206,0	script	Black Bamboo#malaya	844,4,4,{
 	mes "[" + strcharinfo(0) + "]";
 	mes "I knew I could do this!";
 	close;
-OnTouch:
+OnTouch_:
 	if ((checkquest(7366) != -1) || (checkquest(7380) != -1)) {
 		specialeffect EF_LEVEL99_4;
 	}
@@ -4278,7 +4278,7 @@ ma_in01,47,101,3	script	Totoy#buwaya	577,7,7,{
 		mes "Would there be something awesome to surprise people with?";
 		close;
 	}
-OnTouch:
+OnTouch_:
 	emotion e_omg;
 	end;
 }
@@ -5475,7 +5475,7 @@ ma_fild01,165,237,4	script	Malaya Immigrant#bako2	582,{
 
 ma_fild01,171,235,0	script	#bako1	139,2,2,{
 	end;
-OnTouch:
+OnTouch_:
 	if (malaya_bakona1 == 5) {
 		mes "The damage is so severe";
 		mes "that the record is unidentifiable.";
@@ -6196,7 +6196,7 @@ ma_fild01,54,253,4	script	Gruffy Worker#bako2	582,{
 
 ma_fild01,54,244,0	script	#bako2	139,2,2,{
 	end;
-OnTouch:
+OnTouch_:
 	if (malaya_bakona2 == 9) {
 		mes "I should set up the trap";
 		mes "right about here.";
@@ -6265,7 +6265,7 @@ ma_fild01,236,119,5	script	Grumpy Worker#bako2	577,{
 
 ma_fild01,242,116,0	script	#bako3	139,2,2,{
 	end;
-OnTouch:
+OnTouch_:
 	if (malaya_bakona2 == 10) {
 		mes "I should set up the trap";
 		mes "right about here.";
@@ -6338,7 +6338,7 @@ ma_scene01,177,89,4	script	Cowardly Worker#bako2	578,{
 
 ma_scene01,179,85,0	script	#bako4	139,2,2,{
 	end;
-OnTouch:
+OnTouch_:
 	if (malaya_bakona2 == 11) {
 		mes "I should set up the trap";
 		mes "right about here.";
@@ -6408,7 +6408,7 @@ ma_scene01,141,118,4	script	Gloomy Worker#bako2	582,{
 
 ma_scene01,138,122,0	script	#bako5	139,2,2,{
 	end;
-OnTouch:
+OnTouch_:
 	if (malaya_bakona2 == 12) {
 		mes "I should set up the trap";
 		mes "right about here.";
@@ -6475,7 +6475,7 @@ ma_scene01,175,170,5	script	Sentimental Worker#bako2	578,{
 
 ma_scene01,171,174,0	script	#bako6	139,2,2,{
 	end;
-OnTouch:
+OnTouch_:
 	if (malaya_bakona2 == 13) {
 		mes "I should set up the trap";
 		mes "right about here.";

npc/re/quests/quests_mora.txt

@@ -1464,7 +1464,7 @@ sec_in02,35,175,0	script	Theore Set Guid	436,{
 //============================================================
 dic_in01,262,191,0	script	#ep14_1_xq02	139,0,3,{
 	end;
-OnTouch:
+OnTouch_:
 	if (ep13_3_secret > 22 && checkquest(7206) == -1) {
 		enablenpc "Cheshire#ep14_1_xq01";
 		cutin "ep13_cheshire_h",1;
@@ -1855,7 +1855,7 @@ L_CheckPlaytime:
 
 dicastes02,125,192,0	script	#call_cheshir_ep14	139,0,3,{
 	end;
-OnTouch:
+OnTouch_:
 	if (ep13_3_secret > 22) {
 		if (rand(2)) {
 			emotion e_ho,1;

npc/re/warps/cities/eclage.txt

@@ -30,7 +30,7 @@ ecl_in02,80,18,0	warp	in02-2_in02-3	1,1,ecl_in02,157,66
 ecl_in02,157,68,0	warp	in02-3_in02-2	1,1,ecl_in02,83,18
 ecl_in01,84,68,0	script	in01e_hub2-1	45,1,1,{
 	end;
-OnTouch:
+OnTouch_:
 	if (ep14_2_mylord == 29)
 		warp "ecl_hub01",106,31;
 	else
@@ -41,7 +41,7 @@ ecl_hub01,107,110,0	warp	hub2-1_in01e	1,1,ecl_in01,82,68
 ecl_hub01,127,95,0	warp	hub2-2_hub3-1	1,1,ecl_hub01,18,32
 ecl_hub01,18,34,0	script	hub3-1_hub2-2	45,1,1,{
 	end;
-OnTouch:
+OnTouch_:
 	if (ep14_2_mylord == 29)
 		warp "ecl_hub01",135,14;
 	else

npc/re/warps/cities/rachel.txt

@@ -123,4 +123,8 @@ ra_in01,375,109,0	warp	rachel85	1,1,rachel,116,154
 rachel,116,158,0	warp	rachel86	1,1,ra_in01,375,114
 
 //Additional Temple warp
-ra_temin,275,243,0	warp	rachel87	1,1,ra_temin,131,131
+ra_temin,275,243,0	script	rachel87	WARPNPC,1,1,{
+OnTouch:
+	warp "ra_temin",131,131;
+	end;
+}

npc/re/warps/fields/bif_fild.txt

@@ -35,7 +35,7 @@ mora,56,25,0	warp	bifrost_field0005	1,1,bif_fild02,176,162
 		}
 	}
 	close;
-OnTouch:
+OnTouch_:
 	specialeffect EF_LEVEL99_4;
 	end;
 }

npc/re/warps/other/jobquests.txt

@@ -24,7 +24,11 @@ job_sage,55,154,0	warp	sage_out	1,1,yuno_in03,169,171
 //==============================================================================
 //Arch Bishop
 //==============================================================================
-job3_arch01,29,24,0	warp	#archout	1,1,odin_tem02,282,263
+job3_arch01,29,24,0	script	#archout	WARPNPC,1,1,{
+OnTouch:
+	warp "odin_tem02",282,263;
+	end;
+}
 
 //==============================================================================
 //Guillotine Cross

npc/re/warps/other/paradise.txt

@@ -12,14 +12,58 @@
 //= 1.0 First Release
 //============================================================
 
-moc_para01,57,27,0	warp	#warp_2_pub	1,1,moc_para01,162,26
-moc_para01,158,26,0	warp	#warp_2_din_1	1,1,moc_para01,55,27
-moc_para01,48,16,0	warp	#warp_2_2f	1,1,moc_para01,48,164
-moc_para01,47,161,0	warp	#warp_2_1f	1,1,moc_para01,47,18
-moc_para01,107,12,0	warp	#warp_2_din_2	1,1,moc_para01,47,37
-moc_para01,100,27,0	warp	#warp_2_gym	1,1,moc_para01,47,85
-moc_para01,49,86,0	warp	#warp_2_pass_1	1,1,moc_para01,103,27
-moc_para01,113,32,0	warp	#warp_2_ware	1,1,moc_para01,105,92
-moc_para01,102,92,0	warp	#warp_2_pass_2	1,1,moc_para01,109,33
-moc_para01,41,187,0	warp	#warp_2_room2	1,1,moc_para01,179,93
-moc_para01,179,90,0	warp	#warp_2_2fhall_3	1,1,moc_para01,41,185
+moc_para01,57,27,0	script	#warp_2_pub	WARPNPC,1,1,{
+OnTouch:
+	warp "moc_para01",162,26;
+	end;
+}
+moc_para01,158,26,0	script	#warp_2_din_1	WARPNPC,1,1,{
+OnTouch:
+	warp "moc_para01",55,27;
+	end;
+}
+moc_para01,48,16,0	script	#warp_2_2f	WARPNPC,1,1,{
+OnTouch:
+	warp "moc_para01",48,164;
+	end;
+}
+moc_para01,47,161,0	script	#warp_2_1f	WARPNPC,1,1,{
+OnTouch:
+	warp "moc_para01",47,18;
+	end;
+}
+moc_para01,107,12,0	script	#warp_2_din_2	WARPNPC,1,1,{
+OnTouch:
+	warp "moc_para01",47,37;
+	end;
+}
+moc_para01,100,27,0	script	#warp_2_gym	WARPNPC,1,1,{
+OnTouch:
+	warp "moc_para01",47,85;
+	end;
+}
+moc_para01,49,86,0	script	#warp_2_pass_1	WARPNPC,1,1,{
+OnTouch:
+	warp "moc_para01",103,27;
+	end;
+}
+moc_para01,113,32,0	script	#warp_2_ware	WARPNPC,1,1,{
+OnTouch:
+	warp "moc_para01",105,92;
+	end;
+}
+moc_para01,102,92,0	script	#warp_2_pass_2	WARPNPC,1,1,{
+OnTouch:
+	warp "moc_para01",109,33;
+	end;
+}
+moc_para01,41,187,0	script	#warp_2_room2	WARPNPC,1,1,{
+OnTouch:
+	warp "moc_para01",179,93;
+	end;
+}
+moc_para01,179,90,0	script	#warp_2_2fhall_3	WARPNPC,1,1,{
+OnTouch:
+	warp "moc_para01",41,185;
+	end;
+}