diff options
| author | Wushin <pasekei@gmail.com> | 2014-10-19 16:21:44 -0500 |
|---|---|---|
| committer | Wushin <pasekei@gmail.com> | 2014-10-19 16:21:44 -0500 |
| commit | f0f18c3c731c7bc1d4d3a9a0b32696cf0c8e1779 (patch) | |
| tree | 2ab7edf218f90deded9ce980bf4d560bdbb0ae5f /world/map/npc/scripts.conf | |
| parent | 4526fb388dabd53a1f6f4c987b11c5d0afb2489e (diff) | |
| parent | d5501b061b6fb92643bb36c523bde62bcf7181bc (diff) | |
| download | serverdata-f0f18c3c731c7bc1d4d3a9a0b32696cf0c8e1779.tar.gz serverdata-f0f18c3c731c7bc1d4d3a9a0b32696cf0c8e1779.tar.bz2 serverdata-f0f18c3c731c7bc1d4d3a9a0b32696cf0c8e1779.tar.xz serverdata-f0f18c3c731c7bc1d4d3a9a0b32696cf0c8e1779.zip | |
Merge pull request #173 from wushin/halloween-annual
Halloween Annual Base Commit
Diffstat (limited to 'world/map/npc/scripts.conf')
| -rw-r--r-- | world/map/npc/scripts.conf | 9 |
1 files changed, 7 insertions, 2 deletions
diff --git a/world/map/npc/scripts.conf b/world/map/npc/scripts.conf index 8aa774e0..90c11883 100644 --- a/world/map/npc/scripts.conf +++ b/world/map/npc/scripts.conf @@ -39,8 +39,9 @@ import: npc/_import.txt // GM Events npc: npc/functions/gm_island.txt - +// Annuals Framework npc: npc/annuals/fathertime.txt +npc: npc/annuals/tree_beard.txt // Annual Christmas npc: npc/annuals/xmas/config.txt npc: npc/annuals/xmas/states.txt @@ -51,4 +52,8 @@ npc: npc/annuals/xmas/helpers.txt npc: npc/annuals/xmas/list.txt npc: npc/annuals/xmas/reagents.txt npc: npc/annuals/xmas/mobmanager.txt -npc: npc/annuals/xmas/tree_beard.txt +// Annual halloween +npc: npc/annuals/halloween/config.txt +npc: npc/annuals/halloween/debug.txt +npc: npc/annuals/halloween/munro.txt +npc: npc/annuals/halloween/trick_or_treat.txt |