* Updated (and added) item_trade entries. (Converted from Aegis.)

* Updated several Prontera NPCs.
- Updated Prontera town NPCs, and Prontera Library.
- Updated the Prontera Milk Merchant. 
- Updated the inn dialogs slightly, and corrected information for Prontera.
- Added Gaebolg Family Curse quest.
- Commented out old Clothes_dyer npc.
* Updated Rachel's guide's while loop to be a bit nicer looking.
* Added the ability to redeem lottery tickets before max donation is met.
* Changed conflicting warps to the "Adoption" room in the church.
* Fixed a bug in Kiel Hyre warps and quest.
* Updated Dandelion Request quest for Gaebolg compatibility.

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

2 files changed, 83 insertions, 60 deletions

diff --git a/npc/merchants/inn.txt b/npc/merchants/inn.txt
index 235af3807..e6d1be86c 100644
--- a/npc/merchants/inn.txt
+++ b/npc/merchants/inn.txt
@@ -4,7 +4,7 @@
 //= Darkchild (1.1)
 //= Playtester (1.2)
 //===== Current Version: ===================================== 
-//= 1.4
+//= 1.5
 //===== Compatible With: ===================================== 
 //= eAthena 1.0+
 //===== Description: ========================================= 
@@ -25,6 +25,9 @@
 //= 1.3 Added (finally) Rachel Inn Maid. Official warp
 //=	  and save points[erKURITA]
 //= 1.4 Added Hugel inn [erKurita]
+//= 1.5 Added "end;" after warping the player. [L0ne_W0lf]
+//=	- Small corrections to the prontera Inns.
+//=	- Removed the Cancel dialog.
 //============================================================ 
 
 
@@ -32,14 +35,14 @@
 // West Side Inn -------------------
 prt_in,244,135,2	script	Inn Maid::Sammy	53,{
 
-	callfunc "F_InnMaid","[Sammy]","West Inn","prt_in",238,130;
-	warp "prt_in",237,102;
+	callfunc "F_InnMaid","[Employee Sammy]","Nenkaras","prt_in",238,130;
+	warp "prt_in",247,104; end;
 }
 // East Side Inn ------------------
 prt_in,61,141,2	script	Inn Maid::Ahlma#01	53,{
 
-	callfunc "F_InnMaid","[Ahlma]","East Inn","prt_in",64,136;
-	warp "prt_in",49,173;
+	callfunc "F_InnMaid","[Emplyee Ahlma]","Nenkaras","prt_in",64,136;
+	warp "prt_in",64,136; end;
 }
 
 //======================== Alberta ====================================
@@ -47,27 +50,27 @@ prt_in,61,141,2	script	Inn Maid::Ahlma#01	53,{
 alberta_in,32,142,5	script	Inn Maid::Moira	53,{
 
 	callfunc "F_InnMaid","[Moira]","North Inn","alberta_in",26,138;
-	warp "alberta_in",18,188;
+	warp "alberta_in",18,188; end;
 }
 // South -----------------------------
 alberta_in,55,142,8	script	Inn Maid::Tina	53,{
 
 	callfunc "F_InnMaid","[Tina]","South Inn","alberta_in",60,140;
-	warp "alberta_in",68,188;
+	warp "alberta_in",68,188; end;
 }
 
 //====================== Geffen ======================================
 geffen_in,70,64,5	script	Inn Maid::Betty	53,{
 
 	callfunc "F_InnMaid","[Betty]","Geffen Inn","geffen_in",74,60;
-	warp "geffen_in",106,106;
+	warp "geffen_in",106,106; end;
 }
 
 //======================= Payon ======================================
 payon_in01,131,62,5	script	Inn Maid::SunHee	53,{
 
 	callfunc "F_InnMaid","[Sun Hee]","Payon Inn","payon_in01",132,56;
-	warp "payon_in01",140,15;
+	warp "payon_in01",140,15; end;
 }
 
 //======================== Morocc ====================================
@@ -75,33 +78,34 @@ payon_in01,131,62,5	script	Inn Maid::SunHee	53,{
 morocc_in,147,138,5	script	Inn Maid::Suzie	53,{
 
 	callfunc "F_InnMaid","[Suzie]","North East Inn","morocc_in",142,140;
-	warp "morocc_in",174,144;
+	warp "morocc_in",174,144; end;
 }
 // South --------------------------------
 morocc_in,80,100,5	script	Inn Maid::Shala	53,{
 
 	callfunc "F_InnMaid","[Shala]","South Inn","morocc_in",78,95;
-	warp "morocc_in",74,128;
+	warp "morocc_in",74,128; end;
 }
 
 //======================== Rachel ====================================
 ra_in01,376,69,4	script	Inn Keeper	931,{
 
 	callfunc "F_InnMaid","[Annie]","Rachel Inn","ra_in01",375,58;
-	warp "ra_in01",384,128;
+	warp "ra_in01",384,128; end;
 }
 
 //======================== Hugel ====================================
 hu_in01,246,107,3	script	Inn Maid::Receptionist	53,{
 
 	callfunc "F_InnMaid","[Receptionist]","Hugel Inn","hu_in01",263,95;
-	warp "hu_in01",267,5;
+	warp "hu_in01",267,5; end;
 }
 
 //======================= Inn Function ==============================
 function	script	F_InnMaid	{
 	mes getarg(0);
-	mes "Welcome to '" + getarg(1) + "'.";
+	mes "Welcome to";
+	mes getarg(1) + ".";
 	mes "How may I help you?";
 	next;
 	menu "Save",Msave, "Take a Rest -> 5000 zeny",Mrent, "Cancel",Mend;
@@ -132,7 +136,5 @@ function	script	F_InnMaid	{
 		return;
 
 	Mend:
-		mes getarg(0);
-		mes "I am waiting for a job to do.";
 		close;
 }
diff --git a/npc/merchants/milk_trader.txt b/npc/merchants/milk_trader.txt
index a1d0c67fe..fa0e9b6d9 100644
--- a/npc/merchants/milk_trader.txt
+++ b/npc/merchants/milk_trader.txt
@@ -1,61 +1,82 @@
 //===== eAthena Script =======================================
 //= Milk Trader
 //===== By: ==================================================
-//= kobra_k88
+//= kobra_k88; L0ne_W0lf
 //===== Current Version: =====================================
-//= 1.2a
+//= 1.3
 //===== Compatible With: =====================================
-//= eAthena 7.15 +
+//= eAthena SVN
 //===== Description: =========================================
+//= [Aegis Conversion]
 //= trades bottles for milk
 //===== Additional Comments: =================================
 //= Fully working
 //= 1.1 Negative input bug fixed [Lupus]
 //= 1.2 Raised the price to close zeny exploit [Lupus]
 //= 1.2a Switched to Lupus's "loopless" technique.[kobra_k88]
+//= 1.3 Rescripted from the ground up. [L0ne_W0lf]
 //============================================================
 
-
-// Milk Trader -------------------------------------------------------------
-prontera,71,131,7	script	Milk Trader	86,{
-	mes "[Milk Trader]";
-	mes "If you bring me an empty bottle and 20 Zeny, I will exchange it for 1 bottle of milk.";
+prontera,73,140,0	script	Milk Vendor	86,{
+	//Supposedly this is to make sure the character 
+	//has room to accept items in their inventory.
+	//var max_max_c = CheckMaxCount 1201 1
+	//if max_max_c == 1
+	//	mes "^3355FFJust a minute!";
+	//	mes "I can't offer any of my";
+	//	mes "services to you because";
+	//	mes "you're carrying too much";
+	//	mes "stuff. Put your extra items in";
+	//	mes "Kafra Storage and come again~";
+	//	close;
+	//}
+	mes "[Milk Vendor]";
+	mes "Hey, hey...";
+	mes "If you bring me";
+	mes "1 Empty Bottle and";
+	mes "15 Zeny, I'll exchange";
+	mes "them for 1 Milk. How";
+	mes "does that sound?";
 	next;
-	menu "-Exchange as many as possible.",M_0, "-Let me set the amount.",M_1, "-Cancel",M_End;
-
-	M_0:
-		set @amount, 1000;
-		if(zeny/20 < @amount) set @amount, zeny/20;
-		if(countitem(713) < @amount) set @amount, countitem(713);
-		if(@amount > 0) goto L_Milk;
-		mes "[Milk Trader]";
-		mes "..... Are you trying to make a fool of me.... ?";
-		close;
-
-	M_1:
-		input @amount;
-		if(@amount < 1 || @amount > 1000) goto M_End;
-		if(countitem(713) < @amount) goto L_NoBottle;
-		if(zeny < (@amount*20)) goto L_NoZeny;
-
-	L_Milk:
-		set zeny, zeny - (@amount*20);
-		delitem 713, @amount;
-		getitem 519, @amount;
-
-	M_End:
-		mes "[Milk Trader]";
-		mes "Come back anytime.";
-		close;
-
-	L_NoBottle:
-		mes "[Milk Trader]";
-		mes "Ok, empty bottle please! Empty Bottle!!";
-		mes "... Aww.. you don't have enough...?";
-		close;
-
-	L_NoZeny:
-		mes "[Milk Trader]";
-		mes "You need more zeny.";
+	if (select("Exchange all empty bottles.:Cancel") == 1) {
+		if (countitem(713) <= 0) {
+			mes "[Milk Vendor]";
+			mes "Hey...";
+			mes "You don't have";
+			mes "any Empty Bottles.";
+			mes "I can't really give you";
+			mes "this milk any other";
+			mes "way, you know...";
+			close;
+		}
+		set .@bottles,countitem(713);
+		set .@total_weight,.@bottles * 50;
+		set .@total_cost,.@bottles * 15;
+		set .@now_weight,maxweight-weight;
+		if (zeny < .@Total_cost) {
+			mes "[Milk Vendor]";
+			mes "Oh, whoa~!";
+			mes "You don't have enough";
+			mes "zeny to exchange all";
+			mes "these Empty Bottles for";
+			mes "Milk. You need to have";
+			mes "at least " + gap + " zeny.";
+			close;
+		}
+		if (.@now_weight < .@total_weight) {
+			mes "[Milk Vendor]";
+			mes "Hmm...";
+			mes "Would you make";
+			mes "a little more room";
+			mes "in your inventory";
+			mes "before I give you";
+			mes "all of this milk?";
+			close;
+		}
+		set zeny,zeny-.@total_cost;
+		delitem 713,.@bottles; //Empty Bottles
+		getitem 519,.@bottles; //Milk
 		close;
+	}
+	close;
 }