18 files changed, 69 insertions, 20 deletions

diff --git a/conf/map/maps.conf b/conf/map/maps.conf
index 5f7f090ac..dcfe7daae 100644
--- a/conf/map/maps.conf
+++ b/conf/map/maps.conf
@@ -318,6 +318,11 @@ map_list: (
     "031-8",
     "031-9",
     "032-1",
+    "033-1",
+    "033-2",
+    "033-3",
+    "033-4",
+    "033-5",
     "042-0",
     "042-1",
     "042-10",
diff --git a/db/map_index.txt b/db/map_index.txt
index fc45a1830..617a12439 100644
--- a/db/map_index.txt
+++ b/db/map_index.txt
@@ -315,23 +315,28 @@
 031-8 315
 031-9 316
 032-1 317
-042-0 318
-042-1 319
-042-10 320
-042-11 321
-042-2 322
-042-3 323
-042-4 324
-042-5 325
-042-6 326
-042-7 327
-042-8 328
-042-9 329
-boss 330
-botcheck 331
-guilds 332
-sec_pri 333
-soren-2 334
-soren 335
-test 336
-testbg 337
+033-1 318
+033-2 319
+033-3 320
+033-4 321
+033-5 322
+042-0 323
+042-1 324
+042-10 325
+042-11 326
+042-2 327
+042-3 328
+042-4 329
+042-5 330
+042-6 331
+042-7 332
+042-8 333
+042-9 334
+boss 335
+botcheck 336
+guilds 337
+sec_pri 338
+soren-2 339
+soren 340
+test 341
+testbg 342
diff --git a/maps/re/033-1.mcache b/maps/re/033-1.mcache
new file mode 100644
index 000000000..62776abb8
--- /dev/null
+++ b/maps/re/033-1.mcache
diff --git a/maps/re/033-2.mcache b/maps/re/033-2.mcache
new file mode 100644
index 000000000..70a92e4c9
--- /dev/null
+++ b/maps/re/033-2.mcache
diff --git a/maps/re/033-3.mcache b/maps/re/033-3.mcache
new file mode 100644
index 000000000..d3702ef78
--- /dev/null
+++ b/maps/re/033-3.mcache
diff --git a/maps/re/033-4.mcache b/maps/re/033-4.mcache
new file mode 100644
index 000000000..89ac25543
--- /dev/null
+++ b/maps/re/033-4.mcache
diff --git a/maps/re/033-5.mcache b/maps/re/033-5.mcache
new file mode 100644
index 000000000..587112487
--- /dev/null
+++ b/maps/re/033-5.mcache
diff --git a/npc/033-1/_import.txt b/npc/033-1/_import.txt
new file mode 100644
index 000000000..247d96f9b
--- /dev/null
+++ b/npc/033-1/_import.txt
@@ -0,0 +1,3 @@
+// Map 033-1: Porthos - Town of Portals
+// This file is generated automatically. All manually added changes will be removed when running the Converter.
+"npc/033-1/_warps.txt",
diff --git a/npc/033-1/_warps.txt b/npc/033-1/_warps.txt
new file mode 100644
index 000000000..cd8747f88
--- /dev/null
+++ b/npc/033-1/_warps.txt
@@ -0,0 +1,6 @@
+// This file is generated automatically. All manually added changes will be removed when running the Converter.
+// Map 033-1: Porthos - Town of Portals warps
+033-1,189,94,0	warp	#033-1_189_94	0,0,033-5,29,48
+033-1,167,89,0	warp	#033-1_167_89	0,0,033-4,35,42
+033-1,172,101,0	warp	#033-1_172_101	0,0,033-2,40,48
+033-1,72,190,0	warp	#033-1_72_190	0,0,020-1,69,41
diff --git a/npc/033-2/_import.txt b/npc/033-2/_import.txt
new file mode 100644
index 000000000..6941e7853
--- /dev/null
+++ b/npc/033-2/_import.txt
@@ -0,0 +1,3 @@
+// Map 033-2: Building 1
+// This file is generated automatically. All manually added changes will be removed when running the Converter.
+"npc/033-2/_warps.txt",
diff --git a/npc/033-2/_warps.txt b/npc/033-2/_warps.txt
new file mode 100644
index 000000000..39f7084e9
--- /dev/null
+++ b/npc/033-2/_warps.txt
@@ -0,0 +1,4 @@
+// This file is generated automatically. All manually added changes will be removed when running the Converter.
+// Map 033-2: Building 1 warps
+033-2,40,49,0	warp	#033-2_40_49	0,0,033-1,172,102
+033-2,39,21,0	warp	#033-2_39_21	1,0,033-3,38,22
diff --git a/npc/033-3/_import.txt b/npc/033-3/_import.txt
new file mode 100644
index 000000000..5b5c079b6
--- /dev/null
+++ b/npc/033-3/_import.txt
@@ -0,0 +1,3 @@
+// Map 033-3: Building 2
+// This file is generated automatically. All manually added changes will be removed when running the Converter.
+"npc/033-3/_warps.txt",
diff --git a/npc/033-3/_warps.txt b/npc/033-3/_warps.txt
new file mode 100644
index 000000000..4a6a9d2fc
--- /dev/null
+++ b/npc/033-3/_warps.txt
@@ -0,0 +1,3 @@
+// This file is generated automatically. All manually added changes will be removed when running the Converter.
+// Map 033-3: Building 2 warps
+033-3,39,21,0	warp	#033-3_39_21	1,0,033-2,38,22
diff --git a/npc/033-4/_import.txt b/npc/033-4/_import.txt
new file mode 100644
index 000000000..9642c947d
--- /dev/null
+++ b/npc/033-4/_import.txt
@@ -0,0 +1,3 @@
+// Map 033-4: Porthos' Bank
+// This file is generated automatically. All manually added changes will be removed when running the Converter.
+"npc/033-4/_warps.txt",
diff --git a/npc/033-4/_warps.txt b/npc/033-4/_warps.txt
new file mode 100644
index 000000000..61a0758d4
--- /dev/null
+++ b/npc/033-4/_warps.txt
@@ -0,0 +1,3 @@
+// This file is generated automatically. All manually added changes will be removed when running the Converter.
+// Map 033-4: Porthos' Bank warps
+033-4,35,43,0	warp	#033-4_35_43	0,0,033-1,167,90
diff --git a/npc/033-5/_import.txt b/npc/033-5/_import.txt
new file mode 100644
index 000000000..be6102d76
--- /dev/null
+++ b/npc/033-5/_import.txt
@@ -0,0 +1,3 @@
+// Map 033-5: Porthos' General Store
+// This file is generated automatically. All manually added changes will be removed when running the Converter.
+"npc/033-5/_warps.txt",
diff --git a/npc/033-5/_warps.txt b/npc/033-5/_warps.txt
new file mode 100644
index 000000000..5ae4d9d8e
--- /dev/null
+++ b/npc/033-5/_warps.txt
@@ -0,0 +1,3 @@
+// This file is generated automatically. All manually added changes will be removed when running the Converter.
+// Map 033-5: Porthos' General Store warps
+033-5,29,49,0	warp	#033-5_29_49	0,0,033-1,189,95
diff --git a/npc/_import.txt b/npc/_import.txt
index 3363160a2..8ea37d6b2 100644
--- a/npc/_import.txt
+++ b/npc/_import.txt
@@ -317,6 +317,11 @@
 @include "npc/031-8/_import.txt"
 @include "npc/031-9/_import.txt"
 @include "npc/032-1/_import.txt"
+@include "npc/033-1/_import.txt"
+@include "npc/033-2/_import.txt"
+@include "npc/033-3/_import.txt"
+@include "npc/033-4/_import.txt"
+@include "npc/033-5/_import.txt"
 @include "npc/042-0/_import.txt"
 @include "npc/042-1/_import.txt"
 @include "npc/042-10/_import.txt"