Some structure, still need to add the map, the NPCs, and the chocolate boc

6 bars = 1 box, maybe. And on map you probably can farm the boxes, too.
You can send with a Love Letter for better effect. Love Letter can be read.

4 files changed, 18 insertions, 2 deletions

diff --git a/db/quest_db.conf b/db/quest_db.conf
index 7d3c17ddb..47c3fab7a 100644
--- a/db/quest_db.conf
+++ b/db/quest_db.conf
@@ -397,6 +397,10 @@ quest_db: (
 	Id: 308
 	Name: "SQuest_Christmas"
 },
+{
+	Id: 309
+	Name: "SQuest_Valentine"
+},
 
 // ID 400+: Event Quests
 {
diff --git a/npc/017-3/loratay.txt b/npc/017-3/loratay.txt
index 8f16618d8..d2da01b54 100644
--- a/npc/017-3/loratay.txt
+++ b/npc/017-3/loratay.txt
@@ -11,7 +11,7 @@
 017-3,85,85,0	script	Lora Tay	NPC_GLASS_OLD_LADY,{
     showavatar NPC_GLASS_OLD_LADY;
     // bugfix, please move to select()
-    if ($EVENT$ == "Valentine") goto L_Valentine;
+    if ($EVENT$ == "Valentine" && getq(SQuest_Valentine) != gettime(GETTIME_YEAR)) goto L_Valentine;
 
     mesn;
     mesq l("Don't interrupt me, I'm busy!");
@@ -24,6 +24,7 @@ L_Valentine:
     // Lorem ipsum dolor sit amet
     close;
 
+    setq SQuest_Valentine, gettime(GETTIME_YEAR);
     getitem2(ValentineDress, 1, 1, 0, 0, any(DarkRedDye, RedDye), 0,0,0);
     getexp BaseLevel*110, JobLevel*11;
     mesn;
diff --git a/npc/commands/event.txt b/npc/commands/event.txt
index ec4f90067..5c423531e 100644
--- a/npc/commands/event.txt
+++ b/npc/commands/event.txt
@@ -69,6 +69,18 @@ function	script	GlobalEventMenu	{
             removemapmask "020-2", MASK_CHRISTMAS;
         }
 
+        // Delete all Valentine Day stuff
+        if ($EVENT$ != "Valentine") {
+            DelItemFromEveryPlayer(LoveLetter);
+            debugmes "TODO: Delete valentine chocolate box";
+        } else if ($EVENT$ == "Valentine") {
+            // ItemDB prefers account variables than quest log
+            DelAccRegFromEveryPlayer("#VALENTINE_POINTS");
+            DelAccRegFromEveryPlayer("#VALENTINE_RECEIVED");
+            DelAccRegFromEveryPlayer("#VALENTINE_OPENED");
+            DelAccRegFromEveryPlayer("#VALENTINE_SENT");
+        }
+
         // We must remove any event drop
         charcommand("@reloadmobdb");
         SeasonReload(1);
diff --git a/npc/functions/seasons.txt b/npc/functions/seasons.txt
index 924093623..e60a97d82 100644
--- a/npc/functions/seasons.txt
+++ b/npc/functions/seasons.txt
@@ -110,7 +110,6 @@ function	script	sChristmas	{
 // Valentine Day is handled by @event, this is only for @reloadmobdb
 function	script	sValentine	{
     // Add Valentine drops
-    addmonsterdrop(ChocolateSlime,      Rose,  80);
     addmonsterdrop(ChocolateSlime,      LoveLetter,  8);
     return;
 }