zeny exploits fix (1 of ...)

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

2 files changed, 14 insertions, 10 deletions

diff --git a/npc/merchants/milk_trader.txt b/npc/merchants/milk_trader.txt
index 6fb84e59c..54863f8e5 100644
--- a/npc/merchants/milk_trader.txt
+++ b/npc/merchants/milk_trader.txt
@@ -11,6 +11,7 @@
 //===== Additional Comments: ================================= 

 //= Fully working

 //= 1.1 Negative input bug fixed [Lupus]

+//= 1.2 Raised the price to close zeny exploit [Lupus]

 //============================================================ 

 

 

@@ -19,30 +20,30 @@
 // Milk Trader -------------------------------------------------------------

 prontera.gat,71,131,7	script	Milk Trader	86,{

 	mes "[Milk Trader]";

-	mes "If you bring me an empty bottle and 15 zeny, I will exchange it for 1 bottle of milk.";

+	mes "If you bring me an empty bottle and 20 Zeny, I will exchange it for 1 bottle of milk.";

 	next;

 	menu "-Exchange all empty bottles",M_0, "-Let me set the amount.",M_1, "-Cancel",M_End;

 

 	M_0:

 		if(countitem(713) < 1) goto L_NoBottle;

-		if(Zeny < 15) goto L_NoZeny;

+		if(Zeny < 20) goto L_NoZeny;

 

 		sL_GetMilk:

-			if(countitem(713)<1 || Zeny<15) goto M_End;

+			if(countitem(713)<1 || Zeny<20) goto M_End;

 			getitem 519,1;

 			delitem 713,1;

-			set Zeny, Zeny - 15;

+			set Zeny, Zeny - 20;

 			goto sL_GetMilk;

 

 	M_1:

 		set @INPUT,0;

 		input @INPUT;

-		if(@INPUT < 1 ) goto M_End;

+		if(@INPUT < 1 || @INPUT > 100) goto M_End;

 		if(countitem(713) < @INPUT) goto L_NoBottle;

-		if(Zeny < (@INPUT*15)) goto L_NoZeny;

+		if(Zeny < (@INPUT*20)) goto L_NoZeny;

 		getitem 519, @INPUT;

 		delitem 713, @INPUT;

-		set Zeny, Zeny - (@INPUT*15);

+		set Zeny, Zeny - (@INPUT*20);

 		goto M_End;

 

 	M_End:

diff --git a/npc/merchants/shops.txt b/npc/merchants/shops.txt
index 32cffd3ef..a8c43c398 100644
--- a/npc/merchants/shops.txt
+++ b/npc/merchants/shops.txt
@@ -3,7 +3,7 @@
 //===== By: ================================================== 

 //= eAthena Dev Team

 //===== Current Version: ===================================== 

-//= 1.5

+//= 1.6

 //===== Compatible With: ===================================== 

 //= eAthena 7.15 +

 //===== Description: ========================================= 

@@ -15,6 +15,8 @@
 //= 1.5 New Payon Locations [Darkchild]

 //= Moved shops in Umbala.txt here. Commented out the duplicate

 //= ones.[kobra_k88]

+//= 1.6 Removed GRAPE ID 514 from shops (caused exploits)

+//=     Raised selling price of Empty Bottles to 10 (it's a quest item...)

 //============================================================ 

 

 

@@ -40,12 +42,13 @@ aldeba_in.gat,94,56,5	shop	Tool Dealer	83,501:-1,502:-1,503:-1,504:-1,506:-1,601
 //=======================================================

 //AMATSU

 //=======================================================

-amatsu.gat,176,126,4	shop	Fruit Merchant	53,512:-1,513:-1,515:-1,514:-1,531:-1,532:-1,534:-1,533:-1

+//Fruit merchant opens a zeny exploit (due to Juice Maker NPC)

+amatsu.gat,176,126,4	shop	Fruit Merchant	53,512:-1,513:-1,515:-1,516:-1,531:-1,532:-1,534:-1,533:-1

 //amatsu.gat,169,111,6	shop	Tool Dealer	83,611:-1,1750:-1,501:-1,502:-1,503:-1,504:-1,506:-1,525:-1,601:-1,602:-1,1065:-1,2239:-1

 amatsu.gat,180,102,3	shop	Flower Girl	96,712:-1,744:-1,2612:-1,2215:-1

 amatsu.gat,189,99,7	shop	Butcher	49,517:-1,528:-1,540:-1,541:-1

 amatsu.gat,169,119,6	shop	Gift Merchant	91,734:-1,735:-1,736:-1,737:-1,746:-1

-amatsu.gat,183,127,5	shop	Milk Merchant	90,713:-1,519:-1

+amatsu.gat,183,127,5	shop	Milk Merchant	90,713:10,519:-1

 //1st set

 //ama_in01.gat,96,28,4	shop	Weapon Dealer	54,1750:-1,1751:-1,1701:-1,1201:-1,1204:-1,1207:-1,1601:-1,1101:-1,1104:-1,1107:-1,1110:-1,1113:-1,1122:-1,1119:-1,1123:-1,1126:-1,1157:-1,1129:-1,1116:-1,1301:-1

 //ama_in01.gat,103,24,1	shop	Armor Dealer	48,2101:-1,2103:-1,2401:-1,2403:-1,2501:-1,2503:-1,2220:-1,2226:-1,2301:-1,2303:-1,2305:-1,2328:-1,2307:-1,2309:-1,2312:-1,2314:-1