summaryrefslogtreecommitdiff
path: root/npc/re/merchants/shops.txt
diff options
context:
space:
mode:
authorStreusel <advance_me@hotmail.de>2013-03-20 21:40:11 -0800
committerStreusel <advance_me@hotmail.de>2013-03-20 21:40:11 -0800
commit77039104c0b66d524714487d7c14adb142b76ba8 (patch)
treea77283efcf4fc62faaf1adb398fdfc3dc835f77a /npc/re/merchants/shops.txt
parent4c79f825b0de36021af8de337e34b44835d363eb (diff)
downloadhercules-77039104c0b66d524714487d7c14adb142b76ba8.tar.gz
hercules-77039104c0b66d524714487d7c14adb142b76ba8.tar.bz2
hercules-77039104c0b66d524714487d7c14adb142b76ba8.tar.xz
hercules-77039104c0b66d524714487d7c14adb142b76ba8.zip
-Updated shops.txt & quests_moscovia.txt, credits to Euphy
Diffstat (limited to 'npc/re/merchants/shops.txt')
-rw-r--r--npc/re/merchants/shops.txt15
1 files changed, 15 insertions, 0 deletions
diff --git a/npc/re/merchants/shops.txt b/npc/re/merchants/shops.txt
index 9041ae2f3..35b1baf95 100644
--- a/npc/re/merchants/shops.txt
+++ b/npc/re/merchants/shops.txt
@@ -15,6 +15,7 @@
//= 1.3 Added Malangdo tool dealer. [Euphy]
//= 1.4 Moved Izlude merchants. [Streusel]
//= 1.5 Added Dewata merchants. [Lemongrass]
+//= 1.6 Added Mora and Porta Malaya merchants. [Euphy]
//============================================================
//=======================================================
@@ -70,6 +71,12 @@ s_atelier,15,65,5 shop Part-Timer#sc_lgt 89,6123:-1,6120:-1
malangdo,232,163,5 shop Tool Dealer Myo 560,611:-1,1750:-1,645:-1,656:-1,601:-1,602:-1,1065:-1,713:-1
//=======================================================
+// Mora
+//=======================================================
+mora,100,118,4 shop Tool Dealer#mora 517,11522:-1,11523:-1,11524:-1,602:-1,601:-1,611:-1,1773:-1,1774:-1,713:-1
+mora,138,110,4 shop Mora Chef 518,11519:-1
+
+//=======================================================
// Mid Camp
//=======================================================
mid_camp,129,284,4 shop Trap Specialist#mid 66,7940:-1,12341:-1
@@ -81,6 +88,14 @@ mid_camp,184,263,4 shop Black Marketeer#mid 49,2139:-1,2800:-1,2801:-1,2802:-1,2
payon,123,109,4 shop Trap Specialist#pay 66,7940:-1,12341:-1
//=======================================================
+// Port Malaya
+//=======================================================
+ma_in01,73,22,3 shop Weapon Dealer#ma 536,1207:-1,1216:-1,1107:-1,1122:-1,1116:-1,1154:-1,1407:-1,1457:-1,1354:-1,1519:-1
+ma_in01,22,23,3 shop Tool Dealer#ma 536,611:-1,1750:-1,501:-1,502:-1,503:-1,504:-1,645:-1,656:-1,601:-1,602:-1,1065:-1,2239:-1
+malaya,150,261,3 shop Fruit Gardener#ma 535,512:-1,513:-1,515:-1,516:-1,535:-1
+ma_in01,67,13,5 shop Armor Dealer#ma 536,2211:-1,2401:-1,2403:-1,2501:-1,2503:-1,2101:-1,2103:-1,2305:-1,2321:-1,2332:-1,2328:-1,2627:-1
+
+//=======================================================
// Prontera
//=======================================================
//prontera,104,88,5 shop Stuff Gimme 880,616:-1