diff options
author | euphyy <euphyy@54d463be-8e91-2dee-dedb-b68131a5f0ec> | 2012-12-28 04:10:17 +0000 |
---|---|---|
committer | euphyy <euphyy@54d463be-8e91-2dee-dedb-b68131a5f0ec> | 2012-12-28 04:10:17 +0000 |
commit | 382f0b77bf009b938e578286b1048ccf8038d443 (patch) | |
tree | 38149064107c7d0cf3fcf8846674b8b4e2e8c6b5 /npc/re/merchants/shops.txt | |
parent | df3a626f0375fa50c21b1371d565178ec1415935 (diff) | |
download | hercules-382f0b77bf009b938e578286b1048ccf8038d443.tar.gz hercules-382f0b77bf009b938e578286b1048ccf8038d443.tar.bz2 hercules-382f0b77bf009b938e578286b1048ccf8038d443.tar.xz hercules-382f0b77bf009b938e578286b1048ccf8038d443.zip |
* 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
Diffstat (limited to 'npc/re/merchants/shops.txt')
-rw-r--r-- | npc/re/merchants/shops.txt | 8 |
1 files changed, 7 insertions, 1 deletions
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] //============================================================ //======================================================= @@ -52,6 +53,11 @@ lhz_in03,181,17,4 shop Black Marketeer#lhz 49,2139:-1,2800:-1,2801:-1,2802:-1,28 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 //======================================================= mid_camp,129,284,4 shop Trap Specialist#mid 66,7940:-1,12341:-1 |