From 9429d119e2ce99e16687b1b785352cf5ad0d8ade Mon Sep 17 00:00:00 2001 From: celest Date: Wed, 8 Dec 2004 15:59:33 +0000 Subject: * Changed Lord of Death spawn time * Added nomemo flags for Niflheim and some maps * Updated Niflheim shops and Morroc jewel merchant git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/branches/stable@512 54d463be-8e91-2dee-dedb-b68131a5f0ec --- npc/merchants/shops.txt | 24 ++++++++++++++---------- 1 file changed, 14 insertions(+), 10 deletions(-) (limited to 'npc/merchants') diff --git a/npc/merchants/shops.txt b/npc/merchants/shops.txt index 5ce421b31..4080b83b1 100644 --- a/npc/merchants/shops.txt +++ b/npc/merchants/shops.txt @@ -3,7 +3,7 @@ //===== By: ================================================== //= eAthena Dev Team //===== Current Version: ===================================== -//= 1.7 +//= 1.8 //===== Compatible With: ===================================== //= eAthena 7.15 + //===== Description: ========================================= @@ -16,6 +16,7 @@ //= 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] //============================================================ @@ -121,7 +122,7 @@ morocc.gat,145,44,1 shop Jewel Seller 99,730:-1,2613:-1 morocc.gat,147,102,5 shop Tool Dealer 93,1750:-1,611:-1,501:-1,502:-1,503:-1,504:-1,506:-1,525:-1,601:-1,602:-1,1065:-1,645:-1,656:-1,657:-1 morocc.gat,151,243,1 shop Tool Dealer 99,1750:-1,611:-1,501:-1,502:-1,503:-1,504:-1,506:-1,525:-1,601:-1,602:-1,2242:-1,645:-1,656:-1,657:-1 morocc.gat,157,72,6 shop Butcher 49,517:-1 -morocc.gat,166,51,1 shop Jewel Seller 102,721:-1,722:-1,726:-1,728:-1,729:-1 +morocc.gat,166,51,1 shop Jewel Seller 102,721:-1,723:-1,726:-1,728:-1,729:-1 morocc.gat,170,101,3 shop Tool Dealer 85,909:-1,528:-1,919:-1,925:-1 morocc.gat,206,250,1 shop Tool Dealer 85,909:-1,528:-1,919:-1,925:-1 morocc.gat,244,134,1 shop Trader 93,2612:-1 @@ -133,13 +134,16 @@ morocc.gat,269,167,4 shop Pet Merchant 125,537:-1,643:-1,10013:-1,10014:-1 //======================================================= //NIFLHEIM //======================================================= -nif_in.gat,35,91,3 shop Armor Dealer 796,2101:-1,2107:-1,2401:-1,2501:-1,2230:-1,2301:-1,2303:-1,2305:-1,2321:-1,2332:-1 -nif_in.gat,35,84,3 shop Weapon Dealer 795,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 -nif_in.gat,154,21,3 shop Tool Dealer 798,611:-1,1750:-1,501:-1,502:-1,503:-1,504:-1,506:-1,525:-1,601:-1,602:-1,1065:-1,2239:-1,645:-1,656:-1,657:-1 -niflheim.gat,201,209,3 shop Milk Merchant 794,519:-1 -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 +nif_in.gat,35,84,3 shop Weapon Dealer 795,1301:-1,1351:-1,1354:-1,1357:-1,1360:-1 +nif_in.gat,35,91,3 shop Armor Dealer 796,2501:-1,2501:-1,2503:-1,2503:-1,2505:-1,2505:-1 +nif_in.gat,154,21,3 shop Tool Dealer 798,535:-1,1062:-1,902:-1,7106:-1,537:-1,7154:-1,1052:-1,934:-1 +//nif_in.gat,35,84,3 shop Weapon Dealer 795,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 +//nif_in.gat,35,91,3 shop Armor Dealer 796,2101:-1,2107:-1,2401:-1,2501:-1,2230:-1,2301:-1,2303:-1,2305:-1,2321:-1,2332:-1 +//nif_in.gat,154,21,3 shop Tool Dealer 798,611:-1,1750:-1,501:-1,502:-1,503:-1,504:-1,506:-1,525:-1,601:-1,602:-1,1065:-1,2239:-1,645:-1,656:-1,657:-1 +//niflheim.gat,201,209,3 shop Milk Merchant 794,519:-1 +//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 //======================================================= //PAYON @@ -198,7 +202,7 @@ um_in.gat,151,125,4 shop Armor Merchant 49,2103:-1,2105:-1,2403:-1,2405:-1,2503: //======================================================= yuno.gat,65,122,4 shop Fruit Merchant 93,512:-1,513:-1,515:-1,516:-1 yuno.gat,217,97,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.gat,226,106,5 shop Trader 97, 909:-1, 911:-1, 910:-1, 912:-1 +yuno.gat,226,106,5 shop Trader 97, 911:-1, 910:-1, 912:-1 yuno.gat,197,115,4 shop Pet Merchant 124, 537:-1, 643:-1, 10013:-1, 10014:-1 yuno.gat,205,104,4 shop Equip Dealer 84, 2340:-1, 2341:-1, 2411:-1, 2222:-1, 2230:-1; 1721:-1 yuno.gat,163,187,5 shop Magic Dealer 90,717:-1,1601:-1,1604:-1,1607:-1,1610:-1,2232:-1,2321:-1,2332:-1 -- cgit v1.2.3-60-g2f50