diff options
| author | Streusel <advance_me@hotmail.de> | 2013-03-20 21:40:11 -0800 |
|---|---|---|
| committer | Streusel <advance_me@hotmail.de> | 2013-03-20 21:40:11 -0800 |
| commit | 77039104c0b66d524714487d7c14adb142b76ba8 (patch) | |
| tree | a77283efcf4fc62faaf1adb398fdfc3dc835f77a /npc/quests | |
| parent | 4c79f825b0de36021af8de337e34b44835d363eb (diff) | |
| download | hercules-77039104c0b66d524714487d7c14adb142b76ba8.tar.gz hercules-77039104c0b66d524714487d7c14adb142b76ba8.tar.bz2 hercules-77039104c0b66d524714487d7c14adb142b76ba8.tar.xz hercules-77039104c0b66d524714487d7c14adb142b76ba8.zip | |
-Updated shops.txt & quests_moscovia.txt, credits to Euphy
Diffstat (limited to 'npc/quests')
| -rw-r--r-- | npc/quests/quests_moscovia.txt | 30 |
1 files changed, 15 insertions, 15 deletions
diff --git a/npc/quests/quests_moscovia.txt b/npc/quests/quests_moscovia.txt index a55f944f0..bf6177bed 100644 --- a/npc/quests/quests_moscovia.txt +++ b/npc/quests/quests_moscovia.txt @@ -3,7 +3,7 @@ //===== By: ================================================== //= Kisuka //===== Current Version: ===================================== -//= 2.0 +//= 2.0a //===== Compatible With: ===================================== //= rAthena SVN //===== Description: ========================================= @@ -22,6 +22,7 @@ //= 1.8 Fixed some condition checks. [Gepard] //= 1.9 Corrected NPC counting mobs for the wrong NPC. (bugreport:4736) [L0ne_W0lf] //= 2.0 Optimized. [Joseph] +//= 2.0a Bug fixes. [Euphy] //============================================================ //============================================================================ @@ -846,7 +847,7 @@ mosk_ship,98,110,3 script Mr. Ibanoff#npc2 964,{ close; } else if (mos_whale_edq == 8 || mos_whale_edq == 10) callsub S_D_1,3,91,92,93,94; - else if (mos_whale_edq >= 91 && mos_whale_edq <= 94) callsub S_D_2,91,0; + else if (mos_whale_edq >= 91 && mos_whale_edq <= 94) callsub S_D_2,(mos_whale_edq-91); else if (mos_whale_edq == 11) { mes "[Mr. Ibanoff]"; mes "Look... Beyond the sea!"; @@ -898,8 +899,8 @@ mosk_ship,98,110,3 script Mr. Ibanoff#npc2 964,{ close; } else if (mos_whale_edq == 23 || mos_whale_edq == 25) callsub S_D_1,5,241,242,243,244; - else if (mos_whale_edq == 241 || mos_whale_edq == 243 || mos_whale_edq == 244) callsub S_D_2,1,1; - else if (mos_whale_edq == 242) callsub S_D_2,1,2; + else if (mos_whale_edq == 241 || mos_whale_edq == 243 || mos_whale_edq == 244) callsub S_D_2,0; + else if (mos_whale_edq == 242) callsub S_D_2,1; else if (mos_whale_edq == 26) { mes "[Mr. Ibanoff]"; mes "Look there!"; @@ -947,14 +948,14 @@ mosk_ship,98,110,3 script Mr. Ibanoff#npc2 964,{ end; S_D_1: - if (rand(1,4) == 3) { + if (rand(1,getarg(0)) == 3) { set .@ship2,rand(4); - setarray .@d$,"East","West","South","North"; + setarray .@d$[0],"East","West","South","North"; mes "[Mr. Ibanoff]"; mes "Hm. The sea currents have changed."; mes "Adjust the rudder forward to the"; mes .@d$[.@ship2]+", to follow the currents."; - set mos_whale_edq,getarg(.@ship2); + set mos_whale_edq,getarg(.@ship2+1); close; } mes "[Mr. Ibanoff]"; @@ -967,14 +968,13 @@ S_D_1: close; S_D_2: - setarray .@d$[getarg(0)],"East","West","South","North"; - mes "[Mr. Ibanoff]"; - mes "Hey!"; - mes "Did you not hear me?"; - mes "Change the rudder forward to the"; - if (getarg(1)) mes .@d$[getarg(1)]+", and follow the currents!"; - else mes .@d$[mos_whale_edq]+", and follow the currents!"; - close; + setarray .@d$[0],"East","West","South","North"; + mes "[Mr. Ibanoff]"; + mes "Hey!"; + mes "Did you not hear me?"; + mes "Change the rudder forward to the"; + mes .@d$[getarg(0)]+", and follow the currents!"; + close; } //---------------------------------------------------------------------------- |