Elenium Mines

8 files changed, 92 insertions, 49 deletions

diff --git a/conf/map/maps.conf b/conf/map/maps.conf
index 880a86bda..733e5f357 100644
--- a/conf/map/maps.conf
+++ b/conf/map/maps.conf
@@ -128,6 +128,7 @@ map_list: (
     "018-5-boss",
     "018-5",
     "018-6-0",
+    "018-6-1",
     "019-1-1",
     "019-1",
     "019-2",
diff --git a/db/map_index.txt b/db/map_index.txt
index c22009977..3cf92e99f 100644
--- a/db/map_index.txt
+++ b/db/map_index.txt
@@ -125,52 +125,53 @@
 018-5-boss 125
 018-5 126
 018-6-0 127
-019-1-1 128
-019-1 129
-019-2 130
-019-3 131
-019-4-1 132
-019-4 133
-020-1 134
-020-2 135
-020-3 136
-020-4 137
-020-5 138
-020-6 139
-020-7-1 140
-020-7-2 141
-020-7 142
-021-1 143
-021-2 144
-021-3 145
-021-4 146
-022-1 147
-023-1 148
-023-2 149
-023-3-1 150
-023-3-2 151
-023-3 152
-024-1 153
-024-10 154
-024-11 155
-024-12 156
-024-13 157
-024-14 158
-024-15 159
-024-16 160
-024-2 161
-024-3 162
-024-4 163
-024-5 164
-024-6 165
-024-7 166
-024-8 167
-024-9 168
-boss 169
-botcheck 170
-guilds 171
-sec_pri 172
-soren-2 173
-soren 174
-test 175
-testbg 176
+018-6-1 128
+019-1-1 129
+019-1 130
+019-2 131
+019-3 132
+019-4-1 133
+019-4 134
+020-1 135
+020-2 136
+020-3 137
+020-4 138
+020-5 139
+020-6 140
+020-7-1 141
+020-7-2 142
+020-7 143
+021-1 144
+021-2 145
+021-3 146
+021-4 147
+022-1 148
+023-1 149
+023-2 150
+023-3-1 151
+023-3-2 152
+023-3 153
+024-1 154
+024-10 155
+024-11 156
+024-12 157
+024-13 158
+024-14 159
+024-15 160
+024-16 161
+024-2 162
+024-3 163
+024-4 164
+024-5 165
+024-6 166
+024-7 167
+024-8 168
+024-9 169
+boss 170
+botcheck 171
+guilds 172
+sec_pri 173
+soren-2 174
+soren 175
+test 176
+testbg 177
diff --git a/maps/re/018-6-1.mcache b/maps/re/018-6-1.mcache
new file mode 100644
index 000000000..c7f7b2cf5
--- /dev/null
+++ b/maps/re/018-6-1.mcache
diff --git a/npc/017-1/townhall.txt b/npc/017-1/townhall.txt
index 931f130a0..9b78463ce 100644
--- a/npc/017-1/townhall.txt
+++ b/npc/017-1/townhall.txt
@@ -65,3 +65,20 @@ OnInit:
     end;
 }
 
+017-1,32,44,0	script	#LoF_EleniumMines	NPC_HIDDEN,{
+    end;
+
+OnTouch:
+    // TODO: OnQuest: Instance
+    .@q=getq(General_Narrator);
+    if (.@q >= 17) {
+        warp "018-6-1", 80, 199;
+    } else {
+        warp "018-6-1", 80, 199;
+    }
+    end;
+OnInit:
+    .distance=1;
+    end;
+}
+
diff --git a/npc/018-6-1/_import.txt b/npc/018-6-1/_import.txt
new file mode 100644
index 000000000..de446a263
--- /dev/null
+++ b/npc/018-6-1/_import.txt
@@ -0,0 +1,4 @@
+// Map 018-6-1: Elenium Mines
+// This file is generated automatically. All manually added changes will be removed when running the Converter.
+"npc/018-6-1/_mobs.txt",
+"npc/018-6-1/_warps.txt",
diff --git a/npc/018-6-1/_mobs.txt b/npc/018-6-1/_mobs.txt
new file mode 100644
index 000000000..fd07526ca
--- /dev/null
+++ b/npc/018-6-1/_mobs.txt
@@ -0,0 +1,16 @@
+// This file is generated automatically. All manually added changes will be removed when running the Converter.
+// Map 018-6-1: Elenium Mines mobs
+018-6-1,40,49,7,8	monster	Big Elenium Bif	1228,5,450000,45000
+018-6-1,95,51,7,8	monster	Big Elenium Bif	1228,5,450000,45000
+018-6-1,145,83,6,5	monster	Medium Elenium Bif	1227,5,400000,45000
+018-6-1,62,86,6,5	monster	Medium Elenium Bif	1227,5,400000,45000
+018-6-1,65,130,6,5	monster	Medium Elenium Bif	1227,5,400000,45000
+018-6-1,125,158,6,5	monster	Small Elenium Bif	1226,4,300000,45000
+018-6-1,129,183,6,5	monster	Small Elenium Bif	1226,4,300000,45000
+018-6-1,34,181,5,5	monster	Small Elenium Bif	1226,4,300000,45000
+018-6-1,80,172,54,25	monster	Black Slime	1178,16,30000,15000
+018-6-1,89,167,54,25	monster	Dark Lizard	1051,8,30000,15000
+018-6-1,96,103,56,29	monster	Black Scorpion	1074,18,30000,15000
+018-6-1,101,105,54,25	monster	Mountain Snake	1123,10,30000,15000
+018-6-1,70,45,44,25	monster	Wicked Mushroom	1176,14,30000,15000
+018-6-1,68,45,31,21	monster	Archant	1026,7,30000,15000
diff --git a/npc/018-6-1/_warps.txt b/npc/018-6-1/_warps.txt
new file mode 100644
index 000000000..dda336877
--- /dev/null
+++ b/npc/018-6-1/_warps.txt
@@ -0,0 +1,3 @@
+// This file is generated automatically. All manually added changes will be removed when running the Converter.
+// Map 018-6-1: Elenium Mines warps
+018-6-1,80,200,0	warp	#018-6-1_80_200	0,0,017-1,32,45
diff --git a/npc/_import.txt b/npc/_import.txt
index 3fd312d79..c877bae5d 100644
--- a/npc/_import.txt
+++ b/npc/_import.txt
@@ -127,6 +127,7 @@
 @include "npc/018-5-boss/_import.txt"
 @include "npc/018-5/_import.txt"
 @include "npc/018-6-0/_import.txt"
+@include "npc/018-6-1/_import.txt"
 @include "npc/019-1-1/_import.txt"
 @include "npc/019-1/_import.txt"
 @include "npc/019-2/_import.txt"