- Updates to several npc files to match AEGIS standards.

- Added Cash Hair Stylist (disabled by default).

git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@14040 54d463be-8e91-2dee-dedb-b68131a5f0ec

1 files changed, 68 insertions, 46 deletions

diff --git a/npc/merchants/ammo_dealer.txt b/npc/merchants/ammo_dealer.txt
index 6742b6022..3163b3d43 100644
--- a/npc/merchants/ammo_dealer.txt
+++ b/npc/merchants/ammo_dealer.txt
@@ -3,9 +3,9 @@
 //===== By ===================================================
 //= Playtester, Paradox924X
 //===== Version ==============================================
-//= 1.3
+//= 1.4
 //===== Compatible With ======================================
-//= eAthena SVN with jAthena scripting engine and . variables
+//= eAthena SVN
 //===== Description ==========================================
 //= Bullet trader.
 //===== Comments =============================================
@@ -14,21 +14,17 @@
 //= 1.2 More optimized conversion [Legionaire]
 //= 1.2a Removed .GATs [Lupus]
 //= 1.3 Fixed [Playtester] Optimized. Got rid of @vars [Lupus]
+//= 1.4 Updated to match AEGIS script. [Kisuka]
 //============================================================
 
 que_ng,187,156,3	script	Bullet Dealer Tony	86,{
-
-	mes "[Tony]";
 	if (BaseJob == Job_Gunslinger) {
-		mes "I'm Bullet-tooth Tony!";
-		mes "Whenever your out of bullets,";
-		mes "Visit me!!!";
-		next;
 		mes "[Tony]";
-		mes "Now~! Friend~Companion~ Buddy~";
-		mes "What do you need?!";
-		mes "Choose anything~!";
-		mes "And pay money~!";
+		mes "I'm Tony, the Bullet Dealer.";
+		mes "Come to me whenever you're";
+		mes "short on ammo. Just bring me";
+		mes "the materials, and I'll make";
+		mes "you the bullets you need.";
 		next;
 		switch(select("Poison Sphere:Flare Sphere:Lighting Sphere:Blind Sphere:Freezing Sphere:Cancel")) {
 		case 1: callfunc "Bullet_Trade",937,10,13205; break;
@@ -36,66 +32,92 @@ que_ng,187,156,3	script	Bullet Dealer Tony	86,{
 		case 3: callfunc "Bullet_Trade",7053,3,13204; break;
 		case 4: callfunc "Bullet_Trade",1024,5,13206; break;
 		case 5: callfunc "Bullet_Trade",7054,2,13207; break;
-		default:
+		case 6:
 			mes "[Tony]";
-			mes "Mmm~ Okay~";
-			mes "Please visit again~";
-			mes "I, Bullet-tooth Tony,";
-			mes "Will always be here~!!!";
+			mes "Changed your mind?";
+			mes "Well, if you ever need";
+			mes "any bullets, I'll be right";
+			mes "here. Come back whenever";
+			mes "you think you'll need more";
+			mes "ammunition, Gunslinger.";
 			close;
 		}
 	}
-	mes "I'm a trader who supplies";
-	mes "Gunslingers with trade items.";
-	mes "I am called Bullet-tooth Tony.";
+	mes "[Tony]";
+	mes "Hey, I'm Tony. I'm in";
+	mes "charge of distributing";
+	mes "and making bullets for";
+	mes "Gunslingers. It's just";
+	mes "how our guild likes";
+	mes "to do things.";
 	next;
 	mes "[Tony]";
-	mes "I don't think you are a Gunslinger";
-	mes "So just look around";
-	mes "and go.";
+	mes "I'm sorry if you came";
+	mes "here to buy some bullets.";
+	mes "I can only do business with";
+	mes "fully fledged Gunslingers.";
 	close;
 }
 
 function	script	Bullet_Trade	{
 	mes "[Tony]";
-	mes "Input the amount you wish to purchase.";
-	next;
-	mes "[Tony]";
-	mes "We trade 30 "+getitemname(getarg(2))+"s for";
-	mes "1 Phracon,";
+	mes "For every set of";
+	mes "30 "+getitemname(getarg(2))+"s,";
+	mes "you must give me";
 	mes "1 Emveretarcon,";
-	mes "and "+getarg(1)+" "+getitemname(getarg(0))+".";
+	mes "1 Phracon, and";
+	mes ""+getarg(1)+" "+getitemname(getarg(0))+".";
 	next;
 	mes "[Tony]";
-	mes "The maximum number you can trade is 500.";
-	mes "If you want to cancel, input 0.";
+	mes "Remember that I can give";
+	mes "a maximum of 500 sets of";
+	mes "30 bullets at a time. Please";
+	mes "enter the number of bullet sets";
+	mes "that you'd like. If you want to";
+	mes "cancel, then just enter ''0.''";
 	next;
 	input .@amount;
-	mes "[Tony]";
 	if (.@amount < 1 || .@amount > 500) {
-		mes "Invalid Amount!";
-		mes "Enter again~!";
+		mes "[Tony]";
+		mes "Hey, I can't give you";
+		mes "that many bullets. Don't";
+		mes "forget to enter a number";
+		mes "that's no higher than 500";
+		mes "if you want to trade your";
+		mes "items for some bullets.";
 		close;
-	} else if (countitem(1010) >= .@amount && countitem(1011) >= .@amount && countitem(getarg(0)) >= (.@amount*getarg(1))) {
+	}
+	if (countitem(1010) >= .@amount && countitem(1011) >= .@amount && countitem(getarg(0)) >= (.@amount*getarg(1))) {
 		if (checkweight(getarg(2),.@amount * 30) == 0) {
-			mes "I cannot give it to you because your inventory is full. Come back after your inventory has more space.";
+			mes "[Tony]";
+			mes "Eh? Your Inventory doesn't";
+			mes "have enough space for this";
+			mes "many bullets. Come back later";
+			mes "after you make more space";
+			mes "available. Try putting some of";
+			mes "your things into Kafra Storage.";
 			close;
-		} else {
-			mes "Oh~ Good!";
-			mes "Trade number checked!";
-			mes "I'll trade immediately.";
+		}else{
+			mes "[Tony]";
+			mes "Great, everything seems";
+			mes "to be in order. Let me take";
+			mes "these materials, and here are";
+			mes "your bullets. It's a pleasure";
+			mes "to do business with you~";
 			delitem 1010,.@amount;
 			delitem 1011,.@amount;
 			delitem getarg(0),.@amount * getarg(1);
 			getitem getarg(2),.@amount * 30;
 			close;
 		}
-	} else {
-		mes "Tsk Tsk~";
-		mes "You do not have";
-		mes "enough items for the";
-		mes "items you want to trade.";
-		mes "Prepare again and come back.";
+	}else{
+		mes "[Tony]";
+		mes "Huh. It looks like you";
+		mes "don't have enough materials";
+		mes "for that many bullets. Well,";
+		mes "it's no problem. Just come";
+		mes "back after gathering everything";
+		mes "that you need, okay?";
 		close;
 	}
 }