summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJesusaves <cpntb1@ymail.com>2019-01-04 21:26:49 -0200
committerJesusaves <cpntb1@ymail.com>2019-01-04 21:26:49 -0200
commit08b774bbec7c190b8bd6e5d508e207ee53ed7aac (patch)
tree8424123a86f4ea518d94f3ca278766077e7075b3
parent0c19f95b5f1b342189fd63224bfd6d0396da7b54 (diff)
downloadserverdata-08b774bbec7c190b8bd6e5d508e207ee53ed7aac.tar.gz
serverdata-08b774bbec7c190b8bd6e5d508e207ee53ed7aac.tar.bz2
serverdata-08b774bbec7c190b8bd6e5d508e207ee53ed7aac.tar.xz
serverdata-08b774bbec7c190b8bd6e5d508e207ee53ed7aac.zip
Better cleanup for Christmas and all events
-rw-r--r--npc/commands/event.txt21
1 files changed, 17 insertions, 4 deletions
diff --git a/npc/commands/event.txt b/npc/commands/event.txt
index f423e41c1..2ed3368c9 100644
--- a/npc/commands/event.txt
+++ b/npc/commands/event.txt
@@ -120,18 +120,31 @@ function script GlobalEventMenu {
// WARNING, possibly dangerous.
function sClear {
- // Delete all Easter Stuff from every player
+ // Delete all event-only item from every player
DelItemFromEveryPlayer(GoldenEasteregg);
DelItemFromEveryPlayer(GoldenEasteregg);
+ DelItemFromEveryPlayer(ClosedChristmasBox);
+ DelItemFromEveryPlayer(OpenedChristmasBox);
// Delete all Christmas stuff
if ($EVENT$ != "Christmas") {
$XMAS_MONEY=0; // Golbarez
$XMAS_GIFTS=0; // Chief
+ } else if ($EVENT$ == "Christmas") {
+ DelAccRegFromEveryPlayer("#XMAS_LOGINBONUS");
+ removemapmask "003-1", MASK_CHRISTMAS;
+ removemapmask "005-1", MASK_CHRISTMAS;
+ removemapmask "009-1", MASK_CHRISTMAS;
+ removemapmask "012-1", MASK_CHRISTMAS;
+ removemapmask "017-2", MASK_CHRISTMAS;
+ removemapmask "017-2-1", MASK_CHRISTMAS;
+ removemapmask "017-3", MASK_CHRISTMAS;
+ removemapmask "020-2", MASK_CHRISTMAS;
}
- DelItemFromEveryPlayer(ClosedChristmasBox);
- DelItemFromEveryPlayer(OpenedChristmasBox);
- DelAccRegFromEveryPlayer("#XMAS_LOGINBONUS");
+
+ // We must remove any event drop
+ charcommand("@reloadmobdb");
+ SeasonReload(1);
}