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_pupa.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_pupa.txt')
| -rw-r--r-- | npc/pre-re/quests/collection/quest_pupa.txt | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/npc/pre-re/quests/collection/quest_pupa.txt b/npc/pre-re/quests/collection/quest_pupa.txt index 64aafe42f..ec38c275a 100644 --- a/npc/pre-re/quests/collection/quest_pupa.txt +++ b/npc/pre-re/quests/collection/quest_pupa.txt @@ -13,8 +13,8 @@ //============================================================ gef_fild04,191,54,3 script Halgus#Pupa_Hunt 2_F_MAGICMASTER,{ - if (checkquest(60110) != -1) { - if (checkquest(60110,HUNTING) != 2 ) { + if (questprogress(60110)) { + if (questprogress(60110,HUNTING) != 2) { mes "[Halgus]"; mes "Have you gotten rid of the Pupa?"; next; @@ -54,8 +54,8 @@ gef_fild04,191,54,3 script Halgus#Pupa_Hunt 2_F_MAGICMASTER,{ close; } } - if (checkquest(60111) != -1) { - if (checkquest(60111,HUNTING) != 2 ) { + if (questprogress(60111)) { + if (questprogress(60111,HUNTING) != 2) { mes "[Halgus]"; mes "Have you gotten rid of the Pupa?"; next; @@ -96,8 +96,8 @@ gef_fild04,191,54,3 script Halgus#Pupa_Hunt 2_F_MAGICMASTER,{ close; } } - if (checkquest(60112) != -1) { - if (checkquest(60112,HUNTING) != 2 ) { + if (questprogress(60112)) { + if (questprogress(60112,HUNTING) != 2) { mes "[Halgus]"; mes "Have you gotten rid of the Pupa?"; next; |