Include 001-13-1 and Meager Shadow

9 files changed, 488 insertions, 414 deletions

diff --git a/conf/map/maps.conf b/conf/map/maps.conf
index c5adbe8ce..5926d9b8b 100644
--- a/conf/map/maps.conf
+++ b/conf/map/maps.conf
@@ -13,6 +13,7 @@ map_list: (
     "001-13-0",
     "001-13-1",
     "001-13-2",
+    "001-13-3",
     "001-13",
     "001-14",
     "001-2",
diff --git a/db/map_index.txt b/db/map_index.txt
index dd1849fcf..bebe135fe 100644
--- a/db/map_index.txt
+++ b/db/map_index.txt
@@ -10,410 +10,411 @@
 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-3 31
-003-0 32
-003-1-1 33
-003-1-2 34
-003-1-3 35
-003-1 36
-003-10 37
-003-13 38
-003-2-1 39
-003-2 40
-003-3 41
-003-4-1 42
-003-4 43
-003-5 44
-003-6 45
-003-7 46
-003-8 47
-003-9-1 48
-003-9 49
-004-1 50
-004-2-1 51
-004-2-10 52
-004-2-11 53
-004-2-12 54
-004-2-2 55
-004-2-3 56
-004-2-4 57
-004-2-5 58
-004-2-6 59
-004-2-7 60
-004-2-8 61
-004-2-9 62
-004-2 63
-004-3-1 64
-004-3-2 65
-004-3-3 66
-004-3-4 67
-004-3-5 68
-004-3-6 69
-004-3 70
-005-1-1 71
-005-1 72
-005-2-1 73
-005-2 74
-005-3 75
-005-4 76
-005-5 77
-005-6 78
-005-7 79
-006-0 80
-006-1 81
-006-10 82
-006-2-1 83
-006-2-2 84
-006-2-3 85
-006-2-4 86
-006-2-5 87
-006-2-6 88
-006-2 89
-006-3 90
-006-4-1 91
-006-4 92
-006-5 93
-006-6 94
-006-7 95
-006-8 96
-006-9 97
-007-1-1 98
-007-1-2 99
-007-1 100
-007-2 101
-008-0 102
-008-1 103
-008-2 104
-009-1 105
-009-2 106
-009-3 107
-009-4 108
-009-5 109
-009-6 110
-009-7 111
-010-1-1 112
-010-1-10 113
-010-1-11 114
-010-1-12 115
-010-1-2 116
-010-1-3 117
-010-1-4 118
-010-1-5 119
-010-1-6 120
-010-1-7 121
-010-1-8 122
-010-1-9 123
-010-1 124
-010-2-10 125
-010-2-11 126
-010-2-12 127
-010-2-13 128
-010-2-14 129
-010-2-15 130
-010-2-16 131
-010-2-2 132
-010-2-3 133
-010-2-4 134
-010-2-5 135
-010-2-6 136
-010-2-7 137
-010-2-8 138
-010-2-9 139
-010-2 140
-010-3 141
-010-4-1 142
-010-4-2 143
-011-1 144
-011-2 145
-011-3 146
-011-4 147
-012-1 148
-012-2 149
-012-3 150
-012-4 151
-012-5 152
-012-6 153
-012-7 154
-012-8 155
-013-1 156
-014-1 157
-014-2-1 158
-014-2-2 159
-014-2 160
-014-3 161
-014-4 162
-014-5-1 163
-014-5 164
-015-1 165
-015-2 166
-015-3-1 167
-015-3-2 168
-015-3-3 169
-015-3 170
-015-4 171
-015-5 172
-015-6 173
-015-7 174
-015-8-1 175
-015-8 176
-016-1 177
-016-6 178
-016-7 179
-017-0 180
-017-1 181
-017-10 182
-017-2-1 183
-017-2-2 184
-017-2 185
-017-3 186
-017-4 187
-017-5 188
-017-6 189
-017-7 190
-017-8 191
-018-1-1 192
-018-1 193
-018-2-1 194
-018-2-2 195
-018-2-3 196
-018-2-4 197
-018-2-5 198
-018-2-6 199
-018-2-7 200
-018-2-8 201
-018-2 202
-018-3 203
-018-4-1 204
-018-4-2 205
-018-4 206
-018-5-0 207
-018-5-1 208
-018-5-2 209
-018-5-3 210
-018-5-4 211
-018-5-5 212
-018-5-boss 213
-018-5 214
-018-6-0 215
-018-6-1 216
-018-6-2 217
-018-6-3 218
-018-7-1 219
-018-7 220
-018-8 221
-019-1-1 222
-019-1 223
-019-2 224
-019-3 225
-019-4-1 226
-019-4 227
-019-5-1 228
-019-5-2 229
-019-5-3 230
-019-5 231
-019-6 232
-020-1 233
-020-2 234
-020-3 235
-020-4 236
-020-5 237
-020-6 238
-020-7-1 239
-020-7-2 240
-020-7 241
-021-0 242
-021-1 243
-021-2 244
-021-3 245
-021-4 246
-022-1 247
-023-1 248
-023-2 249
-023-3-1 250
-023-3-2 251
-023-3 252
-023-4 253
-024-1 254
-024-10 255
-024-11 256
-024-12 257
-024-13 258
-024-14 259
-024-15 260
-024-16 261
-024-2 262
-024-3 263
-024-4 264
-024-5 265
-024-6 266
-024-7 267
-024-8 268
-024-9 269
-025-1 270
-025-2-1 271
-025-2-2 272
-025-2-3 273
-025-2-4 274
-025-2 275
-025-3 276
-025-4-1 277
-025-4 278
-026-0 279
-026-1 280
-026-2 281
-026-3 282
-026-6 283
-026-7 284
-027-0 285
-027-1 286
-027-2 287
-027-3 288
-027-4 289
-027-5 290
-027-6 291
-027-7 292
-029-0 293
-029-1 294
-029-2 295
-029-3 296
-029-4 297
-029-5 298
-029-6 299
-029-7 300
-029-8 301
-029-9 302
-030-01 303
-030-02 304
-030-03 305
-030-04 306
-030-05 307
-030-06 308
-030-07 309
-030-08 310
-030-09 311
-030-10 312
-030-11 313
-030-12 314
-030-13 315
-030-14 316
-030-15 317
-030-16 318
-030-17 319
-030-18 320
-030-19 321
-030-20 322
-030-21 323
-030-22 324
-030-23 325
-030-24 326
-030-25 327
-030-26 328
-030-27 329
-030-28 330
-030-29 331
-030-30 332
-030-31 333
-030-32 334
-030-33 335
-030-34 336
-030-35 337
-030-36 338
-030-37 339
-030-38 340
-030-39 341
-030-40 342
-030-41 343
-030-42 344
-030-43 345
-030-44 346
-030-45 347
-030-46 348
-030-47 349
-030-48 350
-030-49 351
-030-50 352
-030-51 353
-030-52 354
-030-53 355
-030-54 356
-030-55 357
-030-56 358
-030-57 359
-030-58 360
-030-59 361
-030-60 362
-030-61 363
-030-62 364
-030-63 365
-030-64 366
-030-65 367
-030-66 368
-030-67 369
-030-68 370
-030-69 371
-030-70 372
-030-71 373
-030-72 374
-030-73 375
-030-74 376
-030-75 377
-031-0 378
-031-1 379
-031-2 380
-031-3 381
-031-4 382
-031-5 383
-031-6 384
-031-7 385
-031-8 386
-031-9 387
-032-1 388
-032-2 389
-032-3 390
-032-4 391
-032-5 392
-033-1 393
-033-2 394
-033-3 395
-033-4 396
-033-5 397
-034-1 398
-034-2 399
-034-3 400
-034-4 401
-042-0 402
-042-1 403
-042-10 404
-042-11 405
-042-2 406
-042-3 407
-042-4 408
-042-5 409
-042-6 410
-042-7 411
-042-8 412
-042-9 413
-boss 414
-botcheck 415
-guilds 416
-sec_pri 417
-soren-2 418
-soren 419
+001-13-3 13
+001-13 14
+001-14 15
+001-2 16
+001-3-1 17
+001-3 18
+001-4 19
+001-5 20
+001-6 21
+001-7 22
+001-8 23
+001-9 24
+002-1 25
+002-2 26
+002-3 27
+002-4 28
+002-5 29
+003-0-1 30
+003-0-2 31
+003-0-3 32
+003-0 33
+003-1-1 34
+003-1-2 35
+003-1-3 36
+003-1 37
+003-10 38
+003-13 39
+003-2-1 40
+003-2 41
+003-3 42
+003-4-1 43
+003-4 44
+003-5 45
+003-6 46
+003-7 47
+003-8 48
+003-9-1 49
+003-9 50
+004-1 51
+004-2-1 52
+004-2-10 53
+004-2-11 54
+004-2-12 55
+004-2-2 56
+004-2-3 57
+004-2-4 58
+004-2-5 59
+004-2-6 60
+004-2-7 61
+004-2-8 62
+004-2-9 63
+004-2 64
+004-3-1 65
+004-3-2 66
+004-3-3 67
+004-3-4 68
+004-3-5 69
+004-3-6 70
+004-3 71
+005-1-1 72
+005-1 73
+005-2-1 74
+005-2 75
+005-3 76
+005-4 77
+005-5 78
+005-6 79
+005-7 80
+006-0 81
+006-1 82
+006-10 83
+006-2-1 84
+006-2-2 85
+006-2-3 86
+006-2-4 87
+006-2-5 88
+006-2-6 89
+006-2 90
+006-3 91
+006-4-1 92
+006-4 93
+006-5 94
+006-6 95
+006-7 96
+006-8 97
+006-9 98
+007-1-1 99
+007-1-2 100
+007-1 101
+007-2 102
+008-0 103
+008-1 104
+008-2 105
+009-1 106
+009-2 107
+009-3 108
+009-4 109
+009-5 110
+009-6 111
+009-7 112
+010-1-1 113
+010-1-10 114
+010-1-11 115
+010-1-12 116
+010-1-2 117
+010-1-3 118
+010-1-4 119
+010-1-5 120
+010-1-6 121
+010-1-7 122
+010-1-8 123
+010-1-9 124
+010-1 125
+010-2-10 126
+010-2-11 127
+010-2-12 128
+010-2-13 129
+010-2-14 130
+010-2-15 131
+010-2-16 132
+010-2-2 133
+010-2-3 134
+010-2-4 135
+010-2-5 136
+010-2-6 137
+010-2-7 138
+010-2-8 139
+010-2-9 140
+010-2 141
+010-3 142
+010-4-1 143
+010-4-2 144
+011-1 145
+011-2 146
+011-3 147
+011-4 148
+012-1 149
+012-2 150
+012-3 151
+012-4 152
+012-5 153
+012-6 154
+012-7 155
+012-8 156
+013-1 157
+014-1 158
+014-2-1 159
+014-2-2 160
+014-2 161
+014-3 162
+014-4 163
+014-5-1 164
+014-5 165
+015-1 166
+015-2 167
+015-3-1 168
+015-3-2 169
+015-3-3 170
+015-3 171
+015-4 172
+015-5 173
+015-6 174
+015-7 175
+015-8-1 176
+015-8 177
+016-1 178
+016-6 179
+016-7 180
+017-0 181
+017-1 182
+017-10 183
+017-2-1 184
+017-2-2 185
+017-2 186
+017-3 187
+017-4 188
+017-5 189
+017-6 190
+017-7 191
+017-8 192
+018-1-1 193
+018-1 194
+018-2-1 195
+018-2-2 196
+018-2-3 197
+018-2-4 198
+018-2-5 199
+018-2-6 200
+018-2-7 201
+018-2-8 202
+018-2 203
+018-3 204
+018-4-1 205
+018-4-2 206
+018-4 207
+018-5-0 208
+018-5-1 209
+018-5-2 210
+018-5-3 211
+018-5-4 212
+018-5-5 213
+018-5-boss 214
+018-5 215
+018-6-0 216
+018-6-1 217
+018-6-2 218
+018-6-3 219
+018-7-1 220
+018-7 221
+018-8 222
+019-1-1 223
+019-1 224
+019-2 225
+019-3 226
+019-4-1 227
+019-4 228
+019-5-1 229
+019-5-2 230
+019-5-3 231
+019-5 232
+019-6 233
+020-1 234
+020-2 235
+020-3 236
+020-4 237
+020-5 238
+020-6 239
+020-7-1 240
+020-7-2 241
+020-7 242
+021-0 243
+021-1 244
+021-2 245
+021-3 246
+021-4 247
+022-1 248
+023-1 249
+023-2 250
+023-3-1 251
+023-3-2 252
+023-3 253
+023-4 254
+024-1 255
+024-10 256
+024-11 257
+024-12 258
+024-13 259
+024-14 260
+024-15 261
+024-16 262
+024-2 263
+024-3 264
+024-4 265
+024-5 266
+024-6 267
+024-7 268
+024-8 269
+024-9 270
+025-1 271
+025-2-1 272
+025-2-2 273
+025-2-3 274
+025-2-4 275
+025-2 276
+025-3 277
+025-4-1 278
+025-4 279
+026-0 280
+026-1 281
+026-2 282
+026-3 283
+026-6 284
+026-7 285
+027-0 286
+027-1 287
+027-2 288
+027-3 289
+027-4 290
+027-5 291
+027-6 292
+027-7 293
+029-0 294
+029-1 295
+029-2 296
+029-3 297
+029-4 298
+029-5 299
+029-6 300
+029-7 301
+029-8 302
+029-9 303
+030-01 304
+030-02 305
+030-03 306
+030-04 307
+030-05 308
+030-06 309
+030-07 310
+030-08 311
+030-09 312
+030-10 313
+030-11 314
+030-12 315
+030-13 316
+030-14 317
+030-15 318
+030-16 319
+030-17 320
+030-18 321
+030-19 322
+030-20 323
+030-21 324
+030-22 325
+030-23 326
+030-24 327
+030-25 328
+030-26 329
+030-27 330
+030-28 331
+030-29 332
+030-30 333
+030-31 334
+030-32 335
+030-33 336
+030-34 337
+030-35 338
+030-36 339
+030-37 340
+030-38 341
+030-39 342
+030-40 343
+030-41 344
+030-42 345
+030-43 346
+030-44 347
+030-45 348
+030-46 349
+030-47 350
+030-48 351
+030-49 352
+030-50 353
+030-51 354
+030-52 355
+030-53 356
+030-54 357
+030-55 358
+030-56 359
+030-57 360
+030-58 361
+030-59 362
+030-60 363
+030-61 364
+030-62 365
+030-63 366
+030-64 367
+030-65 368
+030-66 369
+030-67 370
+030-68 371
+030-69 372
+030-70 373
+030-71 374
+030-72 375
+030-73 376
+030-74 377
+030-75 378
+031-0 379
+031-1 380
+031-2 381
+031-3 382
+031-4 383
+031-5 384
+031-6 385
+031-7 386
+031-8 387
+031-9 388
+032-1 389
+032-2 390
+032-3 391
+032-4 392
+032-5 393
+033-1 394
+033-2 395
+033-3 396
+033-4 397
+033-5 398
+034-1 399
+034-2 400
+034-3 401
+034-4 402
+042-0 403
+042-1 404
+042-10 405
+042-11 406
+042-2 407
+042-3 408
+042-4 409
+042-5 410
+042-6 411
+042-7 412
+042-8 413
+042-9 414
+boss 415
+botcheck 416
+guilds 417
+sec_pri 418
+soren-2 419
+soren 420
diff --git a/db/re/mob_db.conf b/db/re/mob_db.conf
index e4cb6dbe9..8f024f7d5 100644
--- a/db/re/mob_db.conf
+++ b/db/re/mob_db.conf
@@ -12815,6 +12815,48 @@ mob_db: (
 },
 // System
 {
+	Id: 1490
+	SpriteName: "MeagerShadow"
+	Name: "Meager Shadow"
+	Lv: 1
+	Hp: 1000
+	Sp: 100
+	Exp: 1
+	JExp: 1
+	AttackRange: 2
+	Attack: [3, 4]
+	Def: 35
+	Mdef: 35
+	WalkMask: "WALK_AIR"
+	Stats: {
+		Str: 1
+		Agi: 1
+		Vit: 1
+		Int: 1
+		Dex: 1
+		Luk: 1
+	}
+	ViewRange: 9
+	ChaseRange: 14
+	Race: 8
+	Element: (8, 1)
+	Mode: {
+		CanMove: true
+		Aggressive: true
+		Angry: true
+		CanAttack: true
+		ChangeTargetMelee: true
+		ChangeChase: true
+	}
+	MoveSpeed: 440
+	AttackDelay: 1600
+	AttackMotion: 672
+	DamageMotion: 480
+	Drops: {
+		StrangeCoin: 1
+	}
+},
+{
 	Id: 1491
 	SpriteName: "WanderingShadow"
 	Name: "Wandering Shadow"
diff --git a/maps/re/001-13-3.mcache b/maps/re/001-13-3.mcache
new file mode 100644
index 000000000..93cd469a5
--- /dev/null
+++ b/maps/re/001-13-3.mcache
diff --git a/npc/001-13-3/_import.txt b/npc/001-13-3/_import.txt
new file mode 100644
index 000000000..795d74a65
--- /dev/null
+++ b/npc/001-13-3/_import.txt
@@ -0,0 +1,2 @@
+// Map 001-13-3: 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 8e6e4c689..d1557d273 100644
--- a/npc/001-13/main.txt
+++ b/npc/001-13/main.txt
@@ -79,10 +79,10 @@ 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...
+    // TODO: Different scenarios: Sewer, Concrete Dungeon, Crypt, Desert Castle, Mountain, Snowland, Lake Region, Ukar Shrine, Woodland...
     .@lv = $FYRAID_LV[.@i];
     .@mp$="fyrb@"+getcharid(0);
-    instance_attachmap(sprintf("001-13-%d", (.@lv % 3)), .@inst, false, .@mp$);
+    instance_attachmap(sprintf("001-13-%d", (.@lv % 4)), .@inst, false, .@mp$);
 
     // Recreate the boss
     .@mob=monster(.@mp$, 47, 33, $RAIDING_BOSS$, WanderingShadow, 1, "sBossRaid::OnBossDie");
@@ -119,9 +119,29 @@ function	script	FYRaid_Select	{
 	addtimer .@tski, "sBossRaid::OnPump";
     dispbottom l("Time left: %s", FuzzyTime(@tm));
     closeclientdialog;
-    // TODO: Spawn an auxiliar every 10 levels
-    // Amount: level % 10
-    // Strength: level / 10
+    // Spawn an auxiliar every 5 levels AFTER level 10
+    if (.@lv > 10) {
+        .@qnt = (.@lv % 5) + 1;
+        .@str = (.@lv / 5);
+        explode(.@n$, $RAIDING_BOSS$, " ");
+        .@n$ = l("%s's Minion", .@n$);
+        for (.@i=0;.@i < .@qnt;.@i++) {
+            .@m=areamonster(.@mp$, 44, 31, 50, 34, .@n$, MeagerShadow, 1);
+            setunitdata(.@m, UDT_STR,    .@str);
+            setunitdata(.@m, UDT_AGI,    .@str);
+            setunitdata(.@m, UDT_VIT,    .@str);
+            setunitdata(.@m, UDT_INT,    .@str);
+            setunitdata(.@m, UDT_DEX,    .@str);
+            setunitdata(.@m, UDT_LUK,    .@str);
+            setunitdata(.@m, UDT_ATKMIN, BaseLevel+.@str*3);
+            setunitdata(.@m, UDT_ATKMAX, BaseLevel+.@str*4);
+            setunitdata(.@m, UDT_MAXHP,  .@str*400);
+            setunitdata(.@m, UDT_HP,     .@str*400);
+            setunitdata(.@m, UDT_HIT,    BaseLevel+.@lv+rand2(.@str*5));
+            setunitdata(.@m, UDT_FLEE,   1+rand2(.@str));
+            setunitdata(.@m, UDT_CRIT,   1+rand2(.@str));
+        }
+    }
     return;
 }
 
diff --git a/npc/025-2-3/_mobs.txt b/npc/025-2-3/_mobs.txt
index ceb14c313..cf3cd596b 100644
--- a/npc/025-2-3/_mobs.txt
+++ b/npc/025-2-3/_mobs.txt
@@ -1,6 +1,6 @@
 // This file is generated automatically. All manually added changes will be removed when running the Converter.
 // Map 025-2-3: Pinkie Cave mobs
-025-2-3,55,39,13,14	monster	Pinkie	1132,14,4000,8000
+025-2-3,55,39,13,14	monster	Pinkie	1132,14,40000,8000
 025-2-3,54,41,15,12	monster	Pinkie Suseran	1419,10,4000,8000
 025-2-3,56,41,17,10	monster	Pinkie Maximus	1249,9,20000,2500
 025-2-3,48,40,26,6	monster	Cave Maggot	1027,9,2000,20000
diff --git a/npc/_import.txt b/npc/_import.txt
index 5bcbdccaf..f51ec463e 100644
--- a/npc/_import.txt
+++ b/npc/_import.txt
@@ -12,6 +12,7 @@
 @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-3/_import.txt"
 @include "npc/001-13/_import.txt"
 @include "npc/001-14/_import.txt"
 @include "npc/001-2/_import.txt"
diff --git a/npc/commands/event.txt b/npc/commands/event.txt
index 288875bc4..06b9cd980 100644
--- a/npc/commands/event.txt
+++ b/npc/commands/event.txt
@@ -292,6 +292,7 @@ function	script	GlobalEventMenu	{
             ("[FY] Enable Kamelot"),
             ("[FY] Enable Regnum Blessing"),
             ("[FY] Enable Candor Season"),
+            ("[FY] Advance Event Schedule"),
             ("Reset Kill Saulc Event (Monthly)");
 
         switch (@menu) {
@@ -348,7 +349,13 @@ function	script	GlobalEventMenu	{
                 $EVENT$="Candor";
                 logmes "Enabled CANDOR event.", LOGMES_ATCOMMAND;
                 break;
-            case 13: DelItemFromEveryPlayer(MurdererCrown); break;
+            case 13:
+                logmes "Advanced AURORA event.", LOGMES_ATCOMMAND;
+                closeclientdialog; detachrid();
+                callfunc "FYStopEvent"; callfunc "FYNewEvent";
+                end;
+                break;
+            case 14: DelItemFromEveryPlayer(MurdererCrown); break;
         }
 
         return;