summaryrefslogtreecommitdiff
path: root/npc/scripts_athena.conf
diff options
context:
space:
mode:
authorL0ne_W0lf <L0ne_W0lf@54d463be-8e91-2dee-dedb-b68131a5f0ec>2010-06-01 23:01:54 +0000
committerL0ne_W0lf <L0ne_W0lf@54d463be-8e91-2dee-dedb-b68131a5f0ec>2010-06-01 23:01:54 +0000
commitf1c4780376953eae3c5e38b7615c06e07b178431 (patch)
treef174d175dbf283294387ae724a01ccb8e3756427 /npc/scripts_athena.conf
parentebab0958bab3daf5834d5805ef3425a11fffc3bb (diff)
downloadhercules-f1c4780376953eae3c5e38b7615c06e07b178431.tar.gz
hercules-f1c4780376953eae3c5e38b7615c06e07b178431.tar.bz2
hercules-f1c4780376953eae3c5e38b7615c06e07b178431.tar.xz
hercules-f1c4780376953eae3c5e38b7615c06e07b178431.zip
* Implemented the Manuk and Splendide item status effects, thanks to Epoque.
* Implemented Manuk and Splendide consumable items. * Added Splendide and Manuk merchants. git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@14327 54d463be-8e91-2dee-dedb-b68131a5f0ec
Diffstat (limited to 'npc/scripts_athena.conf')
-rw-r--r--npc/scripts_athena.conf2
1 files changed, 2 insertions, 0 deletions
diff --git a/npc/scripts_athena.conf b/npc/scripts_athena.conf
index 53f656da8..7a408c249 100644
--- a/npc/scripts_athena.conf
+++ b/npc/scripts_athena.conf
@@ -56,6 +56,8 @@ npc: npc/merchants/gemstone.txt
npc: npc/merchants/advanced_refiner.txt
npc: npc/merchants/elemental_trader.txt
npc: npc/merchants/enchan_arm.txt
+npc: npc/merchants/manuk.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