* Part 1 of Gravitys "Zeny Inflation Control Update"

	- All potion type drops from monsters are changed with Herbs (Excluding MvP Monsters).
		Red Potions -> Red Herb
		Orange Potion -> Yellow Herb
		Yellow Potion -> Yellow Herb
		White Potion -> White Herb
		Green Potion -> Green Herb
	- 'Mastela Fruit', dropped by 'Enchanted Peach Tree' monster, will be deleted.
	   You can buy it in Hugel.
	- All Awakening Potions replaced with Grapes.
	- All Berserk Potions replaced by Lemon.

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

3 files changed, 12 insertions, 7 deletions

diff --git a/npc/Changelog.txt b/npc/Changelog.txt
index b375dc567..205476f69 100644
--- a/npc/Changelog.txt
+++ b/npc/Changelog.txt
@@ -29,7 +29,9 @@ Date		Added
 ======

 

 02/14

+	* Added a new Fruit Merchant in Hugel. [Poki#3]

 	* New, updated st.Valentine Event with a nice quest and EXP bonuses ^_- [Lupus]

+

 02/13

 	* Updated the eA custom spawn sets from Playtester: Juperos lv1, Glast heim

 	  Sewers/Underground and Geffen dungeon lv3. [Skotlex]

diff --git a/npc/cities/hugel.txt b/npc/cities/hugel.txt
index 9960847e7..7191713f1 100644
--- a/npc/cities/hugel.txt
+++ b/npc/cities/hugel.txt
@@ -17,23 +17,24 @@
 hugel.gat,91,152,4	script	Bulletin Board	837,{end;}

 

 hugel.gat,102,161,3	script	Young Sailor	100,{end;}

-hugel.gat,90,151,3	script	Yoko	893,{end;}

-hu_in01.gat,111,386,4	script	Jino	86,{end;}

+hugel.gat,85,139,3	script	Yoko	893,{end;}

 hugel.gat,100,102,3	script	Grandpa Hohi	866,{end;}

 hugel.gat,85,93,3	script	Grandpa Hiho	866,{end;}

-hu_in01.gat,23,311,4	script	Johsh	868,{end;}

+hugel.gat,85,165,5	script	Cudy	896,{end;}

 hugel.gat,107,67,3	script	Kiddy the Kid	706,{end;}

-hu_in01.gat,246,107,2	script	Receptionist	53,{end;}

-hu_in01.gat,256,40,2	script	Garud	897,{end;}

 hugel.gat,98,57,3	script	Old Lady	863,{end;}

 hugel.gat,71,82,3	script	Hon Kiki	900,{end;}

 hugel.gat,56,103,2	script	Sarko	709,{end;}

 hugel.gat,68,99,2	script	Billy the Bull	889,{end;}

+hugel.gat,169,112,5	script	Sani	892,{end;}

 hu_in01.gat,26,77,4	script	Bokie	50,{end;}

 hu_in01.gat,18,94,2	script	Katsuki	95,{end;}

 hu_in01.gat,16,20,4	script	Jamie	70,{end;}

 hu_in01.gat,14,11,4	script	Jana	49,{end;}

 hu_in01.gat,19,161,2	script	Matilda	803,{end;}

 hu_in01.gat,18,167,4	script	Gin	86,{end;}

-hugel.gat,169,112,5	script	Sani	892,{end;}

 hu_in01.gat,381,304,5	script	Soldier	105,{end;}

+hu_in01.gat,111,386,4	script	Jino	86,{end;}

+hu_in01.gat,23,311,4	script	Johsh	868,{end;}

+hu_in01.gat,246,107,2	script	Receptionist	53,{end;}

+hu_in01.gat,256,40,2	script	Garud	897,{end;}

diff --git a/npc/merchants/shops.txt b/npc/merchants/shops.txt
index 6c307bb91..d2c37c1e1 100644
--- a/npc/merchants/shops.txt
+++ b/npc/merchants/shops.txt
@@ -3,7 +3,7 @@
 //===== By: ================================================== 

 //= eAthena Dev Team

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

-//= 1.18

+//= 1.19a

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

 //= eAthena 7.15 +

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

@@ -30,6 +30,7 @@
 //=   -  Guys, I suggest we crop these comments and put them at the bottom soon

 //= 1.18 Fixed some shops based on kRO shots [Poki#3]

 //= 1.19 Added Hugel and fixed Payon shops based on kRO shots [Poki#3]

+//= 1.19a Added Food Seller selling Mastela Fruit in Hugel (Update item_db for the correct price!) [Poki#3]

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

 

 

@@ -127,6 +128,7 @@ gonryun.gat,148,101,4	shop	Food Seller	750,580:-1,7452:-1
 //HUGEL

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

 hugel.gat,105,169,5	shop	Milk Merchant	53,519:-1

+hugel.gat,77,167,3	shop	Food Seller	892,522:-1,512:-1,513:-1,515:-1,516:-1,535:-1

 hu_in01.gat,241,368,2	shop	Tool Dealer	53,1750:-1,611:-1,501:-1,502:-1,503:-1,504:-1,506:-1,645:-1,656:-1,601:-1,602:-1,1065:-1

 hu_in01.gat,252,368,2	shop	Tool Trader	90,717:-1,2201:-1,910:-1,528:-1

 hu_in01.gat,100,390,2	shop	Bow Dealer	86,1701:-1,1707:-1,1718:-1,1714:-1