diff options
Diffstat (limited to 'npc/merchants')
| -rw-r--r-- | npc/merchants/ammo_boxes.txt | 32 | ||||
| -rw-r--r-- | npc/merchants/ammo_dealer.txt | 3 |
2 files changed, 17 insertions, 18 deletions
diff --git a/npc/merchants/ammo_boxes.txt b/npc/merchants/ammo_boxes.txt index fcad5a0ea..fadf8b03f 100644 --- a/npc/merchants/ammo_boxes.txt +++ b/npc/merchants/ammo_boxes.txt @@ -3,7 +3,7 @@ //===== By: ================================================== //= rAthena dev team //===== Current Version: ===================================== -//= 1.4 +//= 1.5 //===== Compatible With: ===================================== //= rAthena SVN //===== Description: ========================================= @@ -15,11 +15,13 @@ //= 1.2a Optimized. Please, ommit extra NPC names [Lupus] //= 1.3 Updated to match AEGIS script. [Kisuka] //= 1.4 Updated to match AEGIS script again. [Masao] +//= 1.5 Moved Izlude duplicate to pre-re/re paths. [Euphy] //============================================================ -izlude,171,127,3 script Magazine Dealer Kenny::mdk 83,{ +alberta,118,157,3 script Magazine Dealer Tonny::mdk 83,{ + set .n$, compare(strnpcinfo(1),"Tonny")?"[Tonny]":"[Kenny]"; if(BaseJob == Job_Gunslinger) { - mes "[Kenny]"; + mes .n$; mes "Welcome to my Magazine Shop."; mes "As you may know, large numbers"; mes "of bullets can be carried more"; @@ -36,7 +38,7 @@ izlude,171,127,3 script Magazine Dealer Kenny::mdk 83,{ case 7: callfunc "Func_Casing",13202,12150; break; case 8: callfunc "Func_Casing",13201,12151; break; case 9: - mes "[Kenny]"; + mes .n$; mes "Well, if you ever find"; mes "that you have too many"; mes "bullets, come and see me."; @@ -45,7 +47,7 @@ izlude,171,127,3 script Magazine Dealer Kenny::mdk 83,{ close; } } - mes "[Kenny]"; + mes .n$; mes "Welcome to my shop."; mes "Here, I provide Magazines"; mes "and Cartridges for Gunslingers."; @@ -53,7 +55,7 @@ izlude,171,127,3 script Magazine Dealer Kenny::mdk 83,{ mes "my services would be of any"; mes "use to you, adventurer."; next; - mes "[Kenny]"; + mes .n$; mes "Eh, but if you happen to"; mes "know any Gunslingers, send"; mes "them my way. You can never"; @@ -62,18 +64,18 @@ izlude,171,127,3 script Magazine Dealer Kenny::mdk 83,{ } function script Func_Casing { - mes "[Kenny]"; + mes .n$; mes "Now, you can trade"; mes "500 "+getitemname(getarg(0))+"s"; mes "and 500 zeny for 1 "+getitemname(getarg(1))+", so make sure"; mes "you have sufficient bullets"; mes "and zeny for this exchange."; next; - mes "[Kenny]"; + mes .n$; mes "You can exchange 500 "+getitemname(getarg(0))+"s and 500 zeny"; mes "with 1 "+getitemname(getarg(1))+"."; next; - mes "[Kenny]"; + mes .n$; mes "Remember that I can't give"; mes "you more than 50 Magazines"; mes "at a time. Now please enter"; @@ -82,7 +84,7 @@ function script Func_Casing { next; input .@amount; if(.@amount > 50 || .@amount == 0) { - mes "[Kenny]"; + mes .n$; mes "Hey, I can't give you"; mes "that many Magazines."; mes "Please try again, and"; @@ -93,7 +95,7 @@ function script Func_Casing { if (countitem(getarg(0)) >= (500*.@amount)) { if (Zeny >= (500*.@amount)) { if (checkweight(getarg(1),.@amount) == 0) { - mes "[Kenny]"; + mes .n$; mes "Hey, you've got a lot"; mes "of junk crammed in your"; mes "Inventory. Free up some"; @@ -102,7 +104,7 @@ function script Func_Casing { mes "some Magazines later, okay?"; close; }else{ - mes "[Kenny]"; + mes .n$; mes "Alright, here are"; mes "your Magazines. Thanks"; mes "for visiting my shop, and"; @@ -114,7 +116,7 @@ function script Func_Casing { close; } }else{ - mes "[Kenny]"; + mes .n$; mes "Sorry, but you don't"; mes "have enough zeny for"; mes "this Magazine exchange."; @@ -124,7 +126,7 @@ function script Func_Casing { close; } }else{ - mes "[Kenny]"; + mes .n$; mes "Sorry, but you don't"; mes "have enough bullets for"; mes "this Magazine exchange."; @@ -134,5 +136,3 @@ function script Func_Casing { close; } } - -alberta,118,157,3 duplicate(mdk) Magazine Dealer Tonny 83 diff --git a/npc/merchants/ammo_dealer.txt b/npc/merchants/ammo_dealer.txt index ea5f9a803..71f189c6e 100644 --- a/npc/merchants/ammo_dealer.txt +++ b/npc/merchants/ammo_dealer.txt @@ -16,6 +16,7 @@ //= 1.3 Fixed [Playtester] Optimized. Got rid of @vars [Lupus] //= 1.4 Updated to match AEGIS script. [Kisuka] //= 1.5 Updated to match AEGIS script again. [Masao] +//= 1.6 Moved Izlude duplicate to pre-re/re paths. [Euphy] //============================================================ alberta,118,160,3 script Bullet Dealer Tony#alb::bdt 86,{ @@ -122,5 +123,3 @@ function script Bullet_Trade { close; } } - -izlude,171,133,3 duplicate(bdt) Bullet Dealer Tony#iz 86 |