diff options
| author | shennetsind <ind@henn.et> | 2014-11-03 08:15:05 -0200 |
|---|---|---|
| committer | shennetsind <ind@henn.et> | 2014-11-03 08:15:05 -0200 |
| commit | bee4c9d36f4a27e39cc76dc5d6c5f876ed44a678 (patch) | |
| tree | 79f9aec5171e8aed2d701bf67167f260e05f41db /npc/pre-re/quests/collection/quest_frilldora.txt | |
| parent | 239d480487e24294975f35ed55f210837ad1088e (diff) | |
| parent | ce3f4bfbe016ea69c855146667ba9bd9e0e2e221 (diff) | |
| download | hercules-bee4c9d36f4a27e39cc76dc5d6c5f876ed44a678.tar.gz hercules-bee4c9d36f4a27e39cc76dc5d6c5f876ed44a678.tar.bz2 hercules-bee4c9d36f4a27e39cc76dc5d6c5f876ed44a678.tar.xz hercules-bee4c9d36f4a27e39cc76dc5d6c5f876ed44a678.zip | |
Merge branch 'master' of github.com:HerculesWS/Hercules
Signed-off-by: shennetsind <ind@henn.et>
Conflicts:
src/map/battle.c
Diffstat (limited to 'npc/pre-re/quests/collection/quest_frilldora.txt')
| -rw-r--r-- | npc/pre-re/quests/collection/quest_frilldora.txt | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/npc/pre-re/quests/collection/quest_frilldora.txt b/npc/pre-re/quests/collection/quest_frilldora.txt index 5c9321aa6..95ee22d3c 100644 --- a/npc/pre-re/quests/collection/quest_frilldora.txt +++ b/npc/pre-re/quests/collection/quest_frilldora.txt @@ -13,8 +13,8 @@ //============================================================ moc_fild17,66,273,5 script Lemly#Frilldora_Hunt 4_F_JOB_ASSASSIN,{ - if (checkquest(60134) != -1) { - if (checkquest(60134,HUNTING) != 2 ) { + if (questprogress(60134)) { + if (questprogress(60134,HUNTING) != 2) { mes "[Lemly]"; mes "Have you finished hunting the 50 Frilldora?"; next; @@ -53,8 +53,8 @@ moc_fild17,66,273,5 script Lemly#Frilldora_Hunt 4_F_JOB_ASSASSIN,{ close; } } - if (checkquest(60135) != -1) { - if (checkquest(60135,HUNTING) != 2 ) { + if (questprogress(60135)) { + if (questprogress(60135,HUNTING) != 2) { mes "[Lemly]"; mes "Have you finished hunting the 50 Frilldora?"; next; @@ -94,8 +94,8 @@ moc_fild17,66,273,5 script Lemly#Frilldora_Hunt 4_F_JOB_ASSASSIN,{ close; } } - if (checkquest(60136) != -1) { - if (checkquest(60136,HUNTING) != 2 ) { + if (questprogress(60136)) { + if (questprogress(60136,HUNTING) != 2) { mes "[Lemly]"; mes "Have you finished hunting the 150 Frilldora?"; next; |