summaryrefslogtreecommitdiff
path: root/npc/merchants/shops.txt
diff options
context:
space:
mode:
authorkobra_k88 <kobra_k88@54d463be-8e91-2dee-dedb-b68131a5f0ec>2004-11-07 08:51:33 +0000
committerkobra_k88 <kobra_k88@54d463be-8e91-2dee-dedb-b68131a5f0ec>2004-11-07 08:51:33 +0000
commitdae8c1978adc2bc0b6fa78b66c15115f6987107a (patch)
treed6e427a8b17c30eec706f10ec7f9f94ad26938c1 /npc/merchants/shops.txt
parent5e186df8aaa674d09a281ef7ae1005f613f93e6b (diff)
downloadhercules-dae8c1978adc2bc0b6fa78b66c15115f6987107a.tar.gz
hercules-dae8c1978adc2bc0b6fa78b66c15115f6987107a.tar.bz2
hercules-dae8c1978adc2bc0b6fa78b66c15115f6987107a.tar.xz
hercules-dae8c1978adc2bc0b6fa78b66c15115f6987107a.zip
Implemented the rest of the triggers for the Doomed Swords quest and the Jack Frost quest. Commented out some duplicate shops.
git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/athena@45 54d463be-8e91-2dee-dedb-b68131a5f0ec
Diffstat (limited to 'npc/merchants/shops.txt')
-rw-r--r--npc/merchants/shops.txt8
1 files changed, 4 insertions, 4 deletions
diff --git a/npc/merchants/shops.txt b/npc/merchants/shops.txt
index 947754e59..32cffd3ef 100644
--- a/npc/merchants/shops.txt
+++ b/npc/merchants/shops.txt
@@ -41,19 +41,19 @@ aldeba_in.gat,94,56,5 shop Tool Dealer 83,501:-1,502:-1,503:-1,504:-1,506:-1,601
//AMATSU
//=======================================================
amatsu.gat,176,126,4 shop Fruit Merchant 53,512:-1,513:-1,515:-1,514:-1,531:-1,532:-1,534:-1,533:-1
-amatsu.gat,169,111,6 shop Tool Dealer 83,611:-1,1750:-1,501:-1,502:-1,503:-1,504:-1,506:-1,525:-1,601:-1,602:-1,1065:-1,2239:-1
+//amatsu.gat,169,111,6 shop Tool Dealer 83,611:-1,1750:-1,501:-1,502:-1,503:-1,504:-1,506:-1,525:-1,601:-1,602:-1,1065:-1,2239:-1
amatsu.gat,180,102,3 shop Flower Girl 96,712:-1,744:-1,2612:-1,2215:-1
amatsu.gat,189,99,7 shop Butcher 49,517:-1,528:-1,540:-1,541:-1
amatsu.gat,169,119,6 shop Gift Merchant 91,734:-1,735:-1,736:-1,737:-1,746:-1
amatsu.gat,183,127,5 shop Milk Merchant 90,713:-1,519:-1
//1st set
-ama_in01.gat,96,28,4 shop Weapon Dealer 54,1750:-1,1751:-1,1701:-1,1201:-1,1204:-1,1207:-1,1601:-1,1101:-1,1104:-1,1107:-1,1110:-1,1113:-1,1122:-1,1119:-1,1123:-1,1126:-1,1157:-1,1129:-1,1116:-1,1301:-1
-ama_in01.gat,103,24,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
+//ama_in01.gat,96,28,4 shop Weapon Dealer 54,1750:-1,1751:-1,1701:-1,1201:-1,1204:-1,1207:-1,1601:-1,1101:-1,1104:-1,1107:-1,1110:-1,1113:-1,1122:-1,1119:-1,1123:-1,1126:-1,1157:-1,1129:-1,1116:-1,1301:-1
+//ama_in01.gat,103,24,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
ama_in01.gat,101,18,8 shop Weapon Dealer 47,1401:-1,1404:-1,1407:-1,1451:-1,1454:-1,1457:-1,1460:-1,1463:-1,1410:-1
//2nd set
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:-11154:-1,1407:-1,1457:-1,1354:-1,1519:-1
-ama_in01.gat,24,30,4 shop Tool Dealer 763,611:-1,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
+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
//=======================================================
//COMODO