make maps following the woodland merge

56 files changed, 302 insertions, 44 deletions

diff --git a/npc/008-1/_mobs.txt b/npc/008-1/_mobs.txt
index e8835c09..4c6f740b 100644
--- a/npc/008-1/_mobs.txt
+++ b/npc/008-1/_mobs.txt
@@ -1,15 +1,42 @@
 // This file is generated automatically. All manually added changes will be removed when running the Converter.
 // Map 008-1: Hurnscald mobs
-008-1,99,39,0,0	monster	Manana Tree	1017,1,420000,240000
-008-1,100,42,0,0	monster	Manana Tree	1017,1,420000,240000
-008-1,102,40,0,0	monster	Manana Tree	1017,1,420000,240000
-008-1,105,41,0,0	monster	Manana Tree	1017,1,420000,240000
-008-1,101,44,0,0	monster	Manana Tree	1017,1,420000,240000
-008-1,104,43,0,0	monster	Manana Tree	1017,1,420000,240000
-008-1,109,40,0,0	monster	Manana Tree	1017,1,420000,240000
-008-1,108,42,0,0	monster	Manana Tree	1017,1,420000,240000
-008-1,106,44,0,0	monster	Manana Tree	1017,1,420000,240000
-008-1,109,44,0,0	monster	Manana Tree	1017,1,420000,240000
-008-1,111,42,0,0	monster	Manana Tree	1017,1,420000,240000
-008-1,112,44,0,0	monster	Manana Tree	1017,1,420000,240000
-008-1,112,39,0,0	monster	Manana Tree	1017,1,420000,240000
+008-1,270,86,0,0	monster	Manana Tree	1017,1,420000,240000
+008-1,271,89,0,0	monster	Manana Tree	1017,1,420000,240000
+008-1,273,87,0,0	monster	Manana Tree	1017,1,420000,240000
+008-1,276,88,0,0	monster	Manana Tree	1017,1,420000,240000
+008-1,275,90,0,0	monster	Manana Tree	1017,1,420000,240000
+008-1,280,87,0,0	monster	Manana Tree	1017,1,420000,240000
+008-1,279,89,0,0	monster	Manana Tree	1017,1,420000,240000
+008-1,282,89,0,0	monster	Manana Tree	1017,1,420000,240000
+008-1,283,86,0,0	monster	Manana Tree	1017,1,420000,240000
+008-1,295,80,4,5	monster	Fluffy	1022,4,24000,60000
+008-1,203,70,0,0	monster	Manana Tree	1017,1,420000,240000
+008-1,198,70,0,0	monster	Manana Tree	1017,1,420000,240000
+008-1,193,70,0,0	monster	Manana Tree	1017,1,420000,240000
+008-1,188,70,0,0	monster	Manana Tree	1017,1,420000,240000
+008-1,183,70,0,0	monster	Manana Tree	1017,1,420000,240000
+008-1,185,72,0,0	monster	Manana Tree	1017,1,420000,240000
+008-1,203,74,0,0	monster	Manana Tree	1017,1,420000,240000
+008-1,198,74,0,0	monster	Manana Tree	1017,1,420000,240000
+008-1,193,74,0,0	monster	Manana Tree	1017,1,420000,240000
+008-1,188,74,0,0	monster	Manana Tree	1017,1,420000,240000
+008-1,180,76,0,0	monster	Manana Tree	1017,1,420000,240000
+008-1,185,76,0,0	monster	Manana Tree	1017,1,420000,240000
+008-1,190,76,0,0	monster	Manana Tree	1017,1,420000,240000
+008-1,195,76,0,0	monster	Manana Tree	1017,1,420000,240000
+008-1,198,78,0,0	monster	Manana Tree	1017,1,420000,240000
+008-1,193,78,0,0	monster	Manana Tree	1017,1,420000,240000
+008-1,188,78,0,0	monster	Manana Tree	1017,1,420000,240000
+008-1,183,78,0,0	monster	Manana Tree	1017,1,420000,240000
+008-1,180,80,0,0	monster	Manana Tree	1017,1,420000,240000
+008-1,200,80,0,0	monster	Manana Tree	1017,1,420000,240000
+008-1,160,97,0,0	monster	Manana Tree	1017,1,420000,240000
+008-1,154,95,0,0	monster	Manana Tree	1017,1,420000,240000
+008-1,148,97,0,0	monster	Manana Tree	1017,1,420000,240000
+008-1,160,101,0,0	monster	Manana Tree	1017,1,420000,240000
+008-1,156,105,0,0	monster	Manana Tree	1017,1,420000,240000
+008-1,154,99,0,0	monster	Manana Tree	1017,1,420000,240000
+008-1,152,101,0,0	monster	Manana Tree	1017,1,420000,240000
+008-1,152,105,0,0	monster	Manana Tree	1017,1,420000,240000
+008-1,146,99,0,0	monster	Manana Tree	1017,1,420000,240000
+008-1,146,103,0,0	monster	Manana Tree	1017,1,420000,240000
diff --git a/npc/008-1/_warps.txt b/npc/008-1/_warps.txt
index 44b0db66..ab1728ed 100644
--- a/npc/008-1/_warps.txt
+++ b/npc/008-1/_warps.txt
@@ -1,13 +1,26 @@
 // This file is generated automatically. All manually added changes will be removed when running the Converter.
 // Map 008-1: Hurnscald warps
-008-1,105,76,0	warp	#008-1_105_76	0,0,008-2-0,26,23
-008-1,102,79,0	warp	#008-1_102_79	0,0,008-2-0,23,34
-008-1,88,71,0	warp	#008-1_88_71	0,0,008-2-1,33,42
-008-1,90,66,0	warp	#008-1_90_66	0,0,008-2-1,38,27
-008-1,65,55,0	warp	#008-1_65_55	0,0,008-2-2,28,33
-008-1,89,58,0	warp	#008-1_89_58	0,0,008-2-6,27,32
-008-1,101,55,0	warp	#008-1_101_55	0,0,008-2-7,36,28
-008-1,121,71,0	warp	#008-1_121_71	1,0,008-2-8,36,38
-008-1,72,68,0	warp	#008-1_72_68	0,0,008-2-9,30,34
-008-1,102,69,0	warp	#008-1_102_69	0,0,008-2-10,37,33
-008-1,110,56,0	warp	#008-1_110_56	0,0,008-2-12,30,31
+008-1,276,122,0	warp	#008-1_276_122	0,0,008-2-0,26,23
+008-1,274,125,0	warp	#008-1_274_125	0,0,008-2-0,23,34
+008-1,259,118,0	warp	#008-1_259_118	0,0,008-2-1,33,42
+008-1,261,111,0	warp	#008-1_261_111	0,0,008-2-1,38,27
+008-1,236,102,0	warp	#008-1_236_102	0,0,008-2-2,28,33
+008-1,260,105,0	warp	#008-1_260_105	0,0,008-2-6,27,32
+008-1,272,102,0	warp	#008-1_272_102	0,0,008-2-7,36,28
+008-1,292,118,0	warp	#008-1_292_118	0,0,008-2-8,36,38
+008-1,243,115,0	warp	#008-1_243_115	0,0,008-2-9,30,34
+008-1,273,116,0	warp	#008-1_273_116	0,0,008-2-10,37,33
+008-1,275,74,0	warp	#008-1_275_74	0,0,008-2-16,25,33
+008-1,281,103,0	warp	#008-1_281_103	0,0,008-2-12,30,31
+008-1,122,114,0	warp	#008-1_122_114	0,0,008-2-22,30,34
+008-1,71,128,0	warp	#008-1_71_128	0,0,008-2-23,52,39
+008-1,106,221,0	warp	#008-1_106_221	0,0,008-2-24,32,45
+008-1,236,39,0	warp	#008-1_236_39	0,0,008-2-17,52,39
+008-1,151,80,0	warp	#008-1_151_80	0,0,008-2-15,35,33
+008-1,256,203,0	warp	#008-1_256_203	0,0,008-2-20,25,31
+008-1,128,138,0	warp	#008-1_128_138	0,0,008-3-1,35,34
+008-1,287,113,0	warp	#008-1_287_113	0,0,008-2-8,26,28
+008-1,252,211,0	warp	#008-1_252_211	0,0,008-2-21,22,42
+008-1,257,130,0	warp	#008-1_257_130	0,0,008-2-28,25,31
+008-1,233,131,0	warp	#008-1_233_131	0,0,008-2-29,36,24
+008-1,287,133,0	warp	#008-1_287_133	0,0,008-2-30,52,39
diff --git a/npc/008-2-0/_savepoints.txt b/npc/008-2-0/_savepoints.txt
index d9055b64..6da9c7b3 100644
--- a/npc/008-2-0/_savepoints.txt
+++ b/npc/008-2-0/_savepoints.txt
@@ -1,6 +1,6 @@
 // This file is generated automatically. All manually added changes will be removed when running the Converter.
 // Map 008-2-0: Chez Celestia saves
-008-2-0,37,27,0	script	#save_008-2-0_37_27	NPC_SAVE_POINT,{
+008-2-0,38,27,0	script	#save_008-2-0_38_27	NPC_SAVE_POINT,{
     savepointparticle .map$, .x, .y, CURRENT_INN;
     close;
 
diff --git a/npc/008-2-0/_warps.txt b/npc/008-2-0/_warps.txt
index 72a8ab12..d24b4b27 100644
--- a/npc/008-2-0/_warps.txt
+++ b/npc/008-2-0/_warps.txt
@@ -1,4 +1,4 @@
 // This file is generated automatically. All manually added changes will be removed when running the Converter.
 // Map 008-2-0: Chez Celestia warps
-008-2-0,26,22,0	warp	#008-2-0_26_22	0,0,008-1,105,75
-008-2-0,22,34,0	warp	#008-2-0_22_34	0,0,008-1,101,79
+008-2-0,26,22,0	warp	#008-2-0_26_22	0,0,008-1,276,121
+008-2-0,22,34,0	warp	#008-2-0_22_34	0,0,008-1,273,125
diff --git a/npc/008-2-1/_warps.txt b/npc/008-2-1/_warps.txt
index e47cbf73..978c5767 100644
--- a/npc/008-2-1/_warps.txt
+++ b/npc/008-2-1/_warps.txt
@@ -1,4 +1,4 @@
 // This file is generated automatically. All manually added changes will be removed when running the Converter.
 // Map 008-2-1: Merchant Guild warps
-008-2-1,37,27,0	warp	#008-2-1_37_27	0,0,008-1,89,66
-008-2-1,33,43,0	warp	#008-2-1_33_43	0,0,008-1,88,72
+008-2-1,37,27,0	warp	#008-2-1_37_27	0,0,008-1,260,111
+008-2-1,33,45,0	warp	#008-2-1_33_45	0,0,008-1,259,119
diff --git a/npc/008-2-10/_warps.txt b/npc/008-2-10/_warps.txt
index 25390f95..26362dee 100644
--- a/npc/008-2-10/_warps.txt
+++ b/npc/008-2-10/_warps.txt
@@ -1,4 +1,4 @@
 // This file is generated automatically. All manually added changes will be removed when running the Converter.
 // Map 008-2-10: Hurnscald City Hall warps
-008-2-10,37,34,0	warp	#008-2-10_37_34	0,0,008-1,102,70
-008-2-10,37,25,0	warp	#008-2-10_37_25	1,0,008-2-11,36,27
+008-2-10,37,34,0	warp	#008-2-10_37_34	0,0,008-1,273,117
+008-2-10,36,25,0	warp	#008-2-10_36_25	2,0,008-2-11,36,27
diff --git a/npc/008-2-11/_savepoints.txt b/npc/008-2-11/_savepoints.txt
index c3cf65fc..cccf4138 100644
--- a/npc/008-2-11/_savepoints.txt
+++ b/npc/008-2-11/_savepoints.txt
@@ -1,6 +1,6 @@
 // This file is generated automatically. All manually added changes will be removed when running the Converter.
 // Map 008-2-11: Hurnscald City Hall saves
-008-2-11,25,27,0	script	#save_008-2-11_25_27	NPC_SAVE_POINT,{
+008-2-11,26,27,0	script	#save_008-2-11_26_27	NPC_SAVE_POINT,{
     savepointparticle .map$, .x, .y, CURRENT_INN;
     close;
 
diff --git a/npc/008-2-11/_warps.txt b/npc/008-2-11/_warps.txt
index 6c8c4732..11b8b45f 100644
--- a/npc/008-2-11/_warps.txt
+++ b/npc/008-2-11/_warps.txt
@@ -1,3 +1,3 @@
 // This file is generated automatically. All manually added changes will be removed when running the Converter.
 // Map 008-2-11: Hurnscald City Hall warps
-008-2-11,37,28,0	warp	#008-2-11_37_28	1,0,008-2-10,36,26
+008-2-11,36,31,0	warp	#008-2-11_36_31	2,0,008-2-10,36,26
diff --git a/npc/008-2-12/_warps.txt b/npc/008-2-12/_warps.txt
index e44e7154..efe934a0 100644
--- a/npc/008-2-12/_warps.txt
+++ b/npc/008-2-12/_warps.txt
@@ -1,4 +1,4 @@
 // This file is generated automatically. All manually added changes will be removed when running the Converter.
 // Map 008-2-12: Hurnscald Clinic warps
-008-2-12,30,32,0	warp	#008-2-12_30_32	0,0,008-1,110,57
-008-2-12,36,27,0	warp	#008-2-12_36_27	1,0,008-2-13,35,31
+008-2-12,30,32,0	warp	#008-2-12_30_32	0,0,008-1,281,104
+008-2-12,36,27,0	warp	#008-2-12_36_27	1,0,008-2-13,35,30
diff --git a/npc/008-2-13/_warps.txt b/npc/008-2-13/_warps.txt
index f9681284..cba843a7 100644
--- a/npc/008-2-13/_warps.txt
+++ b/npc/008-2-13/_warps.txt
@@ -1,4 +1,4 @@
 // This file is generated automatically. All manually added changes will be removed when running the Converter.
 // Map 008-2-13: Hurnscald Clinic warps
-008-2-13,36,32,0	warp	#008-2-13_36_32	1,0,008-2-12,35,28
+008-2-13,36,32,0	warp	#008-2-13_36_32	1,0,008-2-12,35,29
 008-2-13,25,26,0	warp	#008-2-13_25_26	1,0,008-2-14,24,30
diff --git a/npc/008-2-14/_warps.txt b/npc/008-2-14/_warps.txt
index 241626bb..eba5adca 100644
--- a/npc/008-2-14/_warps.txt
+++ b/npc/008-2-14/_warps.txt
@@ -1,3 +1,3 @@
 // This file is generated automatically. All manually added changes will be removed when running the Converter.
 // Map 008-2-14: Hurnscald Clinic warps
-008-2-14,25,31,0	warp	#008-2-14_25_31	1,0,008-2-13,24,27
+008-2-14,25,31,0	warp	#008-2-14_25_31	1,0,008-2-13,24,29
diff --git a/npc/008-2-15/_import.txt b/npc/008-2-15/_import.txt
new file mode 100644
index 00000000..c504df36
--- /dev/null
+++ b/npc/008-2-15/_import.txt
@@ -0,0 +1,3 @@
+// Map 008-2-15: Hurnscald Farm
+// This file is generated automatically. All manually added changes will be removed when running the Converter.
+"npc/008-2-15/_warps.txt",
diff --git a/npc/008-2-15/_warps.txt b/npc/008-2-15/_warps.txt
new file mode 100644
index 00000000..3f3fb766
--- /dev/null
+++ b/npc/008-2-15/_warps.txt
@@ -0,0 +1,3 @@
+// This file is generated automatically. All manually added changes will be removed when running the Converter.
+// Map 008-2-15: Hurnscald Farm warps
+008-2-15,35,34,0	warp	#008-2-15_35_34	0,0,008-1,151,81
diff --git a/npc/008-2-16/_import.txt b/npc/008-2-16/_import.txt
new file mode 100644
index 00000000..90da3caf
--- /dev/null
+++ b/npc/008-2-16/_import.txt
@@ -0,0 +1,3 @@
+// Map 008-2-16: Hurnscald Cottage
+// This file is generated automatically. All manually added changes will be removed when running the Converter.
+"npc/008-2-16/_warps.txt",
diff --git a/npc/008-2-16/_warps.txt b/npc/008-2-16/_warps.txt
new file mode 100644
index 00000000..bb2293f4
--- /dev/null
+++ b/npc/008-2-16/_warps.txt
@@ -0,0 +1,3 @@
+// This file is generated automatically. All manually added changes will be removed when running the Converter.
+// Map 008-2-16: Hurnscald Cottage warps
+008-2-16,25,34,0	warp	#008-2-16_25_34	0,0,008-1,275,75
diff --git a/npc/008-2-17/_import.txt b/npc/008-2-17/_import.txt
new file mode 100644
index 00000000..d90289e3
--- /dev/null
+++ b/npc/008-2-17/_import.txt
@@ -0,0 +1,3 @@
+// Map 008-2-17: Mining Camp
+// This file is generated automatically. All manually added changes will be removed when running the Converter.
+"npc/008-2-17/_warps.txt",
diff --git a/npc/008-2-17/_warps.txt b/npc/008-2-17/_warps.txt
new file mode 100644
index 00000000..9857c005
--- /dev/null
+++ b/npc/008-2-17/_warps.txt
@@ -0,0 +1,5 @@
+// This file is generated automatically. All manually added changes will be removed when running the Converter.
+// Map 008-2-17: Mining Camp warps
+008-2-17,52,40,0	warp	#008-2-17_52_40	0,0,008-1,236,40
+008-2-17,25,42,0	warp	#008-2-17_25_39	1,0,008-2-18,22,24
+008-2-17,24,34,0	warp	#008-2-17_24_34	0,0,008-2-19,20,29
diff --git a/npc/008-2-18/_import.txt b/npc/008-2-18/_import.txt
new file mode 100644
index 00000000..4f791e6f
--- /dev/null
+++ b/npc/008-2-18/_import.txt
@@ -0,0 +1,3 @@
+// Map 008-2-18: Mining Camp First Floor
+// This file is generated automatically. All manually added changes will be removed when running the Converter.
+"npc/008-2-18/_warps.txt",
diff --git a/npc/008-2-18/_warps.txt b/npc/008-2-18/_warps.txt
new file mode 100644
index 00000000..a80310cd
--- /dev/null
+++ b/npc/008-2-18/_warps.txt
@@ -0,0 +1,3 @@
+// This file is generated automatically. All manually added changes will be removed when running the Converter.
+// Map 008-2-18: Mining Camp First Floor warps
+008-2-18,22,26,0	warp	#008-2-18_22_26	1,0,008-2-17,25,40
diff --git a/npc/008-2-19/_import.txt b/npc/008-2-19/_import.txt
new file mode 100644
index 00000000..c080bfb8
--- /dev/null
+++ b/npc/008-2-19/_import.txt
@@ -0,0 +1,3 @@
+// Map 008-2-19: Mining Camp Basement
+// This file is generated automatically. All manually added changes will be removed when running the Converter.
+"npc/008-2-19/_warps.txt",
diff --git a/npc/008-2-19/_warps.txt b/npc/008-2-19/_warps.txt
new file mode 100644
index 00000000..ec68b70c
--- /dev/null
+++ b/npc/008-2-19/_warps.txt
@@ -0,0 +1,3 @@
+// This file is generated automatically. All manually added changes will be removed when running the Converter.
+// Map 008-2-19: Mining Camp Basement warps
+008-2-19,20,26,0	warp	#008-2-19_20_26	0,0,008-2-17,24,32
diff --git a/npc/008-2-2/_warps.txt b/npc/008-2-2/_warps.txt
index 8410ef2b..d7cce7fc 100644
--- a/npc/008-2-2/_warps.txt
+++ b/npc/008-2-2/_warps.txt
@@ -1,6 +1,6 @@
 // This file is generated automatically. All manually added changes will be removed when running the Converter.
 // Map 008-2-2: The Rusty Pick warps
-008-2-2,28,34,0	warp	#008-2-2_28_34	0,0,008-1,65,56
-008-2-2,52,25,0	warp	#008-2-2_52_25	1,0,008-2-3,66,28
+008-2-2,28,34,0	warp	#008-2-2_28_34	0,0,008-1,236,103
+008-2-2,52,26,0	warp	#008-2-2_52_26	1,0,008-2-3,66,28
 008-2-2,24,29,0	warp	#008-2-2_24_29	0,0,008-2-4,43,28
 008-2-2,52,32,0	warp	#008-2-2_52_32	0,0,008-2-5,24,25
diff --git a/npc/008-2-20/_import.txt b/npc/008-2-20/_import.txt
new file mode 100644
index 00000000..bb22ec30
--- /dev/null
+++ b/npc/008-2-20/_import.txt
@@ -0,0 +1,3 @@
+// Map 008-2-20: Forsaken Inn
+// This file is generated automatically. All manually added changes will be removed when running the Converter.
+"npc/008-2-20/_warps.txt",
diff --git a/npc/008-2-20/_warps.txt b/npc/008-2-20/_warps.txt
new file mode 100644
index 00000000..ce2f572a
--- /dev/null
+++ b/npc/008-2-20/_warps.txt
@@ -0,0 +1,4 @@
+// This file is generated automatically. All manually added changes will be removed when running the Converter.
+// Map 008-2-20: Forsaken Inn warps
+008-2-20,25,32,0	warp	#008-2-20_25_32	0,0,008-1,256,204
+008-2-20,36,38,0	warp	#008-2-20_36_38	1,0,008-2-21,34,28
diff --git a/npc/008-2-21/_import.txt b/npc/008-2-21/_import.txt
new file mode 100644
index 00000000..efdf5df8
--- /dev/null
+++ b/npc/008-2-21/_import.txt
@@ -0,0 +1,3 @@
+// Map 008-2-21: Forsaken Inn Basement
+// This file is generated automatically. All manually added changes will be removed when running the Converter.
+"npc/008-2-21/_warps.txt",
diff --git a/npc/008-2-21/_warps.txt b/npc/008-2-21/_warps.txt
new file mode 100644
index 00000000..90e3be7f
--- /dev/null
+++ b/npc/008-2-21/_warps.txt
@@ -0,0 +1,4 @@
+// This file is generated automatically. All manually added changes will be removed when running the Converter.
+// Map 008-2-21: Forsaken Inn Basement warps
+008-2-21,34,27,0	warp	#008-2-21_34_26	1,0,008-2-20,35,36
+008-2-21,22,43,0	warp	#008-2-21_22_43	0,0,008-1,252,212
diff --git a/npc/008-2-22/_import.txt b/npc/008-2-22/_import.txt
new file mode 100644
index 00000000..3be6edbd
--- /dev/null
+++ b/npc/008-2-22/_import.txt
@@ -0,0 +1,4 @@
+// Map 008-2-22: Mages Hut
+// This file is generated automatically. All manually added changes will be removed when running the Converter.
+"npc/008-2-22/_savepoints.txt",
+"npc/008-2-22/_warps.txt",
diff --git a/npc/008-2-22/_savepoints.txt b/npc/008-2-22/_savepoints.txt
new file mode 100644
index 00000000..999032f6
--- /dev/null
+++ b/npc/008-2-22/_savepoints.txt
@@ -0,0 +1,11 @@
+// This file is generated automatically. All manually added changes will be removed when running the Converter.
+// Map 008-2-22: Mages Hut saves
+008-2-22,26,31,0	script	#save_008-2-22_26_31	NPC_SAVE_POINT,{
+    savepointparticle .map$, .x, .y, CURRENT_INN;
+    close;
+
+OnInit:
+    .distance = 2;
+    .sex = G_OTHER;
+    end;
+}
diff --git a/npc/008-2-22/_warps.txt b/npc/008-2-22/_warps.txt
new file mode 100644
index 00000000..c45099dc
--- /dev/null
+++ b/npc/008-2-22/_warps.txt
@@ -0,0 +1,3 @@
+// This file is generated automatically. All manually added changes will be removed when running the Converter.
+// Map 008-2-22: Mages Hut warps
+008-2-22,30,35,0	warp	#008-2-22_30_35	0,0,008-1,122,115
diff --git a/npc/008-2-23/_import.txt b/npc/008-2-23/_import.txt
new file mode 100644
index 00000000..feb70f60
--- /dev/null
+++ b/npc/008-2-23/_import.txt
@@ -0,0 +1,3 @@
+// Map 008-2-23: Mouboo Farm
+// This file is generated automatically. All manually added changes will be removed when running the Converter.
+"npc/008-2-23/_warps.txt",
diff --git a/npc/008-2-23/_warps.txt b/npc/008-2-23/_warps.txt
new file mode 100644
index 00000000..4bd4b6ee
--- /dev/null
+++ b/npc/008-2-23/_warps.txt
@@ -0,0 +1,3 @@
+// This file is generated automatically. All manually added changes will be removed when running the Converter.
+// Map 008-2-23: Mouboo Farm warps
+008-2-23,52,40,0	warp	#008-2-23_52_40	0,0,008-1,71,129
diff --git a/npc/008-2-24/_import.txt b/npc/008-2-24/_import.txt
new file mode 100644
index 00000000..e8f862f4
--- /dev/null
+++ b/npc/008-2-24/_import.txt
@@ -0,0 +1,3 @@
+// Map 008-2-24: Dimond's Cove Ground Floor
+// This file is generated automatically. All manually added changes will be removed when running the Converter.
+"npc/008-2-24/_warps.txt",
diff --git a/npc/008-2-24/_warps.txt b/npc/008-2-24/_warps.txt
new file mode 100644
index 00000000..c72b102d
--- /dev/null
+++ b/npc/008-2-24/_warps.txt
@@ -0,0 +1,5 @@
+// This file is generated automatically. All manually added changes will be removed when running the Converter.
+// Map 008-2-24: Dimond's Cove Ground Floor warps
+008-2-24,27,24,0	warp	#008-2-24_27_24	0,0,008-2-27,44,28
+008-2-24,40,27,0	warp	#008-2-24_40_27	2,0,008-2-25,41,27
+008-2-24,32,46,0	warp	#008-2-24_32_46	0,0,008-1,106,222
diff --git a/npc/008-2-25/_import.txt b/npc/008-2-25/_import.txt
new file mode 100644
index 00000000..02e36d2e
--- /dev/null
+++ b/npc/008-2-25/_import.txt
@@ -0,0 +1,3 @@
+// Map 008-2-25: Dimond's Cove Second Floor
+// This file is generated automatically. All manually added changes will be removed when running the Converter.
+"npc/008-2-25/_warps.txt",
diff --git a/npc/008-2-25/_warps.txt b/npc/008-2-25/_warps.txt
new file mode 100644
index 00000000..d7199084
--- /dev/null
+++ b/npc/008-2-25/_warps.txt
@@ -0,0 +1,4 @@
+// This file is generated automatically. All manually added changes will be removed when running the Converter.
+// Map 008-2-25: Dimond's Cove Second Floor warps
+008-2-25,25,27,0	warp	#008-2-25_25_27	2,0,008-2-26,23,25
+008-2-25,41,29,0	warp	#008-2-25_41_29	2,0,008-2-24,40,30
diff --git a/npc/008-2-26/_import.txt b/npc/008-2-26/_import.txt
new file mode 100644
index 00000000..9b4f3a94
--- /dev/null
+++ b/npc/008-2-26/_import.txt
@@ -0,0 +1,3 @@
+// Map 008-2-26: Dimond's Cove Third Floor
+// This file is generated automatically. All manually added changes will be removed when running the Converter.
+"npc/008-2-26/_warps.txt",
diff --git a/npc/008-2-26/_warps.txt b/npc/008-2-26/_warps.txt
new file mode 100644
index 00000000..e370bcef
--- /dev/null
+++ b/npc/008-2-26/_warps.txt
@@ -0,0 +1,3 @@
+// This file is generated automatically. All manually added changes will be removed when running the Converter.
+// Map 008-2-26: Dimond's Cove Third Floor warps
+008-2-26,24,27,0	warp	#008-2-26_24_27	1,0,008-2-25,25,29
diff --git a/npc/008-2-27/_import.txt b/npc/008-2-27/_import.txt
new file mode 100644
index 00000000..98ec740f
--- /dev/null
+++ b/npc/008-2-27/_import.txt
@@ -0,0 +1,3 @@
+// Map 008-2-27: Dimond's Cove Cellar
+// This file is generated automatically. All manually added changes will be removed when running the Converter.
+"npc/008-2-27/_warps.txt",
diff --git a/npc/008-2-27/_warps.txt b/npc/008-2-27/_warps.txt
new file mode 100644
index 00000000..350010dc
--- /dev/null
+++ b/npc/008-2-27/_warps.txt
@@ -0,0 +1,3 @@
+// This file is generated automatically. All manually added changes will be removed when running the Converter.
+// Map 008-2-27: Dimond's Cove Cellar warps
+008-2-27,45,28,0	warp	#008-2-27_45_28	0,1,008-2-24,28,24
diff --git a/npc/008-2-28/_import.txt b/npc/008-2-28/_import.txt
new file mode 100644
index 00000000..0510c48c
--- /dev/null
+++ b/npc/008-2-28/_import.txt
@@ -0,0 +1,3 @@
+// Map 008-2-28: Big House
+// This file is generated automatically. All manually added changes will be removed when running the Converter.
+"npc/008-2-28/_warps.txt",
diff --git a/npc/008-2-28/_warps.txt b/npc/008-2-28/_warps.txt
new file mode 100644
index 00000000..c83ed168
--- /dev/null
+++ b/npc/008-2-28/_warps.txt
@@ -0,0 +1,3 @@
+// This file is generated automatically. All manually added changes will be removed when running the Converter.
+// Map 008-2-28: Big House warps
+008-2-28,25,32,0	warp	#008-2-28_25_32	0,0,008-1,257,131
diff --git a/npc/008-2-29/_import.txt b/npc/008-2-29/_import.txt
new file mode 100644
index 00000000..d708d657
--- /dev/null
+++ b/npc/008-2-29/_import.txt
@@ -0,0 +1,3 @@
+// Map 008-2-29: Pool House
+// This file is generated automatically. All manually added changes will be removed when running the Converter.
+"npc/008-2-29/_warps.txt",
diff --git a/npc/008-2-29/_warps.txt b/npc/008-2-29/_warps.txt
new file mode 100644
index 00000000..40d34697
--- /dev/null
+++ b/npc/008-2-29/_warps.txt
@@ -0,0 +1,3 @@
+// This file is generated automatically. All manually added changes will be removed when running the Converter.
+// Map 008-2-29: Pool House warps
+008-2-29,37,24,0	warp	#008-2-29_37_24	0,0,008-1,234,131
diff --git a/npc/008-2-3/_import.txt b/npc/008-2-3/_import.txt
index ed172cc7..69f68a67 100644
--- a/npc/008-2-3/_import.txt
+++ b/npc/008-2-3/_import.txt
@@ -1,4 +1,5 @@
 // Map 008-2-3: The Rusty Pick
 // This file is generated automatically. All manually added changes will be removed when running the Converter.
+"npc/008-2-3/_savepoints.txt",
 "npc/008-2-3/_warps.txt",
 "npc/008-2-3/mapflags.txt",
diff --git a/npc/008-2-3/_savepoints.txt b/npc/008-2-3/_savepoints.txt
new file mode 100644
index 00000000..ab7e555d
--- /dev/null
+++ b/npc/008-2-3/_savepoints.txt
@@ -0,0 +1,74 @@
+// This file is generated automatically. All manually added changes will be removed when running the Converter.
+// Map 008-2-3: The Rusty Pick saves
+008-2-3,61,31,0	script	#save_008-2-3_61_31	NPC_SAVE_POINT,{
+    savepointparticle .map$, .x, .y, CURRENT_INN;
+    close;
+
+OnInit:
+    .distance = 2;
+    .sex = G_OTHER;
+    end;
+}
+008-2-3,60,35,0	script	#save_008-2-3_60_35	NPC_SAVE_POINT,{
+    savepointparticle .map$, .x, .y, CURRENT_INN;
+    close;
+
+OnInit:
+    .distance = 2;
+    .sex = G_OTHER;
+    end;
+}
+008-2-3,57,31,0	script	#save_008-2-3_57_31	NPC_SAVE_POINT,{
+    savepointparticle .map$, .x, .y, CURRENT_INN;
+    close;
+
+OnInit:
+    .distance = 2;
+    .sex = G_OTHER;
+    end;
+}
+008-2-3,57,35,0	script	#save_008-2-3_57_35	NPC_SAVE_POINT,{
+    savepointparticle .map$, .x, .y, CURRENT_INN;
+    close;
+
+OnInit:
+    .distance = 2;
+    .sex = G_OTHER;
+    end;
+}
+008-2-3,53,35,0	script	#save_008-2-3_53_35	NPC_SAVE_POINT,{
+    savepointparticle .map$, .x, .y, CURRENT_INN;
+    close;
+
+OnInit:
+    .distance = 2;
+    .sex = G_OTHER;
+    end;
+}
+008-2-3,53,31,0	script	#save_008-2-3_53_31	NPC_SAVE_POINT,{
+    savepointparticle .map$, .x, .y, CURRENT_INN;
+    close;
+
+OnInit:
+    .distance = 2;
+    .sex = G_OTHER;
+    end;
+}
+008-2-3,49,31,0	script	#save_008-2-3_49_31	NPC_SAVE_POINT,{
+    savepointparticle .map$, .x, .y, CURRENT_INN;
+    close;
+
+OnInit:
+    .distance = 2;
+    .sex = G_OTHER;
+    end;
+}
+008-2-3,49,35,0	script	#save_008-2-3_49_35	NPC_SAVE_POINT,{
+    savepointparticle .map$, .x, .y, CURRENT_INN;
+    close;
+
+OnInit:
+    .distance = 2;
+    .sex = G_OTHER;
+    end;
+}
diff --git a/npc/008-2-3/_warps.txt b/npc/008-2-3/_warps.txt
index 957ed686..3233aa46 100644
--- a/npc/008-2-3/_warps.txt
+++ b/npc/008-2-3/_warps.txt
@@ -1,3 +1,3 @@
 // This file is generated automatically. All manually added changes will be removed when running the Converter.
 // Map 008-2-3: The Rusty Pick warps
-008-2-3,67,29,0	warp	#008-2-3_67_29	1,0,008-2-2,51,26
+008-2-3,67,29,0	warp	#008-2-3_67_29	1,0,008-2-2,51,29
diff --git a/npc/008-2-30/_import.txt b/npc/008-2-30/_import.txt
new file mode 100644
index 00000000..df7088b9
--- /dev/null
+++ b/npc/008-2-30/_import.txt
@@ -0,0 +1,3 @@
+// Map 008-2-30: Hurns Farmhouse
+// This file is generated automatically. All manually added changes will be removed when running the Converter.
+"npc/008-2-30/_warps.txt",
diff --git a/npc/008-2-30/_warps.txt b/npc/008-2-30/_warps.txt
new file mode 100644
index 00000000..8afbf1e8
--- /dev/null
+++ b/npc/008-2-30/_warps.txt
@@ -0,0 +1,3 @@
+// This file is generated automatically. All manually added changes will be removed when running the Converter.
+// Map 008-2-30: Hurns Farmhouse warps
+008-2-30,52,40,0	warp	#008-2-30_52_40	0,0,008-1,287,134
diff --git a/npc/008-2-6/_warps.txt b/npc/008-2-6/_warps.txt
index 98944d50..ed2e74a0 100644
--- a/npc/008-2-6/_warps.txt
+++ b/npc/008-2-6/_warps.txt
@@ -1,3 +1,3 @@
 // This file is generated automatically. All manually added changes will be removed when running the Converter.
 // Map 008-2-6: Two Guys One Bed warps
-008-2-6,27,33,0	warp	#008-2-6_27_33	0,0,008-1,89,59
+008-2-6,27,34,0	warp	#008-2-6_27_34	0,0,008-1,260,106
diff --git a/npc/008-2-7/_warps.txt b/npc/008-2-7/_warps.txt
index 3eb8538a..ffd0f758 100644
--- a/npc/008-2-7/_warps.txt
+++ b/npc/008-2-7/_warps.txt
@@ -1,3 +1,3 @@
 // This file is generated automatically. All manually added changes will be removed when running the Converter.
 // Map 008-2-7: Hurnscald Apothecary warps
-008-2-7,36,29,0	warp	#008-2-7_36_29	0,0,008-1,101,56
+008-2-7,36,30,0	warp	#008-2-7_36_30	0,0,008-1,272,103
diff --git a/npc/008-2-8/_warps.txt b/npc/008-2-8/_warps.txt
index 7e791e85..ca801b84 100644
--- a/npc/008-2-8/_warps.txt
+++ b/npc/008-2-8/_warps.txt
@@ -1,3 +1,4 @@
 // This file is generated automatically. All manually added changes will be removed when running the Converter.
 // Map 008-2-8: Hurnscald Forge warps
-008-2-8,37,39,0	warp	#008-2-8_37_39	1,0,008-1,120,72
+008-2-8,37,39,0	warp	#008-2-8_37_39	1,0,008-1,292,119
+008-2-8,26,29,0	warp	#008-2-8_26_29	0,0,008-1,287,114
diff --git a/npc/008-2-9/_warps.txt b/npc/008-2-9/_warps.txt
index 7021feae..71ae1413 100644
--- a/npc/008-2-9/_warps.txt
+++ b/npc/008-2-9/_warps.txt
@@ -1,3 +1,3 @@
 // This file is generated automatically. All manually added changes will be removed when running the Converter.
 // Map 008-2-9: Jack's Abode warps
-008-2-9,30,35,0	warp	#008-2-9_30_35	0,0,008-1,72,69
+008-2-9,30,35,0	warp	#008-2-9_30_35	0,0,008-1,243,116
diff --git a/npc/008-3-1/_import.txt b/npc/008-3-1/_import.txt
new file mode 100644
index 00000000..337fa40f
--- /dev/null
+++ b/npc/008-3-1/_import.txt
@@ -0,0 +1,3 @@
+// Map 008-3-1: Bat Cave
+// This file is generated automatically. All manually added changes will be removed when running the Converter.
+"npc/008-3-1/_warps.txt",
diff --git a/npc/008-3-1/_warps.txt b/npc/008-3-1/_warps.txt
new file mode 100644
index 00000000..221789b7
--- /dev/null
+++ b/npc/008-3-1/_warps.txt
@@ -0,0 +1,3 @@
+// This file is generated automatically. All manually added changes will be removed when running the Converter.
+// Map 008-3-1: Bat Cave warps
+008-3-1,34,34,0	warp	#008-3-1_34_34	0,0,008-1,128,139
diff --git a/npc/_anchors.txt b/npc/_anchors.txt
index 121f33a8..4f9ce83a 100644
--- a/npc/_anchors.txt
+++ b/npc/_anchors.txt
@@ -7,11 +7,15 @@ OnInit:
     htput(.ht, "^ALIG|^HID", "000-2-4 36 30");
     htput(.ht, "^ART", "001-1 89 86");
     htput(.ht, "^BLACK|SMITH", "001-2-27 35 32");
+    htput(.ht, "^CAMP|FIRE", "008-1 55 46");
     htput(.ht, "^CITY|^HALL", "001-2-7 36 41");
+    htput(.ht, "^DIMOND", "008-1 106 222");
     htput(.ht, "^DRA|ISLAND", "000-1 62 111");
+    htput(.ht, "^FARM", "008-1 71 129");
     htput(.ht, "^FIRST|^DECK1?$", "000-2-0 23 28");
     htput(.ht, "^HARB|^MASTER", "001-2-16 28 32");
     htput(.ht, "^HOLD$", "000-2-2 42 31");
+    htput(.ht, "^HURNS", "008-1 250 109");
     htput(.ht, "^LEG", "001-2-33 34 42");
     htput(.ht, "^LIB", "001-2-4 42 35");
     htput(.ht, "^LIGHT", "001-2-0 37 32");
diff --git a/npc/_import.txt b/npc/_import.txt
index 92d7f2a0..890189e1 100644
--- a/npc/_import.txt
+++ b/npc/_import.txt
@@ -63,14 +63,31 @@
 @include "npc/008-2-12/_import.txt"
 @include "npc/008-2-13/_import.txt"
 @include "npc/008-2-14/_import.txt"
+@include "npc/008-2-15/_import.txt"
+@include "npc/008-2-16/_import.txt"
+@include "npc/008-2-17/_import.txt"
+@include "npc/008-2-18/_import.txt"
+@include "npc/008-2-19/_import.txt"
 @include "npc/008-2-2/_import.txt"
+@include "npc/008-2-20/_import.txt"
+@include "npc/008-2-21/_import.txt"
+@include "npc/008-2-22/_import.txt"
+@include "npc/008-2-23/_import.txt"
+@include "npc/008-2-24/_import.txt"
+@include "npc/008-2-25/_import.txt"
+@include "npc/008-2-26/_import.txt"
+@include "npc/008-2-27/_import.txt"
+@include "npc/008-2-28/_import.txt"
+@include "npc/008-2-29/_import.txt"
 @include "npc/008-2-3/_import.txt"
+@include "npc/008-2-30/_import.txt"
 @include "npc/008-2-4/_import.txt"
 @include "npc/008-2-5/_import.txt"
 @include "npc/008-2-6/_import.txt"
 @include "npc/008-2-7/_import.txt"
 @include "npc/008-2-8/_import.txt"
 @include "npc/008-2-9/_import.txt"
+@include "npc/008-3-1/_import.txt"
 @include "npc/test/_import.txt"
 @include "npc/testbg/_import.txt"
 "npc/_anchors.txt",