diff options
| -rw-r--r-- | npc/quests/quests_moscovia.txt | 30 | ||||
| -rw-r--r-- | npc/re/merchants/shops.txt | 15 |
2 files changed, 30 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; } //---------------------------------------------------------------------------- diff --git a/npc/re/merchants/shops.txt b/npc/re/merchants/shops.txt index 9041ae2f3..35b1baf95 100644 --- a/npc/re/merchants/shops.txt +++ b/npc/re/merchants/shops.txt @@ -15,6 +15,7 @@ //= 1.3 Added Malangdo tool dealer. [Euphy] //= 1.4 Moved Izlude merchants. [Streusel] //= 1.5 Added Dewata merchants. [Lemongrass] +//= 1.6 Added Mora and Porta Malaya merchants. [Euphy] //============================================================ //======================================================= @@ -70,6 +71,12 @@ s_atelier,15,65,5 shop Part-Timer#sc_lgt 89,6123:-1,6120:-1 malangdo,232,163,5 shop Tool Dealer Myo 560,611:-1,1750:-1,645:-1,656:-1,601:-1,602:-1,1065:-1,713:-1 //======================================================= +// Mora +//======================================================= +mora,100,118,4 shop Tool Dealer#mora 517,11522:-1,11523:-1,11524:-1,602:-1,601:-1,611:-1,1773:-1,1774:-1,713:-1 +mora,138,110,4 shop Mora Chef 518,11519:-1 + +//======================================================= // Mid Camp //======================================================= mid_camp,129,284,4 shop Trap Specialist#mid 66,7940:-1,12341:-1 @@ -81,6 +88,14 @@ mid_camp,184,263,4 shop Black Marketeer#mid 49,2139:-1,2800:-1,2801:-1,2802:-1,2 payon,123,109,4 shop Trap Specialist#pay 66,7940:-1,12341:-1 //======================================================= +// Port Malaya +//======================================================= +ma_in01,73,22,3 shop Weapon Dealer#ma 536,1207:-1,1216:-1,1107:-1,1122:-1,1116:-1,1154:-1,1407:-1,1457:-1,1354:-1,1519:-1 +ma_in01,22,23,3 shop Tool Dealer#ma 536,611:-1,1750:-1,501:-1,502:-1,503:-1,504:-1,645:-1,656:-1,601:-1,602:-1,1065:-1,2239:-1 +malaya,150,261,3 shop Fruit Gardener#ma 535,512:-1,513:-1,515:-1,516:-1,535:-1 +ma_in01,67,13,5 shop Armor Dealer#ma 536,2211:-1,2401:-1,2403:-1,2501:-1,2503:-1,2101:-1,2103:-1,2305:-1,2321:-1,2332:-1,2328:-1,2627:-1 + +//======================================================= // Prontera //======================================================= //prontera,104,88,5 shop Stuff Gimme 880,616:-1 |