summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--conf/map/maps.conf1
-rw-r--r--db/constants.conf1
-rw-r--r--db/map_index.txt767
-rw-r--r--db/re/item_db.conf22
-rw-r--r--db/re/mob_db.conf97
-rw-r--r--langs/lang_de.old84
-rw-r--r--langs/lang_de.txt181
-rw-r--r--langs/lang_en.old99
-rw-r--r--langs/lang_en.txt183
-rw-r--r--langs/lang_es.old21
-rw-r--r--langs/lang_es.txt157
-rw-r--r--langs/lang_fr.old75
-rw-r--r--langs/lang_fr.txt205
-rw-r--r--langs/lang_pt_BR.old87
-rw-r--r--langs/lang_pt_BR.txt181
-rw-r--r--langs/lang_ru.old81
-rw-r--r--langs/lang_ru.txt173
-rw-r--r--maps/re/003-0-3.mcachebin0 -> 167 bytes
-rw-r--r--npc/001-10-1/scripts.txt2
-rw-r--r--npc/001-10/scripts.txt19
-rw-r--r--npc/003-0-2/_warps.txt2
-rw-r--r--npc/003-0-2/misc.txt37
-rw-r--r--npc/003-0-3/_config.txt20
-rw-r--r--npc/003-0-3/_import.txt4
-rw-r--r--npc/003-0-3/_warps.txt4
-rw-r--r--npc/003-2-1/demure.txt19
-rw-r--r--npc/003-3/malindou.txt41
-rw-r--r--npc/005-1/zegas.txt2
-rw-r--r--npc/005-2/saxsochest.txt3
-rw-r--r--npc/017-1/fairy_collector.txt113
-rw-r--r--npc/018-2-1/dustman.txt8
-rw-r--r--npc/_import.txt1
-rw-r--r--npc/commands/discord.txt1
-rw-r--r--npc/commands/grantpower.txt51
-rw-r--r--npc/functions/hub.txt16
-rw-r--r--npc/functions/main.txt29
-rw-r--r--npc/functions/mkbot.txt9
-rw-r--r--npc/functions/news.txt2
-rw-r--r--npc/functions/refine.txt9
-rw-r--r--npc/functions/vault.txt25
-rw-r--r--npc/items/grenade.txt8
41 files changed, 1864 insertions, 976 deletions
diff --git a/conf/map/maps.conf b/conf/map/maps.conf
index 090ad47a3..e3cb0f273 100644
--- a/conf/map/maps.conf
+++ b/conf/map/maps.conf
@@ -31,6 +31,7 @@ map_list: (
"002-5",
"003-0-1",
"003-0-2",
+ "003-0-3",
"003-0",
"003-1-1",
"003-1-2",
diff --git a/db/constants.conf b/db/constants.conf
index 75897bfa0..f7b97cbdb 100644
--- a/db/constants.conf
+++ b/db/constants.conf
@@ -2120,6 +2120,7 @@ constants_db: {
EE_CRAZYFEFE: 1024
EE_SAULC: 2048
EE_GEMINI: 4096
+ EE_COMPLAINT: 8192
comment__: "Teleporter enum"
TP_NONE: 0
diff --git a/db/map_index.txt b/db/map_index.txt
index bc2a1c856..9fcdca283 100644
--- a/db/map_index.txt
+++ b/db/map_index.txt
@@ -28,386 +28,387 @@
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
+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
+012-1 147
+012-2 148
+012-3 149
+012-4 150
+012-5 151
+012-6 152
+012-7 153
+012-8 154
+013-1 155
+014-1 156
+014-2-1 157
+014-2-2 158
+014-2 159
+014-3 160
+014-4 161
+014-5-1 162
+014-5 163
+015-1 164
+015-2 165
+015-3-1 166
+015-3-2 167
+015-3-3 168
+015-3 169
+015-4 170
+015-5 171
+015-6 172
+015-7 173
+015-8-1 174
+015-8 175
+016-1 176
+016-6 177
+016-7 178
+017-0 179
+017-1 180
+017-10 181
+017-2-1 182
+017-2-2 183
+017-2 184
+017-3 185
+017-4 186
+017-5 187
+017-6 188
+017-7 189
+017-8 190
+018-1-1 191
+018-1 192
+018-2-1 193
+018-2-2 194
+018-2-3 195
+018-2-4 196
+018-2-5 197
+018-2-6 198
+018-2-7 199
+018-2-8 200
+018-2 201
+018-3 202
+018-4-1 203
+018-4-2 204
+018-4 205
+018-5-0 206
+018-5-1 207
+018-5-2 208
+018-5-3 209
+018-5-4 210
+018-5-5 211
+018-5-boss 212
+018-5 213
+018-6-0 214
+018-6-1 215
+018-6-2 216
+018-6-3 217
+018-7-1 218
+018-7 219
+019-1-1 220
+019-1 221
+019-2 222
+019-3 223
+019-4-1 224
+019-4 225
+019-5-1 226
+019-5-2 227
+019-5-3 228
+019-5 229
+019-6 230
+020-1 231
+020-2 232
+020-3 233
+020-4 234
+020-5 235
+020-6 236
+020-7-1 237
+020-7-2 238
+020-7 239
+021-0 240
+021-1 241
+021-2 242
+021-3 243
+021-4 244
+022-1 245
+023-1 246
+023-2 247
+023-3-1 248
+023-3-2 249
+023-3 250
+023-4 251
+024-1 252
+024-10 253
+024-11 254
+024-12 255
+024-13 256
+024-14 257
+024-15 258
+024-16 259
+024-2 260
+024-3 261
+024-4 262
+024-5 263
+024-6 264
+024-7 265
+024-8 266
+024-9 267
+025-1 268
+025-2-1 269
+025-2-2 270
+025-2-3 271
+025-2-4 272
+025-2 273
+025-3 274
+026-0 275
+026-1 276
+026-2 277
+027-0 278
+027-1 279
+027-2 280
+027-3 281
+027-4 282
+027-5 283
+027-6 284
+027-7 285
+029-0 286
+029-1 287
+029-2 288
+029-3 289
+029-4 290
+029-5 291
+029-6 292
+029-7 293
+029-8 294
+029-9 295
+030-01 296
+030-02 297
+030-03 298
+030-04 299
+030-05 300
+030-06 301
+030-07 302
+030-08 303
+030-09 304
+030-10 305
+030-11 306
+030-12 307
+030-13 308
+030-14 309
+030-15 310
+030-16 311
+030-17 312
+030-18 313
+030-19 314
+030-20 315
+030-21 316
+030-22 317
+030-23 318
+030-24 319
+030-25 320
+030-26 321
+030-27 322
+030-28 323
+030-29 324
+030-30 325
+030-31 326
+030-32 327
+030-33 328
+030-34 329
+030-35 330
+030-36 331
+030-37 332
+030-38 333
+030-39 334
+030-40 335
+030-41 336
+030-42 337
+030-43 338
+030-44 339
+030-45 340
+030-46 341
+030-47 342
+030-48 343
+030-49 344
+030-50 345
+030-51 346
+030-52 347
+030-53 348
+030-54 349
+030-55 350
+030-56 351
+030-57 352
+030-58 353
+030-59 354
+030-60 355
+030-61 356
+030-62 357
+030-63 358
+030-64 359
+030-65 360
+030-66 361
+030-67 362
+030-68 363
+030-69 364
+030-70 365
+030-71 366
+030-72 367
+030-73 368
+030-74 369
+030-75 370
+031-0 371
+031-1 372
+031-2 373
+031-3 374
+031-4 375
+031-5 376
+031-6 377
+031-7 378
+031-8 379
+031-9 380
+032-1 381
+032-2 382
+032-3 383
+032-4 384
+032-5 385
+033-1 386
+033-2 387
+033-3 388
+033-4 389
+033-5 390
+034-1 391
+034-2 392
+034-3 393
+034-4 394
+042-0 395
+042-1 396
+042-10 397
+042-11 398
+042-2 399
+042-3 400
+042-4 401
+042-5 402
+042-6 403
+042-7 404
+042-8 405
+042-9 406
+boss 407
+botcheck 408
+guilds 409
+sec_pri 410
+soren-2 411
+soren 412
+test 413
+testbg 414
diff --git a/db/re/item_db.conf b/db/re/item_db.conf
index ab188773e..3b4cdfc9f 100644
--- a/db/re/item_db.conf
+++ b/db/re/item_db.conf
@@ -1539,7 +1539,7 @@ item_db: (
noauction: true
}
Script: <"
- setarray .@r, StrangeCoin, StrangeCoin, StrangeCoin, StrangeCoin, SharpKnife, RedApple, Cheese, Aquada, BronzeGladius, Aquada, Lockpicks, IronAmmoBox, ArrowAmmoBox, ElixirOfLife;
+ setarray .@r, StrangeCoin, StrangeCoin, StrangeCoin, StrangeCoin, Dagger, Curshroom, RedPlushWine, Aquada, BronzeGladius, MoubooSteak, Lockpicks, IronAmmoBox, ArrowAmmoBox, ElixirOfLife;
.@n=rand(getarraysize(.@r));
if (.@n > 3)
@@ -1565,7 +1565,7 @@ item_db: (
noauction: true
}
Script: <"
- setarray .@r, StrangeCoin, StrangeCoin, StrangeCoin, StrangeCoin, StrangeCoin, SnakeEgg, StrengthPotion, HastePotion, Dagger, Wurtzite, RedPlushWine, MoubooSteak, IronOre, CelestiaTea, CursedAmmoBox, IronAmmoBox, SilverRing;
+ setarray .@r, StrangeCoin, StrangeCoin, StrangeCoin, StrangeCoin, StrangeCoin, SnakeEgg, StrengthPotion, HastePotion, Wurtzite, DwarvemSake, SaxsoKey, SilverOre, CelestiaTea, CursedAmmoBox, SilverRing;
.@n=rand(getarraysize(.@r));
if (.@n > 4)
@@ -1591,11 +1591,13 @@ item_db: (
noauction: true
}
Script: <"
- setarray .@r, StrangeCoin, StrangeCoin, CasinoCoins, IronIngot, SaxsoKey, GoldenApple, GoldenRing, GoldOre, Graphene, PoisonAmmoBox, CursedAmmoBox, MercBoxA, AncientBlueprint, HeadHood, SacredLifePotion, SacredManaPotion;
+ setarray .@r, StrangeCoin, StrangeCoin, CasinoCoins, IronIngot, ArcmageBoxset, GoldenApple, GoldenRing, GoldOre, Graphene, PoisonAmmoBox, ThornAmmoBox, MercBoxC, AncientBlueprint, HeadHood, SacredLifePotion, SacredManaPotion;
.@n=rand(getarraysize(.@r));
if (.@n > 2)
getitem .@r[.@n], 1;
+ else if (.@n == 2)
+ getitem .@r[.@n], rand(4,7);
else
getitem .@r[.@n], rand(20,40);
">
@@ -1618,7 +1620,7 @@ item_db: (
noauction: true
}
Script: <"
- setarray .@r, StrangeCoin, StrangeCoin, IronIngot, CopperIngot, TinIngot, SilverIngot, GoldIngot, PlatinumOre, IridiumOre, TitaniumOre, LeadOre, FourLeafClover, MercBoxB, MercBoxC, ThornAmmoBox, PoisonAmmoBox, PolishedDiamond, PolishedRuby, PolishedEmerald, PolishedSapphire, PolishedAmethyst, PolishedTopaz, SacredLifePotion, SacredManaPotion, SacredImmortalityPotion, AncientBlueprint, ArcmageBoxset, MysteriousFruit, MercBoxD, MercBoxE;
+ setarray .@r, StrangeCoin, StrangeCoin, CopperIngot, TinIngot, SilverIngot, GoldIngot, PlatinumOre, IridiumOre, FourLeafClover, BoneAmmoBox, PolishedDiamond, PolishedRuby, PolishedEmerald, PolishedSapphire, PolishedAmethyst, PolishedTopaz, SacredLifePotion, SacredManaPotion, SacredImmortalityPotion, AncientBlueprint, MercBoxD, MercBoxE;
.@n=rand(getarraysize(.@r));
if (.@n > 1)
@@ -1645,7 +1647,7 @@ item_db: (
noauction: true
}
Script: <"
- setarray .@r, StrangeCoin, StrangeCoin, StrangeCoin, Googles, BlueManaPearl, BlackPearl, Bloodstone, LavaManaPearl, SaviorBlueprint, DivineApple, BowlerHat, Butterfly, BoneAmmoBox, CrystallizedMaggot, MylarinDust, MercBoxDD, MercBoxE, MysteriousFruit, MercBoxEE;
+ setarray .@r, StrangeCoin, StrangeCoin, StrangeCoin, Googles, BlueManaPearl, BlackPearl, Bloodstone, LavaManaPearl, SaviorBlueprint, DivineApple, BowlerHat, Butterfly, CrystallizedMaggot, MylarinDust, MercBoxDD, MercBoxEE, MercBoxE, MysteriousFruit;
.@n=rand(getarraysize(.@r));
if (.@n > 2)
@@ -5492,6 +5494,16 @@ item_db: (
Refine: false
//DropAnnounce: true
},
+{
+ Id: 927
+ AegisName: "ComplaintForm"
+ Name: "Complaint Form"
+ Type: "IT_ETC"
+ Buy: 175
+ Sell: 50
+ Weight: 1
+ Refine: false
+},
// <!-- Necklaces -->
diff --git a/db/re/mob_db.conf b/db/re/mob_db.conf
index 1d1008873..ec332a383 100644
--- a/db/re/mob_db.conf
+++ b/db/re/mob_db.conf
@@ -1933,7 +1933,57 @@ mob_db: (
Amethyst: 2
}
},
-// 1046 is free
+{
+ Id: 1046
+ SpriteName: "ComplaintDragon"
+ Name: "Complaint Dragon"
+ Lv: 75
+ Hp: 12308
+ Sp: 1248
+ Exp: 1641
+ JExp: 102
+ AttackRange: 6
+ Attack: [550, 600]
+ Def: 50
+ Mdef: 75
+ WalkMask: "WALK_AIR"
+ Stats: {
+ Str: 41
+ Agi: 55
+ Vit: 72
+ Int: 0
+ Dex: 66
+ Luk: 33
+ }
+ ViewRange: 10
+ ChaseRange: 15
+ Race: 9
+ Element: (3, 2)
+ Mode: {
+ CanMove: true
+ Looter: true
+ Aggressive: true
+ Assist: true
+ CanAttack: true
+ ChangeTargetMelee: true
+ ChangeChase: true
+ }
+ MoveSpeed: 500
+ AttackDelay: 1800
+ AttackMotion: 672
+ DamageMotion: 480
+ Drops: {
+ ComplaintForm: 1800
+ Dragonfruit: 600
+ DragonScales: 400
+ HastePotion: 300
+ StrengthPotion: 300
+ DragonStar: 2
+ }
+ WeaponAttacks: {
+ All: 8000
+ }
+},
{
Id: 1047
SpriteName: "BeeHive"
@@ -12603,6 +12653,51 @@ mob_db: (
Bloodstone: 1
}
},
+{
+ Id: 1451
+ SpriteName: "Birb"
+ Name: "King Chonky Birb"
+ Lv: 101
+ Hp: 57000
+ Sp: 0
+ Exp: 14000
+ JExp: 100
+ AttackRange: 8
+ Attack: [620, 670]
+ Def: 45
+ Mdef: 127
+ Stats: {
+ Str: 12
+ Agi: 63
+ Vit: 88
+ Int: 110
+ Dex: 141
+ Luk: 77
+ }
+ ViewRange: 9
+ ChaseRange: 12
+ Race: 2
+ Element: (7, 1)
+ Mode: {
+ CanMove: true
+ CanAttack: true
+ Aggressive: true
+ Angry: true
+ ChangeTargetMelee: true
+ ChangeChase: true
+ CastSensorChase: true
+ Boss: true
+ }
+ MoveSpeed: 320
+ AttackDelay: 2100
+ AttackMotion: 672
+ DamageMotion: 200
+ Drops: {
+ BronzeBossGift: 200
+ SilverBossGift: 50
+ GoldenBossGift: 10
+ }
+},
// System
{
Id: 1491
diff --git a/langs/lang_de.old b/langs/lang_de.old
index de35513e6..24e6bf83e 100644
--- a/langs/lang_de.old
+++ b/langs/lang_de.old
@@ -283,6 +283,9 @@ Alle Mitwirkenden sollten ihre Belohnungen mit Lua behaupten. Das Wetter ist dor
All torches are lit!
Alle Fackeln leuchten!
+All you need to do then is walk outside, enter on the biggest house, and talk to the Trainer. He'll teach you everything.
+Alles, was Du tun musst, ist rausgehen, das größte Haus betreten und den Trainer anzusprechen. Er wird Dich alles lehren.
+
Alright, take your time we are not in a hurry.
Alles klar, lass dir Zeit. Wir habens nicht eilig.
@@ -343,6 +346,9 @@ Jeder Freund von Hurnscald ist auch mein Freund. Komm zu mir wieder, wenn Du tä
Anyway, conspiratory theories aside, his ghost is a powerful boss. I would not attack him if I were you!
Wie auch immer, Verschwörungstheorien beiseite, sein Geist ist ein mächtiger Boss. Ich würde ihn nicht angreifen, wenn ich du wäre!
+Anyway, our shipkeeper, Juliet, helped to heal your injuries way back.
+Wie auch immer, unser Quartiermeister, Juliet, half Ihre Verletzungen zu heilen.
+
Anyway, you can check our [@@https://gitlab.com/TMW2/Docs/wikis/home|Wiki@@] to find awesome stuff!
Wie auch immer, Du kannst in unserem [@@ https: //gitlab.com/TMW2/Docs/wikis/home | Wiki @@] fantastisches Material zu finden!
@@ -532,6 +538,12 @@ Darf ich dich fragen was deine Muttersprache ist? Ein Matrose meinte Russisch, e
Could you bleach my clothes?
Kannst du meine Kleidung bleichen?
+Could you tell me where I am?#0
+Kannst du mir sagen wo ich bin?
+
+Could you tell me where I am?#1
+Kannst du mir sagen wo ich bin?
+
Counter Attack - Next attack will be retaliated, with twice critical ratio.
Counter Attack - Nächster Angriff wird rächte sich, mit zweimal kritisches Verhältnis.
@@ -625,6 +637,12 @@ Haben Sie die @@ / 11 @@ Ich bat? Segler sind immer hungrig, weil Sie!
Do you know Land Of Fire Village? It is west of Hurnscald and is a major town.
Wissen Sie, Feuerland Village? Es liegt westlich von Hurnscald und ist eine große Stadt.
+Do you know what happened to the gold I had when you guys saved me?#0
+Weißt du, was mit dem Gold passiert ist, das ich bei mir hatte, als ihr Jungs mich gerettet habt?
+
+Do you know what happened to the gold I had when you guys saved me?#1
+Weißt du, was mit dem Gold passiert ist, das ich bei mir hatte, als ihr Jungs mich gerettet habt?
+
Do you really think the poor creature should jump a bridge in water and DIE?
Glaubst du wirklich, das arme Tier eine Brücke in Wasser und DEM springen sollte?
@@ -898,6 +916,9 @@ Hier gehen Sie, habe ich versucht, mein Bestes! Möchtest du ein weiteres?
Here, all yours. I can't use them like I am now. Thank you.
Hier werden alle Ihre. Ich kann sie nicht verwenden, wie ich jetzt bin. Vielen Dank.
+Here, come talk to me, the Magic Arpan! I'll help you get dressed.
+Hier kommen mit mir reden, die Magie Arpan! Ich werde Ihnen helfen, anziehen.
+
Hey @@! You haven't clicked on me yet!
Hallo @@! Sie haben nicht auf mich noch angeklickt!
@@ -1255,6 +1276,15 @@ In dieser Höhle können wir leicht finden Kohle, Eisenerz, und manchmal @@.
In times of famine, magic came to save us.
In Zeiten der Hungersnot, Magie kam, um uns zu retten.
+Invest in Exportations
+Invest in Exportations
+
+Invest in Reputation
+Investieren Sie in Reputation
+
+Investing in Reputation
+Die Investition in Reputation
+
Is that... Wait... Wow. You... Killed a murderer scorpion.
Ist das ... Warte ... Wow. Du ... hast einen Mörder Skorpion getötet.
@@ -1294,6 +1324,9 @@ Schlüssel zur Johanne
Julia
Julia
+Just use the arrow key--, err, I mean, just walk to the door on the right. The one which is not guarded by Peter.
+Verwenden Sie einfach den Pfeil key--, äh, ich meine, nur zu Fuß in die Tür auf der rechten Seite. Die eine, die nicht von Peter bewacht.
+
Khaki Cotton Dye
Khaki Baumwoll Farbe
@@ -1441,21 +1474,33 @@ Monster sind zu Fuß zu den verschiedenen Regionen, neue Schleifzonen erscheint!
Moving while AFK is botting! I'll send you to a %s if you move while AFK! YOU HAVE BEEN WARNED!
Zu bewegen, während AFK ist botting! Ich werde dich zu einem% s senden, wenn Sie während AFK bewegen! DU WURDEST GEWARNT!
+My chestplate, @@
+Meine Brustplatte, @@
+
My father lead a dye fabric, I'm in charge to sell @@ around the world.
Mein Vater einen Farbstoff Stoff führen, ich bin verantwortlich zu verkaufen @@ der ganzen Welt.
My figurin is so nice!
Meine figurin ist so schön!
+My helmet, @@
+Mein Helm, @@
+
My name is @@ and I am the daily task master. Interested in keeping this world free from monsters, or to report back?
Mein Name ist @@ und ich bin die tägliche Aufgabe meistern. Sie interessieren diese Welt frei von Monstern zu halten oder zu berichten?
My name is @@...
Mein Name ist @@...
+My shield, @@
+Mein Schild, @@
+
My unit, however, was attacked! An assassin snuck up on us!
Meine Einheit wurde jedoch angegriffen! Ein Attentäter auf uns schlichen!
+My weapon, @@
+Meine Waffe, @@
+
NOW YOU HAVE DONE IT! By the powers to me vested as a Constable and Game Master, I sentence you to HALF HOUR IN A %s!
Jetzt haben Sie es geschafft! Durch die Kräfte mir unverfallbar als Constable und Game Master, ich verurteile Sie zu einer halben Stunde in einer% s!
@@ -1495,6 +1540,9 @@ Nivalis Befreiungstag Ergebnis: Spieler verloren 92: 300 Monster Won
No problem, I can help you anyway.
Kein Problem, ich kann dir trotzdem helfen.
+No, but what option do I have? I'm railroaded!
+Nein, aber was Option habe ich? Ich bin railroaded!
+
No, none.
Nein, keine.
@@ -1516,6 +1564,9 @@ Natürlich! Aber Vorsicht, dass [@@ https: //www.transifex.com/akaras/saulc-tmw-
Oh really? I'll put more food in the next box then.
Oh, wirklich? Ich werde in die nächste Box mehr essen packen.
+Oh right, I totally forgot about that, here you go.
+Ach ja richtig, das hab ich vollkommen vergessen. HIer bitte.
+
Oh well, we rescued you when you were yaying adrift in the sea.#0
Also, wir haben dich gerettet, als du an uns yayai getrieben bist.
@@ -1591,6 +1642,9 @@ Okay, ich bin fertig für die Arbeit!#0
Okay, I'm ready to work!#1
Okay, ich bin fertig für die Arbeit!#1
+On hindsight, I'll wait you get a few levels. Can't have cheaters, ya know!
+Auf Nachhinein werde ich warten Sie ein paar Ebenen erhalten. Kann nicht Betrüger hat, ya know!
+
Once you lit one of them, monsters will pour out, so take care to don't die.
Sobald Sie einen von ihnen leuchten, wird Monster ausgießen, so kümmern sterben nicht.
@@ -1978,6 +2032,9 @@ Es tut uns Leid vielleicht an einem anderen Tag.
Sorry! I forgot to introduce myself. My name is Arpan, but other sailors call me Magic Arpan because I know one or two yaing magic spells.
Ah. Tut mir Leid. Ich habe vergessen mich vorzustellen. Ich heiße Arpan. Aber die meisten anderen Matrosen nennen mich Magic Arpan, da ich den einen oder anderen Zauberspruch kenne.
+Sorry! I forgot to introduce myself. My name is Arpan, but other sailors call me Magic Arpan because I know one or two yaing magic tricks.
+Es tut uns leid! Ich habe vergessen, mich vorzustellen. Mein Name ist Arpan, aber auch andere Segler rufen Sie mich an Magie Arpan, weil ich ein oder zwei yaing Zaubertricks kennen.
+
Sorry! Not yet implemented!
Es tut uns leid! Noch nicht implementiert!
@@ -2125,6 +2182,9 @@ Vielen Danke für die Hilfe!
Thanks for the help!
Danke für die Hilfe!
+Thanks for the honestity, I guess.
+Vielen Dank für die honestity, denke ich.
+
Thanks once again, I know it's not much but here is @@ GP for your troubles.
Noch einmal vielen Dank, ich weiß, es ist nicht viel, aber hier ist @@ GP für Ihre Mühen.
@@ -2278,6 +2338,9 @@ Es gibt zwei Arten von Magie: Mana Fähigkeiten und Magiefertigkeiten.
There doesn't seems to be any physical wound.
Es ist scheint keine physische Wunde zu sein.
+There is a NPC called Trainer, just outside this ship.
+Es gibt einen NPC namens Trainer, etwas außerhalb dieses Schiff.
+
There is a paper with some rules written on it.
Es ist ein Papier mit einigen darauf geschriebenen Vorschriften.
@@ -2335,6 +2398,9 @@ Sie sehen aus wie die gleichen, aber sie sind es nicht. Mana Fähigkeiten haben
They will try to prove your worth before, though. So be ready.
Sie werden versuchen, Ihren Wert vor zu beweisen, though. So fertig sein.
+They're not magic, but yayaya, people like to say it is! Yeyeye.
+Sie sind keine Zauberei, sondern Yayaya, wie die Menschen sagen, es ist! Yeyeye.
+
They're not too dangerous, but takes a lot to kill. So, if you kill 10 of them, I'll know you're dedicated in learning which monsters are out there.
Sie sind nicht zu gefährlich, aber braucht viel zu töten. Also, wenn Sie 10 von ihnen töten, ich werde wissen, dass Sie beim Lernen gewidmet sind, die Monster gibt es aus.
@@ -2482,6 +2548,9 @@ Leider wurde ich verflucht, nie wieder ihre Höhle zu betreten. Sie benutzten ei
Unfortunately, Tulimshar guards are dying in the sun. Maybe you could provide them with Water?
Leider sterben Tulimshar Wachen in der Sonne. Vielleicht könnte man sie mit Wasser zur Verfügung stellen?
+Use the arrow keys to walk right and meet Juliet.
+Mit den Pfeiltasten nach rechts und treffen Juliet gehen.
+
Use the key.
Benutze den Schlüssel.
@@ -2563,6 +2632,9 @@ Wir haben versucht, sie sauber zu bekommen, aber das Meerwasser hat sie fast vö
We want to party this moment, but can you believe we ran out of beer?
Wir wollen diesen Moment feiern, aber können Sie glauben, dass wir Bier ausging?
+We will be yaying there in a few days, so we will drop you off there.
+Wir yayaen in Artis in ein paar Tagen. Wir werden dich dann dort absetzen.
+
We wish you a merry Christmas! And a happy new year!!
Wir wünschen dir frohe Weihnachten! Und ein glückliches neues Jahr!!
@@ -2620,6 +2692,9 @@ Was sollte ich tun, nachdem ich mir die Kleider genommen habe?
What should I do after taking these clothes?#1
Was sollte ich tun, nachdem ich mir die Kleider genommen habe?
+What yeye could I do for you today?
+Was kann ich heute für dich yeyeen?
+
What's that? He seems to be AFK but is not?
Was ist das? Er scheint AFK zu sein, ist aber nicht?
@@ -2698,6 +2773,9 @@ Yaya, du solltest sie besuchen! Sie wird sich freuen, dich zu sehen.
Yaya, you should go see her! She'll be happy to see you.#1
Yaya, du solltest sie besuchen! Sie wird sich freuen, dich zu sehen.
+Yayaya, @@ is surely slow. Do you remember how to walk? You can use arrow keys for that!
+Yayaya, @@ ist sicherlich langsam. Erinnern Sie sich noch, wie man geht? Sie können die Pfeiltasten für die Verwendung!
+
Yayayaya, it's the first time someone is dressed worse than us!
Yayayaya, es ist das erste Mal, dass jemand schlechter gekleidet ist als wir!
@@ -2725,6 +2803,9 @@ Ja, es sei denn, Sie etwas Besonderes tun, ein Holzscheit ist das, was Sie brauc
Yes. Frostia is a city-estate, and is ruled by me, King Gelid Frozenheart II.
Ja. Frostia ist eine Stadt-estate, und wird von mir, König Gelid Frozenheart II ausgeschlossen.
+Yeye is not paying for your food and is not a sailor like us! You should start standing on your own feet.
+Yeye zahlt nicht für dein Essen und ist kein Seemann wie wir! Du solltest lernen auf eigenen Füßen zu stehen.
+
Yeye, you are really lucky to be alive. You are in good enough shape for walking, do you remember what happened?#0
Yeye, du hast Wahnsinnsglück, am Leben zu sein. Ich denke, du kannst sogar schon aufstehen. Erinnerst du dich, was passiert ist?
@@ -2920,6 +3001,9 @@ Sie haben noch @@ Monster Punkte! Haben Sie mehr Einzelteile wünschen?
You throw a coin on the well.
Sie werfen eine Münze auf den Brunnen.
+You will see, citizens are polite and you can still ask around for help. They can help find a job for you or maybe help you find out what happened to you out at sea!
+Sie werden sehen, Bürger höflich sind und Sie können um Hilfe bitten noch um. Sie können helfen, einen Job für Sie zu finden oder vielleicht helfen Ihnen herauszufinden, was auf See, um Sie aus passiert ist!
+
You'll also need to pay a fee of @@x @@
Sie finden auch eine Gebühr in Höhe von @@ x @@ zahlen müssen
diff --git a/langs/lang_de.txt b/langs/lang_de.txt
index aff944f60..ff260c6bc 100644
--- a/langs/lang_de.txt
+++ b/langs/lang_de.txt
@@ -36,7 +36,7 @@ Es ist auch viel schwächer und weniger präzise als ein Bogen Aber es mach so v
Es ist jetzt nicht soo toll. Ich werde mit Dir handeln für bessere Gegenstände.
It is the same as a bow, including in penalty. But it deals splash damage!
-Es ist das gleiche wie ein Bogen, auch im Schaden. Aber teilt Flächenschaden aus!
+Es ist das gleiche wie ein Bogen, jedoch teilt er auch Flächenschaden aus!
It was quite a challenge, and I still need Lalica to keep curse them.
Es war eine rechte Herausforderung, und ich brauche immer noch Lalica, um sie zu verfluchen.
@@ -707,6 +707,9 @@ ist das Gasthaus, und Du kannst dort eine Wohnung für 30 Tage mieten.
* Acquired @@ @@!
* Erreicht @@ @@!
+* Actual effect lasts %d hours.
+
+
* Aid the Blue Sage in getting Peetu back to action
* Hilf dem Blue Sage, Peetu zurück an die Arbeit zu bringen
@@ -3806,8 +3809,8 @@ All torches are lit! Return to Zarkor.
All warp technology, be it crystal-based, potion-based, or mechanic-based, relies on timespace distortions.
Alle Warp-Technologie, seien es Kristall-basiert, Trank-basiert oder Mechanik-basiert, beruhen auf Raum-Zeit-Verzerrungen.
-All you need to do then is walk outside, enter on the biggest house, and talk to the Trainer. He'll teach you everything.
-Alles, was Du tun musst, ist rausgehen, das größte Haus betreten und den Trainer anzusprechen. Er wird Dich alles lehren.
+All you need to do is walk outside, enter the biggest house, and speak with the Trainer. He'll teach you everything you need to know.
+
Alliance Guard
Allianz Wache
@@ -4520,9 +4523,6 @@ Wie dem auch sei, meine Kräutermischung hält Monster weg.
Anyway, once you have the recipe book and learned a recipe, you can craft items in forges. I think you can buy it in your apartment.
Wie auch immer, sobald Du das Rezeptbuch hast und ein Rezept gelernt hast, kannst Du Gegenstände in Schmieden herstellen. Ich denke, Du kannst es in Deiner eigenen Wohnung kaufen.
-Anyway, our shipkeeper, Juliet, helped to heal your injuries way back.
-Wie auch immer, unser Quartiermeister, Juliet, half Ihre Verletzungen zu heilen.
-
Anyway, the Moubootaur certainly existed, and probably is still alive.
Wie auch immer, der Moubootaur existierte sicherlich, und wahrscheinlich existiert er noch immer.
@@ -4538,6 +4538,9 @@ Wie auch immer, können Sie sehen, wie geschickt im Umgang mit @@ Mana Magie ver
Anyway, you have a letter to our %s, you meant? Sure thing, I'll let him know at once.
+Anyway, you should be thanking Juliet, she's the one who patched you up.
+
+
Anyway. This is the FAIRY KINGDOM spell. It'll spawn fairies.
Wie auch immer. Dies ist der Feenreich zauber. Es wird Feen herbeizaubern.
@@ -6800,6 +6803,9 @@ Können Sie mir Magie lehren? Bitte, bitte?
Can you teach me some Alchemy Recipe?
Können Sie mir einige alchimierezept lehren?
+Can you tell me where I am?
+
+
Can you, perhaps, do me a favor? Please... Check her house for any signs of battle.
Können Sie vielleicht, mir einen Gefallen tun? Bitte ... Überprüfen Sie ihr Haus auf Anzeichen von Kampf.
@@ -7808,12 +7814,6 @@ Können Sie uns eine volle Mahlzeit geben, mit 5 @@ 5 @@ 5 @@ 5 @@ und 5 @@?
Could you sell me a treasure map and a shovel?
-Could you tell me where I am?#0
-Kannst du mir sagen wo ich bin?
-
-Could you tell me where I am?#1
-Kannst du mir sagen wo ich bin?
-
Could you try again, please?
Könnten Sie erneut versuchen, bitte?
@@ -9002,11 +9002,8 @@ Kennen Sie die Kette Kristalle? Wir haben sie. Haben Sie den großen Warptor am
Do you know what a Soul Menhir is?
Wissen Sie, was eine Seele Menhir ist?
-Do you know what happened to the gold I had when you guys saved me?#0
-Weißt du, was mit dem Gold passiert ist, das ich bei mir hatte, als ihr Jungs mich gerettet habt?
+Do you know what happened to the gold I had on me when I was rescued?
-Do you know what happened to the gold I had when you guys saved me?#1
-Weißt du, was mit dem Gold passiert ist, das ich bei mir hatte, als ihr Jungs mich gerettet habt?
Do you know where I can find Nard?
@@ -9404,6 +9401,12 @@ Spenden eine Fledermaus Zähne
Donate a Bat Wing
Spenden einen Fledermausflügel
+Donate all Bat Teeth
+
+
+Donate all Bat Wings
+
+
Donate to town
@@ -13088,9 +13091,6 @@ Hier werden alle Ihre. Ach, wenn ich könnte noch gehen ... Ich würde die läst
Here, all yours. I can't use them while I am this hurt anyways. Thank you.
-Here, come talk to me, the Magic Arpan! I'll help you get dressed.
-Hier kommen mit mir reden, die Magie Arpan! Ich werde Ihnen helfen, anziehen.
-
Here, lemme tell you something good: Do you know that fortress island which all the adventurers are talking about nowadays?
@@ -13103,6 +13103,9 @@ Here, please take this to them. Tell them they are welcome here anytime! %%2
Here, sparking new! Nice!!
Hier Funken neu! Nett!!
+Here, speak to me, Magic Arpan! I'll help you get dressed.
+
+
Here, take as much as you need, I have plenty!
Hier, wie viel nehmen, wie Sie brauchen, ich habe viel!
@@ -17660,17 +17663,23 @@ Invalid recipe from Nahrec partly reimbursed.
Invalid season: @@
Ungültige Saison: @@
-Invest in Exportations
-Invest in Exportations
+Invest all into boosting town exports
+
+
+Invest all into boosting town reputation
+
+
+Invest into boosting town exports
+
+
+Invest into boosting town reputation
-Invest in Reputation
-Investieren Sie in Reputation
Investing in Exportations
Die Investition in Exportations
-Investing in Reputation
-Die Investition in Reputation
+Investing into Reputation
+
Investment executed
Investition ausgeführt
@@ -18512,8 +18521,8 @@ Just tell him that I want to reconsider, and that I want the souvenir he offered
Just two coins for spin.
Nur zwei Münzen für Spin.
-Just use the arrow key--, err, I mean, just walk to the door on the right. The one which is not guarded by Peter.
-Verwenden Sie einfach den Pfeil key--, äh, ich meine, nur zu Fuß in die Tür auf der rechten Seite. Die eine, die nicht von Peter bewacht.
+Just use the arrow key--, err, I mean, just walk to the door on the right. It's the one not guarded by Peter.
+
Just wait. Fafi dragons are slow to show up...
Warte einfach. Fafi Drachen sind langsam zu zeigen ...
@@ -19754,6 +19763,12 @@ Make me some Iron Powder.
Make sure to put on a bait after you click, though!
Vergiß aber nicht, die Angel mit einem Köder zu bestücken!
+Make sure you're dressed and then speak with the captain. He'll give you a mission and unlock the ship's main door.#0
+
+
+Make sure you're dressed and then speak with the captain. He'll give you a mission and unlock the ship's main door.#1
+
+
Male
Männlich
@@ -20831,9 +20846,6 @@ Ich habe Mundgeruch.
My captain wanted me to give this to you as a special reward for your efforts.
-My chestplate, @@
-Meine Brustplatte, @@
-
My children and grandchildren have all moved to the Land of Fire, so the amount of leatherwork I can offer you is limited.
@@ -20870,9 +20882,6 @@ Meine Großmutter hat mir ein Rezept des @@, kann es alles andere als Tod heilen
My greatest realization thus far, besides some time rewinding clocks, is the @@!
Meine größte Erkenntnis bisher, neben einiger Zeit Zurückspulen Uhren, ist die @@!
-My helmet, @@
-Mein Helm, @@
-
My husband and I have moved here under the Alliance orders.
Mein Mann und ich haben hier im Rahmen der Allianz Aufträge bewegen.
@@ -20909,9 +20918,6 @@ My pleasure.
My shaman skills protected us against monsters and thieves!
Meine Schamanen Fähigkeiten uns gegen Monster und Diebe geschützt!
-My shield, @@
-Mein Schild, @@
-
My stats are too good, I won't need it.
Nein danke, meine Stats sind absolut perfekt.
@@ -20924,9 +20930,6 @@ Mein waifu Blossom hat mich hier gefangen, und sie wird mich nicht einmal sehen,
My warp crystal broke!
Meine Kette Kristall brach!
-My weapon, @@
-Meine Waffe, @@
-
Mylarin Dust
Mylarin Staub
@@ -21413,8 +21416,8 @@ Nein, ich lasse dich dort auf den Yeti Barmherzigkeit.
No, I'll save my money.
Nein, ich werde mein Geld sparen.
-No, but what option do I have? I'm railroaded!
-Nein, aber was Option habe ich? Ich bin railroaded!
+No, but what option do I have? I'm being railroaded!
+
No, it is a family heirloom. But I do have the shield blueprints. A skilled craftsman could forge one.
Nein, es ist ein Familienerbstück. Aber ich tun, um die Abschirmung Pläne haben. Ein erfahrener Handwerker könnte man schmieden.
@@ -22229,8 +22232,8 @@ Oh nein, der nows kann meine Frau helfen? Bitte ueberlege es Dir nochmal!
Oh please. Even if you know a trick or two, you don't have real magic.
-Oh right, I totally forgot about that, here you go.
-Ach ja richtig, das hab ich vollkommen vergessen. HIer bitte.
+Oh right, I almost forgot, here you go!
+
Oh well, this sucks, but that was only an illusion.
Na ja, dieses saugt, aber das war nur eine Illusion.
@@ -22325,6 +22328,9 @@ Oh, hey, willkommen zurück, @@! Danke für deine Hilfe!
Oh, hey. Welcome to the library, or what's left of it.
Oh hallo. Willkommen in der Bibliothek oder das, was davon übrig ist.
+Oh, how I miss %s from Tulimshar...
+
+
Oh, just an empty staff with black powder inside it. Which explodes. And then kills monsters.
Oh, nur ein leeres Personal mit schwarzem Pulver in seinem Innern. Was explodiert. Und dann tötet Monster.
@@ -22529,9 +22535,6 @@ Auf einem Computer, können Sie es drücken @@ angreifen. Auf mobiles, das wäre
On a side note, more defense is always good, but the damage won't decrease on the same rate that defense raises.
Auf einer Seite zur Kenntnis, ist mehr Verteidigung immer gut, aber der Schaden wird auf der gleichen Geschwindigkeit nicht verringern, dass die Verteidigung erhöht.
-On hindsight, I'll wait you get a few levels. Can't have cheaters, ya know!
-Auf Nachhinein werde ich warten Sie ein paar Ebenen erhalten. Kann nicht Betrüger hat, ya know!
-
On mobile, the DPAD is at your left. Do you see the chest to my right?
Auf Mobil ist die DPAD auf der linken Seite. Haben Sie die Brust zu meinen Rechten sehen?
@@ -22541,6 +22544,9 @@ Auf mobilen, würden Sie auf dem @@ Symbol klicken!
On my way to get what you need.
Auf dem Weg zu bekommen, was Sie brauchen.
+On second thought, come see me when you've gained a few levels. We can't have cheaters, ya know?
+
+
On second thought, he really could use a bath.
Am zweiten Gedanken, kann er wirklich ein Bad verwenden.
@@ -23927,7 +23933,7 @@ Protip: Sie benötigen eine @@ voll Wasser eine Antwort von Wachen zu bekommen.
Protip: You need level %d or higher to do this quest.
-Protip: You skipped tutorial. A lot of tutorial-ish dialogs and quests will be skipped. You can change this anytime on %s > Game Settings.
+Protip: You skipped the tutorial. A lot of tutorial related dialog and quests will be skipped. You can change this anytime in %s > Game Settings.
Protip: Your current progress will be saved.
@@ -24593,6 +24599,12 @@ Mieten Sie 30 Tage für 1000 GP
Rent 30 days for 2000 GP
Mieten Sie 30 Tage für 2000 GP
+Rent 365 days for 10000 GP
+
+
+Rent 365 days for 20000 GP
+
+
Rent 7 days for 300 GP
Mieten 7 Tage für 300 GP
@@ -26651,8 +26663,8 @@ Sorry kind sir @@, but no.#1
Sorry pal, but only if another miner vouches for you.
Leider Kumpel, aber nur, wenn ein anderer Bergmann für Sie bürgt.
-Sorry! I forgot to introduce myself. My name is Arpan, but other sailors call me Magic Arpan because I know one or two yaing magic tricks.
-Es tut uns leid! Ich habe vergessen, mich vorzustellen. Mein Name ist Arpan, aber auch andere Segler rufen Sie mich an Magie Arpan, weil ich ein oder zwei yaing Zaubertricks kennen.
+Sorry! Allow me to introduce myself. My name is Arpan, but the other sailors call me Magic Arpan because I know one or two ya-ing magic tricks.
+
Sorry! Sorry!
Es tut uns leid! Es tut uns leid!
@@ -27710,6 +27722,9 @@ Thank you for being with us for so long. You gained a %s as a random good-hearte
Thank you for helping me make my tea. I hope the potions have been helpful...
Vielen Dank für die Hilfe bei meinem Tee zu machen. Ich hoffe, die Tränke hilfreich gewesen sein ...
+Thank you for the %s, I really appreciate it.
+
+
Thank you for your help.
Danke für Deine Hilfe.
@@ -27887,9 +27902,6 @@ Danke für die Hilfe.
Thanks for the help. Here, take this shirt and some money.
Danke für die Hilfe. Hier, nehmen Sie dieses Hemd und etwas Geld.
-Thanks for the honestity, I guess.
-Vielen Dank für die honestity, denke ich.
-
Thanks for the kindness, but you don't have enough. I need 5!
Vielen Dank für die Freundlichkeit, aber Sie haben nicht genug. Ich brauche 5!
@@ -27917,6 +27929,9 @@ Danke für deine Hilfe!
Thanks for your help, anyway.
+Thanks for your honesty, I guess.
+
+
Thanks for your patronage! The rewards will be available with @@, in case I do find the paradise!
Vielen Dank für Ihre Schirmherrschaft! Die Belohnungen werden mit @@ verfügbar sein, falls ich das Paradies!
@@ -29705,9 +29720,6 @@ There doesn't seem to be any physical wound.
There exist more food than you know. But this time I don't want anything extravagant, just 6 @@ should be fine.
Es gibt mehr Nahrung, als Sie wissen. Aber dieses Mal habe ich nichts extravagant wollen, nur 6 @@ sollte in Ordnung sein.
-There is a NPC called Trainer, just outside this ship.
-Es gibt einen NPC namens Trainer, etwas außerhalb dieses Schiff.
-
There is a chasm.
Es gibt eine Kluft.
@@ -29720,6 +29732,9 @@ Es gibt eine leichte Brise von @@ kommen.
There is a time limit, which is already running.
+There is an NPC called Trainer, just outside the ship.
+
+
There is no EXP penalty, but you cannot go back without either completing the cave, or dying.
Es gibt keine EXP Strafe, aber man kann ohne entweder Abschluss der Höhle nicht zurück, oder zu sterben.
@@ -30095,8 +30110,8 @@ They'll also start spawning on whole map, so be careful.
They're back - and they took hold of your majesty - my husband - king Arthur!
-They're not magic, but yayaya, people like to say it is! Yeyeye.
-Sie sind keine Zauberei, sondern Yayaya, wie die Menschen sagen, es ist! Yeyeye.
+They're not magic, but yayaya, people like to say it is! Yeyeye!
+
They're not too dangerous, but they can take a lot of hits. So, if you kill 10 of them, I'll know you're dedicated in learning which monsters are out there.
@@ -31874,8 +31889,8 @@ Use its powers for good!
Use the abandoned passage to the north... Usually, no one uses it.
-Use the arrow keys to walk right and meet Juliet.
-Mit den Pfeiltasten nach rechts und treffen Juliet gehen.
+Use the arrow keys to walk over to the right and meet Juliet.
+
Use these coins to exchange for stuff. But beware: Each dungeon difficulty will increase the coin drop in the square value of previous.
Verwenden Sie diese Münzen für Sachen auszutauschen. Aber Achtung: Jede Dungeon-Schwierigkeit wird die Münze Tropfen auf dem Quadratwert der vorherigen erhöhen.
@@ -32252,6 +32267,9 @@ ACHTUNG: Der Fortschritt auf der Suche war verloren!
WARNING: if you die again today in a special map it will be PERMANENT.
+WARNING: you can only rent one mount per character. Either tortuga or a mouboo.
+
+
WARPING IN 10 SECONDS
WARPEN IN 10 SEKUNDEN
@@ -32660,8 +32678,8 @@ We want to celebrate this moment, but can you believe we ran out of beer?
We want to thank everyone who did this release possible.
Wir möchten allen danken, die diese Veröffentlichung möglich gemacht haben.
-We will be yaying there in a few days, so we will drop you off there.
-Wir yayaen in Artis in ein paar Tagen. Wir werden dich dann dort absetzen.
+We will be yeye-ing there in a few days, so we'll part ways there.
+
We will have a party today, but only believers are allowed in!
Wir werden eine Partei heute haben, aber nur Gläubige dürfen in!
@@ -33542,9 +33560,6 @@ Was würdest du gerne begraben?
What would you like today?
Was darfs denn heute sein?
-What yeye could I do for you today?
-Was kann ich heute für dich yeyeen?
-
What you asked me for, again?
Was fragte man mich, wieder?
@@ -33587,6 +33602,9 @@ Was ist Ihre Meinung Peetu und seine Arbeit?
What, only that? Well, this is actually simpler than it looks.
Was, nur das? Nun, dies ist tatsächlich einfacher als es aussieht.
+What-yeye could I do for you today?
+
+
What? A party?
Was? Eine Feier?
@@ -34376,8 +34394,8 @@ Yaya, you should go see her! She'll be happy to help you again.#0
Yaya, you should go see her! She'll be happy to help you again.#1
-Yayaya, @@ is surely slow. Do you remember how to walk? You can use arrow keys for that!
-Yayaya, @@ ist sicherlich langsam. Erinnern Sie sich noch, wie man geht? Sie können die Pfeiltasten für die Verwendung!
+Yayaya, @@ is surely slow. Don't you remember how to walk? You can use arrow keys for that!
+
Yayaya, by pressing @@ or clicking in @@, you'll open your char status window!
Yayaya, durch Drücken der Taste @@ oder in @@ klicken, werden Sie Ihre char Statusfenster öffnen!
@@ -34388,6 +34406,9 @@ Yayaya, by pressing @@ or clicking in @@, you'll open your character status wind
Yayaya, good job! You can collect loot by pressing @@.
Yayaya, gute Arbeit! Sie können Beute sammeln, indem Sie @@.
+Ye not paying for your food and ye isn't a sailor like us! Ye should be standing on your own two feet.
+
+
Yeah sure, take my Amethyst!
Ja sicher, nimm meine Amethyst!
@@ -34781,9 +34802,6 @@ Yeye kann @@ sitzen drücken, die Sie schneller heilen können.
Yeye don't need to train here anymore! Let's head back to the ship before the sun sets, shall we?
Yeye braucht nicht mehr hier zu trainieren! Lassen Sie uns zurück zum Schiff, bevor die Sonne untergeht, sollen wir?
-Yeye is not paying for your food and is not a sailor like us! You should start standing on your own feet.
-Yeye zahlt nicht für dein Essen und ist kein Seemann wie wir! Du solltest lernen auf eigenen Füßen zu stehen.
-
Yeye, are you finally ready to go?#0
@@ -36056,12 +36074,6 @@ You must %s and chant %s to begin channeling.
You must be close to it, and stealing won't change drops! If you fail, just try again! Good luck!
Sie müssen nah an ihm sein, und Stehlen nicht Tropfen ändern! Wenn Sie scheitern, versuchen Sie einfach noch einmal! Viel Glück!
-You must be dressed, and talk to our captain first. He'll give you a mission and unlock the ship main door.#0
-
-
-You must be dressed, and talk to our captain first. He'll give you a mission and unlock the ship main door.#1
-
-
You must be fast! The guards are also affected.
@@ -36182,6 +36194,9 @@ You need to finish at least %d/%d tasks.
You need to have an @@ equipped.
Sie müssen haben eine @@ ausgestattet.
+You need to have level %d or above.
+
+
You need to kill all the %d monsters to complete a bounty.
@@ -36689,8 +36704,8 @@ You will need a certain amount of them to upgrade any skill, which will be spent
You will need to *hic* prove yourself to *hic* me and the town first...
Sie müssen * hicks * selbst beweisen * hicks * me und die Stadt zuerst ein ...
-You will see, citizens are polite and you can still ask around for help. They can help find a job for you or maybe help you find out what happened to you out at sea!
-Sie werden sehen, Bürger höflich sind und Sie können um Hilfe bitten noch um. Sie können helfen, einen Job für Sie zu finden oder vielleicht helfen Ihnen herauszufinden, was auf See, um Sie aus passiert ist!
+You will notice the citizens are polite and they might help you find a job or help you figure out what happened to you out at sea.
+
You win!
Du gewinnst!
@@ -36761,6 +36776,12 @@ Sie werden bald von Sachen ausgehen, hier zu tun um, also ja, sollten Sie Ihren
You'll want your fishing rod to be flexible but solid.
Du möchtest, dass deine Angel gleichzeitig flexibel und stabil ist.
+You're aboard our ship. We made port to a little island and we're actually yeye-ending our long merchant travelling adventure at the city of Tulimshar.#0
+
+
+You're aboard our ship. We made port to a little island and we're actually yeye-ending our long merchant travelling adventure at the city of Tulimshar.#1
+
+
You're about to concede an academic title to "@@".
@@ -36812,12 +36833,6 @@ Sie sind willkommen hier nicht. Beweg dich.
You're on a ship, we're on our way to the oldest human city, Tulishmar.
Sie sind auf einem Schiff, wir sind auf dem Weg zu der ältesten menschlichen Stadt, Tulishmar.
-You're on our ship, we made port to a little island and we're actually yeyending our long merchant travelling adventure at the city of Tulimshar.#0
-
-
-You're on our ship, we made port to a little island and we're actually yeyending our long merchant travelling adventure at the city of Tulimshar.#1
-
-
You're playing with fire. Or ice. Or whatever.
Sie spielen mit dem Feuer. Oder Eis. Oder Wasauchimmer.
diff --git a/langs/lang_en.old b/langs/lang_en.old
index 065b262e9..1e5098ef5 100644
--- a/langs/lang_en.old
+++ b/langs/lang_en.old
@@ -601,6 +601,9 @@ All hail ##B@@##b, first to complete the ##3Yeti King Quest!
All torches are lit!
All torches are lit!
+All you need to do then is walk outside, enter on the biggest house, and talk to the Trainer. He'll teach you everything.
+All you need to do then is walk outside, enter on the biggest house, and talk to the Trainer. He'll teach you everything.
+
Allows to move/attack while casting. (Melee attacks still interrupt casting!)
Allows to move/attack while casting. (Melee attacks still interrupt casting!)
@@ -742,6 +745,9 @@ Anyway, here your reward.
Anyway, my herb mixture keep monsters away.
Anyway, my herb mixture keep monsters away.
+Anyway, our shipkeeper, Juliet, helped to heal your injuries way back.
+Anyway, our shipkeeper, Juliet, helped to heal your injuries way back.
+
Anyway, you can check our [@@https://gitlab.com/TMW2/Docs/wikis/home|Wiki@@] to find awesome stuff!
Anyway, you can check our [@@https://gitlab.com/TMW2/Docs/wikis/home|Wiki@@] to find awesome stuff!
@@ -1180,6 +1186,12 @@ Could be nice if you could bring me this:
Could you bleach my clothes?
Could you bleach my clothes?
+Could you tell me where I am?#0
+Could you tell me where I am?
+
+Could you tell me where I am?#1
+Could you tell me where I am?
+
Counter Attack - Next attack will be retaliated, with twice critical ratio.
Counter Attack - Next attack will be retaliated, with twice critical ratio.
@@ -1369,6 +1381,12 @@ Do you have the @@/11 @@ I requested? Sailors are getting hungry because you!
Do you know Land Of Fire Village? It is west of Hurnscald and is a major town.
Do you know Land Of Fire Village? It is west of Hurnscald and is a major town.
+Do you know what happened to the gold I had when you guys saved me?#0
+Do you know what happened to the gold I had when you guys saved me?
+
+Do you know what happened to the gold I had when you guys saved me?#1
+Do you know what happened to the gold I had when you guys saved me?
+
Do you really think the poor creature should jump a bridge in water and DIE?
Do you really think the poor creature should jump a bridge in water and DIE?
@@ -1948,6 +1966,9 @@ Here, all yours. I can't use them like I am now. Thank you.
Here, all yours. Thank you.
Here, all yours. Thank you.
+Here, come talk to me, the Magic Arpan! I'll help you get dressed.
+Here, come talk to me, the Magic Arpan! I'll help you get dressed.
+
Here, learn the ##BFalkon Punch##b. It is on Physical skills tab. You can drag it to the shortcut list. Use it to protect people!
Here, learn the ##BFalkon Punch##b. It is on Physical skills tab. You can drag it to the shortcut list. Use it to protect people!
@@ -2773,6 +2794,15 @@ Interessing can I be rewarded for my help?
Intermediary Dungeon
Intermediary Dungeon
+Invest in Exportations
+Invest in Exportations
+
+Invest in Reputation
+Invest in Reputation
+
+Investing in Reputation
+Investing in Reputation
+
Iron Butcher Knife
Iron Butcher Knife
@@ -2881,6 +2911,9 @@ Juliet is on the upper level of the ship, use the arrow keys to walk to the stai
Just @@ ago, thiefs stole Pihro & Pyndragon weapons.
Just @@ ago, thiefs stole Pihro & Pyndragon weapons.
+Just use the arrow key--, err, I mean, just walk to the door on the right. The one which is not guarded by Peter.
+Just use the arrow key--, err, I mean, just walk to the door on the right. The one which is not guarded by Peter.
+
KILL EVERY MONSTER W/O COLLECTING test
KILL EVERY MONSTER W/O COLLECTING test
@@ -3175,6 +3208,9 @@ More powerful version of healing. Requires @@ each cast.
Moving while AFK is botting! I'll send you to a %s if you move while AFK! YOU HAVE BEEN WARNED!
Moving while AFK is botting! I'll send you to a %s if you move while AFK! YOU HAVE BEEN WARNED!
+My chestplate, @@
+My chestplate, @@
+
My father lead a dye fabric, I'm in charge to sell @@ around the world.
My father lead a dye fabric, I'm in charge to sell @@ around the world.
@@ -3184,6 +3220,9 @@ My father lead a dye fabric, i'm in charge to sell @@ around the world.
My figurin is so nice!
My figurin is so nice!
+My helmet, @@
+My helmet, @@
+
My man went down and still haven't returned.
My man went down and still haven't returned.
@@ -3208,9 +3247,15 @@ My name is Malindou, I am a representative of the Merchant Guild on Tulimshar.
My shaman skill protect us, against monsters and thiefs!
My shaman skill protect us, against monsters and thiefs!
+My shield, @@
+My shield, @@
+
My unit, however, was attacked! An assassin snuck up on us!
My unit, however, was attacked! An assassin snuck up on us!
+My weapon, @@
+My weapon, @@
+
NOTE: The Energy Ball explodes and Kills. Very. Well. Make them a priority!
NOTE: The Energy Ball explodes and Kills. Very. Well. Make them a priority!
@@ -3289,6 +3334,9 @@ No problem, I can help you anyway.
No, I don't teach magic. No, I'm not interested in @@ affairs.
No, I don't teach magic. No, I'm not interested in @@ affairs.
+No, but what option do I have? I'm railroaded!
+No, but what option do I have? I'm railroaded!
+
No, none.
No, none.
@@ -3373,6 +3421,9 @@ Oh noes ─ the door is sealed! We can only press forward!
Oh really? I'll put more food in the next box then.
Oh really? I'll put more food in the next box then.
+Oh right, I totally forgot about that, here you go.
+Oh right, I totally forgot about that, here you go.
+
Oh well, we rescued you when you were yaying adrift in the sea.#0
Oh well, we rescued you when you were yaying adrift in the sea.
@@ -3469,6 +3520,9 @@ Okay, I'm ready to work!
Oldur Card
Oldur Card
+On hindsight, I'll wait you get a few levels. Can't have cheaters, ya know!
+On hindsight, I'll wait you get a few levels. Can't have cheaters, ya know!
+
Once you lit one of them, monsters will pour out, so take care to don't die.
Once you lit one of them, monsters will pour out, so take care to don't die.
@@ -3682,6 +3736,9 @@ Protip: You can get Croconut from Crocotree, and fill @@ purchased in the market
Protip: You can use "@monsterinfo <monster name>" to gauge a monster strength.
Protip: You can use "@monsterinfo <monster name>" to gauge a monster strength.
+Protip: You skipped tutorial. A lot of tutorial-ish dialogs and quests will be skipped. You can change this anytime on %s > Game Settings.
+Protip: You skipped tutorial. A lot of tutorial-ish dialogs and quests will be skipped. You can change this anytime on %s > Game Settings.
+
Provoke - Provoke a single monster
Provoke - Provoke a single monster
@@ -4156,6 +4213,9 @@ Sorry kind sir @@, but no.
Sorry! I forgot to introduce myself. My name is Arpan, but other sailors call me Magic Arpan because I know one or two yaing magic spells.
Sorry! I forgot to introduce myself. My name is Arpan, but other sailors call me Magic Arpan because I know one or two yaing magic spells.
+Sorry! I forgot to introduce myself. My name is Arpan, but other sailors call me Magic Arpan because I know one or two yaing magic tricks.
+Sorry! I forgot to introduce myself. My name is Arpan, but other sailors call me Magic Arpan because I know one or two yaing magic tricks.
+
Sorry! Not yet implemented!
Sorry! Not yet implemented!
@@ -4429,6 +4489,9 @@ Thanks for helping my wife! May the Mouboo watch over you! o.o
Thanks for the help!
Thanks for the help!
+Thanks for the honestity, I guess.
+Thanks for the honestity, I guess.
+
Thanks once again, I know it's not much but here is 450 GP for your troubles.
Thanks once again, I know it's not much but here is 450 GP for your troubles.
@@ -4720,6 +4783,9 @@ There are two kind of magic: Mana Skills and Magic Skills.
There doesn't seems to be any physical wound.
There doesn't seems to be any physical wound.
+There is a NPC called Trainer, just outside this ship.
+There is a NPC called Trainer, just outside this ship.
+
There is a paper with some rules written on it.
There is a paper with some rules written on it.
@@ -4789,6 +4855,9 @@ They will expire *hic* in just @@... Or on logout.
They will try to prove your worth before, though. So be ready.
They will try to prove your worth before, though. So be ready.
+They're not magic, but yayaya, people like to say it is! Yeyeye.
+They're not magic, but yayaya, people like to say it is! Yeyeye.
+
They're not too dangerous, but takes a lot to kill. So, if you kill 10 of them, I'll know you're dedicated in learning which monsters are out there.
They're not too dangerous, but takes a lot to kill. So, if you kill 10 of them, I'll know you're dedicated in learning which monsters are out there.
@@ -5110,6 +5179,9 @@ Updates disabled, daily login reward: 1,000 GP
Use ##B@zeny##b instead!
Use ##B@zeny##b instead!
+Use the arrow keys to walk right and meet Juliet.
+Use the arrow keys to walk right and meet Juliet.
+
Use the key.
Use the key.
@@ -5281,6 +5353,9 @@ We use swords and bows to protect the people, and we use magic to spice things u
We want to party this moment, but can you believe we ran out of beer?
We want to party this moment, but can you believe we ran out of beer?
+We will be yaying there in a few days, so we will drop you off there.
+We will be yaying there in a few days, so we will drop you off there.
+
We wish you a merry Christmas! And a happy new year!!
We wish you a merry Christmas! And a happy new year!!
@@ -5479,6 +5554,9 @@ What two words are written in big friendly letters on the back cover?
What were the second most intelligent creatures on Earth?
What were the second most intelligent creatures on Earth?
+What yeye could I do for you today?
+What yeye could I do for you today?
+
What's that? He seems to be AFK but is not?
What's that? He seems to be AFK but is not?
@@ -5638,6 +5716,9 @@ Yaya, you should go see her! She'll be happy to see you.
Yaya, you should go see her! She'll be happy to see you.#1
Yaya, you should go see her! She'll be happy to see you.
+Yayaya, @@ is surely slow. Do you remember how to walk? You can use arrow keys for that!
+Yayaya, @@ is surely slow. Do you remember how to walk? You can use arrow keys for that!
+
Yayayaya, it's the first time someone is dressed worse than us!
Yayayaya, it's the first time someone is dressed worse than us!
@@ -5686,6 +5767,9 @@ Yes. Frostia is a city-estate, and is ruled by me, King Gelid Frozenheart II.
Yeti King
Yeti King
+Yeye is not paying for your food and is not a sailor like us! You should start standing on your own feet.
+Yeye is not paying for your food and is not a sailor like us! You should start standing on your own feet.
+
Yeye should go see the capt'n. We still don't know if he's friend or foe...#1
Yeye should go see the capt'n. We still don't know if he's friend or foe...
@@ -5998,6 +6082,12 @@ You might have been affected. Please, select your desired language.
You murder @@ in cold blood.
You murder @@ in cold blood.
+You must be dressed, and talk to our captain first. He'll give you a mission and unlock the ship main door.#0
+You must be dressed, and talk to our captain first. He'll give you a mission and unlock the ship main door.
+
+You must be dressed, and talk to our captain first. He'll give you a mission and unlock the ship main door.#1
+You must be dressed, and talk to our captain first. He'll give you a mission and unlock the ship main door.
+
You must be where the Monster King at 16:30 UTC sharply - no delays allowed!
You must be where the Monster King at 16:30 UTC sharply - no delays allowed!
@@ -6100,6 +6190,9 @@ You were yaying sleeping for quite some time there. Our shipkeeper, Juliet, was
You will be killed on the road if you try to go like this. Try helping people. Get money, experience, equipment.
You will be killed on the road if you try to go like this. Try helping people. Get money, experience, equipment.
+You will see, citizens are polite and you can still ask around for help. They can help find a job for you or maybe help you find out what happened to you out at sea!
+You will see, citizens are polite and you can still ask around for help. They can help find a job for you or maybe help you find out what happened to you out at sea!
+
You will then be able to register citzenship in any city, for free. But just once.
You will then be able to register citzenship in any city, for free. But just once.
@@ -6112,6 +6205,12 @@ You withdrew a total of @@ E.
You'll also need to pay a fee of @@x @@
You'll also need to pay a fee of @@x @@
+You're on our ship, we made port to a little island and we're actually yeyending our long merchant travelling adventure at the city of Tulimshar.#0
+You're on our ship, we made port to a little island and we're actually yeyending our long merchant travelling adventure at the city of Tulimshar.
+
+You're on our ship, we made port to a little island and we're actually yeyending our long merchant travelling adventure at the city of Tulimshar.#1
+You're on our ship, we made port to a little island and we're actually yeyending our long merchant travelling adventure at the city of Tulimshar.
+
You're willing to help? Perfect. We need 3 @@, 4 @@ and 10 @@ for travel.
You're willing to help? Perfect. We need 3 @@, 4 @@ and 10 @@ for travel.
diff --git a/langs/lang_en.txt b/langs/lang_en.txt
index 90919a189..635c393bf 100644
--- a/langs/lang_en.txt
+++ b/langs/lang_en.txt
@@ -707,6 +707,9 @@ Copyright (C) 2010-2021 TMW2 Team
* Acquired @@ @@!
* Acquired @@ @@!
+* Actual effect lasts %d hours.
+* Actual effect lasts %d hours.
+
* Aid the Blue Sage in getting Peetu back to action
* Aid the Blue Sage in getting Peetu back to action
@@ -3806,8 +3809,8 @@ All torches are lit! Return to Zarkor.
All warp technology, be it crystal-based, potion-based, or mechanic-based, relies on timespace distortions.
All warp technology, be it crystal-based, potion-based, or mechanic-based, relies on timespace distortions.
-All you need to do then is walk outside, enter on the biggest house, and talk to the Trainer. He'll teach you everything.
-All you need to do then is walk outside, enter on the biggest house, and talk to the Trainer. He'll teach you everything.
+All you need to do is walk outside, enter the biggest house, and speak with the Trainer. He'll teach you everything you need to know.
+All you need to do is walk outside, enter the biggest house, and speak with the Trainer. He'll teach you everything you need to know.
Alliance Guard
Alliance Guard
@@ -4520,9 +4523,6 @@ Anyway, my herb mixture keeps monsters away.
Anyway, once you have the recipe book and learned a recipe, you can craft items in forges. I think you can buy it in your apartment.
Anyway, once you have the recipe book and learned a recipe, you can craft items in forges. I think you can buy it in your apartment.
-Anyway, our shipkeeper, Juliet, helped to heal your injuries way back.
-Anyway, our shipkeeper, Juliet, helped to heal your injuries way back.
-
Anyway, the Moubootaur certainly existed, and probably is still alive.
Anyway, the Moubootaur certainly existed, and probably is still alive.
@@ -4538,6 +4538,9 @@ Anyway, you can see how skilled using Mana Magic with @@. Mana Magic is the one
Anyway, you have a letter to our %s, you meant? Sure thing, I'll let him know at once.
Anyway, you have a letter to our %s, you meant? Sure thing, I'll let him know at once.
+Anyway, you should be thanking Juliet, she's the one who patched you up.
+Anyway, you should be thanking Juliet, she's the one who patched you up.
+
Anyway. This is the FAIRY KINGDOM spell. It'll spawn fairies.
Anyway. This is the FAIRY KINGDOM spell. It'll spawn fairies.
@@ -6800,6 +6803,9 @@ Can you teach me magic? Pretty please?
Can you teach me some Alchemy Recipe?
Can you teach me some Alchemy Recipe?
+Can you tell me where I am?
+Can you tell me where I am?
+
Can you, perhaps, do me a favor? Please... Check her house for any signs of battle.
Can you, perhaps, do me a favor? Please... Check her house for any signs of battle.
@@ -7808,12 +7814,6 @@ Could you please give us a full meal, with 5 @@, 5 @@, 5@@, 5 @@ and 5 @@?
Could you sell me a treasure map and a shovel?
Could you sell me a treasure map and a shovel?
-Could you tell me where I am?#0
-Could you tell me where I am?
-
-Could you tell me where I am?#1
-Could you tell me where I am?
-
Could you try again, please?
Could you try again, please?
@@ -9002,11 +9002,8 @@ Do you know the warp crystals? We did them. Did you saw the great warp gate at t
Do you know what a Soul Menhir is?
Do you know what a Soul Menhir is?
-Do you know what happened to the gold I had when you guys saved me?#0
-Do you know what happened to the gold I had when you guys saved me?
-
-Do you know what happened to the gold I had when you guys saved me?#1
-Do you know what happened to the gold I had when you guys saved me?
+Do you know what happened to the gold I had on me when I was rescued?
+Do you know what happened to the gold I had on me when I was rescued?
Do you know where I can find Nard?
Do you know where I can find Nard?
@@ -9404,6 +9401,12 @@ Donate a Bat Teeth
Donate a Bat Wing
Donate a Bat Wing
+Donate all Bat Teeth
+Donate all Bat Teeth
+
+Donate all Bat Wings
+Donate all Bat Wings
+
Donate to town
Donate to town
@@ -13088,9 +13091,6 @@ Here, all yours. Ah, if I still could walk... I would hunt those annoying squirr
Here, all yours. I can't use them while I am this hurt anyways. Thank you.
Here, all yours. I can't use them while I am this hurt anyways. Thank you.
-Here, come talk to me, the Magic Arpan! I'll help you get dressed.
-Here, come talk to me, the Magic Arpan! I'll help you get dressed.
-
Here, lemme tell you something good: Do you know that fortress island which all the adventurers are talking about nowadays?
Here, lemme tell you something good: Do you know that fortress island which all the adventurers are talking about nowadays?
@@ -13103,6 +13103,9 @@ Here, please take this to them. Tell them they are welcome here anytime! %%2
Here, sparking new! Nice!!
Here, sparking new! Nice!!
+Here, speak to me, Magic Arpan! I'll help you get dressed.
+Here, speak to me, Magic Arpan! I'll help you get dressed.
+
Here, take as much as you need, I have plenty!
Here, take as much as you need, I have plenty!
@@ -17660,17 +17663,23 @@ Invalid recipe from Nahrec partly reimbursed.
Invalid season: @@
Invalid season: @@
-Invest in Exportations
-Invest in Exportations
+Invest all into boosting town exports
+Invest all into boosting town exports
-Invest in Reputation
-Invest in Reputation
+Invest all into boosting town reputation
+Invest all into boosting town reputation
+
+Invest into boosting town exports
+Invest into boosting town exports
+
+Invest into boosting town reputation
+Invest into boosting town reputation
Investing in Exportations
Investing in Exportations
-Investing in Reputation
-Investing in Reputation
+Investing into Reputation
+Investing into Reputation
Investment executed
Investment executed
@@ -18512,8 +18521,8 @@ Just tell him that I want to reconsider, and that I want the souvenir he offered
Just two coins for spin.
Just two coins for spin.
-Just use the arrow key--, err, I mean, just walk to the door on the right. The one which is not guarded by Peter.
-Just use the arrow key--, err, I mean, just walk to the door on the right. The one which is not guarded by Peter.
+Just use the arrow key--, err, I mean, just walk to the door on the right. It's the one not guarded by Peter.
+Just use the arrow key--, err, I mean, just walk to the door on the right. It's the one not guarded by Peter.
Just wait. Fafi dragons are slow to show up...
Just wait. Fafi dragons are slow to show up...
@@ -19754,6 +19763,12 @@ Make me some Iron Powder.
Make sure to put on a bait after you click, though!
Make sure to put on a bait after you click, though!
+Make sure you're dressed and then speak with the captain. He'll give you a mission and unlock the ship's main door.#0
+Make sure you're dressed and then speak with the captain. He'll give you a mission and unlock the ship's main door.
+
+Make sure you're dressed and then speak with the captain. He'll give you a mission and unlock the ship's main door.#1
+Make sure you're dressed and then speak with the captain. He'll give you a mission and unlock the ship's main door.
+
Male
Male
@@ -20831,9 +20846,6 @@ My breath smells bad.
My captain wanted me to give this to you as a special reward for your efforts.
My captain wanted me to give this to you as a special reward for your efforts.
-My chestplate, @@
-My chestplate, @@
-
My children and grandchildren have all moved to the Land of Fire, so the amount of leatherwork I can offer you is limited.
My children and grandchildren have all moved to the Land of Fire, so the amount of leatherwork I can offer you is limited.
@@ -20870,9 +20882,6 @@ My grandmother gave me a recipe of the @@, it can cure anything but death.
My greatest realization thus far, besides some time rewinding clocks, is the @@!
My greatest realization thus far, besides some time rewinding clocks, is the @@!
-My helmet, @@
-My helmet, @@
-
My husband and I have moved here under the Alliance orders.
My husband and I have moved here under the Alliance orders.
@@ -20909,9 +20918,6 @@ My pleasure.
My shaman skills protected us against monsters and thieves!
My shaman skills protected us against monsters and thieves!
-My shield, @@
-My shield, @@
-
My stats are too good, I won't need it.
My stats are too good, I won't need it.
@@ -20924,9 +20930,6 @@ My waifu Blossom has me trapped here, and she won't even look at me, because I'm
My warp crystal broke!
My warp crystal broke!
-My weapon, @@
-My weapon, @@
-
Mylarin Dust
Mylarin Dust
@@ -21413,8 +21416,8 @@ No, I'll let you there to the Yeti's mercy.
No, I'll save my money.
No, I'll save my money.
-No, but what option do I have? I'm railroaded!
-No, but what option do I have? I'm railroaded!
+No, but what option do I have? I'm being railroaded!
+No, but what option do I have? I'm being railroaded!
No, it is a family heirloom. But I do have the shield blueprints. A skilled craftsman could forge one.
No, it is a family heirloom. But I do have the shield blueprints. A skilled craftsman could forge one.
@@ -22229,8 +22232,8 @@ Oh noes, who nows can help my wife? Please reconsider!
Oh please. Even if you know a trick or two, you don't have real magic.
Oh please. Even if you know a trick or two, you don't have real magic.
-Oh right, I totally forgot about that, here you go.
-Oh right, I totally forgot about that, here you go.
+Oh right, I almost forgot, here you go!
+Oh right, I almost forgot, here you go!
Oh well, this sucks, but that was only an illusion.
Oh well, this sucks, but that was only an illusion.
@@ -22325,6 +22328,9 @@ Oh, hey, welcome back, @@! Thanks for all your help!
Oh, hey. Welcome to the library, or what's left of it.
Oh, hey. Welcome to the library, or what's left of it.
+Oh, how I miss %s from Tulimshar...
+Oh, how I miss %s from Tulimshar...
+
Oh, just an empty staff with black powder inside it. Which explodes. And then kills monsters.
Oh, just an empty staff with black powder inside it. Which explodes. And then kills monsters.
@@ -22529,9 +22535,6 @@ On a computer, you can press @@ to attack it. On mobile, that would be the big b
On a side note, more defense is always good, but the damage won't decrease on the same rate that defense raises.
On a side note, more defense is always good, but the damage won't decrease on the same rate that defense raises.
-On hindsight, I'll wait you get a few levels. Can't have cheaters, ya know!
-On hindsight, I'll wait you get a few levels. Can't have cheaters, ya know!
-
On mobile, the DPAD is at your left. Do you see the chest to my right?
On mobile, the DPAD is at your left. Do you see the chest to my right?
@@ -22541,6 +22544,9 @@ On mobile, you would click on the @@ icon!
On my way to get what you need.
On my way to get what you need.
+On second thought, come see me when you've gained a few levels. We can't have cheaters, ya know?
+On second thought, come see me when you've gained a few levels. We can't have cheaters, ya know?
+
On second thought, he really could use a bath.
On second thought, he really could use a bath.
@@ -23927,8 +23933,8 @@ Protip: You need an @@ full of water to get a reply from guards.
Protip: You need level %d or higher to do this quest.
Protip: You need level %d or higher to do this quest.
-Protip: You skipped tutorial. A lot of tutorial-ish dialogs and quests will be skipped. You can change this anytime on %s > Game Settings.
-Protip: You skipped tutorial. A lot of tutorial-ish dialogs and quests will be skipped. You can change this anytime on %s > Game Settings.
+Protip: You skipped the tutorial. A lot of tutorial related dialog and quests will be skipped. You can change this anytime in %s > Game Settings.
+Protip: You skipped the tutorial. A lot of tutorial related dialog and quests will be skipped. You can change this anytime in %s > Game Settings.
Protip: Your current progress will be saved.
Protip: Your current progress will be saved.
@@ -24593,6 +24599,12 @@ Rent 30 days for 1000 GP
Rent 30 days for 2000 GP
Rent 30 days for 2000 GP
+Rent 365 days for 10000 GP
+Rent 365 days for 10000 GP
+
+Rent 365 days for 20000 GP
+Rent 365 days for 20000 GP
+
Rent 7 days for 300 GP
Rent 7 days for 300 GP
@@ -26651,8 +26663,8 @@ Sorry kind sir @@, but no.
Sorry pal, but only if another miner vouches for you.
Sorry pal, but only if another miner vouches for you.
-Sorry! I forgot to introduce myself. My name is Arpan, but other sailors call me Magic Arpan because I know one or two yaing magic tricks.
-Sorry! I forgot to introduce myself. My name is Arpan, but other sailors call me Magic Arpan because I know one or two yaing magic tricks.
+Sorry! Allow me to introduce myself. My name is Arpan, but the other sailors call me Magic Arpan because I know one or two ya-ing magic tricks.
+Sorry! Allow me to introduce myself. My name is Arpan, but the other sailors call me Magic Arpan because I know one or two ya-ing magic tricks.
Sorry! Sorry!
Sorry! Sorry!
@@ -27710,6 +27722,9 @@ Thank you for being with us for so long. You gained a %s as a random good-hearte
Thank you for helping me make my tea. I hope the potions have been helpful...
Thank you for helping me make my tea. I hope the potions have been helpful...
+Thank you for the %s, I really appreciate it.
+Thank you for the %s, I really appreciate it.
+
Thank you for your help.
Thank you for your help.
@@ -27887,9 +27902,6 @@ Thanks for the help.
Thanks for the help. Here, take this shirt and some money.
Thanks for the help. Here, take this shirt and some money.
-Thanks for the honestity, I guess.
-Thanks for the honestity, I guess.
-
Thanks for the kindness, but you don't have enough. I need 5!
Thanks for the kindness, but you don't have enough. I need 5!
@@ -27917,6 +27929,9 @@ Thanks for your help!
Thanks for your help, anyway.
Thanks for your help, anyway.
+Thanks for your honesty, I guess.
+Thanks for your honesty, I guess.
+
Thanks for your patronage! The rewards will be available with @@, in case I do find the paradise!
Thanks for your patronage! The rewards will be available with @@, in case I do find the paradise!
@@ -29705,9 +29720,6 @@ There doesn't seem to be any physical wound.
There exist more food than you know. But this time I don't want anything extravagant, just 6 @@ should be fine.
There exist more food than you know. But this time I don't want anything extravagant, just 6 @@ should be fine.
-There is a NPC called Trainer, just outside this ship.
-There is a NPC called Trainer, just outside this ship.
-
There is a chasm.
There is a chasm.
@@ -29720,6 +29732,9 @@ There is a slight breeze coming from @@.
There is a time limit, which is already running.
There is a time limit, which is already running.
+There is an NPC called Trainer, just outside the ship.
+There is an NPC called Trainer, just outside the ship.
+
There is no EXP penalty, but you cannot go back without either completing the cave, or dying.
There is no EXP penalty, but you cannot go back without either completing the cave, or dying.
@@ -30095,8 +30110,8 @@ They'll also start spawning on whole map, so be careful.
They're back - and they took hold of your majesty - my husband - king Arthur!
They're back - and they took hold of your majesty - my husband - king Arthur!
-They're not magic, but yayaya, people like to say it is! Yeyeye.
-They're not magic, but yayaya, people like to say it is! Yeyeye.
+They're not magic, but yayaya, people like to say it is! Yeyeye!
+They're not magic, but yayaya, people like to say it is! Yeyeye!
They're not too dangerous, but they can take a lot of hits. So, if you kill 10 of them, I'll know you're dedicated in learning which monsters are out there.
They're not too dangerous, but they can take a lot of hits. So, if you kill 10 of them, I'll know you're dedicated in learning which monsters are out there.
@@ -31874,8 +31889,8 @@ Use its powers for good!
Use the abandoned passage to the north... Usually, no one uses it.
Use the abandoned passage to the north... Usually, no one uses it.
-Use the arrow keys to walk right and meet Juliet.
-Use the arrow keys to walk right and meet Juliet.
+Use the arrow keys to walk over to the right and meet Juliet.
+Use the arrow keys to walk over to the right and meet Juliet.
Use these coins to exchange for stuff. But beware: Each dungeon difficulty will increase the coin drop in the square value of previous.
Use these coins to exchange for stuff. But beware: Each dungeon difficulty will increase the coin drop in the square value of previous.
@@ -32252,6 +32267,9 @@ WARNING: Your progress on the quest was lost!
WARNING: if you die again today in a special map it will be PERMANENT.
WARNING: if you die again today in a special map it will be PERMANENT.
+WARNING: you can only rent one mount per character. Either tortuga or a mouboo.
+WARNING: you can only rent one mount per character. Either tortuga or a mouboo.
+
WARPING IN 10 SECONDS
WARPING IN 10 SECONDS
@@ -32660,8 +32678,8 @@ We want to celebrate this moment, but can you believe we ran out of beer?
We want to thank everyone who did this release possible.
We want to thank everyone who did this release possible.
-We will be yaying there in a few days, so we will drop you off there.
-We will be yaying there in a few days, so we will drop you off there.
+We will be yeye-ing there in a few days, so we'll part ways there.
+We will be yeye-ing there in a few days, so we'll part ways there.
We will have a party today, but only believers are allowed in!
We will have a party today, but only believers are allowed in!
@@ -33542,9 +33560,6 @@ What would you like to bury?
What would you like today?
What would you like today?
-What yeye could I do for you today?
-What yeye could I do for you today?
-
What you asked me for, again?
What you asked me for, again?
@@ -33587,6 +33602,9 @@ What's your opinion of Peetu and his work?
What, only that? Well, this is actually simpler than it looks.
What, only that? Well, this is actually simpler than it looks.
+What-yeye could I do for you today?
+What-yeye could I do for you today?
+
What? A party?
What? A party?
@@ -34376,8 +34394,8 @@ Yaya, you should go see her! She'll be happy to help you again.
Yaya, you should go see her! She'll be happy to help you again.#1
Yaya, you should go see her! She'll be happy to help you again.
-Yayaya, @@ is surely slow. Do you remember how to walk? You can use arrow keys for that!
-Yayaya, @@ is surely slow. Do you remember how to walk? You can use arrow keys for that!
+Yayaya, @@ is surely slow. Don't you remember how to walk? You can use arrow keys for that!
+Yayaya, @@ is surely slow. Don't you remember how to walk? You can use arrow keys for that!
Yayaya, by pressing @@ or clicking in @@, you'll open your char status window!
Yayaya, by pressing @@ or clicking in @@, you'll open your char status window!
@@ -34388,6 +34406,9 @@ Yayaya, by pressing @@ or clicking in @@, you'll open your character status wind
Yayaya, good job! You can collect loot by pressing @@.
Yayaya, good job! You can collect loot by pressing @@.
+Ye not paying for your food and ye isn't a sailor like us! Ye should be standing on your own two feet.
+Ye not paying for your food and ye isn't a sailor like us! Ye should be standing on your own two feet.
+
Yeah sure, take my Amethyst!
Yeah sure, take my Amethyst!
@@ -34781,9 +34802,6 @@ Yeye can press @@ to sit, which will allow you to heal faster.
Yeye don't need to train here anymore! Let's head back to the ship before the sun sets, shall we?
Yeye don't need to train here anymore! Let's head back to the ship before the sun sets, shall we?
-Yeye is not paying for your food and is not a sailor like us! You should start standing on your own feet.
-Yeye is not paying for your food and is not a sailor like us! You should start standing on your own feet.
-
Yeye, are you finally ready to go?#0
Yeye, are you finally ready to go?
@@ -36056,12 +36074,6 @@ You must %s and chant %s to begin channeling.
You must be close to it, and stealing won't change drops! If you fail, just try again! Good luck!
You must be close to it, and stealing won't change drops! If you fail, just try again! Good luck!
-You must be dressed, and talk to our captain first. He'll give you a mission and unlock the ship main door.#0
-You must be dressed, and talk to our captain first. He'll give you a mission and unlock the ship main door.
-
-You must be dressed, and talk to our captain first. He'll give you a mission and unlock the ship main door.#1
-You must be dressed, and talk to our captain first. He'll give you a mission and unlock the ship main door.
-
You must be fast! The guards are also affected.
You must be fast! The guards are also affected.
@@ -36182,6 +36194,9 @@ You need to finish at least %d/%d tasks.
You need to have an @@ equipped.
You need to have an @@ equipped.
+You need to have level %d or above.
+You need to have level %d or above.
+
You need to kill all the %d monsters to complete a bounty.
You need to kill all the %d monsters to complete a bounty.
@@ -36689,8 +36704,8 @@ You will need a certain amount of them to upgrade any skill, which will be spent
You will need to *hic* prove yourself to *hic* me and the town first...
You will need to *hic* prove yourself to *hic* me and the town first...
-You will see, citizens are polite and you can still ask around for help. They can help find a job for you or maybe help you find out what happened to you out at sea!
-You will see, citizens are polite and you can still ask around for help. They can help find a job for you or maybe help you find out what happened to you out at sea!
+You will notice the citizens are polite and they might help you find a job or help you figure out what happened to you out at sea.
+You will notice the citizens are polite and they might help you find a job or help you figure out what happened to you out at sea.
You win!
You win!
@@ -36761,6 +36776,12 @@ You'll soon run out of stuff to do around here, so yeah, you should extend your
You'll want your fishing rod to be flexible but solid.
You'll want your fishing rod to be flexible but solid.
+You're aboard our ship. We made port to a little island and we're actually yeye-ending our long merchant travelling adventure at the city of Tulimshar.#0
+You're aboard our ship. We made port to a little island and we're actually yeye-ending our long merchant travelling adventure at the city of Tulimshar.
+
+You're aboard our ship. We made port to a little island and we're actually yeye-ending our long merchant travelling adventure at the city of Tulimshar.#1
+You're aboard our ship. We made port to a little island and we're actually yeye-ending our long merchant travelling adventure at the city of Tulimshar.
+
You're about to concede an academic title to "@@".
You're about to concede an academic title to "@@".
@@ -36812,12 +36833,6 @@ You're not welcome here. Get moving.
You're on a ship, we're on our way to the oldest human city, Tulishmar.
You're on a ship, we're on our way to the oldest human city, Tulishmar.
-You're on our ship, we made port to a little island and we're actually yeyending our long merchant travelling adventure at the city of Tulimshar.#0
-You're on our ship, we made port to a little island and we're actually yeyending our long merchant travelling adventure at the city of Tulimshar.
-
-You're on our ship, we made port to a little island and we're actually yeyending our long merchant travelling adventure at the city of Tulimshar.#1
-You're on our ship, we made port to a little island and we're actually yeyending our long merchant travelling adventure at the city of Tulimshar.
-
You're playing with fire. Or ice. Or whatever.
You're playing with fire. Or ice. Or whatever.
diff --git a/langs/lang_es.old b/langs/lang_es.old
index f9d56cdda..86948a069 100644
--- a/langs/lang_es.old
+++ b/langs/lang_es.old
@@ -85,6 +85,12 @@ Could I ask you what your native language is? A sailor told me you're Russian, b
Could you bleach my clothes?
¿Puede descolorar mi ropa?
+Could you tell me where I am?#0
+¿Puede decirme dónde estoy?#0
+
+Could you tell me where I am?#1
+¿Puede decirme dónde estoy?#1
+
Create items
Crear artículos
@@ -115,6 +121,12 @@ Do you feel too weak even to do damage to this areas wishy-washy wildlife?
Do you have any other questions for me?
¿Tienes alguna otra alguna pregunta para mí?
+Do you know what happened to the gold I had when you guys saved me?#0
+¿Sabe qué le pasó al oro que yo tenía cuando ustedes me salvaron?#0
+
+Do you know what happened to the gold I had when you guys saved me?#1
+¿Sabe qué le pasó al oro que yo tenía cuando ustedes me salvaron?#1
+
Do you want to cut this @@?
¿Quieres cortar este @@?
@@ -307,6 +319,9 @@ No, ninguna.
Oh really? I'll put more food in the next box then.
¿En serio? Entonces pondré más comida en la siguiente caja.
+Oh right, I totally forgot about that, here you go.
+Oh correcto, lo olvidé totalmente, aquí va.
+
Oh well, we rescued you when you were yaying adrift in the sea.#0
Oh bien, le rescatamos cuando iba a la deriva en el mar.#0
@@ -544,6 +559,9 @@ Intentamos limpiarlas pero el agua del mar destruyó la mayoría. Por eso le dam
We tried to clean them but the sea water mostly destroyed them. It's why we gave you these clothes. They're not very nice, but that's all that we have for you.#1
Intentamos limpiarlas pero el agua del mar destruyó la mayoría. Por eso le damos esta ropa. No es muy buena, pero es todo lo que tenemos para usted.#1
+We will be yaying there in a few days, so we will drop you off there.
+Estaremos yaying allí en unos dias, así que te dejaremos allí.
+
We're soon leaving that island, please return to your cabine.
Pronto dejaremos esa isla, por favor vuelva a su cabina.
@@ -565,6 +583,9 @@ What should I do after taking these clothes?#0
What should I do after taking these clothes?#1
¿Qué debería hacer despés de coger esta ropa?#1
+What yeye could I do for you today?
+¿Qué yeye podría hacer por ti el día de hoy?
+
What? This reward is too small!
¿Qué? ¡Esta recompensa es muy pequeña!
diff --git a/langs/lang_es.txt b/langs/lang_es.txt
index a50a346c0..5e9f09684 100644
--- a/langs/lang_es.txt
+++ b/langs/lang_es.txt
@@ -707,6 +707,9 @@ Copyright (C) 2010-2021 TMW2 Team
* Acquired @@ @@!
+* Actual effect lasts %d hours.
+
+
* Aid the Blue Sage in getting Peetu back to action
@@ -3806,7 +3809,7 @@ All torches are lit! Return to Zarkor.
All warp technology, be it crystal-based, potion-based, or mechanic-based, relies on timespace distortions.
-All you need to do then is walk outside, enter on the biggest house, and talk to the Trainer. He'll teach you everything.
+All you need to do is walk outside, enter the biggest house, and speak with the Trainer. He'll teach you everything you need to know.
Alliance Guard
@@ -4520,9 +4523,6 @@ Anyway, my herb mixture keeps monsters away.
Anyway, once you have the recipe book and learned a recipe, you can craft items in forges. I think you can buy it in your apartment.
-Anyway, our shipkeeper, Juliet, helped to heal your injuries way back.
-
-
Anyway, the Moubootaur certainly existed, and probably is still alive.
@@ -4538,6 +4538,9 @@ Anyway, you can see how skilled using Mana Magic with @@. Mana Magic is the one
Anyway, you have a letter to our %s, you meant? Sure thing, I'll let him know at once.
+Anyway, you should be thanking Juliet, she's the one who patched you up.
+
+
Anyway. This is the FAIRY KINGDOM spell. It'll spawn fairies.
@@ -6800,6 +6803,9 @@ Can you teach me magic? Pretty please?
Can you teach me some Alchemy Recipe?
+Can you tell me where I am?
+
+
Can you, perhaps, do me a favor? Please... Check her house for any signs of battle.
@@ -7808,12 +7814,6 @@ Could you please give us a full meal, with 5 @@, 5 @@, 5@@, 5 @@ and 5 @@?
Could you sell me a treasure map and a shovel?
-Could you tell me where I am?#0
-¿Puede decirme dónde estoy?#0
-
-Could you tell me where I am?#1
-¿Puede decirme dónde estoy?#1
-
Could you try again, please?
@@ -9002,11 +9002,8 @@ Do you know the warp crystals? We did them. Did you saw the great warp gate at t
Do you know what a Soul Menhir is?
-Do you know what happened to the gold I had when you guys saved me?#0
-¿Sabe qué le pasó al oro que yo tenía cuando ustedes me salvaron?#0
+Do you know what happened to the gold I had on me when I was rescued?
-Do you know what happened to the gold I had when you guys saved me?#1
-¿Sabe qué le pasó al oro que yo tenía cuando ustedes me salvaron?#1
Do you know where I can find Nard?
@@ -9404,6 +9401,12 @@ Donate a Bat Teeth
Donate a Bat Wing
+Donate all Bat Teeth
+
+
+Donate all Bat Wings
+
+
Donate to town
@@ -13088,9 +13091,6 @@ Here, all yours. Ah, if I still could walk... I would hunt those annoying squirr
Here, all yours. I can't use them while I am this hurt anyways. Thank you.
-Here, come talk to me, the Magic Arpan! I'll help you get dressed.
-
-
Here, lemme tell you something good: Do you know that fortress island which all the adventurers are talking about nowadays?
@@ -13103,6 +13103,9 @@ Here, please take this to them. Tell them they are welcome here anytime! %%2
Here, sparking new! Nice!!
+Here, speak to me, Magic Arpan! I'll help you get dressed.
+
+
Here, take as much as you need, I have plenty!
@@ -17660,16 +17663,22 @@ Invalid recipe from Nahrec partly reimbursed.
Invalid season: @@
-Invest in Exportations
+Invest all into boosting town exports
+
+
+Invest all into boosting town reputation
-Invest in Reputation
+Invest into boosting town exports
+
+
+Invest into boosting town reputation
Investing in Exportations
-Investing in Reputation
+Investing into Reputation
Investment executed
@@ -18512,7 +18521,7 @@ Just tell him that I want to reconsider, and that I want the souvenir he offered
Just two coins for spin.
-Just use the arrow key--, err, I mean, just walk to the door on the right. The one which is not guarded by Peter.
+Just use the arrow key--, err, I mean, just walk to the door on the right. It's the one not guarded by Peter.
Just wait. Fafi dragons are slow to show up...
@@ -19754,6 +19763,12 @@ Make me some Iron Powder.
Make sure to put on a bait after you click, though!
+Make sure you're dressed and then speak with the captain. He'll give you a mission and unlock the ship's main door.#0
+
+
+Make sure you're dressed and then speak with the captain. He'll give you a mission and unlock the ship's main door.#1
+
+
Male
Varón
@@ -20831,9 +20846,6 @@ Mi aliento huele mal
My captain wanted me to give this to you as a special reward for your efforts.
-My chestplate, @@
-
-
My children and grandchildren have all moved to the Land of Fire, so the amount of leatherwork I can offer you is limited.
@@ -20870,9 +20882,6 @@ My grandmother gave me a recipe of the @@, it can cure anything but death.
My greatest realization thus far, besides some time rewinding clocks, is the @@!
-My helmet, @@
-
-
My husband and I have moved here under the Alliance orders.
@@ -20909,9 +20918,6 @@ My pleasure.
My shaman skills protected us against monsters and thieves!
-My shield, @@
-
-
My stats are too good, I won't need it.
Mis estadísticas son demasiado buenas, no lo necesitaré.
@@ -20924,9 +20930,6 @@ My waifu Blossom has me trapped here, and she won't even look at me, because I'm
My warp crystal broke!
-My weapon, @@
-
-
Mylarin Dust
Polvo de Mylarin
@@ -21413,7 +21416,7 @@ No, I'll let you there to the Yeti's mercy.
No, I'll save my money.
-No, but what option do I have? I'm railroaded!
+No, but what option do I have? I'm being railroaded!
No, it is a family heirloom. But I do have the shield blueprints. A skilled craftsman could forge one.
@@ -22229,8 +22232,8 @@ Oh noes, who nows can help my wife? Please reconsider!
Oh please. Even if you know a trick or two, you don't have real magic.
-Oh right, I totally forgot about that, here you go.
-Oh correcto, lo olvidé totalmente, aquí va.
+Oh right, I almost forgot, here you go!
+
Oh well, this sucks, but that was only an illusion.
@@ -22325,6 +22328,9 @@ Oh, hey, welcome back, @@! Thanks for all your help!
Oh, hey. Welcome to the library, or what's left of it.
+Oh, how I miss %s from Tulimshar...
+
+
Oh, just an empty staff with black powder inside it. Which explodes. And then kills monsters.
@@ -22529,9 +22535,6 @@ On a computer, you can press @@ to attack it. On mobile, that would be the big b
On a side note, more defense is always good, but the damage won't decrease on the same rate that defense raises.
-On hindsight, I'll wait you get a few levels. Can't have cheaters, ya know!
-
-
On mobile, the DPAD is at your left. Do you see the chest to my right?
@@ -22541,6 +22544,9 @@ On mobile, you would click on the @@ icon!
On my way to get what you need.
+On second thought, come see me when you've gained a few levels. We can't have cheaters, ya know?
+
+
On second thought, he really could use a bath.
@@ -23927,7 +23933,7 @@ Protip: You need an @@ full of water to get a reply from guards.
Protip: You need level %d or higher to do this quest.
-Protip: You skipped tutorial. A lot of tutorial-ish dialogs and quests will be skipped. You can change this anytime on %s > Game Settings.
+Protip: You skipped the tutorial. A lot of tutorial related dialog and quests will be skipped. You can change this anytime in %s > Game Settings.
Protip: Your current progress will be saved.
@@ -24593,6 +24599,12 @@ Rent 30 days for 1000 GP
Rent 30 days for 2000 GP
+Rent 365 days for 10000 GP
+
+
+Rent 365 days for 20000 GP
+
+
Rent 7 days for 300 GP
@@ -26651,7 +26663,7 @@ Sorry kind sir @@, but no.#1
Sorry pal, but only if another miner vouches for you.
-Sorry! I forgot to introduce myself. My name is Arpan, but other sailors call me Magic Arpan because I know one or two yaing magic tricks.
+Sorry! Allow me to introduce myself. My name is Arpan, but the other sailors call me Magic Arpan because I know one or two ya-ing magic tricks.
Sorry! Sorry!
@@ -27710,6 +27722,9 @@ Thank you for being with us for so long. You gained a %s as a random good-hearte
Thank you for helping me make my tea. I hope the potions have been helpful...
+Thank you for the %s, I really appreciate it.
+
+
Thank you for your help.
Gracias por tu ayuda.
@@ -27887,9 +27902,6 @@ Thanks for the help.
Thanks for the help. Here, take this shirt and some money.
-Thanks for the honestity, I guess.
-
-
Thanks for the kindness, but you don't have enough. I need 5!
@@ -27917,6 +27929,9 @@ Thanks for your help!
Thanks for your help, anyway.
+Thanks for your honesty, I guess.
+
+
Thanks for your patronage! The rewards will be available with @@, in case I do find the paradise!
@@ -29705,9 +29720,6 @@ There doesn't seem to be any physical wound.
There exist more food than you know. But this time I don't want anything extravagant, just 6 @@ should be fine.
-There is a NPC called Trainer, just outside this ship.
-
-
There is a chasm.
@@ -29720,6 +29732,9 @@ There is a slight breeze coming from @@.
There is a time limit, which is already running.
+There is an NPC called Trainer, just outside the ship.
+
+
There is no EXP penalty, but you cannot go back without either completing the cave, or dying.
@@ -30095,7 +30110,7 @@ They'll also start spawning on whole map, so be careful.
They're back - and they took hold of your majesty - my husband - king Arthur!
-They're not magic, but yayaya, people like to say it is! Yeyeye.
+They're not magic, but yayaya, people like to say it is! Yeyeye!
They're not too dangerous, but they can take a lot of hits. So, if you kill 10 of them, I'll know you're dedicated in learning which monsters are out there.
@@ -31874,7 +31889,7 @@ Use its powers for good!
Use the abandoned passage to the north... Usually, no one uses it.
-Use the arrow keys to walk right and meet Juliet.
+Use the arrow keys to walk over to the right and meet Juliet.
Use these coins to exchange for stuff. But beware: Each dungeon difficulty will increase the coin drop in the square value of previous.
@@ -32252,6 +32267,9 @@ WARNING: Your progress on the quest was lost!
WARNING: if you die again today in a special map it will be PERMANENT.
+WARNING: you can only rent one mount per character. Either tortuga or a mouboo.
+
+
WARPING IN 10 SECONDS
@@ -32660,8 +32678,8 @@ We want to celebrate this moment, but can you believe we ran out of beer?
We want to thank everyone who did this release possible.
-We will be yaying there in a few days, so we will drop you off there.
-Estaremos yaying allí en unos dias, así que te dejaremos allí.
+We will be yeye-ing there in a few days, so we'll part ways there.
+
We will have a party today, but only believers are allowed in!
@@ -33542,9 +33560,6 @@ What would you like to bury?
What would you like today?
¿Qué te gustaría hoy?
-What yeye could I do for you today?
-¿Qué yeye podría hacer por ti el día de hoy?
-
What you asked me for, again?
@@ -33587,6 +33602,9 @@ What's your opinion of Peetu and his work?
What, only that? Well, this is actually simpler than it looks.
+What-yeye could I do for you today?
+
+
What? A party?
@@ -34376,7 +34394,7 @@ Yaya, you should go see her! She'll be happy to help you again.#0
Yaya, you should go see her! She'll be happy to help you again.#1
-Yayaya, @@ is surely slow. Do you remember how to walk? You can use arrow keys for that!
+Yayaya, @@ is surely slow. Don't you remember how to walk? You can use arrow keys for that!
Yayaya, by pressing @@ or clicking in @@, you'll open your char status window!
@@ -34388,6 +34406,9 @@ Yayaya, by pressing @@ or clicking in @@, you'll open your character status wind
Yayaya, good job! You can collect loot by pressing @@.
+Ye not paying for your food and ye isn't a sailor like us! Ye should be standing on your own two feet.
+
+
Yeah sure, take my Amethyst!
@@ -34781,9 +34802,6 @@ Yeye can press @@ to sit, which will allow you to heal faster.
Yeye don't need to train here anymore! Let's head back to the ship before the sun sets, shall we?
-Yeye is not paying for your food and is not a sailor like us! You should start standing on your own feet.
-
-
Yeye, are you finally ready to go?#0
@@ -36056,12 +36074,6 @@ You must %s and chant %s to begin channeling.
You must be close to it, and stealing won't change drops! If you fail, just try again! Good luck!
-You must be dressed, and talk to our captain first. He'll give you a mission and unlock the ship main door.#0
-
-
-You must be dressed, and talk to our captain first. He'll give you a mission and unlock the ship main door.#1
-
-
You must be fast! The guards are also affected.
@@ -36182,6 +36194,9 @@ You need to finish at least %d/%d tasks.
You need to have an @@ equipped.
+You need to have level %d or above.
+
+
You need to kill all the %d monsters to complete a bounty.
@@ -36689,7 +36704,7 @@ You will need a certain amount of them to upgrade any skill, which will be spent
You will need to *hic* prove yourself to *hic* me and the town first...
-You will see, citizens are polite and you can still ask around for help. They can help find a job for you or maybe help you find out what happened to you out at sea!
+You will notice the citizens are polite and they might help you find a job or help you figure out what happened to you out at sea.
You win!
@@ -36761,6 +36776,12 @@ You'll soon run out of stuff to do around here, so yeah, you should extend your
You'll want your fishing rod to be flexible but solid.
+You're aboard our ship. We made port to a little island and we're actually yeye-ending our long merchant travelling adventure at the city of Tulimshar.#0
+
+
+You're aboard our ship. We made port to a little island and we're actually yeye-ending our long merchant travelling adventure at the city of Tulimshar.#1
+
+
You're about to concede an academic title to "@@".
@@ -36812,12 +36833,6 @@ You're not welcome here. Get moving.
You're on a ship, we're on our way to the oldest human city, Tulishmar.
-You're on our ship, we made port to a little island and we're actually yeyending our long merchant travelling adventure at the city of Tulimshar.#0
-
-
-You're on our ship, we made port to a little island and we're actually yeyending our long merchant travelling adventure at the city of Tulimshar.#1
-
-
You're playing with fire. Or ice. Or whatever.
diff --git a/langs/lang_fr.old b/langs/lang_fr.old
index 83a824376..52868d9f9 100644
--- a/langs/lang_fr.old
+++ b/langs/lang_fr.old
@@ -76,6 +76,9 @@ En fait, le Dummy ne se défend pas. Donc pas de peur à avoir?
Ah, this is boring.
Ah, c'est ennuyant
+All you need to do then is walk outside, enter on the biggest house, and talk to the Trainer. He'll teach you everything.
+Tout ce que tu as à faire est de marcher dehors, d'entrer dans la plus grande maison et de parler au Trainer. Il t'apprendra tout.
+
Alright, I'm going to the capt'n room, keep an eye on her, we still don't know if she's friend or foe...#0
Bon, je vais à la salle capt'n, surveille-la, on ne sait toujours pas si elle est amie ou ennemie ... #0
@@ -109,6 +112,9 @@ Une autre façon d'attaquer est de cliquer sur l'énnemi. Maintenant, il y a cer
Anyway, conspiratory theories aside, his ghost is a powerful boss. I would not attack him if I were you!
Quoi qu'il en soit, outre des théories complotistes, son fantôme est très puissant. Je ne l'attaquerai pas si j'étais à ta place!
+Anyway, our shipkeeper, Juliet, helped to heal your injuries way back.
+Quoi qu’il en soit, Juliet notre commerçante, a aidé à soigner vos blessures.
+
AreaNPC
ZonePNJ
@@ -217,6 +223,12 @@ Puis-je te demander qu'elle est ta langue natale ? Un marin m'a dit que tu étai
Could you bleach my clothes?
Peux-tu blanchir mes vêtements ?
+Could you tell me where I am?#0
+Peux-tu me dire où je me trouve ?
+
+Could you tell me where I am?#1
+Peux-tu me dire où je me trouve ?
+
Create items
Créer des objets
@@ -283,6 +295,12 @@ As-tu une autre question à me poser ?
Do you have the @@/11 @@ I requested? Sailors are getting hungry because you!
Avez-vous les @@ / 11 @@ que j'ai demandé? Les marins commencent a avoir faim 
+Do you know what happened to the gold I had when you guys saved me?#0
+Saurais-tu ce qu'il est arrivé à l'argent que j'avais quand vous m'avez sauvée ?
+
+Do you know what happened to the gold I had when you guys saved me?#1
+Saurais-tu ce qu'il est arrivé à l'argent que j'avais quand vous m'avez sauvé ?
+
Do you see that fancy house over there? My husband, @@, used to live there.
Tu vois la belle maison làbas ? Mon mari, @@, y habitait.
@@ -379,6 +397,9 @@ Hehehe, il est un peu nerveux, pardonnes-le, ce n'est pas tous les jours qu'on a
Here they are.
Les voilà.
+Here, come talk to me, the Magic Arpan! I'll help you get dressed.
+Tiens, viens donc parler, Au Magic Arpan! Je t'aiderai à t'habiller.
+
Hey @@! You haven't clicked on me yet!
Hey @@! Vous n'avez pas encore cliqué sur moi!
@@ -514,6 +535,9 @@ Julia
Juliet is on the upper level of the ship, use the arrow keys to walk to the stairs or click on the stairs at the top right of your screen.
Juliette est sur le niveau supérieur du navire, utilisez les touches fléchées pour marcher vers les escaliers ou cliquez sur les escaliers en haut à droite de votre écran.
+Just use the arrow key--, err, I mean, just walk to the door on the right. The one which is not guarded by Peter.
+Utilisez simplement la touche fléchée--, err, je veux dire, juste marcher vers la porte sur la droite. Celle qui n'est pas gardé par Peter.
+
Khaki Cotton Dye
Teinture Coton Khaki
@@ -586,6 +610,9 @@ Teinture Coton Bleu Marine
No problem, I can help you anyway.
Pas de problème, je peux quand même t'aider.
+No, but what option do I have? I'm railroaded!
+Non, mais quelle option ai-je?
+
No, none.
Non, aucune.
@@ -598,6 +625,9 @@ Bien sûr! On recherche des [@@https://www.transifex.com/akaras/saulc-tmw-fork|T
Oh really? I'll put more food in the next box then.
Oh vraiment ? Je mettrai plus de nourriture dans la prochaine boîte alors.
+Oh right, I totally forgot about that, here you go.
+Ah c'est vrai, j'ai complètement oublié ça, tiens.
+
Oh well, we rescued you when you were yaying adrift in the sea.#0
Et bien nous t'avons sauvée quand tu étais à la yayive dans la mer.
@@ -655,6 +685,9 @@ Entendu, je suis prêt à travailler !
Oldur Card
Oldur Card
+On hindsight, I'll wait you get a few levels. Can't have cheaters, ya know!
+Avec le recul, je vais attendre que vous obteniez quelques niveaux. Je ne peux pas avoir affaire a un tricheur, tu sais!
+
Orange Cotton Dye
Teinture Coton Orange
@@ -766,6 +799,9 @@ Alors quelqu'un est enfin venu me rendre visite ?
Sorry! I forgot to introduce myself. My name is Arpan, but other sailors call me Magic Arpan because I know one or two yaing magic spells.
Oh pardon ! J'ai complètement oublié de me présenter. Je me nomme Arpan, mais les autres m'appellent Arpan Magique, parce que je connais deux, trois tours de magie.
+Sorry! I forgot to introduce myself. My name is Arpan, but other sailors call me Magic Arpan because I know one or two yaing magic tricks.
+Pardon! J'ai oublié de me présenter, Je m'appelle Arpan, mais les autres marins m'appellent Magic Arpan parce que je connais un ou deux tours de magie.
+
Sorry, I am not in the mood for another fight with these rattos.
Désolé, mais je ne suis pas d'humeur à me battre contre des rattos.
@@ -805,6 +841,9 @@ Merci de m'avoir aidé !
Thanks for the help!
Merci pour l'aide !
+Thanks for the honestity, I guess.
+Merci pour l'honnêteté, je suppose.
+
Thanks once again, I know it's not much but here is @@ GP for your troubles.
Merci beaucoup ! Je sais que ce n'est pas beaucoup mais voici @@ GP en guise de dédommagement.
@@ -832,6 +871,9 @@ Et bien concentre ta colère sur les arbres par ici, tu obtiendras de l'expérie
There are still some rattos left! Do you want to abort the quest?
Il y a encore quelques Rattos présents ! Veux-tu abandonner la quête ?
+There is a NPC called Trainer, just outside this ship.
+Il y a un PNJ appelé Trainer, juste à l'extérieur, sur l'île de Candor
+
There is a paper with some rules written on it.
Il y a un papier avec des règles écrites dessus.
@@ -841,6 +883,9 @@ Ces boîtes sont bien trop lourdes pour être soulevées par une seule personne,
They are a permanent problem so I will always need your help to exterminate them in order to keep their number under control.
C'est un problème permanent donc j'aurai toujours besoin de ton aide pour les exterminer afin de garder leur nombre sous contrôle.
+They're not magic, but yayaya, people like to say it is! Yeyeye.
+Il n'y a plus pas magiques, mais les gens aiment dire l'inverse ! Hey hey.
+
This girl is lucky we found her before a shark did. I have no idea where she comes from.#0
Cette fille a de la chance d'etre tombée sur nous avant un requin. Je n'ai aucune idée d'où elle vient. # 0
@@ -871,6 +916,9 @@ Pour changer tes compétences, utilise ces commandes :
TrainingGladius
Glaived'Entraînement
+Use the arrow keys to walk right and meet Juliet.
+Utilisez les flèches directionnelles pour aller à droite et rencontrer Juliet.
+
Use the key.
Utilise la clé.
@@ -901,6 +949,9 @@ On a essayé de les nettoyer mais l'eau de la mer les a principalement détruits
We tried to clean them but the sea water mostly destroyed them. It's why we gave you these clothes. They're not very nice, but that's all that we have for you.#1
On a essayé de les nettoyer mais l'eau de la mer les a principalement détruits. C'est pourquoi nous t'avons donné ces vêtements. Ils ne sont pas super beaux mais c'est tout ce que nous avond pour toi.
+We will be yaying there in a few days, so we will drop you off there.
+On arrivera là-bas dans quelques jours donc on t'y déposera.
+
We're soon leaving that island, please return to your cabine.
Nous allons bientôt quitter cette île, retourne s'il-te-plaît à ta cabine.
@@ -937,6 +988,9 @@ Que dois-je faire après avoir pris ces vêtements ?
What should I do after taking these clothes?#1
Que dois-je faire après avoir pris ces vêtements ?
+What yeye could I do for you today?
+Dis-moi, que puis faire pour toi ?
+
What? This reward is too small!
Quoi ? Ce n'est pas assez !
@@ -973,6 +1027,9 @@ Ayaya, tu devrais aller la voir ! Elle sera contente de te voir.
Yaya, you should go see her! She'll be happy to see you.#1
Ayaya, tu devrais aller la voir ! Elle sera contente de te voir.
+Yayaya, @@ is surely slow. Do you remember how to walk? You can use arrow keys for that!
+Hey hey, @@ est sûrement trés lent. Vous souvenez-vous comment marcher? Vous pouvez utiliser les touches fléchées pour ça!
+
Yayayaya, it's the first time someone is dressed worse than us!
Yayayaya, c'est la première fois que quelqu'un est encore moins bien habillé que nous !
@@ -988,6 +1045,9 @@ Oui, j'en ai une.
Yeti King
Yeti King
+Yeye is not paying for your food and is not a sailor like us! You should start standing on your own feet.
+Vous devriez commencer à vous tenir debout.
+
Yeye, you are really lucky to be alive. You are in good enough shape for walking, do you remember what happened?#0
Youiyoui, tu as de la chance d'être vivante. Tu es suffisamment assez en forme pour marcher, te souviens-tu ce qu'il t'es arrivée ?
@@ -1063,6 +1123,12 @@ Vous apprenez vite, bon boulot. Ces vêtements ne sont pas trés puissants mais
You made a cash deposit of @@ E.
Tu as fait un dépôt d'argent de @@ E.
+You must be dressed, and talk to our captain first. He'll give you a mission and unlock the ship main door.#0
+Vous devez être habillé et parler à notre capitaine d'abord. Il te donnera une mission et déverrouillera la porte principale du navire..#0
+
+You must be dressed, and talk to our captain first. He'll give you a mission and unlock the ship main door.#1
+Vous devez être habillé et parler à notre capitaine d'abord. Il te donnera une mission et déverrouillera la porte principale du navire..#1
+
You open a book named @@.
Tu ouvres un livre appelé @@.
@@ -1096,6 +1162,15 @@ Vous avez dormi pendant un certain temps ici, Notre lieutnant, Juliette, était
You were yaying sleeping for quite some time there. Our shipkeeper, Juliet, was here with you, and she did her best to heal your injuries.#1
Vous avez dormi pendant un certain temps ici, Notre lieutnant, Juliette, était ici avec vous et elle a fait de son mieux pour soigner vos blessures.#1
+You will see, citizens are polite and you can still ask around for help. They can help find a job for you or maybe help you find out what happened to you out at sea!
+Vous verrez, les citoyens sont polis et vous pouvez toujours demander de l'aide. Ils peuvent vous aider à trouver un job ou vous aider à découvrir ce qui vous est arrivé en mer!
+
+You're on our ship, we made port to a little island and we're actually yeyending our long merchant travelling adventure at the city of Tulimshar.#0
+Vous êtes sur notre bateau, La Johanne, nous avons fait le port vers une petite île, Candor que nous ajoutons a notre périple de marchand vers la ville de Tulimshar..#0
+
+You're on our ship, we made port to a little island and we're actually yeyending our long merchant travelling adventure at the city of Tulimshar.#1
+Vous êtes sur notre bateau, La Johanne, nous avons fait le port vers une petite île, Candor que nous ajoutons a notre périple de marchand vers la ville de Tulimshar..#1
+
Your body aches. You can't remember what happened. But this is not important now. The ships sailors are shouting at you!
Tu ressens de forte douleur, Il est impossible de te souvenir ce qu'il est arrivé. Mais bon esque ç'est vraiment le moment de réfléchir à ca ? quand les marins te font des signes et crient dans ta direction!
diff --git a/langs/lang_fr.txt b/langs/lang_fr.txt
index 6d64f4ea5..73e178820 100644
--- a/langs/lang_fr.txt
+++ b/langs/lang_fr.txt
@@ -144,10 +144,10 @@ Il n'est pas devenu trop léger, et il est devenu très faible par rapport à un
##1The ship is under a pirate's attack! ##BKill all or survive!
-##1Le navire est attaqué par des pirates! ##BTues-les tous ou survis!
+##1Le navire est attaqué par des pirates ! ##BTues-les tous ou survis !
##1WARNING! WARNING! Siege starting at Candor!!
-##1ALERTE ! ALERTE ! Un siège débute à Candor !!
+##1ALERTE ! ALERTE ! Un siège commence à Candor !!
##1You abused a bug and will be jailed. If this was done in error, you have found a bug. Contact the nearest developer if this is the case.
@@ -213,7 +213,7 @@ Il n'est pas devenu trop léger, et il est devenu très faible par rapport à un
##BFirst and foremost, you should talk to Trainer, inside the big house.##b
-##BD'abord et avant tout, tu devrais parler au Trainer, à l'intérieur de la grande maison.##b
+##BD'abord et avant tout, tu devrais parler à Trainer, à l'intérieur de la grande maison.##b
##BHall Of @@: TOP15##b
##BHall Of @@: TOP15##b
@@ -707,11 +707,14 @@ Il n'est pas devenu trop léger, et il est devenu très faible par rapport à un
* Acquired @@ @@!
+* Actual effect lasts %d hours.
+
+
* Aid the Blue Sage in getting Peetu back to action
* Ask Zegas, the mayoress, if she needs help.
-* Demande à Zegas, la Mairesse, si elle a besoin d'aide.
+* Demande à Zegas, la mairesse, si elle a besoin d'aide.
* Cards will be deleted after transfer is done.
@@ -981,7 +984,7 @@ Il n'est pas devenu trop léger, et il est devenu très faible par rapport à un
*whistles*
-
+*siffle*
, and you have been banned from the Academy.
@@ -1107,7 +1110,7 @@ Il n'est pas devenu trop léger, et il est devenu très faible par rapport à un
-- Zegas, the Mayoress
--- Zegas, la Mairesse
+-- Zegas, la mairesse
--- AND ANY OF ---
@@ -3806,8 +3809,8 @@ All torches are lit! Return to Zarkor.
All warp technology, be it crystal-based, potion-based, or mechanic-based, relies on timespace distortions.
-All you need to do then is walk outside, enter on the biggest house, and talk to the Trainer. He'll teach you everything.
-Tout ce que tu as à faire est de marcher dehors, d'entrer dans la plus grande maison et de parler au Trainer. Il t'apprendra tout.
+All you need to do is walk outside, enter the biggest house, and speak with the Trainer. He'll teach you everything you need to know.
+
Alliance Guard
@@ -4520,9 +4523,6 @@ Anyway, my herb mixture keeps monsters away.
Anyway, once you have the recipe book and learned a recipe, you can craft items in forges. I think you can buy it in your apartment.
-Anyway, our shipkeeper, Juliet, helped to heal your injuries way back.
-Quoi qu’il en soit, Juliet notre commerçante, a aidé à soigner vos blessures.
-
Anyway, the Moubootaur certainly existed, and probably is still alive.
@@ -4538,6 +4538,9 @@ Anyway, you can see how skilled using Mana Magic with @@. Mana Magic is the one
Anyway, you have a letter to our %s, you meant? Sure thing, I'll let him know at once.
+Anyway, you should be thanking Juliet, she's the one who patched you up.
+
+
Anyway. This is the FAIRY KINGDOM spell. It'll spawn fairies.
@@ -6800,6 +6803,9 @@ Can you teach me magic? Pretty please?
Can you teach me some Alchemy Recipe?
+Can you tell me where I am?
+
+
Can you, perhaps, do me a favor? Please... Check her house for any signs of battle.
@@ -7808,12 +7814,6 @@ Could you please give us a full meal, with 5 @@, 5 @@, 5@@, 5 @@ and 5 @@?
Could you sell me a treasure map and a shovel?
-Could you tell me where I am?#0
-Peux-tu me dire où je me trouve ?
-
-Could you tell me where I am?#1
-Peux-tu me dire où je me trouve ?
-
Could you try again, please?
@@ -9002,11 +9002,8 @@ Do you know the warp crystals? We did them. Did you saw the great warp gate at t
Do you know what a Soul Menhir is?
-Do you know what happened to the gold I had when you guys saved me?#0
-Saurais-tu ce qu'il est arrivé à l'argent que j'avais quand vous m'avez sauvée ?
+Do you know what happened to the gold I had on me when I was rescued?
-Do you know what happened to the gold I had when you guys saved me?#1
-Saurais-tu ce qu'il est arrivé à l'argent que j'avais quand vous m'avez sauvé ?
Do you know where I can find Nard?
@@ -9404,6 +9401,12 @@ Donate a Bat Teeth
Donate a Bat Wing
+Donate all Bat Teeth
+
+
+Donate all Bat Wings
+
+
Donate to town
@@ -13088,9 +13091,6 @@ Here, all yours. Ah, if I still could walk... I would hunt those annoying squirr
Here, all yours. I can't use them while I am this hurt anyways. Thank you.
-Here, come talk to me, the Magic Arpan! I'll help you get dressed.
-Tiens, viens donc parler, Au Magic Arpan! Je t'aiderai à t'habiller.
-
Here, lemme tell you something good: Do you know that fortress island which all the adventurers are talking about nowadays?
@@ -13103,6 +13103,9 @@ Here, please take this to them. Tell them they are welcome here anytime! %%2
Here, sparking new! Nice!!
+Here, speak to me, Magic Arpan! I'll help you get dressed.
+
+
Here, take as much as you need, I have plenty!
@@ -17660,16 +17663,22 @@ Invalid recipe from Nahrec partly reimbursed.
Invalid season: @@
-Invest in Exportations
+Invest all into boosting town exports
+
+Invest all into boosting town reputation
-Invest in Reputation
+
+Invest into boosting town exports
+
+
+Invest into boosting town reputation
Investing in Exportations
-Investing in Reputation
+Investing into Reputation
Investment executed
@@ -18512,8 +18521,8 @@ Just tell him that I want to reconsider, and that I want the souvenir he offered
Just two coins for spin.
-Just use the arrow key--, err, I mean, just walk to the door on the right. The one which is not guarded by Peter.
-Utilisez simplement la touche fléchée--, err, je veux dire, juste marcher vers la porte sur la droite. Celle qui n'est pas gardé par Peter.
+Just use the arrow key--, err, I mean, just walk to the door on the right. It's the one not guarded by Peter.
+
Just wait. Fafi dragons are slow to show up...
@@ -19754,6 +19763,12 @@ Make me some Iron Powder.
Make sure to put on a bait after you click, though!
Cependant, n'oublie pas d'ajouter un appât après avoir cliqué !
+Make sure you're dressed and then speak with the captain. He'll give you a mission and unlock the ship's main door.#0
+
+
+Make sure you're dressed and then speak with the captain. He'll give you a mission and unlock the ship's main door.#1
+
+
Male
Masculin
@@ -20831,9 +20846,6 @@ J'ai une haleine horrible.
My captain wanted me to give this to you as a special reward for your efforts.
-My chestplate, @@
-
-
My children and grandchildren have all moved to the Land of Fire, so the amount of leatherwork I can offer you is limited.
@@ -20870,9 +20882,6 @@ My grandmother gave me a recipe of the @@, it can cure anything but death.
My greatest realization thus far, besides some time rewinding clocks, is the @@!
-My helmet, @@
-
-
My husband and I have moved here under the Alliance orders.
@@ -20895,7 +20904,7 @@ My name is Benjamin, and I was in charge of an incursion here to capture Barbara
My name is Juliet, it is me who took care of you after we found you in the sea. I'm glad to see you're okay.
-Je m'appelle Juliette, c'est moi qui ai pris soin de toi après que l'on t'ai retrouvé en mer. Je suis contente de voir que tu vas bien.
+Je m'appelle Juliette. C'est moi qui ai pris soin de toi après qu'on t'ait retrouvé en mer. Je suis contente de voir que tu vas bien.
My name is Naem and I guard the tunnels in this direction. You shall not pass. Now leave.
@@ -20909,9 +20918,6 @@ My pleasure.
My shaman skills protected us against monsters and thieves!
-My shield, @@
-
-
My stats are too good, I won't need it.
Mes statistiques sont bonnes, je n'en aurai pas besoin.
@@ -20924,9 +20930,6 @@ My waifu Blossom has me trapped here, and she won't even look at me, because I'm
My warp crystal broke!
-My weapon, @@
-
-
Mylarin Dust
Mylarin Dust
@@ -21413,8 +21416,8 @@ No, I'll let you there to the Yeti's mercy.
No, I'll save my money.
Non, je vais économiser mon argent.
-No, but what option do I have? I'm railroaded!
-Non, mais quelle option ai-je?
+No, but what option do I have? I'm being railroaded!
+
No, it is a family heirloom. But I do have the shield blueprints. A skilled craftsman could forge one.
@@ -22229,8 +22232,8 @@ Oh noes, who nows can help my wife? Please reconsider!
Oh please. Even if you know a trick or two, you don't have real magic.
-Oh right, I totally forgot about that, here you go.
-Ah c'est vrai, j'ai complètement oublié ça, tiens.
+Oh right, I almost forgot, here you go!
+
Oh well, this sucks, but that was only an illusion.
@@ -22325,6 +22328,9 @@ Oh, hey, welcome back, @@! Thanks for all your help!
Oh, hey. Welcome to the library, or what's left of it.
+Oh, how I miss %s from Tulimshar...
+
+
Oh, just an empty staff with black powder inside it. Which explodes. And then kills monsters.
@@ -22529,9 +22535,6 @@ Sur ordinateur, vous pouvez appuyer sur @@ pour l'attaquer. Et sur mobile, c'est
On a side note, more defense is always good, but the damage won't decrease on the same rate that defense raises.
-On hindsight, I'll wait you get a few levels. Can't have cheaters, ya know!
-Avec le recul, je vais attendre que vous obteniez quelques niveaux. Je ne peux pas avoir affaire a un tricheur, tu sais!
-
On mobile, the DPAD is at your left. Do you see the chest to my right?
Sur mobile, le PAD est à votre gauche de l'écran. Par ailleurs Voyez-vous le coffre à ma droite?
@@ -22541,6 +22544,9 @@ Sur mobile, vous cliqueriez sur l'icône @@!
On my way to get what you need.
+On second thought, come see me when you've gained a few levels. We can't have cheaters, ya know?
+
+
On second thought, he really could use a bath.
@@ -23927,7 +23933,7 @@ Protip: You need an @@ full of water to get a reply from guards.
Protip: You need level %d or higher to do this quest.
-Protip: You skipped tutorial. A lot of tutorial-ish dialogs and quests will be skipped. You can change this anytime on %s > Game Settings.
+Protip: You skipped the tutorial. A lot of tutorial related dialog and quests will be skipped. You can change this anytime in %s > Game Settings.
Protip: Your current progress will be saved.
@@ -24593,6 +24599,12 @@ Rent 30 days for 1000 GP
Rent 30 days for 2000 GP
+Rent 365 days for 10000 GP
+
+
+Rent 365 days for 20000 GP
+
+
Rent 7 days for 300 GP
@@ -26651,8 +26663,8 @@ Sorry kind sir @@, but no.#1
Sorry pal, but only if another miner vouches for you.
-Sorry! I forgot to introduce myself. My name is Arpan, but other sailors call me Magic Arpan because I know one or two yaing magic tricks.
-Pardon! J'ai oublié de me présenter, Je m'appelle Arpan, mais les autres marins m'appellent Magic Arpan parce que je connais un ou deux tours de magie.
+Sorry! Allow me to introduce myself. My name is Arpan, but the other sailors call me Magic Arpan because I know one or two ya-ing magic tricks.
+
Sorry! Sorry!
@@ -27710,6 +27722,9 @@ Thank you for being with us for so long. You gained a %s as a random good-hearte
Thank you for helping me make my tea. I hope the potions have been helpful...
+Thank you for the %s, I really appreciate it.
+
+
Thank you for your help.
Merci pour ton aide.
@@ -27887,9 +27902,6 @@ Thanks for the help.
Thanks for the help. Here, take this shirt and some money.
-Thanks for the honestity, I guess.
-Merci pour l'honnêteté, je suppose.
-
Thanks for the kindness, but you don't have enough. I need 5!
@@ -27917,6 +27929,9 @@ Thanks for your help!
Thanks for your help, anyway.
+Thanks for your honesty, I guess.
+
+
Thanks for your patronage! The rewards will be available with @@, in case I do find the paradise!
@@ -29349,7 +29364,7 @@ The sake wasn't ready yet and you lost it...
The sea route I take is very dangerous, and full of pirates. You're too weak to travel with me.
-
+La route maritime que j'emprunte est très dangereuse et pleine de pirates. Tu es trop faible pour voyager avec moi.
The seal retaliates! It was super effective. You are dead!
@@ -29705,9 +29720,6 @@ There doesn't seem to be any physical wound.
There exist more food than you know. But this time I don't want anything extravagant, just 6 @@ should be fine.
-There is a NPC called Trainer, just outside this ship.
-Il y a un PNJ appelé Trainer, juste à l'extérieur, sur l'île de Candor
-
There is a chasm.
@@ -29720,6 +29732,9 @@ There is a slight breeze coming from @@.
There is a time limit, which is already running.
+There is an NPC called Trainer, just outside the ship.
+
+
There is no EXP penalty, but you cannot go back without either completing the cave, or dying.
@@ -30095,8 +30110,8 @@ They'll also start spawning on whole map, so be careful.
They're back - and they took hold of your majesty - my husband - king Arthur!
-They're not magic, but yayaya, people like to say it is! Yeyeye.
-Il n'y a plus pas magiques, mais les gens aiment dire l'inverse ! Hey hey.
+They're not magic, but yayaya, people like to say it is! Yeyeye!
+
They're not too dangerous, but they can take a lot of hits. So, if you kill 10 of them, I'll know you're dedicated in learning which monsters are out there.
@@ -30879,16 +30894,16 @@ To Artis.
To Candor Island.
-À Candor Island.
+Vers Candor Island.
To Hurnscald.
-À Hurnscald.
+Vers Hurnscald.
To Nivalis.
-À Nivalis.
+Vers Nivalis.
To Tulimshar.
-À Tulimshar.
+Vers Tulimshar.
To aid those in need
@@ -31874,8 +31889,8 @@ Use its powers for good!
Use the abandoned passage to the north... Usually, no one uses it.
-Use the arrow keys to walk right and meet Juliet.
-Utilisez les flèches directionnelles pour aller à droite et rencontrer Juliet.
+Use the arrow keys to walk over to the right and meet Juliet.
+
Use these coins to exchange for stuff. But beware: Each dungeon difficulty will increase the coin drop in the square value of previous.
@@ -32252,6 +32267,9 @@ WARNING: Your progress on the quest was lost!
WARNING: if you die again today in a special map it will be PERMANENT.
+WARNING: you can only rent one mount per character. Either tortuga or a mouboo.
+
+
WARPING IN 10 SECONDS
@@ -32487,7 +32505,7 @@ Water Fairy
Water Fairy
Water, Bread, Cheese and Cherry Cake are to eat, and money is always useful, you know.
-L'eau, le pain, le fromage et le gâteau aux cerises sont à manger et l'argent est toujours utile, tu sais bien!
+Water, Bread, Cheese et Cherry Cake sont à manger... et l'argent est toujours utile, tu sais bien!
Wave @@/10
@@ -32660,8 +32678,8 @@ We want to celebrate this moment, but can you believe we ran out of beer?
We want to thank everyone who did this release possible.
-We will be yaying there in a few days, so we will drop you off there.
-On arrivera là-bas dans quelques jours donc on t'y déposera.
+We will be yeye-ing there in a few days, so we'll part ways there.
+
We will have a party today, but only believers are allowed in!
@@ -33542,9 +33560,6 @@ Que veux-tu enterrer ?
What would you like today?
Que veux-tu aujourd'hui ?
-What yeye could I do for you today?
-Dis-moi, que puis faire pour toi ?
-
What you asked me for, again?
@@ -33587,6 +33602,9 @@ What's your opinion of Peetu and his work?
What, only that? Well, this is actually simpler than it looks.
+What-yeye could I do for you today?
+
+
What? A party?
Quoi ? Une fête ?
@@ -34376,8 +34394,8 @@ Hey hey, tu devrais aller la voir! Elle se fera un plaisir de vous aider à nouv
Yaya, you should go see her! She'll be happy to help you again.#1
Hey hey, tu devrais aller la voir! Elle se fera un plaisir de vous aider à nouveau.
-Yayaya, @@ is surely slow. Do you remember how to walk? You can use arrow keys for that!
-Hey hey, @@ est sûrement trés lent. Vous souvenez-vous comment marcher? Vous pouvez utiliser les touches fléchées pour ça!
+Yayaya, @@ is surely slow. Don't you remember how to walk? You can use arrow keys for that!
+
Yayaya, by pressing @@ or clicking in @@, you'll open your char status window!
Hey hey, en appuyant sur @@ ou en cliquant sur @@, vous ouvrez la fenêtre de statut de votre personnage!
@@ -34388,6 +34406,9 @@ Yayaya, by pressing @@ or clicking in @@, you'll open your character status wind
Yayaya, good job! You can collect loot by pressing @@.
Hey hey, bon travail! Tu peux collecter les butins en appuyant sur @@.
+Ye not paying for your food and ye isn't a sailor like us! Ye should be standing on your own two feet.
+
+
Yeah sure, take my Amethyst!
@@ -34781,9 +34802,6 @@ Vous pouvez appuyer sur @@ pour vous asseoir, ce qui vous permettra de guérir p
Yeye don't need to train here anymore! Let's head back to the ship before the sun sets, shall we?
Hey, Hey. Vous n'avez plus besoin de vous entraîner ici! Revenons au navire avant le coucher du soleil.
-Yeye is not paying for your food and is not a sailor like us! You should start standing on your own feet.
-Vous devriez commencer à vous tenir debout.
-
Yeye, are you finally ready to go?#0
Hey hey, êtes-vous enfin prêt à débuter?
@@ -36056,12 +36074,6 @@ You must %s and chant %s to begin channeling.
You must be close to it, and stealing won't change drops! If you fail, just try again! Good luck!
-You must be dressed, and talk to our captain first. He'll give you a mission and unlock the ship main door.#0
-Vous devez être habillé et parler à notre capitaine d'abord. Il te donnera une mission et déverrouillera la porte principale du navire..#0
-
-You must be dressed, and talk to our captain first. He'll give you a mission and unlock the ship main door.#1
-Vous devez être habillé et parler à notre capitaine d'abord. Il te donnera une mission et déverrouillera la porte principale du navire..#1
-
You must be fast! The guards are also affected.
@@ -36182,6 +36194,9 @@ You need to finish at least %d/%d tasks.
You need to have an @@ equipped.
+You need to have level %d or above.
+
+
You need to kill all the %d monsters to complete a bounty.
@@ -36516,7 +36531,7 @@ You still haven't found all of them yet.
You still need @@ GP for the trip to Tulimshar.
-Tu as encore besoin de @@ GP pour le voyage à Tulimshar.
+Tu as encore besoin de @@ GP pour le voyage vers Tulimshar.
You still need @@ GP to afford it.
Vous avez toujours besoin de @@ GP pour vous le permettre.
@@ -36636,10 +36651,10 @@ You wanted to know about the World Edge, right? The Ancient Families of the Soul
You were in bad shape, you should be happy we found you before the sea killed you.#0
-Tu étais dans un sale état, tu devrais être contente qu'on t'ai trouvée, avant que la mer ne t'ai tuée.
+Tu étais dans un sale état, tu devrais être contente qu'on t'ait trouvée avant que la mer ne te tue.
You were in bad shape, you should be happy we found you before the sea killed you.#1
-Tu étais dans un sale état, tu devrais être content qu'on t'ai trouvé, avant que la mer ne t'ai tué.
+Tu étais dans un sale état, tu devrais être content qu'on t'ait trouvé avant que la mer ne te tue.
You were jailed and now need a GM to get you out of there.
@@ -36689,8 +36704,8 @@ You will need a certain amount of them to upgrade any skill, which will be spent
You will need to *hic* prove yourself to *hic* me and the town first...
-You will see, citizens are polite and you can still ask around for help. They can help find a job for you or maybe help you find out what happened to you out at sea!
-Vous verrez, les citoyens sont polis et vous pouvez toujours demander de l'aide. Ils peuvent vous aider à trouver un job ou vous aider à découvrir ce qui vous est arrivé en mer!
+You will notice the citizens are polite and they might help you find a job or help you figure out what happened to you out at sea.
+
You win!
@@ -36761,6 +36776,12 @@ You'll soon run out of stuff to do around here, so yeah, you should extend your
You'll want your fishing rod to be flexible but solid.
Tu veux que ta canne à pêche soit souple mais solide.
+You're aboard our ship. We made port to a little island and we're actually yeye-ending our long merchant travelling adventure at the city of Tulimshar.#0
+
+
+You're aboard our ship. We made port to a little island and we're actually yeye-ending our long merchant travelling adventure at the city of Tulimshar.#1
+
+
You're about to concede an academic title to "@@".
@@ -36812,12 +36833,6 @@ You're not welcome here. Get moving.
You're on a ship, we're on our way to the oldest human city, Tulishmar.
Vous êtes sur un bateau La Johanne, nous nous dirigeons vers la plus vieille ville humaine, Tulimshar.
-You're on our ship, we made port to a little island and we're actually yeyending our long merchant travelling adventure at the city of Tulimshar.#0
-Vous êtes sur notre bateau, La Johanne, nous avons fait le port vers une petite île, Candor que nous ajoutons a notre périple de marchand vers la ville de Tulimshar..#0
-
-You're on our ship, we made port to a little island and we're actually yeyending our long merchant travelling adventure at the city of Tulimshar.#1
-Vous êtes sur notre bateau, La Johanne, nous avons fait le port vers une petite île, Candor que nous ajoutons a notre périple de marchand vers la ville de Tulimshar..#1
-
You're playing with fire. Or ice. Or whatever.
diff --git a/langs/lang_pt_BR.old b/langs/lang_pt_BR.old
index 751bf2cf6..0613b6d97 100644
--- a/langs/lang_pt_BR.old
+++ b/langs/lang_pt_BR.old
@@ -448,6 +448,9 @@ Todos saúdem ##B@@##b, primeiro(a) a completar a ##3Quest do Rei Yeti!
All torches are lit!
Todas as tochas estão acesas!
+All you need to do then is walk outside, enter on the biggest house, and talk to the Trainer. He'll teach you everything.
+Tudo o que você precisa fazer é andar lá fora, entrar na casa maior e conversar com o treinador. Ele vai te ensinar tudo.
+
Allows to move/attack while casting. (Melee attacks still interrupt casting!)
Permite mover / atacar enquanto lança. (Ataques corpo-a-corpo ainda interrompem o lançamento!)
@@ -556,6 +559,9 @@ De qualquer forma, aqui a sua recompensa.
Anyway, my herb mixture keep monsters away.
De qualquer forma, minha mistura de ervas mantém os monstros longe.
+Anyway, our shipkeeper, Juliet, helped to heal your injuries way back.
+De qualquer forma, nossa armadora, Juliet, ajudou a curar seus ferimentos lá atrás.
+
Anyway, you can check our [@@https://gitlab.com/TMW2/Docs/wikis/home|Wiki@@] to find awesome stuff!
De qualquer forma, você pode conferir nossa [@@https://gitlab.com/TMW2/Docs/wikis/home|Wiki@@] para encontrar coisas incríveis!
@@ -901,6 +907,12 @@ Poderia ser bom se você pudesse me trazer isso:
Could you bleach my clothes?
Você poderia branquear minhas roupas?
+Could you tell me where I am?#0
+Você poderia me dizer aonde estou?
+
+Could you tell me where I am?#1
+Você poderia me dizer aonde estou?
+
Counter Attack - Next attack will be retaliated, with twice critical ratio.
Counter Attack - próximo ataque será retaliado, com relação de duas vezes crítica.
@@ -1063,6 +1075,12 @@ Você tem as @@ / 11 @@ que eu pedi? Os marinheiros estão ficando com fome porq
Do you know Land Of Fire Village? It is west of Hurnscald and is a major town.
Sabe terra do fogo Village? É oeste de Hurnscald e é uma grande cidade.
+Do you know what happened to the gold I had when you guys saved me?#0
+Você sabe o que aconteceu com o ouro que eu tinha quando vocês me salvaram?
+
+Do you know what happened to the gold I had when you guys saved me?#1
+Você sabe o que aconteceu com o ouro que eu tinha quando vocês me salvaram?
+
Do you really think the poor creature should jump a bridge in water and DIE?
Você realmente acha que a pobre criatura deveria pular uma ponte na água e MORRER?
@@ -1549,6 +1567,9 @@ Aqui está, eu tentei o meu melhor! Você quer outro?
Here, all yours. I can't use them like I am now. Thank you.
Aqui, todo seu. Eu não posso usá-los como eu sou agora. Obrigado.
+Here, come talk to me, the Magic Arpan! I'll help you get dressed.
+Aqui venha falar comigo, o Arpan Mágico! Eu vou te ajudar a se vestir.
+
Here, learn this awesome skill. It is on the skills tab. You can drag it to the shortcut list. Use it to protect people!
Aqui, aprenda essa habilidade incrível. Está na guia de habilidades. Você pode arrastá-lo para a lista de atalhos. Use-o para proteger as pessoas!
@@ -2227,6 +2248,15 @@ Inserir uma chave e puxe o interruptor?
Intelligence is very useful for alchemy and magic, but nowadays there are few opportunities to use it.
A inteligência é muito útil para alquimia e magia, mas hoje em dia existem poucas oportunidades de usá-la.
+Invest in Exportations
+Investir nas exportações
+
+Invest in Reputation
+Invista em Reputação
+
+Investing in Reputation
+Investir em Reputação
+
Iron Four-Leaf Amulet
Amuleto de Quatro Folhas de Ferro
@@ -2314,6 +2344,9 @@ Juliet está no nível superior do navio, use as setas do teclado para caminhar
Just @@ ago, thiefs stole Pihro & Pyndragon weapons.
Apenas @@ atrás, ladrões roubaram armas Pihro e Pyndragon.
+Just use the arrow key--, err, I mean, just walk to the door on the right. The one which is not guarded by Peter.
+Basta usar as teclas direcionais--, err, quero dizer, apenas ande até a porta à direita. Aquele que não é guardado por Pedro.
+
KILL EVERY MONSTER W/O COLLECTING test
MATE CADA MONSTRO SEM COLECIONAR teste
@@ -2578,12 +2611,18 @@ Versão mais poderosa de cura. Requer @@ cada elenco.
Moving while AFK is botting! I'll send you to a %s if you move while AFK! YOU HAVE BEEN WARNED!
Movendo enquanto AFK é bots! Eu vou lhe enviar a um% s se mover enquanto AFK! VOCÊ FOI AVISADO!
+My chestplate, @@
+Meu peitoral, @@
+
My father lead a dye fabric, I'm in charge to sell @@ around the world.
Meu pai lidera um tecido de corante, eu sou responsável por vender @@ em todo o mundo.
My figurin is so nice!
Minha figura é tão legal!
+My helmet, @@
+Meu capacete, @@
+
My man went down and still haven't returned.
Meu homem caiu e ainda não voltou.
@@ -2596,9 +2635,15 @@ Meu nome é Julieta, sou eu quem cuida de você depois que a encontramos no mar.
My shaman skill protect us, against monsters and thiefs!
Minha habilidade de xamã nos protege contra monstros e ladrões!
+My shield, @@
+O meu escudo, @@
+
My unit, however, was attacked! An assassin snuck up on us!
A minha unidade, no entanto, foi atacado! Um assassino escapado para cima de nós!
+My weapon, @@
+Minha arma, @@
+
NOTE: The Energy Ball explodes and Kills. Very. Well. Make them a priority!
NOTA: explode e mata a bola de energia. Muito. Bem. Faça-lhes uma prioridade!
@@ -2674,6 +2719,9 @@ Não tem problema, eu posso te ajudar de qualquer maneira.
No, I don't teach magic. No, I'm not interested in @@ affairs.
Não, eu não ensino magia. Não, não estou interessado em assuntos @@.
+No, but what option do I have? I'm railroaded!
+Não, mas qual opção eu tenho? Eu sou ferroviário!
+
No, none.
Ninguém.
@@ -2731,6 +2779,9 @@ Oh - Bem vindo ao TMW2: Lendas do Moubootaur!
Oh really? I'll put more food in the next box then.
Oh, sério? Então eu vou colocar mais comida na próxima caixa.
+Oh right, I totally forgot about that, here you go.
+Ah, bem, eu esqueci completamente disso, aqui vai você.
+
Oh well, we rescued you when you were yaying adrift in the sea.#0
Bem, nós resgatamos você quando você estava a deriva no mar.
@@ -2809,6 +2860,9 @@ Olay, estou pronto para trabalhar!
Oldur Card
Carta Oldur
+On hindsight, I'll wait you get a few levels. Can't have cheaters, ya know!
+Em retrospectiva, vou esperar que você obtenha alguns níveis. Não pode ter trapaceiros, você sabe!
+
Once you lit one of them, monsters will pour out, so take care to don't die.
Uma vez que você acendeu um deles, os monstros vão derramar, então tome cuidado para não morrer.
@@ -2992,6 +3046,9 @@ Protip: Use @hide para não interferir.
Protip: You can get Croconut from Crocotree, and fill @@ purchased in the market.
Protip: Você pode obter Croco de Crocotree e preencher @@ comprado no mercado.
+Protip: You skipped tutorial. A lot of tutorial-ish dialogs and quests will be skipped. You can change this anytime on %s > Game Settings.
+Protip: Você pulou tutorial. Um monte de diálogos e missões tutoriais-ish será ignorado. Você pode mudar este a qualquer hora em% s> Configurações do jogo.
+
Provoke - Provoke a single monster
Provocar - provocar um único monstro
@@ -3397,6 +3454,9 @@ Desculpe outro dia talvez.
Sorry! I forgot to introduce myself. My name is Arpan, but other sailors call me Magic Arpan because I know one or two yaing magic spells.
Desculpa! Eu esqueci de me apresentar. Meu nome é Arpan, mas outros marinheiros me chamam de Magic Arpan porque eu conheço um ou dois feitiços mágicos.
+Sorry! I forgot to introduce myself. My name is Arpan, but other sailors call me Magic Arpan because I know one or two yaing magic tricks.
+Desculpa! Eu esqueci de me apresentar. Meu nome é Arpan, mas outros marinheiros me chamam de Arpan Mágico porque eu conheço um ou dois yayados truques mágicos.
+
Sorry! Not yet implemented!
Desculpa! Ainda não implementado!
@@ -3601,6 +3661,9 @@ Obrigado por ajudar minha esposa! Que o Mouboo cuide de você! o.o
Thanks for the help!
Obrigado pela ajuda!
+Thanks for the honestity, I guess.
+Obrigado pela honestidade, eu acho.
+
Thanks once again, I know it's not much but here is 450 GP for your troubles.
Obrigado mais uma vez, eu sei que não é muito, mas aqui é 450 GP para seus problemas.
@@ -3838,6 +3901,9 @@ Existem dois tipos de magia: Habilidades de Mana e Habilidades Mágicas.
There doesn't seems to be any physical wound.
Não parece haver ferida física.
+There is a NPC called Trainer, just outside this ship.
+Existe um NPC chamado Treinador, do lado de fora desse navio.
+
There is a paper with some rules written on it.
Há um papel com algumas regras escritas nele.
@@ -3901,6 +3967,9 @@ Eles irão expirar * hic * em apenas @@ ... ou no logout.
They will try to prove your worth before, though. So be ready.
Eles vão tentar provar o seu valor antes, embora. Para estar pronto.
+They're not magic, but yayaya, people like to say it is! Yeyeye.
+Eles não são mágicos, mas yayaya, as pessoas gostam de dizer que é! Yeyeye
+
They're not too dangerous, but takes a lot to kill. So, if you kill 10 of them, I'll know you're dedicated in learning which monsters are out there.
Eles não são muito perigosos, mas demoram muito para matar. Então, se você matar 10 deles, eu sei que você é dedicado em aprender quais monstros estão por aí.
@@ -4150,6 +4219,9 @@ A menos que você tenha um @@, será difícil acompanhar o progresso em Mana Mag
Updates disabled, daily login reward: 1,000 GP
Atualizações desativado, recompensa login diário: 1.000 GP
+Use the arrow keys to walk right and meet Juliet.
+Use as setas do teclado para andar à direita e conhecer Juliet.
+
Use the key.
Use a chave.
@@ -4303,6 +4375,9 @@ Usamos espadas e arcos para proteger as pessoas, e usamos magia para apimentar a
We want to party this moment, but can you believe we ran out of beer?
Queremos festejar esse momento, mas você acredita que ficamos sem cerveja?
+We will be yaying there in a few days, so we will drop you off there.
+Nós estaremos lá em poucos dias, então vamos deixá-lo lá.
+
We wish you a merry Christmas! And a happy new year!!
Desejamos-lhe um feliz natal! E um Feliz Ano Novo!!
@@ -4474,6 +4549,9 @@ Quais são as duas palavras escritas em grandes letras amigáveis ​​na contr
What were the second most intelligent creatures on Earth?
Quais foram as segundas criaturas mais inteligentes da Terra?
+What yeye could I do for you today?
+O que yeye poderia fazer por você hoje?
+
What's that? He seems to be AFK but is not?
O que é isso? Ele parece ser AFK mas não é?
@@ -4603,6 +4681,9 @@ Yaya, você deveria ir vê-la! Ela ficará feliz em te ver.
Yaya, you should go see her! She'll be happy to see you.#1
Yaya, você deveria ir vê-la! Ela ficará feliz em te ver.
+Yayaya, @@ is surely slow. Do you remember how to walk? You can use arrow keys for that!
+Yayaya, @@ é certamente lento. Você se lembra de como andar? Você pode usar as setas para isso!
+
Yayayaya, it's the first time someone is dressed worse than us!
Yayayaya, é a primeira vez que alguém se veste pior do que nós!
@@ -4636,6 +4717,9 @@ Sim. Frostia é uma cidade-propriedade e é governada por mim, Rei Gelid Frozenh
Yeti King
Rei Yeti
+Yeye is not paying for your food and is not a sailor like us! You should start standing on your own feet.
+Yeye não está pagando pela sua comida e não é um marinheiro como nós! Você deve começar a ficar em pé.
+
Yeye, you are really lucky to be alive. You are in good enough shape for walking, do you remember what happened?#0
Yeye, você é realmente sortuda de estar viva. Você está forte o suficiente para andar sozinha, por acaso se lembra do que aconteceu?
@@ -4942,6 +5026,9 @@ Você joga uma moeda no poço.
You will be killed on the road if you try to go like this. Try helping people. Get money, experience, equipment.
Você será morto na estrada se tentar ir assim. Tente ajudar as pessoas. Ganhe dinheiro, experiência e equipamentos.
+You will see, citizens are polite and you can still ask around for help. They can help find a job for you or maybe help you find out what happened to you out at sea!
+Você vai ver, os cidadãos são educados e você ainda pode pedir ajuda. Eles podem ajudar a encontrar um trabalho para você ou talvez ajudá-lo a descobrir o que aconteceu com você no mar!
+
You will then be able to register citzenship in any city, for free. But just once.
Você poderá então registrar a cidadania em qualquer cidade gratuitamente. Mas apenas uma vez.
diff --git a/langs/lang_pt_BR.txt b/langs/lang_pt_BR.txt
index f2718e51d..02d842503 100644
--- a/langs/lang_pt_BR.txt
+++ b/langs/lang_pt_BR.txt
@@ -707,6 +707,9 @@ para
* Acquired @@ @@!
* Adquiriu um @@ @@!
+* Actual effect lasts %d hours.
+
+
* Aid the Blue Sage in getting Peetu back to action
* Ajude o Blue Sage a colocar Peetu de volta à ação
@@ -3806,8 +3809,8 @@ All torches are lit! Return to Zarkor.
All warp technology, be it crystal-based, potion-based, or mechanic-based, relies on timespace distortions.
Toda a tecnologia de dobra, seja baseada em cristal, baseada em poções ou mecânica, depende de distorções do espaço-tempo.
-All you need to do then is walk outside, enter on the biggest house, and talk to the Trainer. He'll teach you everything.
-Tudo o que você precisa fazer é andar lá fora, entrar na casa maior e conversar com o treinador. Ele vai te ensinar tudo.
+All you need to do is walk outside, enter the biggest house, and speak with the Trainer. He'll teach you everything you need to know.
+
Alliance Guard
@@ -4520,9 +4523,6 @@ De qualquer forma, minha mistura de ervas mantém os monstros longe.
Anyway, once you have the recipe book and learned a recipe, you can craft items in forges. I think you can buy it in your apartment.
De qualquer forma, depois de ter o livro de receitas e aprendeu uma receita, você pode criar itens em forjas. Eu acho que você pode comprar no seu apartamento.
-Anyway, our shipkeeper, Juliet, helped to heal your injuries way back.
-De qualquer forma, nossa armadora, Juliet, ajudou a curar seus ferimentos lá atrás.
-
Anyway, the Moubootaur certainly existed, and probably is still alive.
De qualquer forma, o Moubootaur certamente existiu e provavelmente ainda está vivo.
@@ -4538,6 +4538,9 @@ De qualquer forma, você pode ver o quão hábil usando Mana Magia com @@. Mana
Anyway, you have a letter to our %s, you meant? Sure thing, I'll let him know at once.
+Anyway, you should be thanking Juliet, she's the one who patched you up.
+
+
Anyway. This is the FAIRY KINGDOM spell. It'll spawn fairies.
De qualquer forma. Este é o feitiço REINO FEERICAMENTE. Isso vai gerar fadas.
@@ -6800,6 +6803,9 @@ Você pode me ensinar magia? Por favor, por favor
Can you teach me some Alchemy Recipe?
Você pode me ensinar alguma receita de alquimia?
+Can you tell me where I am?
+
+
Can you, perhaps, do me a favor? Please... Check her house for any signs of battle.
Você pode, talvez, me fazer um favor? Por favor ... Verifique se há sinais de batalha em sua casa.
@@ -7808,12 +7814,6 @@ Você poderia, por favor, nos dar uma refeição completa, com 5 @@, 5 @@, 5 @@,
Could you sell me a treasure map and a shovel?
Você poderia me vender um mapa do tesouro e uma pá?
-Could you tell me where I am?#0
-Você poderia me dizer aonde estou?
-
-Could you tell me where I am?#1
-Você poderia me dizer aonde estou?
-
Could you try again, please?
Você poderia tentar de novo, por favor?
@@ -9002,11 +9002,8 @@ Você conhece os cristais de dobra? Nós fizemos eles. Você viu o grande portã
Do you know what a Soul Menhir is?
Você sabe o que é um Menhir de Almas?
-Do you know what happened to the gold I had when you guys saved me?#0
-Você sabe o que aconteceu com o ouro que eu tinha quando vocês me salvaram?
+Do you know what happened to the gold I had on me when I was rescued?
-Do you know what happened to the gold I had when you guys saved me?#1
-Você sabe o que aconteceu com o ouro que eu tinha quando vocês me salvaram?
Do you know where I can find Nard?
Você sabe onde eu posso encontrar Nard?
@@ -9404,6 +9401,12 @@ Doe um dente de morcego
Donate a Bat Wing
Doe uma asa de morcego
+Donate all Bat Teeth
+
+
+Donate all Bat Wings
+
+
Donate to town
@@ -13088,9 +13091,6 @@ Aqui, todo seu. Ah, se eu ainda pudesse andar ... eu mesmo caçaria esses esquil
Here, all yours. I can't use them while I am this hurt anyways. Thank you.
-Here, come talk to me, the Magic Arpan! I'll help you get dressed.
-Aqui venha falar comigo, o Arpan Mágico! Eu vou te ajudar a se vestir.
-
Here, lemme tell you something good: Do you know that fortress island which all the adventurers are talking about nowadays?
@@ -13103,6 +13103,9 @@ Here, please take this to them. Tell them they are welcome here anytime! %%2
Here, sparking new! Nice!!
Aqui, brilhando feito novo! Maravilhoso!!
+Here, speak to me, Magic Arpan! I'll help you get dressed.
+
+
Here, take as much as you need, I have plenty!
Aqui, pegue o quanto você precisar, eu tenho muito!
@@ -17660,17 +17663,23 @@ Invalid recipe from Nahrec partly reimbursed.
Invalid season: @@
Temporada inválida: @@
-Invest in Exportations
-Investir nas exportações
+Invest all into boosting town exports
+
+
+Invest all into boosting town reputation
+
+
+Invest into boosting town exports
+
+
+Invest into boosting town reputation
-Invest in Reputation
-Invista em Reputação
Investing in Exportations
Investir nas exportações
-Investing in Reputation
-Investir em Reputação
+Investing into Reputation
+
Investment executed
investimento executado
@@ -18512,8 +18521,8 @@ Basta dizer-lhe que eu queira reconsiderar, e que eu quero que a lembrança que
Just two coins for spin.
Apenas duas moedas para girar.
-Just use the arrow key--, err, I mean, just walk to the door on the right. The one which is not guarded by Peter.
-Basta usar as teclas direcionais--, err, quero dizer, apenas ande até a porta à direita. Aquele que não é guardado por Pedro.
+Just use the arrow key--, err, I mean, just walk to the door on the right. It's the one not guarded by Peter.
+
Just wait. Fafi dragons are slow to show up...
Apenas espere. Os dragões Fafi demoram a aparecer ...
@@ -19754,6 +19763,12 @@ Make me some Iron Powder.
Make sure to put on a bait after you click, though!
Certifique-se de colocar uma isca depois de clicar, embora!
+Make sure you're dressed and then speak with the captain. He'll give you a mission and unlock the ship's main door.#0
+
+
+Make sure you're dressed and then speak with the captain. He'll give you a mission and unlock the ship's main door.#1
+
+
Male
Masculino
@@ -20831,9 +20846,6 @@ Meu hálito cheira mal.
My captain wanted me to give this to you as a special reward for your efforts.
-My chestplate, @@
-Meu peitoral, @@
-
My children and grandchildren have all moved to the Land of Fire, so the amount of leatherwork I can offer you is limited.
@@ -20870,9 +20882,6 @@ Minha avó me deu uma receita do @@, pode curar tudo, menos a morte.
My greatest realization thus far, besides some time rewinding clocks, is the @@!
Minha maior realização até agora, além de algum tempo rebobinar relógios, é o @@!
-My helmet, @@
-Meu capacete, @@
-
My husband and I have moved here under the Alliance orders.
Meu marido e eu nos mudamos para cá sob as ordens da Aliança.
@@ -20909,9 +20918,6 @@ My pleasure.
My shaman skills protected us against monsters and thieves!
Minhas habilidades de xamã nos protegeram contra monstros e ladrões!
-My shield, @@
-O meu escudo, @@
-
My stats are too good, I won't need it.
Minhas estatísticas são boas demais, não vou precisar disso.
@@ -20924,9 +20930,6 @@ Minha flor waifu me deixou presa aqui, e ela nem sequer olha para mim, porque eu
My warp crystal broke!
Meu cristal de teia quebrou!
-My weapon, @@
-Minha arma, @@
-
Mylarin Dust
Poeira Mylarin
@@ -21413,8 +21416,8 @@ Não, eu vou deixar você lá para a misericórdia do Yeti.
No, I'll save my money.
Não, não quero gastar meu dinheiro.
-No, but what option do I have? I'm railroaded!
-Não, mas qual opção eu tenho? Eu sou ferroviário!
+No, but what option do I have? I'm being railroaded!
+
No, it is a family heirloom. But I do have the shield blueprints. A skilled craftsman could forge one.
Não, é uma herança de família. Mas eu tenho as plantas do escudo. Um artesão habilidoso poderia forjar um.
@@ -22229,8 +22232,8 @@ Oh não, quem agora pode ajudar minha esposa? Por favor, reconsidere!
Oh please. Even if you know a trick or two, you don't have real magic.
Oh, por favor. Mesmo que você saiba um truque ou dois, você não tem mágica real.
-Oh right, I totally forgot about that, here you go.
-Ah, bem, eu esqueci completamente disso, aqui vai você.
+Oh right, I almost forgot, here you go!
+
Oh well, this sucks, but that was only an illusion.
Oh bem, isso é uma droga, mas isso foi apenas uma ilusão.
@@ -22325,6 +22328,9 @@ Oh, ei, bem vindo de volta, @@! Obrigado por toda sua ajuda!
Oh, hey. Welcome to the library, or what's left of it.
Oh, ei Bem-vindo à biblioteca ou ao que resta dela.
+Oh, how I miss %s from Tulimshar...
+
+
Oh, just an empty staff with black powder inside it. Which explodes. And then kills monsters.
Oh, apenas uma equipe vazia com pó preto dentro dela. Que explode E então mata monstros.
@@ -22529,9 +22535,6 @@ Em um computador, você pode pressionar @@ para atacá-lo. No celular, esse seri
On a side note, more defense is always good, but the damage won't decrease on the same rate that defense raises.
Em uma nota lateral, mais defesa é sempre boa, mas o dano não diminui na mesma proporção que a defesa aumenta.
-On hindsight, I'll wait you get a few levels. Can't have cheaters, ya know!
-Em retrospectiva, vou esperar que você obtenha alguns níveis. Não pode ter trapaceiros, você sabe!
-
On mobile, the DPAD is at your left. Do you see the chest to my right?
No celular, o DPAD está à sua esquerda. Você vê o baú à minha direita?
@@ -22541,6 +22544,9 @@ No celular, você clicaria no ícone @@!
On my way to get what you need.
No meu caminho para conseguir o que você precisa.
+On second thought, come see me when you've gained a few levels. We can't have cheaters, ya know?
+
+
On second thought, he really could use a bath.
Pensando bem, ele realmente poderia usar um banho.
@@ -23927,8 +23933,8 @@ Dica: Você precisa de uma @@ cheia de água para obter uma resposta dos guardas
Protip: You need level %d or higher to do this quest.
Protip: Você precisa% d nível ou superior para fazer essa quest.
-Protip: You skipped tutorial. A lot of tutorial-ish dialogs and quests will be skipped. You can change this anytime on %s > Game Settings.
-Protip: Você pulou tutorial. Um monte de diálogos e missões tutoriais-ish será ignorado. Você pode mudar este a qualquer hora em% s> Configurações do jogo.
+Protip: You skipped the tutorial. A lot of tutorial related dialog and quests will be skipped. You can change this anytime in %s > Game Settings.
+
Protip: Your current progress will be saved.
Protip: Seu progresso atual será salvo.
@@ -24593,6 +24599,12 @@ Alugar 30 dias por 1000 GP
Rent 30 days for 2000 GP
Alugar 30 dias para 2000 GP
+Rent 365 days for 10000 GP
+
+
+Rent 365 days for 20000 GP
+
+
Rent 7 days for 300 GP
Alugar 7 dias por 300 GP
@@ -26651,8 +26663,8 @@ Sorry kind sir @@, but no.#1
Sorry pal, but only if another miner vouches for you.
pal Desculpe, mas somente se outro mineiro atesta para você.
-Sorry! I forgot to introduce myself. My name is Arpan, but other sailors call me Magic Arpan because I know one or two yaing magic tricks.
-Desculpa! Eu esqueci de me apresentar. Meu nome é Arpan, mas outros marinheiros me chamam de Arpan Mágico porque eu conheço um ou dois yayados truques mágicos.
+Sorry! Allow me to introduce myself. My name is Arpan, but the other sailors call me Magic Arpan because I know one or two ya-ing magic tricks.
+
Sorry! Sorry!
Desculpa! Desculpa!
@@ -27710,6 +27722,9 @@ Obrigado por estarem conosco por tanto tempo. Você ganhou uma% s como um bom co
Thank you for helping me make my tea. I hope the potions have been helpful...
Obrigado por me ajudar a fazer meu chá. Espero que as poções tenham sido úteis ...
+Thank you for the %s, I really appreciate it.
+
+
Thank you for your help.
Obrigado pela ajuda.
@@ -27887,9 +27902,6 @@ Obrigado pela ajuda.
Thanks for the help. Here, take this shirt and some money.
Obrigado pela ajuda. Aqui, pegue esta camisa e algum dinheiro.
-Thanks for the honestity, I guess.
-Obrigado pela honestidade, eu acho.
-
Thanks for the kindness, but you don't have enough. I need 5!
Obrigado pela gentileza, mas você não tem o suficiente. Eu preciso de 5!
@@ -27917,6 +27929,9 @@ Obrigado pela ajuda!
Thanks for your help, anyway.
Obrigado por sua ajuda, pelo menos.
+Thanks for your honesty, I guess.
+
+
Thanks for your patronage! The rewards will be available with @@, in case I do find the paradise!
Obrigado pelo seu patrocínio! As recompensas estarão disponíveis com @@, caso eu encontre o paraíso!
@@ -29705,9 +29720,6 @@ There doesn't seem to be any physical wound.
There exist more food than you know. But this time I don't want anything extravagant, just 6 @@ should be fine.
Existem mais alimentos do que você conhece. Mas desta vez não quero nada extravagante, apenas 6 @@ deve estar bem.
-There is a NPC called Trainer, just outside this ship.
-Existe um NPC chamado Treinador, do lado de fora desse navio.
-
There is a chasm.
Existe um abismo.
@@ -29720,6 +29732,9 @@ Há uma ligeira brisa vinda de @@.
There is a time limit, which is already running.
+There is an NPC called Trainer, just outside the ship.
+
+
There is no EXP penalty, but you cannot go back without either completing the cave, or dying.
Não há penalidade de EXP, mas você não pode voltar sem completar a caverna ou morrer.
@@ -30095,8 +30110,8 @@ They'll also start spawning on whole map, so be careful.
They're back - and they took hold of your majesty - my husband - king Arthur!
Eles estão de volta - e tomaram posse de sua majestade - o meu marido - rei Arthur!
-They're not magic, but yayaya, people like to say it is! Yeyeye.
-Eles não são mágicos, mas yayaya, as pessoas gostam de dizer que é! Yeyeye
+They're not magic, but yayaya, people like to say it is! Yeyeye!
+
They're not too dangerous, but they can take a lot of hits. So, if you kill 10 of them, I'll know you're dedicated in learning which monsters are out there.
@@ -31874,8 +31889,8 @@ Use its powers for good!
Use the abandoned passage to the north... Usually, no one uses it.
-Use the arrow keys to walk right and meet Juliet.
-Use as setas do teclado para andar à direita e conhecer Juliet.
+Use the arrow keys to walk over to the right and meet Juliet.
+
Use these coins to exchange for stuff. But beware: Each dungeon difficulty will increase the coin drop in the square value of previous.
Use essas moedas para trocar por coisas. Mas cuidado: Cada dificuldade da masmorra aumentará a queda de moeda no valor quadrado do anterior.
@@ -32252,6 +32267,9 @@ AVISO: O seu progresso na busca foi perdido!
WARNING: if you die again today in a special map it will be PERMANENT.
AVISO: se você morrer hoje de novo em um mapa especial será permanente.
+WARNING: you can only rent one mount per character. Either tortuga or a mouboo.
+
+
WARPING IN 10 SECONDS
Empenamento em 10 segundos
@@ -32660,8 +32678,8 @@ We want to celebrate this moment, but can you believe we ran out of beer?
We want to thank everyone who did this release possible.
Queremos agradecer a todos que fizeram este lançamento possível.
-We will be yaying there in a few days, so we will drop you off there.
-Nós estaremos lá em poucos dias, então vamos deixá-lo lá.
+We will be yeye-ing there in a few days, so we'll part ways there.
+
We will have a party today, but only believers are allowed in!
Vamos ter uma festa hoje, mas somente crentes são permitidos!
@@ -33542,9 +33560,6 @@ O que você gostaria de enterrar?
What would you like today?
O que você gostaria hoje?
-What yeye could I do for you today?
-O que yeye poderia fazer por você hoje?
-
What you asked me for, again?
O que você me pediu de novo?
@@ -33587,6 +33602,9 @@ Qual sua opinião sobre Peetu e seu trabalho?
What, only that? Well, this is actually simpler than it looks.
O que, só isso? Bem, isso é realmente mais simples do que parece.
+What-yeye could I do for you today?
+
+
What? A party?
O que? Uma festa?
@@ -34376,8 +34394,8 @@ Yaya, you should go see her! She'll be happy to help you again.#0
Yaya, you should go see her! She'll be happy to help you again.#1
-Yayaya, @@ is surely slow. Do you remember how to walk? You can use arrow keys for that!
-Yayaya, @@ é certamente lento. Você se lembra de como andar? Você pode usar as setas para isso!
+Yayaya, @@ is surely slow. Don't you remember how to walk? You can use arrow keys for that!
+
Yayaya, by pressing @@ or clicking in @@, you'll open your char status window!
Yayaya, pressionando @@ ou clicando em @@, você abrirá sua janela de status de caracteres!
@@ -34388,6 +34406,9 @@ Yayaya, by pressing @@ or clicking in @@, you'll open your character status wind
Yayaya, good job! You can collect loot by pressing @@.
Yayaya, bom trabalho! Você pode coletar itens pressionando @@.
+Ye not paying for your food and ye isn't a sailor like us! Ye should be standing on your own two feet.
+
+
Yeah sure, take my Amethyst!
Sim, claro, pegue a minha ametista!
@@ -34781,9 +34802,6 @@ Yeye pode pressionar @@ para se sentar, o que lhe permitirá curar mais rápido.
Yeye don't need to train here anymore! Let's head back to the ship before the sun sets, shall we?
Yeye não precisa mais treinar aqui! Vamos voltar para o navio antes que o sol se ponha, vamos?
-Yeye is not paying for your food and is not a sailor like us! You should start standing on your own feet.
-Yeye não está pagando pela sua comida e não é um marinheiro como nós! Você deve começar a ficar em pé.
-
Yeye, are you finally ready to go?#0
@@ -36056,12 +36074,6 @@ Você deve% se chant% s para começar a canalização.
You must be close to it, and stealing won't change drops! If you fail, just try again! Good luck!
Você deve estar perto disso, e roubar não vai mudar as gotas! Se você falhar, tente novamente! Boa sorte!
-You must be dressed, and talk to our captain first. He'll give you a mission and unlock the ship main door.#0
-
-
-You must be dressed, and talk to our captain first. He'll give you a mission and unlock the ship main door.#1
-
-
You must be fast! The guards are also affected.
Você deve ser rápido! Os guardas também são afetados.
@@ -36182,6 +36194,9 @@ You need to finish at least %d/%d tasks.
You need to have an @@ equipped.
Você precisa ter um @@ equipado.
+You need to have level %d or above.
+
+
You need to kill all the %d monsters to complete a bounty.
@@ -36689,8 +36704,8 @@ You will need a certain amount of them to upgrade any skill, which will be spent
You will need to *hic* prove yourself to *hic* me and the town first...
Você vai precisar se * hic * provar-se para * hic * me e a cidade primeiro ...
-You will see, citizens are polite and you can still ask around for help. They can help find a job for you or maybe help you find out what happened to you out at sea!
-Você vai ver, os cidadãos são educados e você ainda pode pedir ajuda. Eles podem ajudar a encontrar um trabalho para você ou talvez ajudá-lo a descobrir o que aconteceu com você no mar!
+You will notice the citizens are polite and they might help you find a job or help you figure out what happened to you out at sea.
+
You win!
Você ganha!
@@ -36761,6 +36776,12 @@ Em breve você vai ficar sem coisas para fazer por aqui, então sim, você deve
You'll want your fishing rod to be flexible but solid.
Você vai querer que sua vara de pesca seja flexível, mas sólida.
+You're aboard our ship. We made port to a little island and we're actually yeye-ending our long merchant travelling adventure at the city of Tulimshar.#0
+
+
+You're aboard our ship. We made port to a little island and we're actually yeye-ending our long merchant travelling adventure at the city of Tulimshar.#1
+
+
You're about to concede an academic title to "@@".
@@ -36812,12 +36833,6 @@ Você não é bem vindo aqui. Mexa-se.
You're on a ship, we're on our way to the oldest human city, Tulishmar.
Você está em um navio, estamos a caminho da mais antiga cidade humana, Tulishmar.
-You're on our ship, we made port to a little island and we're actually yeyending our long merchant travelling adventure at the city of Tulimshar.#0
-
-
-You're on our ship, we made port to a little island and we're actually yeyending our long merchant travelling adventure at the city of Tulimshar.#1
-
-
You're playing with fire. Or ice. Or whatever.
Você está brincando com fogo. Ou gelo. Como queiras.
diff --git a/langs/lang_ru.old b/langs/lang_ru.old
index 4a3c73694..d9ac57597 100644
--- a/langs/lang_ru.old
+++ b/langs/lang_ru.old
@@ -43,6 +43,9 @@ Ah... You have one too. Be careful with it, please. Many people lost their lives
All torches are lit!
Все факелы зажжены!
+All you need to do then is walk outside, enter on the biggest house, and talk to the Trainer. He'll teach you everything.
+Все, что тебе нужно сделать, это выйти на улицу, войти в самый большой дом и поговорить с Тренером. Он научит тебя всему.
+
And what's about Iron Ore?
А что насчёт железной руды?
@@ -58,6 +61,9 @@ Any friend of Hurnscald is my friend too. Come to me again, if you want to do da
Anyway, conspiratory theories aside, his ghost is a powerful boss. I would not attack him if I were you!
В любом случае, если отбросить конспирологические теории, его призрак - могущественный босс. На вашем месте я бы не нападала на него!
+Anyway, our shipkeeper, Juliet, helped to heal your injuries way back.
+В любом случае, наш корабельщик, Джульетта, помогла залечить твои раны.
+
Anyway, you had a letter to our @@, you meant? Sure thing, I'll let him know at once.
В любом случае, у вас есть письмо нашему @@, вы хотели сказать? Конечно, я сразу же сообщу ему.
@@ -85,6 +91,12 @@ But it's ultimate goal of miners there.
By pressing @@, you can open the Shortcut menu. And by pressing @@, you open the skill menu!
Нажав @@, вы можете открыть меню быстрого доступа. А нажав @@, вы откроете меню навыков!
+Could you tell me where I am?#0
+Не могли бы вы сказать, где я нахожусь?
+
+Could you tell me where I am?#1
+Не могли бы вы сказать, где я нахожусь?
+
Did I said the best craftsman and craftswoman in the world are here? @@, the legendary bow, was proudly crafted by the first king of Frostia!
Разве я сказал, что здесь собрались лучшие мастера и мастерицы в мире? @@, легендарный лук, был с гордостью создан первым королём Фростии!
@@ -100,6 +112,12 @@ Do not hesit to purchase furniture. The furniture belongs to the house, so if yo
Do you know Land Of Fire Village? It is west of Hurnscald and is a major town.
Знаете ли вы Деревню на Огненных Землях? Она находится к западу от Хёрнскальда и является крупным городом.
+Do you know what happened to the gold I had when you guys saved me?#0
+Вы знаете, что случилось с моим золотом, когда вы меня спасли?
+
+Do you know what happened to the gold I had when you guys saved me?#1
+Вы знаете, что случилось с моим золотом, когда вы меня спасли?
+
Do you see that fancy house over there? My husband, @@, used to live there.
Видишь вон тот шикарный дом? Мой муж, @@, жил там.
@@ -244,18 +262,36 @@ In this cave we can easily find Coal, Iron ore, and sometimes @@.
It is pretty close to here. I advise you to use a good sword, and heal yourself often.
Это довольно близко отсюда. Я советую вам использовать хороший меч и часто лечиться.
+Just use the arrow key--, err, I mean, just walk to the door on the right. The one which is not guarded by Peter.
+Просто используйте клавиши со стрелками... эээ, я имею в виду, просто идите к двери справа. К той, которую не охраняет Питер.
+
Less rattos means more food. So, this time the monsters will be a little stronger.
Меньше ратто - больше еды. Так что на этот раз монстры будут немного сильнее.
Listen. North of here, is the ruins of an old village. Said village is cursed, and nobody here wants to go there.
Слушайте. К северу отсюда находятся руины старой деревни. Эта деревня проклята, и никто не хочет туда ходить.
+My helmet, @@
+Мой шлем, @@
+
+My shield, @@
+Мой щит, @@
+
+My weapon, @@
+Моё оружие, @@
+
Nice! I want you to kill some red scorpions, as I said!
Отлично! Я хочу, чтобы вы убили несколько красных скорпионов, как я уже сказал!
+No, but what option do I have? I'm railroaded!
+Нет, но разве у меня есть варианты? Я как на железной дороге!
+
Now you need to fight monster with the maximum range, you can to do this do these steps in order: lock enemy, Attack, hit, move backwards of one tile, hit, ETC.
Теперь вам нужно сражаться с монстром с максимальной дистанцией, для этого выполните следующие действия по порядку: поставьте на врага фокус, атакуйте, ударьте, переместитесь назад на одну плитку, ударьте и так далее.
+Oh right, I totally forgot about that, here you go.
+Ах да, я совсем забыл об этом, вот, пожалуйста.
+
Ok, now I want you to purge the cave from maggots. Kill 25 @@. They keep respawning and annoy miners team.
Хорошо, теперь я хочу, чтобы вы очистили пещеру от личинок. Убейте 25 @@. Они постоянно возрождаются и раздражают команду шахтёров.
@@ -265,6 +301,9 @@ Ok, you look strong enough. Now, let me think on an easy task for you...
Ok. Cool life!
Ок. Классная жизнь!
+On hindsight, I'll wait you get a few levels. Can't have cheaters, ya know!
+С оглядкой на прошлое, я подожду, пока ты наберёшь несколько уровней. Нельзя допускать читеров, знаешь ли!
+
Once you lit one of them, monsters will pour out, so take care to don't die.
Как только вы зажжёте один из них, появятся монстры, поэтому будьте осторожны, чтобы не умереть.
@@ -274,6 +313,9 @@ Ops, I should not leave this room without talking to the king first.
Please kill @@/@@ @@ for us and make the world a safer place!
Пожалуйста, убейте @@/@@ @@ за нас и сделайте мир безопаснее!
+Protip: You skipped tutorial. A lot of tutorial-ish dialogs and quests will be skipped. You can change this anytime on %s > Game Settings.
+Подсказка: Вы пропустили обучение. Многие диалоги и квесты, связанные с обучением, будут пропущены. Вы можете изменить это в любое время в %s > Настройки Игры.
+
So it could be nice, if you could bring me 20 @@,
Так что было бы неплохо, если бы вы принесли мне 20 @@,
@@ -289,6 +331,9 @@ Some of my miners friends died in this mine, because there are plenty of dangero
Some of my miners friends died in this mine, because there are plenty of dangerous monsters.#1
Некоторые из моих друзей-шахтёров погибли в этой шахте, потому что здесь много опасных монстров.
+Sorry! I forgot to introduce myself. My name is Arpan, but other sailors call me Magic Arpan because I know one or two yaing magic tricks.
+Простите! Я забыл представиться. Меня зовут Арпан, но другие моряки зовут меня Маг Арпан, потому что я знаю один или два магических фокуса.
+
Such precious gem, is not something you would give for free, unless you are interested on my... rituals.
Вы не отдадите даром такой драгоценный камень, только если вас не заинтересуют мои... ритуалы.
@@ -307,6 +352,9 @@ Thankfully that item is too rare. I want somebody to slay the bandit leader, but
Thanks for Helping with clear out the store room!
Спасибо за помощь в очистке склада!
+Thanks for the honestity, I guess.
+Спасибо за откровенность, я подумаю.
+
Thanks once again, I know it's not much but here is @@ GP for your troubles.
Ещё раз спасибо, я знаю, что это не много, но вот @@ GP за ваши хлопоты.
@@ -334,9 +382,15 @@ The storehouse here is overrun with house maggots.
The storehouse is still over run with house maggots.
Хранилище всё ещё переполнено домовыми личинками.
+There is a NPC called Trainer, just outside this ship.
+Недалеко от этого корабля находится NPC по имени Тренер.
+
There's a shiny safe here. How much money is inside? Nobody is looking at you, great!
Здесь есть потрясный сейф. Интересно, сколько там бабла? На тебя никто не смотрит, ништяк!
+They're not magic, but yayaya, people like to say it is! Yeyeye.
+Они не магические, но йайайа, люди любят говорить, что это так! Йейейе.
+
This happens quite often, too. My friends and I are always collecting keys to reduce beer price on Hurnscald. %%2
Это тоже происходит довольно часто. Мы с друзьями постоянно собираем ключи, чтобы снизить цену на пиво в Хёрнскальде. %%2
@@ -370,6 +424,9 @@ Uh, you should ask %s, he is the miners leader.
Unfortunately, I was cursed to never enter their cave again. They used a @@ to do that!
К сожалению, я был проклят, чтобы никогда больше не входить в их пещеру. Для этого они использовали @@!
+Use the arrow keys to walk right and meet Juliet.
+Используйте клавиши со стрелками, чтобы идти направо и встретиться с Джульеттой.
+
Very well. I shall now share with you the details of this rite.
Очень хорошо. Теперь я поделюсь с вами подробностями этого обряда.
@@ -382,6 +439,9 @@ We actually have a problem. Bandits ransacked this tavern, and took a huge loot.
We pursued them until the mines, slayed them, and took the chests where they locked our stuff into.
Мы преследовали их до шахт, убили их и забрали сундуки, в которые они заперли наше добро.
+We will be yaying there in a few days, so we will drop you off there.
+Мы будем там через несколько дней, так что мы подбросим тебя туда.
+
Well, I'm the miner leader, indeed. A miner need to have the full set.
Ну, я действительно глава шахтёров. Шахтёр должен иметь полный набор.
@@ -394,6 +454,9 @@ Well, you gave me the gems, so I trust you. Here, take this @@.
What does miners do in cave?
Что делают шахтёры в пещере?
+What yeye could I do for you today?
+Что я могу сделать для тебя сегодня?
+
While it may not be suitable for fighting, by using it against Bifs and other mineral formations, you'll be able to get more ore.
Хотя он не подходит для сражений, используя его против Бифов и других минеральных образований, вы сможете получить больше руды.
@@ -430,6 +493,9 @@ Yes, unless you're doing something VERY special, a Wooden Log is what you need.
Yes. Frostia is a city-estate, and is ruled by me, King Gelid Frozenheart II.
Да. Фростия - это город-государство, которым управляю я, Король Гелид Ледяное Сердце II.
+Yeye is not paying for your food and is not a sailor like us! You should start standing on your own feet.
+Йейе не платит за вашу еду и не является моряком, как мы! Тебе следует начать стоять на своих ногах.
+
You also gained a @@. Bows are very slow, so you should talk to the Blacksmith to make a Quiver.
Вы также получили @@. Луки очень медленные, поэтому вам следует поговорить с кузнецом, чтобы сделать Колчан.
@@ -451,6 +517,21 @@ You humans are so greedy... Just like me. I have more important things to do, ot
You may even obtain ores which you wouldn't otherwise obtain normally, and the drop rate is fixed.
Вы даже можете получить руду, которую не смогли бы получить обычным способом, причём частота выпадения фиксирована.
+You must be dressed, and talk to our captain first. He'll give you a mission and unlock the ship main door.#0
+Ты должен быть одета и сначала поговори с нашим капитаном. Он даст тебе задание и отопрёт главную дверь корабля.
+
+You must be dressed, and talk to our captain first. He'll give you a mission and unlock the ship main door.#1
+Ты должен быть одет и сначала поговори с нашим капитаном. Он даст тебе задание и отопрёт главную дверь корабля.
+
+You will see, citizens are polite and you can still ask around for help. They can help find a job for you or maybe help you find out what happened to you out at sea!
+Как видишь, горожане вежливы и ты всё ещё можешь обратиться к ним за помощью. Они могут помочь тебе найти работу или узнать, что случилось с тобой в море!
+
+You're on our ship, we made port to a little island and we're actually yeyending our long merchant travelling adventure at the city of Tulimshar.#0
+Ты находишься на нашем корабле, мы причалили к маленькому острову и сейчас мы завершаем наше долгое приключение в городе Тулимшара.
+
+You're on our ship, we made port to a little island and we're actually yeyending our long merchant travelling adventure at the city of Tulimshar.#1
+Ты находишься на нашем корабле, мы причалили к маленькому острову и сейчас мы завершаем наше долгое приключение в городе Тулимшара.
+
You... You killed my father during Nivalis siege! I'll make you pay for that!!
Ты... Ты убил моего отца во время осады Нивалиса! Я заставлю тебя заплатить за это!!
diff --git a/langs/lang_ru.txt b/langs/lang_ru.txt
index e49d25594..d00c127c8 100644
--- a/langs/lang_ru.txt
+++ b/langs/lang_ru.txt
@@ -707,6 +707,9 @@ Copyright (C) 2010-2015 Evol Online
* Acquired @@ @@!
+* Actual effect lasts %d hours.
+
+
* Aid the Blue Sage in getting Peetu back to action
* Помочь Синему Мудрецу вернуть Питу в строй.
@@ -3806,8 +3809,8 @@ All torches are lit! Return to Zarkor.
All warp technology, be it crystal-based, potion-based, or mechanic-based, relies on timespace distortions.
-All you need to do then is walk outside, enter on the biggest house, and talk to the Trainer. He'll teach you everything.
-Все, что тебе нужно сделать, это выйти на улицу, войти в самый большой дом и поговорить с Тренером. Он научит тебя всему.
+All you need to do is walk outside, enter the biggest house, and speak with the Trainer. He'll teach you everything you need to know.
+
Alliance Guard
Стражник Альянса
@@ -4520,9 +4523,6 @@ Anyway, my herb mixture keeps monsters away.
Anyway, once you have the recipe book and learned a recipe, you can craft items in forges. I think you can buy it in your apartment.
В любом случае, как только у вас есть книга рецептов и вы выучили рецепт, вы можете изготавливать предметы в кузницах. Думаю, вы можете купить их в своих апартаментах.
-Anyway, our shipkeeper, Juliet, helped to heal your injuries way back.
-В любом случае, наш корабельщик, Джульетта, помогла залечить твои раны.
-
Anyway, the Moubootaur certainly existed, and probably is still alive.
В любом случае, Мубутавр, безусловно, существовал и, вероятно, жив до сих пор.
@@ -4538,6 +4538,9 @@ Anyway, you can see how skilled using Mana Magic with @@. Mana Magic is the one
Anyway, you have a letter to our %s, you meant? Sure thing, I'll let him know at once.
+Anyway, you should be thanking Juliet, she's the one who patched you up.
+
+
Anyway. This is the FAIRY KINGDOM spell. It'll spawn fairies.
В любом случае. Это заклинание FAIRY KINGDOM. Оно порождает фей.
@@ -6800,6 +6803,9 @@ Can you teach me magic? Pretty please?
Can you teach me some Alchemy Recipe?
Вы можете научить меня какому-нибудь Алхимическому Рецепту?
+Can you tell me where I am?
+
+
Can you, perhaps, do me a favor? Please... Check her house for any signs of battle.
Не могли бы вы, возможно, оказать мне услугу? Пожалуйста... Проверьте её дом на наличие следов битвы.
@@ -7808,12 +7814,6 @@ Could you please give us a full meal, with 5 @@, 5 @@, 5@@, 5 @@ and 5 @@?
Could you sell me a treasure map and a shovel?
Не могли бы вы продать мне карту сокровищ и лопату?
-Could you tell me where I am?#0
-Не могли бы вы сказать, где я нахожусь?
-
-Could you tell me where I am?#1
-Не могли бы вы сказать, где я нахожусь?
-
Could you try again, please?
Не могли бы вы попробовать ещё раз, пожалуйста?
@@ -9002,11 +9002,8 @@ Do you know the warp crystals? We did them. Did you saw the great warp gate at t
Do you know what a Soul Menhir is?
Знаете ли вы, что такое Менгир Души?
-Do you know what happened to the gold I had when you guys saved me?#0
-Вы знаете, что случилось с моим золотом, когда вы меня спасли?
+Do you know what happened to the gold I had on me when I was rescued?
-Do you know what happened to the gold I had when you guys saved me?#1
-Вы знаете, что случилось с моим золотом, когда вы меня спасли?
Do you know where I can find Nard?
Вы не знаете, где я могу найти Нарда?
@@ -9404,6 +9401,12 @@ Donate a Bat Teeth
Donate a Bat Wing
Пожертвовать Крыло Летучей Мыши
+Donate all Bat Teeth
+
+
+Donate all Bat Wings
+
+
Donate to town
@@ -13088,9 +13091,6 @@ Here, all yours. Ah, if I still could walk... I would hunt those annoying squirr
Here, all yours. I can't use them while I am this hurt anyways. Thank you.
-Here, come talk to me, the Magic Arpan! I'll help you get dressed.
-
-
Here, lemme tell you something good: Do you know that fortress island which all the adventurers are talking about nowadays?
@@ -13103,6 +13103,9 @@ Here, please take this to them. Tell them they are welcome here anytime! %%2
Here, sparking new! Nice!!
+Here, speak to me, Magic Arpan! I'll help you get dressed.
+
+
Here, take as much as you need, I have plenty!
Вот, берите, сколько нужно, у меня их полно!
@@ -17660,16 +17663,22 @@ Invalid recipe from Nahrec partly reimbursed.
Invalid season: @@
-Invest in Exportations
+Invest all into boosting town exports
+
+Invest all into boosting town reputation
-Invest in Reputation
+
+Invest into boosting town exports
+
+
+Invest into boosting town reputation
Investing in Exportations
-Investing in Reputation
+Investing into Reputation
Investment executed
@@ -18512,8 +18521,8 @@ Just tell him that I want to reconsider, and that I want the souvenir he offered
Just two coins for spin.
Всего две монеты за раскрутку.
-Just use the arrow key--, err, I mean, just walk to the door on the right. The one which is not guarded by Peter.
-Просто используйте клавиши со стрелками... эээ, я имею в виду, просто идите к двери справа. К той, которую не охраняет Питер.
+Just use the arrow key--, err, I mean, just walk to the door on the right. It's the one not guarded by Peter.
+
Just wait. Fafi dragons are slow to show up...
Подождите. Драконы Фафи потихоньку появляются...
@@ -19754,6 +19763,12 @@ Make me some Iron Powder.
Make sure to put on a bait after you click, though!
Не забудьте надеть наживку после нажатия!
+Make sure you're dressed and then speak with the captain. He'll give you a mission and unlock the ship's main door.#0
+
+
+Make sure you're dressed and then speak with the captain. He'll give you a mission and unlock the ship's main door.#1
+
+
Male
@@ -20831,9 +20846,6 @@ My breath smells bad.
My captain wanted me to give this to you as a special reward for your efforts.
Мой капитан хотел, чтобы я передал это вам в качестве особой награды за ваши усилия.
-My chestplate, @@
-
-
My children and grandchildren have all moved to the Land of Fire, so the amount of leatherwork I can offer you is limited.
Мои дети и внуки переехали на Огненные Земли, поэтому количество изделий из кожи, которые я могу вам предложить, ограничено.
@@ -20870,9 +20882,6 @@ My grandmother gave me a recipe of the @@, it can cure anything but death.
My greatest realization thus far, besides some time rewinding clocks, is the @@!
Моё самое большое открытие на сегодняшний день, помимо времени, потраченного на перемотку часов, это @@!
-My helmet, @@
-Мой шлем, @@
-
My husband and I have moved here under the Alliance orders.
Мы с мужем переехали сюда по приказу Альянса.
@@ -20909,9 +20918,6 @@ My pleasure.
My shaman skills protected us against monsters and thieves!
Мои навыки шамана защищали нас от монстров и воров!
-My shield, @@
-Мой щит, @@
-
My stats are too good, I won't need it.
Мои статы слишком хороши, мне это не понадобится.
@@ -20924,9 +20930,6 @@ My waifu Blossom has me trapped here, and she won't even look at me, because I'm
My warp crystal broke!
-My weapon, @@
-Моё оружие, @@
-
Mylarin Dust
@@ -21413,8 +21416,8 @@ No, I'll let you there to the Yeti's mercy.
No, I'll save my money.
Нет, я поберегу свои деньги.
-No, but what option do I have? I'm railroaded!
-Нет, но разве у меня есть варианты? Я как на железной дороге!
+No, but what option do I have? I'm being railroaded!
+
No, it is a family heirloom. But I do have the shield blueprints. A skilled craftsman could forge one.
@@ -22229,8 +22232,8 @@ Oh noes, who nows can help my wife? Please reconsider!
Oh please. Even if you know a trick or two, you don't have real magic.
О, пожалуйста. Даже если ты знаешь пару трюков, это не значит, что ты владеешь настоящей магией.
-Oh right, I totally forgot about that, here you go.
-Ах да, я совсем забыл об этом, вот, пожалуйста.
+Oh right, I almost forgot, here you go!
+
Oh well, this sucks, but that was only an illusion.
Что ж, это отстой, но это была лишь иллюзия.
@@ -22325,6 +22328,9 @@ Oh, hey, welcome back, @@! Thanks for all your help!
Oh, hey. Welcome to the library, or what's left of it.
О, привет. Добро пожаловать в библиотеку, ну или то, что от неё осталось.
+Oh, how I miss %s from Tulimshar...
+
+
Oh, just an empty staff with black powder inside it. Which explodes. And then kills monsters.
О, просто пустой посох с чёрным порошком внутри. Который взрывается. А потом убивает монстров.
@@ -22529,9 +22535,6 @@ On a computer, you can press @@ to attack it. On mobile, that would be the big b
On a side note, more defense is always good, but the damage won't decrease on the same rate that defense raises.
Кстати, увеличение защиты - это всегда хорошо, но урон не будет снижаться на ту же величину, на которую повышается защита.
-On hindsight, I'll wait you get a few levels. Can't have cheaters, ya know!
-С оглядкой на прошлое, я подожду, пока ты наберёшь несколько уровней. Нельзя допускать читеров, знаешь ли!
-
On mobile, the DPAD is at your left. Do you see the chest to my right?
На мобильном устройстве DPAD находится слева от вас. Вы видите сундук справа от меня?
@@ -22541,6 +22544,9 @@ On mobile, you would click on the @@ icon!
On my way to get what you need.
+On second thought, come see me when you've gained a few levels. We can't have cheaters, ya know?
+
+
On second thought, he really could use a bath.
Если подумать, ему действительно не помешала бы ванна.
@@ -23927,8 +23933,8 @@ Protip: You need an @@ full of water to get a reply from guards.
Protip: You need level %d or higher to do this quest.
-Protip: You skipped tutorial. A lot of tutorial-ish dialogs and quests will be skipped. You can change this anytime on %s > Game Settings.
-Подсказка: Вы пропустили обучение. Многие диалоги и квесты, связанные с обучением, будут пропущены. Вы можете изменить это в любое время в %s > Настройки Игры.
+Protip: You skipped the tutorial. A lot of tutorial related dialog and quests will be skipped. You can change this anytime in %s > Game Settings.
+
Protip: Your current progress will be saved.
Подсказка: Ваш текущий прогресс будет сохранен.
@@ -24593,6 +24599,12 @@ Rent 30 days for 1000 GP
Rent 30 days for 2000 GP
Арендовать на 30 дней за 2000 GP
+Rent 365 days for 10000 GP
+
+
+Rent 365 days for 20000 GP
+
+
Rent 7 days for 300 GP
Арендовать на 7 дней за 300 GP
@@ -26651,8 +26663,8 @@ Sorry kind sir @@, but no.#1
Sorry pal, but only if another miner vouches for you.
Извини, приятель, но только если за тебя поручится другой шахтёр.
-Sorry! I forgot to introduce myself. My name is Arpan, but other sailors call me Magic Arpan because I know one or two yaing magic tricks.
-Простите! Я забыл представиться. Меня зовут Арпан, но другие моряки зовут меня Маг Арпан, потому что я знаю один или два магических фокуса.
+Sorry! Allow me to introduce myself. My name is Arpan, but the other sailors call me Magic Arpan because I know one or two ya-ing magic tricks.
+
Sorry! Sorry!
Извините! Извините!
@@ -27710,6 +27722,9 @@ Thank you for being with us for so long. You gained a %s as a random good-hearte
Thank you for helping me make my tea. I hope the potions have been helpful...
Спасибо, что помогли мне приготовить чай. Надеюсь, зелья были полезны...
+Thank you for the %s, I really appreciate it.
+
+
Thank you for your help.
Спасибо за помощь.
@@ -27887,9 +27902,6 @@ Thanks for the help.
Thanks for the help. Here, take this shirt and some money.
Спасибо за помощь. Вот, возьми эту рубашку и немного денег.
-Thanks for the honestity, I guess.
-Спасибо за откровенность, я подумаю.
-
Thanks for the kindness, but you don't have enough. I need 5!
Спасибо за доброту, но у вас недостаточно. Мне нужно 5!
@@ -27917,6 +27929,9 @@ Thanks for your help!
Thanks for your help, anyway.
В любом случае, спасибо за вашу помощь.
+Thanks for your honesty, I guess.
+
+
Thanks for your patronage! The rewards will be available with @@, in case I do find the paradise!
Спасибо за ваше покровительство! Вознаграждения будут у @@, в случае, если я действительно найду рай!
@@ -29705,9 +29720,6 @@ There doesn't seem to be any physical wound.
There exist more food than you know. But this time I don't want anything extravagant, just 6 @@ should be fine.
Существует больше еды, чем вы думаете. Но в этот раз я не хочу ничего экстравагантного, просто 6 @@ должно быть достаточно.
-There is a NPC called Trainer, just outside this ship.
-Недалеко от этого корабля находится NPC по имени Тренер.
-
There is a chasm.
@@ -29720,6 +29732,9 @@ There is a slight breeze coming from @@.
There is a time limit, which is already running.
Существует лимит времени и время уже идёт.
+There is an NPC called Trainer, just outside the ship.
+
+
There is no EXP penalty, but you cannot go back without either completing the cave, or dying.
@@ -30095,8 +30110,8 @@ They'll also start spawning on whole map, so be careful.
They're back - and they took hold of your majesty - my husband - king Arthur!
Они вернулись - и схватили ваше величество - моего мужа - короля Артура!
-They're not magic, but yayaya, people like to say it is! Yeyeye.
-Они не магические, но йайайа, люди любят говорить, что это так! Йейейе.
+They're not magic, but yayaya, people like to say it is! Yeyeye!
+
They're not too dangerous, but they can take a lot of hits. So, if you kill 10 of them, I'll know you're dedicated in learning which monsters are out there.
Они не слишком опасны, но могут выдержать много урона. Если вы убьёте 10 из них, я буду знать, что вы посвятили себя изучению монстров.
@@ -31874,8 +31889,8 @@ Use its powers for good!
Use the abandoned passage to the north... Usually, no one uses it.
-Use the arrow keys to walk right and meet Juliet.
-Используйте клавиши со стрелками, чтобы идти направо и встретиться с Джульеттой.
+Use the arrow keys to walk over to the right and meet Juliet.
+
Use these coins to exchange for stuff. But beware: Each dungeon difficulty will increase the coin drop in the square value of previous.
Используйте эти монеты для обмена на разные вещи. Но остерегайтесь: Каждая сложность подземелья будет увеличивать выпадение монет в квадрате стоимости предыдущей.
@@ -32252,6 +32267,9 @@ WARNING: Your progress on the quest was lost!
WARNING: if you die again today in a special map it will be PERMANENT.
ВНИМАНИЕ: если вы сегодня снова умрёте на специальной карте, это будет ПЕРМАНЕНТНО.
+WARNING: you can only rent one mount per character. Either tortuga or a mouboo.
+
+
WARPING IN 10 SECONDS
@@ -32660,8 +32678,8 @@ We want to celebrate this moment, but can you believe we ran out of beer?
We want to thank everyone who did this release possible.
Мы хотим поблагодарить всех, кто сделал этот релиз возможным.
-We will be yaying there in a few days, so we will drop you off there.
-Мы будем там через несколько дней, так что мы подбросим тебя туда.
+We will be yeye-ing there in a few days, so we'll part ways there.
+
We will have a party today, but only believers are allowed in!
Сегодня у нас будет вечеринка, но вход разрешён только верующим!
@@ -33542,9 +33560,6 @@ What would you like to bury?
What would you like today?
Что бы вы хотели сегодня?
-What yeye could I do for you today?
-Что я могу сделать для тебя сегодня?
-
What you asked me for, again?
О чем вы меня просили?
@@ -33587,6 +33602,9 @@ What's your opinion of Peetu and his work?
What, only that? Well, this is actually simpler than it looks.
Что, только это? На самом деле всё проще, чем кажется.
+What-yeye could I do for you today?
+
+
What? A party?
Что? Вечеринка?
@@ -34376,7 +34394,7 @@ Yaya, you should go see her! She'll be happy to help you again.#0
Yaya, you should go see her! She'll be happy to help you again.#1
Йайа, вы должны пойти к ней! Она будет рада снова помочь вам.
-Yayaya, @@ is surely slow. Do you remember how to walk? You can use arrow keys for that!
+Yayaya, @@ is surely slow. Don't you remember how to walk? You can use arrow keys for that!
Yayaya, by pressing @@ or clicking in @@, you'll open your char status window!
@@ -34388,6 +34406,9 @@ Yayaya, by pressing @@ or clicking in @@, you'll open your character status wind
Yayaya, good job! You can collect loot by pressing @@.
Йайайа, хорошая работа! Вы можете подбирать лут, нажимая @@.
+Ye not paying for your food and ye isn't a sailor like us! Ye should be standing on your own two feet.
+
+
Yeah sure, take my Amethyst!
Да, конечно, возьми мой аметист!
@@ -34781,9 +34802,6 @@ Yeye can press @@ to sit, which will allow you to heal faster.
Yeye don't need to train here anymore! Let's head back to the ship before the sun sets, shall we?
Йейе, в таком случае нет смысла тут тренироваться! Давайте вернёмся на корабль до захода солнца, хорошо?
-Yeye is not paying for your food and is not a sailor like us! You should start standing on your own feet.
-Йейе не платит за вашу еду и не является моряком, как мы! Тебе следует начать стоять на своих ногах.
-
Yeye, are you finally ready to go?#0
Йейе, вы наконец-то готовы?
@@ -36056,12 +36074,6 @@ You must %s and chant %s to begin channeling.
You must be close to it, and stealing won't change drops! If you fail, just try again! Good luck!
-You must be dressed, and talk to our captain first. He'll give you a mission and unlock the ship main door.#0
-Ты должен быть одета и сначала поговори с нашим капитаном. Он даст тебе задание и отопрёт главную дверь корабля.
-
-You must be dressed, and talk to our captain first. He'll give you a mission and unlock the ship main door.#1
-Ты должен быть одет и сначала поговори с нашим капитаном. Он даст тебе задание и отопрёт главную дверь корабля.
-
You must be fast! The guards are also affected.
@@ -36182,6 +36194,9 @@ You need to finish at least %d/%d tasks.
You need to have an @@ equipped.
+You need to have level %d or above.
+
+
You need to kill all the %d monsters to complete a bounty.
@@ -36689,8 +36704,8 @@ You will need a certain amount of them to upgrade any skill, which will be spent
You will need to *hic* prove yourself to *hic* me and the town first...
Сначала тебе нужно *ик* проявить себя *ик* передо мной и городом...
-You will see, citizens are polite and you can still ask around for help. They can help find a job for you or maybe help you find out what happened to you out at sea!
-Как видишь, горожане вежливы и ты всё ещё можешь обратиться к ним за помощью. Они могут помочь тебе найти работу или узнать, что случилось с тобой в море!
+You will notice the citizens are polite and they might help you find a job or help you figure out what happened to you out at sea.
+
You win!
Вы победили!
@@ -36761,6 +36776,12 @@ You'll soon run out of stuff to do around here, so yeah, you should extend your
You'll want your fishing rod to be flexible but solid.
Вы хотите, чтобы ваше удилище было гибким, но прочным.
+You're aboard our ship. We made port to a little island and we're actually yeye-ending our long merchant travelling adventure at the city of Tulimshar.#0
+
+
+You're aboard our ship. We made port to a little island and we're actually yeye-ending our long merchant travelling adventure at the city of Tulimshar.#1
+
+
You're about to concede an academic title to "@@".
@@ -36812,12 +36833,6 @@ You're not welcome here. Get moving.
You're on a ship, we're on our way to the oldest human city, Tulishmar.
Вы на корабле, мы на пути к самому древнему городу людей - Тулишмару.
-You're on our ship, we made port to a little island and we're actually yeyending our long merchant travelling adventure at the city of Tulimshar.#0
-Ты находишься на нашем корабле, мы причалили к маленькому острову и сейчас мы завершаем наше долгое приключение в городе Тулимшара.
-
-You're on our ship, we made port to a little island and we're actually yeyending our long merchant travelling adventure at the city of Tulimshar.#1
-Ты находишься на нашем корабле, мы причалили к маленькому острову и сейчас мы завершаем наше долгое приключение в городе Тулимшара.
-
You're playing with fire. Or ice. Or whatever.
Вы играете с огнём. Или льдом. Или с чем-то ещё
diff --git a/maps/re/003-0-3.mcache b/maps/re/003-0-3.mcache
new file mode 100644
index 000000000..f4b09cb84
--- /dev/null
+++ b/maps/re/003-0-3.mcache
Binary files differ
diff --git a/npc/001-10-1/scripts.txt b/npc/001-10-1/scripts.txt
index 080cae7c9..c23ba30af 100644
--- a/npc/001-10-1/scripts.txt
+++ b/npc/001-10-1/scripts.txt
@@ -46,6 +46,8 @@ OnReward2:
setq2 LoFQuest_COD, getq2(LoFQuest_COD) + 1;
getitem BottledDust, 1;
}
+ if ($EVENT$ == "Rebirth")
+ getitem BottledDust, rand2(1,2);
warp "018-2-1", 24, 29;
specialeffect(FX_FANFARE, SELF, getcharid(3));
end;
diff --git a/npc/001-10/scripts.txt b/npc/001-10/scripts.txt
index 305b29887..143f6b837 100644
--- a/npc/001-10/scripts.txt
+++ b/npc/001-10/scripts.txt
@@ -73,7 +73,7 @@ OnTouch:
// Death handlers
OnWLDeath:
if (playerattached()) {
- if (rand2(0,1000) <= 20)
+ if (rand2(0,1000) <= (.chance/2))
getitem BottledDust, 1;
}
spawner("#CODMASTER::OnWLDeath", 0, 0, 200, 150, 1, 1);
@@ -81,7 +81,7 @@ OnWLDeath:
OnNDeath:
if (playerattached()) {
- if (rand2(0,1000) <= 40)
+ if (rand2(0,1000) <= .chance)
getitem BottledDust, 1;
}
spawner("#CODMASTER::OnNDeath", 0, 10, 200, 25);
@@ -89,7 +89,7 @@ OnNDeath:
OnSDeath:
if (playerattached()) {
- if (rand2(0,1000) <= 40)
+ if (rand2(0,1000) <= .chance)
getitem BottledDust, 1;
}
spawner("#CODMASTER::OnSDeath", 0, 129, 200, 150);
@@ -97,7 +97,7 @@ OnSDeath:
OnCDeath:
if (playerattached()) {
- if (rand2(0,1000) <= 40)
+ if (rand2(0,1000) <= .chance)
getitem BottledDust, 1;
}
spawner("#CODMASTER::OnCDeath", 73, 45, 132, 86);
@@ -105,7 +105,7 @@ OnCDeath:
OnWDeath:
if (playerattached()) {
- if (rand2(0,1000) <= 40)
+ if (rand2(0,1000) <= .chance)
getitem BottledDust, 1;
}
spawner("#CODMASTER::OnWDeath", 10, 25, 72, 122);
@@ -113,7 +113,7 @@ OnWDeath:
OnEDeath:
if (playerattached()) {
- if (rand2(0,1000) <= 40)
+ if (rand2(0,1000) <= .chance)
getitem BottledDust, 1;
}
spawner("#CODMASTER::OnEDeath", 160, 45, 190, 130);
@@ -121,7 +121,7 @@ OnEDeath:
OnDeath:
if (playerattached()) {
- if (rand2(0,1000) <= 40)
+ if (rand2(0,1000) <= .chance)
getitem BottledDust, 1;
}
spawner("#CODMASTER::OnDeath");
@@ -142,6 +142,11 @@ OnInit:
spawner("#CODMASTER::OnWDeath", 10, 25, 72, 122, 5);
spawner("#CODMASTER::OnEDeath", 160, 45, 190, 130, 4);
+OnClock0059:
+ if ($EVENT$ == "Rebirth")
+ .chance=60;
+ else
+ .chance=40;
end;
}
diff --git a/npc/003-0-2/_warps.txt b/npc/003-0-2/_warps.txt
index 01d46e731..190bb35f6 100644
--- a/npc/003-0-2/_warps.txt
+++ b/npc/003-0-2/_warps.txt
@@ -1,3 +1,5 @@
// This file is generated automatically. All manually added changes will be removed when running the Converter.
// Map 003-0-2: The Magic Guild Council Room warps
003-0-2,35,43,0 warp #003-0-2_35_43 3,0,003-0-1,48,24
+003-0-2,25,52,0 warp #003-0-2_25_52 2,0,003-0-3,25,51
+003-0-2,44,52,0 warp #003-0-2_44_52 2,0,003-0-3,44,51
diff --git a/npc/003-0-2/misc.txt b/npc/003-0-2/misc.txt
index e4c2f358b..c2f103d0d 100644
--- a/npc/003-0-2/misc.txt
+++ b/npc/003-0-2/misc.txt
@@ -14,3 +14,40 @@ OnInit:
end;
}
+// 003-0-3 witness list
+// #003-0-3_34_37 (Public)
+// #003-0-3_34_23 (Private)
+003-0-3,34,32,0 script Sagratha#Witness NPC_SAGRATHA,{
+ end;
+OnInit:
+ .sex = G_FEMALE; .distance = 1; disablenpc .name$;
+ end;
+}
+
+003-0-3,35,32,0 script Hasan#Witness NPC_ELVEN_MAN_RED,{
+ end;
+OnInit:
+ .sex = G_FEMALE; .distance = 1; disablenpc .name$;
+ end;
+}
+
+003-0-3,34,32,0 script Elli#Witness NPC_ELLI,{
+ end;
+OnInit:
+ .sex = G_FEMALE; .distance = 1; disablenpc .name$;
+ end;
+}
+
+003-0-3,36,34,0 script A Mirror Lake NPC_MANATREE,0,0,{
+OnTouch:
+ if (!getvaultid()) { dispbottom l("WTF is this devilry?! Just... How?!"); end; }
+ mesc l("Do you want to move the ##BThe Crossroads##b?"), 1;
+ if (askyesno() == ASK_NO) close;
+ closeclientdialog;
+ MirrorLakeSendTo(MLP_CR, 0);
+ end;
+OnInit:
+ .sex = G_OTHER; .distance = 2; disablenpc .name$;
+ end;
+}
+
diff --git a/npc/003-0-3/_config.txt b/npc/003-0-3/_config.txt
new file mode 100644
index 000000000..b3f77f08f
--- /dev/null
+++ b/npc/003-0-3/_config.txt
@@ -0,0 +1,20 @@
+// This file is generated automatically. All manually added changes will be removed when running the Converter.
+// Map 003-0-3: Superior Courtroom conf
+
+003-0-3,34,37,0 script #003-0-3_34_37 NPC_HIDDEN,{
+ end;
+OnDisable:
+OnInit:
+ delcells "003-0-3_34_37"; end;
+OnEnable:
+ setcells "003-0-3", 34, 37, 34, 37, 1, "003-0-3_34_37";
+}
+
+003-0-3,34,23,0 script #003-0-3_34_23 NPC_HIDDEN,{
+ end;
+OnDisable:
+OnInit:
+ delcells "003-0-3_34_23"; end;
+OnEnable:
+ setcells "003-0-3", 34, 23, 35, 23, 1, "003-0-3_34_23";
+}
diff --git a/npc/003-0-3/_import.txt b/npc/003-0-3/_import.txt
new file mode 100644
index 000000000..e00d1d283
--- /dev/null
+++ b/npc/003-0-3/_import.txt
@@ -0,0 +1,4 @@
+// Map 003-0-3: Superior Courtroom
+// This file is generated automatically. All manually added changes will be removed when running the Converter.
+"npc/003-0-3/_config.txt",
+"npc/003-0-3/_warps.txt",
diff --git a/npc/003-0-3/_warps.txt b/npc/003-0-3/_warps.txt
new file mode 100644
index 000000000..dce0d4fd8
--- /dev/null
+++ b/npc/003-0-3/_warps.txt
@@ -0,0 +1,4 @@
+// This file is generated automatically. All manually added changes will be removed when running the Converter.
+// Map 003-0-3: Superior Courtroom warps
+003-0-3,25,52,0 warp #003-0-3_25_52 2,0,003-0-2,25,51
+003-0-3,44,52,0 warp #003-0-3_44_52 2,0,003-0-2,44,51
diff --git a/npc/003-2-1/demure.txt b/npc/003-2-1/demure.txt
index 357577db1..ea5752ffa 100644
--- a/npc/003-2-1/demure.txt
+++ b/npc/003-2-1/demure.txt
@@ -7,15 +7,22 @@
RegEasterEgg(EE_DEMURE, 5);
+ if (countitem(ComplaintForm) > 100) {
+ delitem ComplaintForm, 100;
+ Zeny+=100*getiteminfo(ComplaintForm, ITEMINFO_SELLPRICE);
+ dispbottom l("Due to a bug, all your complaint forms became money!");
+ RegEasterEgg(EE_COMPLAINT, 15);
+ }
+
// Let's try without freeloop
mesn any("NotSoBot", "Demure");
- if (rand(1,5) <= 2)
+ if (rand2(1,5) <= 2)
mes "Blame Saulc";
- .@mx=rand(6,12);
+ .@mx=rand2(6,12);
for (.@i = 0; .@i < .@mx; ++.@i) {
mes "leave Complaints";
- if (rand(1,5) == 3)
+ if (rand2(1,5) == 3)
mes "";
if (.@i == 10) {
next;
@@ -23,18 +30,20 @@
mes any("leave Complaints", "Blame Saulc");
}
}
- if (rand(1,5) >= 4)
+ if (rand2(1,5) >= 4)
mes "Blame Saulc";
close;
OnHydra:
- areamonster "003-2-1", 20, 20, 65, 60, strmobinfo(1, GreenDragon), GreenDragon, any(1,1,2), "NotSoBot::OnHydra2";
+ areamonster "003-2-1", 20, 20, 65, 60, strmobinfo(1, ComplaintDragon), ComplaintDragon, any(1,1,2), "NotSoBot::OnHydra2";
setq Q_DragonFarm, getq(Q_DragonFarm)+1;
+ fix_mobkill(ComplaintDragon);
if (getq(Q_DragonFarm) > 100) goto L_Kick;
end;
OnHydra2:
setq Q_DragonFarm, getq(Q_DragonFarm)+1;
+ fix_mobkill(ComplaintDragon);
if (getq(Q_DragonFarm) > 100) goto L_Kick;
end;
diff --git a/npc/003-3/malindou.txt b/npc/003-3/malindou.txt
index ba7673723..9b2c34fc1 100644
--- a/npc/003-3/malindou.txt
+++ b/npc/003-3/malindou.txt
@@ -57,18 +57,19 @@ OnInit:
$CANDOR_TAX=1000;
$CANDOR_EXPORT=0;
$CANDOR_REPUTATION=100;
- $BCONFN_SPAWN = 70;
- $BCONFD_SPAWN = 100;
- $BCONFN_MOBHP = 100;
- $BCONFD_MOBHP = 90;
- $BCONFB_EXPR = 100;
- $BCONFN_EXPR = 5;
- $BCONFD_EXPR = 0;
- $BCONFB_DROP = 100;
- $BCONFN_DROP = 7;
- $BCONFD_DROP = 0;
+ $BCONFN_SPAWN = 70;
+ $BCONFD_SPAWN = 100;
+ $BCONFN_MOBHP = 100;
+ $BCONFD_MOBHP = 90;
+ $BCONFB_EXPR = 100;
+ $BCONFN_EXPR = 5;
+ $BCONFD_EXPR = 0;
+ $BCONFB_DROP = 100;
+ $BCONFN_DROP = 7;
+ $BCONFD_DROP = 0;
$BETASERVER = false;
$AUTORESTART = false;
+ $REFERRAL_ENABLED = false;
$ALLIANCE_TAX1 = 7500;
$ALLIANCE_TAX2 = 60;
$FIRESOFSTEAM[1] = 2000;
@@ -542,16 +543,16 @@ OnInit:
DelItemFromEveryPlayer(SilverEasteregg);
query_sql("UPDATE `quest` SET `count1` = '2' WHERE `quest`.`quest_id`="+General_Narrator+" AND `count1` = '3'");
query_sql("UPDATE `quest` SET `count2` = '0' WHERE `quest`.`quest_id`="+General_Narrator+" AND `count1` = '2'");
- $BCONFN_SPAWN = 70;
- $BCONFD_SPAWN = 100;
- $BCONFN_MOBHP = 95;
- $BCONFD_MOBHP = 85;
- $BCONFB_EXPR = 100;
- $BCONFN_EXPR = 5;
- $BCONFD_EXPR = 0;
- $BCONFB_DROP = 100;
- $BCONFN_DROP = 7;
- $BCONFD_DROP = 0;
+ $BCONFN_SPAWN = 70;
+ $BCONFD_SPAWN = 100;
+ $BCONFN_MOBHP = 95;
+ $BCONFD_MOBHP = 85;
+ $BCONFB_EXPR = 100;
+ $BCONFN_EXPR = 5;
+ $BCONFD_EXPR = 0;
+ $BCONFB_DROP = 100;
+ $BCONFN_DROP = 7;
+ $BCONFD_DROP = 0;
debugmes "";
debugmes "* Bull Helmet Fix";
debugmes "* Remove Silver Easter Eggs";
diff --git a/npc/005-1/zegas.txt b/npc/005-1/zegas.txt
index a7cbdb3bd..8eaf9701d 100644
--- a/npc/005-1/zegas.txt
+++ b/npc/005-1/zegas.txt
@@ -80,7 +80,7 @@ L_Thanks:
if (!getq(CandorQuest_Chest)) {
next;
mesn;
- mesq l("Do you see that fancy house over there? My husband, %%s, used to live there.", b(l("Saxso")));
+ mesq l("Do you see that fancy house over there? My husband, %s, used to live there.", b(l("Saxso")));
next;
mesn;
mesq l("Strangely enough, when he died, he became a ghost. This shouldn't happen, but yet...");
diff --git a/npc/005-2/saxsochest.txt b/npc/005-2/saxsochest.txt
index 591372e4f..cc2a24291 100644
--- a/npc/005-2/saxsochest.txt
+++ b/npc/005-2/saxsochest.txt
@@ -7,8 +7,7 @@
005-2,44,41,0 script Saxso Chest NPC_NO_SPRITE,{
function quest_completed {
- speech S_FIRST_BLANK_LINE | S_LAST_NEXT,
- l("you already opened the chest.");
+ TreasureBox(100, .key); // 1.0% bonus over common chests
close;
}
diff --git a/npc/017-1/fairy_collector.txt b/npc/017-1/fairy_collector.txt
index a8ab6af18..14e4b8068 100644
--- a/npc/017-1/fairy_collector.txt
+++ b/npc/017-1/fairy_collector.txt
@@ -67,6 +67,7 @@ L_Main:
*/
do {
+ deletearray .@items;
mesn;
mesq l("Are you trying to collect every piece of equipment ingame? Come tell me if you are and I'll give you a collector stamp!");
mesc l("Not every piece of equipment is ingame yet.");
@@ -82,7 +83,7 @@ L_Main:
rif(false && !(#COLLECTOR & COLLECT_ACESSORIES), l("Accessories")),
rif(false && !(#COLLECTOR & COLLECT_SCARFS), l("Scarfs")),
rif(false && !(#COLLECTOR & COLLECT_GLOVES), l("Gloves")),
- rif(false && !(#COLLECTOR & COLLECT_SHIELDS), l("Shields")),
+ rif(true && !(#COLLECTOR & COLLECT_SHIELDS), l("Shields")),
rif(false && !(#COLLECTOR & COLLECT_1HSWORDS), l("1 Hand Swords")),
rif(false && !(#COLLECTOR & COLLECT_2HSWORDS), l("2 Hand Swords")),
rif(true && !(#COLLECTOR & COLLECT_BOWS), l("Bows")),
@@ -94,73 +95,138 @@ L_Main:
l("Trade stamps");
mes "";
switch (@menu+1) {
- // Chestplate
+ /////////////////////////////////////////////////////////////////////////
+ // Chestplate (2x bells)
case 1:
- msObjective(countitem(CreasedShirt), "* "+getitemlink(CreasedShirt));
+ // FIXME: several unreleased
+ setarray .@items, CreasedShirt, YetiTankTop, MoonshroomRobe, GoldenChainmail, LazuriteRobe, CandorShirt, ArtisTankTop, ShortTankTop, TneckSweater, ValentineDress, CottonShirt, SilkRobe, LeatherShirt, SailorShirt, MinerTankTop, LieutenantArmor, CrusadeArmor, VneckSweater, DesertShirt, UglyChristmasSweater, Chainmail, VneckJumper, ForestArmor, Bathrobe, CopperArmor, SorcererRobe, LightPlatemail, GoldenLightPlatemail, WarlordPlate, BromenalChest, GoldenWarlordPlate, GraduationRobe, TerraniteArmor, RedknightArmor, AssassinChest, SaviorArmor;
+ .@power = 0;
+ .@total = getarraysize(.@items);
+ freeloop(true);
+ for (.@i=0; .@i < .@total; .@i++) {
+ msObjective(countitem(.@items[.@i]), "* "+getitemlink(.@items[.@i]));
+ if (countitem(.@items[.@i]))
+ .@power += 1;
+ }
+ freeloop(false);
next;
+ if (.@power == .@total) {
+ //#COLLECTOR = #COLLECTOR|COLLECT_CHESTPLATE;
+ //getitembound SilverBell, 1, 1;
+ mesc l("CONGRATULATIONS! You have obtained the %s.", getitemlink(SilverBell)), 3;
+ }
break;
+ next;
+ break;
+ /////////////////////////////////////////////////////////////////////////
// Headgear (2x bells)
case 2:
msObjective(countitem(CreasedShirt), "* "+getitemlink(CreasedShirt));
next;
break;
+ /////////////////////////////////////////////////////////////////////////
// Pants
case 3:
msObjective(countitem(CreasedShirt), "* "+getitemlink(CreasedShirt));
next;
break;
+ /////////////////////////////////////////////////////////////////////////
// Shoes
case 4:
msObjective(countitem(CreasedShirt), "* "+getitemlink(CreasedShirt));
next;
break;
+ /////////////////////////////////////////////////////////////////////////
// Necklaces
case 5:
msObjective(countitem(CreasedShirt), "* "+getitemlink(CreasedShirt));
next;
break;
+ /////////////////////////////////////////////////////////////////////////
// Rings
case 6:
msObjective(countitem(CreasedShirt), "* "+getitemlink(CreasedShirt));
next;
break;
+ /////////////////////////////////////////////////////////////////////////
// Accessories
case 7:
msObjective(countitem(CreasedShirt), "* "+getitemlink(CreasedShirt));
next;
break;
+ /////////////////////////////////////////////////////////////////////////
// Scarfs
case 8:
msObjective(countitem(CreasedShirt), "* "+getitemlink(CreasedShirt));
next;
break;
+ /////////////////////////////////////////////////////////////////////////
// Gloves
case 9:
msObjective(countitem(CreasedShirt), "* "+getitemlink(CreasedShirt));
next;
break;
+ /////////////////////////////////////////////////////////////////////////
// Shields
case 10:
- msObjective(countitem(CreasedShirt), "* "+getitemlink(CreasedShirt));
+ setarray .@items, EnchantedHerbBag, Barrel, RoundLeatherShirt, LeatherShield, WoodenShield, BladeShield, BraknarShield, BritShield, BromenalShield, AncientShield, BlueKnightShield, SteelShield, DragonShield, SaviorShield;
+ .@power = 0;
+ .@total = getarraysize(.@items);
+ freeloop(true);
+ for (.@i=0; .@i < .@total; .@i++) {
+ msObjective(countitem(.@items[.@i]), "* "+getitemlink(.@items[.@i]));
+ if (countitem(.@items[.@i]))
+ .@power += 1;
+ }
+ freeloop(false);
+ // Shield only: Intervene a Boia
+ .@total += 1;
+ .@shield = min(1, (countitem(KidBola)+
+ countitem(CandorBola)+
+ countitem(PurpleBola)+
+ countitem(TulimsharBola)+
+ countitem(SnakeBola)+
+ countitem(PiouBola)+
+ countitem(MasterBola)));
+ .@power += .@shield;
+ msObjective(.@shield, "* "+l("A [@@2717|Buoy@@] of any type"));
+ // End Shield only code
+ next;
+ if (.@power == .@total) {
+ #COLLECTOR = #COLLECTOR|COLLECT_SHIELDS;
+ getitembound SilverBell, 1, 1;
+ mesc l("CONGRATULATIONS! You have obtained the %s.", getitemlink(SilverBell)), 3;
+ }
next;
break;
+ /////////////////////////////////////////////////////////////////////////
// 1H Swords
case 11:
- msObjective(countitem(CreasedShirt), "* "+getitemlink(CreasedShirt));
+ msObjective(countitem(DarkPulsar), "* "+getitemlink(DarkPulsar));
next;
break;
+ /////////////////////////////////////////////////////////////////////////
// 2H Swords
case 12:
- msObjective(countitem(Scythe), "* "+getitemlink(Scythe));
- msObjective(countitem(ThunderStaff), "* "+getitemlink(ThunderStaff));
- msObjective(countitem(MiereCleaver), "* "+getitemlink(MiereCleaver));
- msObjective(countitem(Broadsword), "* "+getitemlink(Broadsword));
- msObjective(countitem(Kanabo), "* "+getitemlink(Kanabo));
- msObjective(countitem(BlacksmithAxe), "* "+getitemlink(BlacksmithAxe));
- msObjective(countitem(CentaurSpear), "* "+getitemlink(CentaurSpear));
- msObjective(false, l("* More equipment coming soon..."));
+ // FIXME: Zambacutou unreleased
+ setarray .@items, Pickaxe, ThunderStaff, Scythe, MiereCleaver, Broadsword, Kanabo, BlacksmithAxe, PowerfulLightsaber, CentaurSpear, Zambacutou, CursedScythe, Halberd;
+ .@power = 0;
+ .@total = getarraysize(.@items);
+ freeloop(true);
+ for (.@i=0; .@i < .@total; .@i++) {
+ msObjective(countitem(.@items[.@i]), "* "+getitemlink(.@items[.@i]));
+ if (countitem(.@items[.@i]))
+ .@power += 1;
+ }
+ freeloop(false);
next;
+ if (.@power == .@total) {
+ //#COLLECTOR = #COLLECTOR|COLLECT_2HSWORDS;
+ //getitembound SilverBell, 1, 1;
+ mesc l("CONGRATULATIONS! You have obtained the %s.", getitemlink(SilverBell)), 3;
+ }
break;
+ /////////////////////////////////////////////////////////////////////////
// Bows
case 13:
msObjective(countitem(TrainingBow), "* "+getitemlink(TrainingBow));
@@ -181,6 +247,7 @@ L_Main:
mesc l("CONGRATULATIONS! You have obtained the %s.", getitemlink(SilverBell)), 3;
}
break;
+ /////////////////////////////////////////////////////////////////////////
// Firearms
case 14:
msObjective(countitem(PynRifle), "* "+getitemlink(PynRifle));
@@ -200,6 +267,7 @@ L_Main:
next;
}
break;
+ /////////////////////////////////////////////////////////////////////////
// Wands
case 15:
msObjective(countitem(TrainingWand), "* "+getitemlink(TrainingWand));
@@ -221,6 +289,7 @@ L_Main:
next;
}
break;
+ /////////////////////////////////////////////////////////////////////////
// Quivers
case 16:
msObjective(countitem(LeatherQuiver), "* "+getitemlink(LeatherQuiver));
@@ -238,6 +307,7 @@ L_Main:
next;
}
break;
+ /////////////////////////////////////////////////////////////////////////
// Mounts
case 17:
msObjective(countitem(LegendaryTortuga), "* "+getitemlink(LegendaryTortuga));
@@ -251,11 +321,13 @@ L_Main:
next;
}
break;
+ /////////////////////////////////////////////////////////////////////////
// Pets (2x bells)
case 18:
msObjective(countitem(CreasedShirt), "* "+getitemlink(CreasedShirt));
next;
break;
+ /////////////////////////////////////////////////////////////////////////
case 19:
openshop;
closeclientdialog;
@@ -272,16 +344,17 @@ OnInit:
// Sell: Aethyr Points, Strange Coins, Manapple, Supreme Gift, Housing Letter 3, Blueprints E, SaviorBlueprint, BoxsetEE, Tux/Linarian Soul, SunnyCrystal?, X Cards,
// Pets → Strange Coin
- // You can get up to 18 stamps, but pets and hats give 2x
- // Plan wisely and accordingly
+ // You can get up to 18 stamps, but pets, hats and armor give 2x
+ // Plan wisely and accordingly (21 stamps total)
+ // As of 2023-08-01, a total of 5 stamps were available
sellitem SunnyCrystal, 12;
- sellitem LegendaryMouboo, 11;
- sellitem LegendaryTortuga, 10;
- sellitem SupremeGift, 9;
- sellitem PrismGift, 8;
+ sellitem LegendaryMouboo, 8;
+ sellitem SupremeGift, 7;
sellitem MysteriousFruit, 7;
+ sellitem LegendaryTortuga, 6;
sellitem LinarianSoul, 6;
- sellitem SaviorBlueprint, 5;
+ sellitem PrismGift, 5;
+ sellitem SaviorBlueprint, 4;
sellitem TuxSoul, 4;
sellitem GoldenGift, 3;
sellitem MercBoxEE, 2;
diff --git a/npc/018-2-1/dustman.txt b/npc/018-2-1/dustman.txt
index 905e791b4..5def19831 100644
--- a/npc/018-2-1/dustman.txt
+++ b/npc/018-2-1/dustman.txt
@@ -205,8 +205,12 @@ OnInit:
// CoD Exchange Booth Selection
sellitem Dustynator,3000;
- sellitem ArcmageBoxset,880;
- sellitem BronzeGift,100;
+ sellitem MercBoxD,1500;
+ sellitem MercBoxC,750;
+ sellitem ArcmageBoxset,500;
+ sellitem MercBoxB,350;
+ sellitem BronzeGift,200;
+ sellitem MercBoxA,100;
sellitem HeroCoin,1;
end;
diff --git a/npc/_import.txt b/npc/_import.txt
index 1d7d82c9f..99ba6d59e 100644
--- a/npc/_import.txt
+++ b/npc/_import.txt
@@ -30,6 +30,7 @@
@include "npc/002-5/_import.txt"
@include "npc/003-0-1/_import.txt"
@include "npc/003-0-2/_import.txt"
+@include "npc/003-0-3/_import.txt"
@include "npc/003-0/_import.txt"
@include "npc/003-1-1/_import.txt"
@include "npc/003-1-2/_import.txt"
diff --git a/npc/commands/discord.txt b/npc/commands/discord.txt
index 8ceb09e3f..dbde232bd 100644
--- a/npc/commands/discord.txt
+++ b/npc/commands/discord.txt
@@ -137,6 +137,7 @@ OnCall:
DISCTRL=gettimeparam(GETTIME_DAYOFMONTH)+1;
}
.@discord$="";
+ .@link=false;
// Update Cache
htput(.discmem, str(getcharid(3)), "");
// TODO: Remove Adventurer role?
diff --git a/npc/commands/grantpower.txt b/npc/commands/grantpower.txt
index fa367992b..406d1a111 100644
--- a/npc/commands/grantpower.txt
+++ b/npc/commands/grantpower.txt
@@ -79,7 +79,7 @@ OnInit:
// Legendary Controls: Interact over legendary holders and determine their status
function legendaryAPIWarning {
.@aid=getarg(0);
- .@nb = query_sql("SELECT email FROM `login` WHERE `account_id` == "+.@aid+" LIMIT 1", .@email$);
+ .@nb = query_sql("SELECT email FROM `login` WHERE `account_id` = '"+.@aid+"' LIMIT 1", .@email$);
.@msg$=sprintf("[\"%s\", \"Good evening!\nYou have been inactive for a week on Moubootaur Legends.\n\nYou are currently possessing a Legendary Weapon.\nIf you do not login within seven days, your legendary weapon will be returned so the player community can obtain it again.\n\nYour TMW2 Team\", \"Legendary item expiration notice\"]", .@email$);
debugmes .@msg$;
consoleinfo("%d notified for Legendary weapon inactivity. (L:2)", .@aid);
@@ -94,87 +94,106 @@ function legendaryRodexWarning {
return;
}
+function legendaryTimeCheck {
+ .@min = getarg(1)-86400;
+ .@max = getarg(1)+86400;
+ // getarg(0) is last_login, and getarg(1) the tolerance
+ // if last_login < tolerance (older), then ban
+ // But we don't want this to repeat.
+ // Tolerance: day 10 -> min = 10-1=9; max=10+1=11
+ // Day 8: (8 < 11? yes; 8 > 9? no)
+ // Day 9: (9 < 11? yes; 9 > 9? no)
+ // Day 10: (10 < 11? yes; 10 > 9? yes) -> Message sent
+ // Day 11: (11 < 11? no; 11 > 9? yes)
+ // Day 12: (12 < 11? no; 12 > 9? yes)
+ if (getarg(0) < .@max && getarg(0) > .@min)
+ return true;
+ else
+ return false;
+}
+
OnClock0238:
.@date=gettimetick(2);
.@warn=.@date-(86400*2);
.@kick=.@date-(86400*7);
.@kban=.@date-(86400*15);
+
//////////////////////////////////////////
if ($LIGHT_HOLDER$ != "") {
- .@nb = query_sql("SELECT last_login, char_id, account_id FROM `char` WHERE `name` == "+$LIGHT_HOLDER$+" LIMIT 1", .@login, .@cid, .@aid);
+ .@nb = query_sql("SELECT last_login, char_id, account_id FROM `char` WHERE `name` = '"+$LIGHT_HOLDER$+"' LIMIT 1", .@login, .@cid, .@aid);
if (.@login < .@kban) {
// Destroy the item by force
DelItemFromEveryPlayer(Lightbringer);
$LIGHT_HOLDER$="";
kamibroadcast("The Lightbringer has given up on its previous owner and is now available for someone worthier.");
- } else if (.@login < .@kick) {
+ } else if (legendaryTimeCheck(.@login, .@kick)) {
// Send warning via API
legendaryAPIWarning(.@aid);
- } else if (.@login < .@warn) {
+ } else if (legendaryTimeCheck(.@login, .@warn)) {
// Send warning ingame
legendaryRodexWarning(.@cid);
}
}
//////////////////////////////////////////
if ($DEMUR_HOLDER$ != "") {
- .@nb = query_sql("SELECT last_login, char_id, account_id FROM `char` WHERE `name` == "+$DEMUR_HOLDER$+" LIMIT 1", .@login, .@cid, .@aid);
+ .@nb = query_sql("SELECT last_login, char_id, account_id FROM `char` WHERE `name` = '"+$DEMUR_HOLDER$+"' LIMIT 1", .@login, .@cid, .@aid);
if (.@login < .@kban) {
// Destroy the item by force
DelItemFromEveryPlayer(DemureAxe);
$DEMUR_HOLDER$="";
kamibroadcast("The Demure Axe has given up on its previous owner and is now available for someone worthier.");
- } else if (.@login < .@kick) {
+ } else if (legendaryTimeCheck(.@login, .@kick)) {
// Send warning via API
legendaryAPIWarning(.@aid);
- } else if (.@login < .@warn) {
+ } else if (legendaryTimeCheck(.@login, .@warn)) {
// Send warning ingame
legendaryRodexWarning(.@cid);
}
}
//////////////////////////////////////////
if ($TYRAN_HOLDER$ != "") {
- .@nb = query_sql("SELECT last_login, char_id, account_id FROM `char` WHERE `name` == "+$TYRAN_HOLDER$+" LIMIT 1", .@login, .@cid, .@aid);
+ .@nb = query_sql("SELECT last_login, char_id, account_id FROM `char` WHERE `name` = '"+$TYRAN_HOLDER$+"' LIMIT 1", .@login, .@cid, .@aid);
if (.@login < .@kban) {
// Destroy the item by force
DelItemFromEveryPlayer(Tyranny);
$TYRAN_HOLDER$="";
kamibroadcast("The Tyranny has given up on its previous owner and is now available for someone worthier.");
- } else if (.@login < .@kick) {
+ } else if (legendaryTimeCheck(.@login, .@kick)) {
// Send warning via API
legendaryAPIWarning(.@aid);
- } else if (.@login < .@warn) {
+ } else if (legendaryTimeCheck(.@login, .@warn)) {
// Send warning ingame
legendaryRodexWarning(.@cid);
}
}
//////////////////////////////////////////
if ($RUNES_HOLDER$ != "") {
- .@nb = query_sql("SELECT last_login, char_id, account_id FROM `char` WHERE `name` == "+$RUNES_HOLDER$+" LIMIT 1", .@login, .@cid, .@aid);
+ .@nb = query_sql("SELECT last_login, char_id, account_id FROM `char` WHERE `name` = '"+$RUNES_HOLDER$+"' LIMIT 1", .@login, .@cid, .@aid);
if (.@login < .@kban) {
// Destroy the item by force
DelItemFromEveryPlayer(Runestaff);
$RUNES_HOLDER$="";
kamibroadcast("The Runestaff has given up on its previous owner and is now available for someone worthier.");
- } else if (.@login < .@kick) {
+ } else if (legendaryTimeCheck(.@login, .@kick)) {
// Send warning via API
legendaryAPIWarning(.@aid);
- } else if (.@login < .@warn) {
+ } else if (legendaryTimeCheck(.@login, .@warn)) {
// Send warning ingame
legendaryRodexWarning(.@cid);
}
}
//////////////////////////////////////////
if ($AEGIS_HOLDER$ != "") {
- .@nb = query_sql("SELECT last_login, char_id, account_id FROM `char` WHERE `name` == "+$AEGIS_HOLDER$+" LIMIT 1", .@login, .@cid, .@aid);
+ .@nb = query_sql("SELECT last_login, char_id, account_id FROM `char` WHERE `name` = '"+$AEGIS_HOLDER$+"' LIMIT 1", .@login, .@cid, .@aid);
if (.@login < .@kban) {
// Destroy the item by force
DelItemFromEveryPlayer(AegisShield);
$AEGIS_HOLDER$="";
kamibroadcast("The Aegis Shield has given up on its previous owner and is now available for someone worthier.");
- } else if (.@login < .@kick) {
+ } else if (legendaryTimeCheck(.@login, .@kick)) {
// Send warning via API
legendaryAPIWarning(.@aid);
- } else if (.@login < .@warn) {
+ } else if (legendaryTimeCheck(.@login, .@warn)) {
// Send warning ingame
legendaryRodexWarning(.@cid);
}
diff --git a/npc/functions/hub.txt b/npc/functions/hub.txt
index b6b2def84..19e27fdf6 100644
--- a/npc/functions/hub.txt
+++ b/npc/functions/hub.txt
@@ -39,7 +39,7 @@ function script HUB_Login {
// Mirror Lake Debut
if ((##01_CRQUEST & 1) && !(##02_MLWORLD & MLP_CR_DEBUT)) {
##02_MLWORLD = ##02_MLWORLD | MLP_CR_DEBUT;
- rodex_sendmail(getcharid(0), "The Crossroads", "Event Prize", "This is for participating in the debut event.", 0, SupremeGift, 1);
+ rodex_sendmail(getcharid(0), "The Crossroads", "Event Prize", "This is for participating in the debut event.", 0, SupremeGift, 1, ApanaCake, 6);
}
.@gto=get_byte(##00_INFO, 3);
@@ -57,7 +57,9 @@ function script HUB_Login {
{
// Warp to the proper Mirror Lake
switch (.@mlp) {
+ case 2: warp "014-4", 28, 31; LOCATION$ = "LoF"; break;
case 1: warp "018-7-1", 90, 47; LOCATION$ = "LoF"; break;
+ case 0: break;
default: warp "014-4", 28, 31; LOCATION$ = "LoF"; break;
}
@@ -324,19 +326,9 @@ function script HUB_Logout {
CHAREG_CLEANUP=gettimetick(2);
// Send updates to Vault API
if (getvaultid()) {
- .@api$=json_encode("UID", ##VAULT,
- "GID", getcharid(3),
- "VAR1N", "MLQUEST",
- "VAR1V", ##02_MLQUEST,
- "VAR2N", "MLWORLD",
- "VAR2V", ##02_MLWORLD,
- "VEXP", ##VAULT_EXP,
- "GOTO", ##VAULT_GOTO,
- "MLTO", ##VAULT_MLTO);
- ##VAULT_EXP=0;
+ export_vault();
##VAULT_GOTO=0;
##VAULT_MLTO=0;
- api_send(API_FLUSHVAULT, .@api$);
// Destroy temporary characters
if (countitem(MirrorLakeArmor)) {
delitem MirrorLakeArmor, countitem(MirrorLakeArmor);
diff --git a/npc/functions/main.txt b/npc/functions/main.txt
index a099916f6..bbb75dd40 100644
--- a/npc/functions/main.txt
+++ b/npc/functions/main.txt
@@ -299,6 +299,35 @@ function script any_of {
return getelementofarray(getarg(0), getarrayindex(getarg(0)) + rand2(getarraysize(getarg(0)) - getarrayindex(getarg(0))));
}
+// Miller Algorithm implementation for shuffling (PRIG)
+// (C) Copyright 2022 Ronald R. Miller, licensed under Apache 2.0 License
+// miller_rand( state, seed, array_size )
+function script miller_rand {
+ .@inx = getarg(0);
+ .@shuffleID = getarg(1);
+ .@listSize = getarg(2);
+
+ .@shuffleID += 131 * (.@inx/.@listSize); // have inx overflow effect the mix
+ .@si = (.@inx + .@shuffleID) % .@listSize; // cut the deck
+ .@topEven = .@listSize - (.@listSize & 1); // compute reference value
+ .@r1 = .@shuffleID % 0xFFF; // improved randomizing values
+ .@r2 = .@shuffleID % 0x3FFF ^ .@r1;
+ .@r3 = .@shuffleID / 881 + 3;
+ .@rx = (.@shuffleID / .@listSize) % .@listSize + 1;
+
+ // NOTE: the next line operates only 1/3 the time, the following line 1/2
+ // spin multiples of 3
+ if (.@si % 3 == 0) .@si = (((.@si/3)*3343+.@r1) % ((.@listSize+2)/3)) * 3;
+ // reverse+rotate flow of odd #s
+ if (.@si&1) .@si = (2 * .@r2 + .@topEven - .@si) % .@topEven;
+ // flip some bits with Xor
+ if ((.@si ^ .@rx) < .@listSize) .@si ^= .@rx;
+ // turn more prime wheels
+ .@si = (.@si * 9973 + .@r3) % .@listSize;
+
+ return .@si;
+}
+
function script die {
if ($HARDCORE) {
@grace=true;
diff --git a/npc/functions/mkbot.txt b/npc/functions/mkbot.txt
index 23912cba5..80632f383 100644
--- a/npc/functions/mkbot.txt
+++ b/npc/functions/mkbot.txt
@@ -87,6 +87,15 @@ OnTimer90000:
end;
}
+ // Check if MK is still alive
+ if (getunittype($@MK) < 0) {
+ consolebug("Monster King GID %d is not a valid unit type!", $@MK);
+ sleep(300); // Wait 5 minutes for the respawn
+ consolewarn("Forcefully respawning Monster King now (GID was invalid)");
+ .bar=true;
+ goto OnInit;
+ }
+
// The Monster King is online. This loop is not needed
if (isloggedin(.aid, .cid)) {
if (!$@MK_SCENE)
diff --git a/npc/functions/news.txt b/npc/functions/news.txt
index 38120537f..970b1e3df 100644
--- a/npc/functions/news.txt
+++ b/npc/functions/news.txt
@@ -305,6 +305,8 @@ function script EventHelp {
mes "";
mes l("During this season, monster point gain is increased in %d%%!", 10);
mes l("Not only that, but reborn characters will spawn at level %d!", 3);
+ if (getq(LoFQuest_COD))
+ mes l("Call of Dusty event, in Land of Fire, also outputs more rewards.");
mes "";
mes l("Also: You'll be able to rebirth at Tulimshar with Jakod. What are you waiting for?!");
mesc l("Location: Not applicable"), 3;
diff --git a/npc/functions/refine.txt b/npc/functions/refine.txt
index e940ab635..3baa477ea 100644
--- a/npc/functions/refine.txt
+++ b/npc/functions/refine.txt
@@ -21,12 +21,13 @@ function script refineMaster {
function rif_refine {
.@slot = getarg(0);
- .@text = getarg(1);
+ .@text$ = getarg(1);
// Two-handed weapons are already handled under EQI_HAND_R
if (.@slot == EQI_HAND_L && (getequipid(EQI_HAND_L) == getequipid(EQI_HAND_R)))
return "";
- if (getequipisequiped(.@slot) && getequipisenableref(.@slot))
- return l(.@text, getequipname(.@slot));
+ if (getequipisequiped(.@slot) && getequipisenableref(.@slot)) {
+ return l(.@text$, getequipname(.@slot));
+ }
return "";
}
@@ -183,6 +184,7 @@ function script refineMaster {
mesq l("I'm sure I could refine this again, if you bring me the payment and the reagents again.");
next;
// Perhaps the item has broken? (~0.1% chance/refine level)
+ /*
} else if (rand2(10000) <= 10*(.@rlv+1)) {
failedrefitem .@it;
mesc l("*CRASH*");
@@ -193,6 +195,7 @@ function script refineMaster {
mesn;
mesq l("Well, you were warned. Do you have any other stuff for me?");
next;
+ */
// Nothing happens
} else {
mesn;
diff --git a/npc/functions/vault.txt b/npc/functions/vault.txt
index b66d46ff0..69d9cbd4f 100644
--- a/npc/functions/vault.txt
+++ b/npc/functions/vault.txt
@@ -25,6 +25,24 @@ function script getvaultexp {
return;
}
+function script export_vault {
+ // Send updates to Vault API
+ if (getvaultid()) {
+ .@api$=json_encode("UID", ##VAULT,
+ "GID", getcharid(3),
+ "VAR1N", "CRQUEST",
+ "VAR1V", ##01_CRQUEST,
+ //"VAR2N", "CRWORLD",
+ //"VAR2V", ##01_CRWORLD,
+ "VEXP", ##VAULT_EXP,
+ "GOTO", ##VAULT_GOTO,
+ "MLTO", ##VAULT_MLTO);
+ ##VAULT_EXP=0;
+ api_send(API_FLUSHVAULT, .@api$);
+ }
+ return;
+}
+
// MirrorLakeSendTo(World, Lake)
function script MirrorLakeSendTo {
.@w=getarg(0);
@@ -33,7 +51,12 @@ function script MirrorLakeSendTo {
##VAULT_MLTO=.@t;
closeclientdialog;
dispbottom l("Darkness fills your vision...");
- sleep2(1000);
+ export_vault();
+ sleep2(800);
+ specialeffect FX_CIRCLE, SELF, getcharid(3);
+ sleep2(1200);
+ specialeffect FX_MGSHIELD, SELF, getcharid(3);
+ sleep2(1200);
kick(getcharid(3), 7); // 7 is not a valid kick reason
//atcommand("@kick "+strcharinfo(0));
end;
diff --git a/npc/items/grenade.txt b/npc/items/grenade.txt
index 12a314b4b..a3ddf9fca 100644
--- a/npc/items/grenade.txt
+++ b/npc/items/grenade.txt
@@ -78,7 +78,7 @@ function script areasc2 {
return;
}
-// areasc3(range, time, sc, bl, val1, val2, filter)
+// areasc3(range, time, sc, bl, val1, val2, filter, target, chances)
// Defaults to 3x3 square, sleep mob for 500ms. Ignores you.
// Need a player caster. Valid BL: BL_MOB | BL_PC | BL_HOM | BL_MER
function script areasc3 {
@@ -89,14 +89,16 @@ function script areasc3 {
.@v1=getarg(4, 1);
.@v2=getarg(5, 1);
.@f$=getarg(6, "filter_notme");
+ .@t=getarg(7, playerattached());
+ .@sr=getarg(8, 10000);
- getmapxy(.@m$, .@x, .@y, 0);
+ getmapxy(.@m$, .@x, .@y, getunittype(.@t), .@t);
.@c=getunits(.@b, .@mbs, false, .@m$, .@x-.@r, .@y-.@r, .@x+.@r, .@y+.@r);
for (.@i = 0; .@i < .@c; .@i++) {
// Filtering
if (!callfunc(.@f$, .@mbs[.@i]))
continue;
- sc_start2 .@s, .@d, .@v1, .@v2, 10000, SCFLAG_NONE, .@mbs[.@i];
+ sc_start2 .@s, .@d, .@v1, .@v2, .@sr, SCFLAG_NONE, .@mbs[.@i];
specialeffect(FX_BUFF, AREA, .@mbs[.@i]);
}
return;