diff options
Diffstat (limited to 'npc/instances/SealedShrine.txt')
| -rw-r--r-- | npc/instances/SealedShrine.txt | 20 |
1 files changed, 12 insertions, 8 deletions
diff --git a/npc/instances/SealedShrine.txt b/npc/instances/SealedShrine.txt index 82267be7a..5bbe81d27 100644 --- a/npc/instances/SealedShrine.txt +++ b/npc/instances/SealedShrine.txt @@ -121,7 +121,7 @@ monk_test,309,146,3 script Friar Patrick#edq 4_M_OLDFRIAR,{ } else { for (.@i = 1; .@i <= 2; ++.@i) { - if( instance_attachmap("" + .@i + "@cata", .@instance) == "" ) + if( instance_attachmap(.@i + "@cata", .@instance) == "" ) break; } if( .@i < 2 ) { @@ -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)) + erasequest 3042; + setquest 3043; close; case 2: mes "[Rust Blackhand]"; @@ -364,12 +366,12 @@ prt_monk,261,91,3 script Rust Blackhand#edq 4_M_DWARF,{ close; } } - else if (!.@new_maje && countitem(6004) == 0) { + else if (!.@new_maje && !countitem(6004)) { mes "[Rust Blackhand]"; mes "If you don't have business with me, go away! As you see, I make equipment for the Brothers at the monastery, not for adventurers like you. Do you understand?"; close; } - else if (.@new_maje == 2 && countitem(6004) > 0) { + else if (.@new_maje == 2 && countitem(6004)) { switch(select("About the Cursed Baphomet Doll:Stop talking.")) { case 1: mes "[Rust Blackhand]"; @@ -403,8 +405,10 @@ 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)) + erasequest 3042; + erasequest 3043; + setquest 3043; close; case 2: mes "[Rust Blackhand]"; @@ -420,7 +424,7 @@ prt_monk,261,91,3 script Rust Blackhand#edq 4_M_DWARF,{ close; } } - else if (.@new_maje == 2 && countitem(6004) == 0) { + else if (.@new_maje == 2 && !countitem(6004)) { mes "[Rust Blackhand]"; mes "Why are you hanging around here? If you don't want a ^4d4dffGigantic Magestic Goat^000000, go away."; close; |