Lilit's Sanctuary

12 files changed, 128 insertions, 93 deletions

diff --git a/conf/map/maps.conf b/conf/map/maps.conf
index 8d3b7b06a..4507e6aec 100644
--- a/conf/map/maps.conf
+++ b/conf/map/maps.conf
@@ -149,6 +149,8 @@ map_list: (
     "018-6-1",
     "018-6-2",
     "018-6-3",
+    "018-7-1",
+    "018-7",
     "019-1-1",
     "019-1",
     "019-2",
diff --git a/db/map_index.txt b/db/map_index.txt
index 7a8cada33..a6753844a 100644
--- a/db/map_index.txt
+++ b/db/map_index.txt
@@ -146,95 +146,97 @@
 018-6-1 146
 018-6-2 147
 018-6-3 148
-019-1-1 149
-019-1 150
-019-2 151
-019-3 152
-019-4-1 153
-019-4 154
-020-1 155
-020-2 156
-020-3 157
-020-4 158
-020-5 159
-020-6 160
-020-7-1 161
-020-7-2 162
-020-7 163
-021-0 164
-021-1 165
-021-2 166
-021-3 167
-021-4 168
-022-1 169
-023-1 170
-023-2 171
-023-3-1 172
-023-3-2 173
-023-3 174
-024-1 175
-024-10 176
-024-11 177
-024-12 178
-024-13 179
-024-14 180
-024-15 181
-024-16 182
-024-2 183
-024-3 184
-024-4 185
-024-5 186
-024-6 187
-024-7 188
-024-8 189
-024-9 190
-025-1 191
-025-2-1 192
-025-2-2 193
-025-2-3 194
-025-2-4 195
-025-2 196
-025-3 197
-026-0 198
-026-1 199
-027-0 200
-027-1 201
-027-2 202
-027-3 203
-027-4 204
-042-0 205
-042-1 206
-042-10 207
-042-11 208
-042-2 209
-042-3 210
-042-4 211
-042-5 212
-042-6 213
-042-7 214
-042-8 215
-042-9 216
-boss 217
-botcheck 218
-guilds 219
-maze0 220
-maze1 221
-maze10 222
-maze11 223
-maze12 224
-maze13 225
-maze14 226
-maze15 227
-maze2 228
-maze3 229
-maze4 230
-maze5 231
-maze6 232
-maze7 233
-maze8 234
-maze9 235
-sec_pri 236
-soren-2 237
-soren 238
-test 239
-testbg 240
+018-7-1 149
+018-7 150
+019-1-1 151
+019-1 152
+019-2 153
+019-3 154
+019-4-1 155
+019-4 156
+020-1 157
+020-2 158
+020-3 159
+020-4 160
+020-5 161
+020-6 162
+020-7-1 163
+020-7-2 164
+020-7 165
+021-0 166
+021-1 167
+021-2 168
+021-3 169
+021-4 170
+022-1 171
+023-1 172
+023-2 173
+023-3-1 174
+023-3-2 175
+023-3 176
+024-1 177
+024-10 178
+024-11 179
+024-12 180
+024-13 181
+024-14 182
+024-15 183
+024-16 184
+024-2 185
+024-3 186
+024-4 187
+024-5 188
+024-6 189
+024-7 190
+024-8 191
+024-9 192
+025-1 193
+025-2-1 194
+025-2-2 195
+025-2-3 196
+025-2-4 197
+025-2 198
+025-3 199
+026-0 200
+026-1 201
+027-0 202
+027-1 203
+027-2 204
+027-3 205
+027-4 206
+042-0 207
+042-1 208
+042-10 209
+042-11 210
+042-2 211
+042-3 212
+042-4 213
+042-5 214
+042-6 215
+042-7 216
+042-8 217
+042-9 218
+boss 219
+botcheck 220
+guilds 221
+maze0 222
+maze1 223
+maze10 224
+maze11 225
+maze12 226
+maze13 227
+maze14 228
+maze15 229
+maze2 230
+maze3 231
+maze4 232
+maze5 233
+maze6 234
+maze7 235
+maze8 236
+maze9 237
+sec_pri 238
+soren-2 239
+soren 240
+test 241
+testbg 242
diff --git a/maps/re/018-7-1.mcache b/maps/re/018-7-1.mcache
new file mode 100644
index 000000000..09a32be28
--- /dev/null
+++ b/maps/re/018-7-1.mcache
diff --git a/maps/re/018-7.mcache b/maps/re/018-7.mcache
new file mode 100644
index 000000000..2a4c692f5
--- /dev/null
+++ b/maps/re/018-7.mcache
diff --git a/npc/018-5/_mobs.txt b/npc/018-5/_mobs.txt
index e3f497740..25dd4ff65 100644
--- a/npc/018-5/_mobs.txt
+++ b/npc/018-5/_mobs.txt
@@ -3,7 +3,7 @@
 018-5,68,87,25,16	monster	Water Fairy	1185,8,20000,40000
 018-5,66,84,25,18	monster	Grass Snake	1169,8,10000,10000
 018-5,82,88,41,15	monster	Wind Fairy	1185,8,40000,20000
-018-5,99,47,22,14	monster	Poison Fairy	1186,6,30000,30000
+018-5,99,47,22,14	monster	Nature Fairy	1186,6,30000,30000
 018-5,58,146,26,12	monster	Mountain Snake	1123,6,120000,0,Shaabty::OnKillSnake
 018-5,58,83,18,22	monster	Green Dragon	1195,2,120000,0
 018-5,100,52,21,18	monster	Squirrel	1055,6,30000,30000
diff --git a/npc/018-7-1/_import.txt b/npc/018-7-1/_import.txt
new file mode 100644
index 000000000..0e6e250b5
--- /dev/null
+++ b/npc/018-7-1/_import.txt
@@ -0,0 +1,4 @@
+// Map 018-7-1: Developers' Lair (Lilit Palace)
+// This file is generated automatically. All manually added changes will be removed when running the Converter.
+"npc/018-7-1/_mobs.txt",
+"npc/018-7-1/_warps.txt",
diff --git a/npc/018-7-1/_mobs.txt b/npc/018-7-1/_mobs.txt
new file mode 100644
index 000000000..9db1b9c92
--- /dev/null
+++ b/npc/018-7-1/_mobs.txt
@@ -0,0 +1,6 @@
+// This file is generated automatically. All manually added changes will be removed when running the Converter.
+// Map 018-7-1: Developers' Lair (Lilit Palace) mobs
+018-7-1,85,58,9,13	monster	Mana Piou	1155,8,35000,270000
+018-7-1,90,67,5,5	monster	Forest Piou	1202,4,35000,120000
+018-7-1,90,54,5,7	monster	Duck	1029,4,200000,35000
+018-7-1,80,59,4,12	monster	Nature Fairy	1186,3,200000,35000
diff --git a/npc/018-7-1/_warps.txt b/npc/018-7-1/_warps.txt
new file mode 100644
index 000000000..eed0ec149
--- /dev/null
+++ b/npc/018-7-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-7-1: Developers' Lair (Lilit Palace) warps
+018-7-1,56,100,0	warp	#018-7-1_56_100	0,0,018-7,59,71
diff --git a/npc/018-7/_import.txt b/npc/018-7/_import.txt
new file mode 100644
index 000000000..cfc6bbc4f
--- /dev/null
+++ b/npc/018-7/_import.txt
@@ -0,0 +1,4 @@
+// Map 018-7: Lilit - Developers' Sanctuary
+// This file is generated automatically. All manually added changes will be removed when running the Converter.
+"npc/018-7/_mobs.txt",
+"npc/018-7/_warps.txt",
diff --git a/npc/018-7/_mobs.txt b/npc/018-7/_mobs.txt
new file mode 100644
index 000000000..ffd338a3f
--- /dev/null
+++ b/npc/018-7/_mobs.txt
@@ -0,0 +1,8 @@
+// This file is generated automatically. All manually added changes will be removed when running the Converter.
+// Map 018-7: Lilit - Developers' Sanctuary mobs
+018-7,59,74,14,4	monster	Duck	1029,6,200000,35000
+018-7,69,27,8,7	monster	Forest Piou	1202,4,35000,120000
+018-7,61,57,44,43	monster	Wind Fairy	1185,16,40000,20000
+018-7,34,73,25,34	monster	Water Fairy	1185,6,20000,40000
+018-7,85,73,25,34	monster	Fire Fairy	1183,6,20000,40000
+018-7,59,40,48,22	monster	Earth Fairy	1182,6,20000,40000
diff --git a/npc/018-7/_warps.txt b/npc/018-7/_warps.txt
new file mode 100644
index 000000000..f26f85e6c
--- /dev/null
+++ b/npc/018-7/_warps.txt
@@ -0,0 +1,4 @@
+// This file is generated automatically. All manually added changes will be removed when running the Converter.
+// Map 018-7: Lilit - Developers' Sanctuary warps
+018-7,59,70,0	warp	#018-7_59_70	0,0,018-7-1,56,99
+018-7,52,32,0	warp	#018-7_52_32	0,0,018-5,100,53
diff --git a/npc/_import.txt b/npc/_import.txt
index f8ac0cad8..d2c336d64 100644
--- a/npc/_import.txt
+++ b/npc/_import.txt
@@ -148,6 +148,8 @@
 @include "npc/018-6-1/_import.txt"
 @include "npc/018-6-2/_import.txt"
 @include "npc/018-6-3/_import.txt"
+@include "npc/018-7-1/_import.txt"
+@include "npc/018-7/_import.txt"
 @include "npc/019-1-1/_import.txt"
 @include "npc/019-1/_import.txt"
 @include "npc/019-2/_import.txt"