summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorultramage <ultramage@54d463be-8e91-2dee-dedb-b68131a5f0ec>2007-09-15 08:07:48 +0000
committerultramage <ultramage@54d463be-8e91-2dee-dedb-b68131a5f0ec>2007-09-15 08:07:48 +0000
commit0a68cb6168d0fcf9a9b2b93f3a9be8fb513cdea8 (patch)
tree4747e2f75d12b8e1d65ce2cb601922c357b62d85
parenta25c252b511f2b094112b19ae63226689558348e (diff)
downloadhercules-0a68cb6168d0fcf9a9b2b93f3a9be8fb513cdea8.tar.gz
hercules-0a68cb6168d0fcf9a9b2b93f3a9be8fb513cdea8.tar.bz2
hercules-0a68cb6168d0fcf9a9b2b93f3a9be8fb513cdea8.tar.xz
hercules-0a68cb6168d0fcf9a9b2b93f3a9be8fb513cdea8.zip
* Corrected some npc/other/ bugs
- added missing arena.txt and fortune.txt to npc list - commented out arena.txt and mail.txt since it's not at all done yet - alphabetically-sorted the list git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@11214 54d463be-8e91-2dee-dedb-b68131a5f0ec
-rw-r--r--npc/Changelog.txt5
-rw-r--r--npc/scripts_athena.conf18
2 files changed, 15 insertions, 8 deletions
diff --git a/npc/Changelog.txt b/npc/Changelog.txt
index 9e00c4623..a373bd625 100644
--- a/npc/Changelog.txt
+++ b/npc/Changelog.txt
@@ -1,5 +1,10 @@
Date Added
======
+2007/09/15
+ * Corrected some npc/other/ bugs
+ - added missing arena.txt and fortune.txt to npc list
+ - commented out arena.txt and mail.txt since it's not at all done yet
+ - alphabetically-sorted the list
2007/09/14
* Fixed several text typos in the Kiel quest [ultramage]
2007/09/12
diff --git a/npc/scripts_athena.conf b/npc/scripts_athena.conf
index c7d4ecb30..784b3aee9 100644
--- a/npc/scripts_athena.conf
+++ b/npc/scripts_athena.conf
@@ -182,7 +182,7 @@ npc: npc/kafras/dts_warper.txt
//npc: npc/events/twintowers.txt
//Novice WoE is a kRO Event, after the event, the scripts were disabled.
-//Novice Castles doesn't have real dungeons. They're connected to the common ones.
+//Novice Castles don't have real dungeons. They're connected to the common ones.
//So it's better not to uncomment this line.
//npc: npc/events/nguild/nguild_dunsw.txt
//npc: npc/events/nguild/nguild_treas.txt
@@ -194,16 +194,18 @@ npc: npc/kafras/dts_warper.txt
//npc: npc/events/nguild/nguild_kafras.txt
// --------------------------------------------------------------
// --------------------------- Others ---------------------------
-npc: npc/other/pvp.txt
+//npc: npc/other/arena.txt
npc: npc/other/books.txt
-npc: npc/other/msg_boards.txt
npc: npc/other/bulletin_boards.txt
-npc: npc/other/monster_museum.txt
-npc: npc/other/marriage.txt
-npc: npc/other/divorce.txt
npc: npc/other/comodo_gambling.txt
+npc: npc/other/divorce.txt
+npc: npc/other/fortune.txt
+npc: npc/other/hugel_bingo.txt
+//npc: npc/other/mail.txt
+npc: npc/other/marriage.txt
+npc: npc/other/monster_museum.txt
+npc: npc/other/msg_boards.txt
npc: npc/other/powernpc.txt
+npc: npc/other/pvp.txt
npc: npc/other/resetskill.txt
-npc: npc/other/hugel_bingo.txt
-npc: npc/other/mail.txt
// --------------------------------------------------------------