Merge branch 'caves' into 'master'

make maps for caves

See merge request evol/serverdata!236

61 files changed, 350 insertions, 21 deletions

diff --git a/conf/map/maps.conf b/conf/map/maps.conf
index bbc85cfc..eed6eea0 100644
--- a/conf/map/maps.conf
+++ b/conf/map/maps.conf
@@ -96,6 +96,10 @@ map_list: (
     "008-3-0",
     "008-3-1",
     "008-3-2",
+    "008-3-3",
+    "008-3-4",
+    "008-3-5",
+    "008-3-6",
     "012-1",
     "012-2-1",
     "012-2-2",
@@ -104,6 +108,9 @@ map_list: (
     "012-2-5",
     "012-2-6",
     "012-2-7",
+    "012-3-1",
+    "012-3-2",
+    "012-3-3",
     "sec_pri",
     "test",
     "testbg",
diff --git a/db/constants.conf b/db/constants.conf
index 6cce7c25..19a812e8 100644
--- a/db/constants.conf
+++ b/db/constants.conf
@@ -4061,6 +4061,7 @@ constants_db: {
     NPC_AAHNA:              206
     NPC_HASAN:              207
     NPC_CRASMANDE:          208
+    NPC_MANATREE:           210
 
     NPC_CONFUSED_TREE:      400
     NPC_ALIGE:              401
diff --git a/db/map_index.txt b/db/map_index.txt
index 7caaca84..59a69dbf 100644
--- a/db/map_index.txt
+++ b/db/map_index.txt
@@ -93,14 +93,21 @@
 008-3-0 93
 008-3-1 94
 008-3-2 95
-012-1 96
-012-2-1 97
-012-2-2 98
-012-2-3 99
-012-2-4 100
-012-2-5 101
-012-2-6 102
-012-2-7 103
-sec_pri 104
-test 105
-testbg 106
+008-3-3 96
+008-3-4 97
+008-3-5 98
+008-3-6 99
+012-1 100
+012-2-1 101
+012-2-2 102
+012-2-3 103
+012-2-4 104
+012-2-5 105
+012-2-6 106
+012-2-7 107
+012-3-1 108
+012-3-2 109
+012-3-3 110
+sec_pri 111
+test 112
+testbg 113
diff --git a/db/re/mob_db.conf b/db/re/mob_db.conf
index c22d6e90..220ff6c1 100644
--- a/db/re/mob_db.conf
+++ b/db/re/mob_db.conf
@@ -3057,6 +3057,128 @@ mob_db: (
     }
 },
 {
+    Id: 1073
+    SpriteName: "YellowSlime"
+    Name: "Yellow Slime"
+    Lv: 10
+    Hp: 1050
+    Sp: 0
+    Exp: 15
+    JExp: 0
+    AttackRange: 1
+    Attack: [90, 100]
+    Def: 19
+    Mdef: 3
+    Stats: {
+        Str: 5
+        Agi: 15
+        Vit: 20
+        Int: 1
+        Dex: 35
+        Luk: 10
+    }
+    ViewRange: 8
+    ChaseRange: 8
+    Size: 0
+    Race: 2
+    Element: (1, 1)
+    Mode: {
+        CanMove: true
+        CanAttack: false
+        Looter: true
+    }
+    MoveSpeed: 330
+    AttackDelay: 2462
+    AttackMotion: 864
+    DamageMotion: 1026
+    Drops: {
+        MaggotSlime: 800
+        Moss: 400
+        TopazShard: 200
+        GoldNuggets: 10
+    }
+},
+{
+    Id: 1074
+    SpriteName: "RedSlime"
+    Name: "Red Slime"
+    Lv: 15
+    Hp: 1650
+    Sp: 0
+    Exp: 15
+    JExp: 0
+    AttackRange: 1
+    Attack: [90, 100]
+    Def: 19
+    Mdef: 3
+    Stats: {
+        Str: 15
+        Agi: 15
+        Vit: 30
+        Int: 1
+        Dex: 35
+        Luk: 10
+    }
+    ViewRange: 8
+    ChaseRange: 8
+    Size: 0
+    Race: 2
+    Element: (1, 1)
+    Mode: {
+        CanMove: true
+        CanAttack: false
+    }
+    MoveSpeed: 320
+    AttackDelay: 2262
+    AttackMotion: 764
+    DamageMotion: 826
+    Drops: {
+        MaggotSlime: 800
+        Moss: 400
+        RubyShard: 200
+        CoinBag: 10
+    }
+},
+{
+    Id: 1075
+    SpriteName: "Snake"
+    Name: "Snake"
+    Lv: 25
+    Hp: 2640
+    Sp: 0
+    Exp: 45
+    JExp: 5
+    AttackRange: 1
+    Attack: [150, 225]
+    Def: 55
+    Mdef: 10
+    Stats: {
+        Str: 25
+        Agi: 35
+        Vit: 25
+        Int: 5
+        Dex: 50
+        Luk: 20
+    }
+    ViewRange: 1
+    ChaseRange: 15
+    Size: 0
+    Race: 2
+    Element: (1, 1)
+    Mode: {
+        CanMove: true
+        CanAttack: true
+        CastSensorChase: true
+        ChangeChase: true
+    }
+    MoveSpeed: 260
+    AttackDelay: 1000
+    AttackMotion: 750
+    DamageMotion: 1120
+    Drops: {
+    }
+},
+{
     Id: 1100
     SpriteName: "PoisonSkull"
     Name: "Poison Skull"
diff --git a/maps/re/000-0-0.mcache b/maps/re/000-0-0.mcache
index d348c332..418a095a 100644
--- a/maps/re/000-0-0.mcache
+++ b/maps/re/000-0-0.mcache
diff --git a/maps/re/000-0-1.mcache b/maps/re/000-0-1.mcache
index d348c332..f3a038bf 100644
--- a/maps/re/000-0-1.mcache
+++ b/maps/re/000-0-1.mcache
diff --git a/maps/re/000-0.mcache b/maps/re/000-0.mcache
index 1455bac0..b9e0f22c 100644
--- a/maps/re/000-0.mcache
+++ b/maps/re/000-0.mcache
diff --git a/maps/re/000-2-0.mcache b/maps/re/000-2-0.mcache
index afe5fed7..c9bd157c 100644
--- a/maps/re/000-2-0.mcache
+++ b/maps/re/000-2-0.mcache
diff --git a/maps/re/000-2-3.mcache b/maps/re/000-2-3.mcache
index 6334b725..266d86a9 100644
--- a/maps/re/000-2-3.mcache
+++ b/maps/re/000-2-3.mcache
diff --git a/maps/re/001-2-21.mcache b/maps/re/001-2-21.mcache
index e50658f5..94cf1389 100644
--- a/maps/re/001-2-21.mcache
+++ b/maps/re/001-2-21.mcache
diff --git a/maps/re/001-2-24.mcache b/maps/re/001-2-24.mcache
index 836070f8..780e27ae 100644
--- a/maps/re/001-2-24.mcache
+++ b/maps/re/001-2-24.mcache
diff --git a/maps/re/001-2-32.mcache b/maps/re/001-2-32.mcache
index 1839ae32..5978a046 100644
--- a/maps/re/001-2-32.mcache
+++ b/maps/re/001-2-32.mcache
diff --git a/maps/re/001-2-34.mcache b/maps/re/001-2-34.mcache
index 2e7199ab..84ee170b 100644
--- a/maps/re/001-2-34.mcache
+++ b/maps/re/001-2-34.mcache
diff --git a/maps/re/008-2-0.mcache b/maps/re/008-2-0.mcache
index bdb96896..308926b2 100644
--- a/maps/re/008-2-0.mcache
+++ b/maps/re/008-2-0.mcache
diff --git a/maps/re/008-2-19.mcache b/maps/re/008-2-19.mcache
index ee05da2b..5e085f99 100644
--- a/maps/re/008-2-19.mcache
+++ b/maps/re/008-2-19.mcache
diff --git a/maps/re/008-2-20.mcache b/maps/re/008-2-20.mcache
index 06a0ade4..e4fb60ff 100644
--- a/maps/re/008-2-20.mcache
+++ b/maps/re/008-2-20.mcache
diff --git a/maps/re/008-2-21.mcache b/maps/re/008-2-21.mcache
index 0455bd4a..d2ab2b36 100644
--- a/maps/re/008-2-21.mcache
+++ b/maps/re/008-2-21.mcache
diff --git a/maps/re/008-2-28.mcache b/maps/re/008-2-28.mcache
index 453e9876..673f2699 100644
--- a/maps/re/008-2-28.mcache
+++ b/maps/re/008-2-28.mcache
diff --git a/maps/re/008-2-29.mcache b/maps/re/008-2-29.mcache
index 8bbde76d..560f31a5 100644
--- a/maps/re/008-2-29.mcache
+++ b/maps/re/008-2-29.mcache
diff --git a/maps/re/008-2-5.mcache b/maps/re/008-2-5.mcache
index 1ac9bbcf..08cbec2b 100644
--- a/maps/re/008-2-5.mcache
+++ b/maps/re/008-2-5.mcache
diff --git a/maps/re/008-3-2.mcache b/maps/re/008-3-2.mcache
index c64a3c80..9b2e1471 100644
--- a/maps/re/008-3-2.mcache
+++ b/maps/re/008-3-2.mcache
diff --git a/maps/re/008-3-3.mcache b/maps/re/008-3-3.mcache
new file mode 100644
index 00000000..39f60ad7
--- /dev/null
+++ b/maps/re/008-3-3.mcache
diff --git a/maps/re/008-3-4.mcache b/maps/re/008-3-4.mcache
new file mode 100644
index 00000000..45d5c879
--- /dev/null
+++ b/maps/re/008-3-4.mcache
diff --git a/maps/re/008-3-5.mcache b/maps/re/008-3-5.mcache
new file mode 100644
index 00000000..3269fc1e
--- /dev/null
+++ b/maps/re/008-3-5.mcache
diff --git a/maps/re/008-3-6.mcache b/maps/re/008-3-6.mcache
new file mode 100644
index 00000000..7a2fa6b9
--- /dev/null
+++ b/maps/re/008-3-6.mcache
diff --git a/maps/re/012-3-1.mcache b/maps/re/012-3-1.mcache
new file mode 100644
index 00000000..6f95cae1
--- /dev/null
+++ b/maps/re/012-3-1.mcache
diff --git a/maps/re/012-3-2.mcache b/maps/re/012-3-2.mcache
new file mode 100644
index 00000000..704f3d67
--- /dev/null
+++ b/maps/re/012-3-2.mcache
diff --git a/maps/re/012-3-3.mcache b/maps/re/012-3-3.mcache
new file mode 100644
index 00000000..76adf856
--- /dev/null
+++ b/maps/re/012-3-3.mcache
diff --git a/maps/re/testbg.mcache b/maps/re/testbg.mcache
index 29654108..c6885c5f 100644
--- a/maps/re/testbg.mcache
+++ b/maps/re/testbg.mcache
diff --git a/npc/008-1-1/_mobs.txt b/npc/008-1-1/_mobs.txt
index e836fe97..3bd8151c 100644
--- a/npc/008-1-1/_mobs.txt
+++ b/npc/008-1-1/_mobs.txt
@@ -23,9 +23,10 @@
 008-1-1,163,178,2,1	monster	Red Rose	1062,1,50000,10000
 008-1-1,158,191,3,1	monster	Yellow Rose	1060,1,20000,5000
 008-1-1,166,184,1,1	monster	Blue Rose	1061,1,100000,20000
-008-1-1,137,88,11,16	monster	Butterfly	1032,8,10000,10000
+008-1-1,137,86,11,16	monster	Butterfly	1032,8,10000,10000
 008-1-1,75,41,14,4	monster	Silkworm	1040,3,9000,6000
 008-1-1,122,75,8,4	monster	Forest Maggot	1028,3,50000,2500
 008-1-1,96,45,1,0	monster	Red Rose	1062,1,50000,10000
 008-1-1,97,47,2,0	monster	Yellow Rose	1060,1,20000,5000
 008-1-1,99,45,0,0	monster	Blue Rose	1061,1,100000,20000
+008-1-1,161,67,45,11	monster	Moubi	1072,1,200000,1250000
diff --git a/npc/008-1/_mobs.txt b/npc/008-1/_mobs.txt
index d4e6a597..11f3e52a 100644
--- a/npc/008-1/_mobs.txt
+++ b/npc/008-1/_mobs.txt
@@ -58,7 +58,7 @@
 008-1,244,160,31,11	monster	Mana Bug	1035,7,10000,10000
 008-1,232,60,17,26	monster	Mana Bug	1035,7,10000,10000
 008-1,275,103,1,0	monster	Clover Patch	1033,1,10000,30000
-008-1,278,153,1,0	monster	Clover Patch	1033,1,10000,30000
+008-1,277,152,2,1	monster	Clover Patch	1033,1,10000,30000
 008-1,203,130,1,0	monster	Clover Patch	1033,1,10000,30000
 008-1,156,149,1,0	monster	Clover Patch	1033,1,10000,30000
 008-1,193,113,1,0	monster	Clover Patch	1033,1,10000,30000
@@ -103,3 +103,5 @@
 008-1,111,68,8,3	monster	Robin Bandit	1064,2,8000,12000
 008-1,126,80,8,3	monster	Bandit	1063,2,5500,8000
 008-1,122,44,4,7	monster	Robin Bandit	1064,1,3000,8000
+008-1,89,116,7,6	monster	Moubi	1072,1,10000000,1000000
+008-1,259,116,31,20	monster	Maggot	1026,6,500,10000
diff --git a/npc/008-1/_warps.txt b/npc/008-1/_warps.txt
index 500ad1ae..fad30de8 100644
--- a/npc/008-1/_warps.txt
+++ b/npc/008-1/_warps.txt
@@ -19,12 +19,15 @@
 008-1,151,80,0	warp	#008-1_151_80	0,0,008-2-15,35,33
 008-1,256,203,0	warp	#008-1_256_203	0,0,008-2-20,25,31
 008-1,128,138,0	warp	#008-1_128_138	0,0,008-3-1,35,34
+008-1,250,23,0	warp	#008-1_250_23	1,0,008-3-4,88,76
+008-1,283,26,0	warp	#008-1_283_26	0,0,008-3-3,37,56
 008-1,287,113,0	warp	#008-1_287_113	0,0,008-2-8,26,28
 008-1,252,211,0	warp	#008-1_252_211	0,0,008-2-21,22,42
 008-1,257,130,0	warp	#008-1_257_130	0,0,008-2-28,25,31
 008-1,233,131,0	warp	#008-1_233_131	0,0,008-2-29,36,24
 008-1,287,133,0	warp	#008-1_287_133	0,0,008-2-30,52,39
 008-1,20,85,0	warp	#008-1_20_85	0,1,008-1-1,246,85
-008-1,165,171,0	warp	#008-1_165_171	0,0,008-3-2,175,19
+008-1,165,171,0	warp	#008-1_165_171	0,0,008-3-2,175,21
 008-1,289,125,0	warp	#008-1_289_125	0,0,008-2-31,29,25
 008-1,22,216,0	warp	#008-1_22_216	0,0,008-1-2,248,48
+008-1,109,82,0	warp	#008-1_109_82	0,0,008-3-5,92,107
diff --git a/npc/008-3-0/_mobs.txt b/npc/008-3-0/_mobs.txt
index 372c3898..06015caf 100644
--- a/npc/008-3-0/_mobs.txt
+++ b/npc/008-3-0/_mobs.txt
@@ -16,7 +16,7 @@
 008-3-0,68,84,3,7	monster	Spider	1044,4,4000,8000
 008-3-0,80,169,0,0	monster	Diamond Vein	1045,1,600000,60000
 008-3-0,118,96,0,0	monster	Gem Veinbloc	1069,1,600000,60000
-008-3-0,131,93,0,0	monster	Gem Veinbloc	1069,1,600000,60000
+008-3-0,131,93,0,0	monster	Coal Veinbloc	1071,1,600000,60000
 008-3-0,119,101,0,0	monster	Gold Veinbloc	1070,1,600000,60000
 008-3-0,113,60,23,8	monster	Cave Maggot	1027,7,500,2000
 008-3-0,199,68,8,9	monster	Crafty	1018,5,1000,60000
@@ -54,10 +54,10 @@
 008-3-0,107,141,0,0	monster	Gem Veinbloc	1069,1,600000,60000
 008-3-0,77,148,0,0	monster	Gem Veinbloc	1069,1,600000,60000
 008-3-0,62,119,0,0	monster	Gem Veinbloc	1069,1,600000,60000
-008-3-0,162,95,0,0	monster	Gem Veinbloc	1069,1,600000,60000
-008-3-0,157,66,0,0	monster	Gem Veinbloc	1069,1,600000,60000
-008-3-0,112,60,0,0	monster	Gem Veinbloc	1069,1,600000,60000
-008-3-0,66,54,0,0	monster	Gem Veinbloc	1069,1,600000,60000
+008-3-0,162,95,0,0	monster	Coal Veinbloc	1071,1,600000,60000
+008-3-0,157,66,0,0	monster	Coal Veinbloc	1071,1,600000,60000
+008-3-0,112,60,0,0	monster	Coal Veinbloc	1071,1,600000,60000
+008-3-0,66,54,0,0	monster	Coal Veinbloc	1071,1,600000,60000
 008-3-0,63,91,0,0	monster	Gold Veinbloc	1070,1,600000,60000
 008-3-0,76,127,0,0	monster	Gold Veinbloc	1070,1,600000,60000
 008-3-0,111,148,0,0	monster	Gold Veinbloc	1070,1,600000,60000
diff --git a/npc/008-3-1/_mobs.txt b/npc/008-3-1/_mobs.txt
index 8a09426c..b741a714 100644
--- a/npc/008-3-1/_mobs.txt
+++ b/npc/008-3-1/_mobs.txt
@@ -1,7 +1,7 @@
 // This file is generated automatically. All manually added changes will be removed when running the Converter.
 // Map 008-3-1: Bat Cave mobs
-008-3-1,42,35,7,5	monster	Crafty	1018,10,1000,120000
-008-3-1,44,54,4,2	monster	Crafty	1018,5,10000,75000
+008-3-1,42,35,7,5	monster	Crafty	1018,7,1000,120000
+008-3-1,44,54,4,2	monster	Crafty	1018,4,10000,75000
 008-3-1,43,39,5,2	monster	Spider	1044,1,4000,8000
 008-3-1,46,53,5,2	monster	Spider	1044,2,2000,7500
 008-3-1,52,31,0,0	monster	Iron Vein	1047,1,600000,60000
diff --git a/npc/008-3-2/_import.txt b/npc/008-3-2/_import.txt
index 3249121c..580a8f40 100644
--- a/npc/008-3-2/_import.txt
+++ b/npc/008-3-2/_import.txt
@@ -2,3 +2,4 @@
 // This file is generated automatically. All manually added changes will be removed when running the Converter.
 "npc/008-3-2/_mobs.txt",
 "npc/008-3-2/_warps.txt",
+"npc/008-3-2/boss.txt",
diff --git a/npc/008-3-3/_import.txt b/npc/008-3-3/_import.txt
new file mode 100644
index 00000000..96cc09c9
--- /dev/null
+++ b/npc/008-3-3/_import.txt
@@ -0,0 +1,4 @@
+// Map 008-3-3: Bat Cave
+// This file is generated automatically. All manually added changes will be removed when running the Converter.
+"npc/008-3-3/_mobs.txt",
+"npc/008-3-3/_warps.txt",
diff --git a/npc/008-3-3/_mobs.txt b/npc/008-3-3/_mobs.txt
new file mode 100644
index 00000000..4ff0ff2d
--- /dev/null
+++ b/npc/008-3-3/_mobs.txt
@@ -0,0 +1,9 @@
+// This file is generated automatically. All manually added changes will be removed when running the Converter.
+// Map 008-3-3: Obelisk Cave mobs
+// This file is generated automatically. All manually added changes will be removed when running the Converter.
+// Map 008-3-3: Bat Cave mobs
+008-3-3,57,36,12,7	monster	Crafty	1018,5,1000,120000
+008-3-3,31,43,4,5	monster	Crafty	1018,3,1000,120000
+008-3-3,49,38,20,16	monster	Cave Maggot	1027,12,500,2000
+008-3-3,60,49,5,3	monster	Ratto	1005,2,35000,15000
+008-3-3,53,24,5,2	monster	Ratto	1005,2,35000,15000
diff --git a/npc/008-3-3/_warps.txt b/npc/008-3-3/_warps.txt
new file mode 100644
index 00000000..871c897c
--- /dev/null
+++ b/npc/008-3-3/_warps.txt
@@ -0,0 +1,5 @@
+// This file is generated automatically. All manually added changes will be removed when running the Converter.
+// Map 008-3-3: Obelisk Cave warps
+// This file is generated automatically. All manually added changes will be removed when running the Converter.
+// Map 008-3-3: Bat Cave warps
+008-3-3,37,57,0	warp	#008-3-3_37_57	1,0,008-1,283,27
diff --git a/npc/008-3-4/_import.txt b/npc/008-3-4/_import.txt
new file mode 100644
index 00000000..e0815f43
--- /dev/null
+++ b/npc/008-3-4/_import.txt
@@ -0,0 +1,4 @@
+// Map 008-3-4: North Mine
+// This file is generated automatically. All manually added changes will be removed when running the Converter.
+"npc/008-3-4/_mobs.txt",
+"npc/008-3-4/_warps.txt",
diff --git a/npc/008-3-4/_mobs.txt b/npc/008-3-4/_mobs.txt
new file mode 100644
index 00000000..db3cc108
--- /dev/null
+++ b/npc/008-3-4/_mobs.txt
@@ -0,0 +1,32 @@
+// This file is generated automatically. All manually added changes will be removed when running the Converter.
+// Map 008-3-4: North Mine mobs
+008-3-4,84,55,19,25	monster	Cave Maggot	1027,15,2000,20000
+008-3-4,73,100,53,17	monster	Cave Maggot	1027,10,1000,15000
+008-3-4,139,58,20,21	monster	Cave Maggot	1027,5,5000,25000
+008-3-4,87,78,75,12	monster	Crafty	1018,12,2500,35000
+008-3-4,89,79,21,35	monster	Ratto	1005,18,5000,10000
+008-3-4,133,55,16,9	monster	Spider	1044,1,4000,8000
+008-3-4,49,91,29,17	monster	Black Scorpion	1104,4,4000,8000
+008-3-4,138,57,16,17	monster	Spider	1044,3,4000,8000
+008-3-4,54,37,16,17	monster	Spider	1044,3,4000,8000
+008-3-4,85,67,49,39	monster	Thief Slime	1105,3,20000,100000
+008-3-4,82,42,0,0	monster	Coal Veinbloc	1071,1,600000,60000
+008-3-4,74,51,0,0	monster	Coal Veinbloc	1071,1,600000,60000
+008-3-4,104,41,0,0	monster	Coal Veinbloc	1071,1,600000,60000
+008-3-4,62,61,0,0	monster	Coal Veinbloc	1071,1,600000,60000
+008-3-4,128,71,0,0	monster	Coal Veinbloc	1071,1,600000,60000
+008-3-4,118,46,0,0	monster	Coal Vein	1048,1,600000,60000
+008-3-4,108,90,0,0	monster	Iron Vein	1047,1,600000,60000
+008-3-4,72,84,0,0	monster	Iron Vein	1047,1,600000,60000
+008-3-4,47,98,0,0	monster	Iron Vein	1047,1,600000,60000
+008-3-4,50,74,0,0	monster	Iron Vein	1047,1,600000,60000
+008-3-4,135,53,0,0	monster	Diamond Vein	1045,1,600000,60000
+008-3-4,43,96,0,0	monster	Amethyst Vein	1055,1,600000,60000
+008-3-4,102,91,0,0	monster	Topaz Vein	1054,1,600000,60000
+008-3-4,33,102,0,0	monster	Gem Veinbloc	1069,1,600000,60000
+008-3-4,154,56,0,0	monster	Gem Veinbloc	1069,1,600000,60000
+008-3-4,53,31,0,0	monster	Gem Veinbloc	1069,1,600000,60000
+008-3-4,83,44,14,9	monster	Red Slime	1074,5,10000,50000
+008-3-4,115,67,13,29	monster	Red Slime	1074,4,10000,50000
+008-3-4,37,79,24,27	monster	Yellow Slime	1073,4,10000,50000
+008-3-4,111,67,13,29	monster	Red Slime	1074,8,20000,75000
diff --git a/npc/008-3-4/_warps.txt b/npc/008-3-4/_warps.txt
new file mode 100644
index 00000000..d62d5fb5
--- /dev/null
+++ b/npc/008-3-4/_warps.txt
@@ -0,0 +1,5 @@
+// This file is generated automatically. All manually added changes will be removed when running the Converter.
+// Map 008-3-4: North Mine warps
+008-3-4,88,78,0	warp	#008-3-4_88_78	0,0,008-1,249,24
+008-3-4,21,85,0	warp	#008-3-4_21_85	0,2,008-3-5,157,72
+008-3-4,91,119,0	warp	#008-3-4_91_119	3,0,008-3-6,62,22
diff --git a/npc/008-3-5/_import.txt b/npc/008-3-5/_import.txt
new file mode 100644
index 00000000..55e17985
--- /dev/null
+++ b/npc/008-3-5/_import.txt
@@ -0,0 +1,4 @@
+// Map 008-3-5: Bandit Cave
+// This file is generated automatically. All manually added changes will be removed when running the Converter.
+"npc/008-3-5/_mobs.txt",
+"npc/008-3-5/_warps.txt",
diff --git a/npc/008-3-5/_mobs.txt b/npc/008-3-5/_mobs.txt
new file mode 100644
index 00000000..de960072
--- /dev/null
+++ b/npc/008-3-5/_mobs.txt
@@ -0,0 +1,12 @@
+// This file is generated automatically. All manually added changes will be removed when running the Converter.
+// Map 008-3-5: Bandit Cave mobs
+008-3-5,87,83,22,16	monster	Cave Maggot	1027,8,2000,20000
+008-3-5,79,68,54,12	monster	Crafty	1018,12,2500,35000
+008-3-5,71,62,49,39	monster	Thief Slime	1105,3,20000,100000
+008-3-5,90,70,13,29	monster	Red Slime	1074,8,20000,75000
+008-3-5,79,82,21,15	monster	Bandit	1063,3,2000,20000
+008-3-5,74,66,38,21	monster	Snake	1075,3,10000,100000
+008-3-5,54,41,26,21	monster	Robin Bandit	1064,2,2000,20000
+008-3-5,44,51,13,33	monster	Cave Maggot	1027,7,2000,20000
+008-3-5,49,41,38,21	monster	Bandit	1063,2,2000,20000
+008-3-5,133,72,24,9	monster	Ratto	1005,6,5000,10000
diff --git a/npc/008-3-5/_warps.txt b/npc/008-3-5/_warps.txt
new file mode 100644
index 00000000..be81f002
--- /dev/null
+++ b/npc/008-3-5/_warps.txt
@@ -0,0 +1,6 @@
+// This file is generated automatically. All manually added changes will be removed when running the Converter.
+// Map 008-3-5: Bandit Cave warps
+008-3-5,158,72,0	warp	#008-3-5_158_72	0,2,008-3-4,22,85
+008-3-5,109,67,0	warp	#008-3-5_109_67	0,2,008-3-5,101,68
+008-3-5,102,68,0	warp	#008-3-5_102_68	0,2,008-3-5,110,67
+008-3-5,92,108,0	warp	#008-3-5_92_108	0,0,008-1,109,83
diff --git a/npc/008-3-6/_import.txt b/npc/008-3-6/_import.txt
new file mode 100644
index 00000000..41b51532
--- /dev/null
+++ b/npc/008-3-6/_import.txt
@@ -0,0 +1,4 @@
+// Map 008-3-6: Hurnscald Cave
+// This file is generated automatically. All manually added changes will be removed when running the Converter.
+"npc/008-3-6/_mobs.txt",
+"npc/008-3-6/_warps.txt",
diff --git a/npc/008-3-6/_mobs.txt b/npc/008-3-6/_mobs.txt
new file mode 100644
index 00000000..91e614fe
--- /dev/null
+++ b/npc/008-3-6/_mobs.txt
@@ -0,0 +1,11 @@
+// This file is generated automatically. All manually added changes will be removed when running the Converter.
+// Map 008-3-6: Hurnscald Cave mobs
+008-3-6,54,73,18,19	monster	Red Slime	1074,5,10000,50000
+008-3-6,67,44,35,8	monster	Yellow Slime	1073,3,10000,50000
+008-3-6,86,43,23,22	monster	Red Slime	1074,4,10000,50000
+008-3-6,86,76,24,13	monster	Yellow Slime	1073,4,10000,50000
+008-3-6,75,65,24,27	monster	Cave Maggot	1027,8,2000,20000
+008-3-6,56,62,10,7	monster	Ratto	1005,3,5000,10000
+008-3-6,71,77,10,7	monster	Ratto	1005,3,5000,10000
+008-3-6,96,53,15,11	monster	Ratto	1005,4,5000,10000
+008-3-6,95,63,15,21	monster	Black Scorpion	1104,1,4000,8000
diff --git a/npc/008-3-6/_warps.txt b/npc/008-3-6/_warps.txt
new file mode 100644
index 00000000..95dd673a
--- /dev/null
+++ b/npc/008-3-6/_warps.txt
@@ -0,0 +1,3 @@
+// This file is generated automatically. All manually added changes will be removed when running the Converter.
+// Map 008-3-6: Hurnscald Cave warps
+008-3-6,64,21,0	warp	#008-3-6_64_21	3,0,008-3-4,90,118
diff --git a/npc/012-1/_import.txt b/npc/012-1/_import.txt
index 47036b7f..363a65e9 100644
--- a/npc/012-1/_import.txt
+++ b/npc/012-1/_import.txt
@@ -1,5 +1,6 @@
 // Map 012-1: Candor Island
 // This file is generated automatically. All manually added changes will be removed when running the Converter.
+"npc/012-1/_mobs.txt",
 "npc/012-1/_warps.txt",
 "npc/012-1/aahna.txt",
 "npc/012-1/aidan.txt",
diff --git a/npc/012-1/_mobs.txt b/npc/012-1/_mobs.txt
new file mode 100644
index 00000000..d00ebaaa
--- /dev/null
+++ b/npc/012-1/_mobs.txt
@@ -0,0 +1,8 @@
+// This file is generated automatically. All manually added changes will be removed when running the Converter.
+// Map 012-1: Candor Island mobs
+012-1,77,78,30,25	monster	Mana Bug	1035,8,10000,10000
+012-1,62,95,19,15	monster	Butterfly	1032,5,100000,10000
+012-1,78,103,38,12	monster	Maggot	1026,10,500,10000
+012-1,57,57,20,14	monster	Grass Snake	1042,5,3000,12000
+012-1,106,42,16,7	monster	Scorpion	1043,4,15000,50000
+012-1,115,123,14,7	monster	Scorpion	1043,4,15000,40000
diff --git a/npc/012-1/_warps.txt b/npc/012-1/_warps.txt
index ada06743..e7f8b126 100644
--- a/npc/012-1/_warps.txt
+++ b/npc/012-1/_warps.txt
@@ -6,3 +6,4 @@
 012-1,64,95,0	warp	#012-1_64_95	0,0,012-2-3,33,36
 012-1,51,93,0	warp	#012-1_51_93	0,0,012-2-7,30,34
 012-1,57,101,0	warp	#012-1_57_101	0,0,012-2-4,31,43
+012-1,49,67,0	warp	#012-1_49_67	1,0,012-3-1,37,40
diff --git a/npc/012-3-1/_import.txt b/npc/012-3-1/_import.txt
new file mode 100644
index 00000000..8856cef8
--- /dev/null
+++ b/npc/012-3-1/_import.txt
@@ -0,0 +1,4 @@
+// Map 012-3-1: Cador Cave
+// This file is generated automatically. All manually added changes will be removed when running the Converter.
+"npc/012-3-1/_mobs.txt",
+"npc/012-3-1/_warps.txt",
diff --git a/npc/012-3-1/_mobs.txt b/npc/012-3-1/_mobs.txt
new file mode 100644
index 00000000..60055f77
--- /dev/null
+++ b/npc/012-3-1/_mobs.txt
@@ -0,0 +1,8 @@
+// This file is generated automatically. All manually added changes will be removed when running the Converter.
+// Map 012-3-1: Cador Cave mobs
+012-3-1,47,44,17,18	monster	Spider	1044,5,4000,8000
+012-3-1,47,47,23,18	monster	Cave Maggot	1027,8,2000,20000
+012-3-1,41,30,13,6	monster	Green Slime	1024,3,20000,75000
+012-3-1,51,56,15,7	monster	Black Scorpion	1104,1,4000,8000
+012-3-1,60,48,11,14	monster	AngryCrafty	1103,3,50000,2500
+012-3-1,36,43,11,7	monster	AngryCrafty	1103,2,50000,2500
diff --git a/npc/012-3-1/_warps.txt b/npc/012-3-1/_warps.txt
new file mode 100644
index 00000000..4de4ef4a
--- /dev/null
+++ b/npc/012-3-1/_warps.txt
@@ -0,0 +1,5 @@
+// This file is generated automatically. All manually added changes will be removed when running the Converter.
+// Map 012-3-1: Cador Cave warps
+012-3-1,43,44,0	warp	#012-3-1_43_44	1,0,012-3-3,44,97
+012-3-1,68,62,0	warp	#012-3-1_68_62	0,2,012-3-2,22,45
+012-3-1,37,41,0	warp	#012-3-1_37_41	2,0,012-1,48,68
diff --git a/npc/012-3-2/_import.txt b/npc/012-3-2/_import.txt
new file mode 100644
index 00000000..1aaa4813
--- /dev/null
+++ b/npc/012-3-2/_import.txt
@@ -0,0 +1,4 @@
+// Map 012-3-2: Candor Cave
+// This file is generated automatically. All manually added changes will be removed when running the Converter.
+"npc/012-3-2/_mobs.txt",
+"npc/012-3-2/_warps.txt",
diff --git a/npc/012-3-2/_mobs.txt b/npc/012-3-2/_mobs.txt
new file mode 100644
index 00000000..ee085d8d
--- /dev/null
+++ b/npc/012-3-2/_mobs.txt
@@ -0,0 +1,8 @@
+// This file is generated automatically. All manually added changes will be removed when running the Converter.
+// Map 012-3-2: Parua Cave mobs
+// This file is generated automatically. All manually added changes will be removed when running the Converter.
+// Map 012-3-2: Candor Cave mobs
+012-3-2,55,39,13,14	monster	Spider	1044,5,4000,8000
+012-3-2,54,41,15,12	monster	Black Scorpion	1104,4,4000,8000
+012-3-2,56,41,17,10	monster	AngryCrafty	1103,3,50000,2500
+012-3-2,48,40,26,6	monster	Cave Maggot	1027,6,2000,20000
diff --git a/npc/012-3-2/_warps.txt b/npc/012-3-2/_warps.txt
new file mode 100644
index 00000000..25b3477a
--- /dev/null
+++ b/npc/012-3-2/_warps.txt
@@ -0,0 +1,5 @@
+// This file is generated automatically. All manually added changes will be removed when running the Converter.
+// Map 012-3-2: Parua Cave warps
+// This file is generated automatically. All manually added changes will be removed when running the Converter.
+// Map 012-3-2: Candor Cave warps
+012-3-2,21,46,0	warp	#012-3-2_21_46	0,1,012-3-1,67,61
diff --git a/npc/012-3-3/_import.txt b/npc/012-3-3/_import.txt
new file mode 100644
index 00000000..ee48f7ee
--- /dev/null
+++ b/npc/012-3-3/_import.txt
@@ -0,0 +1,5 @@
+// Map 012-3-3: Mana Tree Cave
+// This file is generated automatically. All manually added changes will be removed when running the Converter.
+"npc/012-3-3/_mobs.txt",
+"npc/012-3-3/_warps.txt",
+"npc/012-3-3/manatree.txt",
diff --git a/npc/012-3-3/_mobs.txt b/npc/012-3-3/_mobs.txt
new file mode 100644
index 00000000..f2da13cd
--- /dev/null
+++ b/npc/012-3-3/_mobs.txt
@@ -0,0 +1,7 @@
+// This file is generated automatically. All manually added changes will be removed when running the Converter.
+// Map 012-3-3: Mana Tree Cave mobs
+012-3-3,40,28,13,3	monster	Green Slime	1024,4,20000,75000
+012-3-3,41,55,15,31	monster	Crafty	1018,7,2500,35000
+012-3-3,36,35,9,7	monster	Mana Bug	1035,5,10000,10000
+012-3-3,42,39,8,12	monster	Silkworm	1040,5,3000,6000
+012-3-3,42,35,7,6	monster	Moubi	1072,1,500000,1000000
diff --git a/npc/012-3-3/_warps.txt b/npc/012-3-3/_warps.txt
new file mode 100644
index 00000000..c0e6bf40
--- /dev/null
+++ b/npc/012-3-3/_warps.txt
@@ -0,0 +1,3 @@
+// This file is generated automatically. All manually added changes will be removed when running the Converter.
+// Map 012-3-3: Mana Tree Cave warps
+012-3-3,44,98,0	warp	#012-3-3_44_98	0,0,012-3-1,42,45
diff --git a/npc/012-3-3/manatree.txt b/npc/012-3-3/manatree.txt
new file mode 100644
index 00000000..cd9de629
--- /dev/null
+++ b/npc/012-3-3/manatree.txt
@@ -0,0 +1,20 @@
+// Evol scripts.
+// Author:
+//    Micksha
+// Description:
+//    The Manatree.
+// THIS IS A PLACEHOLDER!
+
+012-3-3,37,32,0	script	Manatree#012-3-3	NPC_MANATREE,{
+    speech
+        l("Magic is all around."),
+        l("You just must listen to it, and feel it deep inside."),
+        lg("Now go, search for the unknown.");
+
+    close;
+
+OnInit:
+    .sex = G_FEMALE;
+    .distance = 2;
+    end;
+}
diff --git a/npc/_import.txt b/npc/_import.txt
index 7203a413..cf56b97e 100644
--- a/npc/_import.txt
+++ b/npc/_import.txt
@@ -95,6 +95,10 @@
 @include "npc/008-3-0/_import.txt"
 @include "npc/008-3-1/_import.txt"
 @include "npc/008-3-2/_import.txt"
+@include "npc/008-3-3/_import.txt"
+@include "npc/008-3-4/_import.txt"
+@include "npc/008-3-5/_import.txt"
+@include "npc/008-3-6/_import.txt"
 @include "npc/012-1/_import.txt"
 @include "npc/012-2-1/_import.txt"
 @include "npc/012-2-2/_import.txt"
@@ -103,6 +107,9 @@
 @include "npc/012-2-5/_import.txt"
 @include "npc/012-2-6/_import.txt"
 @include "npc/012-2-7/_import.txt"
+@include "npc/012-3-1/_import.txt"
+@include "npc/012-3-2/_import.txt"
+@include "npc/012-3-3/_import.txt"
 @include "npc/sec_pri/_import.txt"
 @include "npc/test/_import.txt"
 @include "npc/testbg/_import.txt"