Skip to content

Commit 2ff43cd

Browse files
dastgirdastgir
authored
Merge pull request #1536 from Asheraf/ontouch
Fixed incorrect OnTouch label in Crow of Destiny Quest
2 parents 4f3b79f + 8f49585 commit 2ff43cd

7 files changed

Lines changed: 3 additions & 34 deletions

File tree

‎npc/events/gdevent_aru.txt‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1333,7 +1333,7 @@ OnInit:
13331333
disablenpc "removepp_aru_gd";
13341334
end;
13351335

1336-
OnTouch2:
1336+
OnTouch:
13371337
.@paper_aru_gd = countitem(Glitering_PaperA);
13381338
.@spaper_aru_gd = countitem(Glitering_PaperB);
13391339
if ((.@paper_aru_gd > 0) || (.@spaper_aru_gd > 0)) {

‎npc/events/gdevent_sch.txt‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1330,7 +1330,7 @@ OnInit:
13301330
disablenpc "removepp_sch_gd";
13311331
end;
13321332

1333-
OnTouch2:
1333+
OnTouch:
13341334
.@paper_sch_gd = countitem(Glitering_PaperA);
13351335
.@spaper_sch_gd = countitem(Glitering_PaperB);
13361336
if ((.@paper_sch_gd > 0) || (.@spaper_sch_gd > 0)) {

‎npc/quests/kiel_hyre_quest.txt‎

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -302,7 +302,6 @@ yuno_in01,35,179,4 script Pub Master#kh 1_ETC_01,5,5,{
302302
close;
303303
}
304304

305-
//OnTouch2:
306305
OnTouch:
307306
if (KielHyreQuest < 1) {
308307
mes "[Vandt]";
@@ -1987,7 +1986,6 @@ kh_vila,175,19,0 duplicate(BookKHQ1) Book#kh4 HIDDEN_NPC
19871986

19881987
//- Store room interior; Letter to Elly on the floor. -
19891988
kh_vila,179,11,0 script Letter#kh FAKE_NPC,1,1,{
1990-
//OnTouch2:
19911989
OnTouch:
19921990
if (KielHyreQuest == 18) {
19931991
if (checkweight(Kyll_Hire_Letter,1) == 0) {
@@ -2369,7 +2367,6 @@ kh_vila,39,41,0 script Pool#khp1 HIDDEN_NPC,{
23692367

23702368
//- Cottage interior, upstairs; Vicious Dog -
23712369
kh_vila,181,178,4 script Vicious Dog#khp1 4_DOG01,7,3,{
2372-
//OnTouch2:
23732370
OnTouch:
23742371
mes "*Grrr~*";
23752372
next;
@@ -3456,7 +3453,6 @@ kh_dun01,162,206,0 duplicate(KHKeyardReader) Mechanical Device HIDDEN_NPC
34563453

34573454
//- Kiel Hyre - OnTouch -
34583455
kh_dun01,224,233,0 script Factory B Area Door FAKE_NPC,5,5,{
3459-
//OnTouch2:
34603456
OnTouch:
34613457
if (KielHyreQuest == 40) {
34623458
if (checkweight(Steel_Piece,1) == 0) {
@@ -4612,7 +4608,6 @@ kh_mansion,18,30,4 script Allysia 4_F_KHELLISIA,{
46124608

46134609
//- Abduction triggering NPC -
46144610
lighthalzen,188,200,0 script Abduction_trigger FAKE_NPC,3,1,{
4615-
//OnTouch2:
46164611
OnTouch:
46174612
if (KielHyreQuest == 50) {
46184613
mes "^3355FFAs you walked out of";
@@ -4630,7 +4625,6 @@ OnTouch:
46304625
//- Mysterious Woman "Mitchell Layla" -
46314626
kh_mansion,25,79,4 script Mysterious Woman#kh 4_F_JOB_HUNTER,3,3,{
46324627

4633-
//OnTouch2:
46344628
OnTouch:
46354629
if (KielHyreQuest == 50) {
46364630
mes "^3355FFYou awaken with your";

‎npc/quests/quests_13_1.txt‎

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -7470,7 +7470,6 @@ OnDisable:
74707470
disablenpc "Hillsrion#alba01";
74717471
end;
74727472

7473-
//OnTouch2:
74747473
OnTouch:
74757474
mes "It is hissing in a low voice.";
74767475
mes "Sometimes it purrs, too.";
@@ -7487,7 +7486,6 @@ OnDisable:
74877486
disablenpc "Tatacho#alba02";
74887487
end;
74897488

7490-
//OnTouch2:
74917489
OnTouch:
74927490
mes "[Taab]";
74937491
mes "Oh, please don't disturb";
@@ -7508,7 +7506,6 @@ OnDisable:
75087506
disablenpc "Cornus#alba03";
75097507
end;
75107508

7511-
//OnTouch2:
75127509
OnTouch:
75137510
mes "[Taab]";
75147511
mes "Oh, please don't get";
@@ -11528,7 +11525,6 @@ OnInit:
1152811525
}
1152911526

1153011527
mid_camp,205,312,0 script #moc2_talkevent01 FAKE_NPC,1,1,{
11531-
//OnTouch2:
1153211528
OnTouch:
1153311529
if (mao_morocc2 == 11) {
1153411530
mes "[Mr. Kidd]";
@@ -13394,7 +13390,6 @@ hu_fild04,235,103,0 script Heap of Earth#mao2_01 CLEAR_NPC,4,4,{
1339413390
close;
1339513391
}
1339613392

13397-
//OnTouch2:
1339813393
OnTouch:
1339913394
if (mao_morocc2 == 7) {
1340013395
specialeffect EF_LEVEL99_4;
@@ -13731,7 +13726,6 @@ yuno_fild09,234,133,0 warp #moc2_fild09-que_dan02 1,1,que_dan02,13,10
1373113726
que_dan02,13,6,0 warp #moc_que_dan02-fild09 1,1,yuno_fild09,234,129
1373213727

1373313728
que_dan02,21,37,0 script #moc2_b1_gate FAKE_NPC,1,1,{
13734-
//OnTouch2:
1373513729
OnTouch:
1373613730
if (mao_morocc2 == 17) {
1373713731
mes "- You find a side door that leads to the basement.";

‎npc/quests/quests_morocc.txt‎

Lines changed: 1 addition & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -1092,7 +1092,6 @@ moc_fild20,354,183,3 script Continental Guard#01::MocConGuard 4_M_MOC_SOLDIER,3,
10921092
end;
10931093
}
10941094

1095-
//OnTouch2:
10961095
OnTouch:
10971096
mes "[Continental Guard]";
10981097
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,{
26472646
}
26482647

26492648
yuno,336,203,0 script #garas_catch HIDDEN_WARP_NPC,3,3,{
2650-
//OnTouch2:
26512649
OnTouch:
26522650
if (barmunt_crow == 2) {
26532651
mes "[Dog]";
@@ -2912,8 +2910,7 @@ yuno_in04,100,5,3 script Hot Bestseller Corner HIDDEN_NPC,{
29122910
}
29132911

29142912
yuno_in04,100,3,0 script #garas_path HIDDEN_WARP_NPC,1,1,{
2915-
//OnTouch2:
2916-
OnTouch2:
2913+
OnTouch:
29172914
if (barmunt_crow == 6) {
29182915
mes "...................................";
29192916
next;
@@ -3572,7 +3569,6 @@ yuno_in04,167,120,3 script Worn-out Book#garas HIDDEN_NPC,{
35723569
}
35733570

35743571
que_ba,247,33,0 script #bpast_1_1 FAKE_NPC,1,1,{
3575-
//OnTouch2:
35763572
OnTouch:
35773573
if (barmunt_crow < 4) {
35783574
warp "ama_dun03",119,110;
@@ -3640,7 +3636,6 @@ que_ba,183,25,0 warp #bpast_2to3_1 1,1,que_ba,72,25
36403636
que_ba,183,52,0 warp #bpast_2to3_2 1,1,que_ba,72,51
36413637

36423638
que_ba,102,56,0 script #3room_barmunt FAKE_NPC,3,3,{
3643-
//OnTouch2:
36443639
OnTouch:
36453640
if (barmunt_crow < 4) {
36463641
warp "yuno_in04",100,3;
@@ -3712,7 +3707,6 @@ que_ba,99,51,7 script Grotesque Man#zid1 4_M_MUT1,{
37123707
}
37133708

37143709
que_ba,53,232,0 script #garas_f_yume HIDDEN_WARP_NPC,1,1,{
3715-
//OnTouch2:
37163710
OnTouch:
37173711
if (barmunt_crow == 5) {
37183712
//GetHEALTHSTATE VAR_HEALTHSTATENORMAL 0
@@ -3757,7 +3751,6 @@ que_ba,48,227,7 script Grotesque Man#zid2 4_M_MUT1,{
37573751
}
37583752

37593753
que_ba,264,186,0 script #barmut_room1 HIDDEN_WARP_NPC,2,2,{
3760-
//OnTouch2:
37613754
OnTouch:
37623755
if (barmunt_crow == 11) {
37633756
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,{
37973790
}
37983791

37993792
que_ba,270,270,0 script #barmunt_living HIDDEN_WARP_NPC,1,1,{
3800-
//OnTouch2:
38013793
OnTouch:
38023794
mes "..................";
38033795
mes "..................";
@@ -3974,7 +3966,6 @@ cave,82,97,3 script Cave Settler#g1 4_M_CAVE1,3,3,{
39743966
close;
39753967
}
39763968

3977-
//OnTouch2:
39783969
OnTouch:
39793970
if (barmunt_crow == 8) {
39803971
mes "[Cave Settler]";
@@ -6810,7 +6801,6 @@ prt_castle,368,312,4 script Prince#ern 4_M_2NDPRIN1,{
68106801
}
68116802

68126803
prt_castle,163,319,0 script #twonoble FAKE_NPC,3,3,{
6813-
//OnTouch2:
68146804
OnTouch:
68156805
if (nkprince_eisen == 7) {
68166806
donpcevent "Young Noble#valter::OnEnable";
@@ -7723,7 +7713,6 @@ prt_castle,176,170,5 script Guard#princein 8W_SOLDIER,{
77237713
}
77247714

77257715
prt_castle,121,168,0 script #arm HIDDEN_NPC,4,4,{
7726-
//OnTouch2:
77277716
OnTouch:
77287717
if (nk_prince == 8) {
77297718
mes "[" + strcharinfo(PC_NAME) + "]";
@@ -7744,7 +7733,6 @@ OnTouch:
77447733
}
77457734

77467735
prt_castle,316,313,0 script #arm1 HIDDEN_NPC,3,3,{
7747-
//OnTouch2:
77487736
OnTouch:
77497737
if (nkprince_eisen > 14) {
77507738
mes "[" + strcharinfo(PC_NAME) + "]";

‎npc/quests/quests_nameless.txt‎

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -2862,7 +2862,6 @@ que_temsky,99,100,6 script Pope#rachel2 4_F_ARUNA_POP,{
28622862
}
28632863

28642864
que_temsky,100,93,0 script #em_sky_s FAKE_NPC,5,2,{
2865-
//OnTouch2:
28662865
OnTouch:
28672866
if (aru_em == 21) {
28682867
mes "^3355FFHigh Priest Zhed and High";
@@ -4252,7 +4251,6 @@ cmd_fild01,55,160,0 script Heap of Earth CLEAR_NPC,{
42524251
close;
42534252
}
42544253

4255-
//OnTouch2:
42564254
OnTouch:
42574255
if (diamond_edq < 9) {
42584256
mes "[Dorian]";
@@ -5162,7 +5160,6 @@ moc_ruins,152,147,5 script Ibrahim 4_M_JOB_HUNTER,3,3,{
51625160
mes "kept it well hidden...";
51635161
close;
51645162

5165-
//OnTouch2:
51665163
OnTouch:
51675164
if ((diamond_edq == 14) && (BaseLevel > 65)) {
51685165
mes "[Ibrahim]";
@@ -6861,7 +6858,6 @@ prt_in,168,18,1 script Valdes 1_M_YOUNGKNIGHT,2,2,{
68616858
mes "It's like my life is over...";
68626859
close;
68636860

6864-
//OnTouch2:
68656861
OnTouch:
68666862
if (zdan_edq == 2) {
68676863
mes "[Valdes]";
@@ -8702,7 +8698,6 @@ OnInit:
87028698
$@mosnter = 0;
87038699
end;
87048700

8705-
//OnTouch2:
87068701
OnTouch:
87078702
if (zdan_edq == 15) {
87088703
mes "^FF0000*Creak Creak*^000000";
@@ -11647,7 +11642,6 @@ OnTimer60000:
1164711642
gef_fild08,182,182,0 script #CallGhost FAKE_NPC,2,2,{
1164811643
end;
1164911644

11650-
//OnTouch2:
1165111645
OnTouch:
1165211646
if (jewel_nd == 21) {
1165311647
if (countitem(Unlucky_Emerald) > 0) {

‎npc/quests/skills/knight_skills.txt‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -332,7 +332,6 @@ prt_in,85,99,3 script Knight#kabuto 4_M_JOB_KNIGHT2,{
332332
}
333333

334334
prontera,69,351,0 script #tour HIDDEN_NPC,5,5,{
335-
//OnTouch2:
336335
OnTouch:
337336
if (KNGT_SK > 2)
338337
end;

0 commit comments

Comments
 (0)