Valentine Day not working yet

10 files changed, 226 insertions, 128 deletions

diff --git a/conf/map/maps.conf b/conf/map/maps.conf
index a74e9aef8..e1b961e5d 100644
--- a/conf/map/maps.conf
+++ b/conf/map/maps.conf
@@ -7,6 +7,7 @@ map_list: (
     "001-1",
     "001-10-1",
     "001-10",
+    "001-11",
     "001-2",
     "001-3-1",
     "001-3",
diff --git a/db/map_index.txt b/db/map_index.txt
index 2fee10149..bc9a379cb 100644
--- a/db/map_index.txt
+++ b/db/map_index.txt
@@ -4,128 +4,129 @@
 001-1 4
 001-10-1 5
 001-10 6
-001-2 7
-001-3-1 8
-001-3 9
-001-4 10
-001-5 11
-001-6 12
-001-7 13
-001-8 14
-001-9 15
-002-1 16
-002-2 17
-002-3 18
-002-4 19
-002-5 20
-003-0-1 21
-003-0 22
-003-1-1 23
-003-1-2 24
-003-1-3 25
-003-1 26
-003-10 27
-003-13 28
-003-2 29
-003-3 30
-003-4-1 31
-003-4 32
-003-5 33
-003-6 34
-003-7 35
-003-8 36
-004-1 37
-004-2-1 38
-004-2 39
-005-1 40
-005-2-1 41
-005-2 42
-005-3 43
-005-4 44
-005-5 45
-005-6 46
-005-7 47
-006-1 48
-007-1 49
-008-0 50
-008-1 51
-008-2 52
-009-1 53
-009-2 54
-009-3 55
-009-4 56
-009-5 57
-010-1-1 58
-010-1 59
-010-2 60
-011-1 61
-011-2 62
-012-1 63
-012-2 64
-012-3 65
-012-4 66
-012-5 67
-012-6 68
-012-7 69
-014-1 70
-014-2-1 71
-014-2 72
-014-3 73
-014-4 74
-014-5 75
-015-1 76
-015-2 77
-015-3 78
-015-4 79
-015-5 80
-015-6 81
-015-7 82
-016-1 83
-016-6 84
-016-7 85
-017-1 86
-017-2-1 87
-017-2-2 88
-017-2 89
-017-3 90
-017-4 91
-017-5 92
-017-6 93
-018-1-1 94
-018-1 95
-018-2-1 96
-018-2-2 97
-018-2-3 98
-018-2-4 99
-018-2 100
-018-3 101
-018-4-1 102
-018-4-2 103
-018-4 104
-018-5 105
-019-1-1 106
-019-1 107
-019-2 108
-019-3 109
-019-4-1 110
-019-4 111
-020-1 112
-020-2 113
-020-3 114
-020-4 115
-020-5 116
-021-1 117
-021-2 118
-021-3 119
-021-4 120
-022-1 121
-023-1 122
-023-2 123
-024-1 124
-boss 125
-botcheck 126
-sec_pri 127
-soren-2 128
-soren 129
-test 130
-testbg 131
+001-11 7
+001-2 8
+001-3-1 9
+001-3 10
+001-4 11
+001-5 12
+001-6 13
+001-7 14
+001-8 15
+001-9 16
+002-1 17
+002-2 18
+002-3 19
+002-4 20
+002-5 21
+003-0-1 22
+003-0 23
+003-1-1 24
+003-1-2 25
+003-1-3 26
+003-1 27
+003-10 28
+003-13 29
+003-2 30
+003-3 31
+003-4-1 32
+003-4 33
+003-5 34
+003-6 35
+003-7 36
+003-8 37
+004-1 38
+004-2-1 39
+004-2 40
+005-1 41
+005-2-1 42
+005-2 43
+005-3 44
+005-4 45
+005-5 46
+005-6 47
+005-7 48
+006-1 49
+007-1 50
+008-0 51
+008-1 52
+008-2 53
+009-1 54
+009-2 55
+009-3 56
+009-4 57
+009-5 58
+010-1-1 59
+010-1 60
+010-2 61
+011-1 62
+011-2 63
+012-1 64
+012-2 65
+012-3 66
+012-4 67
+012-5 68
+012-6 69
+012-7 70
+014-1 71
+014-2-1 72
+014-2 73
+014-3 74
+014-4 75
+014-5 76
+015-1 77
+015-2 78
+015-3 79
+015-4 80
+015-5 81
+015-6 82
+015-7 83
+016-1 84
+016-6 85
+016-7 86
+017-1 87
+017-2-1 88
+017-2-2 89
+017-2 90
+017-3 91
+017-4 92
+017-5 93
+017-6 94
+018-1-1 95
+018-1 96
+018-2-1 97
+018-2-2 98
+018-2-3 99
+018-2-4 100
+018-2 101
+018-3 102
+018-4-1 103
+018-4-2 104
+018-4 105
+018-5 106
+019-1-1 107
+019-1 108
+019-2 109
+019-3 110
+019-4-1 111
+019-4 112
+020-1 113
+020-2 114
+020-3 115
+020-4 116
+020-5 117
+021-1 118
+021-2 119
+021-3 120
+021-4 121
+022-1 122
+023-1 123
+023-2 124
+024-1 125
+boss 126
+botcheck 127
+sec_pri 128
+soren-2 129
+soren 130
+test 131
+testbg 132
diff --git a/db/re/item_db.conf b/db/re/item_db.conf
index 1e51a6a2e..40291ca80 100644
--- a/db/re/item_db.conf
+++ b/db/re/item_db.conf
@@ -2697,6 +2697,30 @@ item_db: (
 			dispbottom l("The potion expired!");
 	">
 },
+{
+	Id: 641
+	AegisName: "BoxOfChocolates"
+	Name: "Box Of Chocolates"
+	Type: "IT_USABLE"
+	Buy: 3700
+	Sell: 0
+	Weight: 11
+	Refine: false
+	ViewSprite: 641
+	Script: <"
+		if ($EVENT$ != "Valentine" || #VALENTINE_OPENED >= #VALENTINE_RECEIVED) {
+			dispbottom l("Past due date.");
+		} else {
+			// I know technically this is wrong grammar, but I want fixed width
+			#VALENTINE_OPENED=#VALENTINE_OPENED+1;
+			#VALENTINE_POINTS=#VALENTINE_POINTS+1;
+			if (rand(0,1))
+				dispbottom l("It's tasty ^.^");
+			else
+				dispbottom l("It's yummy ^.^");
+		}
+	">
+},
 
 // Mounts (690 to 699, probably there will be extra IDs)
 {
diff --git a/db/re/mob_db.conf b/db/re/mob_db.conf
index d7a96ed34..d430a0c1c 100644
--- a/db/re/mob_db.conf
+++ b/db/re/mob_db.conf
@@ -1608,7 +1608,46 @@ mob_db: (
 		FluffyHat: 1
 	}
 },
-// 1050 is free
+{
+	Id: 1050
+	SpriteName: "LoveFluffy"
+	Name: "Lovely Fluffy"
+	Lv: 18
+	Hp: 1200
+	Sp: 0
+	Exp: 18
+	JExp: 3
+	AttackRange: 1
+	Attack: [60, 250]
+	Def: 10
+	Mdef: 0
+	Stats: {
+		Str: 14
+		Agi: 1
+		Vit: 10
+		Int: 1
+		Dex: 30
+		Luk: 5
+	}
+	ChaseRange: 12
+	Race: 2
+	Element: (1, 1)
+	Mode: {
+		CanMove: true
+		CanAttack: true
+		ChangeChase: true
+		CastSensorChase: true
+	}
+	MoveSpeed: 600
+	AttackDelay: 1872
+	AttackMotion: 672
+	DamageMotion: 480
+	Drops: {
+		LoveLetter: 200
+		Carrot: 41
+		FluffyHat: 1
+	}
+},
 {
 	Id: 1051
 	SpriteName: "DarkLizard"
diff --git a/maps/re/001-11.mcache b/maps/re/001-11.mcache
new file mode 100644
index 000000000..0041abc94
--- /dev/null
+++ b/maps/re/001-11.mcache
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;