summaryrefslogtreecommitdiff
path: root/npc/scripts_athena.conf
diff options
context:
space:
mode:
authoreuphyy <euphyy@54d463be-8e91-2dee-dedb-b68131a5f0ec>2012-06-13 20:49:48 +0000
committereuphyy <euphyy@54d463be-8e91-2dee-dedb-b68131a5f0ec>2012-06-13 20:49:48 +0000
commit7c5ebe2d2ec057383fb8edc49f442115bbb05eee (patch)
tree717a912124ac2d54ee7fbbbceac400c4758640b6 /npc/scripts_athena.conf
parent4b97da7724f5ff7ce298cfc3cf7abafd8b6f0df8 (diff)
downloadhercules-7c5ebe2d2ec057383fb8edc49f442115bbb05eee.tar.gz
hercules-7c5ebe2d2ec057383fb8edc49f442115bbb05eee.tar.bz2
hercules-7c5ebe2d2ec057383fb8edc49f442115bbb05eee.tar.xz
hercules-7c5ebe2d2ec057383fb8edc49f442115bbb05eee.zip
* Follow-up r16291: Standardized "Valentine's Day 2012" script (events\valentinesday_2012.txt)
* Added entry to scripts_athena.conf, with slight re-ordering of the event list git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@16293 54d463be-8e91-2dee-dedb-b68131a5f0ec
Diffstat (limited to 'npc/scripts_athena.conf')
-rw-r--r--npc/scripts_athena.conf12
1 files changed, 6 insertions, 6 deletions
diff --git a/npc/scripts_athena.conf b/npc/scripts_athena.conf
index a2d6affac..4aec1ed51 100644
--- a/npc/scripts_athena.conf
+++ b/npc/scripts_athena.conf
@@ -269,8 +269,6 @@ npc: npc/kafras/dts_warper.txt
//npc: npc/events/event_skill_reset.txt
//npc: npc/events/whiteday.txt
//npc: npc/events/twintowers.txt
-//npc: npc/events/christmas_2005.txt
-//npc: npc/events/halloween_2006.txt
//Official indian Ro Event Children Week
//npc: npc/events/children_week.txt
//Official Lunar New Year (2008) event (iRO)
@@ -279,15 +277,17 @@ npc: npc/kafras/dts_warper.txt
//npc: npc/events/StPatrick_2008.txt
//Official Easter (2008) event (iRO)
//npc: npc/events/easter_2008.txt
-//Official Valentine's Day (2009) event (iRO)
+//Official Valentine's Day events (iRO)
//npc: npc/events/valentinesday_2009.txt
-//Official Christmas (2008) event (iRO)
+//npc: npc/events/valentinesday_2012.txt
+//Official Christmas events (iRO)
+//npc: npc/events/christmas_2005.txt
//npc: npc/events/christmas_2008.txt
//Official Memorial Day (2009) event (iRO)
//npc: npc/events/MemorialDay_2008.txt
-//Official Halloween (2008) event (iRO)
+//Official Halloween events (iRO)
+//npc: npc/events/halloween_2006.txt
//npc: npc/events/halloween_2008.txt
-//Official Halloween (2009) event (iRO)
//npc: npc/events/halloween_2009.txt
// God Item SE post-creation event.