poi-plugin-quest-info-2 0.9.7 → 0.9.9
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/CHANGELOG.md +12 -0
- package/build/kcQuestsData/DATA_VERSION +1 -1
- package/build/kcQuestsData/index.ts +1 -1
- package/build/kcQuestsData/quests-scn-new.json +6 -9
- package/build/kcQuestsData/quests-scn.json +601 -525
- package/build/kcanotifyGamedata/DATA_VERSION +1 -1
- package/build/kcanotifyGamedata/index.ts +1 -1
- package/build/kcanotifyGamedata/quests-en.json +29 -35
- package/build/kcanotifyGamedata/quests-jp.json +29 -35
- package/build/kcanotifyGamedata/quests-ko.json +30 -39
- package/build/kcanotifyGamedata/quests-scn.json +227 -172
- package/build/kcanotifyGamedata/quests-tcn.json +345 -263
- package/build/prePostQuest.json +4 -348
- package/build/questCategory.json +6 -57
- package/build/questCodeMap.json +7 -58
- package/package.json +1 -1
- package/src/__tests__/__snapshots__/questCategory.spec.ts.snap +5 -0
- package/src/__tests__/kcanotifyData.spec.ts +1 -1
- package/src/__tests__/kcwikiData.spec.ts +1 -1
- package/src/__tests__/questCategory.spec.ts +2 -2
package/build/prePostQuest.json
CHANGED
|
@@ -905,7 +905,6 @@
|
|
|
905
905
|
"post": [
|
|
906
906
|
"B7",
|
|
907
907
|
"B30",
|
|
908
|
-
"7thAnvLC1",
|
|
909
908
|
"B67",
|
|
910
909
|
"B82"
|
|
911
910
|
]
|
|
@@ -942,7 +941,6 @@
|
|
|
942
941
|
],
|
|
943
942
|
"post": [
|
|
944
943
|
"C25",
|
|
945
|
-
"2203B3",
|
|
946
944
|
"B158"
|
|
947
945
|
]
|
|
948
946
|
},
|
|
@@ -1188,12 +1186,6 @@
|
|
|
1188
1186
|
"By5"
|
|
1189
1187
|
]
|
|
1190
1188
|
},
|
|
1191
|
-
"238": {
|
|
1192
|
-
"pre": [
|
|
1193
|
-
"LQ1"
|
|
1194
|
-
],
|
|
1195
|
-
"post": []
|
|
1196
|
-
},
|
|
1197
1189
|
"239": {
|
|
1198
1190
|
"pre": [
|
|
1199
1191
|
"A31"
|
|
@@ -1752,8 +1744,8 @@
|
|
|
1752
1744
|
"B125",
|
|
1753
1745
|
"C4",
|
|
1754
1746
|
"C3",
|
|
1755
|
-
"
|
|
1756
|
-
"
|
|
1747
|
+
"C61",
|
|
1748
|
+
"C71",
|
|
1757
1749
|
"C64",
|
|
1758
1750
|
"C48",
|
|
1759
1751
|
"F44",
|
|
@@ -1765,9 +1757,7 @@
|
|
|
1765
1757
|
"B104",
|
|
1766
1758
|
"B122",
|
|
1767
1759
|
"By2",
|
|
1768
|
-
"B142"
|
|
1769
|
-
"21SuLB1",
|
|
1770
|
-
"2207B1"
|
|
1760
|
+
"B142"
|
|
1771
1761
|
]
|
|
1772
1762
|
},
|
|
1773
1763
|
"304": {
|
|
@@ -1841,9 +1831,7 @@
|
|
|
1841
1831
|
"pre": [
|
|
1842
1832
|
"C2"
|
|
1843
1833
|
],
|
|
1844
|
-
"post": [
|
|
1845
|
-
"2201LD01"
|
|
1846
|
-
]
|
|
1834
|
+
"post": []
|
|
1847
1835
|
},
|
|
1848
1836
|
"315": {
|
|
1849
1837
|
"pre": [
|
|
@@ -1940,12 +1928,6 @@
|
|
|
1940
1928
|
],
|
|
1941
1929
|
"post": []
|
|
1942
1930
|
},
|
|
1943
|
-
"329": {
|
|
1944
|
-
"pre": [],
|
|
1945
|
-
"post": [
|
|
1946
|
-
"2201LB06"
|
|
1947
|
-
]
|
|
1948
|
-
},
|
|
1949
1931
|
"330": {
|
|
1950
1932
|
"pre": [
|
|
1951
1933
|
"Bd1",
|
|
@@ -2010,19 +1992,6 @@
|
|
|
2010
1992
|
],
|
|
2011
1993
|
"post": []
|
|
2012
1994
|
},
|
|
2013
|
-
"340": {
|
|
2014
|
-
"pre": [],
|
|
2015
|
-
"post": [
|
|
2016
|
-
"20WiD1",
|
|
2017
|
-
"20WiG1"
|
|
2018
|
-
]
|
|
2019
|
-
},
|
|
2020
|
-
"341": {
|
|
2021
|
-
"pre": [
|
|
2022
|
-
"B6"
|
|
2023
|
-
],
|
|
2024
|
-
"post": []
|
|
2025
|
-
},
|
|
2026
1995
|
"343": {
|
|
2027
1996
|
"pre": [
|
|
2028
1997
|
"C1",
|
|
@@ -2094,15 +2063,6 @@
|
|
|
2094
2063
|
"B187"
|
|
2095
2064
|
]
|
|
2096
2065
|
},
|
|
2097
|
-
"359": {
|
|
2098
|
-
"pre": [
|
|
2099
|
-
"2210B1"
|
|
2100
|
-
],
|
|
2101
|
-
"post": [
|
|
2102
|
-
"2210B3",
|
|
2103
|
-
"2210F1"
|
|
2104
|
-
]
|
|
2105
|
-
},
|
|
2106
2066
|
"401": {
|
|
2107
2067
|
"pre": [
|
|
2108
2068
|
"A5"
|
|
@@ -2379,14 +2339,6 @@
|
|
|
2379
2339
|
],
|
|
2380
2340
|
"post": []
|
|
2381
2341
|
},
|
|
2382
|
-
"435": {
|
|
2383
|
-
"pre": [
|
|
2384
|
-
"20WiC1"
|
|
2385
|
-
],
|
|
2386
|
-
"post": [
|
|
2387
|
-
"20WiG2"
|
|
2388
|
-
]
|
|
2389
|
-
},
|
|
2390
2342
|
"436": {
|
|
2391
2343
|
"pre": [
|
|
2392
2344
|
"D30"
|
|
@@ -2414,13 +2366,6 @@
|
|
|
2414
2366
|
],
|
|
2415
2367
|
"post": []
|
|
2416
2368
|
},
|
|
2417
|
-
"441": {
|
|
2418
|
-
"pre": [
|
|
2419
|
-
"C63",
|
|
2420
|
-
"2201LB06"
|
|
2421
|
-
],
|
|
2422
|
-
"post": []
|
|
2423
|
-
},
|
|
2424
2369
|
"442": {
|
|
2425
2370
|
"pre": [
|
|
2426
2371
|
"D14",
|
|
@@ -3260,12 +3205,6 @@
|
|
|
3260
3205
|
],
|
|
3261
3206
|
"post": []
|
|
3262
3207
|
},
|
|
3263
|
-
"697": {
|
|
3264
|
-
"pre": [
|
|
3265
|
-
"2003LQ1"
|
|
3266
|
-
],
|
|
3267
|
-
"post": []
|
|
3268
|
-
},
|
|
3269
3208
|
"698": {
|
|
3270
3209
|
"pre": [
|
|
3271
3210
|
"C46",
|
|
@@ -3310,52 +3249,6 @@
|
|
|
3310
3249
|
],
|
|
3311
3250
|
"post": []
|
|
3312
3251
|
},
|
|
3313
|
-
"707": {
|
|
3314
|
-
"pre": [
|
|
3315
|
-
"20WiC1"
|
|
3316
|
-
],
|
|
3317
|
-
"post": []
|
|
3318
|
-
},
|
|
3319
|
-
"708": {
|
|
3320
|
-
"pre": [
|
|
3321
|
-
"20WiD1",
|
|
3322
|
-
"20WiB2"
|
|
3323
|
-
],
|
|
3324
|
-
"post": []
|
|
3325
|
-
},
|
|
3326
|
-
"709": {
|
|
3327
|
-
"pre": [
|
|
3328
|
-
"20WiB3"
|
|
3329
|
-
],
|
|
3330
|
-
"post": []
|
|
3331
|
-
},
|
|
3332
|
-
"710": {
|
|
3333
|
-
"pre": [],
|
|
3334
|
-
"post": [
|
|
3335
|
-
"2103G2",
|
|
3336
|
-
"2103G3"
|
|
3337
|
-
]
|
|
3338
|
-
},
|
|
3339
|
-
"711": {
|
|
3340
|
-
"pre": [
|
|
3341
|
-
"2103G1"
|
|
3342
|
-
],
|
|
3343
|
-
"post": [
|
|
3344
|
-
"2103G4"
|
|
3345
|
-
]
|
|
3346
|
-
},
|
|
3347
|
-
"712": {
|
|
3348
|
-
"pre": [
|
|
3349
|
-
"2103G1"
|
|
3350
|
-
],
|
|
3351
|
-
"post": []
|
|
3352
|
-
},
|
|
3353
|
-
"713": {
|
|
3354
|
-
"pre": [
|
|
3355
|
-
"2103G2"
|
|
3356
|
-
],
|
|
3357
|
-
"post": []
|
|
3358
|
-
},
|
|
3359
3252
|
"714": {
|
|
3360
3253
|
"pre": [],
|
|
3361
3254
|
"post": [
|
|
@@ -3397,26 +3290,6 @@
|
|
|
3397
3290
|
],
|
|
3398
3291
|
"post": []
|
|
3399
3292
|
},
|
|
3400
|
-
"802": {
|
|
3401
|
-
"pre": [],
|
|
3402
|
-
"post": [
|
|
3403
|
-
"2201LB03"
|
|
3404
|
-
]
|
|
3405
|
-
},
|
|
3406
|
-
"803": {
|
|
3407
|
-
"pre": [
|
|
3408
|
-
"2201LB02"
|
|
3409
|
-
],
|
|
3410
|
-
"post": [
|
|
3411
|
-
"2201LB04"
|
|
3412
|
-
]
|
|
3413
|
-
},
|
|
3414
|
-
"804": {
|
|
3415
|
-
"pre": [
|
|
3416
|
-
"2201LB03"
|
|
3417
|
-
],
|
|
3418
|
-
"post": []
|
|
3419
|
-
},
|
|
3420
3293
|
"805": {
|
|
3421
3294
|
"pre": [
|
|
3422
3295
|
"A32",
|
|
@@ -3681,34 +3554,12 @@
|
|
|
3681
3554
|
"F51"
|
|
3682
3555
|
]
|
|
3683
3556
|
},
|
|
3684
|
-
"840": {
|
|
3685
|
-
"pre": [],
|
|
3686
|
-
"post": [
|
|
3687
|
-
"2201LB06"
|
|
3688
|
-
]
|
|
3689
|
-
},
|
|
3690
|
-
"841": {
|
|
3691
|
-
"pre": [
|
|
3692
|
-
"2201LC01",
|
|
3693
|
-
"2201LB05"
|
|
3694
|
-
],
|
|
3695
|
-
"post": [
|
|
3696
|
-
"2201LD01",
|
|
3697
|
-
"2201LB07"
|
|
3698
|
-
]
|
|
3699
|
-
},
|
|
3700
3557
|
"842": {
|
|
3701
3558
|
"pre": [
|
|
3702
3559
|
"B19"
|
|
3703
3560
|
],
|
|
3704
3561
|
"post": []
|
|
3705
3562
|
},
|
|
3706
|
-
"843": {
|
|
3707
|
-
"pre": [
|
|
3708
|
-
"2201LB06"
|
|
3709
|
-
],
|
|
3710
|
-
"post": []
|
|
3711
|
-
},
|
|
3712
3563
|
"844": {
|
|
3713
3564
|
"pre": [
|
|
3714
3565
|
"B73",
|
|
@@ -3884,28 +3735,6 @@
|
|
|
3884
3735
|
"F63"
|
|
3885
3736
|
]
|
|
3886
3737
|
},
|
|
3887
|
-
"866": {
|
|
3888
|
-
"pre": [],
|
|
3889
|
-
"post": [
|
|
3890
|
-
"Fa22LB02"
|
|
3891
|
-
]
|
|
3892
|
-
},
|
|
3893
|
-
"867": {
|
|
3894
|
-
"pre": [
|
|
3895
|
-
"Fa22LB01"
|
|
3896
|
-
],
|
|
3897
|
-
"post": [
|
|
3898
|
-
"Fa22LB03"
|
|
3899
|
-
]
|
|
3900
|
-
},
|
|
3901
|
-
"868": {
|
|
3902
|
-
"pre": [
|
|
3903
|
-
"Fa22LB02"
|
|
3904
|
-
],
|
|
3905
|
-
"post": [
|
|
3906
|
-
"Fa22LF01"
|
|
3907
|
-
]
|
|
3908
|
-
},
|
|
3909
3738
|
"869": {
|
|
3910
3739
|
"pre": [],
|
|
3911
3740
|
"post": [
|
|
@@ -4160,33 +3989,6 @@
|
|
|
4160
3989
|
"By4"
|
|
4161
3990
|
]
|
|
4162
3991
|
},
|
|
4163
|
-
"906": {
|
|
4164
|
-
"pre": [],
|
|
4165
|
-
"post": [
|
|
4166
|
-
"2203B2"
|
|
4167
|
-
]
|
|
4168
|
-
},
|
|
4169
|
-
"907": {
|
|
4170
|
-
"pre": [
|
|
4171
|
-
"2203B1"
|
|
4172
|
-
],
|
|
4173
|
-
"post": [
|
|
4174
|
-
"2203B3"
|
|
4175
|
-
]
|
|
4176
|
-
},
|
|
4177
|
-
"908": {
|
|
4178
|
-
"pre": [
|
|
4179
|
-
"Bd3",
|
|
4180
|
-
"2203B2"
|
|
4181
|
-
],
|
|
4182
|
-
"post": []
|
|
4183
|
-
},
|
|
4184
|
-
"909": {
|
|
4185
|
-
"pre": [
|
|
4186
|
-
"2103B2"
|
|
4187
|
-
],
|
|
4188
|
-
"post": []
|
|
4189
|
-
},
|
|
4190
3992
|
"911": {
|
|
4191
3993
|
"pre": [
|
|
4192
3994
|
"C2",
|
|
@@ -4206,12 +4008,6 @@
|
|
|
4206
4008
|
],
|
|
4207
4009
|
"post": []
|
|
4208
4010
|
},
|
|
4209
|
-
"915": {
|
|
4210
|
-
"pre": [],
|
|
4211
|
-
"post": [
|
|
4212
|
-
"2003LQ2"
|
|
4213
|
-
]
|
|
4214
|
-
},
|
|
4215
4011
|
"916": {
|
|
4216
4012
|
"pre": [
|
|
4217
4013
|
"B133"
|
|
@@ -4444,48 +4240,10 @@
|
|
|
4444
4240
|
],
|
|
4445
4241
|
"post": []
|
|
4446
4242
|
},
|
|
4447
|
-
"950": {
|
|
4448
|
-
"pre": [],
|
|
4449
|
-
"post": [
|
|
4450
|
-
"2107LB2"
|
|
4451
|
-
]
|
|
4452
|
-
},
|
|
4453
|
-
"951": {
|
|
4454
|
-
"pre": [
|
|
4455
|
-
"2107LB1"
|
|
4456
|
-
],
|
|
4457
|
-
"post": []
|
|
4458
|
-
},
|
|
4459
4243
|
"952": {
|
|
4460
4244
|
"pre": [
|
|
4461
4245
|
"D42"
|
|
4462
4246
|
],
|
|
4463
|
-
"post": [
|
|
4464
|
-
"21SuLB2"
|
|
4465
|
-
]
|
|
4466
|
-
},
|
|
4467
|
-
"953": {
|
|
4468
|
-
"pre": [
|
|
4469
|
-
"C2"
|
|
4470
|
-
],
|
|
4471
|
-
"post": []
|
|
4472
|
-
},
|
|
4473
|
-
"954": {
|
|
4474
|
-
"pre": [
|
|
4475
|
-
"B171"
|
|
4476
|
-
],
|
|
4477
|
-
"post": []
|
|
4478
|
-
},
|
|
4479
|
-
"955": {
|
|
4480
|
-
"pre": [],
|
|
4481
|
-
"post": [
|
|
4482
|
-
"21SuLB4"
|
|
4483
|
-
]
|
|
4484
|
-
},
|
|
4485
|
-
"956": {
|
|
4486
|
-
"pre": [
|
|
4487
|
-
"21SuLB3"
|
|
4488
|
-
],
|
|
4489
4247
|
"post": []
|
|
4490
4248
|
},
|
|
4491
4249
|
"957": {
|
|
@@ -4502,18 +4260,6 @@
|
|
|
4502
4260
|
"F103"
|
|
4503
4261
|
]
|
|
4504
4262
|
},
|
|
4505
|
-
"959": {
|
|
4506
|
-
"pre": [],
|
|
4507
|
-
"post": [
|
|
4508
|
-
"Fa22LB05"
|
|
4509
|
-
]
|
|
4510
|
-
},
|
|
4511
|
-
"960": {
|
|
4512
|
-
"pre": [
|
|
4513
|
-
"Fa22LB04"
|
|
4514
|
-
],
|
|
4515
|
-
"post": []
|
|
4516
|
-
},
|
|
4517
4263
|
"961": {
|
|
4518
4264
|
"pre": [
|
|
4519
4265
|
"B117"
|
|
@@ -4522,36 +4268,6 @@
|
|
|
4522
4268
|
"B184"
|
|
4523
4269
|
]
|
|
4524
4270
|
},
|
|
4525
|
-
"962": {
|
|
4526
|
-
"pre": [],
|
|
4527
|
-
"post": [
|
|
4528
|
-
"2112LB02",
|
|
4529
|
-
"2112LB03"
|
|
4530
|
-
]
|
|
4531
|
-
},
|
|
4532
|
-
"963": {
|
|
4533
|
-
"pre": [
|
|
4534
|
-
"2112LB01"
|
|
4535
|
-
],
|
|
4536
|
-
"post": [
|
|
4537
|
-
"2112LB04"
|
|
4538
|
-
]
|
|
4539
|
-
},
|
|
4540
|
-
"964": {
|
|
4541
|
-
"pre": [
|
|
4542
|
-
"2112LB01"
|
|
4543
|
-
],
|
|
4544
|
-
"post": [
|
|
4545
|
-
"2112LB04"
|
|
4546
|
-
]
|
|
4547
|
-
},
|
|
4548
|
-
"965": {
|
|
4549
|
-
"pre": [
|
|
4550
|
-
"2112LB02",
|
|
4551
|
-
"2112LB03"
|
|
4552
|
-
],
|
|
4553
|
-
"post": []
|
|
4554
|
-
},
|
|
4555
4271
|
"966": {
|
|
4556
4272
|
"pre": [
|
|
4557
4273
|
"B113",
|
|
@@ -4589,18 +4305,6 @@
|
|
|
4589
4305
|
],
|
|
4590
4306
|
"post": []
|
|
4591
4307
|
},
|
|
4592
|
-
"971": {
|
|
4593
|
-
"pre": [],
|
|
4594
|
-
"post": [
|
|
4595
|
-
"2204B3"
|
|
4596
|
-
]
|
|
4597
|
-
},
|
|
4598
|
-
"972": {
|
|
4599
|
-
"pre": [
|
|
4600
|
-
"2204B2"
|
|
4601
|
-
],
|
|
4602
|
-
"post": []
|
|
4603
|
-
},
|
|
4604
4308
|
"973": {
|
|
4605
4309
|
"pre": [
|
|
4606
4310
|
"B141"
|
|
@@ -4646,12 +4350,6 @@
|
|
|
4646
4350
|
],
|
|
4647
4351
|
"post": []
|
|
4648
4352
|
},
|
|
4649
|
-
"979": {
|
|
4650
|
-
"pre": [
|
|
4651
|
-
"C2"
|
|
4652
|
-
],
|
|
4653
|
-
"post": []
|
|
4654
|
-
},
|
|
4655
4353
|
"980": {
|
|
4656
4354
|
"pre": [
|
|
4657
4355
|
"B174"
|
|
@@ -4682,36 +4380,6 @@
|
|
|
4682
4380
|
],
|
|
4683
4381
|
"post": []
|
|
4684
4382
|
},
|
|
4685
|
-
"984": {
|
|
4686
|
-
"pre": [],
|
|
4687
|
-
"post": [
|
|
4688
|
-
"2210C1",
|
|
4689
|
-
"2210B2"
|
|
4690
|
-
]
|
|
4691
|
-
},
|
|
4692
|
-
"985": {
|
|
4693
|
-
"pre": [
|
|
4694
|
-
"2210B1"
|
|
4695
|
-
],
|
|
4696
|
-
"post": [
|
|
4697
|
-
"2210B4"
|
|
4698
|
-
]
|
|
4699
|
-
},
|
|
4700
|
-
"986": {
|
|
4701
|
-
"pre": [
|
|
4702
|
-
"2210C1"
|
|
4703
|
-
],
|
|
4704
|
-
"post": [
|
|
4705
|
-
"2210B4"
|
|
4706
|
-
]
|
|
4707
|
-
},
|
|
4708
|
-
"987": {
|
|
4709
|
-
"pre": [
|
|
4710
|
-
"2210B2",
|
|
4711
|
-
"2210B3"
|
|
4712
|
-
],
|
|
4713
|
-
"post": []
|
|
4714
|
-
},
|
|
4715
4383
|
"1101": {
|
|
4716
4384
|
"pre": [],
|
|
4717
4385
|
"post": [
|
|
@@ -4765,12 +4433,6 @@
|
|
|
4765
4433
|
],
|
|
4766
4434
|
"post": []
|
|
4767
4435
|
},
|
|
4768
|
-
"1110": {
|
|
4769
|
-
"pre": [
|
|
4770
|
-
"Fa22LB03"
|
|
4771
|
-
],
|
|
4772
|
-
"post": []
|
|
4773
|
-
},
|
|
4774
4436
|
"1114": {
|
|
4775
4437
|
"pre": [],
|
|
4776
4438
|
"post": [
|
|
@@ -4807,11 +4469,5 @@
|
|
|
4807
4469
|
"post": [
|
|
4808
4470
|
"B187"
|
|
4809
4471
|
]
|
|
4810
|
-
},
|
|
4811
|
-
"1119": {
|
|
4812
|
-
"pre": [
|
|
4813
|
-
"2210C1"
|
|
4814
|
-
],
|
|
4815
|
-
"post": []
|
|
4816
4472
|
}
|
|
4817
4473
|
}
|
package/build/questCategory.json
CHANGED
|
@@ -123,7 +123,8 @@
|
|
|
123
123
|
1103,
|
|
124
124
|
1104,
|
|
125
125
|
1105,
|
|
126
|
-
1107
|
|
126
|
+
1107,
|
|
127
|
+
1120
|
|
127
128
|
],
|
|
128
129
|
"singleQuest": [
|
|
129
130
|
101,
|
|
@@ -240,11 +241,9 @@
|
|
|
240
241
|
231,
|
|
241
242
|
232,
|
|
242
243
|
233,
|
|
243
|
-
234,
|
|
244
244
|
235,
|
|
245
245
|
236,
|
|
246
246
|
237,
|
|
247
|
-
238,
|
|
248
247
|
239,
|
|
249
248
|
240,
|
|
250
249
|
244,
|
|
@@ -314,7 +313,6 @@
|
|
|
314
313
|
326,
|
|
315
314
|
327,
|
|
316
315
|
328,
|
|
317
|
-
329,
|
|
318
316
|
330,
|
|
319
317
|
331,
|
|
320
318
|
332,
|
|
@@ -323,8 +321,6 @@
|
|
|
323
321
|
335,
|
|
324
322
|
336,
|
|
325
323
|
338,
|
|
326
|
-
340,
|
|
327
|
-
341,
|
|
328
324
|
343,
|
|
329
325
|
344,
|
|
330
326
|
347,
|
|
@@ -332,7 +328,7 @@
|
|
|
332
328
|
352,
|
|
333
329
|
356,
|
|
334
330
|
358,
|
|
335
|
-
|
|
331
|
+
360,
|
|
336
332
|
401,
|
|
337
333
|
405,
|
|
338
334
|
406,
|
|
@@ -358,8 +354,6 @@
|
|
|
358
354
|
431,
|
|
359
355
|
432,
|
|
360
356
|
433,
|
|
361
|
-
435,
|
|
362
|
-
441,
|
|
363
357
|
443,
|
|
364
358
|
445,
|
|
365
359
|
446,
|
|
@@ -437,24 +431,12 @@
|
|
|
437
431
|
694,
|
|
438
432
|
695,
|
|
439
433
|
696,
|
|
440
|
-
697,
|
|
441
434
|
698,
|
|
442
435
|
701,
|
|
443
436
|
704,
|
|
444
437
|
705,
|
|
445
|
-
707,
|
|
446
|
-
708,
|
|
447
|
-
709,
|
|
448
|
-
710,
|
|
449
|
-
711,
|
|
450
|
-
712,
|
|
451
|
-
713,
|
|
452
438
|
718,
|
|
453
439
|
719,
|
|
454
|
-
801,
|
|
455
|
-
802,
|
|
456
|
-
803,
|
|
457
|
-
804,
|
|
458
440
|
805,
|
|
459
441
|
806,
|
|
460
442
|
807,
|
|
@@ -489,10 +471,7 @@
|
|
|
489
471
|
837,
|
|
490
472
|
838,
|
|
491
473
|
839,
|
|
492
|
-
840,
|
|
493
|
-
841,
|
|
494
474
|
842,
|
|
495
|
-
843,
|
|
496
475
|
844,
|
|
497
476
|
846,
|
|
498
477
|
847,
|
|
@@ -511,9 +490,6 @@
|
|
|
511
490
|
863,
|
|
512
491
|
864,
|
|
513
492
|
865,
|
|
514
|
-
866,
|
|
515
|
-
867,
|
|
516
|
-
868,
|
|
517
493
|
869,
|
|
518
494
|
870,
|
|
519
495
|
871,
|
|
@@ -538,11 +514,6 @@
|
|
|
538
514
|
898,
|
|
539
515
|
901,
|
|
540
516
|
902,
|
|
541
|
-
906,
|
|
542
|
-
907,
|
|
543
|
-
908,
|
|
544
|
-
909,
|
|
545
|
-
910,
|
|
546
517
|
911,
|
|
547
518
|
913,
|
|
548
519
|
915,
|
|
@@ -561,7 +532,6 @@
|
|
|
561
532
|
929,
|
|
562
533
|
930,
|
|
563
534
|
931,
|
|
564
|
-
932,
|
|
565
535
|
933,
|
|
566
536
|
934,
|
|
567
537
|
935,
|
|
@@ -570,52 +540,32 @@
|
|
|
570
540
|
938,
|
|
571
541
|
939,
|
|
572
542
|
940,
|
|
573
|
-
941,
|
|
574
|
-
942,
|
|
575
543
|
943,
|
|
576
544
|
949,
|
|
577
|
-
950,
|
|
578
|
-
951,
|
|
579
545
|
952,
|
|
580
|
-
953,
|
|
581
|
-
954,
|
|
582
|
-
955,
|
|
583
|
-
956,
|
|
584
546
|
957,
|
|
585
547
|
958,
|
|
586
|
-
959,
|
|
587
|
-
960,
|
|
588
548
|
961,
|
|
589
|
-
962,
|
|
590
|
-
963,
|
|
591
|
-
964,
|
|
592
|
-
965,
|
|
593
549
|
966,
|
|
594
550
|
967,
|
|
595
551
|
968,
|
|
596
552
|
969,
|
|
597
553
|
970,
|
|
598
|
-
971,
|
|
599
|
-
972,
|
|
600
554
|
974,
|
|
601
555
|
976,
|
|
602
556
|
977,
|
|
603
557
|
978,
|
|
604
|
-
979,
|
|
605
558
|
980,
|
|
606
559
|
981,
|
|
607
560
|
982,
|
|
608
561
|
983,
|
|
609
|
-
|
|
610
|
-
|
|
611
|
-
986,
|
|
612
|
-
987,
|
|
562
|
+
988,
|
|
563
|
+
989,
|
|
613
564
|
1101,
|
|
614
565
|
1102,
|
|
615
566
|
1106,
|
|
616
567
|
1108,
|
|
617
568
|
1109,
|
|
618
|
-
1110,
|
|
619
569
|
1111,
|
|
620
570
|
1112,
|
|
621
571
|
1113,
|
|
@@ -623,7 +573,6 @@
|
|
|
623
573
|
1115,
|
|
624
574
|
1116,
|
|
625
575
|
1117,
|
|
626
|
-
1118
|
|
627
|
-
1119
|
|
576
|
+
1118
|
|
628
577
|
]
|
|
629
578
|
}
|