13 files changed, 47 insertions, 20 deletions

diff --git a/conf/map/maps.conf b/conf/map/maps.conf
index 2b3b2ec0b..0bc31e1d9 100644
--- a/conf/map/maps.conf
+++ b/conf/map/maps.conf
@@ -106,6 +106,8 @@ map_list: (
     "019-1",
     "019-2",
     "019-3",
+    "019-4-1",
+    "019-4",
     "020-1",
     "021-1",
     "021-2",
diff --git a/db/map_index.txt b/db/map_index.txt
index 8fac24771..b0835ab1d 100644
--- a/db/map_index.txt
+++ b/db/map_index.txt
@@ -103,19 +103,21 @@
 019-1 103
 019-2 104
 019-3 105
-020-1 106
-021-1 107
-021-2 108
-021-3 109
-021-4 110
-022-1 111
-023-1 112
-023-2 113
-024-1 114
-boss 115
-botcheck 116
-sec_pri 117
-soren-2 118
-soren 119
-test 120
-testbg 121
+019-4-1 106
+019-4 107
+020-1 108
+021-1 109
+021-2 110
+021-3 111
+021-4 112
+022-1 113
+023-1 114
+023-2 115
+024-1 116
+boss 117
+botcheck 118
+sec_pri 119
+soren-2 120
+soren 121
+test 122
+testbg 123
diff --git a/maps/re/019-4-1.mcache b/maps/re/019-4-1.mcache
new file mode 100644
index 000000000..ba9abf549
--- /dev/null
+++ b/maps/re/019-4-1.mcache
diff --git a/maps/re/019-4.mcache b/maps/re/019-4.mcache
new file mode 100644
index 000000000..7bf5ec50e
--- /dev/null
+++ b/maps/re/019-4.mcache
diff --git a/npc/014-5/_warps.txt b/npc/014-5/_warps.txt
index 6744cd67a..f5451e8f3 100644
--- a/npc/014-5/_warps.txt
+++ b/npc/014-5/_warps.txt
@@ -4,4 +4,4 @@
 014-5,59,154,0	warp	#014-5_59_154	0,0,015-7,84,65
 014-5,82,229,0	warp	#014-5_82_229	1,0,014-3,172,60
 014-5,86,31,0	warp	#014-5_86_31	0,0,015-5,81,139
-014-5,192,16,0	warp	#014-5_192_16	2,0,019-1,60,101
+014-5,192,16,0	warp	#014-5_192_16	2,0,019-4,53,109
diff --git a/npc/019-1/_warps.txt b/npc/019-1/_warps.txt
index 603b4c279..e53f590ea 100644
--- a/npc/019-1/_warps.txt
+++ b/npc/019-1/_warps.txt
@@ -1,4 +1,4 @@
 // This file is generated automatically. All manually added changes will be removed when running the Converter.
 // Map 019-1: Snow Field warps
-019-1,61,102,0	warp	#019-1_61_102	3,0,014-5,192,17
+019-1,61,102,0	warp	#019-1_61_102	3,0,019-4,95,28
 019-1,84,53,0	warp	#019-1_84_53	0,0,019-1-1,33,41
diff --git a/npc/019-4-1/_import.txt b/npc/019-4-1/_import.txt
new file mode 100644
index 000000000..89a351b39
--- /dev/null
+++ b/npc/019-4-1/_import.txt
@@ -0,0 +1,3 @@
+// Map 019-4-1: Christmas Workshop
+// This file is generated automatically. All manually added changes will be removed when running the Converter.
+"npc/019-4-1/_warps.txt",
diff --git a/npc/019-4-1/_warps.txt b/npc/019-4-1/_warps.txt
new file mode 100644
index 000000000..caf73d303
--- /dev/null
+++ b/npc/019-4-1/_warps.txt
@@ -0,0 +1,3 @@
+// This file is generated automatically. All manually added changes will be removed when running the Converter.
+// Map 019-4-1: Christmas Workshop warps
+019-4-1,51,46,0	warp	#019-4-1_51_46	3,0,019-4,133,54
diff --git a/npc/019-4/_import.txt b/npc/019-4/_import.txt
new file mode 100644
index 000000000..b51f523d0
--- /dev/null
+++ b/npc/019-4/_import.txt
@@ -0,0 +1,4 @@
+// Map 019-4: Romantic Place
+// This file is generated automatically. All manually added changes will be removed when running the Converter.
+"npc/019-4/_mobs.txt",
+"npc/019-4/_warps.txt",
diff --git a/npc/019-4/_mobs.txt b/npc/019-4/_mobs.txt
new file mode 100644
index 000000000..69c18684b
--- /dev/null
+++ b/npc/019-4/_mobs.txt
@@ -0,0 +1,6 @@
+// This file is generated automatically. All manually added changes will be removed when running the Converter.
+// Map 019-4: Romantic Place mobs
+019-4,93,59,22,21	monster	Water Fairy	1184,6,100000,30000
+019-4,84,103,36,19	monster	Alpha Mouboo	1056,2,100000,30000
+019-4,101,58,44,52	monster	Fluffy	1022,18,100000,30000
+019-4,116,67,36,30	monster	Azul Slime	1095,6,100000,30000
diff --git a/npc/019-4/_warps.txt b/npc/019-4/_warps.txt
new file mode 100644
index 000000000..fa1a5713f
--- /dev/null
+++ b/npc/019-4/_warps.txt
@@ -0,0 +1,5 @@
+// This file is generated automatically. All manually added changes will be removed when running the Converter.
+// Map 019-4: Romantic Place warps
+019-4,95,27,0	warp	#019-4_95_27	3,0,019-1,61,101
+019-4,133,53,0	warp	#019-4_133_53	0,0,019-4-1,50,45
+019-4,54,110,0	warp	#019-4_54_110	1,0,014-5,192,17
diff --git a/npc/_import.txt b/npc/_import.txt
index 1de462e21..3b4da02d8 100644
--- a/npc/_import.txt
+++ b/npc/_import.txt
@@ -105,6 +105,8 @@
 @include "npc/019-1/_import.txt"
 @include "npc/019-2/_import.txt"
 @include "npc/019-3/_import.txt"
+@include "npc/019-4-1/_import.txt"
+@include "npc/019-4/_import.txt"
 @include "npc/020-1/_import.txt"
 @include "npc/021-1/_import.txt"
 @include "npc/021-2/_import.txt"
diff --git a/npc/commands/event.txt b/npc/commands/event.txt
index 5ea971aff..ba2f73448 100644
--- a/npc/commands/event.txt
+++ b/npc/commands/event.txt
@@ -36,8 +36,8 @@ function	script	sChristmas	{
 
 
         addmonsterdrop(Yeti,        ClosedChristmasBox, 1000);
-        addmonsterdrop(AlphaMouboo, ClosedChristmasBox,  900);
-        addmonsterdrop(WaterFairy,  ClosedChristmasBox,  800);
+        addmonsterdrop(WaterFairy,  ClosedChristmasBox,  900);
+        addmonsterdrop(AlphaMouboo, ClosedChristmasBox,  800);
         addmonsterdrop(IcedFluffy,  ClosedChristmasBox,  700);
         addmonsterdrop(BlueSlime,   ClosedChristmasBox,  600);
         addmonsterdrop(SantaSlime,  ClosedChristmasBox,  530);