Desert Canyon bugfixesr15.2_20220217

7 files changed, 4 insertions, 6 deletions

diff --git a/maps/re/010-1-6.mcache b/maps/re/010-1-6.mcache
index b65d99b4b..5bd9a2d52 100644
--- a/maps/re/010-1-6.mcache
+++ b/maps/re/010-1-6.mcache
diff --git a/npc/010-1-1/_mobs.txt b/npc/010-1-1/_mobs.txt
index 19c6ac513..e4b28e745 100644
--- a/npc/010-1-1/_mobs.txt
+++ b/npc/010-1-1/_mobs.txt
@@ -5,7 +5,7 @@
 010-1-1,83,118,4,3	monster	Desert Maggot	1083,2,35000,150000
 010-1-1,109,95,26,24	monster	Scorpion	1071,8,35000,150000
 010-1-1,135,88,20,20	monster	Bat	1039,7,35000,150000
-010-1-1,165,49,17,19	monster	Bat	1122,12,35000,150000
+010-1-1,165,49,17,19	monster	Snake	1122,12,35000,150000
 010-1-1,0,0,0,0	monster	Big Topaz Bif	1103,5,35000,150000
 010-1-1,109,38,78,14	monster	Small Topaz Bif	1101,3,35000,150000
 010-1-1,64,41,12,23	monster	Plushroom Field	1011,4,35000,150000
diff --git a/npc/010-1-1/_warps.txt b/npc/010-1-1/_warps.txt
index 90e1599d5..ceff0e076 100644
--- a/npc/010-1-1/_warps.txt
+++ b/npc/010-1-1/_warps.txt
@@ -11,7 +11,6 @@
 010-1-1,71,116,0	warp	#010-1-1_71_116	0,0,010-1,77,84
 010-1-1,43,42,0	warp	#010-1-1_43_42	0,0,010-2,34,102
 010-1-1,43,26,0	warp	#010-1-1_43_26	0,0,010-1,45,30
-010-1-1,56,20,0	warp	#010-1-1_56_20	0,0,010-2,61,58
 010-1-1,102,70,0	warp	#010-1-1_102_70	0,0,010-1,104,67
 010-1-1,166,87,0	warp	#010-1-1_166_87	0,0,010-1,124,63
 010-1-1,107,31,0	warp	#010-1-1_107_31	0,0,010-1,95,34
diff --git a/npc/010-1-6/_mobs.txt b/npc/010-1-6/_mobs.txt
index d5b789f3b..4a6055186 100644
--- a/npc/010-1-6/_mobs.txt
+++ b/npc/010-1-6/_mobs.txt
@@ -1,6 +1,6 @@
 // This file is generated automatically. All manually added changes will be removed when running the Converter.
 // Map 010-1-6: Canyon Cave mobs
-010-1-6,86,25,5,3	monster	Bat	1122,1,35000,150000
+010-1-6,86,25,5,3	monster	Snake	1122,1,35000,150000
 010-1-6,78,31,11,4	monster	Black Scorpion	1074,1,35000,150000
 010-1-6,0,0,0,0	monster	Cave Maggot	1027,50,35000,150000
 010-1-6,51,72,5,4	monster	Blub	1008,1,35000,150000
diff --git a/npc/010-2-7/_mobs.txt b/npc/010-2-7/_mobs.txt
index f6c43af57..9d98ffdd9 100644
--- a/npc/010-2-7/_mobs.txt
+++ b/npc/010-2-7/_mobs.txt
@@ -2,7 +2,7 @@
 // Map 010-2-7: Canyon Cave mobs
 010-2-7,41,26,11,3	monster	Mountain Snake	1123,3,35000,150000
 010-2-7,0,0,0,0	monster	Cave Maggot	1027,22,35000,150000
-010-2-7,41,32,11,4	monster	Bat	1122,3,35000,150000
+010-2-7,41,32,11,4	monster	Snake	1122,3,35000,150000
 010-2-7,47,38,9,7	monster	Cave Snake	1035,11,35000,150000
 010-2-7,37,33,7,2	monster	Black Scorpion	1074,2,35000,150000
 010-2-7,0,0,0,0	monster	Plushroom Field	1011,2,35000,150000
diff --git a/npc/010-2/_warps.txt b/npc/010-2/_warps.txt
index cdc322825..1b74f8363 100644
--- a/npc/010-2/_warps.txt
+++ b/npc/010-2/_warps.txt
@@ -20,7 +20,6 @@
 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
diff --git a/npc/010-4-2/_mobs.txt b/npc/010-4-2/_mobs.txt
index 2783db7d5..a42124bc6 100644
--- a/npc/010-4-2/_mobs.txt
+++ b/npc/010-4-2/_mobs.txt
@@ -1,4 +1,4 @@
 // This file is generated automatically. All manually added changes will be removed when running the Converter.
 // Map 010-4-2: Canyon Cave mobs
-010-4-2,0,0,0,0	monster	Topaz Bif	1097,30,35000,150000
+010-4-2,0,0,0,0	monster	Lava Slime	1097,30,35000,150000
 010-4-2,87,39,4,2	monster	Maggot	1030,2,35000,150000