- 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, 63 insertions, 55 deletions

diff --git a/npc/merchants/kunai_maker.txt b/npc/merchants/kunai_maker.txt
index ad2adaddd..196405ff0 100644
--- a/npc/merchants/kunai_maker.txt
+++ b/npc/merchants/kunai_maker.txt
@@ -1,93 +1,101 @@
 //===== eAthena Script =======================================
-//= Kunai "Trader" @ que_ng
+//= Kunai Merchant Kashin
 //===== By: ==================================================
 //= eAthena dev team
 //===== Current Version: =====================================
-//= 1.2a
+//= 1.3
 //===== Compatible With: =====================================
-//= eAthena 1.0
+//= eAthena SVN
 //===== Description: =========================================
-//= NPC that trades you a few shurikens + ninja stones for 
-//= elemental kunais.
+//= Trades a few shurikens + ninja stones for elemental kunai.
 //===== Additional Comments: =================================
 //= 1.0 Added the npc. It uses a function that sends the item 
 //=	  id of the 2 required items plus the amount. Can trade
 //= 	  up to 500 units (5,000 kunais) at once. [erKURITA]
 //= 1.1 Officialized script [Playtester]
 //= 1.2a Optimized/cleaned up a bit [ultramage]
+//= 1.3 Updated to match AEGIS script. [Kisuka]
 //============================================================
 
 que_ng,72,29,3	script	Kunai Merchant Kashin	83,{
-
-	mes "[Kashin]";	
-	if(BaseJob != Job_Ninja) {
-		mes "I am Kashin of the Wind. I distribute trade items to the shadows.";
-		next;
+	if(BaseJob == Job_Ninja) {
 		mes "[Kashin]";
-		mes "It doesn't seem like you are a Ninja... Just take a good look around and be on your way.";
-		close;
+		mes "I am Kashin, distributor";
+		mes "of Kunai for Ninjas. Take";
+		mes "a look around and let me";
+		mes "know if you're interested";
+		mes "in any of my wares.";
+		next;
+		switch(select("10 Fell Poison Kunai:10 Icicle Kunai:10 High Wind Kunai:10 Black Earth Kunai:10 Heat Wave Kunai:Cancel")) {
+		case 1: callfunc "Kunai_Trade",13250,20,7524,1,13259; break;
+		case 2: callfunc "Kunai_Trade",13251,8,7522,2,13255; break;
+		case 3: callfunc "Kunai_Trade",13252,4,7523,2,13257; break;
+		case 4: callfunc "Kunai_Trade",13253,2,7524,1,13256; break;
+		case 5: callfunc "Kunai_Trade",13254,1,7521,2,13258; break;
+		case 6:
+			mes "[Kashin]";
+			mes "Well then, thank you";
+			mes "for visiting my shop.";
+			mes "Please come to me when";
+			mes "you need to buy some";
+			mes "Kunais. Goodbye for now~";
+			close;
+		}
 	}
-	mes "I'm Kashin!";
-	mes "If you're ever short on Shurikens, come and see me.";
-	next;
 	mes "[Kashin]";
-	mes "What will it be?";
-	mes "Choose what you want.";
-	next;
-
-	switch(select("Poison Kunais:Frost Kunais:Wind Kunais:Earth Kunais:Fire Kunais:Cancel")) {
-	//usage: callfunc "Kunai_Trade",itemreqid1,itemreqct1,itemreqid2,itemreqct2,itemidtrade;
-	case 1: callfunc "Kunai_Trade",13250,20,7524,1,13259; break;
-	case 2: callfunc "Kunai_Trade",13251,8,7522,2,13255; break;
-	case 3: callfunc "Kunai_Trade",13252,4,7523,2,13257; break;
-	case 4: callfunc "Kunai_Trade",13253,2,7524,1,13256; break;
-	case 5: callfunc "Kunai_Trade",13254,1,7521,2,13258; break;
-	default:
-		mes "[Kashin]";
-		mes "Hmm~ Ok~";
-		mes "Come again~";
-		mes "I, Kashin of the Wind, will always be at this place.";
-		close;
-	}
+	mes "I am Kashin, distributor";
+	mes "of Kunai for Ninjas. If you";
+	mes "have any friends that are";
+	mes "Ninjas, then you might";
+	mes "want to tell them about me.";
 	close;
 }
 
 function	script	Kunai_Trade	{
-	
 	mes "[Kashin]";
-	mes "If you give me "+getarg(1)+" "+getitemname(getarg(0))+" and "+getarg(3)+" "+getitemname(getarg(2))+", I'll give you a pack of 10 "+getitemname(getarg(4))+".";
+	mes "You can exchange";
+	mes ""+getarg(1)+" "+getitemname(getarg(0))+" and";
+	mes ""+getarg(3)+" "+getitemname(getarg(2))+" for every";
+	mes "set of 10 "+getitemname(getarg(4))+".";
 	next;
 	mes "[Kashin]";
-	mes "You can trade up to 500 packs at a time.";
-	mes "If you don't want to trade, just enter 0 as the amount.";
+	mes "I can only give you a maximum of 500 sets of Kunais at a time.";
+	mes "If you want to cancel the trade, then please enter ''0.'' How many";
+	mes "Kunai sets would you like?";
 	next;
 	input .@amount;
-
-	mes "[Kashin]";
-	if(.@amount < 1) {
-		mes "Hmm~ Ok~";
-		mes "Come again~";
-		mes "I, Kashin of the Wind, will always be at this place.";
-		close;
-	}
-	if(.@amount > 500) {
-		mes "You've exceeded the input amount!";
-		mes "Enter a valid number next time~!";
+	if(.@amount < 1 || .@amount > 500) {
+		mes "[Kashin]";
+		mes "Eh? I'm sorry, but";
+		mes "I can't give you that";
+		mes "many Kunai sets. Please";
+		mes "enter a value less than 500.";
 		close;
 	}
 	if(countitem(getarg(0)) < .@amount*getarg(1) || countitem(getarg(2)) < .@amount*getarg(3)) {
-		mes "Hmm... this is no good~";
-		mes "You don't have enough materials to trade in for the amount of Kunai's that you want.";
-		mes "Bring some more if you want this amount.";
+		mes "[Kashin]";
+		mes "Hmm, you don't have";
+		mes "enough items for this";
+		mes "Kunai exchange. Please";
+		mes "check your items again.";
 		close;
  	}
 	if(checkweight(getarg(4), .@amount*10) == 0) {
-		mes "Your bag is too full to carry the trade items. Come back after you made room for the traded items.";
+		mes "[Kashin]";
+		mes "Hmm, it seems like your";
+		mes "Inventory doesn't have";
+		mes "enough space to store";
+		mes "more items. You better";
+		mes "free up some space first.";
 		close;
 	}
-	mes "Ok~ Very well!";
-	mes "Amount verified!";
-	mes "Here are your traded items.";
+	mes "[Kashin]";
+	mes "Great, everything is in";
+	mes "order, so let's go ahead";
+	mes "and complete this trade.";
+	mes "I'm sure that you'll be";
+	mes "quite satisfied with";
+	mes "these Kunais.";
 	delitem getarg(0),getarg(1)*.@amount;
 	delitem getarg(2),getarg(3)*.@amount;
 	getitem getarg(4),10*.@amount;