Added a weapon shop to Einbroch and adjusted the prices of some daggers, thanks to Muad_Dib.

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

2 files changed, 31 insertions, 27 deletions

diff --git a/npc/Changelog.txt b/npc/Changelog.txt
index 75a404513..08a1aadda 100644
--- a/npc/Changelog.txt
+++ b/npc/Changelog.txt
@@ -28,6 +28,7 @@ Nexon
 Date		Added

 ======

 03/11

+	* Added another weapon dealer to Einbroch, thanks to Muad_Dib [MasterOfMuppets]

 	* Updated, fixed Custom Thanatos Statues Quest, thx2Justin84 for help [Lupus]

 03/10

 	* Fixed Turtle Island quest, got rid of 2 useless variables [Lupus]

diff --git a/npc/merchants/shops.txt b/npc/merchants/shops.txt
index 9c830969b..161c9b921 100644
--- a/npc/merchants/shops.txt
+++ b/npc/merchants/shops.txt
@@ -3,39 +3,22 @@
 //===== By: ================================================== 

 //= eAthena Dev Team

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

-//= 1.20

+//= 1.21

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

 //= eAthena 7.15 +

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

 //=

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

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

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

-//= 1.4 Added Niflheim Shops

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

-//= 1.7 Removed juices from custom amatsu shops (it's a quest item + levelup exploit)

-//= 1.8 Corrected Niflheim Shops and Morroc Jewel Merchant [celest]

-//= 1.9 Updated Louyang shops thanks to MasterOfMuppets

-//= 1.10 Lutie Tools coords [Yor]

-//= 1.11 Added Belts to Prontera/Aldebaran shops, thanks to reddozen [Lupus]

-//= 1.12 official Ayothaya Shops, thanks to MasterOfMuppets [Lupus]

-//= 1.13 Added 5092 Coif into Prontera Church shop [Lupus]

-//= 1.14 Added Lighthalzen,Einbroch,Einbech shops. Updated Prontera,Morroc,Payon shops [Lupus]

-//= 1.15 Added Venom Knives into every Weapon Shop (that sells Knife[3]) [Lupus]

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

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

+//= 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 :)

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

 

 

-

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

 //ALBERTA

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

@@ -45,8 +28,7 @@ alberta_in.gat,165,96,1	shop	Item Collector	74,909:-1,528:-1
 alberta_in.gat,182,96,1	shop	Tool Dealer	73,611:-1,501:-1,502:-1,503:-1,504:-1,506:-1,525:-1,601:-1,602:-1,1750:-1,2243:-1,645:-1,656:-1,657:-1

 alberta_in.gat,180,15,1	shop	Armor Dealer	101,2101:-1,2103:-1,2401:-1,2403:-1,2405:-1,2501:-1,2503:-1,2505:-1,2203:-1,2201:-1,2205:-1,2226:-1,2301:-1,2303:-1,2305:-1,2321:-1,2328:-1,2332:-1,2307:-1,2309:-1,2312:-1,2314:-1

 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

-//need SPR ID 4_KID1

-alberta_in.gat,175,97,4	shop	Weapon Dealer	66,1146:-1,1245:-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

 

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

@@ -54,8 +36,7 @@ alberta_in.gat,175,97,4	shop	Weapon Dealer	66,1146:-1,1245:-1
 //=======================================================

 aldeba_in.gat,20,60,5	shop	Armor Dealer	101,2228:-1,2103:-1,2105:-1,2307:-1,2309:-1,2312:-1,2314:-1,2316:-1,2505:-1,2405:-1,2627:-1

 aldeba_in.gat,28,54,5	shop	Weapon Dealer	85,1201:-1,1204:-1,1207:-1,1210:-1,1213:-1,1216:-1,1219:-1,1222:-1,1771:-1

-//need SPR ID 4_M_06

-aldeba_in.gat,22,47,4	shop	Weapon Dealer	66,1146:-1,1245:-1

+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,657:-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

@@ -107,6 +88,7 @@ ein_in01.gat,189,15,0	shop	Tool Dealer	850,1750:-1,1752:-1,1751:-1,611:-1,501:-1
 //=======================================================

 ein_in01.gat,106,27,4	shop	One-Hand Weapon Dealer	850,1101:-1,1104:-1,1107:-1,1110:-1,1113:-1,1119:-1,1122:-1,1123:-1,1126:-1,1129:-1,1201:-1,1204:-1,1207:-1,1210:-1,1213:-1,1216:-1,1219:-1,1222:-1,1301:-1,1401:-1,1404:-1,1407:-1,1501:-1,1504:-1,1507:-1,1510:-1,1513:-1,1516:-1,1519:-1,1522:-1,1801:-1,1803:-1,1805:-1,1807:-1,1809:-1,1811:-1,1771:-1

 ein_in01.gat,109,27,4	shop	Two-Hand Weapon Dealer	850,1116:-1,1151:-1,1154:-1,1157:-1,1160:-1,1351:-1,1354:-1,1357:-1,1360:-1,1410:-1,1451:-1,1454:-1,1457:-1,1460:-1,1463:-1,1250:-1,1252:-1,1254:-1

+ein_in01.gat,119,26,4	shop	Weapon Dealer	855,1247:-1,1248:-1,1249:-1,13000:-1

 einbroch.gat,138,66,3	shop	Flu Mask Dealer	850,2218:-1

 einbroch.gat,82,199,3	shop	Paddler	855,512:-1,645:-1,1750:-1,501:-1

 

@@ -115,8 +97,7 @@ einbroch.gat,82,199,3	shop	Paddler	855,512:-1,645:-1,1750:-1,501:-1
 //=======================================================

 geffen_in.gat,25,177,1	shop	Armor Dealer	66,2101:-1,2107:-1,2401:-1,2501:-1,2230:-1,2301:-1,2303:-1,2305:-1,2321:-1,2332:-1

 geffen_in.gat,29,177,1	shop	Weapon Dealer	47,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

-//need SPR ID 4_M_02

-geffen_in.gat,22,171,6	shop	Weapon Dealer	66,1146:-1,1245:-1

+geffen_in.gat,22,171,6	shop	Weapon Dealer	84,1146:-1,1245:-1

 geffen_in.gat,74,144,1	shop	Trader	66,909:-1,911:-1,910:-1,912:-1

 geffen_in.gat,77,167,1	shop	Tool Dealer	68,1750:-1,611:-1,501:-1,502:-1,503:-1,504:-1,506:-1,525:-1,601:-1,602:-1,2241:-1,645:-1,656:-1,657:-1

 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

@@ -316,3 +297,25 @@ 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

+

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

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

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

+//= 1.4 Added Niflheim Shops

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

+//= 1.7 Removed juices from custom amatsu shops (it's a quest item + levelup exploit)

+//= 1.8 Corrected Niflheim Shops and Morroc Jewel Merchant [celest]

+//= 1.9 Updated Louyang shops thanks to MasterOfMuppets

+//= 1.10 Lutie Tools coords [Yor]

+//= 1.11 Added Belts to Prontera/Aldebaran shops, thanks to reddozen [Lupus]

+//= 1.12 official Ayothaya Shops, thanks to MasterOfMuppets [Lupus]

+//= 1.13 Added 5092 Coif into Prontera Church shop [Lupus]

+//= 1.14 Added Lighthalzen,Einbroch,Einbech shops. Updated Prontera,Morroc,Payon shops [Lupus]

+//= 1.15 Added Venom Knives into every Weapon Shop (that sells Knife[3]) [Lupus]

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

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

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