summaryrefslogtreecommitdiff
path: root/npc/scripts_athena.conf
diff options
context:
space:
mode:
authoreuphyy <euphyy@54d463be-8e91-2dee-dedb-b68131a5f0ec>2012-09-10 20:33:57 +0000
committereuphyy <euphyy@54d463be-8e91-2dee-dedb-b68131a5f0ec>2012-09-10 20:33:57 +0000
commit297ec47268b9fe62dc08413306d66c143f3e9aea (patch)
tree8549a983bbb0727476ab231f850d5cb4663610e0 /npc/scripts_athena.conf
parent72f7c891fd5b2bca64b8f366bced65ca568f77c2 (diff)
downloadhercules-297ec47268b9fe62dc08413306d66c143f3e9aea.tar.gz
hercules-297ec47268b9fe62dc08413306d66c143f3e9aea.tar.bz2
hercules-297ec47268b9fe62dc08413306d66c143f3e9aea.tar.xz
hercules-297ec47268b9fe62dc08413306d66c143f3e9aea.zip
* Optimized Splendide coin merchant and merged it to a template with Manuk's (merchants\coin_exchange.txt)
* Fixed and enabled a Manuk NPC (cities\manuk.txt) * Other small changes and fixes. git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@16773 54d463be-8e91-2dee-dedb-b68131a5f0ec
Diffstat (limited to 'npc/scripts_athena.conf')
-rw-r--r--npc/scripts_athena.conf3
1 files changed, 1 insertions, 2 deletions
diff --git a/npc/scripts_athena.conf b/npc/scripts_athena.conf
index ab83fb7df..8b8ce645b 100644
--- a/npc/scripts_athena.conf
+++ b/npc/scripts_athena.conf
@@ -126,6 +126,7 @@ npc: npc/merchants/ammo_boxes.txt
npc: npc/merchants/ammo_dealer.txt
npc: npc/merchants/buying_shops.txt
//npc: npc/merchants/clothes_dyer.txt
+npc: npc/merchants/coin_exchange.txt
npc: npc/merchants/dye_maker.txt
npc: npc/merchants/elemental_trader.txt
npc: npc/merchants/enchan_arm.txt
@@ -135,7 +136,6 @@ npc: npc/merchants/hair_style.txt
//npc: npc/merchants/icecream.txt
npc: npc/merchants/inn.txt
npc: npc/merchants/kunai_maker.txt
-npc: npc/merchants/manuk.txt
npc: npc/merchants/milk_trader.txt
npc: npc/merchants/novice_exchange.txt
npc: npc/merchants/old_pharmacist.txt
@@ -145,7 +145,6 @@ npc: npc/merchants/renters.txt
npc: npc/merchants/shops.txt
npc: npc/merchants/socket_enchant.txt
npc: npc/merchants/socket_enchant2.txt
-npc: npc/merchants/splendide.txt
npc: npc/merchants/wander_pet_food.txt
// - Cash Shop
// See file before enabling, as you may wish to change the