Regenerate Map and Translation data

36 files changed, 171 insertions, 163 deletions

diff --git a/npc/004-1/_warps.txt b/npc/004-1/_warps.txt
index 6e79013d..4f8a0830 100644
--- a/npc/004-1/_warps.txt
+++ b/npc/004-1/_warps.txt
@@ -1,4 +1,4 @@
 // This file is generated automatically. All manually added changes will be removed when running the Converter.
 // Map 004-1: Beach warps
-004-1,68,19,0	warp	#004-1_68_19	2,0,041-1,101,94
+004-1,68,19,0	warp	#004-1_68_19	2,0,041-1,101,112
 004-1,37,111,0	warp	#004-1_37_111	2,0,003-4,141,20
diff --git a/npc/004-4/_warps.txt b/npc/004-4/_warps.txt
index d476bc2f..1318bc88 100644
--- a/npc/004-4/_warps.txt
+++ b/npc/004-4/_warps.txt
@@ -4,5 +4,5 @@
 004-4,31,72,0	warp	#004-4_31_72	0,0,004-3,31,74
 004-4,49,53,0	warp	#004-4_49_53	0,0,004-3,49,57
 004-4,90,70,0	warp	#004-4_90_70	0,0,004-3,90,66
-004-4,24,64,0	warp	#004-4_24_64	0,0,004-5,24,67
+004-4,24,64,0	warp	#004-4_24_64	0,0,004-5,34,67
 004-4,78,32,0	warp	#004-4_78_32	0,0,004-3,77,38
diff --git a/npc/004-5/_mobs.txt b/npc/004-5/_mobs.txt
index f8fd77fb..795a791f 100644
--- a/npc/004-5/_mobs.txt
+++ b/npc/004-5/_mobs.txt
@@ -1,14 +1,14 @@
 // This file is generated automatically. All manually added changes will be removed when running the Converter.
 // Map 004-5: Pirate Den mobs
-004-5,41,70,3,2	monster	Grenadier	1121,1,100000,30000
-004-5,41,70,3,1	monster	Swashbuckler	1120,2,100000,30000
-004-5,40,70,4,1	monster	Thug	1119,2,100000,30000
-004-5,35,86,3,2	monster	Grenadier	1121,1,100000,30000
-004-5,34,86,4,1	monster	Thug	1119,2,100000,30000
-004-5,35,86,3,1	monster	Swashbuckler	1120,2,100000,30000
-004-5,54,38,3,2	monster	Grenadier	1121,1,100000,30000
-004-5,53,38,4,1	monster	Thug	1119,2,100000,30000
-004-5,54,38,3,1	monster	Swashbuckler	1120,2,100000,30000
-004-5,81,38,3,2	monster	Grenadier	1121,1,100000,30000
-004-5,80,38,4,1	monster	Thug	1119,2,100000,30000
-004-5,81,38,3,1	monster	Swashbuckler	1120,2,100000,30000
+004-5,51,70,3,2	monster	Grenadier	1121,1,100000,30000
+004-5,51,70,3,1	monster	Swashbuckler	1120,2,100000,30000
+004-5,50,70,4,1	monster	Thug	1119,2,100000,30000
+004-5,45,86,3,2	monster	Grenadier	1121,1,100000,30000
+004-5,44,86,4,1	monster	Thug	1119,2,100000,30000
+004-5,45,86,3,1	monster	Swashbuckler	1120,2,100000,30000
+004-5,64,38,3,2	monster	Grenadier	1121,1,100000,30000
+004-5,63,38,4,1	monster	Thug	1119,2,100000,30000
+004-5,64,38,3,1	monster	Swashbuckler	1120,2,100000,30000
+004-5,91,38,3,2	monster	Grenadier	1121,1,100000,30000
+004-5,90,38,4,1	monster	Thug	1119,2,100000,30000
+004-5,91,38,3,1	monster	Swashbuckler	1120,2,100000,30000
diff --git a/npc/004-5/_warps.txt b/npc/004-5/_warps.txt
index 9e67f1ee..9818677a 100644
--- a/npc/004-5/_warps.txt
+++ b/npc/004-5/_warps.txt
@@ -1,3 +1,3 @@
 // This file is generated automatically. All manually added changes will be removed when running the Converter.
 // Map 004-5: Pirate Den warps
-004-5,24,65,0	warp	#004-5_24_65	0,0,004-4,24,62
+004-5,34,65,0	warp	#004-5_34_65	0,0,004-4,24,62
diff --git a/npc/006-1/_warps.txt b/npc/006-1/_warps.txt
index b7c5897c..9283bc18 100644
--- a/npc/006-1/_warps.txt
+++ b/npc/006-1/_warps.txt
@@ -14,12 +14,12 @@
 006-1,117,57,0	warp	#006-1_117_57	0,0,006-3,125,61
 006-1,92,63,0	warp	#006-1_92_63	0,0,006-3,92,65
 006-1,112,74,0	warp	#006-1_112_74	0,0,006-3,112,76
-006-1,111,110,0	warp	#006-1_111_110	0,0,032-3,56,60
+006-1,111,110,0	warp	#006-1_111_110	0,0,032-3,71,70
 006-1,83,117,0	warp	#006-1_83_117	0,0,006-3,79,121
 006-1,38,121,0	warp	#006-1_38_121	0,0,006-3,38,123
 006-1,74,90,0	warp	#006-1_74_90	0,0,006-3,74,92
 006-1,51,90,0	warp	#006-1_51_90	0,0,006-3,51,92
-006-1,30,123,0	warp	#006-1_30_123	0,0,032-3,128,33
+006-1,30,123,0	warp	#006-1_30_123	0,0,032-3,143,43
 006-1,33,85,0	warp	#006-1_33_85	0,0,006-2,58,43
 006-1,23,85,0	warp	#006-1_23_85	0,0,006-2,48,43
 006-1,23,100,0	warp	#006-1_23_100	0,0,006-2,67,64
diff --git a/npc/009-3/_warps.txt b/npc/009-3/_warps.txt
index 24b75cc1..f5aa9542 100644
--- a/npc/009-3/_warps.txt
+++ b/npc/009-3/_warps.txt
@@ -1,6 +1,6 @@
 // This file is generated automatically. All manually added changes will be removed when running the Converter.
 // Map 009-3: Hurnscald Cave warps
 009-3,173,20,0	warp	#009-3_173_20	0,0,009-2,147,89
-009-3,20,57,0	warp	#009-3_20_57	0,0,011-4,129,87
+009-3,20,57,0	warp	#009-3_20_57	0,0,011-4,154,107
 009-3,157,30,0	warp	#009-3_157_30	0,0,018-3,179,180
 009-3,117,19,0	warp	#009-3_117_19	0,0,013-3,160,102
diff --git a/npc/010-1/_warps.txt b/npc/010-1/_warps.txt
index 65b9b694..80147987 100644
--- a/npc/010-1/_warps.txt
+++ b/npc/010-1/_warps.txt
@@ -1,7 +1,7 @@
 // This file is generated automatically. All manually added changes will be removed when running the Converter.
 // Map 010-1: Woodland warps
 010-1,49,24,0	warp	#010-1_49_24	1,0,011-1,48,103
-010-1,13,55,0	warp	#010-1_13_55	0,1,015-1,92,54
+010-1,15,55,0	warp	#010-1_15_55	0,1,015-1,92,54
 010-1,36,94,0	warp	#010-1_36_94	0,0,010-2,32,44
 010-1,56,105,0	warp	#010-1_56_105	2,0,016-1,56,19
 010-1,131,54,0	warp	#010-1_131_54	0,1,007-1,21,53
diff --git a/npc/011-1/_warps.txt b/npc/011-1/_warps.txt
index 263d9e21..f4752f4c 100644
--- a/npc/011-1/_warps.txt
+++ b/npc/011-1/_warps.txt
@@ -4,5 +4,5 @@
 011-1,30,61,0	warp	#011-1_30_61	0,2,014-1,108,91
 011-1,49,104,0	warp	#011-1_49_104	1,0,010-1,48,25
 011-1,124,62,0	warp	#011-1_124_62	0,3,008-1,25,61
-011-1,73,9,0	warp	#011-1_73_9	1,0,012-1,132,175
+011-1,73,14,0	warp	#011-1_73_14	1,0,012-1,132,173
 011-1,38,36,0	warp	#011-1_38_36	0,0,011-6,49,100
diff --git a/npc/011-3/_warps.txt b/npc/011-3/_warps.txt
index c7c117e6..4e047d0c 100644
--- a/npc/011-3/_warps.txt
+++ b/npc/011-3/_warps.txt
@@ -1,3 +1,3 @@
 // This file is generated automatically. All manually added changes will be removed when running the Converter.
 // Map 011-3: Hermit's Cave warps
-011-3,31,14,0	warp	#011-3_31_14	0,0,011-4,73,10
+011-3,46,24,0	warp	#011-3_46_24	0,0,011-4,98,30
diff --git a/npc/011-4/_mobs.txt b/npc/011-4/_mobs.txt
index f8a67a22..0d63b610 100644
--- a/npc/011-4/_mobs.txt
+++ b/npc/011-4/_mobs.txt
@@ -1,9 +1,9 @@
 // This file is generated automatically. All manually added changes will be removed when running the Converter.
 // Map 011-4: Lake Cave mobs
-011-4,52,30,19,19	monster	Spiky Mushroom	1019,1,100000,30000
-011-4,93,114,19,19	monster	Cave Snake	1021,1,100000,30000
+011-4,77,50,19,19	monster	Spiky Mushroom	1019,1,100000,30000
+011-4,118,134,19,19	monster	Cave Snake	1021,1,100000,30000
 011-4,0,0,0,0	monster	Cave Snake	1021,40,0,0
 011-4,0,0,0,0	monster	Spiky Mushroom	1019,15,0,0
-011-4,60,78,28,37	monster	Cave Maggot	1056,10,100000,30000
-011-4,63,21,55,17	monster	Cave Maggot	1056,10,100000,30000
+011-4,85,98,28,37	monster	Cave Maggot	1056,10,100000,30000
+011-4,88,41,55,17	monster	Cave Maggot	1056,10,100000,30000
 011-4,0,0,0,0	monster	Bat	1017,20,180000,40000
diff --git a/npc/011-4/_warps.txt b/npc/011-4/_warps.txt
index 8a512935..0aa49d72 100644
--- a/npc/011-4/_warps.txt
+++ b/npc/011-4/_warps.txt
@@ -1,13 +1,13 @@
 // This file is generated automatically. All manually added changes will be removed when running the Converter.
 // Map 011-4: Lake Cave warps
-011-4,73,8,0	warp	#011-4_73_8	0,0,011-3,31,16
-011-4,129,86,0	warp	#011-4_129_86	0,0,009-3,20,56
-011-4,39,35,0	warp	#011-4_39_35	0,0,011-6,47,184
-011-4,16,57,0	warp	#011-4_16_57	0,0,011-6,24,205
-011-4,89,20,0	warp	#011-4_89_20	0,0,011-6,97,168
-011-4,105,32,0	warp	#011-4_105_32	0,0,011-6,114,183
-011-4,114,61,0	warp	#011-4_114_61	0,0,011-6,123,212
-011-4,86,75,0	warp	#011-4_86_75	0,0,011-6,95,226
-011-4,62,86,0	warp	#011-4_62_86	0,0,011-6,68,234
-011-4,32,5,0	warp	#011-4_32_5	1,0,011-6,186,181
-011-4,45,118,0	warp	#011-4_45_118	0,0,011-6,266,181
+011-4,98,28,0	warp	#011-4_98_28	0,0,011-3,46,25
+011-4,154,106,0	warp	#011-4_154_106	0,0,009-3,20,56
+011-4,64,55,0	warp	#011-4_64_55	0,0,011-6,47,184
+011-4,41,77,0	warp	#011-4_41_77	0,0,011-6,24,205
+011-4,114,40,0	warp	#011-4_114_40	0,0,011-6,97,168
+011-4,130,52,0	warp	#011-4_130_52	0,0,011-6,114,183
+011-4,139,81,0	warp	#011-4_139_81	0,0,011-6,123,212
+011-4,111,95,0	warp	#011-4_111_95	0,0,011-6,95,226
+011-4,87,106,0	warp	#011-4_87_106	0,0,011-6,68,234
+011-4,57,25,0	warp	#011-4_57_25	1,0,011-6,186,181
+011-4,70,138,0	warp	#011-4_70_138	0,0,011-6,266,181
diff --git a/npc/011-6/_warps.txt b/npc/011-6/_warps.txt
index 374205bd..72c7f747 100644
--- a/npc/011-6/_warps.txt
+++ b/npc/011-6/_warps.txt
@@ -11,14 +11,14 @@
 011-6,98,30,0	warp	#011-6_98_30	0,0,011-6,271,51
 011-6,47,120,0	warp	#011-6_47_120	0,0,011-6,145,117
 011-6,49,101,0	warp	#011-6_49_101	0,0,011-1,38,37
-011-6,24,206,0	warp	#011-6_24_206	0,0,011-4,16,58
-011-6,47,185,0	warp	#011-6_47_185	0,0,011-4,39,36
-011-6,97,169,0	warp	#011-6_97_169	0,0,011-4,89,21
-011-6,113,182,0	warp	#011-6_113_182	0,0,011-4,106,33
-011-6,122,211,0	warp	#011-6_122_211	0,0,011-4,115,62
-011-6,94,225,0	warp	#011-6_94_225	0,0,011-4,87,76
-011-6,68,235,0	warp	#011-6_68_235	0,0,011-4,62,87
+011-6,24,206,0	warp	#011-6_24_206	0,0,011-4,41,78
+011-6,47,185,0	warp	#011-6_47_185	0,0,011-4,64,56
+011-6,97,169,0	warp	#011-6_97_169	0,0,011-4,114,41
+011-6,113,182,0	warp	#011-6_113_182	0,0,011-4,131,53
+011-6,122,211,0	warp	#011-6_122_211	0,0,011-4,140,82
+011-6,94,225,0	warp	#011-6_94_225	0,0,011-4,112,96
+011-6,68,235,0	warp	#011-6_68_235	0,0,011-4,87,107
 011-6,251,278,0	warp	#011-6_251_278	0,0,011-4,111,122
-011-6,186,182,0	warp	#011-6_186_182	1,0,011-4,32,6
-011-6,266,182,0	warp	#011-6_266_182	0,0,011-4,45,119
+011-6,186,182,0	warp	#011-6_186_182	1,0,011-4,57,26
+011-6,266,182,0	warp	#011-6_266_182	0,0,011-4,70,139
 011-6,174,256,0	warp	#011-6_174_256	0,0,011-6,264,237
diff --git a/npc/012-1/_warps.txt b/npc/012-1/_warps.txt
index e05cf52f..3c7492c9 100644
--- a/npc/012-1/_warps.txt
+++ b/npc/012-1/_warps.txt
@@ -1,13 +1,13 @@
 // This file is generated automatically. All manually added changes will be removed when running the Converter.
 // Map 012-1: Woodland Hills warps
-012-1,51,39,0	warp	#012-1_51_39	0,0,012-3,370,43
-012-1,147,67,0	warp	#012-1_147_67	0,0,012-3,474,106
-012-1,41,48,0	warp	#012-1_41_48	0,0,012-3,353,78
-012-1,44,88,0	warp	#012-1_44_88	0,0,012-3,355,187
-012-1,92,104,0	warp	#012-1_92_104	0,0,012-3,270,111
-012-1,98,99,0	warp	#012-1_98_99	0,0,012-3,37,81
-012-1,109,92,0	warp	#012-1_109_92	0,0,012-3,80,73
-012-1,123,90,0	warp	#012-1_123_90	0,0,012-3,38,156
+012-1,51,39,0	warp	#012-1_51_39	0,0,012-3,380,52
+012-1,147,67,0	warp	#012-1_147_67	0,0,012-3,484,115
+012-1,41,48,0	warp	#012-1_41_48	0,0,012-3,363,87
+012-1,44,88,0	warp	#012-1_44_88	0,0,012-3,365,196
+012-1,92,104,0	warp	#012-1_92_104	0,0,012-3,280,120
+012-1,98,99,0	warp	#012-1_98_99	0,0,012-3,47,90
+012-1,109,92,0	warp	#012-1_109_92	0,0,012-3,90,82
+012-1,123,90,0	warp	#012-1_123_90	0,0,012-3,48,165
 012-1,150,61,0	warp	#012-1_150_61	0,3,013-1,21,75
-012-1,132,176,0	warp	#012-1_132_176	1,0,011-1,73,10
-012-1,65,126,0	warp	#012-1_65_126	0,0,012-3,176,140
+012-1,132,174,0	warp	#012-1_132_174	1,0,011-1,73,15
+012-1,65,126,0	warp	#012-1_65_126	0,0,012-3,186,150
diff --git a/npc/012-3/_mobs.txt b/npc/012-3/_mobs.txt
index bc4479aa..00650e6a 100644
--- a/npc/012-3/_mobs.txt
+++ b/npc/012-3/_mobs.txt
@@ -1,18 +1,18 @@
 // This file is generated automatically. All manually added changes will be removed when running the Converter.
 // Map 012-3: Moggun Cave mobs
-012-3,448,65,9,3	monster	Moggun	1061,5,100000,30000
-012-3,442,45,9,3	monster	Moggun	1061,5,100000,30000
-012-3,412,31,9,3	monster	Moggun	1061,5,100000,30000
-012-3,347,39,4,8	monster	Moggun	1061,5,100000,30000
-012-3,363,101,8,9	monster	Moggun	1061,10,100000,30000
-012-3,446,81,9,3	monster	Moggun	1061,5,100000,30000
-012-3,388,138,8,3	monster	Moggun	1061,5,100000,30000
-012-3,409,78,4,8	monster	Moggun	1061,5,100000,30000
-012-3,382,152,8,3	monster	Moggun	1061,5,100000,30000
-012-3,430,117,4,8	monster	Moggun	1061,5,100000,30000
-012-3,330,100,4,8	monster	Moggun	1061,5,100000,30000
-012-3,269,138,8,9	monster	Moggun	1061,10,100000,30000
-012-3,188,52,8,9	monster	Moggun	1061,10,100000,30000
-012-3,165,106,8,9	monster	Moggun	1061,10,100000,30000
-012-3,0,0,0,0	monster	Bat	1017,100,0,0
-012-3,0,0,0,0	monster	Cave Snake	1021,75,0,0
+012-3,458,75,9,3	monster	Moggun	1061,5,100000,30000
+012-3,452,55,9,3	monster	Moggun	1061,5,100000,30000
+012-3,422,41,9,3	monster	Moggun	1061,5,100000,30000
+012-3,357,49,4,8	monster	Moggun	1061,5,100000,30000
+012-3,373,111,8,9	monster	Moggun	1061,10,100000,30000
+012-3,456,91,9,3	monster	Moggun	1061,5,100000,30000
+012-3,398,148,8,3	monster	Moggun	1061,5,100000,30000
+012-3,419,88,4,8	monster	Moggun	1061,5,100000,30000
+012-3,392,162,8,3	monster	Moggun	1061,5,100000,30000
+012-3,440,127,4,8	monster	Moggun	1061,5,100000,30000
+012-3,340,110,4,8	monster	Moggun	1061,5,100000,30000
+012-3,279,148,8,9	monster	Moggun	1061,10,100000,30000
+012-3,198,62,8,9	monster	Moggun	1061,10,100000,30000
+012-3,175,116,8,9	monster	Moggun	1061,10,100000,30000
+012-3,10,10,0,0	monster	Bat	1017,100,0,0
+012-3,10,10,0,0	monster	Cave Snake	1021,75,0,0
diff --git a/npc/012-3/_warps.txt b/npc/012-3/_warps.txt
index 24dcc19f..34bbf648 100644
--- a/npc/012-3/_warps.txt
+++ b/npc/012-3/_warps.txt
@@ -1,12 +1,12 @@
 // This file is generated automatically. All manually added changes will be removed when running the Converter.
 // Map 012-3: Moggun Cave warps
-012-3,37,82,0	warp	#012-3_37_82	0,0,012-1,98,100
-012-3,80,74,0	warp	#012-3_80_74	0,0,012-1,109,93
-012-3,38,157,0	warp	#012-3_38_157	0,0,012-1,123,91
-012-3,270,112,0	warp	#012-3_270_112	0,0,012-1,92,105
-012-3,176,138,0	warp	#012-3_176_138	0,0,012-1,65,128
-012-3,355,188,0	warp	#012-3_355_188	0,0,012-1,44,89
-012-3,370,44,0	warp	#012-3_370_44	0,0,012-1,51,40
-012-3,353,79,0	warp	#012-3_353_79	0,0,012-1,41,49
-012-3,473,106,0	warp	#012-3_473_106	0,0,012-1,146,67
-012-3,448,61,0	warp	#012-3_448_61	0,0,012-4,193,57
+012-3,47,92,0	warp	#012-3_47_92	0,0,012-1,98,100
+012-3,90,84,0	warp	#012-3_90_84	0,0,012-1,109,93
+012-3,48,167,0	warp	#012-3_48_167	0,0,012-1,123,91
+012-3,280,122,0	warp	#012-3_280_122	0,0,012-1,92,105
+012-3,186,148,0	warp	#012-3_186_148	0,0,012-1,65,128
+012-3,365,198,0	warp	#012-3_365_198	0,0,012-1,44,89
+012-3,380,54,0	warp	#012-3_380_54	0,0,012-1,51,40
+012-3,363,89,0	warp	#012-3_363_89	0,0,012-1,41,49
+012-3,483,116,0	warp	#012-3_483_116	0,0,012-1,146,67
+012-3,458,71,0	warp	#012-3_458_71	0,0,012-4,193,57
diff --git a/npc/015-1/_warps.txt b/npc/015-1/_warps.txt
index 71cb3c0d..f03dba7c 100644
--- a/npc/015-1/_warps.txt
+++ b/npc/015-1/_warps.txt
@@ -1,5 +1,5 @@
 // This file is generated automatically. All manually added changes will be removed when running the Converter.
 // Map 015-1: Woodland warps
-015-1,93,55,0	warp	#015-1_93_55	0,1,010-1,14,54
+015-1,93,55,0	warp	#015-1_93_55	0,1,010-1,17,54
 015-1,59,31,0	warp	#015-1_59_31	0,0,015-3,31,42
 015-1,59,101,0	warp	#015-1_59_101	3,0,025-1,89,20
diff --git a/npc/017-9/_warps.txt b/npc/017-9/_warps.txt
index daee3206..1c8f826c 100644
--- a/npc/017-9/_warps.txt
+++ b/npc/017-9/_warps.txt
@@ -1,7 +1,7 @@
 // This file is generated automatically. All manually added changes will be removed when running the Converter.
 // Map 017-9: GM Lounge warps
-017-9,29,20,0	warp	#017-9_29_20	0,0,020-1,60,75
-017-9,26,21,0	warp	#017-9_26_21	0,0,009-1,43,45
-017-9,21,20,0	warp	#017-9_21_20	0,0,001-1,54,118
-017-9,31,20,0	warp	#017-9_31_20	0,0,027-2,46,110
-017-9,23,20,0	warp	#017-9_23_20	0,0,029-1,34,95
+017-9,39,24,0	warp	#017-9_39_24	0,0,020-1,60,75
+017-9,36,25,0	warp	#017-9_36_25	0,0,009-1,43,45
+017-9,31,24,0	warp	#017-9_31_24	0,0,001-1,54,118
+017-9,41,24,0	warp	#017-9_41_24	0,0,027-2,46,110
+017-9,33,24,0	warp	#017-9_33_24	0,0,029-1,34,95
diff --git a/npc/020-1/_warps.txt b/npc/020-1/_warps.txt
index 19986393..cbcccd31 100644
--- a/npc/020-1/_warps.txt
+++ b/npc/020-1/_warps.txt
@@ -1,12 +1,12 @@
 // This file is generated automatically. All manually added changes will be removed when running the Converter.
 // Map 020-1: Nivalis warps
 020-1,76,38,0	warp	#020-1_76_38	2,0,020-3,31,26
-020-1,47,48,0	warp	#020-1_47_48	0,0,020-2,25,35
-020-1,66,52,0	warp	#020-1_66_52	0,0,020-2,72,70
-020-1,64,82,0	warp	#020-1_64_82	0,0,020-2,111,32
-020-1,86,46,0	warp	#020-1_86_46	0,0,020-2,32,73
-020-1,57,91,0	warp	#020-1_57_91	0,0,020-2,65,23
+020-1,47,48,0	warp	#020-1_47_48	0,0,020-2,35,35
+020-1,66,52,0	warp	#020-1_66_52	0,0,020-2,82,70
+020-1,64,82,0	warp	#020-1_64_82	0,0,020-2,137,32
+020-1,86,46,0	warp	#020-1_86_46	0,0,020-2,42,73
+020-1,57,91,0	warp	#020-1_57_91	0,0,020-2,75,23
 020-1,70,128,0	warp	#020-1_70_128	3,0,019-1,70,22
 020-1,107,55,0	warp	#020-1_107_55	0,0,031-1,38,55
-020-1,59,45,0	warp	#020-1_59_45	0,0,020-2,127,68
+020-1,59,45,0	warp	#020-1_59_45	0,0,020-2,137,68
 020-1,33,93,0	warp	#020-1_33_93	0,0,030-2,88,50
diff --git a/npc/020-2/_warps.txt b/npc/020-2/_warps.txt
index 239da85a..4ccb9c31 100644
--- a/npc/020-2/_warps.txt
+++ b/npc/020-2/_warps.txt
@@ -1,8 +1,8 @@
 // This file is generated automatically. All manually added changes will be removed when running the Converter.
 // Map 020-2: Nivalis Indoor warps
-020-2,25,36,0	warp	#020-2_25_36	0,0,020-1,47,49
-020-2,64,23,0	warp	#020-2_64_23	0,0,020-1,56,91
-020-2,111,33,0	warp	#020-2_111_33	0,0,020-1,64,83
-020-2,32,74,0	warp	#020-2_32_74	0,0,020-1,86,47
-020-2,72,71,0	warp	#020-2_72_71	0,0,020-1,66,53
-020-2,127,69,0	warp	#020-2_127_69	0,0,020-1,59,46
+020-2,35,36,0	warp	#020-2_35_36	0,0,020-1,47,49
+020-2,74,23,0	warp	#020-2_74_23	0,0,020-1,56,91
+020-2,137,33,0	warp	#020-2_137_33	0,0,020-1,64,83
+020-2,42,74,0	warp	#020-2_42_74	0,0,020-1,86,47
+020-2,82,71,0	warp	#020-2_82_71	0,0,020-1,66,53
+020-2,137,69,0	warp	#020-2_137_69	0,0,020-1,59,46
diff --git a/npc/023-1/_warps.txt b/npc/023-1/_warps.txt
index 0ff1c2c5..1191fb85 100644
--- a/npc/023-1/_warps.txt
+++ b/npc/023-1/_warps.txt
@@ -9,7 +9,7 @@
 023-1,70,95,0	warp	#023-1_70_95	0,0,023-3,70,93
 023-1,48,80,0	warp	#023-1_48_80	0,0,023-3,48,78
 023-1,61,36,0	warp	#023-1_61_36	0,0,023-3,61,39
-023-1,36,34,0	warp	#023-1_36_34	0,0,023-2,31,38
-023-1,37,23,0	warp	#023-1_37_23	0,0,023-2,31,33
+023-1,36,34,0	warp	#023-1_36_34	0,0,023-2,37,29
+023-1,37,23,0	warp	#023-1_37_23	0,0,023-2,37,23
 023-1,66,101,0	warp	#023-1_66_101	0,3,023-1,61,100
 023-1,62,101,0	warp	#023-1_62_101	0,3,023-1,67,100
diff --git a/npc/023-2/_warps.txt b/npc/023-2/_warps.txt
index 4cb63639..f9e0d6f0 100644
--- a/npc/023-2/_warps.txt
+++ b/npc/023-2/_warps.txt
@@ -1,2 +1,2 @@
-023-2,31,40,0	warp	#023-2_31_40	0,0,023-1,36,35
-023-2,31,31,0	warp	#023-2_31_31	0,0,023-1,36,23
+023-2,37,30,0	warp	#023-2_37_30	0,0,023-1,36,35
+023-2,37,22,0	warp	#023-2_37_22	0,0,023-1,36,23
diff --git a/npc/027-2/_warps.txt b/npc/027-2/_warps.txt
index 56d1f881..d6099ded 100644
--- a/npc/027-2/_warps.txt
+++ b/npc/027-2/_warps.txt
@@ -1,5 +1,5 @@
 // This file is generated automatically. All manually added changes will be removed when running the Converter.
 // Map 027-2: Graveyard Indoor warps
 027-2,36,111,0	warp	#027-2_36_111	5,0,027-1,28,68
-027-2,36,78,0	warp	#027-2_36_78	5,0,027-3,25,68
+027-2,36,78,0	warp	#027-2_36_78	5,0,027-3,35,69
 027-2,46,34,0	warp	#027-2_46_34	0,0,027-1,88,85
diff --git a/npc/027-3/_mobs.txt b/npc/027-3/_mobs.txt
index 4f81ed7f..28a14171 100644
--- a/npc/027-3/_mobs.txt
+++ b/npc/027-3/_mobs.txt
@@ -1,10 +1,10 @@
 // This file is generated automatically. All manually added changes will be removed when running the Converter.
 // Map 027-3: Crypt Basement mobs
-027-3,34,63,14,34	monster	Skeleton	1043,6,60000,8000
-027-3,97,43,29,15	monster	Skeleton	1043,6,60000,8000
-027-3,34,63,14,34	monster	Lady Skeleton	1044,4,60000,8000
-027-3,113,78,14,13	monster	Lady Skeleton	1044,4,60000,8000
-027-3,113,78,13,13	monster	Skeleton	1043,4,60000,8000
-027-3,81,87,14,11	monster	Vampire Bat	1066,15,100000,30000
-027-3,74,45,53,16	monster	Poison Skull	1024,1,60000,20000
-027-3,98,84,30,7	monster	Fire Skull	1023,2,60000,20000
+027-3,44,63,14,34	monster	Skeleton	1043,6,60000,8000
+027-3,107,43,29,15	monster	Skeleton	1043,6,60000,8000
+027-3,44,63,14,34	monster	Lady Skeleton	1044,4,60000,8000
+027-3,123,78,14,13	monster	Lady Skeleton	1044,4,60000,8000
+027-3,123,78,13,13	monster	Skeleton	1043,4,60000,8000
+027-3,91,87,14,11	monster	Vampire Bat	1066,15,100000,30000
+027-3,84,45,53,16	monster	Poison Skull	1024,1,60000,20000
+027-3,108,84,30,7	monster	Fire Skull	1023,2,60000,20000
diff --git a/npc/027-3/_warps.txt b/npc/027-3/_warps.txt
index 1a876d29..0b22820e 100644
--- a/npc/027-3/_warps.txt
+++ b/npc/027-3/_warps.txt
@@ -1,4 +1,4 @@
 // This file is generated automatically. All manually added changes will be removed when running the Converter.
 // Map 027-3: Crypt Basement warps
-027-3,26,67,0	warp	#027-3_26_67	3,0,027-2,36,77
-027-3,127,99,0	warp	#027-3_127_99	3,0,027-4,125,18
+027-3,36,67,0	warp	#027-3_36_67	3,0,027-2,36,77
+027-3,137,99,0	warp	#027-3_137_99	3,0,027-4,125,18
diff --git a/npc/027-4/_warps.txt b/npc/027-4/_warps.txt
index 9d611f7b..558ca8d3 100644
--- a/npc/027-4/_warps.txt
+++ b/npc/027-4/_warps.txt
@@ -1,4 +1,4 @@
 // This file is generated automatically. All manually added changes will be removed when running the Converter.
 // Map 027-4: Crypt Sub-Basement One warps
-027-4,125,17,0	warp	#027-4_125_17	4,0,027-3,125,98
+027-4,126,17,0	warp	#027-4_126_17	5,0,027-3,136,97
 027-4,22,98,0	warp	#027-4_22_98	3,0,027-5,124,18
diff --git a/npc/032-3/_mobs.txt b/npc/032-3/_mobs.txt
index 27710b36..791ecb5f 100644
--- a/npc/032-3/_mobs.txt
+++ b/npc/032-3/_mobs.txt
@@ -1,12 +1,12 @@
 // This file is generated automatically. All manually added changes will be removed when running the Converter.
 // Map 032-3: Outback Cave mobs
-032-3,90,44,4,5	monster	Skeleton	1043,3,30000,100000
-032-3,44,23,14,11	monster	Mountain Snake	1026,7,30000,100000
-032-3,125,46,17,37	monster	Snake	1010,13,30000,100000
-032-3,80,44,4,5	monster	Black Scorpion	1009,5,30000,100000
-032-3,85,33,4,5	monster	Spider	1012,5,30000,100000
-032-3,83,18,18,4	monster	Archant	1060,8,30000,100000
-032-3,78,76,12,10	monster	Archant	1060,8,30000,100000
-032-3,25,76,12,10	monster	Yellow Slime	1007,11,300000,1000000
-032-3,46,51,17,9	monster	Cave Maggot	1056,11,30000,100000
+032-3,105,54,4,5	monster	Skeleton	1043,3,30000,100000
+032-3,59,33,14,11	monster	Mountain Snake	1026,7,30000,100000
+032-3,140,56,17,37	monster	Snake	1010,13,30000,100000
+032-3,95,54,4,5	monster	Black Scorpion	1009,5,30000,100000
+032-3,100,43,4,5	monster	Spider	1012,5,30000,100000
+032-3,98,28,18,4	monster	Archant	1060,8,30000,100000
+032-3,93,86,12,10	monster	Archant	1060,8,30000,100000
+032-3,40,86,12,10	monster	Yellow Slime	1007,11,300000,1000000
+032-3,61,61,17,9	monster	Cave Maggot	1056,11,30000,100000
 032-3,0,0,0,0	monster	Bat	1017,25,30000,100000
diff --git a/npc/032-3/_warps.txt b/npc/032-3/_warps.txt
index 2d2f7039..1b109212 100644
--- a/npc/032-3/_warps.txt
+++ b/npc/032-3/_warps.txt
@@ -1,4 +1,4 @@
 // This file is generated automatically. All manually added changes will be removed when running the Converter.
 // Map 032-3: Outback Cave warps
-032-3,128,34,0	warp	#032-3_128_34	0,0,006-1,30,124
-032-3,56,61,0	warp	#032-3_56_61	0,0,006-1,111,111
+032-3,143,44,0	warp	#032-3_143_44	0,0,006-1,30,124
+032-3,71,71,0	warp	#032-3_71_71	0,0,006-1,111,111
diff --git a/npc/041-1/_mobs.txt b/npc/041-1/_mobs.txt
index 045e7fb0..94a1a672 100644
--- a/npc/041-1/_mobs.txt
+++ b/npc/041-1/_mobs.txt
@@ -1,13 +1,13 @@
 // This file is generated automatically. All manually added changes will be removed when running the Converter.
 // Map 041-1: Beach mobs
-041-1,81,55,9,4	monster	Scorpion	1003,3,100000,30000
-041-1,101,67,9,4	monster	Scorpion	1003,3,100000,30000
-041-1,100,84,9,4	monster	Scorpion	1003,3,100000,30000
-041-1,61,34,6,10	monster	Scorpion	1003,3,100000,30000
-041-1,55,30,5,24	monster	Sea Slime	1033,3,100000,30000
-041-1,59,13,5,4	monster	Scorpion	1003,3,100000,30000
-041-1,60,7,1,1	monster	Tame Scorpion	1046,1,100000,30000
-041-1,66,49,1,1	monster	Tame Scorpion	1046,1,100000,30000
-041-1,95,75,10,4	monster	Tame Scorpion	1046,1,100000,30000
-041-1,100,57,9,4	monster	Red Scorpion	1004,3,100000,30000
-041-1,83,64,9,4	monster	Red Scorpion	1004,3,100000,30000
+041-1,88,76,1,1	monster	Scorpion	1003,3,100000,30000
+041-1,101,85,9,4	monster	Scorpion	1003,3,100000,30000
+041-1,100,102,9,4	monster	Scorpion	1003,3,100000,30000
+041-1,61,52,6,10	monster	Scorpion	1003,3,100000,30000
+041-1,55,48,5,24	monster	Sea Slime	1033,3,100000,30000
+041-1,59,31,5,4	monster	Scorpion	1003,3,100000,30000
+041-1,60,25,1,1	monster	Tame Scorpion	1046,1,100000,30000
+041-1,56,84,1,1	monster	Tame Scorpion	1046,1,100000,30000
+041-1,95,93,10,4	monster	Tame Scorpion	1046,1,100000,30000
+041-1,100,75,9,4	monster	Red Scorpion	1004,3,100000,30000
+041-1,83,82,8,4	monster	Red Scorpion	1004,3,100000,30000
diff --git a/npc/041-1/_warps.txt b/npc/041-1/_warps.txt
index 9fa199d6..55f023ad 100644
--- a/npc/041-1/_warps.txt
+++ b/npc/041-1/_warps.txt
@@ -1,4 +1,4 @@
 // This file is generated automatically. All manually added changes will be removed when running the Converter.
 // Map 041-1: Beach warps
-041-1,101,95,0	warp	#041-1_101_95	2,0,004-1,68,20
-041-1,58,4,0	warp	#041-1_58_4	2,0,042-1,44,113
+041-1,101,113,0	warp	#041-1_101_113	2,0,004-1,68,20
+041-1,58,22,0	warp	#041-1_58_22	2,0,042-1,44,113
diff --git a/npc/042-1/_warps.txt b/npc/042-1/_warps.txt
index 657a9b73..62a0d621 100644
--- a/npc/042-1/_warps.txt
+++ b/npc/042-1/_warps.txt
@@ -1,4 +1,4 @@
 // This file is generated automatically. All manually added changes will be removed when running the Converter.
 // Map 042-1: Tulimshar Suburbs warps
 042-1,65,20,0	warp	#042-1_65_20	1,0,023-1,64,143
-042-1,44,115,0	warp	#042-1_44_115	2,0,041-1,58,6
+042-1,44,115,0	warp	#042-1_44_115	2,0,041-1,58,23
diff --git a/npc/099-1/_warps.txt b/npc/099-1/_warps.txt
index 24df433a..936cd0c1 100644
--- a/npc/099-1/_warps.txt
+++ b/npc/099-1/_warps.txt
@@ -1,27 +1,27 @@
 // This file is generated automatically. All manually added changes will be removed when running the Converter.
 // Map 099-1: Keshlam's Adventurer's Guild warps
-099-1,29,14,0	warp	#099-1_29_14	0,0,099-2,25,22
+099-1,29,15,0	warp	#099-1_29_15	0,0,099-2,25,22
 099-1,77,15,0	warp	#099-1_77_15	0,0,099-2,59,21
 099-1,105,7,0	warp	#099-1_105_7	0,0,099-2,90,21
 099-1,91,135,0	warp	#099-1_91_135	0,0,099-2,121,21
 099-1,20,114,0	warp	#099-1_20_114	0,0,099-2,25,49
 099-1,97,84,0	warp	#099-1_97_84	0,0,099-2,59,49
-099-1,118,116,0	warp	#099-1_118_116	0,0,099-3,72,26
+099-1,119,116,0	warp	#099-1_119_116	0,0,099-3,72,26
 099-1,112,125,0	warp	#099-1_112_125	0,0,099-2,91,49
 099-1,64,113,0	warp	#099-1_64_113	0,0,099-2,121,48
 099-1,64,71,0	warp	#099-1_64_71	0,0,099-2,25,75
 099-1,42,50,0	warp	#099-1_42_50	0,0,099-2,59,75
 099-1,92,43,0	warp	#099-1_92_43	0,0,099-2,91,75
 099-1,15,76,0	warp	#099-1_15_76	0,0,099-2,121,75
-099-1,42,123,0	warp	#099-1_42_123	0,0,099-2,25,101
+099-1,42,124,0	warp	#099-1_42_124	0,0,099-2,25,101
 099-1,113,60,0	warp	#099-1_113_60	0,0,099-2,60,101
 099-1,131,80,0	warp	#099-1_131_80	0,0,099-2,91,101
 099-1,72,57,0	warp	#099-1_72_57	0,0,099-2,121,101
 099-1,47,91,0	warp	#099-1_47_91	0,0,099-2,26,132
 099-1,102,23,0	warp	#099-1_102_23	0,0,099-2,60,132
-099-1,119,43,0	warp	#099-1_119_43	0,0,099-2,92,132
+099-1,120,43,0	warp	#099-1_120_43	0,0,099-2,92,132
 099-1,97,104,0	warp	#099-1_97_104	0,0,099-2,121,132
-099-1,47,15,0	warp	#099-1_47_15	0,0,099-3,29,63
+099-1,48,15,0	warp	#099-1_48_15	0,0,099-3,29,63
 099-1,76,24,0	warp	#099-1_76_24	0,0,099-3,35,63
 099-1,128,16,0	warp	#099-1_128_16	0,0,099-3,41,63
 099-1,110,46,0	warp	#099-1_110_46	0,0,099-3,47,63
@@ -30,13 +30,13 @@
 099-1,125,96,0	warp	#099-1_125_96	0,0,099-3,79,63
 099-1,60,91,0	warp	#099-1_60_91	0,0,099-3,85,63
 099-1,20,53,0	warp	#099-1_20_53	0,0,099-3,91,63
-099-1,14,55,0	warp	#099-1_14_55	0,0,099-3,97,63
+099-1,14,56,0	warp	#099-1_14_56	0,0,099-3,97,63
 099-1,22,69,0	warp	#099-1_22_69	0,0,099-3,103,63
 099-1,19,92,0	warp	#099-1_19_92	0,0,099-3,109,63
 099-1,57,50,0	warp	#099-1_57_50	0,0,099-3,115,63
-099-1,127,43,0	warp	#099-1_127_43	0,0,099-1,35,30
+099-1,128,43,0	warp	#099-1_128_43	0,0,099-1,35,30
 099-1,21,15,0	warp	#099-1_21_15	0,0,099-6,121,132
-099-1,39,14,0	warp	#099-1_39_14	0,0,099-1,35,30
+099-1,39,15,0	warp	#099-1_39_15	0,0,099-1,35,30
 099-1,58,15,0	warp	#099-1_58_15	0,0,099-6,92,132
 099-1,67,15,0	warp	#099-1_67_15	0,0,099-1,35,30
 099-1,85,15,0	warp	#099-1_85_15	0,0,099-6,59,21
@@ -54,14 +54,14 @@
 099-1,105,60,0	warp	#099-1_105_60	0,0,099-1,35,30
 099-1,50,50,0	warp	#099-1_50_50	0,0,099-1,35,30
 099-1,34,50,0	warp	#099-1_34_50	0,0,099-6,121,75
-099-1,26,50,0	warp	#099-1_26_50	0,0,099-6,91,75
+099-1,27,50,0	warp	#099-1_27_50	0,0,099-6,91,75
 099-1,25,79,0	warp	#099-1_25_79	0,0,099-6,59,75
-099-1,39,102,0	warp	#099-1_39_102	0,0,099-6,25,75
+099-1,40,103,0	warp	#099-1_40_103	0,0,099-6,25,75
 099-1,29,114,0	warp	#099-1_29_114	0,0,099-1,35,30
 099-1,29,135,0	warp	#099-1_29_135	0,0,099-6,121,48
-099-1,58,127,0	warp	#099-1_58_127	0,0,099-6,91,49
-099-1,84,115,0	warp	#099-1_84_115	0,0,099-6,59,49
+099-1,58,128,0	warp	#099-1_58_128	0,0,099-6,91,49
+099-1,84,116,0	warp	#099-1_84_116	0,0,099-6,59,49
 099-1,125,125,0	warp	#099-1_125_125	0,0,099-1,35,30
-099-1,82,104,0	warp	#099-1_82_104	0,0,099-6,25,49
-099-1,87,87,0	warp	#099-1_87_87	0,0,099-1,35,30
+099-1,83,104,0	warp	#099-1_83_104	0,0,099-6,25,49
+099-1,88,87,0	warp	#099-1_88_87	0,0,099-1,35,30
 099-1,79,71,0	warp	#099-1_79_71	0,0,099-6,121,21
diff --git a/npc/099-3/_warps.txt b/npc/099-3/_warps.txt
index 4ca885c1..1396e822 100644
--- a/npc/099-3/_warps.txt
+++ b/npc/099-3/_warps.txt
@@ -1,16 +1,16 @@
 // This file is generated automatically. All manually added changes will be removed when running the Converter.
 // Map 099-3: Keshlam's Adventurer's Guild Basement warps
 099-3,72,25,0	warp	#099-3_72_25	0,0,099-1,119,115
-099-3,28,60,0	warp	#099-3_28_60	0,0,099-1,48,17
+099-3,29,61,0	warp	#099-3_29_61	0,0,099-1,48,17
 099-3,35,61,0	warp	#099-3_35_61	0,0,099-1,76,26
-099-3,40,60,0	warp	#099-3_40_60	0,0,099-1,128,18
-099-3,47,60,0	warp	#099-3_47_60	0,0,099-1,110,45
-099-3,53,60,0	warp	#099-3_53_60	0,0,099-1,120,79
+099-3,41,61,0	warp	#099-3_41_61	0,0,099-1,128,18
+099-3,47,61,0	warp	#099-3_47_61	0,0,099-1,110,45
+099-3,53,61,0	warp	#099-3_53_61	0,0,099-1,120,79
 099-3,59,61,0	warp	#099-3_59_61	0,0,099-1,113,98
-099-3,79,60,0	warp	#099-3_79_60	0,0,099-1,125,98
+099-3,79,61,0	warp	#099-3_79_61	0,0,099-1,125,98
 099-3,85,61,0	warp	#099-3_85_61	0,0,099-1,60,93
-099-3,91,60,0	warp	#099-3_91_60	0,0,099-1,20,55
+099-3,91,61,0	warp	#099-3_91_61	0,0,099-1,20,55
 099-3,97,61,0	warp	#099-3_97_61	0,0,099-1,14,55
-099-3,102,60,0	warp	#099-3_102_60	0,0,099-1,15,68
-099-3,108,61,0	warp	#099-3_108_61	0,0,099-1,19,94
-099-3,114,61,0	warp	#099-3_114_61	0,0,099-1,57,52
+099-3,103,61,0	warp	#099-3_103_61	0,0,099-1,15,68
+099-3,109,61,0	warp	#099-3_109_61	0,0,099-1,19,94
+099-3,115,61,0	warp	#099-3_115_61	0,0,099-1,57,52
diff --git a/npc/_anchors.txt b/npc/_anchors.txt
index 6321274a..68e17a41 100644
--- a/npc/_anchors.txt
+++ b/npc/_anchors.txt
@@ -3,4 +3,5 @@
 -	script	__anchors__	32767,{
 OnInit:
     .ht = htnew();
+    htput(.ht, "^FERMI|VOTE", "fermi 29 20");
 }
diff --git a/npc/_import.txt b/npc/_import.txt
index 49026b44..174e498d 100644
--- a/npc/_import.txt
+++ b/npc/_import.txt
@@ -130,4 +130,5 @@
 @include "npc/099-7/_import.txt"
 @include "npc/099-8/_import.txt"
 @include "npc/botcheck/_import.txt"
+@include "npc/fermi/_import.txt"
 "npc/_anchors.txt",
diff --git a/npc/fermi/_import.txt b/npc/fermi/_import.txt
new file mode 100644
index 00000000..9c2eafa4
--- /dev/null
+++ b/npc/fermi/_import.txt
@@ -0,0 +1,3 @@
+// Map fermi: Three Fermi Land
+// This file is generated automatically. All manually added changes will be removed when running the Converter.
+"npc/fermi/_warps.txt",
diff --git a/npc/fermi/_warps.txt b/npc/fermi/_warps.txt
new file mode 100644
index 00000000..9da4df68
--- /dev/null
+++ b/npc/fermi/_warps.txt
@@ -0,0 +1,3 @@
+// This file is generated automatically. All manually added changes will be removed when running the Converter.
+// Map fermi: Three Fermi Land warps
+fermi,29,19,0	warp	#fermi_29_19	0,0,marine,43,27