Regenerate all maps

16 files changed, 54 insertions, 33 deletions

diff --git a/conf/map/maps.conf b/conf/map/maps.conf
index 1823bb78d..0a3343ec0 100644
--- a/conf/map/maps.conf
+++ b/conf/map/maps.conf
@@ -75,6 +75,7 @@ map_list: (
     "015-1",
     "015-2",
     "015-3",
+    "015-4",
     "016-1",
     "016-6",
     "016-7",
diff --git a/db/map_index.txt b/db/map_index.txt
index 0378d0349..3b0c82111 100644
--- a/db/map_index.txt
+++ b/db/map_index.txt
@@ -72,30 +72,31 @@
 015-1 72
 015-2 73
 015-3 74
-016-1 75
-016-6 76
-016-7 77
-017-1 78
-017-2-1 79
-017-2 80
-017-3 81
-017-4 82
-017-5 83
-017-6 84
-018-1-1 85
-018-1 86
-018-2-1 87
-018-2 88
-018-3-1 89
-018-3 90
-018-4-1 91
-018-4-2 92
-018-4 93
-018-5 94
-boss 95
-botcheck 96
-sec_pri 97
-soren-2 98
-soren 99
-test 100
-testbg 101
+015-4 75
+016-1 76
+016-6 77
+016-7 78
+017-1 79
+017-2-1 80
+017-2 81
+017-3 82
+017-4 83
+017-5 84
+017-6 85
+018-1-1 86
+018-1 87
+018-2-1 88
+018-2 89
+018-3-1 90
+018-3 91
+018-4-1 92
+018-4-2 93
+018-4 94
+018-5 95
+boss 96
+botcheck 97
+sec_pri 98
+soren-2 99
+soren 100
+test 101
+testbg 102
diff --git a/maps/re/003-4-1.mcache b/maps/re/003-4-1.mcache
index 6371a4cb4..06d3b0992 100644
--- a/maps/re/003-4-1.mcache
+++ b/maps/re/003-4-1.mcache
diff --git a/maps/re/012-1.mcache b/maps/re/012-1.mcache
index c3c0c0cf4..50548c9e2 100644
--- a/maps/re/012-1.mcache
+++ b/maps/re/012-1.mcache
diff --git a/maps/re/014-2.mcache b/maps/re/014-2.mcache
index 3226e0c5a..50320ebdc 100644
--- a/maps/re/014-2.mcache
+++ b/maps/re/014-2.mcache
diff --git a/maps/re/015-1.mcache b/maps/re/015-1.mcache
index 3bc52f01f..d91538e13 100644
--- a/maps/re/015-1.mcache
+++ b/maps/re/015-1.mcache
diff --git a/maps/re/015-4.mcache b/maps/re/015-4.mcache
new file mode 100644
index 000000000..17871a367
--- /dev/null
+++ b/maps/re/015-4.mcache
diff --git a/npc/007-1/_mobs.txt b/npc/007-1/_mobs.txt
index b16c3b4fa..ecb75cd5c 100644
--- a/npc/007-1/_mobs.txt
+++ b/npc/007-1/_mobs.txt
@@ -9,3 +9,4 @@
 007-1,39,125,7,6	monster	Cave Maggot	1027,4,35000,300000,Tycoon::OnKillCaveMaggot
 007-1,89,72,75,57	monster	Cave Bat	1039,6,35000,300000
 007-1,104,99,99,99	monster	Ruby Bif	1099,8,35000,300000
+007-1,117,94,10,7	monster	Black Scorpion	1074,1,35000,300000,Tycoon::OnKillBlackScorpion
diff --git a/npc/015-1/_mobs.txt b/npc/015-1/_mobs.txt
index f0d8507e2..358a78c2d 100644
--- a/npc/015-1/_mobs.txt
+++ b/npc/015-1/_mobs.txt
@@ -1,11 +1,11 @@
 // This file is generated automatically. All manually added changes will be removed when running the Converter.
 // Map 015-1: Woodland Mines mobs
-015-1,79,83,119,97	monster	Silk Worm	1034,20,30000,30000
 015-1,121,105,119,97	monster	Bif	1058,12,45000,45000
-015-1,73,111,119,97	monster	Red Slime	1092,60,30000,30000
+015-1,73,111,119,97	monster	Red Slime	1092,75,30000,30000
 015-1,130,81,119,97	monster	Cave Bat	1039,40,60000,60000
 015-1,147,91,119,97	monster	Yellow Slime	1091,50,30000,40000
-015-1,62,122,119,97	monster	Black Scorpion	1074,18,30000,30000
-015-1,120,136,91,81	monster	Small Amethyst Bif	1110,6,45000,45000
-015-1,80,175,142,39	monster	Copper Slime	1088,4,45000,45000
+015-1,62,122,119,97	monster	Black Scorpion	1074,28,30000,30000
+015-1,120,136,91,81	monster	Small Amethyst Bif	1110,5,45000,45000
+015-1,80,175,142,39	monster	Copper Slime	1088,5,45000,45000
 015-1,88,36,142,39	monster	Copper Slime	1088,3,45000,50000
+015-1,99,73,3,3	monster	Fire Skull	1193,1,45000,60000
diff --git a/npc/015-1/_warps.txt b/npc/015-1/_warps.txt
index ca874567c..fef1a8b5a 100644
--- a/npc/015-1/_warps.txt
+++ b/npc/015-1/_warps.txt
@@ -1,3 +1,5 @@
 // This file is generated automatically. All manually added changes will be removed when running the Converter.
 // Map 015-1: Woodland Mines warps
 015-1,100,133,0	warp	#015-1_100_133	1,0,014-1,79,58
+015-1,90,49,0	warp	#015-1_90_49	0,0,015-4,50,38
+015-1,177,56,0	warp	#015-1_177_56	0,0,015-4,76,19
diff --git a/npc/015-4/_import.txt b/npc/015-4/_import.txt
new file mode 100644
index 000000000..167d402da
--- /dev/null
+++ b/npc/015-4/_import.txt
@@ -0,0 +1,4 @@
+// Map 015-4: Woodland Mines
+// This file is generated automatically. All manually added changes will be removed when running the Converter.
+"npc/015-4/_mobs.txt",
+"npc/015-4/_warps.txt",
diff --git a/npc/015-4/_mobs.txt b/npc/015-4/_mobs.txt
new file mode 100644
index 000000000..7bd3f0cdc
--- /dev/null
+++ b/npc/015-4/_mobs.txt
@@ -0,0 +1,6 @@
+// This file is generated automatically. All manually added changes will be removed when running the Converter.
+// Map 015-4: Woodland Mines mobs
+015-4,49,25,35,12	monster	Angry Bat	1194,15,60000,60000
+015-4,56,36,35,12	monster	Silk worm	1034,15,60000,70000
+015-4,72,23,15,15	monster	Red Slime	1092,4,60000,60000
+015-4,54,21,29,14	monster	Ruby Bif	1099,1,90000,90000
diff --git a/npc/015-4/_warps.txt b/npc/015-4/_warps.txt
new file mode 100644
index 000000000..40f118d93
--- /dev/null
+++ b/npc/015-4/_warps.txt
@@ -0,0 +1,4 @@
+// This file is generated automatically. All manually added changes will be removed when running the Converter.
+// Map 015-4: Woodland Mines warps
+015-4,50,39,0	warp	#015-4_50_39	0,0,015-1,90,50
+015-4,76,18,0	warp	#015-4_76_18	0,0,015-1,177,55
diff --git a/npc/016-1/_import.txt b/npc/016-1/_import.txt
index 77d5078e5..1a7b25d8d 100644
--- a/npc/016-1/_import.txt
+++ b/npc/016-1/_import.txt
@@ -3,4 +3,4 @@
 "npc/016-1/_mobs.txt",
 "npc/016-1/captain.txt",
 "npc/016-1/doors.txt",
-"npc/016-1/laranja.txt",
\ No newline at end of file
+"npc/016-1/laranja.txt",
diff --git a/npc/018-2-1/_import.txt b/npc/018-2-1/_import.txt
index 13f8970a0..1a73f6019 100644
--- a/npc/018-2-1/_import.txt
+++ b/npc/018-2-1/_import.txt
@@ -1,3 +1,4 @@
 // Map 018-2-1: Heroes' Hold - Castle
 // This file is generated automatically. All manually added changes will be removed when running the Converter.
 "npc/018-2-1/_warps.txt",
+"npc/018-2-1/dustman.txt",
diff --git a/npc/_import.txt b/npc/_import.txt
index a9e60f81d..4d3686ea8 100644
--- a/npc/_import.txt
+++ b/npc/_import.txt
@@ -74,6 +74,7 @@
 @include "npc/015-1/_import.txt"
 @include "npc/015-2/_import.txt"
 @include "npc/015-3/_import.txt"
+@include "npc/015-4/_import.txt"
 @include "npc/016-1/_import.txt"
 @include "npc/016-6/_import.txt"
 @include "npc/016-7/_import.txt"