diff options
Diffstat (limited to 'npc')
| -rw-r--r-- | npc/003-1/events.txt | 2 | ||||
| -rw-r--r-- | npc/commands/event.txt | 15 |
2 files changed, 11 insertions, 6 deletions
diff --git a/npc/003-1/events.txt b/npc/003-1/events.txt index 66feed4f4..f270a1aff 100644 --- a/npc/003-1/events.txt +++ b/npc/003-1/events.txt @@ -4,7 +4,7 @@ // Description: // The NPCs on this file are for when events end. Must be manually enabled. -// Easte +// Easter 003-1,47,53,0 script Lilica#final NPC_EASTER,{ mesn; mesq l("Easter is over! I am the last chance to get rid of eggs!!"); diff --git a/npc/commands/event.txt b/npc/commands/event.txt index 12ea6f301..9631f7d73 100644 --- a/npc/commands/event.txt +++ b/npc/commands/event.txt @@ -47,11 +47,16 @@ function script GlobalEventMenu { // WARNING, possibly dangerous. function sClear { - // Delete all event-only item from every player - DelItemFromEveryPlayer(GoldenEasteregg); - DelItemFromEveryPlayer(GoldenEasteregg); - DelItemFromEveryPlayer(ClosedChristmasBox); - DelItemFromEveryPlayer(OpenedChristmasBox); + // Delete all Easter Stuff + if ($EVENT$ != "Easter") { + DelItemFromEveryPlayer(GoldenEasteregg); + DelItemFromEveryPlayer(GoldenEasteregg); + DelItemFromEveryPlayer(ClosedChristmasBox); + DelItemFromEveryPlayer(OpenedChristmasBox); + disablenpc "Lilica#final"; + } else { + enablenpc "Lilica#final"; + } // Delete all Christmas stuff if ($EVENT$ != "Christmas") { |