summaryrefslogtreecommitdiff
path: root/world/map/npc/011-1/oscar.txt
diff options
context:
space:
mode:
authorJessica Tölke <jtoelke@mail.upb.de>2013-03-20 22:59:29 +0100
committerJessica Tölke <jtoelke@mail.upb.de>2013-03-20 23:01:44 +0100
commit00a9c6ae0f6c0808e73929cb81ba8777927654d7 (patch)
tree44bfeac6de66cbae9b6357336866deae3275857d /world/map/npc/011-1/oscar.txt
parent554c243e71e60f8c1ddf09da5c20695eaf06e77e (diff)
parent22c00753de1e821fd41323de4e335e7a89042495 (diff)
downloadserverdata-00a9c6ae0f6c0808e73929cb81ba8777927654d7.tar.gz
serverdata-00a9c6ae0f6c0808e73929cb81ba8777927654d7.tar.bz2
serverdata-00a9c6ae0f6c0808e73929cb81ba8777927654d7.tar.xz
serverdata-00a9c6ae0f6c0808e73929cb81ba8777927654d7.zip
Merge branch 'easter'
Conflicts: world/map/db/item_db.txt
Diffstat (limited to 'world/map/npc/011-1/oscar.txt')
-rw-r--r--world/map/npc/011-1/oscar.txt2
1 files changed, 2 insertions, 0 deletions
diff --git a/world/map/npc/011-1/oscar.txt b/world/map/npc/011-1/oscar.txt
index 53a79f70..d85bd67b 100644
--- a/world/map/npc/011-1/oscar.txt
+++ b/world/map/npc/011-1/oscar.txt
@@ -13,6 +13,8 @@
// Be sure to not have a quest whose duration overlaps on two years,
// or this will cause problems.
+// The second byte contains easter information, see annualeaster.txt for more information.
+
// Halloween quest states:
// 0: nothing started
// 1: the player knows the story and is asked to go find pumpkin seeds in the forest