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_disguiseloliruri.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_disguiseloliruri.txt')
-rw-r--r-- | npc/pre-re/quests/collection/quest_disguiseloliruri.txt | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/npc/pre-re/quests/collection/quest_disguiseloliruri.txt b/npc/pre-re/quests/collection/quest_disguiseloliruri.txt index 35d48aef7..8ff2ebce3 100644 --- a/npc/pre-re/quests/collection/quest_disguiseloliruri.txt +++ b/npc/pre-re/quests/collection/quest_disguiseloliruri.txt @@ -13,8 +13,8 @@ nif_fild02,332,327,4 script Deadman 4_M_NFDEADMAN,{ - if (checkquest(60173) != -1) { - if (checkquest(60173,HUNTING) != 2 ) { + if (questprogress(60173)) { + if (questprogress(60173,HUNTING) != 2) { mes "[Deadman]"; mes "Have you finished hunting the 50 Disguise?"; next; @@ -51,8 +51,8 @@ nif_fild02,332,327,4 script Deadman 4_M_NFDEADMAN,{ erasequest 60173; close; } - if (checkquest(60176) != -1) { - if (checkquest(60176,HUNTING) != 2 ) { + if (questprogress(60176)) { + if (questprogress(60176,HUNTING) != 2) { mes "[Deadman]"; mes "Have you finished hunting the 50 Loli Ruri?"; next; |