summaryrefslogtreecommitdiff
path: root/conf
diff options
context:
space:
mode:
Diffstat (limited to 'conf')
-rwxr-xr-xconf/map_athena.conf11
1 files changed, 9 insertions, 2 deletions
diff --git a/conf/map_athena.conf b/conf/map_athena.conf
index 77580989..a5eb905f 100755
--- a/conf/map_athena.conf
+++ b/conf/map_athena.conf
@@ -109,7 +109,7 @@ npc: npc/cave2/passages.txt
// Xmas snow map 10-1
npc: npc/xmas/monsters.txt
npc: npc/xmas/passages.txt
-npc: npc/xmas/santa.txt
+//npc: npc/xmas/santa.txt
npc: npc/xmas/snowman.txt
npc: npc/xmas/taro.txt
@@ -174,4 +174,11 @@ npc: npc/woodland-village/scythequest.txt
//npc: npc/xmas/xmas17.txt
//npc: npc/xmas/xmas18.txt
//npc: npc/xmas/xmas19.txt
-//npc: npc/xmas/xmas20.txt \ No newline at end of file
+//npc: npc/xmas/xmas20.txt
+
+// Halloween 2007
+//npc: npc/halloween/2007/monsters.txt
+//npc: npc/halloween/2007/summon.txt
+
+// Christmas 2007
+npc: npc/xmas2007/pre-xmas.txt \ No newline at end of file