Rearranged Ingredient Sellers. Removed doubled seller from Morocc

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

2 files changed, 18 insertions, 21 deletions

diff --git a/npc/Changelog.txt b/npc/Changelog.txt
index bd59b8c0d..b481b2503 100644
--- a/npc/Changelog.txt
+++ b/npc/Changelog.txt
@@ -28,6 +28,7 @@ Nexon
 Date		Added

 ======

 04/23

+	* Rearranged Ingredient Sellers. Removed doubled seller from Morocc [Lupus]

 	* Added an ingredient seller to Morroc, thanks to Muad_Dib [MasterOfMuppets]

 	* Fixed the names of the Lighthalzen and Einbroch refiners, thanks to Muad_Dib [Kargha]

 04/22

diff --git a/npc/merchants/shops.txt b/npc/merchants/shops.txt
index 70a325803..40b2ddd6c 100644
--- a/npc/merchants/shops.txt
+++ b/npc/merchants/shops.txt
@@ -3,23 +3,18 @@
 //===== By: ================================================== 

 //= eAthena Dev Team

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

-//= 1.22

+//= 1.4a

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

 //= eAthena 7.15 +

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

 //=

 //===== Additional Comments: ================================= 

 //= For earlier update notes see the bottom.

-//= 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]

-//= 1.20 Added 3 weapons shops, thx2 Muad_Dib [Lupus]

-//= 1.21 Added another weapon dealer to Einbroch, thanks to Muad_Dib [MasterOfMuppets]

-//=    - Fixed up the missing sprites for you Lupus :)

 //= 1.22 Thx8) Removed Berserk Potions from all shops but Comodo [Lupus]

 //= 1.3 Added Gunslinger shops. Credits goes to RockmanEXE for the info [erKURITA]

 //=	Added Bucket Hat to Flu Mask dealer and modified it's name to a more logical one :P [erKURITA]

 //= 1.4 Added an ingredient seller to Morroc, thanks to Muad_Dib [MasterOfMuppets]

+//= a Removed doubled Morocc Ing.Seller, arranged the rest Ing.Sellers according to the city names [Lupus]

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

 

 

@@ -34,6 +29,7 @@ alberta_in.gat,180,15,1	shop	Armor Dealer	101,2101:-1,2103:-1,2401:-1,2403:-1,24
 alberta_in.gat,188,21,1	shop	Weapon Dealer	49,1750:-1,1751:-1,1101:-1,1104:-1,1107:-1,1201:-1,1204:-1,1207:-1,1601:-1,1701:-1,1301:-1,1351:-1,1354:-1,1357:-1,1360:-1,1771:-1

 alberta_in.gat,175,97,4	shop	Weapon Dealer	82,1146:-1,1245:-1

 //alberta_in.gat,18,59,5	shop	Miner	48,1010:-1,1011:-1

+alberta.gat,169,136,4	shop	Ingredient Seller	750,579:-1

 

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

 //AL DE BARAN

@@ -44,6 +40,7 @@ aldeba_in.gat,22,47,4	shop	Weapon Dealer	713,1146:-1,1245:-1
 aldeba_in.gat,94,56,5	shop	Tool Dealer	83,501:-1,502:-1,503:-1,504:-1,506:-1,601:-1,602:-1,611:-1,610:-1,645:-1,656:-1

 //Commented out for now, until we get Homunculus working.

 //alde_alche.gat,38,184,2	shop	Homunculus Supplies	755,7143:-1,7141:-1,7140:-1,12040:-1

+aldebaran.gat,166,109,7	shop	Ingredient Seller	750,580:-1,7482:-1	//temp goods

 

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

 //AMATSU

@@ -63,6 +60,7 @@ ama_in01.gat,101,18,8	shop	Weapon Dealer	47,1401:-1,1404:-1,1407:-1,1451:-1,1454
 ama_in01.gat,89,28,4	shop	Armor Dealer	757,2211:-1,2401:-1,2403:-1,2501:-1,2503:-1,2101:-1,2103:-1,2305:-1,2321:-1,2332:-1,2314:-1,2627:-1

 ama_in01.gat,102,28,4	shop	Weapon Dealer	766,1207:-1,1216:-1,1107:-1,1122:-1,1116:-1,1154:-1,1407:-1,1457:-1,1354:-1,1519:-1

 ama_in01.gat,24,30,4	shop	Tool Dealer	763,1750:-1,1770:-1,611:-1,501:-1,502:-1,503:-1,504:-1,506:-1,645:-1,656:-1,601:-1,602:-1,1065:-1

+amatsu.gat,205,150,2	shop	Ingredient Seller	750,7453:-1,579:-1

 

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

 //AYOTHAYA

@@ -109,6 +107,7 @@ geffen_in.gat,77,167,1	shop	Tool Dealer	68,1750:-1,611:-1,501:-1,502:-1,503:-1,5
 geffen_in.gat,77,173,1	shop	Magical Tool Trader	64,717:-1,1601:-1,1604:-1,1607:-1,1610:-1,2232:-1,2321:-1,2332:-1

 geffen_in.gat,171,123,1	shop	Tool Dealer	64,1092:-1,1093:-1

 geffen.gat,193,152,3	shop	Pet Merchant	125,537:-1,643:-1,10013:-1,10014:-1

+geffen.gat,135,64,3	shop	Ingredient Seller	750,580:-1,7482:-1	//temp coords, temp goods

 

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

 //GONRYUN

@@ -212,6 +211,7 @@ nif_in.gat,154,21,3	shop	Tool Dealer	798,535:-1,1062:-1,902:-1,7106:-1,537:-1,71
 //niflheim.gat,224,185,3	shop	Fruit Merchant	795,512:-1,513:-1 

 //niflheim.gat,209,161,3	shop	Butcher	794,517:-1,528:-1 

 //niflheim.gat,205,152,3	shop	Gift Merchant	795,734:-1,735:-1,736:-1,737:-1,746:-1

+niflheim.gat,205,158,1	shop	Ingredient Seller	795,581:-1	//temp coords, temp spr ID

 

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

 //PAYON

@@ -282,8 +282,8 @@ yuno.gat,163,187,5	shop	Magic Dealer	90,717:-1,1601:-1,1604:-1,1607:-1,1610:-1,2
 yuno_in01.gat,25,34,4	shop	Tool Dealer	83,611:-1,1750:-1,501:-1,502:-1,503:-1,504:-1,505:-1,506:-1,645:-1,656:-1,601:-1,602:-1

 yuno_in01.gat,104,35,4	shop	Weapon Dealer	49,1750:-1,1751:-1,1101:-1,1701:-1,1201:-1,1204:-1,1207:-1,1210:-1,1213:-1,1216:-1,1601:-1,1604:-1,1607:-1,1610:-1,1771:-1

 yuno_in01.gat,112,25,5	shop	Armor Dealer	101,2628:-1,2101:-1,2107:-1,2401:-1,2501:-1,2230:-1,2301:-1,2303:-1,2305:-1,2321:-1,2332:-1

-//Temp shop in Yuno that sells Blank Scrolls

-yuno_in03.gat,176,22,3	shop	Scroll Seller	89,7433:-1

+yuno_in03.gat,176,22,3	shop	Scroll Seller	89,7433:-1	//Temp shop in Yuno that sells Blank Scrolls

+yuno.gat,133,171,2	shop	Ingredient Seller	750,7457:-1,7482:-1

 

 

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

@@ -291,26 +291,16 @@ yuno_in03.gat,176,22,3	shop	Scroll Seller	89,7433:-1
 //======================================

 //= Monk shop, sells Knuckle weapons)

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

-prt_monk.gat,135,263,3	shop	Blacksmith	726, 1801:8000//Waghnak, 1803:25000//Knuckle Dusters, 1805:32000//Studded Knuckles

+prt_monk.gat,135,263,3	shop	Blacksmith	726,1801:-1,1803:-1,1805:-1

 

 

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

-//New Food Sellers (rearrange them when it's settled down) [Lupus]

-//=======================================================

-yuno.gat,133,171,2	shop	Food Seller	750,7457:-1,7482:-1

-niflheim.gat,205,158,1	shop	Food Seller	795,581:-1	//temp coords, temp spr ID

-alberta.gat,169,136,4	shop	Food Seller	750,579:-1

-amatsu.gat,205,150,2	shop	Food Seller	750,7453:-1,579:-1

-morocc.gat,121,97,5	shop	Food Seller	750,7455:-1,7453:-1,7452:-1,7456:-1,7454:-1

-aldebaran.gat,166,109,7	shop	Food Seller	750,580:-1,7482:-1	//temp goods

-geffen.gat,135,64,3	shop	Food Seller	750,580:-1,7482:-1	//temp coords, temp goods

-

-//=======================================================

 // GUNSLINGER SHOPS

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

 que_ng.gat,179,91,4	shop	Gunner#Gunner1	900,13150:-1,13102:-1,13151:-1,13154:-1,13155:-1

 que_ng.gat,180,79,4	shop	Gunner#Gunner2	900,13200:-1,13201:-1,13202:-1

 

+

 //===== Additional Comments(old): ================================= 

 //= swapped shop titles in GONRYUN, thanks to Kashy

 //= 1.3a Fixed Louyang map name. Added additional shops in Yuno. [kobra_k88]

@@ -330,5 +320,11 @@ que_ng.gat,180,79,4	shop	Gunner#Gunner2	900,13200:-1,13201:-1,13202:-1
 //= 1.15a Fixed a small typo in alberta's weapon shop, thanks to reddozen for the fix [MasterOfMuppets]

 //= 1.16 Added a temp shop in Yuno to sell Blank scrolls, thanks to reddozen [MasterOfMuppets]

 //= 1.17 Added wand of hypnotist to the Lighthalzen weapon shop [MasterOfMuppets]

+//= 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]

+//= 1.20 Added 3 weapons shops, thx2 Muad_Dib [Lupus]

+//= 1.21 Added another weapon dealer to Einbroch, thanks to Muad_Dib [MasterOfMuppets]

+//=    - Fixed up the missing sprites for you Lupus :)

 //=   -  Guys, I suggest we crop these comments and put them at the bottom soon

 //============================================================
\ No newline at end of file