make maps :fingers_crossed:

12 files changed, 97 insertions, 48 deletions

diff --git a/npc/004-2-1/_mobs.txt b/npc/004-2-1/_mobs.txt
index 853163431..f4b00ef09 100644
--- a/npc/004-2-1/_mobs.txt
+++ b/npc/004-2-1/_mobs.txt
@@ -1,5 +1,10 @@
 // This file is generated automatically. All manually added changes will be removed when running the Converter.
 // Map 004-2-1: magic school cave mobs
-004-2-1,55,58,29,22	monster	Cave Snake	1035,8,35000,150000
+004-2-1,55,58,29,22	monster	Cave Snake	1035,12,35000,150000
 004-2-1,70,40,3,1	monster	Small Topaz Bif	1101,1,35000,150000
 004-2-1,54,54,54,54	monster	Cave Maggot	1027,20,40000,200000
+004-2-1,43,68,4,4	monster	Snake	1122,5,35000,150000
+004-2-1,46,40,4,4	monster	Snake	1122,5,35000,150000
+004-2-1,79,51,4,4	monster	Snake	1122,6,35000,150000
+004-2-1,60,46,29,22	monster	Cave Maggot	1027,15,35000,150000
+004-2-1,55,48,29,22	monster	Small Topaz Bif	1101,3,35000,150000
diff --git a/npc/004-2-1/_warps.txt b/npc/004-2-1/_warps.txt
index a89fb32ea..57bfadb9f 100644
--- a/npc/004-2-1/_warps.txt
+++ b/npc/004-2-1/_warps.txt
@@ -1,6 +1,6 @@
 // This file is generated automatically. All manually added changes will be removed when running the Converter.
 // Map 004-2-1: magic school cave warps
-004-2-1,78,73,0	warp	#004-2-1_78_73	0,0,004-2,131,111
-004-2-1,26,86,0	warp	#004-2-1_26_86	0,0,010-1,59,192
-004-2-1,25,47,0	warp	#004-2-1_25_47	0,0,004-2,84,78
-004-2-1,51,26,0	warp	#004-2-1_51_26	0,0,004-2,112,64
+004-2-1,78,73,0	warp	#004-2-1_78_73	0,0,004-2,100,90
+004-2-1,26,86,0	warp	#004-2-1_26_86	0,0,004-2,84,78
+004-2-1,25,47,0	warp	#004-2-1_25_47	0,0,010-1,93,67
+004-2-1,51,26,0	warp	#004-2-1_51_26	0,0,004-2,116,35
diff --git a/npc/004-2/_mobs.txt b/npc/004-2/_mobs.txt
index cf8f1493d..026585e1e 100644
--- a/npc/004-2/_mobs.txt
+++ b/npc/004-2/_mobs.txt
@@ -1,3 +1,11 @@
 // This file is generated automatically. All manually added changes will be removed when running the Converter.
 // Map 004-2: Desert Mountains mobs
 004-2,56,20,3,3	monster	Fallen Guard	1082,2,35000,150000
+004-2,42,50,4,4	monster	Maggot	1035,8,35000,150000
+004-2,69,74,4,4	monster	Maggot	1035,8,35000,150000
+004-2,100,53,4,4	monster	Maggot	1035,6,35000,150000
+004-2,52,63,4,4	monster	Scorpion	1071,8,35000,150000
+004-2,47,38,4,4	monster	Scorpion	1071,8,35000,150000
+004-2,55,66,4,4	monster	Black Scorpion	1071,2,35000,150000
+004-2,108,97,4,4	monster	Snake	1122,5,35000,150000
+004-2,77,51,4,4	monster	Snake	1122,2,35000,150000
diff --git a/npc/004-2/_warps.txt b/npc/004-2/_warps.txt
index fb7cc0979..b160a25b8 100644
--- a/npc/004-2/_warps.txt
+++ b/npc/004-2/_warps.txt
@@ -1,5 +1,7 @@
 // This file is generated automatically. All manually added changes will be removed when running the Converter.
 // Map 004-2: Desert Mountains warps
 004-2,20,48,0	warp	#004-2_20_48	0,2,004-1,119,95
-004-2,84,77,0	warp	#004-2_84_77	0,0,004-2-1,25,46
-004-2,112,63,0	warp	#004-2_112_63	0,0,004-2-1,51,27
+004-2,84,77,0	warp	#004-2_84_77	0,0,004-2-1,26,87
+004-2,100,89,0	warp	#004-2_100_89	0,0,004-2-1,78,72
+004-2,116,34,0	warp	#004-2_116_34	0,0,004-2-1,51,27
+004-2,98,34,0	warp	#004-2_98_34	0,0,010-1-1,142,119
diff --git a/npc/009-1/_warps.txt b/npc/009-1/_warps.txt
index 5bdfe938c..975964cd1 100644
--- a/npc/009-1/_warps.txt
+++ b/npc/009-1/_warps.txt
@@ -1,4 +1,4 @@
 // This file is generated automatically. All manually added changes will be removed when running the Converter.
 // Map 009-1: Halinarzo warps
 009-1,56,107,0	warp	#009-1_56_107	2,0,010-2,171,20
-009-1,119,40,0	warp	#009-1_119_40	0,0,011,177,177
+009-1,119,40,0	warp	#009-1_119_40	0,0,11,177,177
diff --git a/npc/010-1-1/_mobs.txt b/npc/010-1-1/_mobs.txt
index 94925b3b7..fe14a7159 100644
--- a/npc/010-1-1/_mobs.txt
+++ b/npc/010-1-1/_mobs.txt
@@ -2,4 +2,10 @@
 // Map 010-1-1: magic school cave mobs
 010-1-1,55,58,29,22	monster	Cave Snake	1035,8,35000,150000
 010-1-1,70,40,3,1	monster	Small Topaz Bif	1101,1,35000,150000
-010-1-1,54,54,54,54	monster	Cave Maggot	1027,20,40000,200000
+010-1-1,54,54,54,54	monster	Cave Maggot	1027,50,40000,200000
+010-1-1,24,34,4,4	monster	Black Scorpion	1071,2,35000,150000
+010-1-1,112,34,4,4	monster	Black Scorpion	1071,2,35000,150000
+010-1-1,147,83,29,22	monster	Black Scorpion	1074,25,35000,150000
+010-1-1,124,43,29,22	monster	Bat	1039,3,35000,150000
+010-1-1,135,63,54,54	monster	Snake	1122,40,40000,200000
+010-1-1,92,90,54,48	monster	Small Topaz Bif	1101,6,40000,200000
diff --git a/npc/010-1-1/_warps.txt b/npc/010-1-1/_warps.txt
index 070208372..8b6d6e8f6 100644
--- a/npc/010-1-1/_warps.txt
+++ b/npc/010-1-1/_warps.txt
@@ -1,20 +1,20 @@
 // This file is generated automatically. All manually added changes will be removed when running the Converter.
 // Map 010-1-1: magic school cave warps
-010-1-1,78,73,0	warp	#010-1-1_78_73	0,0,004-2,131,111
-010-1-1,31,115,0	warp	#010-1-1_31_115	0,0,010-1,59,192
-010-1-1,27,71,0	warp	#010-1-1_27_71	0,0,004-2,84,78
-010-1-1,30,39,0	warp	#010-1-1_30_39	0,0,004-2,112,64
-010-1-1,41,37,0	warp	#010-1-1_41_37	0,0,004-2,112,64
-010-1-1,34,30,0	warp	#010-1-1_34_30	0,0,004-2,112,64
-010-1-1,32,24,0	warp	#010-1-1_32_24	0,0,004-2,112,64
-010-1-1,43,18,0	warp	#010-1-1_43_18	0,0,004-2,112,64
-010-1-1,47,83,0	warp	#010-1-1_47_83	0,0,004-2,112,64
-010-1-1,85,98,0	warp	#010-1-1_85_98	0,0,010-1,59,192
-010-1-1,163,105,0	warp	#010-1-1_163_105	0,0,010-1,59,192
-010-1-1,142,120,0	warp	#010-1-1_142_120	0,0,010-1,59,192
-010-1-1,170,49,0	warp	#010-1-1_170_49	0,0,010-1,59,192
-010-1-1,178,85,0	warp	#010-1-1_178_85	0,0,010-1,59,192
-010-1-1,112,44,0	warp	#010-1-1_112_44	0,0,010-1,59,192
-010-1-1,119,36,0	warp	#010-1-1_119_36	0,0,010-1,59,192
-010-1-1,112,42,0	warp	#010-1-1_112_42	0,0,010-1,59,192
+010-1-1,78,73,0	warp	#010-1-1_78_73	0,0,010-1,76,67
+010-1-1,31,115,0	warp	#010-1-1_31_115	0,0,010-1,81,89
+010-1-1,27,71,0	warp	#010-1-1_27_71	0,0,010-1,52,51
+010-1-1,30,39,0	warp	#010-1-1_30_39	0,0,010-1,53,91
+010-1-1,41,37,0	warp	#010-1-1_41_37	0,0,010-2,88,114
+010-1-1,34,30,0	warp	#010-1-1_34_30	0,0,010-1,45,71
+010-1-1,32,24,0	warp	#010-1-1_32_24	0,0,010-2,36,104
+010-1-1,43,18,0	warp	#010-1-1_43_18	0,0,010-1,6,33
+010-1-1,47,83,0	warp	#010-1-1_47_83	0,0,010-2,162,69
+010-1-1,85,98,0	warp	#010-1-1_85_98	0,0,010-1,96,31
+010-1-1,163,105,0	warp	#010-1-1_163_105	0,0,010-1,110,82
+010-1-1,142,120,0	warp	#010-1-1_142_120	0,0,004-2,98,35
+010-1-1,170,49,0	warp	#010-1-1_170_49	0,0,010-2,108,128
+010-1-1,178,85,0	warp	#010-1-1_178_85	0,0,010-1,87,37
+010-1-1,112,44,0	warp	#010-1-1_112_44	0,0,010-2,114,104
+010-1-1,119,36,0	warp	#010-1-1_119_36	0,0,010-2,123,100
+010-1-1,112,42,0	warp	#010-1-1_112_42	0,0,010-1,105,28
 010-1-1,168,23,0	warp	#010-1-1_168_23	0,0,010-1,59,192
diff --git a/npc/010-1/_import.txt b/npc/010-1/_import.txt
index 3248587b8..3d09583f9 100644
--- a/npc/010-1/_import.txt
+++ b/npc/010-1/_import.txt
@@ -1,3 +1,4 @@
 // Map 010-1: Desert Mountains
 // This file is generated automatically. All manually added changes will be removed when running the Converter.
+"npc/010-1/_mobs.txt",
 "npc/010-1/_warps.txt",
diff --git a/npc/010-1/_mobs.txt b/npc/010-1/_mobs.txt
new file mode 100644
index 000000000..74b9b356c
--- /dev/null
+++ b/npc/010-1/_mobs.txt
@@ -0,0 +1,18 @@
+// This file is generated automatically. All manually added changes will be removed when running the Converter.
+// Map 010-1: Desert Mountains mobs
+010-1,101,87,4,4	monster	Maggot	1035,6,35000,150000
+010-1,65,95,4,4	monster	Scorpion	1071,8,35000,150000
+010-1,48,80,4,4	monster	Scorpion	1071,6,35000,150000
+010-1,68,46,4,4	monster	Snake	1122,6,35000,150000
+010-1,88,74,3,8	monster	Mountain Snake	1123,8,35000,300000
+010-1,103,27,3,8	monster	Mountain Snake	1123,3,35000,300000
+010-1,120,30,3,2	monster	Desert Bandit	1124,1,35000,300000
+010-1,115,45,3,2	monster	Desert Bandit	1124,2,35000,300000
+010-1,53,85,3,2	monster	Desert Bandit	1124,2,35000,300000
+010-1,93,77,6,5	monster	Sarracenus	1125,2,35000,300000
+010-1,78,95,6,5	monster	Sarracenus	1125,1,35000,300000
+010-1,75,43,6,5	monster	Sarracenus	1125,1,35000,300000
+010-1,100,67,8,2	monster	Snake	1122,12,35000,300000
+010-1,59,93,8,2	monster	Snake	1122,2,35000,300000
+010-1,65,43,8,2	monster	Snake	1122,2,35000,300000
+010-1,110,34,8,2	monster	Desert Maggot	1083,10,35000,300000
diff --git a/npc/010-1/_warps.txt b/npc/010-1/_warps.txt
index 0fe61f26b..894e9d86d 100644
--- a/npc/010-1/_warps.txt
+++ b/npc/010-1/_warps.txt
@@ -2,29 +2,29 @@
 // Map 010-1: Desert Mountains warps
 010-1,92,17,0	warp	#010-1_92_17	0,0,004-1,33,110
 010-1,89,27,0	warp	#010-1_89_27	0,0,004-1,33,110
-010-1,96,30,0	warp	#010-1_96_30	0,0,004-1,33,110
-010-1,87,36,0	warp	#010-1_87_36	0,0,004-1,33,110
-010-1,62,54,0	warp	#010-1_62_54	0,0,004-1,33,110
-010-1,52,50,0	warp	#010-1_52_50	0,0,004-1,33,110
+010-1,96,30,0	warp	#010-1_96_30	0,0,010-1-1,85,99
+010-1,87,36,0	warp	#010-1_87_36	0,0,004-2-1,178,84
+010-1,62,54,0	warp	#010-1_62_54	0,0,010-1-1,43,19
+010-1,52,50,0	warp	#010-1_52_50	0,0,010-1-1,27,70
 010-1,47,48,0	warp	#010-1_47_48	0,0,004-1,33,110
 010-1,50,63,0	warp	#010-1_50_63	0,0,004-1,33,110
-010-1,45,70,0	warp	#010-1_45_70	0,0,004-1,33,110
+010-1,45,70,0	warp	#010-1_45_70	0,0,010-1-1,34,31
 010-1,59,76,0	warp	#010-1_59_76	0,0,004-1,33,110
-010-1,53,90,0	warp	#010-1_53_90	0,0,004-1,33,110
-010-1,81,88,0	warp	#010-1_81_88	0,0,004-1,33,110
+010-1,53,90,0	warp	#010-1_53_90	0,0,010-1-1,30,38
+010-1,81,88,0	warp	#010-1_81_88	0,0,010-1-1,31,114
 010-1,78,80,0	warp	#010-1_78_80	0,0,004-1,33,110
 010-1,65,73,0	warp	#010-1_65_73	0,0,004-1,33,110
 010-1,122,89,0	warp	#010-1_122_89	0,0,004-1,33,110
-010-1,110,81,0	warp	#010-1_110_81	0,0,004-1,33,110
-010-1,93,66,0	warp	#010-1_93_66	0,0,004-1,33,110
-010-1,76,66,0	warp	#010-1_76_66	0,0,004-1,33,110
+010-1,110,81,0	warp	#010-1_110_81	0,0,010-1-1,163,106
+010-1,93,66,0	warp	#010-1_93_66	0,0,004-2-1,25,46
+010-1,76,66,0	warp	#010-1_76_66	0,0,010-1-1,77,73
 010-1,68,60,0	warp	#010-1_68_60	0,0,004-1,33,110
 010-1,75,52,0	warp	#010-1_75_52	0,0,004-1,33,110
 010-1,126,60,0	warp	#010-1_126_60	0,0,004-1,33,110
 010-1,88,48,0	warp	#010-1_88_48	0,0,004-1,33,110
 010-1,92,45,0	warp	#010-1_92_45	0,0,004-1,33,110
 010-1,108,38,0	warp	#010-1_108_38	0,0,004-1,33,110
-010-1,124,24,0	warp	#010-1_124_24	0,0,004-1,33,110
-010-1,105,27,0	warp	#010-1_105_27	0,0,004-1,33,110
-010-1,42,32,0	warp	#010-1_42_32	0,0,004-1,33,110
+010-1,124,24,0	warp	#010-1_124_24	0,0,010-2,95,125
+010-1,105,27,0	warp	#010-1_105_27	0,0,010-1-1,112,41
+010-1,42,32,0	warp	#010-1_42_32	0,0,010-1-1,43,19
 010-1,46,26,0	warp	#010-1_46_26	0,0,004-1,33,110
diff --git a/npc/010-2/_mobs.txt b/npc/010-2/_mobs.txt
index f668cabb5..a5442d996 100644
--- a/npc/010-2/_mobs.txt
+++ b/npc/010-2/_mobs.txt
@@ -1,5 +1,7 @@
 // This file is generated automatically. All manually added changes will be removed when running the Converter.
 // Map 010-2: Desert Mountains mobs
+010-2,168,27,4,4	monster	Maggot	1035,10,35000,150000
+010-2,154,46,4,4	monster	Maggot	1035,8,35000,150000
 010-2,122,102,8,2	monster	Snake	1122,2,35000,300000
 010-2,163,77,3,8	monster	Mountain Snake	1123,8,35000,300000
 010-2,98,122,3,2	monster	Desert Bandit	1124,1,35000,300000
@@ -8,3 +10,10 @@
 010-2,141,102,6,5	monster	Desert Bandit	1124,3,35000,300000
 010-2,158,57,6,5	monster	Desert Bandit	1124,3,35000,300000
 010-2,149,95,6,5	monster	Sarracenus	1125,2,35000,300000
+010-2,149,83,3,8	monster	Mountain Snake	1123,6,35000,300000
+010-2,49,107,3,8	monster	Mountain Snake	1123,7,35000,300000
+010-2,78,120,3,8	monster	Mountain Snake	1123,2,35000,300000
+010-2,178,88,3,8	monster	Mountain Snake	1123,3,35000,300000
+010-2,172,92,3,8	monster	Snake	1122,4,35000,300000
+010-2,154,57,29,22	monster	Desert Maggot	1083,25,35000,150000
+010-2,86,120,29,22	monster	Desert Maggot	1083,15,35000,150000
diff --git a/npc/010-2/_warps.txt b/npc/010-2/_warps.txt
index 0d5e0da5b..851a68630 100644
--- a/npc/010-2/_warps.txt
+++ b/npc/010-2/_warps.txt
@@ -1,25 +1,25 @@
 // This file is generated automatically. All manually added changes will be removed when running the Converter.
 // Map 010-2: Desert Mountains warps
-010-2,36,103,0	warp	#010-2_36_103	0,0,004-1,33,110
+010-2,36,103,0	warp	#010-2_36_103	0,0,010-1-1,32,25
 010-2,39,98,0	warp	#010-2_39_98	0,0,004-1,33,110
 010-2,59,81,0	warp	#010-2_59_81	0,0,004-1,33,110
 010-2,64,75,0	warp	#010-2_64_75	0,0,004-1,33,110
-010-2,94,125,0	warp	#010-2_94_125	0,0,004-1,33,110
-010-2,108,129,0	warp	#010-2_108_129	0,0,004-1,33,110
-010-2,88,113,0	warp	#010-2_88_113	0,0,004-1,33,110
+010-2,94,125,0	warp	#010-2_94_125	0,0,010-1,124,25
+010-2,108,129,0	warp	#010-2_108_129	0,0,004-2-1,170,50
+010-2,88,113,0	warp	#010-2_88_113	0,0,010-1-1,41,38
 010-2,127,122,0	warp	#010-2_127_122	0,0,004-1,33,110
 010-2,136,115,0	warp	#010-2_136_115	0,0,004-1,33,110
 010-2,133,114,0	warp	#010-2_133_114	0,0,004-1,33,110
-010-2,114,103,0	warp	#010-2_114_103	0,0,004-1,33,110
-010-2,123,99,0	warp	#010-2_123_99	0,0,004-1,33,110
-010-2,158,121,0	warp	#010-2_158_121	0,0,004-1,33,110
+010-2,114,103,0	warp	#010-2_114_103	0,0,010-1-1,112,45
+010-2,123,99,0	warp	#010-2_123_99	0,0,010-1-1,119,35
+010-2,158,121,0	warp	#010-2_158_121	0,0,010-1-1,31,114
 010-2,165,114,0	warp	#010-2_165_114	0,0,004-1,33,110
 010-2,144,111,0	warp	#010-2_144_111	0,0,004-1,33,110
 010-2,157,102,0	warp	#010-2_157_102	0,0,004-1,33,110
 010-2,192,110,0	warp	#010-2_192_110	0,0,004-1,33,110
 010-2,194,109,0	warp	#010-2_194_109	0,0,004-1,33,110
-010-2,162,68,0	warp	#010-2_162_68	0,0,004-1,33,110
-010-2,175,80,0	warp	#010-2_175_80	0,0,004-1,33,110
+010-2,162,68,0	warp	#010-2_162_68	0,0,010-1-1,47,84
+010-2,175,80,0	warp	#010-2_175_80	0,0,010-1-1,168,24
 010-2,187,66,0	warp	#010-2_187_66	0,0,004-1,33,110
 010-2,196,57,0	warp	#010-2_196_57	0,0,004-1,33,110
 010-2,253,95,0	warp	#010-2_253_95	0,0,004-1,33,110