Update maps

12 files changed, 16 insertions, 7 deletions

diff --git a/db/re/mob_db.conf b/db/re/mob_db.conf
index 7002e9388..efc130112 100644
--- a/db/re/mob_db.conf
+++ b/db/re/mob_db.conf
@@ -6533,7 +6533,6 @@ mob_db: (
     DamageMotion: 280
     MvpExp: 0
     Drops: {
-        Coal: 500
         Coal: 300
         Coal: 200
         Coal: 100
diff --git a/maps/re/009-2.mcache b/maps/re/009-2.mcache
index 74a8cfad1..3b5f0bb38 100644
--- a/maps/re/009-2.mcache
+++ b/maps/re/009-2.mcache
diff --git a/maps/re/009-3.mcache b/maps/re/009-3.mcache
index 79560bc91..0e6c88af9 100644
--- a/maps/re/009-3.mcache
+++ b/maps/re/009-3.mcache
diff --git a/maps/re/015-3.mcache b/maps/re/015-3.mcache
index b44395f7a..cff9c2699 100644
--- a/maps/re/015-3.mcache
+++ b/maps/re/015-3.mcache
diff --git a/maps/re/017-2-1.mcache b/maps/re/017-2-1.mcache
index 00714ca5b..17216061a 100644
--- a/maps/re/017-2-1.mcache
+++ b/maps/re/017-2-1.mcache
diff --git a/maps/re/018-3.mcache b/maps/re/018-3.mcache
index d17edc645..e69d4aa31 100644
--- a/maps/re/018-3.mcache
+++ b/maps/re/018-3.mcache
diff --git a/npc/015-3/_mobs.txt b/npc/015-3/_mobs.txt
index d3ef0a6a8..a0617f7f9 100644
--- a/npc/015-3/_mobs.txt
+++ b/npc/015-3/_mobs.txt
@@ -1,5 +1,5 @@
 // This file is generated automatically. All manually added changes will be removed when running the Converter.
 // Map 015-3: Butterfly Caves mobs
-015-3,160,179,19,18	monster	Bat	1039,35,30000,40000
+015-3,160,179,19,18	monster	Cave Bat	1039,28,30000,40000
 015-3,142,31,24,14	monster	Green Slime	1085,5,30000,40000
 015-3,102,105,81,87	monster	Small Emerald Bif	1104,6,45000,45000
diff --git a/npc/017-2-1/_warps.txt b/npc/017-2-1/_warps.txt
index 7c0035a5d..5bf0499a7 100644
--- a/npc/017-2-1/_warps.txt
+++ b/npc/017-2-1/_warps.txt
@@ -1,3 +1,4 @@
 // This file is generated automatically. All manually added changes will be removed when running the Converter.
 // Map 017-2-1: Jack's Basement warps
 017-2-1,121,115,0	warp	#017-2-1_121_115	0,0,017-2,21,29
+017-2-1,27,127,0	warp	#017-2-1_27_127	0,0,018-3,114,24
diff --git a/npc/018-1-1/_mobs.txt b/npc/018-1-1/_mobs.txt
index 35c00a8fb..72037f94f 100644
--- a/npc/018-1-1/_mobs.txt
+++ b/npc/018-1-1/_mobs.txt
@@ -1,6 +1,10 @@
 // This file is generated automatically. All manually added changes will be removed when running the Converter.
 // Map 018-1-1: Sincerity Island Cave mobs
-018-1-1,51,49,11,7	monster	Silkworm	1034,10,30000,3000
+018-1-1,53,51,14,12	monster	Silkworm	1034,10,30000,3000
 018-1-1,43,35,0,0	monster	Evil Mushroom	1042,3,40000,5000
 018-1-1,27,31,0,0	monster	Evil Mushroom	1042,3,40000,5000
 018-1-1,50,49,30,30	monster	Bat	1039,10,60000,10000
+018-1-1,65,52,12,24	monster	Chocolate Slime	1180,6,30000,60000
+018-1-1,49,65,27,10	monster	Wicked Mushroom	1176,4,30000,3000
+018-1-1,35,39,13,17	monster	Lavern	1175,6,30000,3000
+018-1-1,71,33,0,0	monster	Evil Mushroom	1042,3,40000,5000
diff --git a/npc/018-3/_mobs.txt b/npc/018-3/_mobs.txt
index 8915592de..ad5608b30 100644
--- a/npc/018-3/_mobs.txt
+++ b/npc/018-3/_mobs.txt
@@ -2,10 +2,10 @@
 // Map 018-3: Somber Cave mobs
 018-3,81,91,1,1	monster	Dark Lizard	1051,2,0,20000
 018-3,37,61,1,1	monster	Dark Lizard	1051,2,0,20000
-018-3,45,114,1,1	monster	Dark Lizard	1051,2,0,20000
+018-3,45,114,1,1	monster	Troll	1171,2,10000,60000
 018-3,0,0,0,0	monster	Lava Slime	1097,8,10000,0
 018-3,0,0,0,0	monster	Fire Goblin	1067,30,20,0
-018-3,75,53,1,1	monster	Black Scorpion	1074,1,0,10000
+018-3,75,53,1,1	monster	Black Slime	1178,1,10000,20000
 018-3,115,116,2,2	monster	Black Scorpion	1074,1,0,10000
 018-3,0,0,0,0	monster	Evil Mushroom	1042,10,20,0
 018-3,39,57,21,38	monster	Lava Slime	1097,12,10000,0
@@ -13,4 +13,6 @@
 018-3,88,84,26,10	monster	Lava Slime	1097,5,10000,0
 018-3,123,100,7,26	monster	Lava Slime	1097,4,10000,0
 018-3,66,111,48,15	monster	Lava Slime	1097,11,10000,0
-018-3,74,72,56,53	monster	Night Scorpion	1077,9,15000,0
+018-3,74,72,56,53	monster	Black Mamba	1174,9,20000,0
+018-3,56,114,1,1	monster	Black Scorpion	1074,1,0,10000
+018-3,41,76,1,1	monster	Electro Worm	1173,1,0,30000
diff --git a/npc/018-4-1/_mobs.txt b/npc/018-4-1/_mobs.txt
index 4d37288f2..d50c5063c 100644
--- a/npc/018-4-1/_mobs.txt
+++ b/npc/018-4-1/_mobs.txt
@@ -5,3 +5,5 @@
 018-4-1,95,66,66,35	monster	Cave Snake	1035,15,9000,3000
 018-4-1,95,84,66,18	monster	Golden Scorpion	1078,7,10000,5000
 018-4-1,102,48,40,17	monster	Giant Mutated Bat	1044,2,100000,50000
+018-4-1,142,64,27,44	monster	Black Mamba	1174,2,100000,50000
+018-4-1,51,64,27,44	monster	Troll	1171,1,90000,90000
diff --git a/npc/018-4/_mobs.txt b/npc/018-4/_mobs.txt
index 101c5bba8..59b67f34a 100644
--- a/npc/018-4/_mobs.txt
+++ b/npc/018-4/_mobs.txt
@@ -2,8 +2,9 @@
 // Map 018-4: Secret Island mobs
 018-4,120,68,46,21	monster	Golden Scorpion	1078,7,10000,5000
 018-4,98,47,46,32	monster	Night Scorpion	1077,5,20000,10000
-018-4,98,47,46,32	monster	BlackSlime	1002,10,15000,10000
+018-4,98,47,46,32	monster	Black Slime	1178,10,15000,10000
 018-4,91,60,76,47	monster	Red Slime	1092,12,12000,4000
 018-4,91,60,76,47	monster	Yellow Slime	1091,15,30000,30000
 018-4,91,56,76,43	monster	Clover Patch	1028,2,75000,35000
 018-4,91,60,76,47	monster	Mouboo	1023,3,12000,4000
+018-4,98,66,40,12	monster	Fafi Dragon	1179,1,35000,50000