Gemini Inn unlocked

11 files changed, 308 insertions, 245 deletions

diff --git a/conf/map/maps.conf b/conf/map/maps.conf
index 0c34637ba..ea27ae2c0 100644
--- a/conf/map/maps.conf
+++ b/conf/map/maps.conf
@@ -154,6 +154,7 @@ map_list: (
     "013-1",
     "014-1",
     "014-2-1",
+    "014-2-2",
     "014-2",
     "014-3",
     "014-4",
diff --git a/db/map_index.txt b/db/map_index.txt
index d86006be9..14a605ca4 100644
--- a/db/map_index.txt
+++ b/db/map_index.txt
@@ -151,247 +151,248 @@
 013-1 151
 014-1 152
 014-2-1 153
-014-2 154
-014-3 155
-014-4 156
-014-5-1 157
-014-5 158
-015-1 159
-015-2 160
-015-3-1 161
-015-3-2 162
-015-3-3 163
-015-3 164
-015-4 165
-015-5 166
-015-6 167
-015-7 168
-015-8-1 169
-015-8 170
-016-1 171
-016-6 172
-016-7 173
-017-0 174
-017-1 175
-017-10 176
-017-2-1 177
-017-2-2 178
-017-2 179
-017-3 180
-017-4 181
-017-5 182
-017-6 183
-017-7 184
-017-8 185
-018-1-1 186
-018-1 187
-018-2-1 188
-018-2-2 189
-018-2-3 190
-018-2-4 191
-018-2-5 192
-018-2-6 193
-018-2-7 194
-018-2-8 195
-018-2 196
-018-3 197
-018-4-1 198
-018-4-2 199
-018-4 200
-018-5-0 201
-018-5-1 202
-018-5-2 203
-018-5-3 204
-018-5-4 205
-018-5-5 206
-018-5-boss 207
-018-5 208
-018-6-0 209
-018-6-1 210
-018-6-2 211
-018-6-3 212
-018-7-1 213
-018-7 214
-019-1-1 215
-019-1 216
-019-2 217
-019-3 218
-019-4-1 219
-019-4 220
-020-1 221
-020-2 222
-020-3 223
-020-4 224
-020-5 225
-020-6 226
-020-7-1 227
-020-7-2 228
-020-7 229
-021-0 230
-021-1 231
-021-2 232
-021-3 233
-021-4 234
-022-1 235
-023-1 236
-023-2 237
-023-3-1 238
-023-3-2 239
-023-3 240
-023-4 241
-024-1 242
-024-10 243
-024-11 244
-024-12 245
-024-13 246
-024-14 247
-024-15 248
-024-16 249
-024-2 250
-024-3 251
-024-4 252
-024-5 253
-024-6 254
-024-7 255
-024-8 256
-024-9 257
-025-1 258
-025-2-1 259
-025-2-2 260
-025-2-3 261
-025-2-4 262
-025-2 263
-025-3 264
-026-0 265
-026-1 266
-026-2 267
-027-0 268
-027-1 269
-027-2 270
-027-3 271
-027-4 272
-029-0 273
-029-1 274
-029-2 275
-029-3 276
-029-4 277
-029-5 278
-029-6 279
-029-7 280
-029-8 281
-029-9 282
-030-01 283
-030-02 284
-030-03 285
-030-04 286
-030-05 287
-030-06 288
-030-07 289
-030-08 290
-030-09 291
-030-10 292
-030-11 293
-030-12 294
-030-13 295
-030-14 296
-030-15 297
-030-16 298
-030-17 299
-030-18 300
-030-19 301
-030-20 302
-030-21 303
-030-22 304
-030-23 305
-030-24 306
-030-25 307
-030-26 308
-030-27 309
-030-28 310
-030-29 311
-030-30 312
-030-31 313
-030-32 314
-030-33 315
-030-34 316
-030-35 317
-030-36 318
-030-37 319
-030-38 320
-030-39 321
-030-40 322
-030-41 323
-030-42 324
-030-43 325
-030-44 326
-030-45 327
-030-46 328
-030-47 329
-030-48 330
-030-49 331
-030-50 332
-030-51 333
-030-52 334
-030-53 335
-030-54 336
-030-55 337
-030-56 338
-030-57 339
-030-58 340
-030-59 341
-030-60 342
-030-61 343
-030-62 344
-030-63 345
-030-64 346
-030-65 347
-030-66 348
-030-67 349
-030-68 350
-030-69 351
-030-70 352
-030-71 353
-030-72 354
-030-73 355
-030-74 356
-030-75 357
-031-0 358
-031-1 359
-031-2 360
-031-3 361
-031-4 362
-031-5 363
-031-6 364
-031-7 365
-031-8 366
-031-9 367
-032-1 368
-033-1 369
-033-2 370
-033-3 371
-033-4 372
-033-5 373
-034-1 374
-034-2 375
-034-3 376
-034-4 377
-042-0 378
-042-1 379
-042-10 380
-042-11 381
-042-2 382
-042-3 383
-042-4 384
-042-5 385
-042-6 386
-042-7 387
-042-8 388
-042-9 389
-boss 390
-botcheck 391
-guilds 392
-sec_pri 393
-soren-2 394
-soren 395
-test 396
-testbg 397
+014-2-2 154
+014-2 155
+014-3 156
+014-4 157
+014-5-1 158
+014-5 159
+015-1 160
+015-2 161
+015-3-1 162
+015-3-2 163
+015-3-3 164
+015-3 165
+015-4 166
+015-5 167
+015-6 168
+015-7 169
+015-8-1 170
+015-8 171
+016-1 172
+016-6 173
+016-7 174
+017-0 175
+017-1 176
+017-10 177
+017-2-1 178
+017-2-2 179
+017-2 180
+017-3 181
+017-4 182
+017-5 183
+017-6 184
+017-7 185
+017-8 186
+018-1-1 187
+018-1 188
+018-2-1 189
+018-2-2 190
+018-2-3 191
+018-2-4 192
+018-2-5 193
+018-2-6 194
+018-2-7 195
+018-2-8 196
+018-2 197
+018-3 198
+018-4-1 199
+018-4-2 200
+018-4 201
+018-5-0 202
+018-5-1 203
+018-5-2 204
+018-5-3 205
+018-5-4 206
+018-5-5 207
+018-5-boss 208
+018-5 209
+018-6-0 210
+018-6-1 211
+018-6-2 212
+018-6-3 213
+018-7-1 214
+018-7 215
+019-1-1 216
+019-1 217
+019-2 218
+019-3 219
+019-4-1 220
+019-4 221
+020-1 222
+020-2 223
+020-3 224
+020-4 225
+020-5 226
+020-6 227
+020-7-1 228
+020-7-2 229
+020-7 230
+021-0 231
+021-1 232
+021-2 233
+021-3 234
+021-4 235
+022-1 236
+023-1 237
+023-2 238
+023-3-1 239
+023-3-2 240
+023-3 241
+023-4 242
+024-1 243
+024-10 244
+024-11 245
+024-12 246
+024-13 247
+024-14 248
+024-15 249
+024-16 250
+024-2 251
+024-3 252
+024-4 253
+024-5 254
+024-6 255
+024-7 256
+024-8 257
+024-9 258
+025-1 259
+025-2-1 260
+025-2-2 261
+025-2-3 262
+025-2-4 263
+025-2 264
+025-3 265
+026-0 266
+026-1 267
+026-2 268
+027-0 269
+027-1 270
+027-2 271
+027-3 272
+027-4 273
+029-0 274
+029-1 275
+029-2 276
+029-3 277
+029-4 278
+029-5 279
+029-6 280
+029-7 281
+029-8 282
+029-9 283
+030-01 284
+030-02 285
+030-03 286
+030-04 287
+030-05 288
+030-06 289
+030-07 290
+030-08 291
+030-09 292
+030-10 293
+030-11 294
+030-12 295
+030-13 296
+030-14 297
+030-15 298
+030-16 299
+030-17 300
+030-18 301
+030-19 302
+030-20 303
+030-21 304
+030-22 305
+030-23 306
+030-24 307
+030-25 308
+030-26 309
+030-27 310
+030-28 311
+030-29 312
+030-30 313
+030-31 314
+030-32 315
+030-33 316
+030-34 317
+030-35 318
+030-36 319
+030-37 320
+030-38 321
+030-39 322
+030-40 323
+030-41 324
+030-42 325
+030-43 326
+030-44 327
+030-45 328
+030-46 329
+030-47 330
+030-48 331
+030-49 332
+030-50 333
+030-51 334
+030-52 335
+030-53 336
+030-54 337
+030-55 338
+030-56 339
+030-57 340
+030-58 341
+030-59 342
+030-60 343
+030-61 344
+030-62 345
+030-63 346
+030-64 347
+030-65 348
+030-66 349
+030-67 350
+030-68 351
+030-69 352
+030-70 353
+030-71 354
+030-72 355
+030-73 356
+030-74 357
+030-75 358
+031-0 359
+031-1 360
+031-2 361
+031-3 362
+031-4 363
+031-5 364
+031-6 365
+031-7 366
+031-8 367
+031-9 368
+032-1 369
+033-1 370
+033-2 371
+033-3 372
+033-4 373
+033-5 374
+034-1 375
+034-2 376
+034-3 377
+034-4 378
+042-0 379
+042-1 380
+042-10 381
+042-11 382
+042-2 383
+042-3 384
+042-4 385
+042-5 386
+042-6 387
+042-7 388
+042-8 389
+042-9 390
+boss 391
+botcheck 392
+guilds 393
+sec_pri 394
+soren-2 395
+soren 396
+test 397
+testbg 398
diff --git a/maps/re/014-2-2.mcache b/maps/re/014-2-2.mcache
new file mode 100644
index 000000000..05a682931
--- /dev/null
+++ b/maps/re/014-2-2.mcache
diff --git a/maps/re/014-2.mcache b/maps/re/014-2.mcache
index d3b37e990..fa7fd60ea 100644
--- a/maps/re/014-2.mcache
+++ b/maps/re/014-2.mcache
diff --git a/npc/014-2-2/_import.txt b/npc/014-2-2/_import.txt
new file mode 100644
index 000000000..0c96b6aa0
--- /dev/null
+++ b/npc/014-2-2/_import.txt
@@ -0,0 +1,3 @@
+// Map 014-2-2: Forsaken Inn
+// This file is generated automatically. All manually added changes will be removed when running the Converter.
+"npc/014-2-2/_warps.txt",
diff --git a/npc/014-2-2/_warps.txt b/npc/014-2-2/_warps.txt
new file mode 100644
index 000000000..ff20d0aa0
--- /dev/null
+++ b/npc/014-2-2/_warps.txt
@@ -0,0 +1,3 @@
+// This file is generated automatically. All manually added changes will be removed when running the Converter.
+// Map 014-2-2: Forsaken Inn warps
+014-2-2,34,35,0	warp	#014-2-2_34_35	0,0,014-2,183,77
diff --git a/npc/014-2/_import.txt b/npc/014-2/_import.txt
index 4cadbd274..1ee7fb0b6 100644
--- a/npc/014-2/_import.txt
+++ b/npc/014-2/_import.txt
@@ -5,3 +5,4 @@
 "npc/014-2/carla.txt",
 "npc/014-2/guards.txt",
 "npc/014-2/mouboo.txt",
+"npc/014-2/trap.txt",
diff --git a/npc/014-2/_warps.txt b/npc/014-2/_warps.txt
index 0a2817bd9..c159673d0 100644
--- a/npc/014-2/_warps.txt
+++ b/npc/014-2/_warps.txt
@@ -2,4 +2,5 @@
 // Map 014-2: Woodlands Southeast warps
 014-2,179,21,0	warp	#014-2_179_21	3,0,012-1,78,101
 014-2,232,20,0	warp	#014-2_232_20	2,0,012-1,132,100
+014-2,183,76,0	warp	#014-2_183_76	0,0,014-2-2,34,34
 014-2,49,24,0	warp	#014-2_49_24	1,0,014-3,130,134
diff --git a/npc/014-2/trap.txt b/npc/014-2/trap.txt
new file mode 100644
index 000000000..924943dbd
--- /dev/null
+++ b/npc/014-2/trap.txt
@@ -0,0 +1,52 @@
+// TMW2 scripts.
+// Authors:
+//    Jesusalva
+// Description:
+//    Gemini Sisters Quest - Traps
+
+014-2,230,58,0	script	#GeminiTrap1	NPC_HIDDEN,0,0,{
+OnTouch:
+    if (getq(General_Narrator) < 16) {
+        mesc l("WARNING:"), 1;
+        mes l("You are not welcome on this island.");
+        mes "";
+        mes l("No mercy will be shown, turn back now!");
+        mes "";
+        mes l("-- Valia G.");
+        close;
+    }
+    end;
+}
+
+014-2,230,60,0	script	#GeminiTrap2	NPC_HIDDEN,0,0,{
+OnTouch:
+    if (getq(General_Narrator) < 16) {
+        slide 230, 56;
+        dispbottom l("You are pushed back with extreme force!");
+        percentheal -15, 0;
+    }
+    end;
+}
+
+014-2,228,64,0	script	#GeminiTrap3	NPC_HIDDEN,0,0,{
+OnTouch:
+    if (getq(General_Narrator) < 16) {
+        slide 230, 56;
+        dispbottom l("You are pushed back with absolute force!");
+        percentheal -85, 0;
+    }
+    end;
+}
+
+// Should never trigger
+014-2,221,69,0	script	#GeminiTrap4	NPC_HIDDEN,1,1,{
+OnTouch:
+    if (getq(General_Narrator) < 16) {
+        warp "Save", 0, 0;
+        dispbottom l("You don't feel so well... And then, you're dead.");
+        die();
+        end;
+    }
+    end;
+}
+
diff --git a/npc/034-4/exit.txt b/npc/034-4/exit.txt
index 8afc3392a..a20664099 100644
--- a/npc/034-4/exit.txt
+++ b/npc/034-4/exit.txt
@@ -144,7 +144,7 @@ OnTouch:
     // Defeating the boss yields a bonus
     InitMaze(7200);
     dispbottom l("It was a trap! We must escape!");
-    sleep2(2000);
+    sleep2(2500);
     @forced_sick$ = getmap();
 	doevent "#DungeonCore::OnSick";
     end;
diff --git a/npc/_import.txt b/npc/_import.txt
index 782d21fdf..d6a59f20c 100644
--- a/npc/_import.txt
+++ b/npc/_import.txt
@@ -153,6 +153,7 @@
 @include "npc/013-1/_import.txt"
 @include "npc/014-1/_import.txt"
 @include "npc/014-2-1/_import.txt"
+@include "npc/014-2-2/_import.txt"
 @include "npc/014-2/_import.txt"
 @include "npc/014-3/_import.txt"
 @include "npc/014-4/_import.txt"