diff options
Diffstat (limited to 'npc/events/gdevent_sch.txt')
| -rw-r--r-- | npc/events/gdevent_sch.txt | 19 |
1 files changed, 8 insertions, 11 deletions
diff --git a/npc/events/gdevent_sch.txt b/npc/events/gdevent_sch.txt index 31537763e..a6df13889 100644 --- a/npc/events/gdevent_sch.txt +++ b/npc/events/gdevent_sch.txt @@ -63,8 +63,8 @@ schg_dun01,194,148,5 script Dwarf#sch_gd 4_M_DWARF,{ mes "Hey did you see an ugly Goblin come by? He stole something from me!"; close; } - set .@chk_urquest,checkquest(2143,PLAYTIME); - set .@chk_yourgdname$,getguildname(getcharid(2)); + .@chk_urquest = questprogress(2143,PLAYTIME); + .@chk_yourgdname$ = getguildname(getcharid(2)); if ($@gdeventv_s1 == 0) { if ($@gdevents_s$ == "") { set $@gdeventv_s1,1; @@ -178,8 +178,7 @@ schg_dun01,194,148,5 script Dwarf#sch_gd 4_M_DWARF,{ } } else if ($@gdevents_s$ == .@chk_yourgdname$) { - set .@chk_urquest1,checkquest(2144); - if ((.@chk_urquest1 == 0) || (.@chk_urquest1 == 1)) { + if (questprogress(2144) == 1) { mes "[Morestone]"; mes "I, Morestone, have made an alliance with the "+$@gdevents_s$+" guild."; mes "Oh, you are a member."; @@ -321,8 +320,7 @@ schg_dun01,194,148,5 script Dwarf#sch_gd 4_M_DWARF,{ } else { if ($@gdevents_s$ == .@chk_yourgdname$) { - set .@chk_urquest1,checkquest(2144); - if ((.@chk_urquest1 == 0) || (.@chk_urquest1 == 1)) { + if (questprogress(2144) == 1) { mes "[Morestone]"; mes "I, Morestone, have made an alliance with the "+$@gdevents_s$+" guild."; mes "Oh, you are a member."; @@ -503,8 +501,8 @@ schg_que01,100,81,3 script Pierrot Pier#sch_gd 4_M_PIERROT,{ } if (strcharinfo(0) == getguildmaster(getcharid(2))) { if ($@gdeventv_s2 == 0) { - set .@que_2143,checkquest(2143,PLAYTIME); - if (.@que_2143 == -1) { + .@que_2143 = questprogress(2143,PLAYTIME); + if (!.@que_2143) { setnpcdisplay "Pierrot Pier#sch_gd", 4_M_PIERROT; mes "A lonely clown is juggling."; next; @@ -588,7 +586,7 @@ schg_que01,100,81,3 script Pierrot Pier#sch_gd 4_M_PIERROT,{ donpcevent "Gergath#sch_gd::OnEnable"; close; } - else if ((.@que_2143 == 0) || (.@que_2143 == 1)) { + else if (.@que_2143 == 1) { mes "[Pierrot Pier]"; mes "Let's talk after I finished reading my master's message. Beep beep."; close; @@ -766,8 +764,7 @@ schg_que01,100,81,3 script Pierrot Pier#sch_gd 4_M_PIERROT,{ } } else if ($@gdeventv_s2 == 3) { - set .@que_2143,checkquest(2143); - if (.@que_2143 == 3) { + if (questprogress(2143) == 2) { erasequest 2143; } mes "[Pierrot Pier]"; |