Fixed incorrect OnTouch label in Crow of Destiny Quest (issue #1840) and in Guild dungeon 2 event. Thanks @Tokeiburu

npc/events/gdevent_aru.txt

@@ -1323,7 +1323,7 @@ OnInit:
 	disablenpc "removepp_aru_gd";
 	end;
 
-OnTouch2:
+OnTouch:
 	set .@paper_aru_gd,countitem(6030);
 	set .@spaper_aru_gd,countitem(6031);
 	if ((.@paper_aru_gd > 0) || (.@spaper_aru_gd > 0)) {

npc/events/gdevent_sch.txt

@@ -1322,7 +1322,7 @@ OnInit:
 	disablenpc "removepp_sch_gd";
 	end;
 
-OnTouch2:
+OnTouch:
 	set .@paper_sch_gd,countitem(6030);
 	set .@spaper_sch_gd,countitem(6031);
 	if ((.@paper_sch_gd > 0) || (.@spaper_sch_gd > 0)) {

npc/quests/kiel_hyre_quest.txt

@@ -439,7 +439,6 @@ yuno_in01,35,179,4	script	Pub Master#kh	46,5,5,{
 		close;
 	}
 
-//OnTouch2:
 OnTouch:
 	if (KielHyreQuest < 1) {
 		mes "[Vandt]";
@@ -2166,7 +2165,6 @@ kh_vila,175,19,0	duplicate(BookKHQ1)	Book#kh4	111
 // Store room interior; Letter to Elly on the floor.
 //----------------------------------------------------------------------------
 kh_vila,179,11,0	script	Letter#kh	-1,1,1,{
-//OnTouch2:
 OnTouch:
 	if (KielHyreQuest == 18) {
 		if (checkweight(7490,1) == 0) {
@@ -2563,7 +2561,6 @@ kh_vila,39,41,0	script	Pool#khp1	111,{
 // Cottage interior, upstairs; Vicious Dog
 //----------------------------------------------------------------------------
 kh_vila,181,178,4	script	Vicious Dog#khp1	81,7,3,{
-//OnTouch2:
 OnTouch:
 	mes "*Grrr~*";
 	next;
@@ -3685,7 +3682,6 @@ kh_dun01,162,206,0	duplicate(KHKeyardReader)	Mechanical Device	111
 // Kiel Hyre - OnTouch
 //----------------------------------------------------------------------------
 kh_dun01,224,233,0	script	Factory B Area Door	-1,5,5,{
-//OnTouch2:
 OnTouch:
 	if (KielHyreQuest == 40) {
 		if (checkweight(7497,1) == 0) {
@@ -4854,7 +4850,6 @@ kh_mansion,18,30,4	script	Allysia	894,{
 // Abduction triggering NPC
 //----------------------------------------------------------------------------
 lighthalzen,188,200,0	script	Abduction_trigger	-1,3,1,{
-//OnTouch2:
 OnTouch:
 	if (KielHyreQuest == 50) {
 		mes "^3355FFAs you walked out of";
@@ -4874,7 +4869,6 @@ OnTouch:
 //----------------------------------------------------------------------------
 kh_mansion,25,79,4	script	Mysterious Woman#kh	727,3,3,{
 
-//OnTouch2:
 OnTouch:
 	if (KielHyreQuest == 50) {
 		mes "^3355FFYou awaken with your";

npc/quests/quests_13_1.txt

@@ -7459,7 +7459,6 @@ OnDisable:
 	disablenpc "Hillsrion#alba01";
 	end;
 
-//OnTouch2:
 OnTouch:
 	mes "It is hissing in a low voice.";
 	mes "Sometimes it purrs, too.";
@@ -7476,7 +7475,6 @@ OnDisable:
 	disablenpc "Tatacho#alba02";
 	end;
 
-//OnTouch2:
 OnTouch:
 	mes "[Taab]";
 	mes "Oh, please don't disturb";
@@ -7497,7 +7495,6 @@ OnDisable:
 	disablenpc "Cornus#alba03";
 	end;
 
-//OnTouch2:
 OnTouch:
 	mes "[Taab]";
 	mes "Oh, please don't get";
@@ -11520,7 +11517,6 @@ OnInit:
 }
 
 mid_camp,205,312,0	script	#moc2_talkevent01	-1,1,1,{
-//OnTouch2:
 OnTouch:
 	if (mao_morocc2 == 11) {
 		mes "[Mr. Kidd]";
@@ -13386,7 +13382,6 @@ hu_fild04,235,103,0	script	Heap of Earth#mao2_01	844,4,4,{
 		close;
 	}
 
-//OnTouch2:
 OnTouch:
 	if (mao_morocc2 == 7) {
 		specialeffect EF_LEVEL99_4;
@@ -13723,7 +13718,6 @@ yuno_fild09,234,133,0	warp	#moc2_fild09-que_dan02	1,1,que_dan02,13,10
 que_dan02,13,6,0	warp	#moc_que_dan02-fild09	1,1,yuno_fild09,234,129
 
 que_dan02,21,37,0	script	#moc2_b1_gate	-1,1,1,{
-//OnTouch2:
 OnTouch:
 	if (mao_morocc2 == 17) {
 		mes "- You find a side door that leads to the basement.";

npc/quests/quests_morocc.txt

@@ -1101,7 +1101,6 @@ moc_fild20,354,183,3	script	Continental Guard#01::MocConGuard	707,3,3,{
 		end;
 	}
 
-//OnTouch2:
 OnTouch:
 	mes "[Continental Guard]";
 	mes "No commoners are allowed in the area beyond this point.";
@@ -2657,7 +2656,6 @@ yuno,333,210,5	script	Library Master#garas	57,{
 }
 
 yuno,336,203,0	script	#garas_catch	139,3,3,{
-//OnTouch2:
 OnTouch:
 	if (barmunt_crow == 2) {
 		mes "[Dog]";
@@ -2922,8 +2920,7 @@ yuno_in04,100,5,3	script	Hot Bestseller Corner	111,{
 }
 
 yuno_in04,100,3,0	script	#garas_path	139,1,1,{
-//OnTouch2:
-OnTouch2:
+OnTouch:
 	if (barmunt_crow == 6) {
 		mes "...................................";
 		next;
@@ -3582,7 +3579,6 @@ yuno_in04,167,120,3	script	Worn-out Book#garas	111,{
 }
 
 que_ba,247,33,0	script	#bpast_1_1	-1,1,1,{
-//OnTouch2:
 OnTouch:
 	if (barmunt_crow < 4) {
 		warp "ama_dun03",119,110;
@@ -3650,7 +3646,6 @@ que_ba,183,25,0	warp	#bpast_2to3_1	1,1,que_ba,72,25
 que_ba,183,52,0	warp	#bpast_2to3_2	1,1,que_ba,72,51
 
 que_ba,102,56,0	script	#3room_barmunt	-1,3,3,{
-//OnTouch2:
 OnTouch:
 	if (barmunt_crow < 4) {
 		warp "yuno_in04",100,3;
@@ -3722,7 +3717,6 @@ que_ba,99,51,7	script	Grotesque Man#zid1	999,{
 }
 
 que_ba,53,232,0	script	#garas_f_yume	139,1,1,{
-//OnTouch2:
 OnTouch:
 	if (barmunt_crow == 5) {
 		//GetHEALTHSTATE VAR_HEALTHSTATENORMAL 0
@@ -3767,7 +3761,6 @@ que_ba,48,227,7	script	Grotesque Man#zid2	999,{
 }
 
 que_ba,264,186,0	script	#barmut_room1	139,2,2,{
-//OnTouch2:
 OnTouch:
 	if (barmunt_crow == 11) {
 		mes "^660000You wake up, and look around you. Somehow, you've now ended up in a huge mansion.^000000";
@@ -3807,7 +3800,6 @@ que_ba,270,181,3	script	#barmunt_fire	755,{
 }
 
 que_ba,270,270,0	script	#barmunt_living	139,1,1,{
-//OnTouch2:
 OnTouch:
 	mes "..................";
 	mes "..................";
@@ -3984,7 +3976,6 @@ cave,82,97,3	script	Cave Settler#g1	996,3,3,{
 		close;
 	}
 
-//OnTouch2:
 OnTouch:
 	if (barmunt_crow == 8) {
 		mes "[Cave Settler]";
@@ -6893,7 +6884,6 @@ prt_castle,368,312,4	script	Prince#ern	985,{
 }
 
 prt_castle,163,319,0	script	#twonoble	-1,3,3,{
-//OnTouch2:
 OnTouch:
 	if (nkprince_eisen == 7) {
 		donpcevent "Young Noble#valter::OnEnable";
@@ -7826,7 +7816,6 @@ prt_castle,176,170,5	script	Guard#princein	105,{
 }
 
 prt_castle,121,168,0	script	#arm	111,4,4,{
-//OnTouch2:
 OnTouch:
 	if (nk_prince == 8) {
 		mes "[" + strcharinfo(0) + "]";
@@ -7847,7 +7836,6 @@ OnTouch:
 }
 
 prt_castle,316,313,0	script	#arm1	111,3,3,{
-//OnTouch2:
 OnTouch:
 	if (nkprince_eisen > 14) {
 		mes "[" + strcharinfo(0) + "]";

npc/quests/quests_nameless.txt

@@ -2871,7 +2871,6 @@ que_temsky,99,100,6	script	Pope#rachel2	936,{
 }
 
 que_temsky,100,93,0	script	#em_sky_s	-1,5,2,{
-//OnTouch2:
 OnTouch:
 	if (aru_em == 21) {
 		mes "^3355FFHigh Priest Zhed and High";
@@ -4262,7 +4261,6 @@ cmd_fild01,55,160,0	script	Heap of Earth	844,{
 		close;
 	}
 
-//OnTouch2:
 OnTouch:
 	if (diamond_edq < 9) {
 		mes "[Dorian]";
@@ -5173,7 +5171,6 @@ moc_ruins,152,147,5	script	Ibrahim	732,3,3,{
 	mes "kept it well hidden...";
 	close;
 
-//OnTouch2:
 OnTouch:
 if ((diamond_edq == 14) && (BaseLevel > 65)) {
 	mes "[Ibrahim]";
@@ -6873,7 +6870,6 @@ prt_in,168,18,1	script	Valdes	65,2,2,{
 	mes "It's like my life is over...";
 	close;
 
-//OnTouch2:
 OnTouch:
 	if (zdan_edq == 2) {
 		mes "[Valdes]";
@@ -8443,7 +8439,6 @@ OnInit:
 	set $@mosnter,0;
 	end;
 
-//OnTouch2:
 OnTouch:
 	if (zdan_edq == 15) {
 		mes "^FF0000*Creak Creak*^000000";
@@ -11389,7 +11384,6 @@ OnTimer60000:
 gef_fild08,182,182,0	script	#CallGhost	-1,2,2,{
 	end;
 
-//OnTouch2:
 OnTouch:
 	if (jewel_nd == 21) {
 		if (countitem(7725) > 0) {

npc/quests/skills/knight_skills.txt

@@ -309,7 +309,6 @@ prt_in,85,99,3	script	Knight#kabuto	734,{
 }
 
 prontera,69,351,0	script	#tour	111,5,5,{
-//OnTouch2:
 OnTouch:
 	if (KNGT_SK > 2)
 		end;