added 3 shops

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

2 files changed, 11 insertions, 2 deletions

diff --git a/npc/Changelog.txt b/npc/Changelog.txt
index 3058d2eda..36db72348 100644
--- a/npc/Changelog.txt
+++ b/npc/Changelog.txt
@@ -29,6 +29,8 @@ Date		Added
 ======

 03/10

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

+	* Added 3 Weapon shops, thanks to Muad_Dib. Still need SPRITES ID [Lupus]

+		^^^^^ could we just add spr ID's into CONST.txt?

 03/07

 	* Fixed some reference to old locations of the Blacksmith NPC's, Thanks to Neouni. [Poki#3]

 03/06

diff --git a/npc/merchants/shops.txt b/npc/merchants/shops.txt
index d893925dd..9c830969b 100644
--- a/npc/merchants/shops.txt
+++ b/npc/merchants/shops.txt
@@ -3,7 +3,7 @@
 //===== By: ================================================== 

 //= eAthena Dev Team

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

-//= 1.19a

+//= 1.20

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

 //= eAthena 7.15 +

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

@@ -31,6 +31,7 @@
 //= 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]

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

 

 

@@ -44,6 +45,8 @@ 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,18,59,5	shop	Miner	48,1010:-1,1011:-1

 

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

@@ -51,6 +54,8 @@ alberta_in.gat,188,21,1	shop	Weapon Dealer	49,1750:-1,1751:-1,1101:-1,1104:-1,11
 //=======================================================

 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,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

@@ -110,6 +115,8 @@ 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,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

@@ -254,7 +261,7 @@ prt_in.gat,172,130,1	shop	Weapon Dealer	54,1750:-1,1751:-1,1701:-1,1201:-1,1204:
 prt_in.gat,172,132,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,2627:-1

 prt_in.gat,171,140,1	shop	Weapon Dealer	47,1401:-1,1404:-1,1407:-1,1451:-1,1454:-1,1457:-1,1460:-1,1463:-1,1410:-1

 //prt_in.gat,56,69,4	shop	Miner	48,1010:-1,1011:-1

-prt_in.gat,165,140,4	shop	Weapon Dealer	66,1146:-1,1245:-1

+prt_in.gat,164,140,4	shop	Weapon Dealer	66,1146:-1,1245:-1

 

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

 //TURTLE ISLAND