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

diff --git a/npc/merchants/icecream.txt b/npc/merchants/icecream.txt
index eec7b0171..eb1dd0c63 100644
--- a/npc/merchants/icecream.txt
+++ b/npc/merchants/icecream.txt
@@ -1,61 +1,82 @@
 //===== eAthena Script =======================================
 //= Ice Cream Maker
 //===== By: ==================================================
-//= KOOK SWU
+//= KOOK SWU, Kisuka
 //===== Current Version: =====================================
-//= 1.2
+//= 1.3
 //===== Compatible With: =====================================
-//= eAthena 1.0
+//= eAthena SVN
 //===== Description: =========================================
 //= A man makes you ice-cream
 //===== Additional Comments: =================================
 //= 1.1 Optimized, changed overlapping coords in Alberta [Lupus]
 //= 1.2 According to the patch, IceCream seller has been removed from Morocc [Lupus]
+//= 1.3 No more label menu and updated to match AEGIS script. [Kisuka]
 //============================================================
 
-//ALBERTA
+// Alberta
 alberta,120,45,2	script	Ice Cream Maker::IceCreamer	85,{
 	mes "[Ice Cream Maker]";
 	mes "Fresh Ice Cream made with snow from Lutie!";
 	mes "Enjoy it now, it won't be on sale for long!";
-	mes "^0000FF100 Zeny^000000 Ice Cream,";
+	mes "^3355FF100 Zeny^000000 Ice Cream,";
 	mes "Ice Cream!";
 	next;
-	menu "Gimme Ice Cream!",-,"Cancel Trade",L_End;
-	
-		mes "[Ice Cream Maker]";
-		mes "Fresh Ice Cream made with snow from Lutie!";
-		mes "Everyone wants our delicious ice cream, but we have limited amount,";
-		mes "so you can only purchase 5 at a time!!";
-		next;
-		input @input;
-		mes "[Ice Cream Maker]";
-		if(@input<1) goto L_inpC;
-		if(@input>5) goto L_inpM;
-		if(Zeny< @input*100) goto L_NoZ;
-		set Zeny,Zeny-100*@input;
-		getitem 536,@input;
-		mes "Here you go  " +@input+ "  Ice Cream for you.";
+	if(select("Gimme Ice Cream!:Cancel Trade") == 2) {
+		mes "Are you sure you don't want any?";
+		mes "I won't be selling it for long,";
+		mes "and once I run out,";
+		mes "there won't be any more!!!";
 		close;
-		
-		L_inpC:
-			mes "Deal is canceled.";
-			close;
-		L_inpM:
-			mes "Sorry, but you can only buy 5 at a time.";
-			close;
-		L_NoZ:
-			mes "Sorry, but you need more money.";
+	}
+	mes "[Ice Cream Maker]";
+	mes "Fresh Ice Cream made with snow from Lutie!";
+	mes "Everyone wants our delicious ice cream, ";
+	mes "but we have a limited amount,";
+	mes "so you can only purchase 5 at a time!!";
+	next;
+	while(1) {
+		input .@input;
+		if(.@input < 1) {
+			mes "[Ice Cream Maker]";
+			mes "If you don't want to buy any,";
+			mes "could you please let the next customer";
+			mes "make a purchase?";
+			mes "Thank you.";
 			close;
-	L_End:
+		}
+		if(.@input > 5) {
+			mes "[Ice Cream Maker]";
+			mes "Ouch";
+			mes "You expect too much.";
+			mes "Dear customer,";
+			mes "If you eat more than 5 Ice creams,";
+			mes "If you might haveto make a lot of trips";
+			mes "to the bathroom tonight.";
+			next;		
+		}
+	}
+	if(Zeny<.@input*100) {
 		mes "[Ice Cream Maker]";
-		mes "Are you sure you don't want any?";
-		mes "I won't be selling it for long, and once I run out, there won't be anymore!!!";
+		mes "Dear customer, your wallet seems to be light.";
+		mes "Price is ^3355FF100 Zeny^000000 per ice cream.";
+		close;	
+	}
+	if(checkweight(536,.@amount) == 0) {
+		mes "[Ice Cream Maker]";
+		mes "Dear customer,you look like you're carrying a lot.";
+		mes "Ice Cream is fine,";
+		mes "but you must consider your weight";
+		mes "before making a purchase.";
 		close;
+	}
+	set Zeny,Zeny-100*.@input;
+	getitem 536,.@input;	// Ice_Cream
+	close;
 }
 
-//MORROC FIELD
+// Morroc Field
 moc_fild16,88,304,4	duplicate(IceCreamer)	Ice Cream Maker#2	85
 
-//MORROC
+// Morroc
 //morocc,160,144,4	duplicate(IceCreamer)	Ice Cream Maker#3	85