summaryrefslogtreecommitdiff
path: root/npc
diff options
context:
space:
mode:
authorPlaytester <Playtester@54d463be-8e91-2dee-dedb-b68131a5f0ec>2006-07-27 10:40:29 +0000
committerPlaytester <Playtester@54d463be-8e91-2dee-dedb-b68131a5f0ec>2006-07-27 10:40:29 +0000
commit5c5b78dc8c26ae02a1b8245a8398c8cffdb314f3 (patch)
tree2d924b09155a323603c49adce207ebf75ac08a1e /npc
parent391bdf7ec1974db2fd432b988a60ed0ae880b578 (diff)
downloadhercules-5c5b78dc8c26ae02a1b8245a8398c8cffdb314f3.tar.gz
hercules-5c5b78dc8c26ae02a1b8245a8398c8cffdb314f3.tar.bz2
hercules-5c5b78dc8c26ae02a1b8245a8398c8cffdb314f3.tar.xz
hercules-5c5b78dc8c26ae02a1b8245a8398c8cffdb314f3.zip
Fixed the Morroc ingredient seller to not appear
git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@7911 54d463be-8e91-2dee-dedb-b68131a5f0ec
Diffstat (limited to 'npc')
-rw-r--r--npc/Changelog.txt1
-rw-r--r--npc/merchants/shops.txt2
2 files changed, 2 insertions, 1 deletions
diff --git a/npc/Changelog.txt b/npc/Changelog.txt
index cbf1260f8..96a8c3059 100644
--- a/npc/Changelog.txt
+++ b/npc/Changelog.txt
@@ -39,6 +39,7 @@ Playtester
Date Added
======
07/27
+ * Fixed the Morroc ingredient seller to not appear [Playtester]
* Fixed some spawns and a warp in Sunken Ship [Playtester]
07/26
* Fixed the Factory Quest [Playtester]
diff --git a/npc/merchants/shops.txt b/npc/merchants/shops.txt
index 0e391b382..3e2ad76d8 100644
--- a/npc/merchants/shops.txt
+++ b/npc/merchants/shops.txt
@@ -210,7 +210,7 @@ morocc.gat,244,134,1 shop Trader 93,2612:-1
morocc.gat,259,193,1 shop Trader 99,747:-1
morocc.gat,268,193,1 shop Trader 93,748:-1
morocc.gat,269,167,4 shop Pet Merchant 125,537:-1,643:-1,10013:-1,10014:-1
-morocc.gat,120,97,5 shop Ingredient Seller 86,7452,:-,7453:-1,7454:-1,7455:-1,7456:-1
+morocc.gat,120,97,5 shop Ingredient Seller 86,7452:-1,7453:-1,7454:-1,7455:-1,7456:-1
//morocc_in.gat,65,37,4 shop Miner 48,1010:-1,1011:-1
morocc_in.gat,132,57,0 shop Weapon Dealer 99,1146:-1,1245:-1