From 382f0b77bf009b938e578286b1048ccf8038d443 Mon Sep 17 00:00:00 2001 From: euphyy Date: Fri, 28 Dec 2012 04:10:17 +0000 Subject: * Added a point to 'npcskill' documentation. * Added Malangdo Tool Dealer. * Fixed quest log sample, which never worked to begin with -- thanks clydelion! * Fixed potential error with clones in custom Hunting Missions script (bugreport:7055). * Follow-up r16990, forgot to commit the EXP fix. git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@17055 54d463be-8e91-2dee-dedb-b68131a5f0ec --- npc/re/merchants/shops.txt | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) (limited to 'npc/re/merchants') diff --git a/npc/re/merchants/shops.txt b/npc/re/merchants/shops.txt index f9bde7a99..a6f64174d 100644 --- a/npc/re/merchants/shops.txt +++ b/npc/re/merchants/shops.txt @@ -3,7 +3,7 @@ //===== By: ================================================== //= rAthena Dev Team //===== Current Version: ===================================== -//= 1.2 +//= 1.3 //===== Compatible With: ===================================== //= rAthena SVN //===== Description: ========================================= @@ -12,6 +12,7 @@ //= 1.0 Moved some merchants to a separate renewal file. [Kenpachi] //= 1.1 Added Dicastes merchants. [Joseph] //= 1.2 Moved more shops to Renewal file. [Euphy] +//= 1.3 Added Malangdo tool dealer. [Euphy] //============================================================ //======================================================= @@ -51,6 +52,11 @@ lighthalzen,337,240,4 shop Trap Specialist#lhz 66,7940:-1,12341:-1 lhz_in03,181,17,4 shop Black Marketeer#lhz 49,2139:-1,2800:-1,2801:-1,2802:-1,2803:-1,2804:-1,2805:-1,2806:-1,2807:-1,18000:-1,18001:-1,18002:-1,18003:-1,18004:-1,12392:-1,12393:-1,12394:-1,6145:-1,6146:-1,6147:-1,6186:-1,2808:-1 s_atelier,15,65,5 shop Part-Timer#sc_lgt 89,6123:-1,6120:-1 +//======================================================= +// Malangdo +//======================================================= +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 + //======================================================= // Mid Camp //======================================================= -- cgit v1.2.3-60-g2f50