Valentine Day not working yet

5 files changed, 35 insertions, 2 deletions

diff --git a/npc/001-11/_import.txt b/npc/001-11/_import.txt
new file mode 100644
index 000000000..503e48ed9
--- /dev/null
+++ b/npc/001-11/_import.txt
@@ -0,0 +1,3 @@
+// Map 001-11: Valentine Highlands
+// This file is generated automatically. All manually added changes will be removed when running the Converter.
+"npc/001-11/event_soulmenhir.txt",
diff --git a/npc/001-11/event_soulmenhir.txt b/npc/001-11/event_soulmenhir.txt
new file mode 100644
index 000000000..a0253b118
--- /dev/null
+++ b/npc/001-11/event_soulmenhir.txt
@@ -0,0 +1,21 @@
+// TMW2 scripts.
+// Author:
+//    Jesusalva
+// Description:
+//    Special Soul Menhir which only allows leaving the map.
+
+001-11,37,31,0	script	Soul Menhir#001-11	NPC_SOUL_CLEAN,{
+    mesn;
+    mes l("(A mystical aura surrounds this stone. It probably can return you home. What do you do?)");
+
+    menu
+        l("Touch it."), L_Warp,
+        l("Leave it alone."), -;
+    close;
+
+L_Warp:
+    warp "Save", 0, 0;
+    close;
+
+}
+
diff --git a/npc/_import.txt b/npc/_import.txt
index bcccd035e..b7b068a12 100644
--- a/npc/_import.txt
+++ b/npc/_import.txt
@@ -6,6 +6,7 @@
 @include "npc/001-1/_import.txt"
 @include "npc/001-10-1/_import.txt"
 @include "npc/001-10/_import.txt"
+@include "npc/001-11/_import.txt"
 @include "npc/001-2/_import.txt"
 @include "npc/001-3-1/_import.txt"
 @include "npc/001-3/_import.txt"
diff --git a/npc/commands/event.txt b/npc/commands/event.txt
index 4045de7cc..bf678a5a0 100644
--- a/npc/commands/event.txt
+++ b/npc/commands/event.txt
@@ -79,7 +79,8 @@ function	script	GlobalEventMenu	{
             DelAccRegFromEveryPlayer("#VALENTINE_RECEIVED");
             DelAccRegFromEveryPlayer("#VALENTINE_OPENED");
             DelAccRegFromEveryPlayer("#VALENTINE_SENT");
-            DelAccRegFromEveryPlayer("#VALENTINE_LOVELETTERS");
+            htdelete $@VALENTINE_LOVELETTER;
+            $@VALENTINE_LOVELETTER=0;
         }
 
         // We must remove any event drop
@@ -122,7 +123,7 @@ function	script	GlobalEventMenu	{
             case 1: sClear(); set $EVENT$, ""; logmes "Disabled events.", LOGMES_ATCOMMAND;
                 break;
             case 2:
-                set $EVENT$, "Valentine"; logmes "Enabled VALENTINE DAY event.", LOGMES_ATCOMMAND;
+                set $EVENT$, "Valentine"; $@VALENTINE_LOVELETTER = htnew(); logmes "Enabled VALENTINE DAY event.", LOGMES_ATCOMMAND;
                 break;
             case 3: sEaster(); break;
             case 4:
diff --git a/npc/functions/soul_menhir.txt b/npc/functions/soul_menhir.txt
index d08e09b71..52452e7d3 100644
--- a/npc/functions/soul_menhir.txt
+++ b/npc/functions/soul_menhir.txt
@@ -9,6 +9,7 @@ function	script	SoulMenhir	{
     menu
         l("Touch it."), L_Bind,
         rif($@GM_EVENT, l("Send soul to the Mana Plane for GM events")), L_Aeros,
+        rif($EVENT$ == "Valentine", l("[Valentine Day] Send soul to the Valentine Cliff!")), L_Valentine,
         rif($EVENT$ == "Easter", l("[Easter] Send soul to the Mana Forest!")), L_Easter,
         rif($EVENT$ == "Worker Day", l("[Worker Day] Send soul to the Contributor Cave!")), L_Worker,
         rif($EVENT$ == "Christmas", l("[Christmas] Send soul to the Christmas Workshop!")), L_Xmas, // TODO: In future there'll be an event map
@@ -68,6 +69,12 @@ L_Aeros:
     message strcharinfo(0), l("You are now at the Mana Plane of Existence, at the Floating Island of Aeros.");
     close;
 
+L_Valentine:
+    if ($EVENT$ != "Valentine") goto L_DontPanic;
+    warp "001-11", 38, 32;
+    message strcharinfo(0), l("You are now at the Valentine Cliff. Death penalty is active.");
+    close;
+
 L_Easter:
     if ($EVENT$ != "Easter") goto L_DontPanic;
     warp "001-4", 151, 157;