summaryrefslogtreecommitdiff
path: root/npc
diff options
context:
space:
mode:
Diffstat (limited to 'npc')
-rw-r--r--npc/001-11/Demure.txt2
-rw-r--r--npc/commands/event.txt9
2 files changed, 6 insertions, 5 deletions
diff --git a/npc/001-11/Demure.txt b/npc/001-11/Demure.txt
index 4f2d07fd5..1d5f6871e 100644
--- a/npc/001-11/Demure.txt
+++ b/npc/001-11/Demure.txt
@@ -70,7 +70,7 @@
#VALENTINE_SENT+=1;
// Handle Love Letter
- if (countitem(LoveLetter) {
+ if (countitem(LoveLetter)) {
mesn;
mesq l("Should I attach a love letter?");
next;
diff --git a/npc/commands/event.txt b/npc/commands/event.txt
index da27370a1..a4583159a 100644
--- a/npc/commands/event.txt
+++ b/npc/commands/event.txt
@@ -76,15 +76,16 @@ function script GlobalEventMenu {
// Delete all Valentine Day stuff
if ($EVENT$ != "Valentine") {
- DelItemFromEveryPlayer(LoveLetter);
- DelItemFromEveryPlayer(BoxOfChocolates);
- disablenpc "Demure#ValentineFinal";
- } else if ($EVENT$ == "Valentine") {
// ItemDB prefers account variables than quest log
DelAccRegFromEveryPlayer("#VALENTINE_POINTS");
DelAccRegFromEveryPlayer("#VALENTINE_RECEIVED");
DelAccRegFromEveryPlayer("#VALENTINE_OPENED");
DelAccRegFromEveryPlayer("#VALENTINE_SENT");
+ // Remove event items
+ DelItemFromEveryPlayer(LoveLetter);
+ DelItemFromEveryPlayer(BoxOfChocolates);
+ disablenpc "Demure#ValentineFinal";
+ } else if ($EVENT$ == "Valentine") {
htdelete $@VALENTINE_GIFTSTACKS;
htdelete $@VALENTINE_LOVELETTER;
$@VALENTINE_GIFTSTACKS=0;