8 files changed, 131 insertions, 102 deletions
diff --git a/conf/map/maps.conf b/conf/map/maps.conf
index def50e165..203bb212d 100644
--- a/conf/map/maps.conf
+++ b/conf/map/maps.conf
@@ -143,6 +143,7 @@ map_list: (
     "018-5-2",
     "018-5-3",
     "018-5-4",
+    "018-5-5",
     "018-5-boss",
     "018-5",
     "018-6-0",
diff --git a/db/map_index.txt b/db/map_index.txt
index 57dc87a72..c2856a8d2 100644
--- a/db/map_index.txt
+++ b/db/map_index.txt
@@ -140,104 +140,105 @@
 018-5-2 140
 018-5-3 141
 018-5-4 142
-018-5-boss 143
-018-5 144
-018-6-0 145
-018-6-1 146
-018-6-2 147
-018-6-3 148
-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
-026-2 202
-027-0 203
-027-1 204
-027-2 205
-027-3 206
-027-4 207
-042-0 208
-042-1 209
-042-10 210
-042-11 211
-042-2 212
-042-3 213
-042-4 214
-042-5 215
-042-6 216
-042-7 217
-042-8 218
-042-9 219
-boss 220
-botcheck 221
-guilds 222
-maze0 223
-maze1 224
-maze10 225
-maze11 226
-maze12 227
-maze13 228
-maze14 229
-maze15 230
-maze2 231
-maze3 232
-maze4 233
-maze5 234
-maze6 235
-maze7 236
-maze8 237
-maze9 238
-sec_pri 239
-soren-2 240
-soren 241
-test 242
-testbg 243
+018-5-5 143
+018-5-boss 144
+018-5 145
+018-6-0 146
+018-6-1 147
+018-6-2 148
+018-6-3 149
+018-7-1 150
+018-7 151
+019-1-1 152
+019-1 153
+019-2 154
+019-3 155
+019-4-1 156
+019-4 157
+020-1 158
+020-2 159
+020-3 160
+020-4 161
+020-5 162
+020-6 163
+020-7-1 164
+020-7-2 165
+020-7 166
+021-0 167
+021-1 168
+021-2 169
+021-3 170
+021-4 171
+022-1 172
+023-1 173
+023-2 174
+023-3-1 175
+023-3-2 176
+023-3 177
+024-1 178
+024-10 179
+024-11 180
+024-12 181
+024-13 182
+024-14 183
+024-15 184
+024-16 185
+024-2 186
+024-3 187
+024-4 188
+024-5 189
+024-6 190
+024-7 191
+024-8 192
+024-9 193
+025-1 194
+025-2-1 195
+025-2-2 196
+025-2-3 197
+025-2-4 198
+025-2 199
+025-3 200
+026-0 201
+026-1 202
+026-2 203
+027-0 204
+027-1 205
+027-2 206
+027-3 207
+027-4 208
+042-0 209
+042-1 210
+042-10 211
+042-11 212
+042-2 213
+042-3 214
+042-4 215
+042-5 216
+042-6 217
+042-7 218
+042-8 219
+042-9 220
+boss 221
+botcheck 222
+guilds 223
+maze0 224
+maze1 225
+maze10 226
+maze11 227
+maze12 228
+maze13 229
+maze14 230
+maze15 231
+maze2 232
+maze3 233
+maze4 234
+maze5 235
+maze6 236
+maze7 237
+maze8 238
+maze9 239
+sec_pri 240
+soren-2 241
+soren 242
+test 243
+testbg 244
diff --git a/maps/re/018-5-5.mcache b/maps/re/018-5-5.mcache
new file mode 100644
index 000000000..aaa44988d
--- /dev/null
+++ b/maps/re/018-5-5.mcache
diff --git a/npc/018-5-5/_import.txt b/npc/018-5-5/_import.txt
new file mode 100644
index 000000000..bcf2f812f
--- /dev/null
+++ b/npc/018-5-5/_import.txt
@@ -0,0 +1,4 @@
+// Map 018-5-5: Indoors
+// This file is generated automatically. All manually added changes will be removed when running the Converter.
+"npc/018-5-5/_warps.txt",
+"npc/018-5-5/ivanize.txt",
diff --git a/npc/018-5-5/_warps.txt b/npc/018-5-5/_warps.txt
new file mode 100644
index 000000000..aebe078b1
--- /dev/null
+++ b/npc/018-5-5/_warps.txt
@@ -0,0 +1,3 @@
+// This file is generated automatically. All manually added changes will be removed when running the Converter.
+// Map 018-5-5: Indoors warps
+018-5-5,33,47,0	warp	#018-5-5_33_47	1,0,018-5,114,55
diff --git a/npc/018-5-5/ivanize.txt b/npc/018-5-5/ivanize.txt
new file mode 100644
index 000000000..bfec74f6b
--- /dev/null
+++ b/npc/018-5-5/ivanize.txt
@@ -0,0 +1,19 @@
+// TMW2 scripts.
+// Authors:
+//    Indigovox <rui.gravata@hotmail.com>
+//    Jesusalva <jesusalva@tmw2.org>
+// Description:
+//    Evil Fairy
+
+018-5-5,31,26,0	script	Ivanize	NPC_FAIRY_A,{
+    if (strcharinfo(0) == "Manatauro") npctalk3 l("Leave me alone! Stop annoying me!");
+    mesn;
+    mesq l("Can't you see I'm busy?");
+    close;
+
+OnInit:
+    .sex=G_FEMALE;
+    .distance=5;
+    end;
+}
+
diff --git a/npc/026-2/_warps.txt b/npc/026-2/_warps.txt
index 4a2bb4d7a..a80657fb6 100644
--- a/npc/026-2/_warps.txt
+++ b/npc/026-2/_warps.txt
@@ -1,3 +1,3 @@
 // This file is generated automatically. All manually added changes will be removed when running the Converter.
 // Map 026-2: The Impregnable Fortress (B2F) warps
-026-2,32,98,0	warp	#026-2_32_98	0,0,100-1,60,27
+026-2,32,98,0	warp	#026-2_32_98	0,0,026-1,60,27
diff --git a/npc/_import.txt b/npc/_import.txt
index 713f6db20..bc61711ea 100644
--- a/npc/_import.txt
+++ b/npc/_import.txt
@@ -142,6 +142,7 @@
 @include "npc/018-5-2/_import.txt"
 @include "npc/018-5-3/_import.txt"
 @include "npc/018-5-4/_import.txt"
+@include "npc/018-5-5/_import.txt"
 @include "npc/018-5-boss/_import.txt"
 @include "npc/018-5/_import.txt"
 @include "npc/018-6-0/_import.txt"