diff options
Diffstat (limited to 'npc')
| -rw-r--r-- | npc/instances/SealedShrine.txt | 11 | ||||
| -rw-r--r-- | npc/re/instances/WolfchevLaboratory.txt | 10 | ||||
| -rw-r--r-- | npc/re/merchants/ninja_craftsman.txt | 2 |
3 files changed, 12 insertions, 11 deletions
diff --git a/npc/instances/SealedShrine.txt b/npc/instances/SealedShrine.txt index 82267be7a..240bc1ac4 100644 --- a/npc/instances/SealedShrine.txt +++ b/npc/instances/SealedShrine.txt @@ -272,7 +272,7 @@ prt_monk,261,91,3 script Rust Blackhand#edq 4_M_DWARF,{ mes "[Rust Blackhand]"; mes "Did you bring all of the ingredients?"; next; - if ((countitem(6004) > 0) && (countitem(2256) > 0) && (countitem(7799) > 29) && (countitem(7798) > 49) && (Zeny > 990000)) { + if (countitem(6004) && countitem(2256) && (countitem(7799) > 29) && (countitem(7798) > 49) && (Zeny >= 990000)) { mes "[Rust Blackhand]"; mes "kkk... You prepared the ingredients well. Why don't you leave it there and wait?"; next; @@ -348,7 +348,9 @@ prt_monk,261,91,3 script Rust Blackhand#edq 4_M_DWARF,{ next; mes "[Rust Blackhand]"; mes "You'll never know how great this hat is until you get one. If you understood, go and get the ingredients."; - changequest 3042,3043; + if (questprogress(3042)==1) + erasequest 3042; + setquest 3043; close; case 2: mes "[Rust Blackhand]"; @@ -403,8 +405,9 @@ prt_monk,261,91,3 script Rust Blackhand#edq 4_M_DWARF,{ next; mes "[Rust Blackhand]"; mes "You'll never know how great this hat is until you get one. If you understood, go and get the ingredients."; - //recall_completequest 3043 - changequest 3042,3043; + if (questprogress(3042)==1) + erasequest 3042; + setquest 3043; close; case 2: mes "[Rust Blackhand]"; diff --git a/npc/re/instances/WolfchevLaboratory.txt b/npc/re/instances/WolfchevLaboratory.txt index a4e484785..55fef1b07 100644 --- a/npc/re/instances/WolfchevLaboratory.txt +++ b/npc/re/instances/WolfchevLaboratory.txt @@ -1693,8 +1693,10 @@ lhz_dun04,151,276,3 script Researcher#memo 4_LGTSCIENCE,{ } .@killed_bosses = true; for(.@quest_id = 5113; .@quest_id <= 5125; .@quest_id++) { - if(questprogress(.@quest_id, HUNTING) != 2) + if(questprogress(.@quest_id, HUNTING) != 2){ .@killed_bosses = false; + break; + } } if (lght_duk01 < 6) { mes "[Researcher]"; @@ -1781,13 +1783,11 @@ lhz_dun04,151,276,3 script Researcher#memo 4_LGTSCIENCE,{ close; case 2: .@quest_time = questprogress(5112, PLAYTIME); - if (!.@quest_time) { + if (.@quest_time==1) { mes "[Wolfchev]"; mes "I'm sorry, but it seems you still cannot enter to the laboratory yet. Will you come back later? The system is kind of tricky you know."; close; } else { - //if (.@quest_time == 2) - //recall_completequest 5112; if (.@quest_time) erasequest 5112; if (!.@killed_bosses) { @@ -1950,8 +1950,6 @@ lhz_dun04,147,279,0 script Laboratory Entrance#memo CLEAR_NPC,{ } else if (.@lhz_time == 2) { mes "Di Rit- Di- Di- Dit-"; next; - //if (.@lhz_time == 2) - //recall_completequest 5112; erasequest 5112; mes ""+ strcharinfo(PC_NAME) +". . ."; mes "^FF0000Access denial has been deactivated.^000000"; diff --git a/npc/re/merchants/ninja_craftsman.txt b/npc/re/merchants/ninja_craftsman.txt index b9025f3aa..a88069e99 100644 --- a/npc/re/merchants/ninja_craftsman.txt +++ b/npc/re/merchants/ninja_craftsman.txt @@ -193,7 +193,7 @@ L_Ingredients: } -que_ng,21,72,6 script Master Craftsman Ki#weap 4_M_RASWORD,{ +que_ng,23,70,6 script Master Craftsman Ki#weap 4_DST_SOLDIER,{ mes "[Ki]"; mes "To attack is the best means of defense."; mes "A powerful weapon will make you truly complete."; |