From c9fb77576d9fd67439344e5929106c5f115132c8 Mon Sep 17 00:00:00 2001
From: Jesusaves <cpntb1@ymail.com>
Date: Tue, 27 Sep 2022 14:07:07 -0300
Subject: Include map variations for Boss Raid: Normal Cave & Inn

---
 conf/map/maps.conf       |   3 +
 db/map_index.txt         | 805 ++++++++++++++++++++++++-----------------------
 maps/re/001-13-0.mcache  | Bin 0 -> 139 bytes
 maps/re/001-13-1.mcache  | Bin 0 -> 123 bytes
 maps/re/001-13-2.mcache  | Bin 0 -> 139 bytes
 npc/001-13-0/_import.txt |   2 +
 npc/001-13-1/_import.txt |   2 +
 npc/001-13-2/_import.txt |   2 +
 npc/001-13/main.txt      |  10 +-
 npc/_import.txt          |   3 +
 10 files changed, 424 insertions(+), 403 deletions(-)
 create mode 100644 maps/re/001-13-0.mcache
 create mode 100644 maps/re/001-13-1.mcache
 create mode 100644 maps/re/001-13-2.mcache
 create mode 100644 npc/001-13-0/_import.txt
 create mode 100644 npc/001-13-1/_import.txt
 create mode 100644 npc/001-13-2/_import.txt

diff --git a/conf/map/maps.conf b/conf/map/maps.conf
index 11798feac..090ad47a3 100644
--- a/conf/map/maps.conf
+++ b/conf/map/maps.conf
@@ -10,6 +10,9 @@ map_list: (
     "001-10",
     "001-11",
     "001-12",
+    "001-13-0",
+    "001-13-1",
+    "001-13-2",
     "001-13",
     "001-14",
     "001-2",
diff --git a/db/map_index.txt b/db/map_index.txt
index d77a24973..bc2a1c856 100644
--- a/db/map_index.txt
+++ b/db/map_index.txt
@@ -7,404 +7,407 @@
 001-10 7
 001-11 8
 001-12 9
-001-13 10
-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-10 48
-004-2-11 49
-004-2-12 50
-004-2-2 51
-004-2-3 52
-004-2-4 53
-004-2-5 54
-004-2-6 55
-004-2-7 56
-004-2-8 57
-004-2-9 58
-004-2 59
-004-3-1 60
-004-3-2 61
-004-3-3 62
-004-3-4 63
-004-3-5 64
-004-3-6 65
-004-3 66
-005-1-1 67
-005-1 68
-005-2-1 69
-005-2 70
-005-3 71
-005-4 72
-005-5 73
-005-6 74
-005-7 75
-006-0 76
-006-1 77
-006-10 78
-006-2-1 79
-006-2-2 80
-006-2-3 81
-006-2-4 82
-006-2-5 83
-006-2-6 84
-006-2 85
-006-3 86
-006-4-1 87
-006-4 88
-006-5 89
-006-6 90
-006-7 91
-006-8 92
-006-9 93
-007-1-1 94
-007-1-2 95
-007-1 96
-007-2 97
-008-0 98
-008-1 99
-008-2 100
-009-1 101
-009-2 102
-009-3 103
-009-4 104
-009-5 105
-009-6 106
-009-7 107
-010-1-1 108
-010-1-10 109
-010-1-11 110
-010-1-12 111
-010-1-2 112
-010-1-3 113
-010-1-4 114
-010-1-5 115
-010-1-6 116
-010-1-7 117
-010-1-8 118
-010-1-9 119
-010-1 120
-010-2-10 121
-010-2-11 122
-010-2-12 123
-010-2-13 124
-010-2-14 125
-010-2-15 126
-010-2-16 127
-010-2-2 128
-010-2-3 129
-010-2-4 130
-010-2-5 131
-010-2-6 132
-010-2-7 133
-010-2-8 134
-010-2-9 135
-010-2 136
-010-3 137
-010-4-1 138
-010-4-2 139
-011-1 140
-011-2 141
-011-3 142
-012-1 143
-012-2 144
-012-3 145
-012-4 146
-012-5 147
-012-6 148
-012-7 149
-012-8 150
-013-1 151
-014-1 152
-014-2-1 153
-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
-019-5-1 222
-019-5-2 223
-019-5-3 224
-019-5 225
-019-6 226
-020-1 227
-020-2 228
-020-3 229
-020-4 230
-020-5 231
-020-6 232
-020-7-1 233
-020-7-2 234
-020-7 235
-021-0 236
-021-1 237
-021-2 238
-021-3 239
-021-4 240
-022-1 241
-023-1 242
-023-2 243
-023-3-1 244
-023-3-2 245
-023-3 246
-023-4 247
-024-1 248
-024-10 249
-024-11 250
-024-12 251
-024-13 252
-024-14 253
-024-15 254
-024-16 255
-024-2 256
-024-3 257
-024-4 258
-024-5 259
-024-6 260
-024-7 261
-024-8 262
-024-9 263
-025-1 264
-025-2-1 265
-025-2-2 266
-025-2-3 267
-025-2-4 268
-025-2 269
-025-3 270
-026-0 271
-026-1 272
-026-2 273
-027-0 274
-027-1 275
-027-2 276
-027-3 277
-027-4 278
-027-5 279
-027-6 280
-027-7 281
-029-0 282
-029-1 283
-029-2 284
-029-3 285
-029-4 286
-029-5 287
-029-6 288
-029-7 289
-029-8 290
-029-9 291
-030-01 292
-030-02 293
-030-03 294
-030-04 295
-030-05 296
-030-06 297
-030-07 298
-030-08 299
-030-09 300
-030-10 301
-030-11 302
-030-12 303
-030-13 304
-030-14 305
-030-15 306
-030-16 307
-030-17 308
-030-18 309
-030-19 310
-030-20 311
-030-21 312
-030-22 313
-030-23 314
-030-24 315
-030-25 316
-030-26 317
-030-27 318
-030-28 319
-030-29 320
-030-30 321
-030-31 322
-030-32 323
-030-33 324
-030-34 325
-030-35 326
-030-36 327
-030-37 328
-030-38 329
-030-39 330
-030-40 331
-030-41 332
-030-42 333
-030-43 334
-030-44 335
-030-45 336
-030-46 337
-030-47 338
-030-48 339
-030-49 340
-030-50 341
-030-51 342
-030-52 343
-030-53 344
-030-54 345
-030-55 346
-030-56 347
-030-57 348
-030-58 349
-030-59 350
-030-60 351
-030-61 352
-030-62 353
-030-63 354
-030-64 355
-030-65 356
-030-66 357
-030-67 358
-030-68 359
-030-69 360
-030-70 361
-030-71 362
-030-72 363
-030-73 364
-030-74 365
-030-75 366
-031-0 367
-031-1 368
-031-2 369
-031-3 370
-031-4 371
-031-5 372
-031-6 373
-031-7 374
-031-8 375
-031-9 376
-032-1 377
-032-2 378
-032-3 379
-032-4 380
-032-5 381
-033-1 382
-033-2 383
-033-3 384
-033-4 385
-033-5 386
-034-1 387
-034-2 388
-034-3 389
-034-4 390
-042-0 391
-042-1 392
-042-10 393
-042-11 394
-042-2 395
-042-3 396
-042-4 397
-042-5 398
-042-6 399
-042-7 400
-042-8 401
-042-9 402
-boss 403
-botcheck 404
-guilds 405
-sec_pri 406
-soren-2 407
-soren 408
-test 409
-testbg 410
+001-13-0 10
+001-13-1 11
+001-13-2 12
+001-13 13
+001-14 14
+001-2 15
+001-3-1 16
+001-3 17
+001-4 18
+001-5 19
+001-6 20
+001-7 21
+001-8 22
+001-9 23
+002-1 24
+002-2 25
+002-3 26
+002-4 27
+002-5 28
+003-0-1 29
+003-0-2 30
+003-0 31
+003-1-1 32
+003-1-2 33
+003-1-3 34
+003-1 35
+003-10 36
+003-13 37
+003-2-1 38
+003-2 39
+003-3 40
+003-4-1 41
+003-4 42
+003-5 43
+003-6 44
+003-7 45
+003-8 46
+003-9-1 47
+003-9 48
+004-1 49
+004-2-1 50
+004-2-10 51
+004-2-11 52
+004-2-12 53
+004-2-2 54
+004-2-3 55
+004-2-4 56
+004-2-5 57
+004-2-6 58
+004-2-7 59
+004-2-8 60
+004-2-9 61
+004-2 62
+004-3-1 63
+004-3-2 64
+004-3-3 65
+004-3-4 66
+004-3-5 67
+004-3-6 68
+004-3 69
+005-1-1 70
+005-1 71
+005-2-1 72
+005-2 73
+005-3 74
+005-4 75
+005-5 76
+005-6 77
+005-7 78
+006-0 79
+006-1 80
+006-10 81
+006-2-1 82
+006-2-2 83
+006-2-3 84
+006-2-4 85
+006-2-5 86
+006-2-6 87
+006-2 88
+006-3 89
+006-4-1 90
+006-4 91
+006-5 92
+006-6 93
+006-7 94
+006-8 95
+006-9 96
+007-1-1 97
+007-1-2 98
+007-1 99
+007-2 100
+008-0 101
+008-1 102
+008-2 103
+009-1 104
+009-2 105
+009-3 106
+009-4 107
+009-5 108
+009-6 109
+009-7 110
+010-1-1 111
+010-1-10 112
+010-1-11 113
+010-1-12 114
+010-1-2 115
+010-1-3 116
+010-1-4 117
+010-1-5 118
+010-1-6 119
+010-1-7 120
+010-1-8 121
+010-1-9 122
+010-1 123
+010-2-10 124
+010-2-11 125
+010-2-12 126
+010-2-13 127
+010-2-14 128
+010-2-15 129
+010-2-16 130
+010-2-2 131
+010-2-3 132
+010-2-4 133
+010-2-5 134
+010-2-6 135
+010-2-7 136
+010-2-8 137
+010-2-9 138
+010-2 139
+010-3 140
+010-4-1 141
+010-4-2 142
+011-1 143
+011-2 144
+011-3 145
+012-1 146
+012-2 147
+012-3 148
+012-4 149
+012-5 150
+012-6 151
+012-7 152
+012-8 153
+013-1 154
+014-1 155
+014-2-1 156
+014-2-2 157
+014-2 158
+014-3 159
+014-4 160
+014-5-1 161
+014-5 162
+015-1 163
+015-2 164
+015-3-1 165
+015-3-2 166
+015-3-3 167
+015-3 168
+015-4 169
+015-5 170
+015-6 171
+015-7 172
+015-8-1 173
+015-8 174
+016-1 175
+016-6 176
+016-7 177
+017-0 178
+017-1 179
+017-10 180
+017-2-1 181
+017-2-2 182
+017-2 183
+017-3 184
+017-4 185
+017-5 186
+017-6 187
+017-7 188
+017-8 189
+018-1-1 190
+018-1 191
+018-2-1 192
+018-2-2 193
+018-2-3 194
+018-2-4 195
+018-2-5 196
+018-2-6 197
+018-2-7 198
+018-2-8 199
+018-2 200
+018-3 201
+018-4-1 202
+018-4-2 203
+018-4 204
+018-5-0 205
+018-5-1 206
+018-5-2 207
+018-5-3 208
+018-5-4 209
+018-5-5 210
+018-5-boss 211
+018-5 212
+018-6-0 213
+018-6-1 214
+018-6-2 215
+018-6-3 216
+018-7-1 217
+018-7 218
+019-1-1 219
+019-1 220
+019-2 221
+019-3 222
+019-4-1 223
+019-4 224
+019-5-1 225
+019-5-2 226
+019-5-3 227
+019-5 228
+019-6 229
+020-1 230
+020-2 231
+020-3 232
+020-4 233
+020-5 234
+020-6 235
+020-7-1 236
+020-7-2 237
+020-7 238
+021-0 239
+021-1 240
+021-2 241
+021-3 242
+021-4 243
+022-1 244
+023-1 245
+023-2 246
+023-3-1 247
+023-3-2 248
+023-3 249
+023-4 250
+024-1 251
+024-10 252
+024-11 253
+024-12 254
+024-13 255
+024-14 256
+024-15 257
+024-16 258
+024-2 259
+024-3 260
+024-4 261
+024-5 262
+024-6 263
+024-7 264
+024-8 265
+024-9 266
+025-1 267
+025-2-1 268
+025-2-2 269
+025-2-3 270
+025-2-4 271
+025-2 272
+025-3 273
+026-0 274
+026-1 275
+026-2 276
+027-0 277
+027-1 278
+027-2 279
+027-3 280
+027-4 281
+027-5 282
+027-6 283
+027-7 284
+029-0 285
+029-1 286
+029-2 287
+029-3 288
+029-4 289
+029-5 290
+029-6 291
+029-7 292
+029-8 293
+029-9 294
+030-01 295
+030-02 296
+030-03 297
+030-04 298
+030-05 299
+030-06 300
+030-07 301
+030-08 302
+030-09 303
+030-10 304
+030-11 305
+030-12 306
+030-13 307
+030-14 308
+030-15 309
+030-16 310
+030-17 311
+030-18 312
+030-19 313
+030-20 314
+030-21 315
+030-22 316
+030-23 317
+030-24 318
+030-25 319
+030-26 320
+030-27 321
+030-28 322
+030-29 323
+030-30 324
+030-31 325
+030-32 326
+030-33 327
+030-34 328
+030-35 329
+030-36 330
+030-37 331
+030-38 332
+030-39 333
+030-40 334
+030-41 335
+030-42 336
+030-43 337
+030-44 338
+030-45 339
+030-46 340
+030-47 341
+030-48 342
+030-49 343
+030-50 344
+030-51 345
+030-52 346
+030-53 347
+030-54 348
+030-55 349
+030-56 350
+030-57 351
+030-58 352
+030-59 353
+030-60 354
+030-61 355
+030-62 356
+030-63 357
+030-64 358
+030-65 359
+030-66 360
+030-67 361
+030-68 362
+030-69 363
+030-70 364
+030-71 365
+030-72 366
+030-73 367
+030-74 368
+030-75 369
+031-0 370
+031-1 371
+031-2 372
+031-3 373
+031-4 374
+031-5 375
+031-6 376
+031-7 377
+031-8 378
+031-9 379
+032-1 380
+032-2 381
+032-3 382
+032-4 383
+032-5 384
+033-1 385
+033-2 386
+033-3 387
+033-4 388
+033-5 389
+034-1 390
+034-2 391
+034-3 392
+034-4 393
+042-0 394
+042-1 395
+042-10 396
+042-11 397
+042-2 398
+042-3 399
+042-4 400
+042-5 401
+042-6 402
+042-7 403
+042-8 404
+042-9 405
+boss 406
+botcheck 407
+guilds 408
+sec_pri 409
+soren-2 410
+soren 411
+test 412
+testbg 413
diff --git a/maps/re/001-13-0.mcache b/maps/re/001-13-0.mcache
new file mode 100644
index 000000000..343490f43
Binary files /dev/null and b/maps/re/001-13-0.mcache differ
diff --git a/maps/re/001-13-1.mcache b/maps/re/001-13-1.mcache
new file mode 100644
index 000000000..24c07f8fa
Binary files /dev/null and b/maps/re/001-13-1.mcache differ
diff --git a/maps/re/001-13-2.mcache b/maps/re/001-13-2.mcache
new file mode 100644
index 000000000..343490f43
Binary files /dev/null and b/maps/re/001-13-2.mcache differ
diff --git a/npc/001-13-0/_import.txt b/npc/001-13-0/_import.txt
new file mode 100644
index 000000000..574eefa40
--- /dev/null
+++ b/npc/001-13-0/_import.txt
@@ -0,0 +1,2 @@
+// Map 001-13-0: Showdown
+// This file is generated automatically. All manually added changes will be removed when running the Converter.
diff --git a/npc/001-13-1/_import.txt b/npc/001-13-1/_import.txt
new file mode 100644
index 000000000..7cdcf9685
--- /dev/null
+++ b/npc/001-13-1/_import.txt
@@ -0,0 +1,2 @@
+// Map 001-13-1: Showdown
+// This file is generated automatically. All manually added changes will be removed when running the Converter.
diff --git a/npc/001-13-2/_import.txt b/npc/001-13-2/_import.txt
new file mode 100644
index 000000000..58b5a77d3
--- /dev/null
+++ b/npc/001-13-2/_import.txt
@@ -0,0 +1,2 @@
+// Map 001-13-2: Showdown
+// This file is generated automatically. All manually added changes will be removed when running the Converter.
diff --git a/npc/001-13/main.txt b/npc/001-13/main.txt
index 619c263f7..b2921aa18 100644
--- a/npc/001-13/main.txt
+++ b/npc/001-13/main.txt
@@ -79,11 +79,12 @@ function	script	FYRaid_Select	{
         return;
     }
     // Attach map
+    // TODO: Different scenarios: Block Castle, Sewer, Concrete Dungeon, Crypt, Desert Castle, Mountain, Snowland, Lake Region, Ukar Shrine, Woodland...
+    .@lv = $FYRAID_LV[.@i];
     .@mp$="fyrb@"+getcharid(0);
-    instance_attachmap("001-13", .@inst, false, .@mp$);
+    instance_attachmap(sprintf("001-13-%d", (.@lv % 3)), .@inst, false, .@mp$);
 
     // Recreate the boss
-    .@lv = $FYRAID_LV[.@i];
     .@mob=monster(.@mp$, 47, 33, $RAIDING_BOSS$, WanderingShadow, 1, "sBossRaid::OnBossDie");
     setunitdata(.@mob, UDT_LEVEL, min(.@lv * 7, 200));
     setunitdata(.@mob, UDT_STR, .@lv * 4);
@@ -117,6 +118,7 @@ function	script	FYRaid_Select	{
 	addtimer 40000, "sBossRaid::OnPump";
     dispbottom l("Time left: %s", FuzzyTime(@tm));
     closeclientdialog;
+    // TODO: Spawn an auxiliar every 10 levels
     return;
 }
 
@@ -226,3 +228,7 @@ OnClose:
 }
 
 001-13	mapflag	zone	MMO
+001-13-0	mapflag	zone	MMO
+001-13-1	mapflag	zone	MMO
+001-13-2	mapflag	zone	MMO
+
diff --git a/npc/_import.txt b/npc/_import.txt
index 4822a2d48..1d7d82c9f 100644
--- a/npc/_import.txt
+++ b/npc/_import.txt
@@ -9,6 +9,9 @@
 @include "npc/001-10/_import.txt"
 @include "npc/001-11/_import.txt"
 @include "npc/001-12/_import.txt"
+@include "npc/001-13-0/_import.txt"
+@include "npc/001-13-1/_import.txt"
+@include "npc/001-13-2/_import.txt"
 @include "npc/001-13/_import.txt"
 @include "npc/001-14/_import.txt"
 @include "npc/001-2/_import.txt"
-- 
cgit v1.2.3-60-g2f50