summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--npc/events/gdevent_aru.txt2
-rw-r--r--npc/events/gdevent_sch.txt2
-rw-r--r--npc/quests/kiel_hyre_quest.txt6
-rw-r--r--npc/quests/quests_13_1.txt6
-rw-r--r--npc/quests/quests_morocc.txt14
-rw-r--r--npc/quests/quests_nameless.txt6
-rw-r--r--npc/quests/skills/knight_skills.txt1
7 files changed, 3 insertions, 34 deletions
diff --git a/npc/events/gdevent_aru.txt b/npc/events/gdevent_aru.txt
index 898880d02..d192456aa 100644
--- a/npc/events/gdevent_aru.txt
+++ b/npc/events/gdevent_aru.txt
@@ -1333,7 +1333,7 @@ OnInit:
disablenpc "removepp_aru_gd";
end;
-OnTouch2:
+OnTouch:
.@paper_aru_gd = countitem(Glitering_PaperA);
.@spaper_aru_gd = countitem(Glitering_PaperB);
if ((.@paper_aru_gd > 0) || (.@spaper_aru_gd > 0)) {
diff --git a/npc/events/gdevent_sch.txt b/npc/events/gdevent_sch.txt
index e04a28075..dcb529ebe 100644
--- a/npc/events/gdevent_sch.txt
+++ b/npc/events/gdevent_sch.txt
@@ -1330,7 +1330,7 @@ OnInit:
disablenpc "removepp_sch_gd";
end;
-OnTouch2:
+OnTouch:
.@paper_sch_gd = countitem(Glitering_PaperA);
.@spaper_sch_gd = countitem(Glitering_PaperB);
if ((.@paper_sch_gd > 0) || (.@spaper_sch_gd > 0)) {
diff --git a/npc/quests/kiel_hyre_quest.txt b/npc/quests/kiel_hyre_quest.txt
index 9468bbe38..3a21bbfa0 100644
--- a/npc/quests/kiel_hyre_quest.txt
+++ b/npc/quests/kiel_hyre_quest.txt
@@ -302,7 +302,6 @@ yuno_in01,35,179,4 script Pub Master#kh 1_ETC_01,5,5,{
close;
}
-//OnTouch2:
OnTouch:
if (KielHyreQuest < 1) {
mes "[Vandt]";
@@ -1987,7 +1986,6 @@ kh_vila,175,19,0 duplicate(BookKHQ1) Book#kh4 HIDDEN_NPC
//- Store room interior; Letter to Elly on the floor. -
kh_vila,179,11,0 script Letter#kh FAKE_NPC,1,1,{
-//OnTouch2:
OnTouch:
if (KielHyreQuest == 18) {
if (checkweight(Kyll_Hire_Letter,1) == 0) {
@@ -2369,7 +2367,6 @@ kh_vila,39,41,0 script Pool#khp1 HIDDEN_NPC,{
//- Cottage interior, upstairs; Vicious Dog -
kh_vila,181,178,4 script Vicious Dog#khp1 4_DOG01,7,3,{
-//OnTouch2:
OnTouch:
mes "*Grrr~*";
next;
@@ -3456,7 +3453,6 @@ kh_dun01,162,206,0 duplicate(KHKeyardReader) Mechanical Device HIDDEN_NPC
//- Kiel Hyre - OnTouch -
kh_dun01,224,233,0 script Factory B Area Door FAKE_NPC,5,5,{
-//OnTouch2:
OnTouch:
if (KielHyreQuest == 40) {
if (checkweight(Steel_Piece,1) == 0) {
@@ -4612,7 +4608,6 @@ kh_mansion,18,30,4 script Allysia 4_F_KHELLISIA,{
//- Abduction triggering NPC -
lighthalzen,188,200,0 script Abduction_trigger FAKE_NPC,3,1,{
-//OnTouch2:
OnTouch:
if (KielHyreQuest == 50) {
mes "^3355FFAs you walked out of";
@@ -4630,7 +4625,6 @@ OnTouch:
//- Mysterious Woman "Mitchell Layla" -
kh_mansion,25,79,4 script Mysterious Woman#kh 4_F_JOB_HUNTER,3,3,{
-//OnTouch2:
OnTouch:
if (KielHyreQuest == 50) {
mes "^3355FFYou awaken with your";
diff --git a/npc/quests/quests_13_1.txt b/npc/quests/quests_13_1.txt
index 80a458dea..562609d31 100644
--- a/npc/quests/quests_13_1.txt
+++ b/npc/quests/quests_13_1.txt
@@ -7470,7 +7470,6 @@ OnDisable:
disablenpc "Hillsrion#alba01";
end;
-//OnTouch2:
OnTouch:
mes "It is hissing in a low voice.";
mes "Sometimes it purrs, too.";
@@ -7487,7 +7486,6 @@ OnDisable:
disablenpc "Tatacho#alba02";
end;
-//OnTouch2:
OnTouch:
mes "[Taab]";
mes "Oh, please don't disturb";
@@ -7508,7 +7506,6 @@ OnDisable:
disablenpc "Cornus#alba03";
end;
-//OnTouch2:
OnTouch:
mes "[Taab]";
mes "Oh, please don't get";
@@ -11528,7 +11525,6 @@ OnInit:
}
mid_camp,205,312,0 script #moc2_talkevent01 FAKE_NPC,1,1,{
-//OnTouch2:
OnTouch:
if (mao_morocc2 == 11) {
mes "[Mr. Kidd]";
@@ -13394,7 +13390,6 @@ hu_fild04,235,103,0 script Heap of Earth#mao2_01 CLEAR_NPC,4,4,{
close;
}
-//OnTouch2:
OnTouch:
if (mao_morocc2 == 7) {
specialeffect EF_LEVEL99_4;
@@ -13731,7 +13726,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 FAKE_NPC,1,1,{
-//OnTouch2:
OnTouch:
if (mao_morocc2 == 17) {
mes "- You find a side door that leads to the basement.";
diff --git a/npc/quests/quests_morocc.txt b/npc/quests/quests_morocc.txt
index 1b387be0c..0d509b2d4 100644
--- a/npc/quests/quests_morocc.txt
+++ b/npc/quests/quests_morocc.txt
@@ -1092,7 +1092,6 @@ moc_fild20,354,183,3 script Continental Guard#01::MocConGuard 4_M_MOC_SOLDIER,3,
end;
}
-//OnTouch2:
OnTouch:
mes "[Continental Guard]";
mes "No commoners are allowed in the area beyond this point.";
@@ -2647,7 +2646,6 @@ yuno,333,210,5 script Library Master#garas 1_M_LIBRARYMASTER,{
}
yuno,336,203,0 script #garas_catch HIDDEN_WARP_NPC,3,3,{
-//OnTouch2:
OnTouch:
if (barmunt_crow == 2) {
mes "[Dog]";
@@ -2912,8 +2910,7 @@ yuno_in04,100,5,3 script Hot Bestseller Corner HIDDEN_NPC,{
}
yuno_in04,100,3,0 script #garas_path HIDDEN_WARP_NPC,1,1,{
-//OnTouch2:
-OnTouch2:
+OnTouch:
if (barmunt_crow == 6) {
mes "...................................";
next;
@@ -3572,7 +3569,6 @@ yuno_in04,167,120,3 script Worn-out Book#garas HIDDEN_NPC,{
}
que_ba,247,33,0 script #bpast_1_1 FAKE_NPC,1,1,{
-//OnTouch2:
OnTouch:
if (barmunt_crow < 4) {
warp "ama_dun03",119,110;
@@ -3640,7 +3636,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 FAKE_NPC,3,3,{
-//OnTouch2:
OnTouch:
if (barmunt_crow < 4) {
warp "yuno_in04",100,3;
@@ -3712,7 +3707,6 @@ que_ba,99,51,7 script Grotesque Man#zid1 4_M_MUT1,{
}
que_ba,53,232,0 script #garas_f_yume HIDDEN_WARP_NPC,1,1,{
-//OnTouch2:
OnTouch:
if (barmunt_crow == 5) {
//GetHEALTHSTATE VAR_HEALTHSTATENORMAL 0
@@ -3757,7 +3751,6 @@ que_ba,48,227,7 script Grotesque Man#zid2 4_M_MUT1,{
}
que_ba,264,186,0 script #barmut_room1 HIDDEN_WARP_NPC,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";
@@ -3797,7 +3790,6 @@ que_ba,270,181,3 script #barmunt_fire 4_M_SAGE_C,{
}
que_ba,270,270,0 script #barmunt_living HIDDEN_WARP_NPC,1,1,{
-//OnTouch2:
OnTouch:
mes "..................";
mes "..................";
@@ -3974,7 +3966,6 @@ cave,82,97,3 script Cave Settler#g1 4_M_CAVE1,3,3,{
close;
}
-//OnTouch2:
OnTouch:
if (barmunt_crow == 8) {
mes "[Cave Settler]";
@@ -6810,7 +6801,6 @@ prt_castle,368,312,4 script Prince#ern 4_M_2NDPRIN1,{
}
prt_castle,163,319,0 script #twonoble FAKE_NPC,3,3,{
-//OnTouch2:
OnTouch:
if (nkprince_eisen == 7) {
donpcevent "Young Noble#valter::OnEnable";
@@ -7723,7 +7713,6 @@ prt_castle,176,170,5 script Guard#princein 8W_SOLDIER,{
}
prt_castle,121,168,0 script #arm HIDDEN_NPC,4,4,{
-//OnTouch2:
OnTouch:
if (nk_prince == 8) {
mes "[" + strcharinfo(PC_NAME) + "]";
@@ -7744,7 +7733,6 @@ OnTouch:
}
prt_castle,316,313,0 script #arm1 HIDDEN_NPC,3,3,{
-//OnTouch2:
OnTouch:
if (nkprince_eisen > 14) {
mes "[" + strcharinfo(PC_NAME) + "]";
diff --git a/npc/quests/quests_nameless.txt b/npc/quests/quests_nameless.txt
index 1371c93bf..0e0422530 100644
--- a/npc/quests/quests_nameless.txt
+++ b/npc/quests/quests_nameless.txt
@@ -2862,7 +2862,6 @@ que_temsky,99,100,6 script Pope#rachel2 4_F_ARUNA_POP,{
}
que_temsky,100,93,0 script #em_sky_s FAKE_NPC,5,2,{
-//OnTouch2:
OnTouch:
if (aru_em == 21) {
mes "^3355FFHigh Priest Zhed and High";
@@ -4252,7 +4251,6 @@ cmd_fild01,55,160,0 script Heap of Earth CLEAR_NPC,{
close;
}
-//OnTouch2:
OnTouch:
if (diamond_edq < 9) {
mes "[Dorian]";
@@ -5162,7 +5160,6 @@ moc_ruins,152,147,5 script Ibrahim 4_M_JOB_HUNTER,3,3,{
mes "kept it well hidden...";
close;
-//OnTouch2:
OnTouch:
if ((diamond_edq == 14) && (BaseLevel > 65)) {
mes "[Ibrahim]";
@@ -6861,7 +6858,6 @@ prt_in,168,18,1 script Valdes 1_M_YOUNGKNIGHT,2,2,{
mes "It's like my life is over...";
close;
-//OnTouch2:
OnTouch:
if (zdan_edq == 2) {
mes "[Valdes]";
@@ -8702,7 +8698,6 @@ OnInit:
$@mosnter = 0;
end;
-//OnTouch2:
OnTouch:
if (zdan_edq == 15) {
mes "^FF0000*Creak Creak*^000000";
@@ -11647,7 +11642,6 @@ OnTimer60000:
gef_fild08,182,182,0 script #CallGhost FAKE_NPC,2,2,{
end;
-//OnTouch2:
OnTouch:
if (jewel_nd == 21) {
if (countitem(Unlucky_Emerald) > 0) {
diff --git a/npc/quests/skills/knight_skills.txt b/npc/quests/skills/knight_skills.txt
index 3e177243a..1230ecab9 100644
--- a/npc/quests/skills/knight_skills.txt
+++ b/npc/quests/skills/knight_skills.txt
@@ -332,7 +332,6 @@ prt_in,85,99,3 script Knight#kabuto 4_M_JOB_KNIGHT2,{
}
prontera,69,351,0 script #tour HIDDEN_NPC,5,5,{
-//OnTouch2:
OnTouch:
if (KNGT_SK > 2)
end;
generated by cgit v1.2.3-70-g09d2 (git 2.46.0) at 2024-11-15 08:02:21 +0000