7 files changed, 407 insertions, 278 deletions
diff --git a/conf/map/maps.conf b/conf/map/maps.conf
index 0caeb4d92..1f1bb24e7 100644
--- a/conf/map/maps.conf
+++ b/conf/map/maps.conf
@@ -11,6 +11,7 @@ map_list: (
     "001-11",
     "001-12",
     "001-13",
+    "001-14",
     "001-2",
     "001-3-1",
     "001-3",
diff --git a/db/map_index.txt b/db/map_index.txt
index 51541c610..ce4d85927 100644
--- a/db/map_index.txt
+++ b/db/map_index.txt
@@ -8,280 +8,281 @@
 001-11 8
 001-12 9
 001-13 10
-001-2 11
-001-3-1 12
-001-3 13
-001-4 14
-001-5 15
-001-6 16
-001-7 17
-001-8 18
-001-9 19
-002-1 20
-002-2 21
-002-3 22
-002-4 23
-002-5 24
-003-0-1 25
-003-0-2 26
-003-0 27
-003-1-1 28
-003-1-2 29
-003-1-3 30
-003-1 31
-003-10 32
-003-13 33
-003-2-1 34
-003-2 35
-003-3 36
-003-4-1 37
-003-4 38
-003-5 39
-003-6 40
-003-7 41
-003-8 42
-003-9-1 43
-003-9 44
-004-1 45
-004-2-1 46
-004-2 47
-005-1-1 48
-005-1 49
-005-2-1 50
-005-2 51
-005-3 52
-005-4 53
-005-5 54
-005-6 55
-005-7 56
-006-0 57
-006-1 58
-006-10 59
-006-2-1 60
-006-2-2 61
-006-2-3 62
-006-2-4 63
-006-2-5 64
-006-2-6 65
-006-2 66
-006-3 67
-006-4-1 68
-006-4 69
-006-5 70
-006-6 71
-006-7 72
-006-8 73
-006-9 74
-007-1 75
-007-2 76
-008-0 77
-008-1 78
-008-2 79
-009-1 80
-009-2 81
-009-3 82
-009-4 83
-009-5 84
-009-6 85
-009-7 86
-010-1-1 87
-010-1 88
-010-2 89
-011-1 90
-011-2 91
-011-3 92
-012-1 93
-012-2 94
-012-3 95
-012-4 96
-012-5 97
-012-6 98
-012-7 99
-012-8 100
-013-1 101
-014-1 102
-014-2-1 103
-014-2 104
-014-3 105
-014-4 106
-014-5-1 107
-014-5 108
-015-1 109
-015-2 110
-015-3-1 111
-015-3-2 112
-015-3-3 113
-015-3 114
-015-4 115
-015-5 116
-015-6 117
-015-7 118
-015-8-1 119
-015-8 120
-016-1 121
-016-6 122
-016-7 123
-017-0 124
-017-1 125
-017-10 126
-017-2-1 127
-017-2-2 128
-017-2 129
-017-3 130
-017-4 131
-017-5 132
-017-6 133
-017-7 134
-017-8 135
-018-1-1 136
-018-1 137
-018-2-1 138
-018-2-2 139
-018-2-3 140
-018-2-4 141
-018-2-5 142
-018-2-6 143
-018-2-7 144
-018-2-8 145
-018-2 146
-018-3 147
-018-4-1 148
-018-4-2 149
-018-4 150
-018-5-0 151
-018-5-1 152
-018-5-2 153
-018-5-3 154
-018-5-4 155
-018-5-5 156
-018-5-boss 157
-018-5 158
-018-6-0 159
-018-6-1 160
-018-6-2 161
-018-6-3 162
-018-7-1 163
-018-7 164
-019-1-1 165
-019-1 166
-019-2 167
-019-3 168
-019-4-1 169
-019-4 170
-020-1 171
-020-2 172
-020-3 173
-020-4 174
-020-5 175
-020-6 176
-020-7-1 177
-020-7-2 178
-020-7 179
-021-0 180
-021-1 181
-021-2 182
-021-3 183
-021-4 184
-022-1 185
-023-1 186
-023-2 187
-023-3-1 188
-023-3-2 189
-023-3 190
-023-4 191
-024-1 192
-024-10 193
-024-11 194
-024-12 195
-024-13 196
-024-14 197
-024-15 198
-024-16 199
-024-2 200
-024-3 201
-024-4 202
-024-5 203
-024-6 204
-024-7 205
-024-8 206
-024-9 207
-025-1 208
-025-2-1 209
-025-2-2 210
-025-2-3 211
-025-2-4 212
-025-2 213
-025-3 214
-026-0 215
-026-1 216
-026-2 217
-027-0 218
-027-1 219
-027-2 220
-027-3 221
-027-4 222
-029-0 223
-029-1 224
-029-2 225
-029-3 226
-029-4 227
-029-5 228
-029-6 229
-029-7 230
-029-8 231
-029-9 232
-030-01 233
-030-02 234
-030-03 235
-030-04 236
-030-05 237
-030-06 238
-030-07 239
-030-08 240
-030-09 241
-030-10 242
-030-11 243
-030-12 244
-030-13 245
-030-14 246
-030-15 247
-030-16 248
-030-17 249
-030-18 250
-030-19 251
-030-20 252
-030-21 253
-030-22 254
-030-23 255
-030-24 256
-031-0 257
-031-1 258
-031-2 259
-031-3 260
-031-4 261
-031-5 262
-031-6 263
-031-7 264
-031-8 265
-031-9 266
-032-1 267
-042-0 268
-042-1 269
-042-10 270
-042-11 271
-042-2 272
-042-3 273
-042-4 274
-042-5 275
-042-6 276
-042-7 277
-042-8 278
-042-9 279
-boss 280
-botcheck 281
-guilds 282
-sec_pri 283
-soren-2 284
-soren 285
-test 286
-testbg 287
+001-14 11
+001-2 12
+001-3-1 13
+001-3 14
+001-4 15
+001-5 16
+001-6 17
+001-7 18
+001-8 19
+001-9 20
+002-1 21
+002-2 22
+002-3 23
+002-4 24
+002-5 25
+003-0-1 26
+003-0-2 27
+003-0 28
+003-1-1 29
+003-1-2 30
+003-1-3 31
+003-1 32
+003-10 33
+003-13 34
+003-2-1 35
+003-2 36
+003-3 37
+003-4-1 38
+003-4 39
+003-5 40
+003-6 41
+003-7 42
+003-8 43
+003-9-1 44
+003-9 45
+004-1 46
+004-2-1 47
+004-2 48
+005-1-1 49
+005-1 50
+005-2-1 51
+005-2 52
+005-3 53
+005-4 54
+005-5 55
+005-6 56
+005-7 57
+006-0 58
+006-1 59
+006-10 60
+006-2-1 61
+006-2-2 62
+006-2-3 63
+006-2-4 64
+006-2-5 65
+006-2-6 66
+006-2 67
+006-3 68
+006-4-1 69
+006-4 70
+006-5 71
+006-6 72
+006-7 73
+006-8 74
+006-9 75
+007-1 76
+007-2 77
+008-0 78
+008-1 79
+008-2 80
+009-1 81
+009-2 82
+009-3 83
+009-4 84
+009-5 85
+009-6 86
+009-7 87
+010-1-1 88
+010-1 89
+010-2 90
+011-1 91
+011-2 92
+011-3 93
+012-1 94
+012-2 95
+012-3 96
+012-4 97
+012-5 98
+012-6 99
+012-7 100
+012-8 101
+013-1 102
+014-1 103
+014-2-1 104
+014-2 105
+014-3 106
+014-4 107
+014-5-1 108
+014-5 109
+015-1 110
+015-2 111
+015-3-1 112
+015-3-2 113
+015-3-3 114
+015-3 115
+015-4 116
+015-5 117
+015-6 118
+015-7 119
+015-8-1 120
+015-8 121
+016-1 122
+016-6 123
+016-7 124
+017-0 125
+017-1 126
+017-10 127
+017-2-1 128
+017-2-2 129
+017-2 130
+017-3 131
+017-4 132
+017-5 133
+017-6 134
+017-7 135
+017-8 136
+018-1-1 137
+018-1 138
+018-2-1 139
+018-2-2 140
+018-2-3 141
+018-2-4 142
+018-2-5 143
+018-2-6 144
+018-2-7 145
+018-2-8 146
+018-2 147
+018-3 148
+018-4-1 149
+018-4-2 150
+018-4 151
+018-5-0 152
+018-5-1 153
+018-5-2 154
+018-5-3 155
+018-5-4 156
+018-5-5 157
+018-5-boss 158
+018-5 159
+018-6-0 160
+018-6-1 161
+018-6-2 162
+018-6-3 163
+018-7-1 164
+018-7 165
+019-1-1 166
+019-1 167
+019-2 168
+019-3 169
+019-4-1 170
+019-4 171
+020-1 172
+020-2 173
+020-3 174
+020-4 175
+020-5 176
+020-6 177
+020-7-1 178
+020-7-2 179
+020-7 180
+021-0 181
+021-1 182
+021-2 183
+021-3 184
+021-4 185
+022-1 186
+023-1 187
+023-2 188
+023-3-1 189
+023-3-2 190
+023-3 191
+023-4 192
+024-1 193
+024-10 194
+024-11 195
+024-12 196
+024-13 197
+024-14 198
+024-15 199
+024-16 200
+024-2 201
+024-3 202
+024-4 203
+024-5 204
+024-6 205
+024-7 206
+024-8 207
+024-9 208
+025-1 209
+025-2-1 210
+025-2-2 211
+025-2-3 212
+025-2-4 213
+025-2 214
+025-3 215
+026-0 216
+026-1 217
+026-2 218
+027-0 219
+027-1 220
+027-2 221
+027-3 222
+027-4 223
+029-0 224
+029-1 225
+029-2 226
+029-3 227
+029-4 228
+029-5 229
+029-6 230
+029-7 231
+029-8 232
+029-9 233
+030-01 234
+030-02 235
+030-03 236
+030-04 237
+030-05 238
+030-06 239
+030-07 240
+030-08 241
+030-09 242
+030-10 243
+030-11 244
+030-12 245
+030-13 246
+030-14 247
+030-15 248
+030-16 249
+030-17 250
+030-18 251
+030-19 252
+030-20 253
+030-21 254
+030-22 255
+030-23 256
+030-24 257
+031-0 258
+031-1 259
+031-2 260
+031-3 261
+031-4 262
+031-5 263
+031-6 264
+031-7 265
+031-8 266
+031-9 267
+032-1 268
+042-0 269
+042-1 270
+042-10 271
+042-11 272
+042-2 273
+042-3 274
+042-4 275
+042-5 276
+042-6 277
+042-7 278
+042-8 279
+042-9 280
+boss 281
+botcheck 282
+guilds 283
+sec_pri 284
+soren-2 285
+soren 286
+test 287
+testbg 288
diff --git a/maps/re/001-14.mcache b/maps/re/001-14.mcache
new file mode 100644
index 000000000..29bb631c1
--- /dev/null
+++ b/maps/re/001-14.mcache
diff --git a/npc/001-14/_import.txt b/npc/001-14/_import.txt
new file mode 100644
index 000000000..d304c1aa5
--- /dev/null
+++ b/npc/001-14/_import.txt
@@ -0,0 +1,3 @@
+// Map 001-14: Porthos - The Town Of Portals
+// This file is generated automatically. All manually added changes will be removed when running the Converter.
+"npc/001-14/_warps.txt",
diff --git a/npc/001-14/_warps.txt b/npc/001-14/_warps.txt
new file mode 100644
index 000000000..e614565e2
--- /dev/null
+++ b/npc/001-14/_warps.txt
@@ -0,0 +1,123 @@
+// This file is generated automatically. All manually added changes will be removed when running the Converter.
+// Map 001-14: Porthos - The Town Of Portals warps
+001-14,90,27,0	script	#001-14_90_27	NPC_HIDDEN,0,0,{
+	end;
+OnTouch:
+	slide 90,65; end;
+}
+001-14,62,33,0	script	#001-14_62_33	NPC_HIDDEN,0,0,{
+	end;
+OnTouch:
+	slide 79,70; end;
+}
+001-14,113,42,0	script	#001-14_113_42	NPC_HIDDEN,0,0,{
+	end;
+OnTouch:
+	slide 101,70; end;
+}
+001-14,135,57,0	script	#001-14_135_57	NPC_HIDDEN,0,0,{
+	end;
+OnTouch:
+	slide 110,78; end;
+}
+001-14,137,85,0	script	#001-14_137_85	NPC_HIDDEN,0,0,{
+	end;
+OnTouch:
+	slide 111,91; end;
+}
+001-14,135,113,0	script	#001-14_135_113	NPC_HIDDEN,0,0,{
+	end;
+OnTouch:
+	slide 109,102; end;
+}
+001-14,119,131,0	script	#001-14_119_131	NPC_HIDDEN,0,0,{
+	end;
+OnTouch:
+	slide 101,110; end;
+}
+001-14,90,139,0	script	#001-14_90_139	NPC_HIDDEN,0,0,{
+	end;
+OnTouch:
+	slide 90,114; end;
+}
+001-14,54,129,0	script	#001-14_54_129	NPC_HIDDEN,0,0,{
+	end;
+OnTouch:
+	slide 79,109; end;
+}
+001-14,39,110,0	script	#001-14_39_110	NPC_HIDDEN,0,0,{
+	end;
+OnTouch:
+	slide 71,101; end;
+}
+001-14,35,84,0	script	#001-14_35_84	NPC_HIDDEN,0,0,{
+	end;
+OnTouch:
+	slide 69,89; end;
+}
+001-14,43,46,0	script	#001-14_43_46	NPC_HIDDEN,0,0,{
+	end;
+OnTouch:
+	slide 71,78; end;
+}
+001-14,90,64,0	script	#001-14_90_64	NPC_HIDDEN,0,0,{
+	end;
+OnTouch:
+	slide 90,34; end;
+}
+001-14,101,69,0	script	#001-14_101_69	NPC_HIDDEN,0,0,{
+	end;
+OnTouch:
+	slide 113,49; end;
+}
+001-14,110,77,0	script	#001-14_110_77	NPC_HIDDEN,0,0,{
+	end;
+OnTouch:
+	slide 135,64; end;
+}
+001-14,111,90,0	script	#001-14_111_90	NPC_HIDDEN,0,0,{
+	end;
+OnTouch:
+	slide 137,92; end;
+}
+001-14,109,103,0	script	#001-14_109_103	NPC_HIDDEN,0,0,{
+	end;
+OnTouch:
+	slide 135,120; end;
+}
+001-14,101,111,0	script	#001-14_101_111	NPC_HIDDEN,0,0,{
+	end;
+OnTouch:
+	slide 119,138; end;
+}
+001-14,90,115,0	script	#001-14_90_115	NPC_HIDDEN,0,0,{
+	end;
+OnTouch:
+	slide 90,146; end;
+}
+001-14,79,110,0	script	#001-14_79_110	NPC_HIDDEN,0,0,{
+	end;
+OnTouch:
+	slide 54,136; end;
+}
+001-14,71,102,0	script	#001-14_71_102	NPC_HIDDEN,0,0,{
+	end;
+OnTouch:
+	slide 39,117; end;
+}
+001-14,69,90,0	script	#001-14_69_90	NPC_HIDDEN,0,0,{
+	end;
+OnTouch:
+	slide 35,91; end;
+}
+001-14,71,77,0	script	#001-14_71_77	NPC_HIDDEN,0,0,{
+	end;
+OnTouch:
+	slide 43,53; end;
+}
+001-14,79,69,0	script	#001-14_79_69	NPC_HIDDEN,0,0,{
+	end;
+OnTouch:
+	slide 62,40; end;
+}
+001-14,92,89,0	warp	#001-14_92_89	0,0,000-1,22,22
diff --git a/npc/_import.txt b/npc/_import.txt
index db651f62e..45971c295 100644
--- a/npc/_import.txt
+++ b/npc/_import.txt
@@ -10,6 +10,7 @@
 @include "npc/001-11/_import.txt"
 @include "npc/001-12/_import.txt"
 @include "npc/001-13/_import.txt"
+@include "npc/001-14/_import.txt"
 @include "npc/001-2/_import.txt"
 @include "npc/001-3-1/_import.txt"
 @include "npc/001-3/_import.txt"
diff --git a/npc/functions/aurora.txt b/npc/functions/aurora.txt
index fed63e8f8..0e11c47fe 100644
--- a/npc/functions/aurora.txt
+++ b/npc/functions/aurora.txt
@@ -356,7 +356,7 @@ function	script	FYEConf_Regnum	{
 
 // Configure World Expo
 function	script	FYEConf_Expo	{
-    $WORLDEXPO_ENEMY$=any("Xakabael the Dark", "Isbamuth", "Saulc", "SUSAN", "Terogan");
+    $WORLDEXPO_ENEMY$=any("Xakabael the Dark", "Isbamuth", "Saulc", "SUSAN", "Terogan", ($GAME_STORYLINE >= 5 ? "Moubootaur" : "Monster King"));
     setarray $FYREWARD_PT, 100, 220, 440, 880, 1320,
                            1760, 2640, 3520, 5280, 7040,
                            10560, 14080, 21120, 28160, 32000,