diff options
| -rw-r--r-- | db/constants.conf | 2 | ||||
| -rw-r--r-- | npc/commands/event.txt | 20 | ||||
| -rw-r--r-- | npc/functions/weather.txt | 4 |
3 files changed, 24 insertions, 2 deletions
diff --git a/db/constants.conf b/db/constants.conf index 8bcb1b42a..4d70e8f57 100644 --- a/db/constants.conf +++ b/db/constants.conf @@ -3855,7 +3855,7 @@ constants_db: { MASK_RAIN: 16 MASK_SANDSTORM: 32 MASK_SNOW: 64 - MASK_RESERVED1: 128 + MASK_CHRISTMAS: 128 MASK_RESERVED2: 256 comment__: "speechflags" diff --git a/npc/commands/event.txt b/npc/commands/event.txt index f8641f83b..49bc9f897 100644 --- a/npc/commands/event.txt +++ b/npc/commands/event.txt @@ -56,6 +56,21 @@ function script GlobalEventMenu { return; } + function sChristmas { + // Delete all Christmas stuff? + DelItemFromEveryPlayer(GoldenEasteregg); + DelItemFromEveryPlayer(GoldenEasteregg); + + // Add drops? + + // Change maps? + + // Enable event + set $EVENT$, "Christmas"; + logmes "Enabled CHRISTMAS event.", LOGMES_ATCOMMAND; + return; + } + //MASK_CHRISTMAS @@ -81,7 +96,8 @@ function script GlobalEventMenu { menu l("Disable event"), -, l("Enable Easter"), -, - l("Enable Worker's Day"), -; + l("Enable Worker's Day"), -, + l("Enable Refeer Program"), -; switch (@menu) { case 1: set $EVENT$, ""; logmes "Disabled events.", LOGMES_ATCOMMAND; @@ -95,6 +111,8 @@ function script GlobalEventMenu { debugmes "Snakes are now dropping Pearls."; */ break; + case 4: $EVENT$="Refeer"; logmes "Enabled REFEER event.", LOGMES_ATCOMMAND; + break; } return; diff --git a/npc/functions/weather.txt b/npc/functions/weather.txt index d9c7b1d67..bdf58b191 100644 --- a/npc/functions/weather.txt +++ b/npc/functions/weather.txt @@ -107,6 +107,10 @@ OnMinute45: if (!(.@mk & MASK_NONE)) .@mk=.@mk|MASK_NONE; + // Christmas Decor should not be here + if ($EVENT$ == "Christmas" && .@key$ == "009-1") + .@mk=.@mk|MASK_CHRISTMAS; + setmapmask .@key$, .@mk; // Is it night time? |