Tonori Canyon.

3 files changed, 63 insertions, 46 deletions

diff --git a/npc/010-2/_mobs.txt b/npc/010-2/_mobs.txt
index 2efa74b58..866c45e34 100644
--- a/npc/010-2/_mobs.txt
+++ b/npc/010-2/_mobs.txt
@@ -1,19 +1,19 @@
 // This file is generated automatically. All manually added changes will be removed when running the Converter.
 // Map 010-2: Desert Mountains mobs
-010-2,122,102,8,2	monster	Snake	1122,2,35000,300000
-010-2,163,77,3,8	monster	Mountain Snake	1123,3,35000,300000
-010-2,98,122,3,2	monster	Desert Bandit	1124,1,35000,300000
-010-2,110,113,3,2	monster	Desert Bandit	1124,1,35000,300000
-010-2,126,110,3,2	monster	Desert Bandit	1124,2,35000,300000
-010-2,141,102,6,5	monster	Desert Bandit	1124,2,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,180,32,49,9	monster	Desert Maggot	1083,9,35000,150000
-010-2,159,61,9,19	monster	Desert Maggot	1083,8,35000,150000
-010-2,149,83,3,8	monster	Mountain Snake	1123,4,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,81,29,46	monster	Desert Maggot	1083,30,35000,150000
-010-2,86,120,29,22	monster	Desert Maggot	1083,16,35000,150000
+010-2,119,100,7,2	monster	Snake	1122,2,35000,300000
+010-2,161,76,3,9	monster	Mountain Snake	1123,7,35000,300000
+010-2,96,120,3,2	monster	Desert Bandit	1124,1,35000,300000
+010-2,107,111,3,2	monster	Desert Bandit	1124,1,35000,300000
+010-2,123,108,3,2	monster	Desert Bandit	1124,2,35000,300000
+010-2,139,100,6,5	monster	Desert Bandit	1124,3,35000,300000
+010-2,157,55,7,5	monster	Desert Bandit	1124,3,35000,300000
+010-2,148,93,7,5	monster	Sarracenus	1125,2,35000,300000
+010-2,175,30,46,9	monster	Desert Maggot	1083,12,35000,150000
+010-2,157,60,9,20	monster	Desert Maggot	1083,8,35000,150000
+010-2,147,82,3,9	monster	Mountain Snake	1123,6,35000,300000
+010-2,47,105,3,9	monster	Mountain Snake	1123,7,35000,300000
+010-2,76,118,3,8	monster	Mountain Snake	1123,2,35000,300000
+010-2,176,87,3,9	monster	Mountain Snake	1123,3,35000,300000
+010-2,169,91,3,9	monster	Snake	1122,4,35000,300000
+010-2,151,78,28,45	monster	Desert Maggot	1083,35,35000,150000
+010-2,85,113,30,17	monster	Desert Maggot	1083,20,35000,150000
diff --git a/npc/010-2/_warps.txt b/npc/010-2/_warps.txt
index f3ffe77e3..cdc322825 100644
--- a/npc/010-2/_warps.txt
+++ b/npc/010-2/_warps.txt
@@ -1,31 +1,47 @@
 // 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,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,108,129,0	warp	#010-2_108_129	0,0,010-1-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,010-1-1,176,49
-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,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,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
-010-2,252,91,0	warp	#010-2_252_91	0,0,004-1,33,110
-010-2,239,63,0	warp	#010-2_239_63	0,0,004-1,33,110
-010-2,212,70,0	warp	#010-2_212_70	0,0,004-1,33,110
-010-2,209,41,0	warp	#010-2_209_41	0,0,004-1,33,110
-010-2,243,41,0	warp	#010-2_243_41	0,0,004-1,33,110
-010-2,171,18,0	warp	#010-2_171_18	0,0,009-1,56,105
-010-2,97,124,0	warp	#010-2_97_124	8,0,004-2,71,70
+010-2,190,108,0	warp	#010-2_190_108	0,0,010-1-2,120,109
+010-2,149,119,0	warp	#010-2_149_119	0,0,010-1-2,94,96
+010-2,125,120,0	warp	#010-2_125_120	0,0,010-1-2,77,56
+010-2,112,101,0	warp	#010-2_112_101	0,0,010-1-2,64,46
+010-2,185,64,0	warp	#010-2_185_64	0,0,010-1-2,49,46
+010-2,194,55,0	warp	#010-2_194_55	0,0,010-1-9,60,32
+010-2,249,47,0	warp	#010-2_249_47	0,0,010-2-2,94,21
+010-2,210,68,0	warp	#010-2_210_68	0,0,010-2-2,64,49
+010-2,224,63,0	warp	#010-2_224_63	0,0,010-2-2,59,49
+010-2,223,81,0	warp	#010-2_223_81	0,0,010-2-2,70,57
+010-2,230,115,0	warp	#010-2_230_115	0,0,010-2-11,45,53
+010-2,175,111,0	warp	#010-2_175_111	0,0,010-2-3,55,47
+010-2,168,119,0	warp	#010-2_168_119	0,0,010-2-3,49,54
+010-2,232,45,0	warp	#010-2_232_45	0,0,010-2-2,80,28
+010-2,236,52,0	warp	#010-2_236_52	0,0,010-2-3,77,28
+010-2,204,95,0	warp	#010-2_204_95	0,0,010-2-3,78,28
+010-2,142,109,0	warp	#010-2_142_109	0,0,010-1-9,32,31
+010-2,160,66,0	warp	#010-2_160_66	0,0,010-1-2,87,23
+010-2,173,78,0	warp	#010-2_173_78	0,0,010-1-2,118,28
+010-2,192,107,0	warp	#010-2_192_107	0,0,010-2-13,33,36
+010-2,201,115,0	warp	#010-2_201_115	0,0,010-1-9,33,62
+010-2,218,118,0	warp	#010-2_218_118	0,0,010-1-9,33,59
+010-2,237,61,0	warp	#010-2_237_61	0,0,010-1-9,72,21
+010-2,106,127,0	warp	#010-2_106_127	0,0,010-1-2,62,69
+010-2,86,111,0	warp	#010-2_86_111	0,0,010-1-1,124,55
+010-2,241,39,0	warp	#010-2_241_39	0,0,010-2-16,105,44
+010-2,232,37,0	warp	#010-2_232_37	0,0,010-2-16,57,22
+010-2,219,38,0	warp	#010-2_219_38	0,0,010-2-16,37,21
+010-2,168,100,0	warp	#010-2_168_100	0,0,010-1-1,180,25
+010-2,131,112,0	warp	#010-2_131_112	0,0,010-1-1,183,52
+010-2,134,113,0	warp	#010-2_134_113	0,0,010-1-1,188,52
+010-2,121,97,0	warp	#010-2_121_97	0,0,010-1-1,181,26
+010-2,97,63,0	warp	#010-2_97_63	0,0,010-2-6,41,21
+010-2,62,73,0	warp	#010-2_62_73	0,0,010-2-5,47,21
+010-2,48,89,0	warp	#010-2_48_89	0,0,010-2-5,33,29
+010-2,37,96,0	warp	#010-2_37_96	0,0,010-1-1,47,33
+010-2,34,101,0	warp	#010-2_34_101	0,0,010-1-1,43,41
+010-2,57,79,0	warp	#010-2_57_79	0,0,004-1,33,110
+010-2,169,19,0	warp	#010-2_169_19	2,0,009-1,56,108
+010-2,155,100,0	warp	#010-2_155_100	0,0,004-1,33,110
+010-2,93,123,0	warp	#010-2_93_123	0,0,010-3,34,21
+010-2,40,78,0	warp	#010-2_40_78	0,0,010-1-1,54,41
+010-2,171,90,0	warp	#010-2_171_90	0,0,010-2-3,54,24
+010-2,181,98,0	warp	#010-2_181_98	0,0,010-2-2,33,81
+010-2,207,39,0	warp	#010-2_207_39	0,0,010-1-9,73,21
diff --git a/npc/010-2/sawis.txt b/npc/010-2/sawis.txt
index 3d9a028b3..dc3c9db21 100644
--- a/npc/010-2/sawis.txt
+++ b/npc/010-2/sawis.txt
@@ -128,6 +128,7 @@ OnInit:
 
     .sex = G_MALE;
     .distance = 5;
+    npcsit;
 
     end;
 }