***The Money Maker Patch***

- Tulimshar Employment Center
- Reduce cooldown on Merchant Guild Requests
- Update warnings and consequences of using skip-content system

12 files changed, 536 insertions, 392 deletions

diff --git a/conf/map/maps.conf b/conf/map/maps.conf
index 5e3d63232..c519766e8 100644
--- a/conf/map/maps.conf
+++ b/conf/map/maps.conf
@@ -42,6 +42,7 @@ map_list: (
     "003-1-3",
     "003-1",
     "003-10",
+    "003-11",
     "003-13",
     "003-2-1",
     "003-2",
diff --git a/db/map_index.txt b/db/map_index.txt
index 3a1350d0b..a918dbf1c 100644
--- a/db/map_index.txt
+++ b/db/map_index.txt
@@ -39,389 +39,390 @@
 003-1-3 39
 003-1 40
 003-10 41
-003-13 42
-003-2-1 43
-003-2 44
-003-3 45
-003-4-1 46
-003-4 47
-003-5 48
-003-6 49
-003-7 50
-003-8 51
-003-9-1 52
-003-9 53
-004-1 54
-004-2-1 55
-004-2-10 56
-004-2-11 57
-004-2-12 58
-004-2-2 59
-004-2-3 60
-004-2-4 61
-004-2-5 62
-004-2-6 63
-004-2-7 64
-004-2-8 65
-004-2-9 66
-004-2 67
-004-3-1 68
-004-3-2 69
-004-3-3 70
-004-3-4 71
-004-3-5 72
-004-3-6 73
-004-3 74
-005-1-1 75
-005-1 76
-005-2-1 77
-005-2 78
-005-3 79
-005-4 80
-005-5 81
-005-6 82
-005-7 83
-006-0 84
-006-1 85
-006-10 86
-006-2-1 87
-006-2-2 88
-006-2-3 89
-006-2-4 90
-006-2-5 91
-006-2-6 92
-006-2 93
-006-3 94
-006-4-1 95
-006-4 96
-006-5 97
-006-6 98
-006-7 99
-006-8 100
-006-9 101
-007-1-1 102
-007-1-2 103
-007-1 104
-007-2 105
-008-0 106
-008-1 107
-008-2 108
-009-1 109
-009-2 110
-009-3 111
-009-4 112
-009-5 113
-009-6 114
-009-7 115
-009-8 116
-010-1-1 117
-010-1-10 118
-010-1-11 119
-010-1-12 120
-010-1-2 121
-010-1-3 122
-010-1-4 123
-010-1-5 124
-010-1-6 125
-010-1-7 126
-010-1-8 127
-010-1-9 128
-010-1 129
-010-2-10 130
-010-2-11 131
-010-2-12 132
-010-2-13 133
-010-2-14 134
-010-2-15 135
-010-2-16 136
-010-2-2 137
-010-2-3 138
-010-2-4 139
-010-2-5 140
-010-2-6 141
-010-2-7 142
-010-2-8 143
-010-2-9 144
-010-2 145
-010-3 146
-010-4-1 147
-010-4-2 148
-011-1 149
-011-2 150
-011-3 151
-011-4 152
-012-1 153
-012-2 154
-012-3 155
-012-4 156
-012-5 157
-012-6 158
-012-7 159
-012-8 160
-013-1 161
-014-1 162
-014-2-1 163
-014-2-2 164
-014-2 165
-014-3 166
-014-4 167
-014-5-1 168
-014-5 169
-015-1 170
-015-2 171
-015-3-1 172
-015-3-2 173
-015-3-3 174
-015-3 175
-015-4 176
-015-5 177
-015-6 178
-015-7 179
-015-8-1 180
-015-8 181
-016-1 182
-016-6 183
-016-7 184
-016-8 185
-017-0 186
-017-1 187
-017-10 188
-017-2-1 189
-017-2-2 190
-017-2 191
-017-3 192
-017-4 193
-017-5 194
-017-6 195
-017-7 196
-017-8 197
-018-1-1 198
-018-1 199
-018-2-1 200
-018-2-2 201
-018-2-3 202
-018-2-4 203
-018-2-5 204
-018-2-6 205
-018-2-7 206
-018-2-8 207
-018-2 208
-018-3 209
-018-4-1 210
-018-4-2 211
-018-4 212
-018-5-0 213
-018-5-1 214
-018-5-2 215
-018-5-3 216
-018-5-4 217
-018-5-5 218
-018-5-6 219
-018-5-boss 220
-018-5 221
-018-6-0 222
-018-6-1 223
-018-6-2 224
-018-6-3 225
-018-7-1 226
-018-7 227
-018-8 228
-019-1-1 229
-019-1 230
-019-2 231
-019-3 232
-019-4-1 233
-019-4 234
-019-5-1 235
-019-5-2 236
-019-5-3 237
-019-5 238
-019-6 239
-020-1 240
-020-2 241
-020-3 242
-020-4 243
-020-5 244
-020-6 245
-020-7-1 246
-020-7-2 247
-020-7 248
-020-8 249
-021-0 250
-021-1 251
-021-2 252
-021-3 253
-021-4 254
-022-1 255
-023-1 256
-023-2 257
-023-3-1 258
-023-3-2 259
-023-3 260
-023-4 261
-024-1 262
-024-10 263
-024-11 264
-024-12 265
-024-13 266
-024-14 267
-024-15 268
-024-16 269
-024-2 270
-024-3 271
-024-4 272
-024-5 273
-024-6 274
-024-7 275
-024-8 276
-024-9 277
-025-1 278
-025-2-1 279
-025-2-2 280
-025-2-3 281
-025-2-4 282
-025-2 283
-025-3 284
-025-4-1 285
-025-4 286
-026-0 287
-026-1 288
-026-2 289
-026-3 290
-026-6 291
-026-7 292
-027-0 293
-027-1 294
-027-2 295
-027-3 296
-027-4 297
-027-5 298
-027-6 299
-027-7 300
-029-0 301
-029-1 302
-029-2 303
-029-3 304
-029-4 305
-029-5 306
-029-6 307
-029-7 308
-029-8 309
-029-9 310
-030-01 311
-030-02 312
-030-03 313
-030-04 314
-030-05 315
-030-06 316
-030-07 317
-030-08 318
-030-09 319
-030-10 320
-030-11 321
-030-12 322
-030-13 323
-030-14 324
-030-15 325
-030-16 326
-030-17 327
-030-18 328
-030-19 329
-030-20 330
-030-21 331
-030-22 332
-030-23 333
-030-24 334
-030-25 335
-030-26 336
-030-27 337
-030-28 338
-030-29 339
-030-30 340
-030-31 341
-030-32 342
-030-33 343
-030-34 344
-030-35 345
-030-36 346
-030-37 347
-030-38 348
-030-39 349
-030-40 350
-030-41 351
-030-42 352
-030-43 353
-030-44 354
-030-45 355
-030-46 356
-030-47 357
-030-48 358
-030-49 359
-030-50 360
-030-51 361
-030-52 362
-030-53 363
-030-54 364
-030-55 365
-030-56 366
-030-57 367
-030-58 368
-030-59 369
-030-60 370
-030-61 371
-030-62 372
-030-63 373
-030-64 374
-030-65 375
-030-66 376
-030-67 377
-030-68 378
-030-69 379
-030-70 380
-030-71 381
-030-72 382
-030-73 383
-030-74 384
-030-75 385
-031-0 386
-031-1 387
-031-2 388
-031-3 389
-031-4 390
-031-5 391
-031-6 392
-031-7 393
-031-8 394
-031-9 395
-032-1 396
-032-2 397
-032-3 398
-032-4 399
-032-5 400
-033-1 401
-033-2 402
-033-3 403
-033-4 404
-033-5 405
-034-1 406
-034-2 407
-034-3 408
-034-4 409
-042-0 410
-042-1 411
-042-10 412
-042-11 413
-042-2 414
-042-3 415
-042-4 416
-042-5 417
-042-6 418
-042-7 419
-042-8 420
-042-9 421
-boss 422
-botcheck 423
-guilds 424
-sec_pri 425
-soren-2 426
-soren 427
+003-11 42
+003-13 43
+003-2-1 44
+003-2 45
+003-3 46
+003-4-1 47
+003-4 48
+003-5 49
+003-6 50
+003-7 51
+003-8 52
+003-9-1 53
+003-9 54
+004-1 55
+004-2-1 56
+004-2-10 57
+004-2-11 58
+004-2-12 59
+004-2-2 60
+004-2-3 61
+004-2-4 62
+004-2-5 63
+004-2-6 64
+004-2-7 65
+004-2-8 66
+004-2-9 67
+004-2 68
+004-3-1 69
+004-3-2 70
+004-3-3 71
+004-3-4 72
+004-3-5 73
+004-3-6 74
+004-3 75
+005-1-1 76
+005-1 77
+005-2-1 78
+005-2 79
+005-3 80
+005-4 81
+005-5 82
+005-6 83
+005-7 84
+006-0 85
+006-1 86
+006-10 87
+006-2-1 88
+006-2-2 89
+006-2-3 90
+006-2-4 91
+006-2-5 92
+006-2-6 93
+006-2 94
+006-3 95
+006-4-1 96
+006-4 97
+006-5 98
+006-6 99
+006-7 100
+006-8 101
+006-9 102
+007-1-1 103
+007-1-2 104
+007-1 105
+007-2 106
+008-0 107
+008-1 108
+008-2 109
+009-1 110
+009-2 111
+009-3 112
+009-4 113
+009-5 114
+009-6 115
+009-7 116
+009-8 117
+010-1-1 118
+010-1-10 119
+010-1-11 120
+010-1-12 121
+010-1-2 122
+010-1-3 123
+010-1-4 124
+010-1-5 125
+010-1-6 126
+010-1-7 127
+010-1-8 128
+010-1-9 129
+010-1 130
+010-2-10 131
+010-2-11 132
+010-2-12 133
+010-2-13 134
+010-2-14 135
+010-2-15 136
+010-2-16 137
+010-2-2 138
+010-2-3 139
+010-2-4 140
+010-2-5 141
+010-2-6 142
+010-2-7 143
+010-2-8 144
+010-2-9 145
+010-2 146
+010-3 147
+010-4-1 148
+010-4-2 149
+011-1 150
+011-2 151
+011-3 152
+011-4 153
+012-1 154
+012-2 155
+012-3 156
+012-4 157
+012-5 158
+012-6 159
+012-7 160
+012-8 161
+013-1 162
+014-1 163
+014-2-1 164
+014-2-2 165
+014-2 166
+014-3 167
+014-4 168
+014-5-1 169
+014-5 170
+015-1 171
+015-2 172
+015-3-1 173
+015-3-2 174
+015-3-3 175
+015-3 176
+015-4 177
+015-5 178
+015-6 179
+015-7 180
+015-8-1 181
+015-8 182
+016-1 183
+016-6 184
+016-7 185
+016-8 186
+017-0 187
+017-1 188
+017-10 189
+017-2-1 190
+017-2-2 191
+017-2 192
+017-3 193
+017-4 194
+017-5 195
+017-6 196
+017-7 197
+017-8 198
+018-1-1 199
+018-1 200
+018-2-1 201
+018-2-2 202
+018-2-3 203
+018-2-4 204
+018-2-5 205
+018-2-6 206
+018-2-7 207
+018-2-8 208
+018-2 209
+018-3 210
+018-4-1 211
+018-4-2 212
+018-4 213
+018-5-0 214
+018-5-1 215
+018-5-2 216
+018-5-3 217
+018-5-4 218
+018-5-5 219
+018-5-6 220
+018-5-boss 221
+018-5 222
+018-6-0 223
+018-6-1 224
+018-6-2 225
+018-6-3 226
+018-7-1 227
+018-7 228
+018-8 229
+019-1-1 230
+019-1 231
+019-2 232
+019-3 233
+019-4-1 234
+019-4 235
+019-5-1 236
+019-5-2 237
+019-5-3 238
+019-5 239
+019-6 240
+020-1 241
+020-2 242
+020-3 243
+020-4 244
+020-5 245
+020-6 246
+020-7-1 247
+020-7-2 248
+020-7 249
+020-8 250
+021-0 251
+021-1 252
+021-2 253
+021-3 254
+021-4 255
+022-1 256
+023-1 257
+023-2 258
+023-3-1 259
+023-3-2 260
+023-3 261
+023-4 262
+024-1 263
+024-10 264
+024-11 265
+024-12 266
+024-13 267
+024-14 268
+024-15 269
+024-16 270
+024-2 271
+024-3 272
+024-4 273
+024-5 274
+024-6 275
+024-7 276
+024-8 277
+024-9 278
+025-1 279
+025-2-1 280
+025-2-2 281
+025-2-3 282
+025-2-4 283
+025-2 284
+025-3 285
+025-4-1 286
+025-4 287
+026-0 288
+026-1 289
+026-2 290
+026-3 291
+026-6 292
+026-7 293
+027-0 294
+027-1 295
+027-2 296
+027-3 297
+027-4 298
+027-5 299
+027-6 300
+027-7 301
+029-0 302
+029-1 303
+029-2 304
+029-3 305
+029-4 306
+029-5 307
+029-6 308
+029-7 309
+029-8 310
+029-9 311
+030-01 312
+030-02 313
+030-03 314
+030-04 315
+030-05 316
+030-06 317
+030-07 318
+030-08 319
+030-09 320
+030-10 321
+030-11 322
+030-12 323
+030-13 324
+030-14 325
+030-15 326
+030-16 327
+030-17 328
+030-18 329
+030-19 330
+030-20 331
+030-21 332
+030-22 333
+030-23 334
+030-24 335
+030-25 336
+030-26 337
+030-27 338
+030-28 339
+030-29 340
+030-30 341
+030-31 342
+030-32 343
+030-33 344
+030-34 345
+030-35 346
+030-36 347
+030-37 348
+030-38 349
+030-39 350
+030-40 351
+030-41 352
+030-42 353
+030-43 354
+030-44 355
+030-45 356
+030-46 357
+030-47 358
+030-48 359
+030-49 360
+030-50 361
+030-51 362
+030-52 363
+030-53 364
+030-54 365
+030-55 366
+030-56 367
+030-57 368
+030-58 369
+030-59 370
+030-60 371
+030-61 372
+030-62 373
+030-63 374
+030-64 375
+030-65 376
+030-66 377
+030-67 378
+030-68 379
+030-69 380
+030-70 381
+030-71 382
+030-72 383
+030-73 384
+030-74 385
+030-75 386
+031-0 387
+031-1 388
+031-2 389
+031-3 390
+031-4 391
+031-5 392
+031-6 393
+031-7 394
+031-8 395
+031-9 396
+032-1 397
+032-2 398
+032-3 399
+032-4 400
+032-5 401
+033-1 402
+033-2 403
+033-3 404
+033-4 405
+033-5 406
+034-1 407
+034-2 408
+034-3 409
+034-4 410
+042-0 411
+042-1 412
+042-10 413
+042-11 414
+042-2 415
+042-3 416
+042-4 417
+042-5 418
+042-6 419
+042-7 420
+042-8 421
+042-9 422
+boss 423
+botcheck 424
+guilds 425
+sec_pri 426
+soren-2 427
+soren 428
diff --git a/maps/re/003-11.mcache b/maps/re/003-11.mcache
new file mode 100644
index 000000000..a4b0a81bb
--- /dev/null
+++ b/maps/re/003-11.mcache
diff --git a/npc/003-1/_warps.txt b/npc/003-1/_warps.txt
index a724dd23c..b10e149b3 100644
--- a/npc/003-1/_warps.txt
+++ b/npc/003-1/_warps.txt
@@ -24,3 +24,4 @@
 003-1,96,143,0	warp	#003-1_96_143	0,0,003-5,38,40
 003-1,106,146,0	warp	#003-1_106_146	0,0,003-6,32,38
 003-1,112,146,0	warp	#003-1_112_146	0,0,003-6,40,38
+003-1,115,62,0	warp	#003-1_115_62	0,0,003-11,38,40
diff --git a/npc/003-11/_import.txt b/npc/003-11/_import.txt
new file mode 100644
index 000000000..118bcaa09
--- /dev/null
+++ b/npc/003-11/_import.txt
@@ -0,0 +1,4 @@
+// Map 003-11: Tulimshar Employment Center
+// This file is generated automatically. All manually added changes will be removed when running the Converter.
+"npc/003-11/_warps.txt",
+"npc/003-11/alfred.txt",
diff --git a/npc/003-11/_warps.txt b/npc/003-11/_warps.txt
new file mode 100644
index 000000000..547bc3eb5
--- /dev/null
+++ b/npc/003-11/_warps.txt
@@ -0,0 +1,3 @@
+// This file is generated automatically. All manually added changes will be removed when running the Converter.
+// Map 003-11: Tulimshar Employment Center warps
+003-11,38,41,0	warp	#003-11_38_41	0,0,003-1,115,63
diff --git a/npc/003-11/alfred.txt b/npc/003-11/alfred.txt
new file mode 100644
index 000000000..157043cd3
--- /dev/null
+++ b/npc/003-11/alfred.txt
@@ -0,0 +1,115 @@
+// TMW2 Script
+// Author:
+//    Jesusalva
+// Description:
+//  Tulimshar Employment Center
+
+003-11,38,37,0	script	Alfred	NPC_LOF_RICH,{
+    function _calc_wage;
+    if (@alfred_st) goto L_Working;
+    // Hours of Function
+    if (gettime(8) >= 365) {
+        mesn;
+        mesq l("Sorry, we're closed for New Year festivities.");
+        close;
+	} else if (gettime(GETTIME_MONTH) == DECEMBER) {
+		mes("It's December! The center will close for new year, be warned!");
+    }
+    // Main
+    mesn;
+    mesq l("Hello! I am Alfred, and I offer paperwork jobs. No one likes to do them, because they consist in ##Bnot doing anything for hours straight##b. Heck, most people even snooze while filling them!");
+    next;
+    mesn;
+    mesq l("I'll offer you a payment for hours worked, I do not advise this unless you have nothing better to do.");
+    next;
+    mesn;
+    mesq l("Do you want to work? The current wage is %s GP/hour, and if you leave the building, I'll assume you've stopped working and will emit payment.", fnum(_calc_wage()));
+    mesc l("There is no payment for fraction of hours worked."), 1;
+    mesc l("If you logout without leaving the map first, fees will be deducted from your payment."), 1;
+    if (askyesno() == ASK_YES) {
+        dispbottom l("You've started to fill paperwork.");
+        tutmes l("As long that you do not leave the map, your char will keep generating money. Do note you cannot work more than %d hours straight.", .maxHours);
+        @alfred_st = gettimeparam(GETTIME_MINUTE);
+        addtimer(3000, "Alfred::OnBleep");
+    }
+    close;
+
+OnBleep:
+    // Check if you changed the map
+    if (getmap() != "003-11") {
+        // Check how many hours you've worked
+        .@current = gettimeparam(GETTIME_MINUTE);
+        // Pay you for every 60 minutes
+        .@pay = min(.maxHours, (.@current - @alfred_st) / 60) * _calc_wage();
+        // Fraction of hour code pending .maxHours enforcement
+        // i.e. preventing you from working more than .maxHours per day
+        //.@pay += ((.@current - @alfred_st) % 60) * _calc_wage() / 60;
+        Zeny += .@pay;
+        // Terminate the work
+        @alfred_st = 0;
+        dispbottom l("You've stopped working and was paid %s GP.", fnum(.@pay));
+        end;
+    }
+    // Keep the variable alive and in use
+    @alfred_st += 0;
+    // Keep bleeping!
+    addtimer(rand(1000,5000), "Alfred::OnBleep");
+    end;
+
+L_Working:
+    .@current = gettimeparam(GETTIME_MINUTE) - @alfred_st;
+    if (.@current / 60 >= .maxHours)
+        npctalk3 l("You have worked the limit of %d hours and will not be paid for overtime.", .maxHours);
+    else
+        npctalk3 l("You have currently worked %d hour(s) and %d minute(s). Fraction of hour won't be paid.", .@current / 60, .@current % 60);
+    end;
+
+// Calculate your hourly wage
+function _calc_wage {
+    .@wage = 0;
+    /* Player Story (8 arcs) */
+    // Fortress Arc Complete
+    if (getq(General_Narrator) >= 23)
+        .@wage += 850;
+    // LoF Arc Complete
+    if (getq(General_Narrator) >= 19)
+        .@wage += 850;
+    // Frostia Arc Complete
+    if (getq(General_Narrator) >= 17)
+        .@wage += 850;
+    // Nivalis Arc Complete
+    if (getq(General_Narrator) >= 12)
+        .@wage += 850;
+    // Halinarzo Arc Complete
+    if (getq(General_Narrator) >= 10)
+        .@wage += 850;
+    // Hurnscald Arc Complete
+    if (getq(General_Narrator) >= 6)
+        .@wage += 850;
+    // Tulimshar Arc Complete
+    if (getq(General_Narrator) >= 3)
+        .@wage += 850;
+    // Candor Arc Complete
+    if (getq(General_Narrator) >= 1)
+        .@wage += 850;
+
+    // Game Storyline Inflation Bonus
+    if ($GAME_STORYLINE >= 3)
+        .@wage += ($GAME_STORYLINE-2) * 200;
+
+    // Personal Inflation Bonus
+    .@wage += min((gettimetick(2) - TUT_VAR) / 86400, 500);
+
+    // Global Inflation Bonus
+    .@wage += min(TOP3AVERAGELVL()/2, 100);
+
+    // Return the wage, capped at 8k/hour
+    return .@wage;
+}
+
+OnInit:
+    .sex = G_MALE;
+    .distance = 5;
+    .maxHours = 7 + $GAME_STORYLINE;
+    end;
+}
diff --git a/npc/012-1/milly.txt b/npc/012-1/milly.txt
index 95e99aa50..f411868dd 100644
--- a/npc/012-1/milly.txt
+++ b/npc/012-1/milly.txt
@@ -105,8 +105,11 @@ L_Epic:
     getitem SunnyCrystal, 1;
     getitem MysteriousFruit, 1;
     // To complete all quests, you need to be at least Lv 95
-    getexp 1000000, 24000;
-    Zeny += 25000;
+    // However, you'll not receive this prize if you used Beta Resurrection
+    if (!#BETA_REVIVE) {
+        getexp 1000000, 24000;
+        Zeny += 25000;
+    }
     mesn;
     mesq lg("Here you go, miss! Thanks for being my hero! <3", "Here you go, mister! Thanks for being my hero! <3");
     close;
diff --git a/npc/029-0/event.txt b/npc/029-0/event.txt
index 0eda1b0b4..0cedab04c 100644
--- a/npc/029-0/event.txt
+++ b/npc/029-0/event.txt
@@ -296,6 +296,7 @@ L_PowerUp:
     mesq l("Yes. I can. But this is irreversible. Are you sure you want this?");
     next;
     mesc l("Awake lost potential? This will mess with your char data irreversibly, beware."), 1;
+    mesc b(l("New players are strongly DISCOURAGED from using this resource, as it'll close about half of the available quests.")), 1;
     if (askyesno() == ASK_NO) close;
     inventoryplace Iten, 1, NPCEyes, 4;
 
@@ -347,7 +348,7 @@ L_PowerUp:
     // Monster points
     MPQUEST=true;
     if (!Mobpt)
-        Mobpt+=100000;
+        Mobpt+=80000;
 
     // Magic Power
     adddefaultskills();
diff --git a/npc/_import.txt b/npc/_import.txt
index 2b9a79696..84c377814 100644
--- a/npc/_import.txt
+++ b/npc/_import.txt
@@ -41,6 +41,7 @@
 @include "npc/003-1-3/_import.txt"
 @include "npc/003-1/_import.txt"
 @include "npc/003-10/_import.txt"
+@include "npc/003-11/_import.txt"
 @include "npc/003-13/_import.txt"
 @include "npc/003-2-1/_import.txt"
 @include "npc/003-2/_import.txt"
diff --git a/npc/functions/bank.txt b/npc/functions/bank.txt
index b079e6445..9d45602ba 100644
--- a/npc/functions/bank.txt
+++ b/npc/functions/bank.txt
@@ -336,7 +336,7 @@ function	script	MerchantQuest	{
             mesq l("Thanks for the letter! Your efforts are greatly appreciated.");
             Zeny+=rand2(7, 12) * 57;
             getexp 67, 9;
-            setq General_MerchantRequest, MERCQ_NONE, 0, gettimetick(2)+1800;
+            setq General_MerchantRequest, MERCQ_NONE, 0, gettimetick(2)+900;
             return;
         }
         else
@@ -367,7 +367,7 @@ function	script	MerchantQuest	{
             .@price = getiteminfo(.@q2, ITEMINFO_SELLPRICE);
             Zeny+=.@price + rand2(12, 18) * 57;
             getexp 120, 18;
-            setq General_MerchantRequest, MERCQ_NONE, 0, gettimetick(2)+7200;
+            setq General_MerchantRequest, MERCQ_NONE, 0, gettimetick(2)+1200;
             return;
         }
         else
@@ -409,7 +409,7 @@ function	script	MerchantQuest	{
             mesq l("Thanks for scorting our associate! Your efforts are greatly appreciated.");
             Zeny+=rand2(24, 52) * 57;
             getexp 360, 44;
-            setq General_MerchantRequest, MERCQ_NONE, 0, gettimetick(2)+7200; //Original: 43200
+            setq General_MerchantRequest, MERCQ_NONE, 0, gettimetick(2)+1800; //Original: 43200
             unitkill(MERCHANT_ID);
             MERCHANT_ID = 0;
             return;
diff --git a/npc/functions/hub.txt b/npc/functions/hub.txt
index 4511936d7..773f306c7 100644
--- a/npc/functions/hub.txt
+++ b/npc/functions/hub.txt
@@ -158,6 +158,20 @@ function	script	HUB_Logout	{
         recovery(getcharid(3));
         warp "Save", 0, 0;
     }
+    // Died or logged out on Employment Center
+    if (.@mapa$ == "003-11") {
+      if (@alfred_st) {
+        .@current = gettimeparam(GETTIME_MINUTE);
+        .@hours = (.@current - @alfred_st) / 60;
+        .@wage = 6800 * getq(General_Narrator) / 23; // "Alfred"::_calc_wage();
+        .@pay = min(getvariableofnpc(.maxHours, "Alfred"), .@hours) * .@wage;
+        // I can't really know the wage! >.<
+        // You'll be underpaid, but there's nothing I can *do* about it now.
+        Zeny += .@pay;
+        // Terminate the work
+        @alfred_st = 0;
+      }
+    }
     // Logout while donating blood
     if (getq(HurnscaldQuest_BloodDonor) == 2) {
         slide 35, 28;