summaryrefslogtreecommitdiff
path: root/npc/scripts_athena.conf
diff options
context:
space:
mode:
authorL0ne_W0lf <L0ne_W0lf@54d463be-8e91-2dee-dedb-b68131a5f0ec>2007-06-10 01:33:26 +0000
committerL0ne_W0lf <L0ne_W0lf@54d463be-8e91-2dee-dedb-b68131a5f0ec>2007-06-10 01:33:26 +0000
commit622537266bb785847dd5eb7439bdbe2203a1b75e (patch)
tree4fdcc3272691843b55119d24d233b570070c4481 /npc/scripts_athena.conf
parent1f77c598f27b2ba41fe006d7c868e1e2e31f8727 (diff)
downloadhercules-622537266bb785847dd5eb7439bdbe2203a1b75e.tar.gz
hercules-622537266bb785847dd5eb7439bdbe2203a1b75e.tar.bz2
hercules-622537266bb785847dd5eb7439bdbe2203a1b75e.tar.xz
hercules-622537266bb785847dd5eb7439bdbe2203a1b75e.zip
* Updated (and added) item_trade entries. (Converted from Aegis.)
* Updated several Prontera NPCs. - Updated Prontera town NPCs, and Prontera Library. - Updated the Prontera Milk Merchant. - Updated the inn dialogs slightly, and corrected information for Prontera. - Added Gaebolg Family Curse quest. - Commented out old Clothes_dyer npc. * Updated Rachel's guide's while loop to be a bit nicer looking. * Added the ability to redeem lottery tickets before max donation is met. * Changed conflicting warps to the "Adoption" room in the church. * Fixed a bug in Kiel Hyre warps and quest. * Updated Dandelion Request quest for Gaebolg compatibility. git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@10736 54d463be-8e91-2dee-dedb-b68131a5f0ec
Diffstat (limited to 'npc/scripts_athena.conf')
-rw-r--r--npc/scripts_athena.conf2
1 files changed, 1 insertions, 1 deletions
diff --git a/npc/scripts_athena.conf b/npc/scripts_athena.conf
index 8e577debc..0e8266f65 100644
--- a/npc/scripts_athena.conf
+++ b/npc/scripts_athena.conf
@@ -41,7 +41,7 @@ npc: npc/cities/yuno.txt
npc: npc/merchants/shops.txt
npc: npc/merchants/refine.txt
npc: npc/merchants/dye_maker.txt
-npc: npc/merchants/clothes_dyer.txt
+//npc: npc/merchants/clothes_dyer.txt
npc: npc/merchants/hair_dyer.txt
npc: npc/merchants/hair_style.txt
npc: npc/merchants/old_pharmacist.txt