From f9f1a3cc84b4b4b152f58d849de943ee04f82c9d Mon Sep 17 00:00:00 2001 From: MasterOfMuppets Date: Sun, 23 Apr 2006 18:29:36 +0000 Subject: Why do we have both a changelog here and inside the SVN? git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@6240 54d463be-8e91-2dee-dedb-b68131a5f0ec --- npc/Changelog.txt | 2 ++ npc/merchants/shops.txt | 2 ++ 2 files changed, 4 insertions(+) diff --git a/npc/Changelog.txt b/npc/Changelog.txt index 88a4d81ae..b834ad183 100644 --- a/npc/Changelog.txt +++ b/npc/Changelog.txt @@ -27,6 +27,8 @@ Nexon Date Added ====== +04/23 + * Added an ingredient seller to Morroc, thanks to Muad_Dib [MasterOfMuppets] 04/22 * Fixed some typos in the mage quest thanks to decayed.cell [Playtester] 04/21 diff --git a/npc/merchants/shops.txt b/npc/merchants/shops.txt index 29725ec91..70a325803 100644 --- a/npc/merchants/shops.txt +++ b/npc/merchants/shops.txt @@ -19,6 +19,7 @@ //= 1.22 Thx8) Removed Berserk Potions from all shops but Comodo [Lupus] //= 1.3 Added Gunslinger shops. Credits goes to RockmanEXE for the info [erKURITA] //= Added Bucket Hat to Flu Mask dealer and modified it's name to a more logical one :P [erKURITA] +//= 1.4 Added an ingredient seller to Morroc, thanks to Muad_Dib [MasterOfMuppets] //============================================================ @@ -194,6 +195,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_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 -- cgit v1.2.3-70-g09d2