diff options
author | Michieru <michieru@0-mail.com> | 2013-10-24 12:10:43 +0200 |
---|---|---|
committer | Michieru <michieru@0-mail.com> | 2013-10-24 12:10:43 +0200 |
commit | e3afdc2af4c5e50c79237ee092e25f39b7428e47 (patch) | |
tree | 20cfd05dd6fc2e3e53173ef059f045cee1526d58 /npc/merchants/quivers.txt | |
parent | 491892212d338903179909b89a5bfc2385e52261 (diff) | |
download | hercules-e3afdc2af4c5e50c79237ee092e25f39b7428e47.tar.gz hercules-e3afdc2af4c5e50c79237ee092e25f39b7428e47.tar.bz2 hercules-e3afdc2af4c5e50c79237ee092e25f39b7428e47.tar.xz hercules-e3afdc2af4c5e50c79237ee092e25f39b7428e47.zip |
Update to last rAthena npc.
Fix some typos
change sc_bleeding to -> sc_blooding
Updated RE EXP for quests_brasilis.txt
Diffstat (limited to 'npc/merchants/quivers.txt')
-rw-r--r-- | npc/merchants/quivers.txt | 37 |
1 files changed, 15 insertions, 22 deletions
diff --git a/npc/merchants/quivers.txt b/npc/merchants/quivers.txt index 30a4788a8..53ae6d114 100644 --- a/npc/merchants/quivers.txt +++ b/npc/merchants/quivers.txt @@ -5,13 +5,13 @@ //===== Current Version: ===================================== //= 1.2 //===== Description: ========================================= -//= [Aegis COnversion] +//= [Official Conversion] //= Turns arrows into Arrow Quivers. -// Breakdown of Subroutine "S_BuyQuiver" -// arg(0): Type of Arrow to be packaged (item ID) -// arg(1): How many of each 'getarg(0)' arrow per quiver -// arg(2): The cost of making a 'getarg(0)' quiver. -// arg(3): The quiver given by the NPC. (item ID) +//= Breakdown of Subroutine "S_BuyQuiver" +//= arg(0): Type of Arrow to be packaged (item ID). +//= arg(1): How many of each 'getarg(0)' arrow per quiver. +//= arg(2): The cost of making a 'getarg(0)' quiver. +//= arg(3): The quiver given by the NPC (item ID). //===== Additional Comments: ================================= //= 07/06/05 : Added 1st Version. [Muad_Dib] //= Converted to rAthena format by Dr.Evil @@ -19,18 +19,11 @@ //= Fixed a few spelling errors. [Nexon] //= 1.1 Added Holy Arrow Quivers [Playtester] //= 1.2 Rescripted to Aegis 10.3 standards. [L0ne_W0lf] -//= Removed "Holy Arrows" from the list. +//= Removed "Holy Arrows" from the list. //============================================================ payon_in01,5,134,5 script Inventor Jaax 89,{ - if (checkweight(1201,1) == 0) { - mes "[Inventor Jaax]"; - mes "Hey, you're carrying"; - mes "way too much stuff. Why don't you stash it away in Kafra Storage? We can talk after you do that, right?"; - close; - } - set .@now_weight,MaxWeight-Weight; - if (.@now_weight < 2000) { + if (checkweight(1201,1) == 0 || MaxWeight - Weight < 2000) { mes "[Inventor Jaax]"; mes "Hey, you're carrying"; mes "way too much stuff. Why don't you stash it away in Kafra Storage? We can talk after you do that, right?"; @@ -47,7 +40,7 @@ payon_in01,5,134,5 script Inventor Jaax 89,{ mes "created something"; mes "truly extraordinary. I call them... ^663300Magic Quivers^000000 !! This will be remembered in history as an"; mes "arrow revolution!"; - Emotion e_no1; + emotion e_no1; next; mes "[Inventor Jaax]"; mes "I've studied magic and quivers for years, working night and day until I finally figured how to condense arrows with magic! With magic quivers, you'll be carrying more arrows, but with less weight!"; @@ -76,7 +69,7 @@ payon_in01,5,134,5 script Inventor Jaax 89,{ //close; S_BuyQuiver: - if (countitem(getarg(0)) > 499) { + if (countitem(getarg(0)) >= getarg(1)) { mes "[Inventor Jaax]"; mes "Excellent!"; mes "Are you carrying any Arrows with you? I'll provide you with a quiver that can carry "+getarg(1)+" of your "+getitemname(getarg(0))+"s for only ^FF3131"+getarg(2)+" Zeny^000000."; @@ -105,7 +98,7 @@ S_BuyQuiver: mes "[Inventor Jaax]"; mes "There you go!"; mes "Just remember, ^FF0000you won't be able to use the Quiver when your carried weight is 90% of your maximum weight limit^000000."; - set zeny,zeny-.@arrow_zeny01; + set Zeny, Zeny-.@arrow_zeny01; delitem getarg(0),.@arrows_used; //Arrow getitem getarg(3),.@quiver; //Quiver next; @@ -131,11 +124,11 @@ S_BuyQuiver: mes "a quiver is so close?"; close; case 2: - if (zeny > getarg(2)) { + if (Zeny > getarg(2)) { mes "[Inventor Jaax]"; mes "There you go!"; mes "Just remember, ^FF0000you won't be able to use the Quiver when your carried weight is 90% of your maximum weight limit^000000."; - set zeny,zeny-getarg(2); + set Zeny, Zeny-getarg(2); delitem getarg(0),getarg(1); //Arrow getitem getarg(3),1; //Quiver next; @@ -166,11 +159,11 @@ S_BuyQuiver: } else { mes "[Inventor Jaax]"; - mes "You can carry a maximum of 500 Arrows within this quiver. It was made using my secret method,"; + mes "You can carry a maximum of "+getarg(1)+" Arrows within this quiver. It was made using my secret method,"; mes "so the total weight of the Arrows and Quiver is less than carrying the Arrows alone."; next; mes "[Inventor Jaax]"; - mes "It's a miracle of science! One that you can experience for yourself if you bring me at least 500 Arrows and 500 Zeny for each Quiver."; + mes "It's a miracle of science! One that you can experience for yourself if you bring me at least "+getarg(1)+" Arrows and "+getarg(2)+" Zeny for each Quiver."; close; } } |