diff --git a/L2J_Mobius_1.0_Ertheia/dist/game/config/ClassMaster.xml b/L2J_Mobius_1.0_Ertheia/dist/game/config/ClassMaster.xml
index 64fd4dc65d..e3efd06e2e 100644
--- a/L2J_Mobius_1.0_Ertheia/dist/game/config/ClassMaster.xml
+++ b/L2J_Mobius_1.0_Ertheia/dist/game/config/ClassMaster.xml
@@ -17,7 +17,7 @@
- SIGEL_CANDIDATE
+ TANKER_CATEGORY
@@ -26,7 +26,7 @@
- TYRR_CANDIDATE
+ WARRIOR_CATEGORY
@@ -35,7 +35,7 @@
- OTHELL_CANDIDATE
+ ROGUE_CATEGORY
@@ -44,7 +44,7 @@
- YUL_CANDIDATE
+ ARCHER_CATEGORY
@@ -53,7 +53,7 @@
- FEOH_CANDIDATE
+ WIZARD_CATEGORY
@@ -62,7 +62,7 @@
- WYNN_CANDIDATE
+ SUMMONER_CATEGORY
@@ -71,7 +71,7 @@
- ISS_CANDIDATE
+ ENCHANTER_CATEGORY
@@ -80,7 +80,7 @@
- AEORE_CANDIDATE
+ HEALER_CATEGORY
@@ -89,7 +89,7 @@
- EVISCERATOR_CANDIDATE
+ ERTHEIA_THIRD_FIGHTER_GROUP
@@ -98,7 +98,7 @@
- SAYHA_SEER_CANDIDATE
+ ERTHEIA_THIRD_WIZARD_GROUP
diff --git a/L2J_Mobius_1.0_Ertheia/dist/game/data/CategoryData.xml b/L2J_Mobius_1.0_Ertheia/dist/game/data/CategoryData.xml
index b4958b1379..a92e1c68c7 100644
--- a/L2J_Mobius_1.0_Ertheia/dist/game/data/CategoryData.xml
+++ b/L2J_Mobius_1.0_Ertheia/dist/game/data/CategoryData.xml
@@ -1,72 +1,77 @@
- 0
- 1
- 2
- 3
- 4
- 5
- 6
- 7
- 8
- 9
- 18
- 19
- 20
- 21
- 22
- 23
- 24
- 31
- 32
- 33
- 34
- 35
- 36
- 37
- 44
- 45
- 46
- 47
- 48
- 53
- 54
- 55
- 56
- 57
- 88
- 89
- 90
- 91
- 92
- 93
- 99
- 100
- 101
- 102
- 106
- 107
- 108
- 109
- 113
- 114
- 117
- 118
- 123
- 124
- 125
- 126
- 127
- 128
- 129
- 130
- 131
- 132
- 133
- 134
- 135
- 136
+ 0
+ 1
+ 2
+ 3
+ 4
+ 5
+ 6
+ 7
+ 8
+ 9
+ 18
+ 19
+ 20
+ 21
+ 22
+ 23
+ 24
+ 31
+ 32
+ 33
+ 34
+ 35
+ 36
+ 37
+ 44
+ 45
+ 46
+ 47
+ 48
+ 53
+ 54
+ 55
+ 56
+ 57
+ 88
+ 89
+ 90
+ 91
+ 92
+ 93
+ 99
+ 100
+ 101
+ 102
+ 106
+ 107
+ 108
+ 109
+ 113
+ 114
+ 117
+ 118
+ 123
+ 124
+ 125
+ 126
+ 127
+ 128
+ 129
+ 130
+ 131
+ 132
+ 133
+ 134
+ 135
+ 136
+ 139
+ 140
+ 141
+ 142
+ 144
148
149
150
@@ -85,49 +90,465 @@
163
164
165
+ 171
+ 172
+ 173
+ 174
+ 175
182
184
186
188
- 10
- 11
- 12
- 13
- 14
- 15
- 16
- 17
- 25
- 26
- 27
- 28
- 29
- 30
- 38
- 39
- 40
- 41
- 42
- 43
- 49
- 50
- 51
- 52
- 94
- 95
- 96
- 97
- 98
- 103
- 104
- 105
- 110
- 111
- 112
- 115
- 116
+ 10
+ 11
+ 12
+ 13
+ 14
+ 15
+ 16
+ 17
+ 25
+ 26
+ 27
+ 28
+ 29
+ 30
+ 38
+ 39
+ 40
+ 41
+ 42
+ 43
+ 49
+ 50
+ 51
+ 52
+ 94
+ 95
+ 96
+ 97
+ 98
+ 103
+ 104
+ 105
+ 110
+ 111
+ 112
+ 115
+ 116
+ 143
+ 145
+ 146
+ 166
+ 167
+ 168
+ 169
+ 170
+ 176
+ 177
+ 178
+ 179
+ 180
+ 181
+ 183
+ 185
+ 187
+ 189
+
+
+ 10
+ 11
+ 12
+ 13
+ 14
+ 25
+ 26
+ 27
+ 28
+ 38
+ 39
+ 40
+ 41
+ 94
+ 95
+ 96
+ 103
+ 104
+ 110
+ 111
+ 49
+ 50
+ 51
+ 52
+ 115
+ 116
+ 143
+ 145
+ 166
+ 167
+ 168
+ 169
+ 170
+ 176
+ 177
+ 178
+ 183
+ 185
+ 187
+ 189
+
+
+ 10
+ 15
+ 16
+ 17
+ 25
+ 29
+ 30
+ 38
+ 42
+ 43
+ 97
+ 98
+ 105
+ 146
+ 179
+ 180
+ 181
+
+
+ 0
+ 1
+ 2
+ 3
+ 7
+ 8
+ 9
+ 18
+ 22
+ 23
+ 24
+ 31
+ 35
+ 36
+ 37
+ 44
+ 45
+ 46
+ 47
+ 48
+ 53
+ 88
+ 89
+ 93
+ 92
+ 102
+ 101
+ 108
+ 109
+ 113
+ 114
+ 123
+ 124
+ 125
+ 126
+ 127
+ 128
+ 129
+ 130
+ 135
+ 131
+ 132
+ 133
+ 134
+ 136
+ 140
+ 141
+ 142
+ 144
+ 152
+ 153
+ 154
+ 155
+ 156
+ 157
+ 158
+ 159
+ 160
+ 161
+ 162
+ 163
+ 164
+ 165
+ 171
+ 172
+ 173
+ 174
+ 175
+ 182
+ 184
+ 186
+ 188
+
+
+ 4
+ 5
+ 6
+ 90
+ 91
+ 19
+ 20
+ 99
+ 32
+ 33
+ 106
+ 54
+ 56
+ 55
+ 57
+ 117
+ 118
+ 139
+ 148
+ 149
+ 150
+ 151
+
+
+ 0
+ 10
+ 18
+ 25
+ 31
+ 38
+ 44
+ 49
+ 53
+ 123
+ 124
+ 182
+ 183
+
+
+ 1
+ 4
+ 7
+ 11
+ 15
+ 19
+ 22
+ 26
+ 29
+ 32
+ 35
+ 39
+ 42
+ 45
+ 47
+ 50
+ 54
+ 56
+ 125
+ 126
+
+
+ 2
+ 3
+ 5
+ 6
+ 8
+ 9
+ 12
+ 13
+ 14
+ 16
+ 17
+ 20
+ 21
+ 23
+ 24
+ 27
+ 28
+ 30
+ 33
+ 34
+ 36
+ 37
+ 40
+ 41
+ 43
+ 46
+ 48
+ 51
+ 52
+ 55
+ 57
+ 127
+ 128
+ 129
+ 130
+ 135
+ 184
+ 185
+
+
+ 88
+ 89
+ 90
+ 91
+ 92
+ 93
+ 94
+ 95
+ 96
+ 97
+ 98
+ 99
+ 100
+ 101
+ 102
+ 103
+ 104
+ 105
+ 106
+ 107
+ 108
+ 109
+ 110
+ 111
+ 112
+ 113
+ 114
+ 115
+ 116
+ 117
+ 118
+ 131
+ 132
+ 133
+ 134
+ 136
+ 186
+ 187
+
+
+ 0
+ 10
+ 18
+ 25
+ 31
+ 38
+ 44
+ 49
+ 53
+ 1
+ 4
+ 7
+ 11
+ 15
+ 19
+ 22
+ 26
+ 29
+ 32
+ 35
+ 39
+ 42
+ 45
+ 47
+ 50
+ 54
+ 56
+ 2
+ 3
+ 5
+ 6
+ 8
+ 9
+ 12
+ 13
+ 14
+ 16
+ 17
+ 20
+ 21
+ 23
+ 24
+ 27
+ 28
+ 30
+ 33
+ 34
+ 36
+ 37
+ 40
+ 41
+ 43
+ 46
+ 48
+ 51
+ 52
+ 55
+ 57
+ 88
+ 89
+ 90
+ 91
+ 92
+ 93
+ 94
+ 95
+ 96
+ 97
+ 98
+ 99
+ 100
+ 101
+ 102
+ 103
+ 104
+ 105
+ 106
+ 107
+ 108
+ 109
+ 110
+ 111
+ 112
+ 113
+ 114
+ 115
+ 116
+ 117
+ 118
+ 139
+ 140
+ 141
+ 142
+ 143
+ 144
+ 145
+ 146
+ 148
+ 149
+ 150
+ 151
+ 152
+ 153
+ 154
+ 155
+ 156
+ 157
+ 158
+ 159
+ 160
+ 161
+ 162
+ 163
+ 164
+ 165
166
167
168
@@ -144,2396 +565,26 @@
179
180
181
+ 182
+ 184
+ 186
+ 188
183
185
- 187
+ 187
189
-
- 10
- 11
- 12
- 13
- 14
- 25
- 26
- 27
- 28
- 38
- 39
- 40
- 41
- 94
- 95
- 96
- 103
- 104
- 110
- 111
- 49
- 50
- 51
- 52
- 115
- 116
- 166
- 167
- 168
- 169
- 170
- 176
- 177
- 178
- 183
-
-
- 10
- 15
- 16
- 17
- 25
- 29
- 30
- 38
- 42
- 43
- 97
- 98
- 105
- 179
- 180
- 181
-
-
- 0
- 1
- 2
- 3
- 7
- 8
- 9
- 18
- 22
- 23
- 24
- 31
- 35
- 36
- 37
- 44
- 45
- 46
- 47
- 48
- 53
- 88
- 89
- 93
- 92
- 102
- 101
- 108
- 109
- 113
- 114
- 123
- 124
- 125
- 126
- 127
- 128
- 129
- 130
- 135
- 131
- 132
- 133
- 134
- 136
- 152
- 153
- 154
- 155
- 156
- 157
- 158
- 159
- 160
- 161
- 162
- 163
- 164
- 165
-
-
- 4
- 5
- 6
- 90
- 91
- 19
- 20
- 99
- 32
- 33
- 106
- 54
- 56
- 55
- 57
- 117
- 118
- 148
- 149
- 150
- 151
-
-
- 0
- 10
- 18
- 25
- 31
- 38
- 44
- 49
- 53
- 123
- 124
- 182
- 183
-
-
- 1
- 4
- 7
- 11
- 15
- 19
- 22
- 26
- 29
- 32
- 35
- 39
- 42
- 45
- 47
- 50
- 54
- 56
- 125
- 126
-
-
- 2
- 3
- 5
- 6
- 8
- 9
- 12
- 13
- 14
- 16
- 17
- 20
- 21
- 23
- 24
- 27
- 28
- 30
- 33
- 34
- 36
- 37
- 40
- 41
- 43
- 46
- 48
- 51
- 52
- 55
- 57
- 127
- 128
- 129
- 130
- 135
- 184
- 185
-
-
- 88
- 89
- 90
- 91
- 92
- 93
- 94
- 95
- 96
- 97
- 98
- 99
- 100
- 101
- 102
- 103
- 104
- 105
- 106
- 107
- 108
- 109
- 110
- 111
- 112
- 113
- 114
- 115
- 116
- 117
- 118
- 131
- 132
- 133
- 134
- 136
- 186
- 187
-
-
- 53
- 54
- 55
- 117
- 161
-
-
- 53
- 56
- 57
- 118
- 156
-
-
- 14001
- 14002
- 14003
- 14004
- 14005
- 14006
- 14007
- 14008
- 14009
- 14010
- 14011
- 14012
- 14013
- 14014
- 14015
- 14016
- 14017
- 14018
- 14019
- 14020
- 14021
- 14022
- 14023
- 14024
- 14025
- 14026
- 14027
- 14028
- 14029
- 14030
- 14031
- 14032
- 14033
- 14034
- 14035
- 14036
- 14037
- 14038
- 14039
- 14040
- 14041
- 14042
- 14043
- 14044
- 14045
- 14046
- 14047
- 14048
- 14049
- 14050
- 14051
- 14052
- 14053
- 14054
- 14055
- 14056
- 14057
- 14058
- 14059
- 14060
- 14061
- 14062
- 14063
- 14064
- 14065
- 14066
- 14067
- 14068
- 14069
- 14070
- 14071
- 14072
- 14073
- 14074
- 14075
- 14076
- 14077
- 14078
- 14079
- 14080
- 14081
- 14082
- 14083
- 14084
- 14085
- 14086
- 14087
- 14088
- 14089
- 14090
- 14091
- 14092
- 14093
- 14094
- 14095
- 14096
- 14097
- 14098
- 14099
- 14100
- 14101
- 14102
- 14103
- 14104
- 14105
- 14106
- 14107
- 14108
- 14109
- 14110
- 14111
- 14112
- 14113
- 14114
- 14115
- 14116
- 14117
- 14118
- 14119
- 14120
- 14121
- 14122
- 14123
- 14124
- 14125
- 14126
- 14127
- 14128
- 14129
- 14130
- 14131
- 14132
- 14133
- 14134
- 14135
- 14136
- 14137
- 14138
- 14139
- 14140
- 14141
- 14142
- 14143
- 14144
- 14145
- 14146
- 14147
- 14148
- 14149
- 14150
- 14151
- 14152
- 14153
- 14154
- 14155
- 14156
- 14157
- 14158
- 14159
- 14160
- 14161
- 14162
- 14163
- 14164
- 14165
- 14166
- 14167
- 14168
- 14169
- 14170
- 14171
- 14172
- 14173
- 14174
- 14175
- 14176
- 14177
- 14178
- 14179
- 14180
- 14181
- 14182
- 14183
- 14184
- 14185
- 14186
- 14187
- 14188
- 14189
- 14190
- 14191
- 14192
- 14193
- 14194
- 14195
- 14196
- 14197
- 14198
- 14199
- 14200
- 14201
- 14202
- 14203
- 14204
- 14205
- 14206
- 14207
- 14208
- 14209
- 14210
- 14211
- 14212
- 14213
- 14214
- 14215
- 14216
- 14217
- 14218
- 14219
- 14220
- 14221
- 14222
- 14223
- 14224
- 14225
- 14226
- 14227
- 14228
- 14229
- 14230
- 14231
- 14232
- 14233
- 14234
- 14235
- 14236
- 14237
- 14238
- 14239
- 14240
- 14241
- 14242
- 14243
- 14244
- 14245
- 14246
- 14247
- 14248
- 14249
- 14250
- 14251
- 14252
- 14253
- 14254
- 14255
- 14256
- 14257
- 14258
- 14259
- 14260
- 14265
- 14266
- 14267
- 14268
- 14269
- 14270
- 14271
- 14272
- 14273
- 14274
- 14275
- 14276
- 14277
- 14278
- 14279
- 14280
- 14281
- 14282
- 14283
- 14284
- 14285
- 14286
- 14287
- 14288
- 14289
- 14290
- 14291
- 14292
- 14293
- 14294
- 14295
- 14296
- 14297
- 14298
- 14299
- 14300
- 14301
- 14302
- 14303
- 14304
- 14305
- 14306
- 14307
- 14308
- 14309
- 14310
- 14311
- 14312
- 14313
- 14314
- 14315
- 14316
- 14317
- 14318
- 14319
- 14320
- 14321
- 14322
- 14323
- 14324
- 14325
- 14326
- 14327
- 14328
- 14329
- 14330
- 14331
- 14332
- 14333
- 14334
- 14335
- 14336
- 14337
- 14338
- 14339
- 14340
- 14341
- 14342
- 14343
- 14344
- 14345
- 14346
- 14347
- 14348
- 14349
- 14350
- 14351
- 14352
- 14353
- 14354
- 14355
- 14356
- 14357
- 14358
- 14359
- 14360
- 14361
- 14362
- 14363
- 14364
- 14365
- 14366
- 14367
- 14368
- 14369
- 14370
- 14371
- 14372
- 14373
- 14374
- 14375
- 14376
- 14377
- 14378
- 14379
- 14380
- 14381
- 14382
- 14383
- 14384
- 14385
- 14386
- 14387
- 14388
- 14389
- 14390
- 14391
- 14392
- 14393
- 14394
- 14395
- 14396
- 14397
- 14398
- 14399
- 14400
- 14401
- 14402
- 14403
- 14404
- 14405
- 14406
- 14407
- 14408
- 14409
- 14410
- 14411
- 14412
- 14413
- 14414
- 14415
- 14416
- 14417
- 14418
- 14419
- 14420
- 14421
- 14422
- 14423
- 14424
- 14425
- 14426
- 14427
- 14428
- 14429
- 14430
- 14431
- 14432
- 14433
- 14434
- 14435
- 14436
- 14437
- 14438
- 14439
- 14440
- 14441
- 14442
- 14443
- 14444
- 14449
- 14450
- 14451
- 14452
- 14453
- 14454
- 14455
- 14456
- 14457
- 14458
- 14459
- 14460
- 14461
- 14462
- 14463
- 14464
- 14465
- 14466
- 14467
- 14468
- 14469
- 14470
- 14471
- 14472
- 14473
- 14474
- 14475
- 14476
- 14477
- 14478
- 14479
- 14480
- 14481
- 14482
- 14483
- 14484
- 14485
- 14486
- 14487
- 14488
- 14489
- 14490
- 14491
- 14492
- 14493
- 14494
- 14495
- 14496
- 14497
- 14498
- 14499
- 14500
- 14501
- 14502
- 14503
- 14504
- 14505
- 14506
- 14507
- 14508
- 14509
- 14510
- 14511
- 14512
- 14513
- 14514
- 14515
- 14516
- 14517
- 14518
- 14519
- 14520
- 14521
- 14522
- 14523
- 14524
- 14525
- 14526
- 14527
- 14528
- 14529
- 14530
- 14531
- 14532
- 14533
- 14534
- 14535
- 14536
- 14537
- 14538
- 14539
- 14540
- 14541
- 14542
- 14543
- 14544
- 14545
- 14546
- 14547
- 14548
- 14549
- 14550
- 14551
- 14552
- 14553
- 14554
- 14555
- 14556
- 14557
- 14558
- 14559
- 14560
- 14561
- 14562
- 14563
- 14564
- 14565
- 14566
- 14567
- 14568
- 14569
- 14570
- 14571
- 14572
- 14573
- 14574
- 14575
- 14576
- 14577
- 14578
- 14579
- 14580
- 14581
- 14582
- 14583
- 14584
- 14585
- 14586
- 14587
- 14588
- 14589
- 14590
- 14591
- 14592
- 14593
- 14594
- 14595
- 14596
- 14597
- 14598
- 14599
- 14600
- 14601
- 14602
- 14603
- 14604
- 14605
- 14606
- 14607
- 14608
- 14609
- 14610
- 14611
- 14612
- 14613
- 14614
- 14615
- 14616
- 14617
- 14618
- 14619
- 14620
- 14621
- 14622
- 14623
- 14624
- 14625
- 14626
- 14627
- 14628
- 14633
- 14634
- 14635
- 14636
- 14637
- 14638
- 14639
- 14640
- 14641
- 14642
- 14643
- 14644
- 14645
- 14646
- 14647
- 14648
- 14649
- 14650
- 14651
- 14652
- 14653
- 14654
- 14655
- 14656
- 14657
- 14658
- 14659
- 14660
- 14661
- 14662
- 14663
- 14664
- 14665
- 14666
- 14667
- 14668
- 14669
- 14670
- 14671
- 14672
- 14673
- 14674
- 14675
- 14676
- 14677
- 14678
- 14679
- 14680
- 14681
- 14682
- 14683
- 14684
- 14685
- 14686
- 14687
- 14688
- 14689
- 14690
- 14691
- 14692
- 14693
- 14694
- 14695
- 14696
- 14697
- 14698
- 14699
- 14700
- 14701
- 14702
- 14703
- 14704
- 14705
- 14706
- 14707
- 14708
- 14709
- 14710
- 14711
- 14712
- 14713
- 14714
- 14715
- 14716
- 14717
- 14718
- 14719
- 14720
- 14721
- 14722
- 14723
- 14724
- 14725
- 14726
- 14727
- 14728
- 14729
- 14730
- 14731
- 14732
- 14733
- 14734
- 14735
- 14736
- 14737
- 14738
- 14739
- 14740
- 14741
- 14742
- 14743
- 14744
- 14745
- 14746
- 14747
- 14748
- 14749
- 14750
- 14751
- 14752
- 14753
- 14754
- 14755
- 14756
- 14757
- 14758
- 14759
- 14760
- 14761
- 14762
- 14763
- 14764
- 14765
- 14766
- 14767
- 14768
- 14769
- 14770
- 14771
- 14772
- 14773
- 14774
- 14775
- 14776
- 14777
- 14778
- 14779
- 14780
- 14781
- 14782
- 14783
- 14784
- 14785
- 14786
- 14787
- 14788
- 14789
- 14790
- 14791
- 14792
- 14793
- 14794
- 14795
- 14796
- 14797
- 14798
- 14799
- 14800
- 14801
- 14802
- 14803
- 14804
- 14805
- 14806
- 14807
- 14808
- 14809
- 14810
- 14811
- 14812
- 14813
- 14814
- 14815
- 14816
- 14817
- 14818
- 14819
- 14820
- 14821
- 14822
- 14823
- 14824
- 14825
- 14826
- 14827
- 14828
- 14829
- 14830
- 14831
- 14832
- 14833
- 14834
- 14835
- 14836
- 14837
- 14838
- 14839
- 14840
- 14841
- 14842
- 14843
- 14844
- 14845
- 14846
- 14847
- 14848
- 14849
- 14850
- 14851
- 14852
- 14853
- 14854
- 14855
- 14856
- 14857
- 14858
- 14859
- 14860
- 14861
- 14862
- 14863
- 14864
- 14865
- 14866
- 14867
- 14868
- 14869
- 12077
- 12311
- 12312
- 12313
- 12526
- 12527
- 12528
- 12564
- 12621
- 12780
- 12781
- 12782
- 16025
- 13071
- 13072
- 13073
- 13074
- 13075
- 13076
- 14870
- 14871
- 14872
- 14873
- 14874
- 14875
- 14876
- 14877
- 14878
- 14879
- 14880
- 14881
- 14882
- 14883
- 14884
- 14885
- 14886
- 14887
- 14888
- 14889
- 14890
- 14891
- 14892
- 14893
- 14894
- 14895
- 14896
- 14897
- 14898
- 14899
- 14900
- 14901
- 14902
- 14903
- 14904
- 14905
- 14906
- 14907
- 14908
- 14909
- 14910
- 14911
- 14912
- 14913
- 14914
- 14915
- 16030
- 16034
- 16035
- 16036
- 16037
- 16038
- 16039
- 16040
- 16041
- 16042
- 16043
- 16044
- 16045
- 16046
- 14916
- 14917
- 14918
- 16050
- 16051
- 16052
- 16053
- 16067
- 16068
- 16071
- 16072
-
-
- 4
- 19
- 32
-
-
- 15
- 29
- 5
- 19
- 4
-
-
- 15
- 29
- 42
- 50
-
-
- 15
- 42
-
-
- 1
- 19
- 32
- 45
- 47
-
-
- 1
- 4
- 7
- 11
- 15
-
-
- 22
- 19
- 26
- 29
-
-
- 35
- 32
- 39
- 42
-
-
- 50
- 45
- 47
-
-
- 54
- 56
-
-
- 12526
- 12527
- 12528
- 16038
- 16039
- 16040
- 16068
-
-
- 12526
- 12527
- 12528
-
-
- 16038
- 16039
- 16040
- 16068
-
-
- 16030
- 16037
- 16041
- 16042
-
-
- 16025
- 16030
- 16037
- 16041
- 16042
-
-
- 12311
- 12312
- 12313
-
-
- 12780
- 12781
- 12782
-
-
- 16034
- 16035
- 16036
-
-
- 12621
-
-
- 12077
- 16025
- 16030
- 16037
- 16041
- 16042
-
-
- 12077
-
-
- 12564
-
-
- 12077
- 12311
- 12312
- 12313
- 12526
- 12527
- 12528
- 12780
- 12781
- 12782
- 16025
- 16030
- 16034
- 16035
- 16036
- 16037
- 16038
- 16039
- 16040
- 16041
- 16042
- 16043
- 16044
- 16045
- 16046
- 16050
- 16051
- 16052
- 16053
- 16067
- 16068
- 16071
- 16072
- 1561
- 1538
- 1562
- 1563
- 1564
- 1565
- 1566
- 1567
- 1568
- 1569
- 1570
- 1571
- 1572
- 1573
-
-
- 12077
- 12311
- 12312
- 12313
- 12526
- 12527
- 12528
- 12780
- 12781
- 12782
- 16025
- 16030
- 16034
- 16035
- 16036
- 16037
- 16038
- 16039
- 16040
- 16041
- 16042
- 16068
- 16067
- 16071
- 16072
- 1561
-
-
- 8
- 23
- 36
- 93
- 101
- 108
-
-
- 9
- 24
- 37
- 92
- 102
- 109
-
-
- 5
- 6
- 33
- 20
- 90
- 91
- 106
- 99
-
-
- 14
- 28
- 41
- 96
- 104
- 111
-
-
- 30
- 43
- 105
- 112
-
-
- 21
- 34
- 100
- 107
-
-
- 12
- 27
- 40
- 94
- 103
- 110
-
-
- 0
- 1
- 4
- 7
- 2
- 3
- 5
- 6
- 8
- 9
- 88
- 89
- 90
- 91
- 92
- 93
-
-
- 10
- 11
- 12
- 13
- 14
- 94
- 95
- 96
-
-
- 10
- 11
- 12
- 13
- 14
- 10
- 15
- 16
- 17
- 95
- 96
- 97
- 98
-
-
- 10
- 15
- 16
- 17
- 97
- 98
-
-
- 18
- 19
- 22
- 20
- 21
- 23
- 24
- 99
- 100
- 101
- 102
-
-
- 25
- 26
- 27
- 28
- 25
- 29
- 30
- 103
- 104
- 105
-
-
- 25
- 26
- 27
- 28
- 103
- 104
-
-
- 25
- 29
- 30
- 105
-
-
- 31
- 32
- 35
- 33
- 34
- 36
- 37
- 106
- 107
- 108
- 109
-
-
- 38
- 39
- 42
- 40
- 41
- 43
- 110
- 111
- 112
-
-
- 38
- 39
- 40
- 41
- 110
- 111
-
-
- 38
- 42
- 43
- 112
-
-
- 44
- 45
- 47
- 46
- 48
- 113
- 114
-
-
- 49
- 50
- 51
- 52
- 115
- 116
-
-
- 53
- 54
- 56
- 55
- 57
- 117
- 118
-
-
- 53
- 54
- 55
- 117
-
-
- 53
- 56
- 57
- 118
-
-
- 123
- 124
- 125
- 126
- 127
- 128
- 129
- 130
- 131
- 132
- 133
- 134
- 135
- 136
-
-
- 123
- 124
-
-
- 125
- 126
-
-
- 127
- 128
- 129
- 130
- 135
-
-
- 131
- 132
- 133
- 134
- 136
-
-
- 0
- 1
- 2
- 3
- 4
- 5
- 6
- 7
- 8
- 9
- 18
- 19
- 20
- 21
- 22
- 23
- 24
- 31
- 32
- 33
- 34
- 35
- 36
- 37
- 44
- 45
- 46
- 47
- 48
- 49
- 50
- 51
- 52
- 53
- 54
- 55
- 56
- 57
- 123
- 124
- 125
- 126
- 127
- 128
- 129
- 130
- 135
-
-
- 10
- 11
- 12
- 13
- 14
- 15
- 16
- 17
- 25
- 26
- 27
- 28
- 29
- 30
- 38
- 39
- 40
- 41
- 42
- 43
-
-
- 123
- 125
- 127
- 128
- 131
- 132
- 129
- 133
- 135
- 136
-
-
- 124
- 126
- 129
- 130
- 133
- 134
- 128
- 132
- 135
- 136
-
-
- 9
- 24
- 37
- 92
- 102
- 109
-
-
- 90
- 91
- 99
- 106
-
-
- 100
- 107
-
-
- 88
- 114
-
-
- 89
- 113
- 117
- 118
- 131
- 132
- 133
-
-
- 92
- 102
- 109
- 134
-
-
- 93
- 101
- 108
- 117
- 158
- 159
- 160
- 161
-
-
- 97
- 105
- 112
-
-
- 94
- 103
- 110
- 95
-
-
- 98
- 115
- 116
- 136
-
-
- 96
- 104
- 111
-
-
- 90
- 91
- 99
- 106
- 100
- 107
- 88
- 114
- 89
- 113
- 117
- 118
-
-
- 92
- 102
- 109
- 134
- 93
- 101
- 108
-
-
- 97
- 105
- 112
- 94
- 103
- 110
- 95
- 98
- 115
- 116
- 136
- 96
- 104
- 111
-
-
- 20
- 33
- 5
- 6
- 90
- 91
- 99
- 106
-
-
- 21
- 34
- 100
- 107
-
-
- 48
- 2
- 88
- 114
-
-
- 3
- 127
- 128
- 129
- 46
- 55
- 57
- 89
- 113
- 117
- 118
- 131
- 132
- 133
-
-
- 24
- 130
- 37
- 9
- 92
- 102
- 109
- 134
-
-
- 36
- 23
- 8
- 93
- 101
- 108
-
-
- 16
- 30
- 43
- 97
- 105
- 112
-
-
- 27
- 40
- 12
- 13
- 94
- 103
- 110
- 95
-
-
- 135
- 17
- 51
- 52
- 98
- 115
- 116
- 136
-
-
- 14
- 28
- 41
- 96
- 104
- 111
-
-
- 14
- 28
- 41
- 96
- 104
- 111
-
-
- 3
- 127
- 128
- 129
- 46
- 55
- 57
- 48
- 2
- 89
- 131
- 113
- 117
- 118
- 132
- 133
- 114
- 88
-
-
- 8
- 23
- 36
- 93
- 101
- 108
- 9
- 24
- 37
- 92
- 102
- 109
- 130
- 134
-
-
- 5
- 6
- 33
- 20
- 90
- 91
- 106
- 99
-
-
- 14
- 28
- 41
- 96
- 104
- 111
-
-
- 12
- 27
- 40
- 13
- 94
- 103
- 110
- 95
-
-
- 16
- 30
- 43
- 97
- 105
- 112
-
-
- 17
- 51
- 52
- 21
- 34
- 135
- 98
- 115
- 116
- 100
- 107
- 136
-
-
- 16
- 30
- 97
- 105
- 17
- 98
-
-
- 12
- 94
- 27
- 103
- 13
- 95
- 14
- 96
- 28
- 104
-
-
- 2
- 88
- 3
- 89
- 5
- 90
- 6
- 91
- 8
- 93
- 9
- 92
- 20
- 99
- 21
- 100
- 23
- 101
- 24
- 102
-
-
- 46
- 113
- 48
- 114
- 51
- 115
- 52
- 116
-
-
- 55
- 117
-
-
- 57
- 118
-
-
- 36
- 108
- 37
- 109
- 33
- 106
- 41
- 111
- 40
- 110
- 43
- 112
- 34
- 107
-
-
- 127
- 131
- 128
- 132
- 129
- 133
- 135
- 136
- 130
- 134
-
-
- 5
- 20
- 90
- 99
-
-
- 6
- 33
- 91
- 106
-
-
- 0
- 1
- 2
- 3
- 4
- 5
- 6
- 7
- 8
- 18
- 19
- 20
- 21
- 22
- 23
- 31
- 32
- 33
- 34
- 35
- 36
- 44
- 45
- 46
- 47
- 48
- 53
- 54
- 55
- 56
- 57
- 88
- 89
- 90
- 91
- 93
- 99
- 100
- 101
- 106
- 107
- 108
- 113
- 114
- 117
- 118
- 123
- 124
- 125
- 126
- 127
- 128
- 129
- 131
- 132
- 133
- 135
- 136
-
-
- 4
- 5
- 6
- 19
- 32
- 20
- 21
- 33
- 34
- 90
- 91
- 99
- 100
- 106
- 107
-
-
- 11
- 15
- 26
- 29
- 39
- 42
- 12
- 13
- 14
- 16
- 17
- 27
- 28
- 30
- 40
- 41
- 43
- 94
- 95
- 96
- 97
- 98
- 103
- 104
- 105
- 110
- 111
- 112
-
-
- 1
- 2
- 3
- 54
- 56
- 55
- 57
- 117
- 118
- 88
- 89
-
-
- 7
- 22
- 35
- 8
- 9
- 23
- 24
- 36
- 37
- 92
- 93
- 101
- 102
- 108
- 109
-
-
- 125
- 126
- 127
- 128
- 129
- 130
- 135
- 131
- 132
- 133
- 134
- 136
-
-
- 45
- 47
- 46
- 48
- 113
- 114
-
-
- 50
- 51
- 52
- 115
- 116
-
-
- 16067
- 16071
- 16072
-
-
- 18869
- 18870
- 18871
- 18872
- 18873
- 18874
- 18875
- 18876
- 18877
- 18878
- 18879
- 18880
- 18881
- 18882
- 18883
- 18884
- 18885
- 18886
- 18887
- 18888
- 18889
- 18890
- 18891
- 18892
- 18893
- 18894
- 18895
- 18896
- 18897
- 18898
- 18899
- 18900
- 18901
- 18902
- 18903
- 18904
-
-
- 18905
- 18906
- 18907
-
-
- 18850
- 18851
- 18852
-
-
+
+ 139
+ 140
+ 141
+ 142
+ 143
+ 144
+ 145
+ 146
+
+
148
149
150
@@ -2571,99 +622,13 @@
188
189
-
- 25867
- 25868
- 19160
- 19172
- 25796
- 25881
- 25797
- 25799
- 29179
- 29180
- 25876
- 25877
- 29194
- 29212
- 29195
- 29196
- 29218
- 29213
- 25837
- 25840
- 25845
- 25841
- 25838
- 25839
- 25846
- 25825
- 29068
-
-
- 90
- 91
- 99
- 106
-
-
- 88
- 89
- 131
- 113
- 118
- 114
-
-
- 93
- 101
- 108
- 117
-
-
- 92
- 102
- 109
- 134
-
-
- 94
- 95
- 103
- 110
- 132
- 133
-
-
- 98
- 115
- 116
- 100
- 107
-
-
- 96
- 104
- 111
-
-
- 97
- 105
- 112
-
-
- 186
-
-
- 187
-
-
+
148
149
150
151
-
+
152
153
154
@@ -2671,40 +636,5098 @@
156
157
-
+
158
159
160
161
-
+
162
163
164
165
-
+
166
167
168
169
170
-
+
171
172
173
174
175
-
+
176
177
178
-
+
179
180
181
+
+ 53
+ 54
+ 55
+ 117
+ 161
+
+
+ 53
+ 56
+ 57
+ 118
+ 156
+
+
+ 14001
+ 14002
+ 14003
+ 14004
+ 14005
+ 14006
+ 14007
+ 14008
+ 14009
+ 14010
+ 14011
+ 14012
+ 14013
+ 14014
+ 14015
+ 14016
+ 14017
+ 14018
+ 14019
+ 14020
+ 14021
+ 14022
+ 14023
+ 14024
+ 14025
+ 14026
+ 14027
+ 14028
+ 14029
+ 14030
+ 14031
+ 14032
+ 14033
+ 14034
+ 14035
+ 14036
+ 14037
+ 14038
+ 14039
+ 14040
+ 14041
+ 14042
+ 14043
+ 14044
+ 14045
+ 14046
+ 14047
+ 14048
+ 14049
+ 14050
+ 14051
+ 14052
+ 14053
+ 14054
+ 14055
+ 14056
+ 14057
+ 14058
+ 14059
+ 14060
+ 14061
+ 14062
+ 14063
+ 14064
+ 14065
+ 14066
+ 14067
+ 14068
+ 14069
+ 14070
+ 14071
+ 14072
+ 14073
+ 14074
+ 14075
+ 14076
+ 14077
+ 14078
+ 14079
+ 14080
+ 14081
+ 14082
+ 14083
+ 14084
+ 14085
+ 14086
+ 14087
+ 14088
+ 14089
+ 14090
+ 14091
+ 14092
+ 14093
+ 14094
+ 14095
+ 14096
+ 14097
+ 14098
+ 14099
+ 14100
+ 14101
+ 14102
+ 14103
+ 14104
+ 14105
+ 14106
+ 14107
+ 14108
+ 14109
+ 14110
+ 14111
+ 14112
+ 14113
+ 14114
+ 14115
+ 14116
+ 14117
+ 14118
+ 14119
+ 14120
+ 14121
+ 14122
+ 14123
+ 14124
+ 14125
+ 14126
+ 14127
+ 14128
+ 14129
+ 14130
+ 14131
+ 14132
+ 14133
+ 14134
+ 14135
+ 14136
+ 14137
+ 14138
+ 14139
+ 14140
+ 14141
+ 14142
+ 14143
+ 14144
+ 14145
+ 14146
+ 14147
+ 14148
+ 14149
+ 14150
+ 14151
+ 14152
+ 14153
+ 14154
+ 14155
+ 14156
+ 14157
+ 14158
+ 14159
+ 14160
+ 14161
+ 14162
+ 14163
+ 14164
+ 14165
+ 14166
+ 14167
+ 14168
+ 14169
+ 14170
+ 14171
+ 14172
+ 14173
+ 14174
+ 14175
+ 14176
+ 14177
+ 14178
+ 14179
+ 14180
+ 14181
+ 14182
+ 14183
+ 14184
+ 14185
+ 14186
+ 14187
+ 14188
+ 14189
+ 14190
+ 14191
+ 14192
+ 14193
+ 14194
+ 14195
+ 14196
+ 14197
+ 14198
+ 14199
+ 14200
+ 14201
+ 14202
+ 14203
+ 14204
+ 14205
+ 14206
+ 14207
+ 14208
+ 14209
+ 14210
+ 14211
+ 14212
+ 14213
+ 14214
+ 14215
+ 14216
+ 14217
+ 14218
+ 14219
+ 14220
+ 14221
+ 14222
+ 14223
+ 14224
+ 14225
+ 14226
+ 14227
+ 14228
+ 14229
+ 14230
+ 14231
+ 14232
+ 14233
+ 14234
+ 14235
+ 14236
+ 14237
+ 14238
+ 14239
+ 14240
+ 14241
+ 14242
+ 14243
+ 14244
+ 14245
+ 14246
+ 14247
+ 14248
+ 14249
+ 14250
+ 14251
+ 14252
+ 14253
+ 14254
+ 14255
+ 14256
+ 14257
+ 14258
+ 14259
+ 14260
+ 14265
+ 14266
+ 14267
+ 14268
+ 14269
+ 14270
+ 14271
+ 14272
+ 14273
+ 14274
+ 14275
+ 14276
+ 14277
+ 14278
+ 14279
+ 14280
+ 14281
+ 14282
+ 14283
+ 14284
+ 14285
+ 14286
+ 14287
+ 14288
+ 14289
+ 14290
+ 14291
+ 14292
+ 14293
+ 14294
+ 14295
+ 14296
+ 14297
+ 14298
+ 14299
+ 14300
+ 14301
+ 14302
+ 14303
+ 14304
+ 14305
+ 14306
+ 14307
+ 14308
+ 14309
+ 14310
+ 14311
+ 14312
+ 14313
+ 14314
+ 14315
+ 14316
+ 14317
+ 14318
+ 14319
+ 14320
+ 14321
+ 14322
+ 14323
+ 14324
+ 14325
+ 14326
+ 14327
+ 14328
+ 14329
+ 14330
+ 14331
+ 14332
+ 14333
+ 14334
+ 14335
+ 14336
+ 14337
+ 14338
+ 14339
+ 14340
+ 14341
+ 14342
+ 14343
+ 14344
+ 14345
+ 14346
+ 14347
+ 14348
+ 14349
+ 14350
+ 14351
+ 14352
+ 14353
+ 14354
+ 14355
+ 14356
+ 14357
+ 14358
+ 14359
+ 14360
+ 14361
+ 14362
+ 14363
+ 14364
+ 14365
+ 14366
+ 14367
+ 14368
+ 14369
+ 14370
+ 14371
+ 14372
+ 14373
+ 14374
+ 14375
+ 14376
+ 14377
+ 14378
+ 14379
+ 14380
+ 14381
+ 14382
+ 14383
+ 14384
+ 14385
+ 14386
+ 14387
+ 14388
+ 14389
+ 14390
+ 14391
+ 14392
+ 14393
+ 14394
+ 14395
+ 14396
+ 14397
+ 14398
+ 14399
+ 14400
+ 14401
+ 14402
+ 14403
+ 14404
+ 14405
+ 14406
+ 14407
+ 14408
+ 14409
+ 14410
+ 14411
+ 14412
+ 14413
+ 14414
+ 14415
+ 14416
+ 14417
+ 14418
+ 14419
+ 14420
+ 14421
+ 14422
+ 14423
+ 14424
+ 14425
+ 14426
+ 14427
+ 14428
+ 14429
+ 14430
+ 14431
+ 14432
+ 14433
+ 14434
+ 14435
+ 14436
+ 14437
+ 14438
+ 14439
+ 14440
+ 14441
+ 14442
+ 14443
+ 14444
+ 14449
+ 14450
+ 14451
+ 14452
+ 14453
+ 14454
+ 14455
+ 14456
+ 14457
+ 14458
+ 14459
+ 14460
+ 14461
+ 14462
+ 14463
+ 14464
+ 14465
+ 14466
+ 14467
+ 14468
+ 14469
+ 14470
+ 14471
+ 14472
+ 14473
+ 14474
+ 14475
+ 14476
+ 14477
+ 14478
+ 14479
+ 14480
+ 14481
+ 14482
+ 14483
+ 14484
+ 14485
+ 14486
+ 14487
+ 14488
+ 14489
+ 14490
+ 14491
+ 14492
+ 14493
+ 14494
+ 14495
+ 14496
+ 14497
+ 14498
+ 14499
+ 14500
+ 14501
+ 14502
+ 14503
+ 14504
+ 14505
+ 14506
+ 14507
+ 14508
+ 14509
+ 14510
+ 14511
+ 14512
+ 14513
+ 14514
+ 14515
+ 14516
+ 14517
+ 14518
+ 14519
+ 14520
+ 14521
+ 14522
+ 14523
+ 14524
+ 14525
+ 14526
+ 14527
+ 14528
+ 14529
+ 14530
+ 14531
+ 14532
+ 14533
+ 14534
+ 14535
+ 14536
+ 14537
+ 14538
+ 14539
+ 14540
+ 14541
+ 14542
+ 14543
+ 14544
+ 14545
+ 14546
+ 14547
+ 14548
+ 14549
+ 14550
+ 14551
+ 14552
+ 14553
+ 14554
+ 14555
+ 14556
+ 14557
+ 14558
+ 14559
+ 14560
+ 14561
+ 14562
+ 14563
+ 14564
+ 14565
+ 14566
+ 14567
+ 14568
+ 14569
+ 14570
+ 14571
+ 14572
+ 14573
+ 14574
+ 14575
+ 14576
+ 14577
+ 14578
+ 14579
+ 14580
+ 14581
+ 14582
+ 14583
+ 14584
+ 14585
+ 14586
+ 14587
+ 14588
+ 14589
+ 14590
+ 14591
+ 14592
+ 14593
+ 14594
+ 14595
+ 14596
+ 14597
+ 14598
+ 14599
+ 14600
+ 14601
+ 14602
+ 14603
+ 14604
+ 14605
+ 14606
+ 14607
+ 14608
+ 14609
+ 14610
+ 14611
+ 14612
+ 14613
+ 14614
+ 14615
+ 14616
+ 14617
+ 14618
+ 14619
+ 14620
+ 14621
+ 14622
+ 14623
+ 14624
+ 14625
+ 14626
+ 14627
+ 14628
+ 14633
+ 14634
+ 14635
+ 14636
+ 14637
+ 14638
+ 14639
+ 14640
+ 14641
+ 14642
+ 14643
+ 14644
+ 14645
+ 14646
+ 14647
+ 14648
+ 14649
+ 14650
+ 14651
+ 14652
+ 14653
+ 14654
+ 14655
+ 14656
+ 14657
+ 14658
+ 14659
+ 14660
+ 14661
+ 14662
+ 14663
+ 14664
+ 14665
+ 14666
+ 14667
+ 14668
+ 14669
+ 14670
+ 14671
+ 14672
+ 14673
+ 14674
+ 14675
+ 14676
+ 14677
+ 14678
+ 14679
+ 14680
+ 14681
+ 14682
+ 14683
+ 14684
+ 14685
+ 14686
+ 14687
+ 14688
+ 14689
+ 14690
+ 14691
+ 14692
+ 14693
+ 14694
+ 14695
+ 14696
+ 14697
+ 14698
+ 14699
+ 14700
+ 14701
+ 14702
+ 14703
+ 14704
+ 14705
+ 14706
+ 14707
+ 14708
+ 14709
+ 14710
+ 14711
+ 14712
+ 14713
+ 14714
+ 14715
+ 14716
+ 14717
+ 14718
+ 14719
+ 14720
+ 14721
+ 14722
+ 14723
+ 14724
+ 14725
+ 14726
+ 14727
+ 14728
+ 14729
+ 14730
+ 14731
+ 14732
+ 14733
+ 14734
+ 14735
+ 14736
+ 14737
+ 14738
+ 14739
+ 14740
+ 14741
+ 14742
+ 14743
+ 14744
+ 14745
+ 14746
+ 14747
+ 14748
+ 14749
+ 14750
+ 14751
+ 14752
+ 14753
+ 14754
+ 14755
+ 14756
+ 14757
+ 14758
+ 14759
+ 14760
+ 14761
+ 14762
+ 14763
+ 14764
+ 14765
+ 14766
+ 14767
+ 14768
+ 14769
+ 14770
+ 14771
+ 14772
+ 14773
+ 14774
+ 14775
+ 14776
+ 14777
+ 14778
+ 14779
+ 14780
+ 14781
+ 14782
+ 14783
+ 14784
+ 14785
+ 14786
+ 14787
+ 14788
+ 14789
+ 14790
+ 14791
+ 14792
+ 14793
+ 14794
+ 14795
+ 14796
+ 14797
+ 14798
+ 14799
+ 14800
+ 14801
+ 14802
+ 14803
+ 14804
+ 14805
+ 14806
+ 14807
+ 14808
+ 14809
+ 14810
+ 14811
+ 14812
+ 14813
+ 14814
+ 14815
+ 14816
+ 14817
+ 14818
+ 14819
+ 14820
+ 14821
+ 14822
+ 14823
+ 14824
+ 14825
+ 14826
+ 14827
+ 14828
+ 14829
+ 14830
+ 14831
+ 14832
+ 14833
+ 14834
+ 14835
+ 14836
+ 14837
+ 14838
+ 14839
+ 14840
+ 14841
+ 14842
+ 14843
+ 14844
+ 14845
+ 14846
+ 14847
+ 14848
+ 14849
+ 14850
+ 14851
+ 14852
+ 14853
+ 14854
+ 14855
+ 14856
+ 14857
+ 14858
+ 14859
+ 14860
+ 14861
+ 14862
+ 14863
+ 14864
+ 14865
+ 14866
+ 14867
+ 14868
+ 14869
+ 12077
+ 12311
+ 12312
+ 12313
+ 12526
+ 12527
+ 12528
+ 12564
+ 12621
+ 12780
+ 12781
+ 12782
+ 16025
+ 13071
+ 13072
+ 13073
+ 13074
+ 13075
+ 13076
+ 14870
+ 14871
+ 14872
+ 14873
+ 14874
+ 14875
+ 14876
+ 14877
+ 14878
+ 14879
+ 14880
+ 14881
+ 14882
+ 14883
+ 14884
+ 14885
+ 14886
+ 14887
+ 14888
+ 14889
+ 14890
+ 14891
+ 14892
+ 14893
+ 14894
+ 14895
+ 14896
+ 14897
+ 14898
+ 14899
+ 14900
+ 14901
+ 14902
+ 14903
+ 14904
+ 14905
+ 14906
+ 14907
+ 14908
+ 14909
+ 14910
+ 14911
+ 14912
+ 14913
+ 14914
+ 14915
+ 16030
+ 16034
+ 16035
+ 16036
+ 16037
+ 16038
+ 16039
+ 16040
+ 16041
+ 16042
+ 16043
+ 16044
+ 16045
+ 16046
+ 14916
+ 14917
+ 14918
+ 16050
+ 16051
+ 16052
+ 16053
+ 16067
+ 16068
+ 16071
+ 16072
+ 13302
+ 13303
+ 13304
+ 13305
+ 14929
+ 14930
+ 14931
+ 14947
+ 14948
+ 14949
+ 14950
+ 14951
+ 14952
+ 14953
+ 14954
+ 14955
+ 14956
+ 14957
+ 14958
+ 14959
+ 14960
+ 14961
+ 14962
+ 14963
+ 14964
+ 14965
+ 14966
+ 14967
+ 14926
+ 14932
+ 14940
+ 14941
+ 14942
+ 14986
+ 14987
+ 14988
+ 14989
+ 14990
+ 14991
+ 14992
+ 14993
+ 14994
+ 14995
+ 14996
+ 14997
+ 14998
+ 14999
+ 14936
+ 14937
+ 14938
+ 14939
+ 14974
+ 14975
+ 14976
+ 14977
+ 14978
+ 14979
+ 14980
+ 14981
+ 14982
+ 14983
+ 14984
+ 14985
+ 14933
+ 14943
+ 15010
+ 15011
+ 15012
+ 15013
+ 15014
+ 15015
+ 15016
+ 15017
+ 15018
+ 15019
+ 15020
+ 15021
+ 14925
+ 14944
+ 14945
+ 14946
+ 15000
+ 15001
+ 15002
+ 15003
+ 15004
+ 15005
+ 15006
+ 15007
+ 15008
+ 15009
+ 14968
+ 14969
+ 14970
+ 14927
+ 14928
+ 15022
+ 15023
+ 15024
+ 15025
+ 15026
+ 15027
+ 15028
+ 15029
+ 15030
+ 15031
+ 15032
+ 15033
+ 15034
+ 15035
+ 15036
+ 15037
+ 15038
+ 15039
+ 15040
+ 15041
+ 15042
+ 15043
+ 15044
+ 15045
+ 15046
+ 15047
+ 15048
+ 15049
+ 15050
+ 15051
+ 15053
+ 15054
+ 15055
+ 15056
+ 15057
+ 15058
+ 15059
+ 15060
+ 15061
+ 15062
+ 15063
+ 15064
+ 15065
+ 1562
+ 1563
+ 1564
+ 1565
+ 1566
+ 1567
+ 1568
+ 1569
+ 1570
+ 1571
+ 1572
+ 1573
+ 16094
+ 16095
+ 16096
+ 16097
+
+
+ 4
+ 19
+ 32
+
+
+ 15
+ 29
+ 5
+ 19
+ 4
+
+
+ 15
+ 29
+ 42
+ 50
+
+
+ 15
+ 42
+
+
+ 1
+ 19
+ 32
+ 45
+ 47
+
+
+ 1
+ 4
+ 7
+ 11
+ 15
+
+
+ 22
+ 19
+ 26
+ 29
+
+
+ 35
+ 32
+ 39
+ 42
+
+
+ 50
+ 45
+ 47
+
+
+ 54
+ 56
+
+
+ 12526
+ 12527
+ 12528
+ 16038
+ 16039
+ 16040
+ 16068
+
+
+ 12526
+ 12527
+ 12528
+
+
+ 16038
+ 16039
+ 16040
+ 16068
+
+
+ 16030
+ 16037
+ 16041
+ 16042
+
+
+ 16025
+ 16030
+ 16037
+ 16041
+ 16042
+
+
+ 12311
+ 12312
+ 12313
+
+
+ 12780
+ 12781
+ 12782
+
+
+ 16034
+ 16035
+ 16036
+
+
+ 12621
+
+
+ 12077
+ 16025
+ 16030
+ 16037
+ 16041
+ 16042
+
+
+ 12077
+
+
+ 12564
+
+
+ 12077
+ 12311
+ 12312
+ 12313
+ 12526
+ 12527
+ 12528
+ 12780
+ 12781
+ 12782
+ 16025
+ 16030
+ 16034
+ 16035
+ 16036
+ 16037
+ 16038
+ 16039
+ 16040
+ 16041
+ 16042
+ 16043
+ 16044
+ 16045
+ 16046
+ 16050
+ 16051
+ 16052
+ 16053
+ 16067
+ 16068
+ 16071
+ 16072
+ 1561
+ 1538
+ 1562
+ 1563
+ 1564
+ 1565
+ 1566
+ 1567
+ 1568
+ 1569
+ 1570
+ 1571
+ 1572
+ 1573
+ 16094
+ 16095
+ 16096
+ 16097
+
+
+ 12077
+ 12311
+ 12312
+ 12313
+ 12526
+ 12527
+ 12528
+ 12780
+ 12781
+ 12782
+ 16025
+ 16030
+ 16034
+ 16035
+ 16036
+ 16037
+ 16038
+ 16039
+ 16040
+ 16041
+ 16042
+ 16068
+ 16067
+ 16071
+ 16072
+ 1561
+
+
+ 8
+ 23
+ 36
+ 93
+ 101
+ 108
+
+
+ 9
+ 24
+ 37
+ 92
+ 102
+ 109
+
+
+ 5
+ 6
+ 33
+ 20
+ 90
+ 91
+ 106
+ 99
+
+
+ 14
+ 28
+ 41
+ 96
+ 104
+ 111
+
+
+ 30
+ 43
+ 105
+ 112
+
+
+ 21
+ 34
+ 100
+ 107
+
+
+ 12
+ 27
+ 40
+ 94
+ 103
+ 110
+
+
+ 0
+ 1
+ 4
+ 7
+ 2
+ 3
+ 5
+ 6
+ 8
+ 9
+ 88
+ 89
+ 90
+ 91
+ 92
+ 93
+ 152
+ 153
+ 148
+ 149
+ 162
+ 158
+
+
+ 10
+ 11
+ 12
+ 13
+ 14
+ 94
+ 95
+ 96
+ 166
+ 167
+ 176
+
+
+ 10
+ 11
+ 12
+ 13
+ 14
+ 10
+ 15
+ 16
+ 17
+ 95
+ 96
+ 97
+ 98
+ 167
+ 176
+ 179
+ 171
+
+
+ 10
+ 15
+ 16
+ 17
+ 97
+ 98
+ 179
+ 171
+
+
+ 18
+ 19
+ 22
+ 20
+ 21
+ 23
+ 24
+ 99
+ 100
+ 101
+ 102
+ 150
+ 172
+ 159
+ 163
+
+
+ 25
+ 26
+ 27
+ 28
+ 25
+ 29
+ 30
+ 103
+ 104
+ 105
+ 168
+ 177
+ 180
+
+
+ 25
+ 26
+ 27
+ 28
+ 103
+ 104
+ 168
+ 177
+
+
+ 25
+ 29
+ 30
+ 105
+ 180
+
+
+ 31
+ 32
+ 35
+ 33
+ 34
+ 36
+ 37
+ 106
+ 107
+ 108
+ 109
+ 151
+ 173
+ 160
+ 164
+
+
+ 38
+ 39
+ 42
+ 40
+ 41
+ 43
+ 110
+ 111
+ 112
+ 169
+ 178
+ 181
+
+
+ 38
+ 39
+ 40
+ 41
+ 110
+ 111
+ 169
+ 178
+
+
+ 38
+ 42
+ 43
+ 112
+ 181
+
+
+ 44
+ 45
+ 47
+ 46
+ 48
+ 113
+ 114
+ 154
+ 155
+
+
+ 49
+ 50
+ 51
+ 52
+ 115
+ 116
+ 174
+ 175
+
+
+ 53
+ 54
+ 56
+ 55
+ 57
+ 117
+ 118
+ 161
+ 156
+
+
+ 53
+ 54
+ 55
+ 117
+ 161
+
+
+ 53
+ 56
+ 57
+ 118
+ 156
+
+
+ 123
+ 124
+ 125
+ 126
+ 127
+ 128
+ 129
+ 130
+ 131
+ 132
+ 133
+ 134
+ 135
+ 136
+ 157
+ 165
+ 170
+
+
+ 123
+ 124
+
+
+ 125
+ 126
+
+
+ 127
+ 128
+ 129
+ 130
+ 135
+
+
+ 131
+ 132
+ 133
+ 134
+ 136
+
+
+ 0
+ 1
+ 2
+ 3
+ 4
+ 5
+ 6
+ 7
+ 8
+ 9
+ 18
+ 19
+ 20
+ 21
+ 22
+ 23
+ 24
+ 31
+ 32
+ 33
+ 34
+ 35
+ 36
+ 37
+ 44
+ 45
+ 46
+ 47
+ 48
+ 49
+ 50
+ 51
+ 52
+ 53
+ 54
+ 55
+ 56
+ 57
+ 123
+ 124
+ 125
+ 126
+ 127
+ 128
+ 129
+ 130
+ 135
+ 182
+ 184
+
+
+ 10
+ 11
+ 12
+ 13
+ 14
+ 15
+ 16
+ 17
+ 25
+ 26
+ 27
+ 28
+ 29
+ 30
+ 38
+ 39
+ 40
+ 41
+ 42
+ 43
+ 183
+ 185
+
+
+ 123
+ 125
+ 127
+ 128
+ 131
+ 132
+ 129
+ 133
+ 135
+ 136
+
+
+ 124
+ 126
+ 129
+ 130
+ 133
+ 134
+ 128
+ 132
+ 135
+ 136
+
+
+ 9
+ 24
+ 37
+ 92
+ 102
+ 109
+
+
+ 90
+ 91
+ 99
+ 106
+
+
+ 100
+ 107
+
+
+ 88
+ 114
+
+
+ 89
+ 113
+ 117
+ 118
+ 131
+ 132
+ 133
+
+
+ 92
+ 102
+ 109
+ 134
+
+
+ 93
+ 101
+ 108
+ 117
+ 141
+ 139
+ 140
+ 141
+ 142
+ 143
+ 144
+ 145
+ 146
+ 148
+ 149
+ 150
+ 151
+ 152
+ 153
+ 154
+ 155
+ 156
+ 157
+ 158
+ 159
+ 160
+ 161
+ 162
+ 163
+ 164
+ 165
+ 166
+ 167
+ 168
+ 169
+ 170
+ 171
+ 172
+ 173
+ 174
+ 175
+ 176
+ 177
+ 178
+ 179
+ 180
+ 181
+
+
+ 97
+ 105
+ 112
+
+
+ 94
+ 103
+ 110
+ 95
+
+
+ 98
+ 115
+ 116
+ 136
+
+
+ 96
+ 104
+ 111
+
+
+ 90
+ 91
+ 99
+ 106
+ 100
+ 107
+ 88
+ 114
+ 89
+ 113
+ 117
+ 118
+
+
+ 92
+ 102
+ 109
+ 134
+ 93
+ 101
+ 108
+
+
+ 97
+ 105
+ 112
+ 94
+ 103
+ 110
+ 95
+ 98
+ 115
+ 116
+ 136
+ 96
+ 104
+ 111
+
+
+ 20
+ 33
+ 5
+ 6
+ 90
+ 91
+ 99
+ 106
+ 143
+ 145
+ 146
+ 139
+ 140
+ 141
+ 142
+ 144
+ 166
+ 167
+ 168
+ 169
+ 170
+ 176
+ 177
+ 178
+ 179
+ 180
+ 181
+ 148
+ 149
+ 150
+ 151
+ 152
+ 153
+ 154
+ 155
+ 156
+ 157
+ 158
+ 159
+ 160
+ 161
+ 162
+ 163
+ 164
+ 165
+ 171
+ 172
+ 173
+ 174
+ 175
+
+
+ 21
+ 34
+ 100
+ 107
+ 143
+ 145
+ 146
+ 139
+ 140
+ 141
+ 142
+ 144
+ 166
+ 167
+ 168
+ 169
+ 170
+ 176
+ 177
+ 178
+ 179
+ 180
+ 181
+ 148
+ 149
+ 150
+ 151
+ 152
+ 153
+ 154
+ 155
+ 156
+ 157
+ 158
+ 159
+ 160
+ 161
+ 162
+ 163
+ 164
+ 165
+ 171
+ 172
+ 173
+ 174
+ 175
+
+
+ 48
+ 2
+ 88
+ 114
+ 143
+ 145
+ 146
+ 139
+ 140
+ 141
+ 142
+ 144
+ 166
+ 167
+ 168
+ 169
+ 170
+ 176
+ 177
+ 178
+ 179
+ 180
+ 181
+ 148
+ 149
+ 150
+ 151
+ 152
+ 153
+ 154
+ 155
+ 156
+ 157
+ 158
+ 159
+ 160
+ 161
+ 162
+ 163
+ 164
+ 165
+ 171
+ 172
+ 173
+ 174
+ 175
+
+
+ 3
+ 127
+ 128
+ 129
+ 46
+ 55
+ 57
+ 89
+ 113
+ 117
+ 118
+ 131
+ 132
+ 133
+ 143
+ 145
+ 146
+ 139
+ 140
+ 141
+ 142
+ 144
+ 166
+ 167
+ 168
+ 169
+ 170
+ 176
+ 177
+ 178
+ 179
+ 180
+ 181
+ 148
+ 149
+ 150
+ 151
+ 152
+ 153
+ 154
+ 155
+ 156
+ 157
+ 158
+ 159
+ 160
+ 161
+ 162
+ 163
+ 164
+ 165
+ 171
+ 172
+ 173
+ 174
+ 175
+
+
+ 24
+ 130
+ 37
+ 9
+ 92
+ 102
+ 109
+ 134
+ 143
+ 145
+ 146
+ 139
+ 140
+ 141
+ 142
+ 144
+ 166
+ 167
+ 168
+ 169
+ 170
+ 176
+ 177
+ 178
+ 179
+ 180
+ 181
+ 148
+ 149
+ 150
+ 151
+ 152
+ 153
+ 154
+ 155
+ 156
+ 157
+ 158
+ 159
+ 160
+ 161
+ 162
+ 163
+ 164
+ 165
+ 171
+ 172
+ 173
+ 174
+ 175
+
+
+ 36
+ 23
+ 8
+ 93
+ 101
+ 108
+ 143
+ 145
+ 146
+ 139
+ 140
+ 141
+ 142
+ 144
+ 166
+ 167
+ 168
+ 169
+ 170
+ 176
+ 177
+ 178
+ 179
+ 180
+ 181
+ 148
+ 149
+ 150
+ 151
+ 152
+ 153
+ 154
+ 155
+ 156
+ 157
+ 158
+ 159
+ 160
+ 161
+ 162
+ 163
+ 164
+ 165
+ 171
+ 172
+ 173
+ 174
+ 175
+
+
+ 16
+ 30
+ 43
+ 97
+ 105
+ 112
+ 143
+ 145
+ 146
+ 139
+ 140
+ 141
+ 142
+ 144
+ 166
+ 167
+ 168
+ 169
+ 170
+ 176
+ 177
+ 178
+ 179
+ 180
+ 181
+ 148
+ 149
+ 150
+ 151
+ 152
+ 153
+ 154
+ 155
+ 156
+ 157
+ 158
+ 159
+ 160
+ 161
+ 162
+ 163
+ 164
+ 165
+ 171
+ 172
+ 173
+ 174
+ 175
+
+
+ 27
+ 40
+ 12
+ 13
+ 94
+ 103
+ 110
+ 95
+ 143
+ 145
+ 146
+ 139
+ 140
+ 141
+ 142
+ 144
+ 166
+ 167
+ 168
+ 169
+ 170
+ 176
+ 177
+ 178
+ 179
+ 180
+ 181
+ 148
+ 149
+ 150
+ 151
+ 152
+ 153
+ 154
+ 155
+ 156
+ 157
+ 158
+ 159
+ 160
+ 161
+ 162
+ 163
+ 164
+ 165
+ 171
+ 172
+ 173
+ 174
+ 175
+
+
+ 135
+ 17
+ 51
+ 52
+ 98
+ 115
+ 116
+ 136
+ 143
+ 145
+ 146
+ 139
+ 140
+ 141
+ 142
+ 144
+ 166
+ 167
+ 168
+ 169
+ 170
+ 176
+ 177
+ 178
+ 179
+ 180
+ 181
+ 148
+ 149
+ 150
+ 151
+ 152
+ 153
+ 154
+ 155
+ 156
+ 157
+ 158
+ 159
+ 160
+ 161
+ 162
+ 163
+ 164
+ 165
+ 171
+ 172
+ 173
+ 174
+ 175
+
+
+ 14
+ 28
+ 41
+ 96
+ 104
+ 111
+ 143
+ 145
+ 146
+ 139
+ 140
+ 141
+ 142
+ 144
+ 166
+ 167
+ 168
+ 169
+ 170
+ 176
+ 177
+ 178
+ 179
+ 180
+ 181
+ 148
+ 149
+ 150
+ 151
+ 152
+ 153
+ 154
+ 155
+ 156
+ 157
+ 158
+ 159
+ 160
+ 161
+ 162
+ 163
+ 164
+ 165
+ 171
+ 172
+ 173
+ 174
+ 175
+
+
+ 14
+ 28
+ 41
+ 96
+ 104
+ 111
+ 13
+ 95
+ 145
+ 176
+ 177
+ 178
+
+
+ 3
+ 127
+ 128
+ 129
+ 46
+ 55
+ 57
+ 48
+ 2
+ 89
+ 131
+ 113
+ 117
+ 118
+ 132
+ 133
+ 114
+ 88
+ 140
+ 152
+ 153
+ 154
+ 155
+ 156
+ 157
+
+
+ 8
+ 23
+ 36
+ 93
+ 101
+ 108
+ 9
+ 24
+ 37
+ 92
+ 102
+ 109
+ 130
+ 134
+ 141
+ 142
+ 158
+ 159
+ 160
+ 161
+ 162
+ 163
+ 164
+
+
+ 5
+ 6
+ 33
+ 20
+ 90
+ 91
+ 106
+ 99
+ 139
+ 148
+ 149
+ 150
+ 151
+
+
+ 14
+ 28
+ 41
+ 96
+ 104
+ 111
+ 145
+ 176
+ 177
+ 178
+
+
+ 12
+ 27
+ 40
+ 13
+ 94
+ 103
+ 110
+ 95
+ 143
+ 166
+ 167
+ 168
+ 169
+ 170
+
+
+ 16
+ 30
+ 43
+ 97
+ 105
+ 112
+ 146
+ 179
+ 180
+ 181
+
+
+ 17
+ 51
+ 52
+ 21
+ 34
+ 135
+ 98
+ 115
+ 116
+ 100
+ 107
+ 136
+ 144
+ 171
+ 172
+ 173
+ 174
+ 175
+
+
+ 16
+ 30
+ 97
+ 105
+ 17
+ 98
+ 179
+ 180
+ 171
+
+
+ 12
+ 94
+ 27
+ 103
+ 13
+ 95
+ 14
+ 96
+ 28
+ 104
+ 168
+ 167
+ 176
+ 177
+
+
+ 2
+ 88
+ 3
+ 89
+ 5
+ 90
+ 6
+ 91
+ 8
+ 93
+ 9
+ 92
+ 20
+ 99
+ 21
+ 100
+ 23
+ 101
+ 24
+ 102
+ 152
+ 153
+ 148
+ 149
+ 158
+ 162
+ 150
+ 172
+ 159
+ 163
+
+
+ 46
+ 113
+ 48
+ 114
+ 51
+ 115
+ 52
+ 116
+ 154
+ 155
+ 174
+ 175
+
+
+ 55
+ 117
+ 161
+
+
+ 57
+ 118
+ 156
+
+
+ 36
+ 108
+ 37
+ 109
+ 33
+ 106
+ 41
+ 111
+ 40
+ 110
+ 43
+ 112
+ 34
+ 107
+ 160
+ 164
+ 151
+ 178
+ 169
+ 181
+ 173
+
+
+ 127
+ 131
+ 128
+ 132
+ 129
+ 133
+ 135
+ 136
+ 130
+ 134
+ 157
+ 170
+ 165
+
+
+ 5
+ 20
+ 90
+ 99
+ 148
+ 150
+
+
+ 6
+ 33
+ 91
+ 106
+ 149
+ 151
+
+
+ 0
+ 1
+ 2
+ 3
+ 4
+ 5
+ 6
+ 7
+ 8
+ 18
+ 19
+ 20
+ 21
+ 22
+ 23
+ 31
+ 32
+ 33
+ 34
+ 35
+ 36
+ 44
+ 45
+ 46
+ 47
+ 48
+ 53
+ 54
+ 55
+ 56
+ 57
+ 88
+ 89
+ 90
+ 91
+ 93
+ 99
+ 100
+ 101
+ 106
+ 107
+ 108
+ 113
+ 114
+ 117
+ 118
+ 123
+ 124
+ 125
+ 126
+ 127
+ 128
+ 129
+ 131
+ 132
+ 133
+ 135
+ 136
+ 139
+ 140
+ 141
+ 144
+ 148
+ 149
+ 150
+ 151
+ 152
+ 153
+ 154
+ 155
+ 156
+ 157
+ 158
+ 159
+ 160
+ 161
+ 171
+ 172
+ 173
+ 174
+ 175
+ 182
+ 184
+ 186
+ 188
+
+
+ 4
+ 5
+ 6
+ 19
+ 32
+ 20
+ 21
+ 33
+ 34
+ 90
+ 91
+ 99
+ 100
+ 106
+ 107
+ 139
+ 148
+ 149
+ 150
+ 151
+
+
+ 11
+ 15
+ 26
+ 29
+ 39
+ 42
+ 12
+ 13
+ 14
+ 16
+ 17
+ 27
+ 28
+ 30
+ 40
+ 41
+ 43
+ 94
+ 95
+ 96
+ 97
+ 98
+ 103
+ 104
+ 105
+ 110
+ 111
+ 112
+ 143
+ 145
+ 146
+ 166
+ 167
+ 168
+ 169
+ 176
+ 177
+ 178
+ 179
+ 180
+ 181
+
+
+ 1
+ 2
+ 3
+ 54
+ 56
+ 55
+ 57
+ 117
+ 118
+ 88
+ 89
+ 140
+ 144
+ 152
+ 153
+ 156
+ 171
+ 172
+ 173
+
+
+ 7
+ 22
+ 35
+ 8
+ 9
+ 23
+ 24
+ 36
+ 37
+ 92
+ 93
+ 101
+ 102
+ 108
+ 109
+ 141
+ 142
+ 158
+ 159
+ 160
+ 161
+ 162
+ 163
+ 164
+
+
+ 125
+ 126
+ 127
+ 128
+ 129
+ 130
+ 135
+ 131
+ 132
+ 133
+ 134
+ 136
+ 157
+ 170
+ 165
+
+
+ 45
+ 47
+ 46
+ 48
+ 113
+ 114
+ 154
+ 155
+ 174
+ 175
+
+
+ 50
+ 51
+ 52
+ 115
+ 116
+
+
+ 182
+ 184
+ 186
+ 188
+
+
+ 183
+ 185
+ 187
+ 189
+
+
+ 16067
+ 16071
+ 16072
+
+
+ 18869
+ 18870
+ 18871
+ 18872
+ 18873
+ 18874
+ 18875
+ 18876
+ 18877
+ 18878
+ 18879
+ 18880
+ 18881
+ 18882
+ 18883
+ 18884
+ 18885
+ 18886
+ 18887
+ 18888
+ 18889
+ 18890
+ 18891
+ 18892
+ 18893
+ 18894
+ 18895
+ 18896
+ 18897
+ 18898
+ 18899
+ 18900
+ 18901
+ 18902
+ 18903
+ 18904
+
+
+ 18905
+ 18906
+ 18907
+
+
+ 18850
+ 18851
+ 18852
+
+
+ 32913
+ 32914
+ 33097
+ 32922
+ 33098
+ 33099
+ 33131
+ 33132
+ 14001
+ 14002
+ 14003
+ 14004
+ 14005
+ 14006
+ 14007
+ 14008
+ 14009
+ 14010
+ 14011
+ 14012
+ 14013
+ 14014
+ 14015
+ 14016
+ 14017
+ 14018
+ 14019
+ 14020
+ 14021
+ 14022
+ 14023
+ 14024
+ 14025
+ 14026
+ 14027
+ 14028
+ 14029
+ 14030
+ 14031
+ 14032
+ 14033
+ 14034
+ 14035
+ 14036
+ 14037
+ 14038
+ 14039
+ 14040
+ 14041
+ 14042
+ 14043
+ 14044
+ 14045
+ 14046
+ 14047
+ 14048
+ 14049
+ 14050
+ 14051
+ 14052
+ 14053
+ 14054
+ 14055
+ 14056
+ 14057
+ 14058
+ 14059
+ 14060
+ 14061
+ 14062
+ 14063
+ 14064
+ 14065
+ 14066
+ 14067
+ 14068
+ 14069
+ 14070
+ 14071
+ 14072
+ 14073
+ 14074
+ 14075
+ 14076
+ 14077
+ 14078
+ 14079
+ 14080
+ 14081
+ 14082
+ 14083
+ 14084
+ 14085
+ 14086
+ 14087
+ 14088
+ 14089
+ 14090
+ 14091
+ 14092
+ 14093
+ 14094
+ 14095
+ 14096
+ 14097
+ 14098
+ 14099
+ 14100
+ 14101
+ 14102
+ 14103
+ 14104
+ 14105
+ 14106
+ 14107
+ 14108
+ 14109
+ 14110
+ 14111
+ 14112
+ 14113
+ 14114
+ 14115
+ 14116
+ 14117
+ 14118
+ 14119
+ 14120
+ 14121
+ 14122
+ 14123
+ 14124
+ 14125
+ 14126
+ 14127
+ 14128
+ 14129
+ 14130
+ 14131
+ 14132
+ 14133
+ 14134
+ 14135
+ 14136
+ 14137
+ 14138
+ 14139
+ 14140
+ 14141
+ 14142
+ 14143
+ 14144
+ 14145
+ 14146
+ 14147
+ 14148
+ 14149
+ 14150
+ 14151
+ 14152
+ 14153
+ 14154
+ 14155
+ 14156
+ 14157
+ 14158
+ 14159
+ 14160
+ 14161
+ 14162
+ 14163
+ 14164
+ 14165
+ 14166
+ 14167
+ 14168
+ 14169
+ 14170
+ 14171
+ 14172
+ 14173
+ 14174
+ 14175
+ 14176
+ 14177
+ 14178
+ 14179
+ 14180
+ 14181
+ 14182
+ 14183
+ 14184
+ 14185
+ 14186
+ 14187
+ 14188
+ 14189
+ 14190
+ 14191
+ 14192
+ 14193
+ 14194
+ 14195
+ 14196
+ 14197
+ 14198
+ 14199
+ 14200
+ 14201
+ 14202
+ 14203
+ 14204
+ 14205
+ 14206
+ 14207
+ 14208
+ 14209
+ 14210
+ 14211
+ 14212
+ 14213
+ 14214
+ 14215
+ 14216
+ 14217
+ 14218
+ 14219
+ 14220
+ 14221
+ 14222
+ 14223
+ 14224
+ 14225
+ 14226
+ 14227
+ 14228
+ 14229
+ 14230
+ 14231
+ 14232
+ 14233
+ 14234
+ 14235
+ 14236
+ 14237
+ 14238
+ 14239
+ 14240
+ 14241
+ 14242
+ 14243
+ 14244
+ 14245
+ 14246
+ 14247
+ 14248
+ 14249
+ 14250
+ 14251
+ 14252
+ 14253
+ 14254
+ 14255
+ 14256
+ 14257
+ 14258
+ 14259
+ 14260
+ 14265
+ 14266
+ 14267
+ 14268
+ 14269
+ 14270
+ 14271
+ 14272
+ 14273
+ 14274
+ 14275
+ 14276
+ 14277
+ 14278
+ 14279
+ 14280
+ 14281
+ 14282
+ 14283
+ 14284
+ 14285
+ 14286
+ 14287
+ 14288
+ 14289
+ 14290
+ 14291
+ 14292
+ 14293
+ 14294
+ 14295
+ 14296
+ 14297
+ 14298
+ 14299
+ 14300
+ 14301
+ 14302
+ 14303
+ 14304
+ 14305
+ 14306
+ 14307
+ 14308
+ 14309
+ 14310
+ 14311
+ 14312
+ 14313
+ 14314
+ 14315
+ 14316
+ 14317
+ 14318
+ 14319
+ 14320
+ 14321
+ 14322
+ 14323
+ 14324
+ 14325
+ 14326
+ 14327
+ 14328
+ 14329
+ 14330
+ 14331
+ 14332
+ 14333
+ 14334
+ 14335
+ 14336
+ 14337
+ 14338
+ 14339
+ 14340
+ 14341
+ 14342
+ 14343
+ 14344
+ 14345
+ 14346
+ 14347
+ 14348
+ 14349
+ 14350
+ 14351
+ 14352
+ 14353
+ 14354
+ 14355
+ 14356
+ 14357
+ 14358
+ 14359
+ 14360
+ 14361
+ 14362
+ 14363
+ 14364
+ 14365
+ 14366
+ 14367
+ 14368
+ 14369
+ 14370
+ 14371
+ 14372
+ 14373
+ 14374
+ 14375
+ 14376
+ 14377
+ 14378
+ 14379
+ 14380
+ 14381
+ 14382
+ 14383
+ 14384
+ 14385
+ 14386
+ 14387
+ 14388
+ 14389
+ 14390
+ 14391
+ 14392
+ 14393
+ 14394
+ 14395
+ 14396
+ 14397
+ 14398
+ 14399
+ 14400
+ 14401
+ 14402
+ 14403
+ 14404
+ 14405
+ 14406
+ 14407
+ 14408
+ 14409
+ 14410
+ 14411
+ 14412
+ 14413
+ 14414
+ 14415
+ 14416
+ 14417
+ 14418
+ 14419
+ 14420
+ 14421
+ 14422
+ 14423
+ 14424
+ 14425
+ 14426
+ 14427
+ 14428
+ 14429
+ 14430
+ 14431
+ 14432
+ 14433
+ 14434
+ 14435
+ 14436
+ 14437
+ 14438
+ 14439
+ 14440
+ 14441
+ 14442
+ 14443
+ 14444
+ 14449
+ 14450
+ 14451
+ 14452
+ 14453
+ 14454
+ 14455
+ 14456
+ 14457
+ 14458
+ 14459
+ 14460
+ 14461
+ 14462
+ 14463
+ 14464
+ 14465
+ 14466
+ 14467
+ 14468
+ 14469
+ 14470
+ 14471
+ 14472
+ 14473
+ 14474
+ 14475
+ 14476
+ 14477
+ 14478
+ 14479
+ 14480
+ 14481
+ 14482
+ 14483
+ 14484
+ 14485
+ 14486
+ 14487
+ 14488
+ 14489
+ 14490
+ 14491
+ 14492
+ 14493
+ 14494
+ 14495
+ 14496
+ 14497
+ 14498
+ 14499
+ 14500
+ 14501
+ 14502
+ 14503
+ 14504
+ 14505
+ 14506
+ 14507
+ 14508
+ 14509
+ 14510
+ 14511
+ 14512
+ 14513
+ 14514
+ 14515
+ 14516
+ 14517
+ 14518
+ 14519
+ 14520
+ 14521
+ 14522
+ 14523
+ 14524
+ 14525
+ 14526
+ 14527
+ 14528
+ 14529
+ 14530
+ 14531
+ 14532
+ 14533
+ 14534
+ 14535
+ 14536
+ 14537
+ 14538
+ 14539
+ 14540
+ 14541
+ 14542
+ 14543
+ 14544
+ 14545
+ 14546
+ 14547
+ 14548
+ 14549
+ 14550
+ 14551
+ 14552
+ 14553
+ 14554
+ 14555
+ 14556
+ 14557
+ 14558
+ 14559
+ 14560
+ 14561
+ 14562
+ 14563
+ 14564
+ 14565
+ 14566
+ 14567
+ 14568
+ 14569
+ 14570
+ 14571
+ 14572
+ 14573
+ 14574
+ 14575
+ 14576
+ 14577
+ 14578
+ 14579
+ 14580
+ 14581
+ 14582
+ 14583
+ 14584
+ 14585
+ 14586
+ 14587
+ 14588
+ 14589
+ 14590
+ 14591
+ 14592
+ 14593
+ 14594
+ 14595
+ 14596
+ 14597
+ 14598
+ 14599
+ 14600
+ 14601
+ 14602
+ 14603
+ 14604
+ 14605
+ 14606
+ 14607
+ 14608
+ 14609
+ 14610
+ 14611
+ 14612
+ 14613
+ 14614
+ 14615
+ 14616
+ 14617
+ 14618
+ 14619
+ 14620
+ 14621
+ 14622
+ 14623
+ 14624
+ 14625
+ 14626
+ 14627
+ 14628
+ 14633
+ 14634
+ 14635
+ 14636
+ 14637
+ 14638
+ 14639
+ 14640
+ 14641
+ 14642
+ 14643
+ 14644
+ 14645
+ 14646
+ 14647
+ 14648
+ 14649
+ 14650
+ 14651
+ 14652
+ 14653
+ 14654
+ 14655
+ 14656
+ 14657
+ 14658
+ 14659
+ 14660
+ 14661
+ 14662
+ 14663
+ 14664
+ 14665
+ 14666
+ 14667
+ 14668
+ 14669
+ 14670
+ 14671
+ 14672
+ 14673
+ 14674
+ 14675
+ 14676
+ 14677
+ 14678
+ 14679
+ 14680
+ 14681
+ 14682
+ 14683
+ 14684
+ 14685
+ 14686
+ 14687
+ 14688
+ 14689
+ 14690
+ 14691
+ 14692
+ 14693
+ 14694
+ 14695
+ 14696
+ 14697
+ 14698
+ 14699
+ 14700
+ 14701
+ 14702
+ 14703
+ 14704
+ 14705
+ 14706
+ 14707
+ 14708
+ 14709
+ 14710
+ 14711
+ 14712
+ 14713
+ 14714
+ 14715
+ 14716
+ 14717
+ 14718
+ 14719
+ 14720
+ 14721
+ 14722
+ 14723
+ 14724
+ 14725
+ 14726
+ 14727
+ 14728
+ 14729
+ 14730
+ 14731
+ 14732
+ 14733
+ 14734
+ 14735
+ 14736
+ 14737
+ 14738
+ 14739
+ 14740
+ 14741
+ 14742
+ 14743
+ 14744
+ 14745
+ 14746
+ 14747
+ 14748
+ 14749
+ 14750
+ 14751
+ 14752
+ 14753
+ 14754
+ 14755
+ 14756
+ 14757
+ 14758
+ 14759
+ 14760
+ 14761
+ 14762
+ 14763
+ 14764
+ 14765
+ 14766
+ 14767
+ 14768
+ 14769
+ 14770
+ 14771
+ 14772
+ 14773
+ 14774
+ 14775
+ 14776
+ 14777
+ 14778
+ 14779
+ 14780
+ 14781
+ 14782
+ 14783
+ 14784
+ 14785
+ 14786
+ 14787
+ 14788
+ 14789
+ 14790
+ 14791
+ 14792
+ 14793
+ 14794
+ 14795
+ 14796
+ 14797
+ 14798
+ 14799
+ 14800
+ 14801
+ 14802
+ 14803
+ 14804
+ 14805
+ 14806
+ 14807
+ 14808
+ 14809
+ 14810
+ 14811
+ 14812
+ 14813
+ 14814
+ 14815
+ 14816
+ 14817
+ 14818
+ 14819
+ 14820
+ 14821
+ 14822
+ 14823
+ 14824
+ 14825
+ 14826
+ 14827
+ 14828
+ 14829
+ 14830
+ 14831
+ 14832
+ 14833
+ 14834
+ 14835
+ 14836
+ 14837
+ 14838
+ 14839
+ 14840
+ 14841
+ 14842
+ 14843
+ 14844
+ 14845
+ 14846
+ 14847
+ 14848
+ 14849
+ 14850
+ 14851
+ 14852
+ 14853
+ 14854
+ 14855
+ 14856
+ 14857
+ 14858
+ 14859
+ 14860
+ 14861
+ 14862
+ 14863
+ 14864
+ 14865
+ 14866
+ 14867
+ 14868
+ 14869
+ 12077
+ 12311
+ 12312
+ 12313
+ 12526
+ 12527
+ 12528
+ 12564
+ 12621
+ 12780
+ 12781
+ 12782
+ 16025
+ 13071
+ 13072
+ 13073
+ 13074
+ 13075
+ 13076
+ 14870
+ 14871
+ 14872
+ 14873
+ 14874
+ 14875
+ 14876
+ 14877
+ 14878
+ 14879
+ 14880
+ 14881
+ 14882
+ 14883
+ 14884
+ 14885
+ 14886
+ 14887
+ 14888
+ 14889
+ 14890
+ 14891
+ 14892
+ 14893
+ 14894
+ 14895
+ 14896
+ 14897
+ 14898
+ 14899
+ 14900
+ 14901
+ 14902
+ 14903
+ 14904
+ 14905
+ 14906
+ 14907
+ 14908
+ 14909
+ 14910
+ 14911
+ 14912
+ 14913
+ 14914
+ 14915
+ 16030
+ 16034
+ 16035
+ 16036
+ 16037
+ 16038
+ 16039
+ 16040
+ 16041
+ 16042
+ 16043
+ 16044
+ 16045
+ 16046
+ 14916
+ 14917
+ 14918
+ 16050
+ 16051
+ 16052
+ 16053
+ 16067
+ 16068
+ 16071
+ 16072
+
+
+ 32915
+ 32916
+ 33142
+ 33143
+ 33144
+ 33145
+ 33147
+ 33148
+ 33137
+
+
+ 32915
+ 32916
+ 32917
+ 32918
+ 32919
+ 32920
+ 33147
+ 33148
+ 32913
+ 32914
+ 33097
+
+
+ 90
+ 91
+ 99
+ 106
+
+
+ 88
+ 89
+ 113
+ 114
+ 118
+ 131
+
+
+ 93
+ 101
+ 108
+ 117
+
+
+ 92
+ 102
+ 109
+ 134
+
+
+ 95
+ 94
+ 103
+ 110
+ 132
+ 133
+
+
+ 96
+ 104
+ 111
+
+
+ 97
+ 105
+ 112
+
+
+ 98
+ 100
+ 107
+ 116
+ 115
+ 136
+
+
+ 19117
+ 19118
+
+
+ 32908
+
+
+ 14930
+ 14954
+ 14955
+ 14956
+ 14957
+ 14958
+ 14959
+ 14960
+ 14931
+ 14961
+ 14962
+ 14963
+ 14964
+ 14965
+ 14966
+ 14967
+ 15032
+ 15033
+ 15034
+ 15035
+ 15036
+ 15037
+ 15038
+ 15039
+ 15040
+ 15041
+ 15042
+ 15043
+ 15044
+ 15045
+ 15046
+ 15047
+ 15048
+ 15049
+ 15050
+ 15051
+ 14929
+ 14947
+ 14948
+ 14949
+ 14950
+ 14951
+ 14952
+ 14953
+ 15022
+ 15023
+ 15024
+ 15025
+ 15026
+ 15027
+ 15028
+ 15029
+ 15030
+ 15031
+
+
+ 0
+ 18
+ 31
+ 44
+ 53
+ 123
+ 124
+
+
+ 10
+ 25
+ 38
+ 49
+
+
+ 4
+ 19
+ 32
+
+
+ 1
+ 7
+ 22
+ 35
+ 45
+ 47
+ 125
+ 126
+ 50
+ 54
+ 56
+
+
+ 11
+ 26
+ 39
+
+
+ 15
+ 29
+ 42
+
+
+ 5
+ 6
+ 20
+ 33
+
+
+ 2
+ 3
+ 46
+ 48
+ 127
+ 128
+ 129
+ 57
+ 135
+
+
+ 8
+ 23
+ 36
+ 55
+
+
+ 12
+ 27
+ 40
+ 13
+
+
+ 9
+ 130
+ 37
+ 24
+
+
+ 17
+ 52
+
+
+ 14
+ 28
+ 41
+
+
+ 16
+ 30
+ 34
+ 43
+ 21
+ 51
+
+
+ 90
+ 91
+ 99
+ 106
+
+
+ 88
+ 89
+ 113
+ 114
+ 118
+ 131
+ 132
+ 133
+ 136
+
+
+ 93
+ 101
+ 108
+ 101
+ 117
+
+
+ 94
+ 103
+ 110
+ 95
+
+
+ 92
+ 102
+ 109
+ 134
+
+
+ 116
+ 98
+ 115
+
+
+ 96
+ 104
+ 111
+
+
+ 97
+ 105
+ 112
+ 107
+ 100
+
+
+ 5
+ 6
+ 20
+ 33
+ 90
+ 91
+ 99
+ 106
+ 139
+ 148
+ 149
+ 150
+ 151
+
+
+ 3
+ 2
+ 46
+ 48
+ 89
+ 88
+ 113
+ 114
+ 118
+ 140
+ 152
+ 153
+ 154
+ 155
+ 156
+
+
+ 8
+ 23
+ 36
+ 55
+ 93
+ 101
+ 108
+ 117
+ 141
+ 158
+ 159
+ 160
+ 161
+
+
+ 9
+ 24
+ 37
+ 92
+ 102
+ 109
+ 142
+ 162
+ 163
+ 164
+
+
+ 12
+ 13
+ 27
+ 40
+ 94
+ 95
+ 103
+ 110
+ 143
+ 166
+ 167
+ 168
+ 169
+
+
+ 14
+ 28
+ 41
+ 96
+ 104
+ 111
+ 145
+ 176
+ 177
+ 178
+
+
+ 16
+ 30
+ 43
+ 97
+ 105
+ 112
+ 146
+ 179
+ 180
+ 181
+
+
+ 17
+ 21
+ 34
+ 52
+ 98
+ 116
+ 100
+ 107
+ 115
+ 144
+ 171
+ 172
+ 173
+ 174
+ 175
+
+
+ 51
+ 57
+
+
+ 127
+ 130
+ 128
+ 129
+ 135
+ 131
+ 134
+ 132
+ 133
+ 136
+ 157
+ 170
+ 165
+
+
+ 0
+ 1
+ 2
+ 3
+ 4
+ 5
+ 6
+ 7
+ 8
+ 9
+ 18
+ 19
+ 20
+ 21
+ 22
+ 23
+ 24
+ 31
+ 32
+ 33
+ 34
+ 35
+ 36
+ 37
+ 44
+ 45
+ 46
+ 47
+ 48
+ 53
+ 54
+ 55
+ 56
+ 57
+ 88
+ 89
+ 90
+ 91
+ 92
+ 93
+ 99
+ 100
+ 101
+ 102
+ 106
+ 107
+ 108
+ 109
+ 113
+ 114
+ 117
+ 118
+ 139
+ 140
+ 141
+ 142
+ 144
+ 10
+ 11
+ 12
+ 13
+ 14
+ 15
+ 16
+ 17
+ 25
+ 26
+ 27
+ 28
+ 29
+ 30
+ 38
+ 39
+ 40
+ 41
+ 42
+ 43
+ 49
+ 50
+ 51
+ 52
+ 94
+ 95
+ 96
+ 97
+ 98
+ 103
+ 104
+ 105
+ 110
+ 111
+ 112
+ 115
+ 116
+ 143
+ 145
+ 146
+ 148
+ 149
+ 150
+ 151
+ 152
+ 153
+ 154
+ 155
+ 156
+ 158
+ 159
+ 160
+ 161
+ 162
+ 163
+ 164
+ 166
+ 167
+ 168
+ 169
+ 171
+ 172
+ 173
+ 174
+ 175
+ 176
+ 177
+ 178
+ 179
+ 180
+ 181
+ 182
+ 184
+ 186
+ 188
+ 183
+ 185
+ 187
+ 189
+
+
+ 143
+ 145
+ 146
+ 166
+ 167
+ 176
+ 179
+
+
+ 139
+ 140
+ 141
+ 142
+ 144
+ 148
+ 149
+ 152
+ 153
+ 158
+ 162
+ 171
+
+
+ 5
+ 6
+ 20
+ 33
+ 90
+ 91
+ 99
+ 106
+ 139
+ 148
+ 149
+ 150
+ 151
+
+
+ 3
+ 2
+ 46
+ 48
+ 127
+ 57
+ 89
+ 88
+ 113
+ 114
+ 118
+ 131
+ 140
+ 152
+ 153
+ 154
+ 155
+ 156
+ 184
+ 186
+ 188
+
+
+ 8
+ 23
+ 36
+ 55
+ 93
+ 101
+ 108
+ 117
+ 141
+ 158
+ 159
+ 160
+ 161
+
+
+ 9
+ 24
+ 37
+ 130
+ 92
+ 102
+ 109
+ 134
+ 142
+ 162
+ 163
+ 164
+ 165
+
+
+ 12
+ 13
+ 27
+ 40
+ 128
+ 129
+ 94
+ 95
+ 103
+ 110
+ 132
+ 133
+ 143
+ 166
+ 167
+ 168
+ 169
+ 170
+
+
+ 14
+ 28
+ 41
+ 96
+ 104
+ 111
+ 145
+ 176
+ 177
+ 178
+
+
+ 17
+ 21
+ 34
+ 52
+ 135
+ 51
+ 98
+ 116
+ 100
+ 107
+ 115
+ 136
+ 144
+ 171
+ 172
+ 173
+ 174
+ 175
+
+
+ 16
+ 30
+ 43
+ 97
+ 105
+ 112
+ 146
+ 179
+ 180
+ 181
+
+
+ 88
+ 89
+ 90
+ 91
+ 93
+ 92
+ 94
+ 95
+ 96
+ 97
+ 98
+
+
+ 99
+ 100
+ 101
+ 102
+ 103
+ 104
+ 105
+
+
+ 106
+ 107
+ 108
+ 109
+ 110
+ 111
+ 112
+
+
+ 113
+ 114
+ 115
+ 116
+
+
+ 117
+ 118
+
+
+ 8401
+ 8402
+ 8403
+ 8405
+ 8417
+ 8422
+ 8423
+ 8424
+ 8425
+ 8416
+
+
+ 8407
+ 8408
+ 8409
+ 8410
+ 8411
+ 8412
+ 8413
+ 8414
+ 8415
+ 8428
+ 8429
+ 8430
+ 8431
+ 8432
+
+
+ 8516
+ 8517
+ 8514
+ 8515
+ 8512
+ 8513
+
+
+ 182
+ 184
+ 186
+ 188
+ 183
+ 185
+ 187
+ 189
+
+
+ 182
+ 183
+
+
+ 184
+ 185
+
+
+ 186
+ 187
+
+
+ 188
+ 189
+
+
+ 183
+ 185
+ 187
+ 189
+
+
+ 182
+ 184
+ 186
+ 188
+
+
+ 187
+
+
+ 186
+
+
+ 0
+ 1
+ 2
+ 3
+ 4
+ 5
+ 6
+ 7
+ 8
+ 9
+ 18
+ 19
+ 20
+ 21
+ 22
+ 23
+ 24
+ 31
+ 32
+ 33
+ 34
+ 35
+ 36
+ 37
+ 44
+ 45
+ 46
+ 47
+ 48
+ 53
+ 54
+ 55
+ 56
+ 57
+ 88
+ 89
+ 90
+ 91
+ 92
+ 93
+ 99
+ 100
+ 101
+ 102
+ 106
+ 107
+ 108
+ 109
+ 113
+ 114
+ 117
+ 118
+ 123
+ 124
+ 125
+ 126
+ 127
+ 128
+ 129
+ 130
+ 131
+ 132
+ 133
+ 134
+ 135
+ 136
+ 139
+ 140
+ 141
+ 142
+ 144
+ 148
+ 149
+ 150
+ 151
+ 152
+ 153
+ 154
+ 155
+ 156
+ 157
+ 158
+ 159
+ 160
+ 161
+ 162
+ 163
+ 164
+ 165
+ 171
+ 172
+ 173
+ 174
+ 175
+ 10
+ 11
+ 12
+ 13
+ 14
+ 15
+ 16
+ 17
+ 25
+ 26
+ 27
+ 28
+ 29
+ 30
+ 38
+ 39
+ 40
+ 41
+ 42
+ 43
+ 49
+ 50
+ 51
+ 52
+ 94
+ 95
+ 96
+ 97
+ 98
+ 103
+ 104
+ 105
+ 110
+ 111
+ 112
+ 115
+ 116
+ 143
+ 145
+ 146
+ 166
+ 167
+ 168
+ 169
+ 170
+ 176
+ 177
+ 178
+ 179
+ 180
+ 181
+
+
+ 1
+ 2
+ 3
+ 4
+ 5
+ 6
+ 19
+ 20
+ 21
+ 32
+ 33
+ 34
+ 45
+ 46
+ 56
+ 57
+ 88
+ 89
+ 90
+ 91
+ 99
+ 100
+ 106
+ 107
+ 113
+ 118
+ 139
+ 140
+ 148
+ 149
+ 150
+ 151
+ 152
+ 153
+ 154
+ 155
+ 156
+ 157
+ 49
+ 50
+ 51
+ 52
+ 115
+ 116
+
+
+ 0
+ 7
+ 8
+ 9
+ 18
+ 22
+ 23
+ 24
+ 31
+ 35
+ 36
+ 37
+ 44
+ 47
+ 48
+ 53
+ 54
+ 55
+ 92
+ 93
+ 101
+ 102
+ 108
+ 109
+ 114
+ 123
+ 124
+ 125
+ 126
+ 127
+ 128
+ 129
+ 130
+ 131
+ 132
+ 133
+ 134
+ 135
+ 136
+ 141
+ 142
+ 144
+ 158
+ 159
+ 160
+ 161
+ 162
+ 163
+ 164
+ 165
+ 171
+ 172
+ 173
+ 174
+ 175
+ 182
+ 184
+ 186
+ 188
+
+
+ 10
+ 11
+ 12
+ 13
+ 14
+ 15
+ 16
+ 17
+ 25
+ 26
+ 27
+ 28
+ 29
+ 30
+ 38
+ 39
+ 40
+ 41
+ 42
+ 43
+ 94
+ 95
+ 96
+ 97
+ 98
+ 103
+ 104
+ 105
+ 110
+ 111
+ 112
+ 143
+ 145
+ 146
+ 166
+ 167
+ 168
+ 169
+ 170
+ 176
+ 177
+ 178
+ 179
+ 180
+ 181
+ 183
+ 185
+ 187
+ 189
+
\ No newline at end of file
diff --git a/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/ai/areas/TalkingIsland/AwakeningMaster/AwakeningMaster.java b/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/ai/areas/TalkingIsland/AwakeningMaster/AwakeningMaster.java
index 25db941e6f..1a41e95122 100644
--- a/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/ai/areas/TalkingIsland/AwakeningMaster/AwakeningMaster.java
+++ b/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/ai/areas/TalkingIsland/AwakeningMaster/AwakeningMaster.java
@@ -68,17 +68,16 @@ public final class AwakeningMaster extends AbstractNpcAI
private static final int CHAOS_POMANDER = 37374;
private static final int CHAOS_POMANDER_DUAL_CLASS = 37375;
private static final Map AWAKE_POWER = new HashMap<>();
-
static
{
- AWAKE_POWER.put(CategoryType.SIGEL_GROUP, 32264);
- AWAKE_POWER.put(CategoryType.TYRR_GROUP, 32265);
- AWAKE_POWER.put(CategoryType.OTHELL_GROUP, 32266);
- AWAKE_POWER.put(CategoryType.YUL_GROUP, 32267);
- AWAKE_POWER.put(CategoryType.FEOH_GROUP, 32268);
- AWAKE_POWER.put(CategoryType.ISS_GROUP, 32269);
- AWAKE_POWER.put(CategoryType.WYNN_GROUP, 32270);
- AWAKE_POWER.put(CategoryType.AEORE_GROUP, 32271);
+ AWAKE_POWER.put(CategoryType.SIXTH_SIGEL_GROUP, 32264);
+ AWAKE_POWER.put(CategoryType.SIXTH_TIR_GROUP, 32265);
+ AWAKE_POWER.put(CategoryType.SIXTH_OTHEL_GROUP, 32266);
+ AWAKE_POWER.put(CategoryType.SIXTH_YR_GROUP, 32267);
+ AWAKE_POWER.put(CategoryType.SIXTH_FEOH_GROUP, 32268);
+ AWAKE_POWER.put(CategoryType.SIXTH_WYNN_GROUP, 32269);
+ AWAKE_POWER.put(CategoryType.SIXTH_IS_GROUP, 32270);
+ AWAKE_POWER.put(CategoryType.SIXTH_EOLH_GROUP, 32271);
}
// Skills
@@ -117,7 +116,7 @@ public final class AwakeningMaster extends AbstractNpcAI
{
case SIGEL_MASTER:
{
- if (!player.isInCategory(CategoryType.SIGEL_CANDIDATE))
+ if (!player.isInCategory(CategoryType.TANKER_CATEGORY))
{
return SIGEL_MASTER + "-no_class.htm";
}
@@ -125,7 +124,7 @@ public final class AwakeningMaster extends AbstractNpcAI
}
case TYRR_MASTER:
{
- if (!player.isInCategory(CategoryType.TYRR_CANDIDATE))
+ if (!player.isInCategory(CategoryType.WARRIOR_CATEGORY))
{
return TYRR_MASTER + "-no_class.htm";
}
@@ -133,7 +132,7 @@ public final class AwakeningMaster extends AbstractNpcAI
}
case OTHELL_MASTER:
{
- if (!player.isInCategory(CategoryType.OTHELL_CANDIDATE))
+ if (!player.isInCategory(CategoryType.ROGUE_CATEGORY))
{
return OTHELL_MASTER + "-no_class.htm";
}
@@ -141,7 +140,7 @@ public final class AwakeningMaster extends AbstractNpcAI
}
case YUL_MASTER:
{
- if (!player.isInCategory(CategoryType.YUL_CANDIDATE))
+ if (!player.isInCategory(CategoryType.ARCHER_CATEGORY))
{
return YUL_MASTER + "-no_class.htm";
}
@@ -149,7 +148,7 @@ public final class AwakeningMaster extends AbstractNpcAI
}
case FEOH_MASTER:
{
- if (!player.isInCategory(CategoryType.FEOH_CANDIDATE))
+ if (!player.isInCategory(CategoryType.WIZARD_CATEGORY))
{
return FEOH_MASTER + "-no_class.htm";
}
@@ -157,7 +156,7 @@ public final class AwakeningMaster extends AbstractNpcAI
}
case ISS_MASTER:
{
- if (!player.isInCategory(CategoryType.ISS_CANDIDATE))
+ if (!player.isInCategory(CategoryType.ENCHANTER_CATEGORY))
{
return ISS_MASTER + "-no_class.htm";
}
@@ -165,7 +164,7 @@ public final class AwakeningMaster extends AbstractNpcAI
}
case WYNN_MASTER:
{
- if (!player.isInCategory(CategoryType.WYNN_CANDIDATE))
+ if (!player.isInCategory(CategoryType.SUMMONER_CATEGORY))
{
return WYNN_MASTER + "-no_class.htm";
}
@@ -173,7 +172,7 @@ public final class AwakeningMaster extends AbstractNpcAI
}
case AEORE_MASTER:
{
- if (!player.isInCategory(CategoryType.AEORE_CANDIDATE))
+ if (!player.isInCategory(CategoryType.HEALER_CATEGORY))
{
return AEORE_MASTER + "-no_class.htm";
}
diff --git a/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/ai/areas/TalkingIsland/Hadel/Hadel.java b/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/ai/areas/TalkingIsland/Hadel/Hadel.java
index fdb12a0bb9..3c673a0a70 100644
--- a/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/ai/areas/TalkingIsland/Hadel/Hadel.java
+++ b/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/ai/areas/TalkingIsland/Hadel/Hadel.java
@@ -62,7 +62,7 @@ public final class Hadel extends AbstractNpcAI
}
case "teleportToHarnak":
{
- if ((!player.isInCategory(CategoryType.AWAKEN_GROUP)) || (player.getLevel() < 85))
+ if ((!player.isInCategory(CategoryType.SIXTH_CLASS_GROUP)) || (player.getLevel() < 85))
{
htmltext = "33344-noClass.html";
break;
diff --git a/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/ai/areas/TalkingIsland/Hardin/Hardin.java b/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/ai/areas/TalkingIsland/Hardin/Hardin.java
index 2c4bc51193..9feadede0f 100644
--- a/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/ai/areas/TalkingIsland/Hardin/Hardin.java
+++ b/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/ai/areas/TalkingIsland/Hardin/Hardin.java
@@ -183,7 +183,7 @@ public final class Hardin extends AbstractNpcAI
return "33870-02.html";
}
}
- if (!player.isInCategory(CategoryType.AWAKEN_GROUP))
+ if (!player.isInCategory(CategoryType.SIXTH_CLASS_GROUP))
{
return "33870-no.html";
}
diff --git a/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/ai/areas/TalkingIsland/MonkOfChaos/MonkOfChaos.java b/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/ai/areas/TalkingIsland/MonkOfChaos/MonkOfChaos.java
index bd823959b4..9757b3464d 100644
--- a/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/ai/areas/TalkingIsland/MonkOfChaos/MonkOfChaos.java
+++ b/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/ai/areas/TalkingIsland/MonkOfChaos/MonkOfChaos.java
@@ -78,7 +78,7 @@ public final class MonkOfChaos extends AbstractNpcAI
}
case "LearnRevelationSkills":
{
- if ((player.getLevel() < MIN_LEVEL) || !player.isInCategory(CategoryType.AWAKEN_GROUP))
+ if ((player.getLevel() < MIN_LEVEL) || !player.isInCategory(CategoryType.SIXTH_CLASS_GROUP))
{
htmltext = "no-learn.html";
break;
@@ -139,7 +139,7 @@ public final class MonkOfChaos extends AbstractNpcAI
}
}
- if ((player.getLevel() < MIN_LEVEL) || !player.isInCategory(CategoryType.AWAKEN_GROUP) || (count == 0))
+ if ((player.getLevel() < MIN_LEVEL) || !player.isInCategory(CategoryType.SIXTH_CLASS_GROUP) || (count == 0))
{
htmltext = "no-cancel.html";
break;
diff --git a/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/ai/areas/TalkingIsland/Raina/Raina.java b/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/ai/areas/TalkingIsland/Raina/Raina.java
index 5f8ec667e9..f61345700f 100644
--- a/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/ai/areas/TalkingIsland/Raina/Raina.java
+++ b/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/ai/areas/TalkingIsland/Raina/Raina.java
@@ -111,14 +111,14 @@ public final class Raina extends AbstractNpcAI
private static final Map classCloak = new HashMap<>();
{
- classCloak.put(CategoryType.SIGEL_GROUP, 30310); // Abelius Cloak
- classCloak.put(CategoryType.TYRR_GROUP, 30311); // Sapyros Cloak Grade
- classCloak.put(CategoryType.OTHELL_GROUP, 30312); // Ashagen Cloak Grade
- classCloak.put(CategoryType.YUL_GROUP, 30313); // Cranigg Cloak Grade
- classCloak.put(CategoryType.FEOH_GROUP, 30314); // Soltkreig Cloak Grade
- classCloak.put(CategoryType.WYNN_GROUP, 30315); // Naviarope Cloak Grade
- classCloak.put(CategoryType.ISS_GROUP, 30316); // Leister Cloak Grade
- classCloak.put(CategoryType.AEORE_GROUP, 30317); // Laksis Cloak Grade
+ classCloak.put(CategoryType.SIXTH_SIGEL_GROUP, 30310); // Abelius Cloak
+ classCloak.put(CategoryType.SIXTH_TIR_GROUP, 30311); // Sapyros Cloak Grade
+ classCloak.put(CategoryType.SIXTH_OTHEL_GROUP, 30312); // Ashagen Cloak Grade
+ classCloak.put(CategoryType.SIXTH_YR_GROUP, 30313); // Cranigg Cloak Grade
+ classCloak.put(CategoryType.SIXTH_FEOH_GROUP, 30314); // Soltkreig Cloak Grade
+ classCloak.put(CategoryType.SIXTH_WYNN_GROUP, 30315); // Naviarope Cloak Grade
+ classCloak.put(CategoryType.SIXTH_IS_GROUP, 30316); // Leister Cloak Grade
+ classCloak.put(CategoryType.SIXTH_EOLH_GROUP, 30317); // Laksis Cloak Grade
}
private static final List dualClassList = new ArrayList<>();
@@ -290,7 +290,7 @@ public final class Raina extends AbstractNpcAI
case "ertheiaDualClass":
{
// TODO: Maybe html is different when you have 85lvl but you haven't completed quest
- if ((player.getRace() != Race.ERTHEIA) || (player.getLevel() < 85) || !player.isInCategory(CategoryType.AWAKEN_GROUP) || player.hasDualClass() || !haveDoneQuest(player, true))
+ if ((player.getRace() != Race.ERTHEIA) || (player.getLevel() < 85) || !player.isInCategory(CategoryType.SIXTH_CLASS_GROUP) || player.hasDualClass() || !haveDoneQuest(player, true))
{
htmltext = "addDualClassErtheiaFailed.html";
}
@@ -309,7 +309,7 @@ public final class Raina extends AbstractNpcAI
case "addDualClass_WYNN_GROUP":
case "addDualClass_AEORE_GROUP":
{
- if ((player.getRace() != Race.ERTHEIA) || (player.getLevel() < 85) || !player.isInCategory(CategoryType.AWAKEN_GROUP) || player.hasDualClass() || !haveDoneQuest(player, true))
+ if ((player.getRace() != Race.ERTHEIA) || (player.getLevel() < 85) || !player.isInCategory(CategoryType.SIXTH_CLASS_GROUP) || player.hasDualClass() || !haveDoneQuest(player, true))
{
htmltext = "addDualClassErtheiaFailed.html";
break;
@@ -659,31 +659,31 @@ public final class Raina extends AbstractNpcAI
private void addPowerItem(L2PcInstance player)
{
int itemId = ABELIUS_POWER; // Sigel
- if (player.isInCategory(CategoryType.TYRR_GROUP))
+ if (player.isInCategory(CategoryType.SIXTH_TIR_GROUP))
{
itemId = SAPYROS_POWER;
}
- else if (player.isInCategory(CategoryType.OTHELL_GROUP))
+ else if (player.isInCategory(CategoryType.SIXTH_OTHEL_GROUP))
{
itemId = ASHAGEN_POWER;
}
- else if (player.isInCategory(CategoryType.YUL_GROUP))
+ else if (player.isInCategory(CategoryType.SIXTH_YR_GROUP))
{
itemId = CRANIGG_POWER;
}
- else if (player.isInCategory(CategoryType.FEOH_GROUP))
+ else if (player.isInCategory(CategoryType.SIXTH_FEOH_GROUP))
{
itemId = SOLTKREIG_POWER;
}
- else if (player.isInCategory(CategoryType.WYNN_GROUP))
+ else if (player.isInCategory(CategoryType.SIXTH_WYNN_GROUP))
{
itemId = NAVIAROPE_POWER;
}
- else if (player.isInCategory(CategoryType.ISS_GROUP))
+ else if (player.isInCategory(CategoryType.SIXTH_IS_GROUP))
{
itemId = LEISTER_POWER;
}
- else if (player.isInCategory(CategoryType.AEORE_GROUP))
+ else if (player.isInCategory(CategoryType.SIXTH_EOLH_GROUP))
{
itemId = LAKCIS_POWER;
}
@@ -905,37 +905,37 @@ public final class Raina extends AbstractNpcAI
{
CategoryType catType = null;
- if (player.isInCategory(CategoryType.SIGEL_GROUP))
+ if (player.isInCategory(CategoryType.SIXTH_SIGEL_GROUP))
{
- catType = CategoryType.SIGEL_GROUP;
+ catType = CategoryType.SIXTH_SIGEL_GROUP;
}
- else if (player.isInCategory(CategoryType.TYRR_GROUP))
+ else if (player.isInCategory(CategoryType.SIXTH_TIR_GROUP))
{
- catType = CategoryType.TYRR_GROUP;
+ catType = CategoryType.SIXTH_TIR_GROUP;
}
- else if (player.isInCategory(CategoryType.OTHELL_GROUP))
+ else if (player.isInCategory(CategoryType.SIXTH_OTHEL_GROUP))
{
- catType = CategoryType.OTHELL_GROUP;
+ catType = CategoryType.SIXTH_OTHEL_GROUP;
}
- else if (player.isInCategory(CategoryType.YUL_GROUP))
+ else if (player.isInCategory(CategoryType.SIXTH_YR_GROUP))
{
- catType = CategoryType.YUL_GROUP;
+ catType = CategoryType.SIXTH_YR_GROUP;
}
- else if (player.isInCategory(CategoryType.FEOH_GROUP))
+ else if (player.isInCategory(CategoryType.SIXTH_FEOH_GROUP))
{
- catType = CategoryType.FEOH_GROUP;
+ catType = CategoryType.SIXTH_FEOH_GROUP;
}
- else if (player.isInCategory(CategoryType.ISS_GROUP))
+ else if (player.isInCategory(CategoryType.SIXTH_IS_GROUP))
{
- catType = CategoryType.ISS_GROUP;
+ catType = CategoryType.SIXTH_IS_GROUP;
}
- else if (player.isInCategory(CategoryType.WYNN_GROUP))
+ else if (player.isInCategory(CategoryType.SIXTH_WYNN_GROUP))
{
- catType = CategoryType.WYNN_GROUP;
+ catType = CategoryType.SIXTH_WYNN_GROUP;
}
- else if (player.isInCategory(CategoryType.AEORE_GROUP))
+ else if (player.isInCategory(CategoryType.SIXTH_EOLH_GROUP))
{
- catType = CategoryType.AEORE_GROUP;
+ catType = CategoryType.SIXTH_EOLH_GROUP;
}
return classCloak.get(catType);
}
diff --git a/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/ai/bosses/Kimerian/KimerianCommon.java b/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/ai/bosses/Kimerian/KimerianCommon.java
index 87ecf2699a..51ee3bad82 100644
--- a/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/ai/bosses/Kimerian/KimerianCommon.java
+++ b/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/ai/bosses/Kimerian/KimerianCommon.java
@@ -152,7 +152,7 @@ public final class KimerianCommon extends AbstractInstance
{
if (hasQuestItems(player, FLUTE))
{
- if (player.isInCategory(CategoryType.AEORE_GROUP))
+ if (player.isInCategory(CategoryType.SIXTH_EOLH_GROUP))
{
addSpawn(FAIRY_REBEL, player.getX() + 60, player.getY(), player.getZ(), 0, false, 0, false, instance.getId());
addSpawn(FAIRY_REBEL, player.getX() - 60, player.getY(), player.getZ(), 0, false, 0, false, instance.getId());
diff --git a/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/ai/others/AdventurersGuide/AdventurersGuide.java b/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/ai/others/AdventurersGuide/AdventurersGuide.java
index 7a0a53fcea..41870fd27c 100644
--- a/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/ai/others/AdventurersGuide/AdventurersGuide.java
+++ b/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/ai/others/AdventurersGuide/AdventurersGuide.java
@@ -53,6 +53,9 @@ public final class AdventurersGuide extends AbstractNpcAI
new SkillHolder(15652, 1), // Daring Sonata (Adventurer)
new SkillHolder(15653, 1), // Refreshing Sonata (Adventurer)
};
+ // Misc
+ private static int MAX_LEVEL_BUFFS = 90;
+ private static int MIN_LEVEL_PROTECTION = 40;
private AdventurersGuide()
{
@@ -115,7 +118,7 @@ public final class AdventurersGuide extends AbstractNpcAI
private String applyBuffs(L2Npc npc, L2PcInstance player, Skill skill)
{
- if (player.getLevel() > 90)
+ if (player.getLevel() > MAX_LEVEL_BUFFS)
{
return "guide-noBuffs.html";
}
@@ -126,7 +129,7 @@ public final class AdventurersGuide extends AbstractNpcAI
}
SkillCaster.triggerCast(npc, player, skill);
- if ((player.getLevel() < 40) && (player.getClassId().level() <= 1))
+ if ((player.getLevel() < MIN_LEVEL_PROTECTION) && (player.getClassId().level() <= 1))
{
SkillCaster.triggerCast(npc, player, BLESS_PROTECTION.getSkill());
}
diff --git a/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/ai/others/CastleCourtMagician/CastleCourtMagician.java b/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/ai/others/CastleCourtMagician/CastleCourtMagician.java
index ff6975b3f2..f01d1044ea 100644
--- a/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/ai/others/CastleCourtMagician/CastleCourtMagician.java
+++ b/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/ai/others/CastleCourtMagician/CastleCourtMagician.java
@@ -121,14 +121,14 @@ public final class CastleCourtMagician extends AbstractNpcAI
// Misc
private static final CategoryType[] AWAKENED_CT =
{
- CategoryType.SIGEL_GROUP,
- CategoryType.TYRR_GROUP,
- CategoryType.OTHELL_GROUP,
- CategoryType.YUL_GROUP,
- CategoryType.FEOH_GROUP,
- CategoryType.ISS_GROUP,
- CategoryType.WYNN_GROUP,
- CategoryType.AEORE_GROUP,
+ CategoryType.SIXTH_SIGEL_GROUP,
+ CategoryType.SIXTH_TIR_GROUP,
+ CategoryType.SIXTH_OTHEL_GROUP,
+ CategoryType.SIXTH_YR_GROUP,
+ CategoryType.SIXTH_FEOH_GROUP,
+ CategoryType.SIXTH_IS_GROUP,
+ CategoryType.SIXTH_WYNN_GROUP,
+ CategoryType.SIXTH_EOLH_GROUP,
};
private CastleCourtMagician()
@@ -266,7 +266,7 @@ public final class CastleCourtMagician extends AbstractNpcAI
}
case "giveTalismanR":
{
- htmltext = player.isInCategory(CategoryType.AWAKEN_GROUP) ? "courtmagician-09.html" : "courtmagician-10.html";
+ htmltext = player.isInCategory(CategoryType.SIXTH_CLASS_GROUP) ? "courtmagician-09.html" : "courtmagician-10.html";
break;
}
case "giveTalismanR_classSpecific":
diff --git a/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/ai/others/ClassMaster/ClassMaster.java b/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/ai/others/ClassMaster/ClassMaster.java
index a34d633757..33a894b6c0 100644
--- a/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/ai/others/ClassMaster/ClassMaster.java
+++ b/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/ai/others/ClassMaster/ClassMaster.java
@@ -297,7 +297,7 @@ public final class ClassMaster extends AbstractNpcAI implements IGameXmlReader
{
htmltext = "test_server_helper011.html";
}
- else if (player.isInCategory(CategoryType.AWAKEN_GROUP))
+ else if (player.isInCategory(CategoryType.SIXTH_CLASS_GROUP))
{
htmltext = "test_server_helper011a.html";
}
@@ -319,7 +319,7 @@ public final class ClassMaster extends AbstractNpcAI implements IGameXmlReader
htmltext = "test_server_helper021.html";
}
}
- else if (player.isInCategory(CategoryType.AWAKEN_GROUP))
+ else if (player.isInCategory(CategoryType.SIXTH_CLASS_GROUP))
{
htmltext = "test_server_helper011a.html";
}
@@ -352,7 +352,7 @@ public final class ClassMaster extends AbstractNpcAI implements IGameXmlReader
}
else if (player.isInCategory(CategoryType.FOURTH_CLASS_GROUP) && (player.getLevel() >= 85)) // 9
{
- canChange = CategoryData.getInstance().isInCategory(CategoryType.AWAKEN_GROUP, classId); // 11
+ canChange = CategoryData.getInstance().isInCategory(CategoryType.SIXTH_CLASS_GROUP, classId); // 11
}
if (canChange)
@@ -422,7 +422,7 @@ public final class ClassMaster extends AbstractNpcAI implements IGameXmlReader
{
player.setBaseClass(player.getActiveClass());
}
- if (player.isInCategory(CategoryType.AWAKEN_GROUP))
+ if (player.isInCategory(CategoryType.SIXTH_CLASS_GROUP))
{
SkillTreesData.getInstance().cleanSkillUponAwakening(player);
for (L2SkillLearn skill : SkillTreesData.getInstance().getRaceSkillTree(player.getRace()))
@@ -450,7 +450,7 @@ public final class ClassMaster extends AbstractNpcAI implements IGameXmlReader
case "learnskills":
{
// Retail class master only lets you learn all third class skills.
- if (player.isInCategory(CategoryType.AWAKEN_GROUP))
+ if (player.isInCategory(CategoryType.SIXTH_CLASS_GROUP))
{
htmltext = "test_server_helper001_failed.html";
}
@@ -578,7 +578,7 @@ public final class ClassMaster extends AbstractNpcAI implements IGameXmlReader
{
htmltext = "test_server_helper011.html";
}
- else if (player.isInCategory(CategoryType.AWAKEN_GROUP))
+ else if (player.isInCategory(CategoryType.SIXTH_CLASS_GROUP))
{
htmltext = "test_server_helper011a.html";
}
@@ -762,7 +762,7 @@ public final class ClassMaster extends AbstractNpcAI implements IGameXmlReader
{
htmltext = "test_server_helper011.html";
}
- else if (player.isInCategory(CategoryType.AWAKEN_GROUP))
+ else if (player.isInCategory(CategoryType.SIXTH_CLASS_GROUP))
{
htmltext = "test_server_helper011a.html";
}
@@ -853,7 +853,7 @@ public final class ClassMaster extends AbstractNpcAI implements IGameXmlReader
{
player.setBaseClass(player.getActiveClass());
}
- if (player.isInCategory(CategoryType.AWAKEN_GROUP))
+ if (player.isInCategory(CategoryType.SIXTH_CLASS_GROUP))
{
SkillTreesData.getInstance().cleanSkillUponAwakening(player);
for (L2SkillLearn skill : SkillTreesData.getInstance().getRaceSkillTree(player.getRace()))
diff --git a/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/ai/others/HermuncusMinion/HermuncusMinion.java b/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/ai/others/HermuncusMinion/HermuncusMinion.java
index d17067c902..6ac78443c9 100644
--- a/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/ai/others/HermuncusMinion/HermuncusMinion.java
+++ b/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/ai/others/HermuncusMinion/HermuncusMinion.java
@@ -97,7 +97,7 @@ public final class HermuncusMinion extends AbstractNpcAI
if (event.equals("teleportList"))
{
- if (!player.isInCategory(CategoryType.AWAKEN_GROUP))
+ if (!player.isInCategory(CategoryType.SIXTH_CLASS_GROUP))
{
htmltext = "HermuncusMinion-no.html";
}
@@ -155,7 +155,7 @@ public final class HermuncusMinion extends AbstractNpcAI
@Override
public String onFirstTalk(L2Npc npc, L2PcInstance player)
{
- return player.isInCategory(CategoryType.AWAKEN_GROUP) ? "HermuncusMinion.html" : "HermuncusMinion-no.html";
+ return player.isInCategory(CategoryType.SIXTH_CLASS_GROUP) ? "HermuncusMinion.html" : "HermuncusMinion-no.html";
}
private String generateButton(Integer locationId)
diff --git a/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/ai/others/MentorGuide/MentorGuide.java b/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/ai/others/MentorGuide/MentorGuide.java
index 9aba4c962c..8499c186a1 100644
--- a/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/ai/others/MentorGuide/MentorGuide.java
+++ b/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/ai/others/MentorGuide/MentorGuide.java
@@ -369,7 +369,7 @@ public final class MentorGuide extends AbstractNpcAI implements IGameXmlReader
handleMenteeSkills(player);
- if (player.isInCategory(CategoryType.AWAKEN_GROUP))
+ if (player.isInCategory(CategoryType.SIXTH_CLASS_GROUP))
{
handleGraduateMentee(player);
}
diff --git a/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/ai/others/OlyManager/OlyManager.java b/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/ai/others/OlyManager/OlyManager.java
index d22a8b9b16..a3a41cad2a 100644
--- a/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/ai/others/OlyManager/OlyManager.java
+++ b/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/ai/others/OlyManager/OlyManager.java
@@ -57,16 +57,15 @@ public final class OlyManager extends AbstractNpcAI implements IBypassHandler
private static final int MANAGER = 31688;
// Misc
private static final Map EQUIPMENT_MULTISELL = new HashMap<>();
-
{
- EQUIPMENT_MULTISELL.put(CategoryType.SIGEL_GROUP, 917);
- EQUIPMENT_MULTISELL.put(CategoryType.TYRR_GROUP, 918);
- EQUIPMENT_MULTISELL.put(CategoryType.OTHELL_GROUP, 919);
- EQUIPMENT_MULTISELL.put(CategoryType.YUL_GROUP, 920);
- EQUIPMENT_MULTISELL.put(CategoryType.FEOH_GROUP, 921);
- EQUIPMENT_MULTISELL.put(CategoryType.ISS_GROUP, 923);
- EQUIPMENT_MULTISELL.put(CategoryType.WYNN_GROUP, 922);
- EQUIPMENT_MULTISELL.put(CategoryType.AEORE_GROUP, 924);
+ EQUIPMENT_MULTISELL.put(CategoryType.SIXTH_SIGEL_GROUP, 917);
+ EQUIPMENT_MULTISELL.put(CategoryType.SIXTH_TIR_GROUP, 918);
+ EQUIPMENT_MULTISELL.put(CategoryType.SIXTH_OTHEL_GROUP, 919);
+ EQUIPMENT_MULTISELL.put(CategoryType.SIXTH_YR_GROUP, 920);
+ EQUIPMENT_MULTISELL.put(CategoryType.SIXTH_FEOH_GROUP, 921);
+ EQUIPMENT_MULTISELL.put(CategoryType.SIXTH_IS_GROUP, 923);
+ EQUIPMENT_MULTISELL.put(CategoryType.SIXTH_WYNN_GROUP, 922);
+ EQUIPMENT_MULTISELL.put(CategoryType.SIXTH_EOLH_GROUP, 924);
}
private static final String[] BYPASSES =
@@ -144,7 +143,7 @@ public final class OlyManager extends AbstractNpcAI implements IBypassHandler
{
htmltext = "OlyManager-subclass.html";
}
- else if (!player.isInCategory(CategoryType.AWAKEN_GROUP))
+ else if (!player.isInCategory(CategoryType.SIXTH_CLASS_GROUP))
{
htmltext = "OlyManager-awaken.html";
}
diff --git a/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/admincommandhandlers/AdminEditChar.java b/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/admincommandhandlers/AdminEditChar.java
index abd1a600c0..d12bce2242 100644
--- a/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/admincommandhandlers/AdminEditChar.java
+++ b/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/admincommandhandlers/AdminEditChar.java
@@ -416,7 +416,7 @@ public class AdminEditChar implements IAdminCommandHandler
}
final String newclass = ClassListData.getInstance().getClass(player.getClassId()).getClassName();
- if (player.isInCategory(CategoryType.AWAKEN_GROUP))
+ if (player.isInCategory(CategoryType.SIXTH_CLASS_GROUP))
{
SkillTreesData.getInstance().cleanSkillUponAwakening(player);
for (L2SkillLearn skill : SkillTreesData.getInstance().getRaceSkillTree(player.getRace()))
diff --git a/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/AirBind.java b/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/AirBind.java
index e1adc4c75d..2b1aed91f3 100644
--- a/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/AirBind.java
+++ b/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/AirBind.java
@@ -114,7 +114,7 @@ public final class AirBind extends AbstractEffect
for (L2PcInstance nearbyPlayer : L2World.getInstance().getVisibleObjects(effected, L2PcInstance.class, 1200))
{
if ((nearbyPlayer.getRace() != Race.ERTHEIA) && (nearbyPlayer.getTarget() == effected) //
- && nearbyPlayer.isInCategory(CategoryType.AWAKEN_GROUP) && !nearbyPlayer.isAlterSkillActive())
+ && nearbyPlayer.isInCategory(CategoryType.SIXTH_CLASS_GROUP) && !nearbyPlayer.isAlterSkillActive())
{
final int chainSkill = _chainedAirSkills.get(nearbyPlayer.getClassId());
if (nearbyPlayer.getSkillRemainingReuseTime(chainSkill) == -1)
diff --git a/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/KnockBack.java b/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/KnockBack.java
index f6fa9dc43e..81b8f8134c 100644
--- a/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/KnockBack.java
+++ b/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/KnockBack.java
@@ -173,7 +173,7 @@ public final class KnockBack extends AbstractEffect
{
continue;
}
- if ((nearbyPlayer.getTarget() == effected) && nearbyPlayer.isInCategory(CategoryType.AWAKEN_GROUP) && !nearbyPlayer.isAlterSkillActive())
+ if ((nearbyPlayer.getTarget() == effected) && nearbyPlayer.isInCategory(CategoryType.SIXTH_CLASS_GROUP) && !nearbyPlayer.isAlterSkillActive())
{
final int chainSkill = _chainKnockSkills.get(nearbyPlayer.getClassId());
if (nearbyPlayer.getSkillRemainingReuseTime(chainSkill) == -1)
diff --git a/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/instances/HarnakUndergroundRuins/HarnakUndergroundRuins.java b/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/instances/HarnakUndergroundRuins/HarnakUndergroundRuins.java
index 5a74053b38..49de099a70 100644
--- a/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/instances/HarnakUndergroundRuins/HarnakUndergroundRuins.java
+++ b/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/instances/HarnakUndergroundRuins/HarnakUndergroundRuins.java
@@ -79,17 +79,16 @@ public final class HarnakUndergroundRuins extends AbstractInstance
private static final int DOOR_ONE = 16240100;
private static final int DOOR_TWO = 16240102;
private static final Map MOB_CATEGORY = new HashMap<>();
-
static
{
- MOB_CATEGORY.put(CategoryType.SIGEL_CANDIDATE, RAKZAN);
- MOB_CATEGORY.put(CategoryType.TYRR_CANDIDATE, KRAKIA_BATHUS);
- MOB_CATEGORY.put(CategoryType.OTHELL_CANDIDATE, BAMONTI);
- MOB_CATEGORY.put(CategoryType.YUL_CANDIDATE, KRAKIA_CARCASS);
- MOB_CATEGORY.put(CategoryType.FEOH_CANDIDATE, WEISS_KHAN);
- MOB_CATEGORY.put(CategoryType.ISS_CANDIDATE, SEKNUS);
- MOB_CATEGORY.put(CategoryType.WYNN_CANDIDATE, KRAKIA_LOTUS);
- MOB_CATEGORY.put(CategoryType.AEORE_CANDIDATE, WEISS_ELE);
+ MOB_CATEGORY.put(CategoryType.SIXTH_SIGEL_GROUP, RAKZAN);
+ MOB_CATEGORY.put(CategoryType.SIXTH_TIR_GROUP, KRAKIA_BATHUS);
+ MOB_CATEGORY.put(CategoryType.SIXTH_OTHEL_GROUP, BAMONTI);
+ MOB_CATEGORY.put(CategoryType.SIXTH_YR_GROUP, KRAKIA_CARCASS);
+ MOB_CATEGORY.put(CategoryType.SIXTH_FEOH_GROUP, WEISS_KHAN);
+ MOB_CATEGORY.put(CategoryType.SIXTH_IS_GROUP, SEKNUS);
+ MOB_CATEGORY.put(CategoryType.SIXTH_WYNN_GROUP, KRAKIA_LOTUS);
+ MOB_CATEGORY.put(CategoryType.SIXTH_EOLH_GROUP, WEISS_ELE);
}
public HarnakUndergroundRuins()
diff --git a/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/instances/Nursery/Nursery.java b/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/instances/Nursery/Nursery.java
index cd0364efe8..f2affd49bf 100644
--- a/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/instances/Nursery/Nursery.java
+++ b/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/instances/Nursery/Nursery.java
@@ -363,27 +363,27 @@ public final class Nursery extends AbstractInstance
{
int pointsCount = getRandom(6) + 3;
- if (killer.isInCategory(CategoryType.SIGEL_GROUP) || killer.isInCategory(CategoryType.AEORE_GROUP))
+ if (killer.isInCategory(CategoryType.SIXTH_SIGEL_GROUP) || killer.isInCategory(CategoryType.SIXTH_EOLH_GROUP))
{
pointsCount += 6;
}
- else if (killer.isInCategory(CategoryType.TYRR_GROUP))
+ else if (killer.isInCategory(CategoryType.SIXTH_TIR_GROUP))
{
pointsCount -= 1;
}
- else if (killer.isInCategory(CategoryType.OTHELL_GROUP))
+ else if (killer.isInCategory(CategoryType.SIXTH_OTHEL_GROUP))
{
pointsCount += 2;
}
- else if (killer.isInCategory(CategoryType.YUL_GROUP))
+ else if (killer.isInCategory(CategoryType.SIXTH_YR_GROUP))
{
pointsCount += 1;
}
- else if (killer.isInCategory(CategoryType.FEOH_GROUP) || killer.isInCategory(CategoryType.ISS_GROUP))
+ else if (killer.isInCategory(CategoryType.SIXTH_FEOH_GROUP) || killer.isInCategory(CategoryType.SIXTH_IS_GROUP))
{
pointsCount += 0;
}
- else if (killer.isInCategory(CategoryType.WYNN_GROUP))
+ else if (killer.isInCategory(CategoryType.SIXTH_WYNN_GROUP))
{
pointsCount += 3;
}
diff --git a/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/quests/Q00177_SplitDestiny/Q00177_SplitDestiny.java b/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/quests/Q00177_SplitDestiny/Q00177_SplitDestiny.java
index a2ed81b2e7..4b9af8b327 100644
--- a/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/quests/Q00177_SplitDestiny/Q00177_SplitDestiny.java
+++ b/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/quests/Q00177_SplitDestiny/Q00177_SplitDestiny.java
@@ -239,39 +239,39 @@ public final class Q00177_SplitDestiny extends Quest
{
htmltext = "33344-02.htm";
}
- else if (!CategoryData.getInstance().isInCategory(CategoryType.AWAKEN_GROUP, player.getBaseClass()))
+ else if (!CategoryData.getInstance().isInCategory(CategoryType.SIXTH_CLASS_GROUP, player.getBaseClass()))
{
htmltext = "33344-03.htm";
}
- else if (CategoryData.getInstance().isInCategory(CategoryType.SIGEL_GROUP, player.getBaseClass()) && player.isInCategory(CategoryType.SIGEL_CANDIDATE))
+ else if (CategoryData.getInstance().isInCategory(CategoryType.SIXTH_SIGEL_GROUP, player.getBaseClass()) && player.isInCategory(CategoryType.TANKER_CATEGORY))
{
htmltext = "33344-sigel.htm";
}
- else if (CategoryData.getInstance().isInCategory(CategoryType.TYRR_GROUP, player.getBaseClass()) && player.isInCategory(CategoryType.TYRR_CANDIDATE))
+ else if (CategoryData.getInstance().isInCategory(CategoryType.SIXTH_TIR_GROUP, player.getBaseClass()) && player.isInCategory(CategoryType.WARRIOR_CATEGORY))
{
htmltext = "33344-tyrr.htm";
}
- else if (CategoryData.getInstance().isInCategory(CategoryType.OTHELL_GROUP, player.getBaseClass()) && player.isInCategory(CategoryType.OTHELL_CANDIDATE))
+ else if (CategoryData.getInstance().isInCategory(CategoryType.SIXTH_OTHEL_GROUP, player.getBaseClass()) && player.isInCategory(CategoryType.ROGUE_CATEGORY))
{
htmltext = "33344-othell.htm";
}
- else if (CategoryData.getInstance().isInCategory(CategoryType.YUL_GROUP, player.getBaseClass()) && player.isInCategory(CategoryType.YUL_CANDIDATE))
+ else if (CategoryData.getInstance().isInCategory(CategoryType.SIXTH_YR_GROUP, player.getBaseClass()) && player.isInCategory(CategoryType.ARCHER_CATEGORY))
{
htmltext = "33344-yul.htm";
}
- else if (CategoryData.getInstance().isInCategory(CategoryType.FEOH_GROUP, player.getBaseClass()) && player.isInCategory(CategoryType.FEOH_CANDIDATE))
+ else if (CategoryData.getInstance().isInCategory(CategoryType.SIXTH_FEOH_GROUP, player.getBaseClass()) && player.isInCategory(CategoryType.WIZARD_CATEGORY))
{
htmltext = "33344-feoh.htm";
}
- else if (CategoryData.getInstance().isInCategory(CategoryType.ISS_GROUP, player.getBaseClass()) && player.isInCategory(CategoryType.ISS_CANDIDATE))
+ else if (CategoryData.getInstance().isInCategory(CategoryType.SIXTH_IS_GROUP, player.getBaseClass()) && player.isInCategory(CategoryType.ENCHANTER_CATEGORY))
{
htmltext = "33344-iss.htm";
}
- else if (CategoryData.getInstance().isInCategory(CategoryType.WYNN_GROUP, player.getBaseClass()) && player.isInCategory(CategoryType.WYNN_CANDIDATE))
+ else if (CategoryData.getInstance().isInCategory(CategoryType.SIXTH_WYNN_GROUP, player.getBaseClass()) && player.isInCategory(CategoryType.SUMMONER_CATEGORY))
{
htmltext = "33344-wynn.htm";
}
- else if (CategoryData.getInstance().isInCategory(CategoryType.AEORE_GROUP, player.getBaseClass()) && player.isInCategory(CategoryType.AEORE_CANDIDATE))
+ else if (CategoryData.getInstance().isInCategory(CategoryType.SIXTH_EOLH_GROUP, player.getBaseClass()) && player.isInCategory(CategoryType.HEALER_CATEGORY))
{
htmltext = "33344-aeore.htm";
}
diff --git a/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/quests/Q10338_SeizeYourDestiny/Q10338_SeizeYourDestiny.java b/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/quests/Q10338_SeizeYourDestiny/Q10338_SeizeYourDestiny.java
index 64aac90a45..6ac9939d16 100644
--- a/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/quests/Q10338_SeizeYourDestiny/Q10338_SeizeYourDestiny.java
+++ b/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/quests/Q10338_SeizeYourDestiny/Q10338_SeizeYourDestiny.java
@@ -91,7 +91,7 @@ public final class Q10338_SeizeYourDestiny extends Quest
}
case "33477-03.html":
{
- if (!player.isInCategory(CategoryType.AWAKEN_GROUP))
+ if (!player.isInCategory(CategoryType.SIXTH_CLASS_GROUP))
{
qs.setSimulated(false);
qs.setState(State.CREATED);
@@ -149,7 +149,7 @@ public final class Q10338_SeizeYourDestiny extends Quest
{
htmltext = "33477-06.html";
}
- else if (player.isInCategory(CategoryType.AWAKEN_GROUP) || hasQuestItems(player, SCROLL_OF_AFTERLIFE.getId()))
+ else if (player.isInCategory(CategoryType.SIXTH_CLASS_GROUP) || hasQuestItems(player, SCROLL_OF_AFTERLIFE.getId()))
{
htmltext = "33477-05.html";
}
@@ -167,7 +167,7 @@ public final class Q10338_SeizeYourDestiny extends Quest
}
case HADEL:
{
- if (player.isInCategory(CategoryType.AWAKEN_GROUP) || hasQuestItems(player, SCROLL_OF_AFTERLIFE.getId()))
+ if (player.isInCategory(CategoryType.SIXTH_CLASS_GROUP) || hasQuestItems(player, SCROLL_OF_AFTERLIFE.getId()))
{
htmltext = "33344-07.html";
}
diff --git a/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/quests/Q10339_FightingTheForgotten/Q10339_FightingTheForgotten.java b/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/quests/Q10339_FightingTheForgotten/Q10339_FightingTheForgotten.java
index 78c2aaa6fa..8f582b0287 100644
--- a/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/quests/Q10339_FightingTheForgotten/Q10339_FightingTheForgotten.java
+++ b/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/quests/Q10339_FightingTheForgotten/Q10339_FightingTheForgotten.java
@@ -62,7 +62,7 @@ public final class Q10339_FightingTheForgotten extends Quest
addTalkId(THEODORE, HADEL);
addKillId(MONSTERS);
addCondMinLevel(MIN_LV, "32975-06.html");
- addCondInCategory(CategoryType.AWAKEN_GROUP, "32975-06.html");
+ addCondInCategory(CategoryType.SIXTH_CLASS_GROUP, "32975-06.html");
}
@Override
diff --git a/L2J_Mobius_1.0_Ertheia/dist/game/data/stats/npcs/19100-19199.xml b/L2J_Mobius_1.0_Ertheia/dist/game/data/stats/npcs/19100-19199.xml
index bab5873db7..46c1076ab9 100644
--- a/L2J_Mobius_1.0_Ertheia/dist/game/data/stats/npcs/19100-19199.xml
+++ b/L2J_Mobius_1.0_Ertheia/dist/game/data/stats/npcs/19100-19199.xml
@@ -1961,7 +1961,7 @@
-
+
diff --git a/L2J_Mobius_1.0_Ertheia/dist/game/data/stats/npcs/25700-25799.xml b/L2J_Mobius_1.0_Ertheia/dist/game/data/stats/npcs/25700-25799.xml
index 805d7c9392..f1762661e6 100644
--- a/L2J_Mobius_1.0_Ertheia/dist/game/data/stats/npcs/25700-25799.xml
+++ b/L2J_Mobius_1.0_Ertheia/dist/game/data/stats/npcs/25700-25799.xml
@@ -4616,7 +4616,7 @@
-
+
@@ -4932,7 +4932,7 @@
-
+
@@ -5614,7 +5614,7 @@
-
+
@@ -5677,6 +5677,7 @@
+
@@ -5769,7 +5770,6 @@
-
@@ -5878,6 +5878,7 @@
+
@@ -5970,7 +5971,6 @@
-
diff --git a/L2J_Mobius_1.0_Ertheia/dist/game/data/stats/npcs/25800-25899.xml b/L2J_Mobius_1.0_Ertheia/dist/game/data/stats/npcs/25800-25899.xml
index cdb940e7e2..9d9c9a451e 100644
--- a/L2J_Mobius_1.0_Ertheia/dist/game/data/stats/npcs/25800-25899.xml
+++ b/L2J_Mobius_1.0_Ertheia/dist/game/data/stats/npcs/25800-25899.xml
@@ -56,7 +56,7 @@
-
+
@@ -108,7 +108,7 @@
-
+
@@ -1026,7 +1026,7 @@
-
+
@@ -1085,6 +1085,7 @@
+
@@ -1589,6 +1590,7 @@
+
@@ -1669,6 +1671,7 @@
+
@@ -1742,6 +1745,7 @@
+
@@ -1818,6 +1822,7 @@
+
@@ -1895,6 +1900,7 @@
+
@@ -1977,7 +1983,7 @@
-
+
@@ -2018,7 +2024,7 @@
-
+
@@ -2071,7 +2077,7 @@
-
+
@@ -2125,6 +2131,7 @@
+
@@ -2184,6 +2191,7 @@
+
@@ -2255,7 +2263,7 @@
-
+
@@ -2311,7 +2319,7 @@
-
+
@@ -2901,7 +2909,7 @@
-
+
@@ -2957,7 +2965,7 @@
-
+
@@ -3010,7 +3018,7 @@
-
+
@@ -3318,7 +3326,7 @@
-
+
@@ -3374,7 +3382,7 @@
-
+
@@ -3561,7 +3569,7 @@
-
+
@@ -4632,7 +4640,7 @@
-
+
diff --git a/L2J_Mobius_1.0_Ertheia/dist/game/data/stats/npcs/29000-29099.xml b/L2J_Mobius_1.0_Ertheia/dist/game/data/stats/npcs/29000-29099.xml
index 5ad30b4589..e72d1f5696 100644
--- a/L2J_Mobius_1.0_Ertheia/dist/game/data/stats/npcs/29000-29099.xml
+++ b/L2J_Mobius_1.0_Ertheia/dist/game/data/stats/npcs/29000-29099.xml
@@ -1358,7 +1358,7 @@
-
+
@@ -3425,7 +3425,7 @@
-
+
diff --git a/L2J_Mobius_1.0_Ertheia/dist/game/data/stats/npcs/29100-29199.xml b/L2J_Mobius_1.0_Ertheia/dist/game/data/stats/npcs/29100-29199.xml
index ed202c91d1..e4559a17b4 100644
--- a/L2J_Mobius_1.0_Ertheia/dist/game/data/stats/npcs/29100-29199.xml
+++ b/L2J_Mobius_1.0_Ertheia/dist/game/data/stats/npcs/29100-29199.xml
@@ -3375,7 +3375,7 @@
-
+
@@ -3904,7 +3904,7 @@
-
+
@@ -3943,7 +3943,7 @@
-
+
@@ -3983,7 +3983,7 @@
-
+
@@ -4025,7 +4025,7 @@
-
+
@@ -4130,7 +4130,7 @@
-
+
@@ -4258,7 +4258,7 @@
-
+
@@ -4373,7 +4373,7 @@
-
+
@@ -4489,7 +4489,7 @@
-
+
@@ -4535,7 +4535,7 @@
-
+
diff --git a/L2J_Mobius_1.0_Ertheia/dist/game/data/stats/npcs/29200-29299.xml b/L2J_Mobius_1.0_Ertheia/dist/game/data/stats/npcs/29200-29299.xml
index c3f8de397d..76308e6278 100644
--- a/L2J_Mobius_1.0_Ertheia/dist/game/data/stats/npcs/29200-29299.xml
+++ b/L2J_Mobius_1.0_Ertheia/dist/game/data/stats/npcs/29200-29299.xml
@@ -25,7 +25,7 @@
-
+
@@ -71,7 +71,7 @@
-
+
@@ -116,7 +116,7 @@
-
+
@@ -160,7 +160,7 @@
-
+
@@ -204,7 +204,7 @@
-
+
@@ -249,7 +249,7 @@
-
+
@@ -293,7 +293,7 @@
-
+
@@ -334,7 +334,7 @@
-
+
@@ -375,7 +375,7 @@
-
+
@@ -416,7 +416,7 @@
-
+
@@ -457,7 +457,7 @@
-
+
@@ -497,7 +497,7 @@
-
+
@@ -540,7 +540,7 @@
-
+
@@ -668,7 +668,7 @@
-
+
@@ -938,7 +938,7 @@
-
+
@@ -1090,7 +1090,7 @@
-
+
@@ -1131,7 +1131,7 @@
-
+
@@ -1171,7 +1171,7 @@
-
+
@@ -1222,7 +1222,7 @@
-
+
@@ -1444,7 +1444,7 @@
-
+
@@ -1567,7 +1567,7 @@
-
+
@@ -1650,7 +1650,7 @@
-
+
@@ -1698,7 +1698,7 @@
-
+
@@ -1746,7 +1746,7 @@
-
+
@@ -1786,7 +1786,7 @@
-
+
@@ -1894,7 +1894,7 @@
-
+
@@ -2002,7 +2002,7 @@
-
+
@@ -2041,7 +2041,7 @@
-
+
diff --git a/L2J_Mobius_1.0_Ertheia/dist/game/data/xsd/npcs.xsd b/L2J_Mobius_1.0_Ertheia/dist/game/data/xsd/npcs.xsd
index 4555d46531..6f00944cff 100644
--- a/L2J_Mobius_1.0_Ertheia/dist/game/data/xsd/npcs.xsd
+++ b/L2J_Mobius_1.0_Ertheia/dist/game/data/xsd/npcs.xsd
@@ -200,6 +200,7 @@
+
diff --git a/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/gameserver/data/xml/impl/SkillTreesData.java b/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/gameserver/data/xml/impl/SkillTreesData.java
index 5d2bd7a033..4b35d8bca8 100644
--- a/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/gameserver/data/xml/impl/SkillTreesData.java
+++ b/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/gameserver/data/xml/impl/SkillTreesData.java
@@ -689,7 +689,7 @@ public final class SkillTreesData implements IGameXmlReader
return result;
}
- final boolean isAwaken = player.isInCategory(CategoryType.AWAKEN_GROUP) && ((player.getRace() != Race.ERTHEIA) || player.isDualClassActive());
+ final boolean isAwaken = player.isInCategory(CategoryType.SIXTH_CLASS_GROUP) && ((player.getRace() != Race.ERTHEIA) || player.isDualClassActive());
for (Entry entry : skills.entrySet())
{
@@ -803,7 +803,7 @@ public final class SkillTreesData implements IGameXmlReader
}
final Race race = player.getRace();
- final boolean isAwaken = player.isInCategory(CategoryType.AWAKEN_GROUP);
+ final boolean isAwaken = player.isInCategory(CategoryType.SIXTH_CLASS_GROUP);
// Race skills
if (isAwaken)
diff --git a/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/gameserver/enums/CategoryType.java b/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/gameserver/enums/CategoryType.java
index c2e14659cd..3619287373 100644
--- a/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/gameserver/enums/CategoryType.java
+++ b/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/gameserver/enums/CategoryType.java
@@ -32,6 +32,17 @@ public enum CategoryType
SECOND_CLASS_GROUP,
THIRD_CLASS_GROUP,
FOURTH_CLASS_GROUP,
+ EQUIP_ENABLE_R,
+ FIFTH_CLASS_GROUP,
+ SIXTH_CLASS_GROUP,
+ SIXTH_SIGEL_GROUP,
+ SIXTH_TIR_GROUP,
+ SIXTH_OTHEL_GROUP,
+ SIXTH_YR_GROUP,
+ SIXTH_FEOH_GROUP,
+ SIXTH_IS_GROUP,
+ SIXTH_WYNN_GROUP,
+ SIXTH_EOLH_GROUP,
BOUNTY_HUNTER_GROUP,
WARSMITH_GROUP,
SUMMON_NPC_GROUP,
@@ -142,30 +153,158 @@ public enum CategoryType
RECOM_KAMAEL_GROUP,
RECOM_ORCF_GROUP,
RECOM_ORCM_GROUP,
+ RECOM_ERTHEIAF_GROUP,
+ RECOM_ERTHEIAM_GROUP,
DEINONYCHUS_PET_GROUP,
BEASTFARM_BEAST,
BEASTFARM_INVADER,
ICEQUEEN_NPC,
- AWAKEN_GROUP,
- SHILENS_FOLLOWERS,
- SIGEL_CANDIDATE,
- TYRR_CANDIDATE,
- OTHELL_CANDIDATE,
- YUL_CANDIDATE,
- FEOH_CANDIDATE,
- ISS_CANDIDATE,
- WYNN_CANDIDATE,
- AEORE_CANDIDATE,
- EVISCERATOR_CANDIDATE,
- SAYHA_SEER_CANDIDATE,
- SIGEL_GROUP,
- TYRR_GROUP,
- OTHELL_GROUP,
- YUL_GROUP,
- FEOH_GROUP,
- ISS_GROUP,
- WYNN_GROUP,
- AEORE_GROUP;
+ FAIRY_PC_SIDE,
+ FAIRY_WISP,
+ FAIRY_GLIMMER,
+ TANKER_CATEGORY,
+ WARRIOR_CATEGORY,
+ ROGUE_CATEGORY,
+ ARCHER_CATEGORY,
+ WIZARD_CATEGORY,
+ SUMMONER_CATEGORY,
+ HEALER_CATEGORY,
+ ENCHANTER_CATEGORY,
+ RUMBLE_MONSTERS,
+ RUMBLE_GUARDIANS,
+ TWO_POINT_MULTI_SUMMON,
+ APM_ZERO_WARRIOR_GROUP,
+ APM_ZERO_MAGE_GROUP,
+ APM_1ST_KNIGHT_GROUP,
+ APM_1ST_WARRIOR_GROUP,
+ APM_1ST_WIZARD_GROUP,
+ APM_1ST_HEALER_GROUP,
+ APM_2ND_KNIGHT_GROUP,
+ APM_2ND_WARRIOR_GROUP,
+ APM_2ND_ROGUE_GROUP,
+ APM_2ND_WIZARD_GROUP,
+ APM_2ND_ARCHER_GROUP,
+ APM_2ND_BUFFER_GROUP,
+ APM_2ND_SUMMONER_GROUP,
+ APM_2ND_ONLY_GROUP,
+ APM_3RD_KNIGHT_GROUP,
+ APM_3RD_WARRIOR_GROUP,
+ APM_3RD_ROGUE_GROUP,
+ APM_3RD_WIZARD_GROUP,
+ APM_3RD_ARCHER_GROUP,
+ APM_3RD_BUFFER_GROUP,
+ APM_3RD_SUMMONER_GROUP,
+ APM_3RD_ONLY_GROUP,
+ SUBCLASS_TANKER,
+ SUBCLASS_WARRIOR,
+ SUBCLASS_ROUGE,
+ SUBCLASS_ARCHER,
+ SUBCLASS_WIZARD,
+ SUBCLASS_SUMMON,
+ SUBCLASS_HEAL,
+ SUBCLASS_ENCHANTER,
+ SUBCLASS_SPEACIAL,
+ SUBCLASS_KAMAEL,
+ EXCEPT_KAMAEL_GROUP,
+ R_HUMANMAGE_GROUP,
+ R_HUMANFIGHTER_GROUP,
+ DIVISION_TANKER,
+ DIVISION_WARRIOR,
+ DIVISION_ROUGE,
+ DIVISION_ARCHER,
+ DIVISION_WIZARD,
+ DIVISION_SUMMON,
+ DIVISION_ENCHANTER,
+ DIVISION_HEAL,
+ HUMAN_FOURTH_CLASS_GROUP,
+ ELF_FOURTH_CLASS_GROUP,
+ DARKELF_FOURTH_CLASS_GROUP,
+ ORC_FOURTH_CLASS_GROUP,
+ DWARF_FOURTH_CLASS_GROUP,
+ FOURTH_LANCE_CLASS_GROUP,
+ FOURTH_BOW_CLASS_GROUP,
+ EQUIP_ENABLE_HEAVY_ATTACK,
+ EQUIP_ENABLE_HEAVY_DEFENSE,
+ EQUIP_ENABLE_LIGHT_HIT,
+ EQUIP_ENABLE_LIGHT_ENCHANT,
+ EQUIP_ENABLE_ROBE_MAGIC,
+ EQUIP_ENABLE_ROBE_RECOVERY,
+ DILLER_GROUP,
+ MAESTRO_GROUP,
+ MAESTRO_GROUP_CRAFT,
+ SUB_GROUP_WARRIOR2,
+ SUB_GROUP_ROGUE2,
+ SUB_GROUP_KNIGHT2,
+ SUB_GROUP_SUMMONER2,
+ SUB_GROUP_WIZARD2,
+ SUB_GROUP_HEALER2,
+ SUB_GROUP_ENCHANTER2,
+ G_CARTIA_PC_GROUP,
+ G_CARTIA_NPC_GROUP,
+ HEAVY_GROUP,
+ LIGHT_GROUP,
+ ROBE_GROUP,
+ M_WARRIOR_GROUP,
+ PHYSICS_CLASS_GROUP,
+ HEATSAND_SUMMON_CLASS_GROUP,
+ MAGIC_CLASS_GROUP,
+ LONG_DISTANCE_CLASS_GROUP,
+ CLOSE_DISTANCE_CLASS_GROUP,
+ HS_WIZARD_CLASS_GROUP,
+ HS_WARRIOR_CLASS_GROUP,
+ SUBCLASS_PALADIN,
+ SUBCLASS_DARKAVENGER,
+ SUBCLASS_TEMPLEKNIGHT,
+ SUBCLASS_SHILLIENKNIGHT,
+ SUBCLASS_GLADIATOR,
+ SUBCLASS_WARLORD,
+ SUBCLASS_DESTROYER,
+ SUBCLASS_TYRAN,
+ SUBCLASS_BERSERKER,
+ SUBCLASS_TREASUREHUNTER,
+ SUBCLASS_PLAINSWALKER,
+ SUBCLASS_ABYSSWALKER,
+ SUBCLASS_BOUNTYHUNTER,
+ SUBCLASS_HAWKEYE,
+ SUBCLASS_SILVERRANGER,
+ SUBCLASS_PHANTOMRANGER,
+ SUBCLASS_ARBALESTER,
+ SUBCLASS_SORCERER,
+ SUBCLASS_NECROMANCER,
+ SUBCLASS_SPELLSINGER,
+ SUBCLASS_SPELLHOWLER,
+ SUBCLASS_SOULBREAKER,
+ SUBCLASS_WARLOCK,
+ SUBCLASS_ELEMENTALSUMMONER,
+ SUBCLASS_PHANTOMSUMMONER,
+ SUBCLASS_BISHOP,
+ SUBCLASS_ELDER,
+ SUBCLASS_SHILLIENELDER,
+ SUBCLASS_PROPHET,
+ SUBCLASS_SWORDSINGER,
+ SUBCLASS_BLADEDANCER,
+ SUBCLASS_WARCRYER,
+ SUBCLASS_INSPECTOR,
+ WINDREFINE_ERTHEIA_GROUP,
+ WINDREFINE_ERTHEIA_GROUP1,
+ WINDREFINE_ERTHEIA_GROUP2,
+ ERTHEIA_ALL_CLASS,
+ ERTHEIA_FIRST_CLASS_GROUP,
+ ERTHEIA_SECOND_CLASS_GROUP,
+ ERTHEIA_THIRD_CLASS_GROUP,
+ ERTHEIA_FOURTH_CLASS_GROUP,
+ ERTHEIA_WIZARD_GROUP,
+ ERTHEIA_FIGHTER_GROUP,
+ ERTHEIA_THIRD_WIZARD_GROUP,
+ ERTHEIA_THIRD_FIGHTER_GROUP,
+ VANGUARD_OF_ADEN_FCC,
+ COMMON_MONSTER_FCC,
+ EQEIP_ENABLE_LHAND,
+ G_EV_MON_MINIGAME,
+ HEAVY_ARMOR_CLASS,
+ LIGHT_ARMOR_CLASS,
+ ROBE_CLASS,
+ EXCEPT_ERTHEIA_CLASS;
/**
* Finds category by it's name
diff --git a/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/gameserver/instancemanager/CeremonyOfChaosManager.java b/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/gameserver/instancemanager/CeremonyOfChaosManager.java
index 536650197b..7133977526 100644
--- a/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/gameserver/instancemanager/CeremonyOfChaosManager.java
+++ b/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/gameserver/instancemanager/CeremonyOfChaosManager.java
@@ -288,7 +288,7 @@ public class CeremonyOfChaosManager extends AbstractEventManager HERO_IDS = CategoryData.getInstance().getCategoryByType(CategoryType.AWAKEN_GROUP);
+ private static final Set HERO_IDS = CategoryData.getInstance().getCategoryByType(CategoryType.SIXTH_CLASS_GROUP);
private static final int COMP_START = Config.ALT_OLY_START_TIME; // 6PM
private static final int COMP_MIN = Config.ALT_OLY_MIN; // 00 mins
diff --git a/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/gameserver/model/zone/type/L2SayuneZone.java b/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/gameserver/model/zone/type/L2SayuneZone.java
index 0872062a68..ca1ec6ed1a 100644
--- a/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/gameserver/model/zone/type/L2SayuneZone.java
+++ b/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/gameserver/model/zone/type/L2SayuneZone.java
@@ -56,7 +56,7 @@ public class L2SayuneZone extends L2ZoneType
@Override
protected void onEnter(L2Character character)
{
- if (character.isPlayer() && (character.isInCategory(CategoryType.AWAKEN_GROUP) || Config.FREE_JUMPS_FOR_ALL) && !character.getActingPlayer().isMounted() && !character.isTransformed())
+ if (character.isPlayer() && (character.isInCategory(CategoryType.SIXTH_CLASS_GROUP) || Config.FREE_JUMPS_FOR_ALL) && !character.getActingPlayer().isMounted() && !character.isTransformed())
{
character.setInsideZone(ZoneId.SAYUNE, true);
ThreadPoolManager.execute(new FlyMoveStartTask(this, character.getActingPlayer()));
diff --git a/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/gameserver/network/clientpackets/RequestAcquireSkill.java b/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/gameserver/network/clientpackets/RequestAcquireSkill.java
index 2507e2937b..9778fe7c2f 100644
--- a/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/gameserver/network/clientpackets/RequestAcquireSkill.java
+++ b/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/gameserver/network/clientpackets/RequestAcquireSkill.java
@@ -417,7 +417,7 @@ public final class RequestAcquireSkill implements IClientIncomingPacket
Util.handleIllegalPlayerAction(activeChar, "Player " + activeChar.getName() + " is requesting skill Id: " + _id + " level " + _level + " while Sub-Class is active!", IllegalActionPunishmentType.NONE);
return;
}
- if ((activeChar.getLevel() < 85) || !activeChar.isInCategory(CategoryType.AWAKEN_GROUP))
+ if ((activeChar.getLevel() < 85) || !activeChar.isInCategory(CategoryType.SIXTH_CLASS_GROUP))
{
activeChar.sendPacket(SystemMessageId.YOU_DO_NOT_HAVE_THE_NECESSARY_MATERIALS_OR_PREREQUISITES_TO_LEARN_THIS_SKILL);
Util.handleIllegalPlayerAction(activeChar, "Player " + activeChar.getName() + " is requesting skill Id: " + _id + " level " + _level + " while not being level 85 or awaken!", IllegalActionPunishmentType.NONE);
@@ -460,7 +460,7 @@ public final class RequestAcquireSkill implements IClientIncomingPacket
return;
}
- if ((activeChar.getLevel() < 85) || !activeChar.isInCategory(CategoryType.AWAKEN_GROUP))
+ if ((activeChar.getLevel() < 85) || !activeChar.isInCategory(CategoryType.SIXTH_CLASS_GROUP))
{
activeChar.sendPacket(SystemMessageId.YOU_DO_NOT_HAVE_THE_NECESSARY_MATERIALS_OR_PREREQUISITES_TO_LEARN_THIS_SKILL);
Util.handleIllegalPlayerAction(activeChar, "Player " + activeChar.getName() + " is requesting skill Id: " + _id + " level " + _level + " while not being level 85 or awaken!", IllegalActionPunishmentType.NONE);
diff --git a/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/gameserver/network/clientpackets/RequestAcquireSkillInfo.java b/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/gameserver/network/clientpackets/RequestAcquireSkillInfo.java
index 642b423b4b..6ceb8bc736 100644
--- a/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/gameserver/network/clientpackets/RequestAcquireSkillInfo.java
+++ b/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/gameserver/network/clientpackets/RequestAcquireSkillInfo.java
@@ -150,7 +150,7 @@ public final class RequestAcquireSkillInfo implements IClientIncomingPacket
}
case REVELATION:
{
- if ((activeChar.getLevel() < 85) || !activeChar.isInCategory(CategoryType.AWAKEN_GROUP))
+ if ((activeChar.getLevel() < 85) || !activeChar.isInCategory(CategoryType.SIXTH_CLASS_GROUP))
{
return;
}
diff --git a/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/gameserver/network/clientpackets/RequestExEnchantSkill.java b/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/gameserver/network/clientpackets/RequestExEnchantSkill.java
index f376a2b647..20bddb71e4 100644
--- a/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/gameserver/network/clientpackets/RequestExEnchantSkill.java
+++ b/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/gameserver/network/clientpackets/RequestExEnchantSkill.java
@@ -87,7 +87,7 @@ public final class RequestExEnchantSkill implements IClientIncomingPacket
return;
}
- if (!player.isInCategory(CategoryType.AWAKEN_GROUP))
+ if (!player.isInCategory(CategoryType.SIXTH_CLASS_GROUP))
{
return;
}
diff --git a/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/gameserver/network/clientpackets/RequestExEnchantSkillInfo.java b/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/gameserver/network/clientpackets/RequestExEnchantSkillInfo.java
index ea945a56e1..aee265cc38 100644
--- a/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/gameserver/network/clientpackets/RequestExEnchantSkillInfo.java
+++ b/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/gameserver/network/clientpackets/RequestExEnchantSkillInfo.java
@@ -72,7 +72,7 @@ public final class RequestExEnchantSkillInfo implements IClientIncomingPacket
return;
}
- if (!activeChar.isInCategory(CategoryType.AWAKEN_GROUP))
+ if (!activeChar.isInCategory(CategoryType.SIXTH_CLASS_GROUP))
{
return;
}
diff --git a/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/gameserver/network/clientpackets/mentoring/ConfirmMenteeAdd.java b/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/gameserver/network/clientpackets/mentoring/ConfirmMenteeAdd.java
index ec5e7516a8..0c907de10f 100644
--- a/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/gameserver/network/clientpackets/mentoring/ConfirmMenteeAdd.java
+++ b/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/gameserver/network/clientpackets/mentoring/ConfirmMenteeAdd.java
@@ -115,7 +115,7 @@ public class ConfirmMenteeAdd implements IClientIncomingPacket
mentor.sendPacket(SystemMessageId.THAT_PLAYER_IS_NOT_ONLINE);
return false;
}
- else if (!mentor.isInCategory(CategoryType.AWAKEN_GROUP))
+ else if (!mentor.isInCategory(CategoryType.SIXTH_CLASS_GROUP))
{
mentor.sendPacket(SystemMessageId.YOU_MUST_AWAKEN_IN_ORDER_TO_BECOME_A_MENTOR);
return false;
diff --git a/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/gameserver/network/clientpackets/sayune/RequestFlyMoveStart.java b/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/gameserver/network/clientpackets/sayune/RequestFlyMoveStart.java
index 4ddb30ba78..50b48de960 100644
--- a/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/gameserver/network/clientpackets/sayune/RequestFlyMoveStart.java
+++ b/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/gameserver/network/clientpackets/sayune/RequestFlyMoveStart.java
@@ -44,7 +44,7 @@ public class RequestFlyMoveStart implements IClientIncomingPacket
public void run(L2GameClient client)
{
final L2PcInstance activeChar = client.getActiveChar();
- if ((activeChar == null) || !activeChar.isInsideZone(ZoneId.SAYUNE) || activeChar.hasRequest(SayuneRequest.class) || !activeChar.isInCategory(CategoryType.AWAKEN_GROUP))
+ if ((activeChar == null) || !activeChar.isInsideZone(ZoneId.SAYUNE) || activeChar.hasRequest(SayuneRequest.class) || !activeChar.isInCategory(CategoryType.SIXTH_CLASS_GROUP))
{
return;
}
diff --git a/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/gameserver/network/serverpackets/mentoring/ExMentorList.java b/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/gameserver/network/serverpackets/mentoring/ExMentorList.java
index 81e7216e87..bfd2044055 100644
--- a/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/gameserver/network/serverpackets/mentoring/ExMentorList.java
+++ b/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/gameserver/network/serverpackets/mentoring/ExMentorList.java
@@ -48,7 +48,7 @@ public class ExMentorList implements IClientOutgoingPacket
_type = 0x02;
_mentees = Arrays.asList(MentorManager.getInstance().getMentor(activeChar.getObjectId()));
}
- else if (activeChar.isInCategory(CategoryType.AWAKEN_GROUP)) // Not a mentor, Not a mentee, so can be a mentor
+ else if (activeChar.isInCategory(CategoryType.SIXTH_CLASS_GROUP)) // Not a mentor, Not a mentee, so can be a mentor
{
_mentees = Collections.emptyList();
_type = 0x01;
diff --git a/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/gameserver/network/serverpackets/mentoring/ListMenteeWaiting.java b/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/gameserver/network/serverpackets/mentoring/ListMenteeWaiting.java
index 97226c02a6..3bd29141b5 100644
--- a/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/gameserver/network/serverpackets/mentoring/ListMenteeWaiting.java
+++ b/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/gameserver/network/serverpackets/mentoring/ListMenteeWaiting.java
@@ -40,7 +40,7 @@ public class ListMenteeWaiting implements IClientOutgoingPacket
_page = page;
for (L2PcInstance player : L2World.getInstance().getPlayers())
{
- if ((player.getLevel() >= minLevel) && (player.getLevel() <= maxLevel) && !player.isMentee() && !player.isMentor() && !player.isInCategory(CategoryType.AWAKEN_GROUP))
+ if ((player.getLevel() >= minLevel) && (player.getLevel() <= maxLevel) && !player.isMentee() && !player.isMentor() && !player.isInCategory(CategoryType.SIXTH_CLASS_GROUP))
{
_possibleCandiates.add(player);
}
diff --git a/L2J_Mobius_2.5_Underground/dist/game/config/ClassMaster.xml b/L2J_Mobius_2.5_Underground/dist/game/config/ClassMaster.xml
index 64fd4dc65d..e3efd06e2e 100644
--- a/L2J_Mobius_2.5_Underground/dist/game/config/ClassMaster.xml
+++ b/L2J_Mobius_2.5_Underground/dist/game/config/ClassMaster.xml
@@ -17,7 +17,7 @@
- SIGEL_CANDIDATE
+ TANKER_CATEGORY
@@ -26,7 +26,7 @@
- TYRR_CANDIDATE
+ WARRIOR_CATEGORY
@@ -35,7 +35,7 @@
- OTHELL_CANDIDATE
+ ROGUE_CATEGORY
@@ -44,7 +44,7 @@
- YUL_CANDIDATE
+ ARCHER_CATEGORY
@@ -53,7 +53,7 @@
- FEOH_CANDIDATE
+ WIZARD_CATEGORY
@@ -62,7 +62,7 @@
- WYNN_CANDIDATE
+ SUMMONER_CATEGORY
@@ -71,7 +71,7 @@
- ISS_CANDIDATE
+ ENCHANTER_CATEGORY
@@ -80,7 +80,7 @@
- AEORE_CANDIDATE
+ HEALER_CATEGORY
@@ -89,7 +89,7 @@
- EVISCERATOR_CANDIDATE
+ ERTHEIA_THIRD_FIGHTER_GROUP
@@ -98,7 +98,7 @@
- SAYHA_SEER_CANDIDATE
+ ERTHEIA_THIRD_WIZARD_GROUP
diff --git a/L2J_Mobius_2.5_Underground/dist/game/data/CategoryData.xml b/L2J_Mobius_2.5_Underground/dist/game/data/CategoryData.xml
index b4958b1379..a92e1c68c7 100644
--- a/L2J_Mobius_2.5_Underground/dist/game/data/CategoryData.xml
+++ b/L2J_Mobius_2.5_Underground/dist/game/data/CategoryData.xml
@@ -1,72 +1,77 @@
- 0
- 1
- 2
- 3
- 4
- 5
- 6
- 7
- 8
- 9
- 18
- 19
- 20
- 21
- 22
- 23
- 24
- 31
- 32
- 33
- 34
- 35
- 36
- 37
- 44
- 45
- 46
- 47
- 48
- 53
- 54
- 55
- 56
- 57
- 88
- 89
- 90
- 91
- 92
- 93
- 99
- 100
- 101
- 102
- 106
- 107
- 108
- 109
- 113
- 114
- 117
- 118
- 123
- 124
- 125
- 126
- 127
- 128
- 129
- 130
- 131
- 132
- 133
- 134
- 135
- 136
+ 0
+ 1
+ 2
+ 3
+ 4
+ 5
+ 6
+ 7
+ 8
+ 9
+ 18
+ 19
+ 20
+ 21
+ 22
+ 23
+ 24
+ 31
+ 32
+ 33
+ 34
+ 35
+ 36
+ 37
+ 44
+ 45
+ 46
+ 47
+ 48
+ 53
+ 54
+ 55
+ 56
+ 57
+ 88
+ 89
+ 90
+ 91
+ 92
+ 93
+ 99
+ 100
+ 101
+ 102
+ 106
+ 107
+ 108
+ 109
+ 113
+ 114
+ 117
+ 118
+ 123
+ 124
+ 125
+ 126
+ 127
+ 128
+ 129
+ 130
+ 131
+ 132
+ 133
+ 134
+ 135
+ 136
+ 139
+ 140
+ 141
+ 142
+ 144
148
149
150
@@ -85,49 +90,465 @@
163
164
165
+ 171
+ 172
+ 173
+ 174
+ 175
182
184
186
188
- 10
- 11
- 12
- 13
- 14
- 15
- 16
- 17
- 25
- 26
- 27
- 28
- 29
- 30
- 38
- 39
- 40
- 41
- 42
- 43
- 49
- 50
- 51
- 52
- 94
- 95
- 96
- 97
- 98
- 103
- 104
- 105
- 110
- 111
- 112
- 115
- 116
+ 10
+ 11
+ 12
+ 13
+ 14
+ 15
+ 16
+ 17
+ 25
+ 26
+ 27
+ 28
+ 29
+ 30
+ 38
+ 39
+ 40
+ 41
+ 42
+ 43
+ 49
+ 50
+ 51
+ 52
+ 94
+ 95
+ 96
+ 97
+ 98
+ 103
+ 104
+ 105
+ 110
+ 111
+ 112
+ 115
+ 116
+ 143
+ 145
+ 146
+ 166
+ 167
+ 168
+ 169
+ 170
+ 176
+ 177
+ 178
+ 179
+ 180
+ 181
+ 183
+ 185
+ 187
+ 189
+
+
+ 10
+ 11
+ 12
+ 13
+ 14
+ 25
+ 26
+ 27
+ 28
+ 38
+ 39
+ 40
+ 41
+ 94
+ 95
+ 96
+ 103
+ 104
+ 110
+ 111
+ 49
+ 50
+ 51
+ 52
+ 115
+ 116
+ 143
+ 145
+ 166
+ 167
+ 168
+ 169
+ 170
+ 176
+ 177
+ 178
+ 183
+ 185
+ 187
+ 189
+
+
+ 10
+ 15
+ 16
+ 17
+ 25
+ 29
+ 30
+ 38
+ 42
+ 43
+ 97
+ 98
+ 105
+ 146
+ 179
+ 180
+ 181
+
+
+ 0
+ 1
+ 2
+ 3
+ 7
+ 8
+ 9
+ 18
+ 22
+ 23
+ 24
+ 31
+ 35
+ 36
+ 37
+ 44
+ 45
+ 46
+ 47
+ 48
+ 53
+ 88
+ 89
+ 93
+ 92
+ 102
+ 101
+ 108
+ 109
+ 113
+ 114
+ 123
+ 124
+ 125
+ 126
+ 127
+ 128
+ 129
+ 130
+ 135
+ 131
+ 132
+ 133
+ 134
+ 136
+ 140
+ 141
+ 142
+ 144
+ 152
+ 153
+ 154
+ 155
+ 156
+ 157
+ 158
+ 159
+ 160
+ 161
+ 162
+ 163
+ 164
+ 165
+ 171
+ 172
+ 173
+ 174
+ 175
+ 182
+ 184
+ 186
+ 188
+
+
+ 4
+ 5
+ 6
+ 90
+ 91
+ 19
+ 20
+ 99
+ 32
+ 33
+ 106
+ 54
+ 56
+ 55
+ 57
+ 117
+ 118
+ 139
+ 148
+ 149
+ 150
+ 151
+
+
+ 0
+ 10
+ 18
+ 25
+ 31
+ 38
+ 44
+ 49
+ 53
+ 123
+ 124
+ 182
+ 183
+
+
+ 1
+ 4
+ 7
+ 11
+ 15
+ 19
+ 22
+ 26
+ 29
+ 32
+ 35
+ 39
+ 42
+ 45
+ 47
+ 50
+ 54
+ 56
+ 125
+ 126
+
+
+ 2
+ 3
+ 5
+ 6
+ 8
+ 9
+ 12
+ 13
+ 14
+ 16
+ 17
+ 20
+ 21
+ 23
+ 24
+ 27
+ 28
+ 30
+ 33
+ 34
+ 36
+ 37
+ 40
+ 41
+ 43
+ 46
+ 48
+ 51
+ 52
+ 55
+ 57
+ 127
+ 128
+ 129
+ 130
+ 135
+ 184
+ 185
+
+
+ 88
+ 89
+ 90
+ 91
+ 92
+ 93
+ 94
+ 95
+ 96
+ 97
+ 98
+ 99
+ 100
+ 101
+ 102
+ 103
+ 104
+ 105
+ 106
+ 107
+ 108
+ 109
+ 110
+ 111
+ 112
+ 113
+ 114
+ 115
+ 116
+ 117
+ 118
+ 131
+ 132
+ 133
+ 134
+ 136
+ 186
+ 187
+
+
+ 0
+ 10
+ 18
+ 25
+ 31
+ 38
+ 44
+ 49
+ 53
+ 1
+ 4
+ 7
+ 11
+ 15
+ 19
+ 22
+ 26
+ 29
+ 32
+ 35
+ 39
+ 42
+ 45
+ 47
+ 50
+ 54
+ 56
+ 2
+ 3
+ 5
+ 6
+ 8
+ 9
+ 12
+ 13
+ 14
+ 16
+ 17
+ 20
+ 21
+ 23
+ 24
+ 27
+ 28
+ 30
+ 33
+ 34
+ 36
+ 37
+ 40
+ 41
+ 43
+ 46
+ 48
+ 51
+ 52
+ 55
+ 57
+ 88
+ 89
+ 90
+ 91
+ 92
+ 93
+ 94
+ 95
+ 96
+ 97
+ 98
+ 99
+ 100
+ 101
+ 102
+ 103
+ 104
+ 105
+ 106
+ 107
+ 108
+ 109
+ 110
+ 111
+ 112
+ 113
+ 114
+ 115
+ 116
+ 117
+ 118
+ 139
+ 140
+ 141
+ 142
+ 143
+ 144
+ 145
+ 146
+ 148
+ 149
+ 150
+ 151
+ 152
+ 153
+ 154
+ 155
+ 156
+ 157
+ 158
+ 159
+ 160
+ 161
+ 162
+ 163
+ 164
+ 165
166
167
168
@@ -144,2396 +565,26 @@
179
180
181
+ 182
+ 184
+ 186
+ 188
183
185
- 187
+ 187
189
-
- 10
- 11
- 12
- 13
- 14
- 25
- 26
- 27
- 28
- 38
- 39
- 40
- 41
- 94
- 95
- 96
- 103
- 104
- 110
- 111
- 49
- 50
- 51
- 52
- 115
- 116
- 166
- 167
- 168
- 169
- 170
- 176
- 177
- 178
- 183
-
-
- 10
- 15
- 16
- 17
- 25
- 29
- 30
- 38
- 42
- 43
- 97
- 98
- 105
- 179
- 180
- 181
-
-
- 0
- 1
- 2
- 3
- 7
- 8
- 9
- 18
- 22
- 23
- 24
- 31
- 35
- 36
- 37
- 44
- 45
- 46
- 47
- 48
- 53
- 88
- 89
- 93
- 92
- 102
- 101
- 108
- 109
- 113
- 114
- 123
- 124
- 125
- 126
- 127
- 128
- 129
- 130
- 135
- 131
- 132
- 133
- 134
- 136
- 152
- 153
- 154
- 155
- 156
- 157
- 158
- 159
- 160
- 161
- 162
- 163
- 164
- 165
-
-
- 4
- 5
- 6
- 90
- 91
- 19
- 20
- 99
- 32
- 33
- 106
- 54
- 56
- 55
- 57
- 117
- 118
- 148
- 149
- 150
- 151
-
-
- 0
- 10
- 18
- 25
- 31
- 38
- 44
- 49
- 53
- 123
- 124
- 182
- 183
-
-
- 1
- 4
- 7
- 11
- 15
- 19
- 22
- 26
- 29
- 32
- 35
- 39
- 42
- 45
- 47
- 50
- 54
- 56
- 125
- 126
-
-
- 2
- 3
- 5
- 6
- 8
- 9
- 12
- 13
- 14
- 16
- 17
- 20
- 21
- 23
- 24
- 27
- 28
- 30
- 33
- 34
- 36
- 37
- 40
- 41
- 43
- 46
- 48
- 51
- 52
- 55
- 57
- 127
- 128
- 129
- 130
- 135
- 184
- 185
-
-
- 88
- 89
- 90
- 91
- 92
- 93
- 94
- 95
- 96
- 97
- 98
- 99
- 100
- 101
- 102
- 103
- 104
- 105
- 106
- 107
- 108
- 109
- 110
- 111
- 112
- 113
- 114
- 115
- 116
- 117
- 118
- 131
- 132
- 133
- 134
- 136
- 186
- 187
-
-
- 53
- 54
- 55
- 117
- 161
-
-
- 53
- 56
- 57
- 118
- 156
-
-
- 14001
- 14002
- 14003
- 14004
- 14005
- 14006
- 14007
- 14008
- 14009
- 14010
- 14011
- 14012
- 14013
- 14014
- 14015
- 14016
- 14017
- 14018
- 14019
- 14020
- 14021
- 14022
- 14023
- 14024
- 14025
- 14026
- 14027
- 14028
- 14029
- 14030
- 14031
- 14032
- 14033
- 14034
- 14035
- 14036
- 14037
- 14038
- 14039
- 14040
- 14041
- 14042
- 14043
- 14044
- 14045
- 14046
- 14047
- 14048
- 14049
- 14050
- 14051
- 14052
- 14053
- 14054
- 14055
- 14056
- 14057
- 14058
- 14059
- 14060
- 14061
- 14062
- 14063
- 14064
- 14065
- 14066
- 14067
- 14068
- 14069
- 14070
- 14071
- 14072
- 14073
- 14074
- 14075
- 14076
- 14077
- 14078
- 14079
- 14080
- 14081
- 14082
- 14083
- 14084
- 14085
- 14086
- 14087
- 14088
- 14089
- 14090
- 14091
- 14092
- 14093
- 14094
- 14095
- 14096
- 14097
- 14098
- 14099
- 14100
- 14101
- 14102
- 14103
- 14104
- 14105
- 14106
- 14107
- 14108
- 14109
- 14110
- 14111
- 14112
- 14113
- 14114
- 14115
- 14116
- 14117
- 14118
- 14119
- 14120
- 14121
- 14122
- 14123
- 14124
- 14125
- 14126
- 14127
- 14128
- 14129
- 14130
- 14131
- 14132
- 14133
- 14134
- 14135
- 14136
- 14137
- 14138
- 14139
- 14140
- 14141
- 14142
- 14143
- 14144
- 14145
- 14146
- 14147
- 14148
- 14149
- 14150
- 14151
- 14152
- 14153
- 14154
- 14155
- 14156
- 14157
- 14158
- 14159
- 14160
- 14161
- 14162
- 14163
- 14164
- 14165
- 14166
- 14167
- 14168
- 14169
- 14170
- 14171
- 14172
- 14173
- 14174
- 14175
- 14176
- 14177
- 14178
- 14179
- 14180
- 14181
- 14182
- 14183
- 14184
- 14185
- 14186
- 14187
- 14188
- 14189
- 14190
- 14191
- 14192
- 14193
- 14194
- 14195
- 14196
- 14197
- 14198
- 14199
- 14200
- 14201
- 14202
- 14203
- 14204
- 14205
- 14206
- 14207
- 14208
- 14209
- 14210
- 14211
- 14212
- 14213
- 14214
- 14215
- 14216
- 14217
- 14218
- 14219
- 14220
- 14221
- 14222
- 14223
- 14224
- 14225
- 14226
- 14227
- 14228
- 14229
- 14230
- 14231
- 14232
- 14233
- 14234
- 14235
- 14236
- 14237
- 14238
- 14239
- 14240
- 14241
- 14242
- 14243
- 14244
- 14245
- 14246
- 14247
- 14248
- 14249
- 14250
- 14251
- 14252
- 14253
- 14254
- 14255
- 14256
- 14257
- 14258
- 14259
- 14260
- 14265
- 14266
- 14267
- 14268
- 14269
- 14270
- 14271
- 14272
- 14273
- 14274
- 14275
- 14276
- 14277
- 14278
- 14279
- 14280
- 14281
- 14282
- 14283
- 14284
- 14285
- 14286
- 14287
- 14288
- 14289
- 14290
- 14291
- 14292
- 14293
- 14294
- 14295
- 14296
- 14297
- 14298
- 14299
- 14300
- 14301
- 14302
- 14303
- 14304
- 14305
- 14306
- 14307
- 14308
- 14309
- 14310
- 14311
- 14312
- 14313
- 14314
- 14315
- 14316
- 14317
- 14318
- 14319
- 14320
- 14321
- 14322
- 14323
- 14324
- 14325
- 14326
- 14327
- 14328
- 14329
- 14330
- 14331
- 14332
- 14333
- 14334
- 14335
- 14336
- 14337
- 14338
- 14339
- 14340
- 14341
- 14342
- 14343
- 14344
- 14345
- 14346
- 14347
- 14348
- 14349
- 14350
- 14351
- 14352
- 14353
- 14354
- 14355
- 14356
- 14357
- 14358
- 14359
- 14360
- 14361
- 14362
- 14363
- 14364
- 14365
- 14366
- 14367
- 14368
- 14369
- 14370
- 14371
- 14372
- 14373
- 14374
- 14375
- 14376
- 14377
- 14378
- 14379
- 14380
- 14381
- 14382
- 14383
- 14384
- 14385
- 14386
- 14387
- 14388
- 14389
- 14390
- 14391
- 14392
- 14393
- 14394
- 14395
- 14396
- 14397
- 14398
- 14399
- 14400
- 14401
- 14402
- 14403
- 14404
- 14405
- 14406
- 14407
- 14408
- 14409
- 14410
- 14411
- 14412
- 14413
- 14414
- 14415
- 14416
- 14417
- 14418
- 14419
- 14420
- 14421
- 14422
- 14423
- 14424
- 14425
- 14426
- 14427
- 14428
- 14429
- 14430
- 14431
- 14432
- 14433
- 14434
- 14435
- 14436
- 14437
- 14438
- 14439
- 14440
- 14441
- 14442
- 14443
- 14444
- 14449
- 14450
- 14451
- 14452
- 14453
- 14454
- 14455
- 14456
- 14457
- 14458
- 14459
- 14460
- 14461
- 14462
- 14463
- 14464
- 14465
- 14466
- 14467
- 14468
- 14469
- 14470
- 14471
- 14472
- 14473
- 14474
- 14475
- 14476
- 14477
- 14478
- 14479
- 14480
- 14481
- 14482
- 14483
- 14484
- 14485
- 14486
- 14487
- 14488
- 14489
- 14490
- 14491
- 14492
- 14493
- 14494
- 14495
- 14496
- 14497
- 14498
- 14499
- 14500
- 14501
- 14502
- 14503
- 14504
- 14505
- 14506
- 14507
- 14508
- 14509
- 14510
- 14511
- 14512
- 14513
- 14514
- 14515
- 14516
- 14517
- 14518
- 14519
- 14520
- 14521
- 14522
- 14523
- 14524
- 14525
- 14526
- 14527
- 14528
- 14529
- 14530
- 14531
- 14532
- 14533
- 14534
- 14535
- 14536
- 14537
- 14538
- 14539
- 14540
- 14541
- 14542
- 14543
- 14544
- 14545
- 14546
- 14547
- 14548
- 14549
- 14550
- 14551
- 14552
- 14553
- 14554
- 14555
- 14556
- 14557
- 14558
- 14559
- 14560
- 14561
- 14562
- 14563
- 14564
- 14565
- 14566
- 14567
- 14568
- 14569
- 14570
- 14571
- 14572
- 14573
- 14574
- 14575
- 14576
- 14577
- 14578
- 14579
- 14580
- 14581
- 14582
- 14583
- 14584
- 14585
- 14586
- 14587
- 14588
- 14589
- 14590
- 14591
- 14592
- 14593
- 14594
- 14595
- 14596
- 14597
- 14598
- 14599
- 14600
- 14601
- 14602
- 14603
- 14604
- 14605
- 14606
- 14607
- 14608
- 14609
- 14610
- 14611
- 14612
- 14613
- 14614
- 14615
- 14616
- 14617
- 14618
- 14619
- 14620
- 14621
- 14622
- 14623
- 14624
- 14625
- 14626
- 14627
- 14628
- 14633
- 14634
- 14635
- 14636
- 14637
- 14638
- 14639
- 14640
- 14641
- 14642
- 14643
- 14644
- 14645
- 14646
- 14647
- 14648
- 14649
- 14650
- 14651
- 14652
- 14653
- 14654
- 14655
- 14656
- 14657
- 14658
- 14659
- 14660
- 14661
- 14662
- 14663
- 14664
- 14665
- 14666
- 14667
- 14668
- 14669
- 14670
- 14671
- 14672
- 14673
- 14674
- 14675
- 14676
- 14677
- 14678
- 14679
- 14680
- 14681
- 14682
- 14683
- 14684
- 14685
- 14686
- 14687
- 14688
- 14689
- 14690
- 14691
- 14692
- 14693
- 14694
- 14695
- 14696
- 14697
- 14698
- 14699
- 14700
- 14701
- 14702
- 14703
- 14704
- 14705
- 14706
- 14707
- 14708
- 14709
- 14710
- 14711
- 14712
- 14713
- 14714
- 14715
- 14716
- 14717
- 14718
- 14719
- 14720
- 14721
- 14722
- 14723
- 14724
- 14725
- 14726
- 14727
- 14728
- 14729
- 14730
- 14731
- 14732
- 14733
- 14734
- 14735
- 14736
- 14737
- 14738
- 14739
- 14740
- 14741
- 14742
- 14743
- 14744
- 14745
- 14746
- 14747
- 14748
- 14749
- 14750
- 14751
- 14752
- 14753
- 14754
- 14755
- 14756
- 14757
- 14758
- 14759
- 14760
- 14761
- 14762
- 14763
- 14764
- 14765
- 14766
- 14767
- 14768
- 14769
- 14770
- 14771
- 14772
- 14773
- 14774
- 14775
- 14776
- 14777
- 14778
- 14779
- 14780
- 14781
- 14782
- 14783
- 14784
- 14785
- 14786
- 14787
- 14788
- 14789
- 14790
- 14791
- 14792
- 14793
- 14794
- 14795
- 14796
- 14797
- 14798
- 14799
- 14800
- 14801
- 14802
- 14803
- 14804
- 14805
- 14806
- 14807
- 14808
- 14809
- 14810
- 14811
- 14812
- 14813
- 14814
- 14815
- 14816
- 14817
- 14818
- 14819
- 14820
- 14821
- 14822
- 14823
- 14824
- 14825
- 14826
- 14827
- 14828
- 14829
- 14830
- 14831
- 14832
- 14833
- 14834
- 14835
- 14836
- 14837
- 14838
- 14839
- 14840
- 14841
- 14842
- 14843
- 14844
- 14845
- 14846
- 14847
- 14848
- 14849
- 14850
- 14851
- 14852
- 14853
- 14854
- 14855
- 14856
- 14857
- 14858
- 14859
- 14860
- 14861
- 14862
- 14863
- 14864
- 14865
- 14866
- 14867
- 14868
- 14869
- 12077
- 12311
- 12312
- 12313
- 12526
- 12527
- 12528
- 12564
- 12621
- 12780
- 12781
- 12782
- 16025
- 13071
- 13072
- 13073
- 13074
- 13075
- 13076
- 14870
- 14871
- 14872
- 14873
- 14874
- 14875
- 14876
- 14877
- 14878
- 14879
- 14880
- 14881
- 14882
- 14883
- 14884
- 14885
- 14886
- 14887
- 14888
- 14889
- 14890
- 14891
- 14892
- 14893
- 14894
- 14895
- 14896
- 14897
- 14898
- 14899
- 14900
- 14901
- 14902
- 14903
- 14904
- 14905
- 14906
- 14907
- 14908
- 14909
- 14910
- 14911
- 14912
- 14913
- 14914
- 14915
- 16030
- 16034
- 16035
- 16036
- 16037
- 16038
- 16039
- 16040
- 16041
- 16042
- 16043
- 16044
- 16045
- 16046
- 14916
- 14917
- 14918
- 16050
- 16051
- 16052
- 16053
- 16067
- 16068
- 16071
- 16072
-
-
- 4
- 19
- 32
-
-
- 15
- 29
- 5
- 19
- 4
-
-
- 15
- 29
- 42
- 50
-
-
- 15
- 42
-
-
- 1
- 19
- 32
- 45
- 47
-
-
- 1
- 4
- 7
- 11
- 15
-
-
- 22
- 19
- 26
- 29
-
-
- 35
- 32
- 39
- 42
-
-
- 50
- 45
- 47
-
-
- 54
- 56
-
-
- 12526
- 12527
- 12528
- 16038
- 16039
- 16040
- 16068
-
-
- 12526
- 12527
- 12528
-
-
- 16038
- 16039
- 16040
- 16068
-
-
- 16030
- 16037
- 16041
- 16042
-
-
- 16025
- 16030
- 16037
- 16041
- 16042
-
-
- 12311
- 12312
- 12313
-
-
- 12780
- 12781
- 12782
-
-
- 16034
- 16035
- 16036
-
-
- 12621
-
-
- 12077
- 16025
- 16030
- 16037
- 16041
- 16042
-
-
- 12077
-
-
- 12564
-
-
- 12077
- 12311
- 12312
- 12313
- 12526
- 12527
- 12528
- 12780
- 12781
- 12782
- 16025
- 16030
- 16034
- 16035
- 16036
- 16037
- 16038
- 16039
- 16040
- 16041
- 16042
- 16043
- 16044
- 16045
- 16046
- 16050
- 16051
- 16052
- 16053
- 16067
- 16068
- 16071
- 16072
- 1561
- 1538
- 1562
- 1563
- 1564
- 1565
- 1566
- 1567
- 1568
- 1569
- 1570
- 1571
- 1572
- 1573
-
-
- 12077
- 12311
- 12312
- 12313
- 12526
- 12527
- 12528
- 12780
- 12781
- 12782
- 16025
- 16030
- 16034
- 16035
- 16036
- 16037
- 16038
- 16039
- 16040
- 16041
- 16042
- 16068
- 16067
- 16071
- 16072
- 1561
-
-
- 8
- 23
- 36
- 93
- 101
- 108
-
-
- 9
- 24
- 37
- 92
- 102
- 109
-
-
- 5
- 6
- 33
- 20
- 90
- 91
- 106
- 99
-
-
- 14
- 28
- 41
- 96
- 104
- 111
-
-
- 30
- 43
- 105
- 112
-
-
- 21
- 34
- 100
- 107
-
-
- 12
- 27
- 40
- 94
- 103
- 110
-
-
- 0
- 1
- 4
- 7
- 2
- 3
- 5
- 6
- 8
- 9
- 88
- 89
- 90
- 91
- 92
- 93
-
-
- 10
- 11
- 12
- 13
- 14
- 94
- 95
- 96
-
-
- 10
- 11
- 12
- 13
- 14
- 10
- 15
- 16
- 17
- 95
- 96
- 97
- 98
-
-
- 10
- 15
- 16
- 17
- 97
- 98
-
-
- 18
- 19
- 22
- 20
- 21
- 23
- 24
- 99
- 100
- 101
- 102
-
-
- 25
- 26
- 27
- 28
- 25
- 29
- 30
- 103
- 104
- 105
-
-
- 25
- 26
- 27
- 28
- 103
- 104
-
-
- 25
- 29
- 30
- 105
-
-
- 31
- 32
- 35
- 33
- 34
- 36
- 37
- 106
- 107
- 108
- 109
-
-
- 38
- 39
- 42
- 40
- 41
- 43
- 110
- 111
- 112
-
-
- 38
- 39
- 40
- 41
- 110
- 111
-
-
- 38
- 42
- 43
- 112
-
-
- 44
- 45
- 47
- 46
- 48
- 113
- 114
-
-
- 49
- 50
- 51
- 52
- 115
- 116
-
-
- 53
- 54
- 56
- 55
- 57
- 117
- 118
-
-
- 53
- 54
- 55
- 117
-
-
- 53
- 56
- 57
- 118
-
-
- 123
- 124
- 125
- 126
- 127
- 128
- 129
- 130
- 131
- 132
- 133
- 134
- 135
- 136
-
-
- 123
- 124
-
-
- 125
- 126
-
-
- 127
- 128
- 129
- 130
- 135
-
-
- 131
- 132
- 133
- 134
- 136
-
-
- 0
- 1
- 2
- 3
- 4
- 5
- 6
- 7
- 8
- 9
- 18
- 19
- 20
- 21
- 22
- 23
- 24
- 31
- 32
- 33
- 34
- 35
- 36
- 37
- 44
- 45
- 46
- 47
- 48
- 49
- 50
- 51
- 52
- 53
- 54
- 55
- 56
- 57
- 123
- 124
- 125
- 126
- 127
- 128
- 129
- 130
- 135
-
-
- 10
- 11
- 12
- 13
- 14
- 15
- 16
- 17
- 25
- 26
- 27
- 28
- 29
- 30
- 38
- 39
- 40
- 41
- 42
- 43
-
-
- 123
- 125
- 127
- 128
- 131
- 132
- 129
- 133
- 135
- 136
-
-
- 124
- 126
- 129
- 130
- 133
- 134
- 128
- 132
- 135
- 136
-
-
- 9
- 24
- 37
- 92
- 102
- 109
-
-
- 90
- 91
- 99
- 106
-
-
- 100
- 107
-
-
- 88
- 114
-
-
- 89
- 113
- 117
- 118
- 131
- 132
- 133
-
-
- 92
- 102
- 109
- 134
-
-
- 93
- 101
- 108
- 117
- 158
- 159
- 160
- 161
-
-
- 97
- 105
- 112
-
-
- 94
- 103
- 110
- 95
-
-
- 98
- 115
- 116
- 136
-
-
- 96
- 104
- 111
-
-
- 90
- 91
- 99
- 106
- 100
- 107
- 88
- 114
- 89
- 113
- 117
- 118
-
-
- 92
- 102
- 109
- 134
- 93
- 101
- 108
-
-
- 97
- 105
- 112
- 94
- 103
- 110
- 95
- 98
- 115
- 116
- 136
- 96
- 104
- 111
-
-
- 20
- 33
- 5
- 6
- 90
- 91
- 99
- 106
-
-
- 21
- 34
- 100
- 107
-
-
- 48
- 2
- 88
- 114
-
-
- 3
- 127
- 128
- 129
- 46
- 55
- 57
- 89
- 113
- 117
- 118
- 131
- 132
- 133
-
-
- 24
- 130
- 37
- 9
- 92
- 102
- 109
- 134
-
-
- 36
- 23
- 8
- 93
- 101
- 108
-
-
- 16
- 30
- 43
- 97
- 105
- 112
-
-
- 27
- 40
- 12
- 13
- 94
- 103
- 110
- 95
-
-
- 135
- 17
- 51
- 52
- 98
- 115
- 116
- 136
-
-
- 14
- 28
- 41
- 96
- 104
- 111
-
-
- 14
- 28
- 41
- 96
- 104
- 111
-
-
- 3
- 127
- 128
- 129
- 46
- 55
- 57
- 48
- 2
- 89
- 131
- 113
- 117
- 118
- 132
- 133
- 114
- 88
-
-
- 8
- 23
- 36
- 93
- 101
- 108
- 9
- 24
- 37
- 92
- 102
- 109
- 130
- 134
-
-
- 5
- 6
- 33
- 20
- 90
- 91
- 106
- 99
-
-
- 14
- 28
- 41
- 96
- 104
- 111
-
-
- 12
- 27
- 40
- 13
- 94
- 103
- 110
- 95
-
-
- 16
- 30
- 43
- 97
- 105
- 112
-
-
- 17
- 51
- 52
- 21
- 34
- 135
- 98
- 115
- 116
- 100
- 107
- 136
-
-
- 16
- 30
- 97
- 105
- 17
- 98
-
-
- 12
- 94
- 27
- 103
- 13
- 95
- 14
- 96
- 28
- 104
-
-
- 2
- 88
- 3
- 89
- 5
- 90
- 6
- 91
- 8
- 93
- 9
- 92
- 20
- 99
- 21
- 100
- 23
- 101
- 24
- 102
-
-
- 46
- 113
- 48
- 114
- 51
- 115
- 52
- 116
-
-
- 55
- 117
-
-
- 57
- 118
-
-
- 36
- 108
- 37
- 109
- 33
- 106
- 41
- 111
- 40
- 110
- 43
- 112
- 34
- 107
-
-
- 127
- 131
- 128
- 132
- 129
- 133
- 135
- 136
- 130
- 134
-
-
- 5
- 20
- 90
- 99
-
-
- 6
- 33
- 91
- 106
-
-
- 0
- 1
- 2
- 3
- 4
- 5
- 6
- 7
- 8
- 18
- 19
- 20
- 21
- 22
- 23
- 31
- 32
- 33
- 34
- 35
- 36
- 44
- 45
- 46
- 47
- 48
- 53
- 54
- 55
- 56
- 57
- 88
- 89
- 90
- 91
- 93
- 99
- 100
- 101
- 106
- 107
- 108
- 113
- 114
- 117
- 118
- 123
- 124
- 125
- 126
- 127
- 128
- 129
- 131
- 132
- 133
- 135
- 136
-
-
- 4
- 5
- 6
- 19
- 32
- 20
- 21
- 33
- 34
- 90
- 91
- 99
- 100
- 106
- 107
-
-
- 11
- 15
- 26
- 29
- 39
- 42
- 12
- 13
- 14
- 16
- 17
- 27
- 28
- 30
- 40
- 41
- 43
- 94
- 95
- 96
- 97
- 98
- 103
- 104
- 105
- 110
- 111
- 112
-
-
- 1
- 2
- 3
- 54
- 56
- 55
- 57
- 117
- 118
- 88
- 89
-
-
- 7
- 22
- 35
- 8
- 9
- 23
- 24
- 36
- 37
- 92
- 93
- 101
- 102
- 108
- 109
-
-
- 125
- 126
- 127
- 128
- 129
- 130
- 135
- 131
- 132
- 133
- 134
- 136
-
-
- 45
- 47
- 46
- 48
- 113
- 114
-
-
- 50
- 51
- 52
- 115
- 116
-
-
- 16067
- 16071
- 16072
-
-
- 18869
- 18870
- 18871
- 18872
- 18873
- 18874
- 18875
- 18876
- 18877
- 18878
- 18879
- 18880
- 18881
- 18882
- 18883
- 18884
- 18885
- 18886
- 18887
- 18888
- 18889
- 18890
- 18891
- 18892
- 18893
- 18894
- 18895
- 18896
- 18897
- 18898
- 18899
- 18900
- 18901
- 18902
- 18903
- 18904
-
-
- 18905
- 18906
- 18907
-
-
- 18850
- 18851
- 18852
-
-
+
+ 139
+ 140
+ 141
+ 142
+ 143
+ 144
+ 145
+ 146
+
+
148
149
150
@@ -2571,99 +622,13 @@
188
189
-
- 25867
- 25868
- 19160
- 19172
- 25796
- 25881
- 25797
- 25799
- 29179
- 29180
- 25876
- 25877
- 29194
- 29212
- 29195
- 29196
- 29218
- 29213
- 25837
- 25840
- 25845
- 25841
- 25838
- 25839
- 25846
- 25825
- 29068
-
-
- 90
- 91
- 99
- 106
-
-
- 88
- 89
- 131
- 113
- 118
- 114
-
-
- 93
- 101
- 108
- 117
-
-
- 92
- 102
- 109
- 134
-
-
- 94
- 95
- 103
- 110
- 132
- 133
-
-
- 98
- 115
- 116
- 100
- 107
-
-
- 96
- 104
- 111
-
-
- 97
- 105
- 112
-
-
- 186
-
-
- 187
-
-
+
148
149
150
151
-
+
152
153
154
@@ -2671,40 +636,5098 @@
156
157
-
+
158
159
160
161
-
+
162
163
164
165
-
+
166
167
168
169
170
-
+
171
172
173
174
175
-
+
176
177
178
-
+
179
180
181
+
+ 53
+ 54
+ 55
+ 117
+ 161
+
+
+ 53
+ 56
+ 57
+ 118
+ 156
+
+
+ 14001
+ 14002
+ 14003
+ 14004
+ 14005
+ 14006
+ 14007
+ 14008
+ 14009
+ 14010
+ 14011
+ 14012
+ 14013
+ 14014
+ 14015
+ 14016
+ 14017
+ 14018
+ 14019
+ 14020
+ 14021
+ 14022
+ 14023
+ 14024
+ 14025
+ 14026
+ 14027
+ 14028
+ 14029
+ 14030
+ 14031
+ 14032
+ 14033
+ 14034
+ 14035
+ 14036
+ 14037
+ 14038
+ 14039
+ 14040
+ 14041
+ 14042
+ 14043
+ 14044
+ 14045
+ 14046
+ 14047
+ 14048
+ 14049
+ 14050
+ 14051
+ 14052
+ 14053
+ 14054
+ 14055
+ 14056
+ 14057
+ 14058
+ 14059
+ 14060
+ 14061
+ 14062
+ 14063
+ 14064
+ 14065
+ 14066
+ 14067
+ 14068
+ 14069
+ 14070
+ 14071
+ 14072
+ 14073
+ 14074
+ 14075
+ 14076
+ 14077
+ 14078
+ 14079
+ 14080
+ 14081
+ 14082
+ 14083
+ 14084
+ 14085
+ 14086
+ 14087
+ 14088
+ 14089
+ 14090
+ 14091
+ 14092
+ 14093
+ 14094
+ 14095
+ 14096
+ 14097
+ 14098
+ 14099
+ 14100
+ 14101
+ 14102
+ 14103
+ 14104
+ 14105
+ 14106
+ 14107
+ 14108
+ 14109
+ 14110
+ 14111
+ 14112
+ 14113
+ 14114
+ 14115
+ 14116
+ 14117
+ 14118
+ 14119
+ 14120
+ 14121
+ 14122
+ 14123
+ 14124
+ 14125
+ 14126
+ 14127
+ 14128
+ 14129
+ 14130
+ 14131
+ 14132
+ 14133
+ 14134
+ 14135
+ 14136
+ 14137
+ 14138
+ 14139
+ 14140
+ 14141
+ 14142
+ 14143
+ 14144
+ 14145
+ 14146
+ 14147
+ 14148
+ 14149
+ 14150
+ 14151
+ 14152
+ 14153
+ 14154
+ 14155
+ 14156
+ 14157
+ 14158
+ 14159
+ 14160
+ 14161
+ 14162
+ 14163
+ 14164
+ 14165
+ 14166
+ 14167
+ 14168
+ 14169
+ 14170
+ 14171
+ 14172
+ 14173
+ 14174
+ 14175
+ 14176
+ 14177
+ 14178
+ 14179
+ 14180
+ 14181
+ 14182
+ 14183
+ 14184
+ 14185
+ 14186
+ 14187
+ 14188
+ 14189
+ 14190
+ 14191
+ 14192
+ 14193
+ 14194
+ 14195
+ 14196
+ 14197
+ 14198
+ 14199
+ 14200
+ 14201
+ 14202
+ 14203
+ 14204
+ 14205
+ 14206
+ 14207
+ 14208
+ 14209
+ 14210
+ 14211
+ 14212
+ 14213
+ 14214
+ 14215
+ 14216
+ 14217
+ 14218
+ 14219
+ 14220
+ 14221
+ 14222
+ 14223
+ 14224
+ 14225
+ 14226
+ 14227
+ 14228
+ 14229
+ 14230
+ 14231
+ 14232
+ 14233
+ 14234
+ 14235
+ 14236
+ 14237
+ 14238
+ 14239
+ 14240
+ 14241
+ 14242
+ 14243
+ 14244
+ 14245
+ 14246
+ 14247
+ 14248
+ 14249
+ 14250
+ 14251
+ 14252
+ 14253
+ 14254
+ 14255
+ 14256
+ 14257
+ 14258
+ 14259
+ 14260
+ 14265
+ 14266
+ 14267
+ 14268
+ 14269
+ 14270
+ 14271
+ 14272
+ 14273
+ 14274
+ 14275
+ 14276
+ 14277
+ 14278
+ 14279
+ 14280
+ 14281
+ 14282
+ 14283
+ 14284
+ 14285
+ 14286
+ 14287
+ 14288
+ 14289
+ 14290
+ 14291
+ 14292
+ 14293
+ 14294
+ 14295
+ 14296
+ 14297
+ 14298
+ 14299
+ 14300
+ 14301
+ 14302
+ 14303
+ 14304
+ 14305
+ 14306
+ 14307
+ 14308
+ 14309
+ 14310
+ 14311
+ 14312
+ 14313
+ 14314
+ 14315
+ 14316
+ 14317
+ 14318
+ 14319
+ 14320
+ 14321
+ 14322
+ 14323
+ 14324
+ 14325
+ 14326
+ 14327
+ 14328
+ 14329
+ 14330
+ 14331
+ 14332
+ 14333
+ 14334
+ 14335
+ 14336
+ 14337
+ 14338
+ 14339
+ 14340
+ 14341
+ 14342
+ 14343
+ 14344
+ 14345
+ 14346
+ 14347
+ 14348
+ 14349
+ 14350
+ 14351
+ 14352
+ 14353
+ 14354
+ 14355
+ 14356
+ 14357
+ 14358
+ 14359
+ 14360
+ 14361
+ 14362
+ 14363
+ 14364
+ 14365
+ 14366
+ 14367
+ 14368
+ 14369
+ 14370
+ 14371
+ 14372
+ 14373
+ 14374
+ 14375
+ 14376
+ 14377
+ 14378
+ 14379
+ 14380
+ 14381
+ 14382
+ 14383
+ 14384
+ 14385
+ 14386
+ 14387
+ 14388
+ 14389
+ 14390
+ 14391
+ 14392
+ 14393
+ 14394
+ 14395
+ 14396
+ 14397
+ 14398
+ 14399
+ 14400
+ 14401
+ 14402
+ 14403
+ 14404
+ 14405
+ 14406
+ 14407
+ 14408
+ 14409
+ 14410
+ 14411
+ 14412
+ 14413
+ 14414
+ 14415
+ 14416
+ 14417
+ 14418
+ 14419
+ 14420
+ 14421
+ 14422
+ 14423
+ 14424
+ 14425
+ 14426
+ 14427
+ 14428
+ 14429
+ 14430
+ 14431
+ 14432
+ 14433
+ 14434
+ 14435
+ 14436
+ 14437
+ 14438
+ 14439
+ 14440
+ 14441
+ 14442
+ 14443
+ 14444
+ 14449
+ 14450
+ 14451
+ 14452
+ 14453
+ 14454
+ 14455
+ 14456
+ 14457
+ 14458
+ 14459
+ 14460
+ 14461
+ 14462
+ 14463
+ 14464
+ 14465
+ 14466
+ 14467
+ 14468
+ 14469
+ 14470
+ 14471
+ 14472
+ 14473
+ 14474
+ 14475
+ 14476
+ 14477
+ 14478
+ 14479
+ 14480
+ 14481
+ 14482
+ 14483
+ 14484
+ 14485
+ 14486
+ 14487
+ 14488
+ 14489
+ 14490
+ 14491
+ 14492
+ 14493
+ 14494
+ 14495
+ 14496
+ 14497
+ 14498
+ 14499
+ 14500
+ 14501
+ 14502
+ 14503
+ 14504
+ 14505
+ 14506
+ 14507
+ 14508
+ 14509
+ 14510
+ 14511
+ 14512
+ 14513
+ 14514
+ 14515
+ 14516
+ 14517
+ 14518
+ 14519
+ 14520
+ 14521
+ 14522
+ 14523
+ 14524
+ 14525
+ 14526
+ 14527
+ 14528
+ 14529
+ 14530
+ 14531
+ 14532
+ 14533
+ 14534
+ 14535
+ 14536
+ 14537
+ 14538
+ 14539
+ 14540
+ 14541
+ 14542
+ 14543
+ 14544
+ 14545
+ 14546
+ 14547
+ 14548
+ 14549
+ 14550
+ 14551
+ 14552
+ 14553
+ 14554
+ 14555
+ 14556
+ 14557
+ 14558
+ 14559
+ 14560
+ 14561
+ 14562
+ 14563
+ 14564
+ 14565
+ 14566
+ 14567
+ 14568
+ 14569
+ 14570
+ 14571
+ 14572
+ 14573
+ 14574
+ 14575
+ 14576
+ 14577
+ 14578
+ 14579
+ 14580
+ 14581
+ 14582
+ 14583
+ 14584
+ 14585
+ 14586
+ 14587
+ 14588
+ 14589
+ 14590
+ 14591
+ 14592
+ 14593
+ 14594
+ 14595
+ 14596
+ 14597
+ 14598
+ 14599
+ 14600
+ 14601
+ 14602
+ 14603
+ 14604
+ 14605
+ 14606
+ 14607
+ 14608
+ 14609
+ 14610
+ 14611
+ 14612
+ 14613
+ 14614
+ 14615
+ 14616
+ 14617
+ 14618
+ 14619
+ 14620
+ 14621
+ 14622
+ 14623
+ 14624
+ 14625
+ 14626
+ 14627
+ 14628
+ 14633
+ 14634
+ 14635
+ 14636
+ 14637
+ 14638
+ 14639
+ 14640
+ 14641
+ 14642
+ 14643
+ 14644
+ 14645
+ 14646
+ 14647
+ 14648
+ 14649
+ 14650
+ 14651
+ 14652
+ 14653
+ 14654
+ 14655
+ 14656
+ 14657
+ 14658
+ 14659
+ 14660
+ 14661
+ 14662
+ 14663
+ 14664
+ 14665
+ 14666
+ 14667
+ 14668
+ 14669
+ 14670
+ 14671
+ 14672
+ 14673
+ 14674
+ 14675
+ 14676
+ 14677
+ 14678
+ 14679
+ 14680
+ 14681
+ 14682
+ 14683
+ 14684
+ 14685
+ 14686
+ 14687
+ 14688
+ 14689
+ 14690
+ 14691
+ 14692
+ 14693
+ 14694
+ 14695
+ 14696
+ 14697
+ 14698
+ 14699
+ 14700
+ 14701
+ 14702
+ 14703
+ 14704
+ 14705
+ 14706
+ 14707
+ 14708
+ 14709
+ 14710
+ 14711
+ 14712
+ 14713
+ 14714
+ 14715
+ 14716
+ 14717
+ 14718
+ 14719
+ 14720
+ 14721
+ 14722
+ 14723
+ 14724
+ 14725
+ 14726
+ 14727
+ 14728
+ 14729
+ 14730
+ 14731
+ 14732
+ 14733
+ 14734
+ 14735
+ 14736
+ 14737
+ 14738
+ 14739
+ 14740
+ 14741
+ 14742
+ 14743
+ 14744
+ 14745
+ 14746
+ 14747
+ 14748
+ 14749
+ 14750
+ 14751
+ 14752
+ 14753
+ 14754
+ 14755
+ 14756
+ 14757
+ 14758
+ 14759
+ 14760
+ 14761
+ 14762
+ 14763
+ 14764
+ 14765
+ 14766
+ 14767
+ 14768
+ 14769
+ 14770
+ 14771
+ 14772
+ 14773
+ 14774
+ 14775
+ 14776
+ 14777
+ 14778
+ 14779
+ 14780
+ 14781
+ 14782
+ 14783
+ 14784
+ 14785
+ 14786
+ 14787
+ 14788
+ 14789
+ 14790
+ 14791
+ 14792
+ 14793
+ 14794
+ 14795
+ 14796
+ 14797
+ 14798
+ 14799
+ 14800
+ 14801
+ 14802
+ 14803
+ 14804
+ 14805
+ 14806
+ 14807
+ 14808
+ 14809
+ 14810
+ 14811
+ 14812
+ 14813
+ 14814
+ 14815
+ 14816
+ 14817
+ 14818
+ 14819
+ 14820
+ 14821
+ 14822
+ 14823
+ 14824
+ 14825
+ 14826
+ 14827
+ 14828
+ 14829
+ 14830
+ 14831
+ 14832
+ 14833
+ 14834
+ 14835
+ 14836
+ 14837
+ 14838
+ 14839
+ 14840
+ 14841
+ 14842
+ 14843
+ 14844
+ 14845
+ 14846
+ 14847
+ 14848
+ 14849
+ 14850
+ 14851
+ 14852
+ 14853
+ 14854
+ 14855
+ 14856
+ 14857
+ 14858
+ 14859
+ 14860
+ 14861
+ 14862
+ 14863
+ 14864
+ 14865
+ 14866
+ 14867
+ 14868
+ 14869
+ 12077
+ 12311
+ 12312
+ 12313
+ 12526
+ 12527
+ 12528
+ 12564
+ 12621
+ 12780
+ 12781
+ 12782
+ 16025
+ 13071
+ 13072
+ 13073
+ 13074
+ 13075
+ 13076
+ 14870
+ 14871
+ 14872
+ 14873
+ 14874
+ 14875
+ 14876
+ 14877
+ 14878
+ 14879
+ 14880
+ 14881
+ 14882
+ 14883
+ 14884
+ 14885
+ 14886
+ 14887
+ 14888
+ 14889
+ 14890
+ 14891
+ 14892
+ 14893
+ 14894
+ 14895
+ 14896
+ 14897
+ 14898
+ 14899
+ 14900
+ 14901
+ 14902
+ 14903
+ 14904
+ 14905
+ 14906
+ 14907
+ 14908
+ 14909
+ 14910
+ 14911
+ 14912
+ 14913
+ 14914
+ 14915
+ 16030
+ 16034
+ 16035
+ 16036
+ 16037
+ 16038
+ 16039
+ 16040
+ 16041
+ 16042
+ 16043
+ 16044
+ 16045
+ 16046
+ 14916
+ 14917
+ 14918
+ 16050
+ 16051
+ 16052
+ 16053
+ 16067
+ 16068
+ 16071
+ 16072
+ 13302
+ 13303
+ 13304
+ 13305
+ 14929
+ 14930
+ 14931
+ 14947
+ 14948
+ 14949
+ 14950
+ 14951
+ 14952
+ 14953
+ 14954
+ 14955
+ 14956
+ 14957
+ 14958
+ 14959
+ 14960
+ 14961
+ 14962
+ 14963
+ 14964
+ 14965
+ 14966
+ 14967
+ 14926
+ 14932
+ 14940
+ 14941
+ 14942
+ 14986
+ 14987
+ 14988
+ 14989
+ 14990
+ 14991
+ 14992
+ 14993
+ 14994
+ 14995
+ 14996
+ 14997
+ 14998
+ 14999
+ 14936
+ 14937
+ 14938
+ 14939
+ 14974
+ 14975
+ 14976
+ 14977
+ 14978
+ 14979
+ 14980
+ 14981
+ 14982
+ 14983
+ 14984
+ 14985
+ 14933
+ 14943
+ 15010
+ 15011
+ 15012
+ 15013
+ 15014
+ 15015
+ 15016
+ 15017
+ 15018
+ 15019
+ 15020
+ 15021
+ 14925
+ 14944
+ 14945
+ 14946
+ 15000
+ 15001
+ 15002
+ 15003
+ 15004
+ 15005
+ 15006
+ 15007
+ 15008
+ 15009
+ 14968
+ 14969
+ 14970
+ 14927
+ 14928
+ 15022
+ 15023
+ 15024
+ 15025
+ 15026
+ 15027
+ 15028
+ 15029
+ 15030
+ 15031
+ 15032
+ 15033
+ 15034
+ 15035
+ 15036
+ 15037
+ 15038
+ 15039
+ 15040
+ 15041
+ 15042
+ 15043
+ 15044
+ 15045
+ 15046
+ 15047
+ 15048
+ 15049
+ 15050
+ 15051
+ 15053
+ 15054
+ 15055
+ 15056
+ 15057
+ 15058
+ 15059
+ 15060
+ 15061
+ 15062
+ 15063
+ 15064
+ 15065
+ 1562
+ 1563
+ 1564
+ 1565
+ 1566
+ 1567
+ 1568
+ 1569
+ 1570
+ 1571
+ 1572
+ 1573
+ 16094
+ 16095
+ 16096
+ 16097
+
+
+ 4
+ 19
+ 32
+
+
+ 15
+ 29
+ 5
+ 19
+ 4
+
+
+ 15
+ 29
+ 42
+ 50
+
+
+ 15
+ 42
+
+
+ 1
+ 19
+ 32
+ 45
+ 47
+
+
+ 1
+ 4
+ 7
+ 11
+ 15
+
+
+ 22
+ 19
+ 26
+ 29
+
+
+ 35
+ 32
+ 39
+ 42
+
+
+ 50
+ 45
+ 47
+
+
+ 54
+ 56
+
+
+ 12526
+ 12527
+ 12528
+ 16038
+ 16039
+ 16040
+ 16068
+
+
+ 12526
+ 12527
+ 12528
+
+
+ 16038
+ 16039
+ 16040
+ 16068
+
+
+ 16030
+ 16037
+ 16041
+ 16042
+
+
+ 16025
+ 16030
+ 16037
+ 16041
+ 16042
+
+
+ 12311
+ 12312
+ 12313
+
+
+ 12780
+ 12781
+ 12782
+
+
+ 16034
+ 16035
+ 16036
+
+
+ 12621
+
+
+ 12077
+ 16025
+ 16030
+ 16037
+ 16041
+ 16042
+
+
+ 12077
+
+
+ 12564
+
+
+ 12077
+ 12311
+ 12312
+ 12313
+ 12526
+ 12527
+ 12528
+ 12780
+ 12781
+ 12782
+ 16025
+ 16030
+ 16034
+ 16035
+ 16036
+ 16037
+ 16038
+ 16039
+ 16040
+ 16041
+ 16042
+ 16043
+ 16044
+ 16045
+ 16046
+ 16050
+ 16051
+ 16052
+ 16053
+ 16067
+ 16068
+ 16071
+ 16072
+ 1561
+ 1538
+ 1562
+ 1563
+ 1564
+ 1565
+ 1566
+ 1567
+ 1568
+ 1569
+ 1570
+ 1571
+ 1572
+ 1573
+ 16094
+ 16095
+ 16096
+ 16097
+
+
+ 12077
+ 12311
+ 12312
+ 12313
+ 12526
+ 12527
+ 12528
+ 12780
+ 12781
+ 12782
+ 16025
+ 16030
+ 16034
+ 16035
+ 16036
+ 16037
+ 16038
+ 16039
+ 16040
+ 16041
+ 16042
+ 16068
+ 16067
+ 16071
+ 16072
+ 1561
+
+
+ 8
+ 23
+ 36
+ 93
+ 101
+ 108
+
+
+ 9
+ 24
+ 37
+ 92
+ 102
+ 109
+
+
+ 5
+ 6
+ 33
+ 20
+ 90
+ 91
+ 106
+ 99
+
+
+ 14
+ 28
+ 41
+ 96
+ 104
+ 111
+
+
+ 30
+ 43
+ 105
+ 112
+
+
+ 21
+ 34
+ 100
+ 107
+
+
+ 12
+ 27
+ 40
+ 94
+ 103
+ 110
+
+
+ 0
+ 1
+ 4
+ 7
+ 2
+ 3
+ 5
+ 6
+ 8
+ 9
+ 88
+ 89
+ 90
+ 91
+ 92
+ 93
+ 152
+ 153
+ 148
+ 149
+ 162
+ 158
+
+
+ 10
+ 11
+ 12
+ 13
+ 14
+ 94
+ 95
+ 96
+ 166
+ 167
+ 176
+
+
+ 10
+ 11
+ 12
+ 13
+ 14
+ 10
+ 15
+ 16
+ 17
+ 95
+ 96
+ 97
+ 98
+ 167
+ 176
+ 179
+ 171
+
+
+ 10
+ 15
+ 16
+ 17
+ 97
+ 98
+ 179
+ 171
+
+
+ 18
+ 19
+ 22
+ 20
+ 21
+ 23
+ 24
+ 99
+ 100
+ 101
+ 102
+ 150
+ 172
+ 159
+ 163
+
+
+ 25
+ 26
+ 27
+ 28
+ 25
+ 29
+ 30
+ 103
+ 104
+ 105
+ 168
+ 177
+ 180
+
+
+ 25
+ 26
+ 27
+ 28
+ 103
+ 104
+ 168
+ 177
+
+
+ 25
+ 29
+ 30
+ 105
+ 180
+
+
+ 31
+ 32
+ 35
+ 33
+ 34
+ 36
+ 37
+ 106
+ 107
+ 108
+ 109
+ 151
+ 173
+ 160
+ 164
+
+
+ 38
+ 39
+ 42
+ 40
+ 41
+ 43
+ 110
+ 111
+ 112
+ 169
+ 178
+ 181
+
+
+ 38
+ 39
+ 40
+ 41
+ 110
+ 111
+ 169
+ 178
+
+
+ 38
+ 42
+ 43
+ 112
+ 181
+
+
+ 44
+ 45
+ 47
+ 46
+ 48
+ 113
+ 114
+ 154
+ 155
+
+
+ 49
+ 50
+ 51
+ 52
+ 115
+ 116
+ 174
+ 175
+
+
+ 53
+ 54
+ 56
+ 55
+ 57
+ 117
+ 118
+ 161
+ 156
+
+
+ 53
+ 54
+ 55
+ 117
+ 161
+
+
+ 53
+ 56
+ 57
+ 118
+ 156
+
+
+ 123
+ 124
+ 125
+ 126
+ 127
+ 128
+ 129
+ 130
+ 131
+ 132
+ 133
+ 134
+ 135
+ 136
+ 157
+ 165
+ 170
+
+
+ 123
+ 124
+
+
+ 125
+ 126
+
+
+ 127
+ 128
+ 129
+ 130
+ 135
+
+
+ 131
+ 132
+ 133
+ 134
+ 136
+
+
+ 0
+ 1
+ 2
+ 3
+ 4
+ 5
+ 6
+ 7
+ 8
+ 9
+ 18
+ 19
+ 20
+ 21
+ 22
+ 23
+ 24
+ 31
+ 32
+ 33
+ 34
+ 35
+ 36
+ 37
+ 44
+ 45
+ 46
+ 47
+ 48
+ 49
+ 50
+ 51
+ 52
+ 53
+ 54
+ 55
+ 56
+ 57
+ 123
+ 124
+ 125
+ 126
+ 127
+ 128
+ 129
+ 130
+ 135
+ 182
+ 184
+
+
+ 10
+ 11
+ 12
+ 13
+ 14
+ 15
+ 16
+ 17
+ 25
+ 26
+ 27
+ 28
+ 29
+ 30
+ 38
+ 39
+ 40
+ 41
+ 42
+ 43
+ 183
+ 185
+
+
+ 123
+ 125
+ 127
+ 128
+ 131
+ 132
+ 129
+ 133
+ 135
+ 136
+
+
+ 124
+ 126
+ 129
+ 130
+ 133
+ 134
+ 128
+ 132
+ 135
+ 136
+
+
+ 9
+ 24
+ 37
+ 92
+ 102
+ 109
+
+
+ 90
+ 91
+ 99
+ 106
+
+
+ 100
+ 107
+
+
+ 88
+ 114
+
+
+ 89
+ 113
+ 117
+ 118
+ 131
+ 132
+ 133
+
+
+ 92
+ 102
+ 109
+ 134
+
+
+ 93
+ 101
+ 108
+ 117
+ 141
+ 139
+ 140
+ 141
+ 142
+ 143
+ 144
+ 145
+ 146
+ 148
+ 149
+ 150
+ 151
+ 152
+ 153
+ 154
+ 155
+ 156
+ 157
+ 158
+ 159
+ 160
+ 161
+ 162
+ 163
+ 164
+ 165
+ 166
+ 167
+ 168
+ 169
+ 170
+ 171
+ 172
+ 173
+ 174
+ 175
+ 176
+ 177
+ 178
+ 179
+ 180
+ 181
+
+
+ 97
+ 105
+ 112
+
+
+ 94
+ 103
+ 110
+ 95
+
+
+ 98
+ 115
+ 116
+ 136
+
+
+ 96
+ 104
+ 111
+
+
+ 90
+ 91
+ 99
+ 106
+ 100
+ 107
+ 88
+ 114
+ 89
+ 113
+ 117
+ 118
+
+
+ 92
+ 102
+ 109
+ 134
+ 93
+ 101
+ 108
+
+
+ 97
+ 105
+ 112
+ 94
+ 103
+ 110
+ 95
+ 98
+ 115
+ 116
+ 136
+ 96
+ 104
+ 111
+
+
+ 20
+ 33
+ 5
+ 6
+ 90
+ 91
+ 99
+ 106
+ 143
+ 145
+ 146
+ 139
+ 140
+ 141
+ 142
+ 144
+ 166
+ 167
+ 168
+ 169
+ 170
+ 176
+ 177
+ 178
+ 179
+ 180
+ 181
+ 148
+ 149
+ 150
+ 151
+ 152
+ 153
+ 154
+ 155
+ 156
+ 157
+ 158
+ 159
+ 160
+ 161
+ 162
+ 163
+ 164
+ 165
+ 171
+ 172
+ 173
+ 174
+ 175
+
+
+ 21
+ 34
+ 100
+ 107
+ 143
+ 145
+ 146
+ 139
+ 140
+ 141
+ 142
+ 144
+ 166
+ 167
+ 168
+ 169
+ 170
+ 176
+ 177
+ 178
+ 179
+ 180
+ 181
+ 148
+ 149
+ 150
+ 151
+ 152
+ 153
+ 154
+ 155
+ 156
+ 157
+ 158
+ 159
+ 160
+ 161
+ 162
+ 163
+ 164
+ 165
+ 171
+ 172
+ 173
+ 174
+ 175
+
+
+ 48
+ 2
+ 88
+ 114
+ 143
+ 145
+ 146
+ 139
+ 140
+ 141
+ 142
+ 144
+ 166
+ 167
+ 168
+ 169
+ 170
+ 176
+ 177
+ 178
+ 179
+ 180
+ 181
+ 148
+ 149
+ 150
+ 151
+ 152
+ 153
+ 154
+ 155
+ 156
+ 157
+ 158
+ 159
+ 160
+ 161
+ 162
+ 163
+ 164
+ 165
+ 171
+ 172
+ 173
+ 174
+ 175
+
+
+ 3
+ 127
+ 128
+ 129
+ 46
+ 55
+ 57
+ 89
+ 113
+ 117
+ 118
+ 131
+ 132
+ 133
+ 143
+ 145
+ 146
+ 139
+ 140
+ 141
+ 142
+ 144
+ 166
+ 167
+ 168
+ 169
+ 170
+ 176
+ 177
+ 178
+ 179
+ 180
+ 181
+ 148
+ 149
+ 150
+ 151
+ 152
+ 153
+ 154
+ 155
+ 156
+ 157
+ 158
+ 159
+ 160
+ 161
+ 162
+ 163
+ 164
+ 165
+ 171
+ 172
+ 173
+ 174
+ 175
+
+
+ 24
+ 130
+ 37
+ 9
+ 92
+ 102
+ 109
+ 134
+ 143
+ 145
+ 146
+ 139
+ 140
+ 141
+ 142
+ 144
+ 166
+ 167
+ 168
+ 169
+ 170
+ 176
+ 177
+ 178
+ 179
+ 180
+ 181
+ 148
+ 149
+ 150
+ 151
+ 152
+ 153
+ 154
+ 155
+ 156
+ 157
+ 158
+ 159
+ 160
+ 161
+ 162
+ 163
+ 164
+ 165
+ 171
+ 172
+ 173
+ 174
+ 175
+
+
+ 36
+ 23
+ 8
+ 93
+ 101
+ 108
+ 143
+ 145
+ 146
+ 139
+ 140
+ 141
+ 142
+ 144
+ 166
+ 167
+ 168
+ 169
+ 170
+ 176
+ 177
+ 178
+ 179
+ 180
+ 181
+ 148
+ 149
+ 150
+ 151
+ 152
+ 153
+ 154
+ 155
+ 156
+ 157
+ 158
+ 159
+ 160
+ 161
+ 162
+ 163
+ 164
+ 165
+ 171
+ 172
+ 173
+ 174
+ 175
+
+
+ 16
+ 30
+ 43
+ 97
+ 105
+ 112
+ 143
+ 145
+ 146
+ 139
+ 140
+ 141
+ 142
+ 144
+ 166
+ 167
+ 168
+ 169
+ 170
+ 176
+ 177
+ 178
+ 179
+ 180
+ 181
+ 148
+ 149
+ 150
+ 151
+ 152
+ 153
+ 154
+ 155
+ 156
+ 157
+ 158
+ 159
+ 160
+ 161
+ 162
+ 163
+ 164
+ 165
+ 171
+ 172
+ 173
+ 174
+ 175
+
+
+ 27
+ 40
+ 12
+ 13
+ 94
+ 103
+ 110
+ 95
+ 143
+ 145
+ 146
+ 139
+ 140
+ 141
+ 142
+ 144
+ 166
+ 167
+ 168
+ 169
+ 170
+ 176
+ 177
+ 178
+ 179
+ 180
+ 181
+ 148
+ 149
+ 150
+ 151
+ 152
+ 153
+ 154
+ 155
+ 156
+ 157
+ 158
+ 159
+ 160
+ 161
+ 162
+ 163
+ 164
+ 165
+ 171
+ 172
+ 173
+ 174
+ 175
+
+
+ 135
+ 17
+ 51
+ 52
+ 98
+ 115
+ 116
+ 136
+ 143
+ 145
+ 146
+ 139
+ 140
+ 141
+ 142
+ 144
+ 166
+ 167
+ 168
+ 169
+ 170
+ 176
+ 177
+ 178
+ 179
+ 180
+ 181
+ 148
+ 149
+ 150
+ 151
+ 152
+ 153
+ 154
+ 155
+ 156
+ 157
+ 158
+ 159
+ 160
+ 161
+ 162
+ 163
+ 164
+ 165
+ 171
+ 172
+ 173
+ 174
+ 175
+
+
+ 14
+ 28
+ 41
+ 96
+ 104
+ 111
+ 143
+ 145
+ 146
+ 139
+ 140
+ 141
+ 142
+ 144
+ 166
+ 167
+ 168
+ 169
+ 170
+ 176
+ 177
+ 178
+ 179
+ 180
+ 181
+ 148
+ 149
+ 150
+ 151
+ 152
+ 153
+ 154
+ 155
+ 156
+ 157
+ 158
+ 159
+ 160
+ 161
+ 162
+ 163
+ 164
+ 165
+ 171
+ 172
+ 173
+ 174
+ 175
+
+
+ 14
+ 28
+ 41
+ 96
+ 104
+ 111
+ 13
+ 95
+ 145
+ 176
+ 177
+ 178
+
+
+ 3
+ 127
+ 128
+ 129
+ 46
+ 55
+ 57
+ 48
+ 2
+ 89
+ 131
+ 113
+ 117
+ 118
+ 132
+ 133
+ 114
+ 88
+ 140
+ 152
+ 153
+ 154
+ 155
+ 156
+ 157
+
+
+ 8
+ 23
+ 36
+ 93
+ 101
+ 108
+ 9
+ 24
+ 37
+ 92
+ 102
+ 109
+ 130
+ 134
+ 141
+ 142
+ 158
+ 159
+ 160
+ 161
+ 162
+ 163
+ 164
+
+
+ 5
+ 6
+ 33
+ 20
+ 90
+ 91
+ 106
+ 99
+ 139
+ 148
+ 149
+ 150
+ 151
+
+
+ 14
+ 28
+ 41
+ 96
+ 104
+ 111
+ 145
+ 176
+ 177
+ 178
+
+
+ 12
+ 27
+ 40
+ 13
+ 94
+ 103
+ 110
+ 95
+ 143
+ 166
+ 167
+ 168
+ 169
+ 170
+
+
+ 16
+ 30
+ 43
+ 97
+ 105
+ 112
+ 146
+ 179
+ 180
+ 181
+
+
+ 17
+ 51
+ 52
+ 21
+ 34
+ 135
+ 98
+ 115
+ 116
+ 100
+ 107
+ 136
+ 144
+ 171
+ 172
+ 173
+ 174
+ 175
+
+
+ 16
+ 30
+ 97
+ 105
+ 17
+ 98
+ 179
+ 180
+ 171
+
+
+ 12
+ 94
+ 27
+ 103
+ 13
+ 95
+ 14
+ 96
+ 28
+ 104
+ 168
+ 167
+ 176
+ 177
+
+
+ 2
+ 88
+ 3
+ 89
+ 5
+ 90
+ 6
+ 91
+ 8
+ 93
+ 9
+ 92
+ 20
+ 99
+ 21
+ 100
+ 23
+ 101
+ 24
+ 102
+ 152
+ 153
+ 148
+ 149
+ 158
+ 162
+ 150
+ 172
+ 159
+ 163
+
+
+ 46
+ 113
+ 48
+ 114
+ 51
+ 115
+ 52
+ 116
+ 154
+ 155
+ 174
+ 175
+
+
+ 55
+ 117
+ 161
+
+
+ 57
+ 118
+ 156
+
+
+ 36
+ 108
+ 37
+ 109
+ 33
+ 106
+ 41
+ 111
+ 40
+ 110
+ 43
+ 112
+ 34
+ 107
+ 160
+ 164
+ 151
+ 178
+ 169
+ 181
+ 173
+
+
+ 127
+ 131
+ 128
+ 132
+ 129
+ 133
+ 135
+ 136
+ 130
+ 134
+ 157
+ 170
+ 165
+
+
+ 5
+ 20
+ 90
+ 99
+ 148
+ 150
+
+
+ 6
+ 33
+ 91
+ 106
+ 149
+ 151
+
+
+ 0
+ 1
+ 2
+ 3
+ 4
+ 5
+ 6
+ 7
+ 8
+ 18
+ 19
+ 20
+ 21
+ 22
+ 23
+ 31
+ 32
+ 33
+ 34
+ 35
+ 36
+ 44
+ 45
+ 46
+ 47
+ 48
+ 53
+ 54
+ 55
+ 56
+ 57
+ 88
+ 89
+ 90
+ 91
+ 93
+ 99
+ 100
+ 101
+ 106
+ 107
+ 108
+ 113
+ 114
+ 117
+ 118
+ 123
+ 124
+ 125
+ 126
+ 127
+ 128
+ 129
+ 131
+ 132
+ 133
+ 135
+ 136
+ 139
+ 140
+ 141
+ 144
+ 148
+ 149
+ 150
+ 151
+ 152
+ 153
+ 154
+ 155
+ 156
+ 157
+ 158
+ 159
+ 160
+ 161
+ 171
+ 172
+ 173
+ 174
+ 175
+ 182
+ 184
+ 186
+ 188
+
+
+ 4
+ 5
+ 6
+ 19
+ 32
+ 20
+ 21
+ 33
+ 34
+ 90
+ 91
+ 99
+ 100
+ 106
+ 107
+ 139
+ 148
+ 149
+ 150
+ 151
+
+
+ 11
+ 15
+ 26
+ 29
+ 39
+ 42
+ 12
+ 13
+ 14
+ 16
+ 17
+ 27
+ 28
+ 30
+ 40
+ 41
+ 43
+ 94
+ 95
+ 96
+ 97
+ 98
+ 103
+ 104
+ 105
+ 110
+ 111
+ 112
+ 143
+ 145
+ 146
+ 166
+ 167
+ 168
+ 169
+ 176
+ 177
+ 178
+ 179
+ 180
+ 181
+
+
+ 1
+ 2
+ 3
+ 54
+ 56
+ 55
+ 57
+ 117
+ 118
+ 88
+ 89
+ 140
+ 144
+ 152
+ 153
+ 156
+ 171
+ 172
+ 173
+
+
+ 7
+ 22
+ 35
+ 8
+ 9
+ 23
+ 24
+ 36
+ 37
+ 92
+ 93
+ 101
+ 102
+ 108
+ 109
+ 141
+ 142
+ 158
+ 159
+ 160
+ 161
+ 162
+ 163
+ 164
+
+
+ 125
+ 126
+ 127
+ 128
+ 129
+ 130
+ 135
+ 131
+ 132
+ 133
+ 134
+ 136
+ 157
+ 170
+ 165
+
+
+ 45
+ 47
+ 46
+ 48
+ 113
+ 114
+ 154
+ 155
+ 174
+ 175
+
+
+ 50
+ 51
+ 52
+ 115
+ 116
+
+
+ 182
+ 184
+ 186
+ 188
+
+
+ 183
+ 185
+ 187
+ 189
+
+
+ 16067
+ 16071
+ 16072
+
+
+ 18869
+ 18870
+ 18871
+ 18872
+ 18873
+ 18874
+ 18875
+ 18876
+ 18877
+ 18878
+ 18879
+ 18880
+ 18881
+ 18882
+ 18883
+ 18884
+ 18885
+ 18886
+ 18887
+ 18888
+ 18889
+ 18890
+ 18891
+ 18892
+ 18893
+ 18894
+ 18895
+ 18896
+ 18897
+ 18898
+ 18899
+ 18900
+ 18901
+ 18902
+ 18903
+ 18904
+
+
+ 18905
+ 18906
+ 18907
+
+
+ 18850
+ 18851
+ 18852
+
+
+ 32913
+ 32914
+ 33097
+ 32922
+ 33098
+ 33099
+ 33131
+ 33132
+ 14001
+ 14002
+ 14003
+ 14004
+ 14005
+ 14006
+ 14007
+ 14008
+ 14009
+ 14010
+ 14011
+ 14012
+ 14013
+ 14014
+ 14015
+ 14016
+ 14017
+ 14018
+ 14019
+ 14020
+ 14021
+ 14022
+ 14023
+ 14024
+ 14025
+ 14026
+ 14027
+ 14028
+ 14029
+ 14030
+ 14031
+ 14032
+ 14033
+ 14034
+ 14035
+ 14036
+ 14037
+ 14038
+ 14039
+ 14040
+ 14041
+ 14042
+ 14043
+ 14044
+ 14045
+ 14046
+ 14047
+ 14048
+ 14049
+ 14050
+ 14051
+ 14052
+ 14053
+ 14054
+ 14055
+ 14056
+ 14057
+ 14058
+ 14059
+ 14060
+ 14061
+ 14062
+ 14063
+ 14064
+ 14065
+ 14066
+ 14067
+ 14068
+ 14069
+ 14070
+ 14071
+ 14072
+ 14073
+ 14074
+ 14075
+ 14076
+ 14077
+ 14078
+ 14079
+ 14080
+ 14081
+ 14082
+ 14083
+ 14084
+ 14085
+ 14086
+ 14087
+ 14088
+ 14089
+ 14090
+ 14091
+ 14092
+ 14093
+ 14094
+ 14095
+ 14096
+ 14097
+ 14098
+ 14099
+ 14100
+ 14101
+ 14102
+ 14103
+ 14104
+ 14105
+ 14106
+ 14107
+ 14108
+ 14109
+ 14110
+ 14111
+ 14112
+ 14113
+ 14114
+ 14115
+ 14116
+ 14117
+ 14118
+ 14119
+ 14120
+ 14121
+ 14122
+ 14123
+ 14124
+ 14125
+ 14126
+ 14127
+ 14128
+ 14129
+ 14130
+ 14131
+ 14132
+ 14133
+ 14134
+ 14135
+ 14136
+ 14137
+ 14138
+ 14139
+ 14140
+ 14141
+ 14142
+ 14143
+ 14144
+ 14145
+ 14146
+ 14147
+ 14148
+ 14149
+ 14150
+ 14151
+ 14152
+ 14153
+ 14154
+ 14155
+ 14156
+ 14157
+ 14158
+ 14159
+ 14160
+ 14161
+ 14162
+ 14163
+ 14164
+ 14165
+ 14166
+ 14167
+ 14168
+ 14169
+ 14170
+ 14171
+ 14172
+ 14173
+ 14174
+ 14175
+ 14176
+ 14177
+ 14178
+ 14179
+ 14180
+ 14181
+ 14182
+ 14183
+ 14184
+ 14185
+ 14186
+ 14187
+ 14188
+ 14189
+ 14190
+ 14191
+ 14192
+ 14193
+ 14194
+ 14195
+ 14196
+ 14197
+ 14198
+ 14199
+ 14200
+ 14201
+ 14202
+ 14203
+ 14204
+ 14205
+ 14206
+ 14207
+ 14208
+ 14209
+ 14210
+ 14211
+ 14212
+ 14213
+ 14214
+ 14215
+ 14216
+ 14217
+ 14218
+ 14219
+ 14220
+ 14221
+ 14222
+ 14223
+ 14224
+ 14225
+ 14226
+ 14227
+ 14228
+ 14229
+ 14230
+ 14231
+ 14232
+ 14233
+ 14234
+ 14235
+ 14236
+ 14237
+ 14238
+ 14239
+ 14240
+ 14241
+ 14242
+ 14243
+ 14244
+ 14245
+ 14246
+ 14247
+ 14248
+ 14249
+ 14250
+ 14251
+ 14252
+ 14253
+ 14254
+ 14255
+ 14256
+ 14257
+ 14258
+ 14259
+ 14260
+ 14265
+ 14266
+ 14267
+ 14268
+ 14269
+ 14270
+ 14271
+ 14272
+ 14273
+ 14274
+ 14275
+ 14276
+ 14277
+ 14278
+ 14279
+ 14280
+ 14281
+ 14282
+ 14283
+ 14284
+ 14285
+ 14286
+ 14287
+ 14288
+ 14289
+ 14290
+ 14291
+ 14292
+ 14293
+ 14294
+ 14295
+ 14296
+ 14297
+ 14298
+ 14299
+ 14300
+ 14301
+ 14302
+ 14303
+ 14304
+ 14305
+ 14306
+ 14307
+ 14308
+ 14309
+ 14310
+ 14311
+ 14312
+ 14313
+ 14314
+ 14315
+ 14316
+ 14317
+ 14318
+ 14319
+ 14320
+ 14321
+ 14322
+ 14323
+ 14324
+ 14325
+ 14326
+ 14327
+ 14328
+ 14329
+ 14330
+ 14331
+ 14332
+ 14333
+ 14334
+ 14335
+ 14336
+ 14337
+ 14338
+ 14339
+ 14340
+ 14341
+ 14342
+ 14343
+ 14344
+ 14345
+ 14346
+ 14347
+ 14348
+ 14349
+ 14350
+ 14351
+ 14352
+ 14353
+ 14354
+ 14355
+ 14356
+ 14357
+ 14358
+ 14359
+ 14360
+ 14361
+ 14362
+ 14363
+ 14364
+ 14365
+ 14366
+ 14367
+ 14368
+ 14369
+ 14370
+ 14371
+ 14372
+ 14373
+ 14374
+ 14375
+ 14376
+ 14377
+ 14378
+ 14379
+ 14380
+ 14381
+ 14382
+ 14383
+ 14384
+ 14385
+ 14386
+ 14387
+ 14388
+ 14389
+ 14390
+ 14391
+ 14392
+ 14393
+ 14394
+ 14395
+ 14396
+ 14397
+ 14398
+ 14399
+ 14400
+ 14401
+ 14402
+ 14403
+ 14404
+ 14405
+ 14406
+ 14407
+ 14408
+ 14409
+ 14410
+ 14411
+ 14412
+ 14413
+ 14414
+ 14415
+ 14416
+ 14417
+ 14418
+ 14419
+ 14420
+ 14421
+ 14422
+ 14423
+ 14424
+ 14425
+ 14426
+ 14427
+ 14428
+ 14429
+ 14430
+ 14431
+ 14432
+ 14433
+ 14434
+ 14435
+ 14436
+ 14437
+ 14438
+ 14439
+ 14440
+ 14441
+ 14442
+ 14443
+ 14444
+ 14449
+ 14450
+ 14451
+ 14452
+ 14453
+ 14454
+ 14455
+ 14456
+ 14457
+ 14458
+ 14459
+ 14460
+ 14461
+ 14462
+ 14463
+ 14464
+ 14465
+ 14466
+ 14467
+ 14468
+ 14469
+ 14470
+ 14471
+ 14472
+ 14473
+ 14474
+ 14475
+ 14476
+ 14477
+ 14478
+ 14479
+ 14480
+ 14481
+ 14482
+ 14483
+ 14484
+ 14485
+ 14486
+ 14487
+ 14488
+ 14489
+ 14490
+ 14491
+ 14492
+ 14493
+ 14494
+ 14495
+ 14496
+ 14497
+ 14498
+ 14499
+ 14500
+ 14501
+ 14502
+ 14503
+ 14504
+ 14505
+ 14506
+ 14507
+ 14508
+ 14509
+ 14510
+ 14511
+ 14512
+ 14513
+ 14514
+ 14515
+ 14516
+ 14517
+ 14518
+ 14519
+ 14520
+ 14521
+ 14522
+ 14523
+ 14524
+ 14525
+ 14526
+ 14527
+ 14528
+ 14529
+ 14530
+ 14531
+ 14532
+ 14533
+ 14534
+ 14535
+ 14536
+ 14537
+ 14538
+ 14539
+ 14540
+ 14541
+ 14542
+ 14543
+ 14544
+ 14545
+ 14546
+ 14547
+ 14548
+ 14549
+ 14550
+ 14551
+ 14552
+ 14553
+ 14554
+ 14555
+ 14556
+ 14557
+ 14558
+ 14559
+ 14560
+ 14561
+ 14562
+ 14563
+ 14564
+ 14565
+ 14566
+ 14567
+ 14568
+ 14569
+ 14570
+ 14571
+ 14572
+ 14573
+ 14574
+ 14575
+ 14576
+ 14577
+ 14578
+ 14579
+ 14580
+ 14581
+ 14582
+ 14583
+ 14584
+ 14585
+ 14586
+ 14587
+ 14588
+ 14589
+ 14590
+ 14591
+ 14592
+ 14593
+ 14594
+ 14595
+ 14596
+ 14597
+ 14598
+ 14599
+ 14600
+ 14601
+ 14602
+ 14603
+ 14604
+ 14605
+ 14606
+ 14607
+ 14608
+ 14609
+ 14610
+ 14611
+ 14612
+ 14613
+ 14614
+ 14615
+ 14616
+ 14617
+ 14618
+ 14619
+ 14620
+ 14621
+ 14622
+ 14623
+ 14624
+ 14625
+ 14626
+ 14627
+ 14628
+ 14633
+ 14634
+ 14635
+ 14636
+ 14637
+ 14638
+ 14639
+ 14640
+ 14641
+ 14642
+ 14643
+ 14644
+ 14645
+ 14646
+ 14647
+ 14648
+ 14649
+ 14650
+ 14651
+ 14652
+ 14653
+ 14654
+ 14655
+ 14656
+ 14657
+ 14658
+ 14659
+ 14660
+ 14661
+ 14662
+ 14663
+ 14664
+ 14665
+ 14666
+ 14667
+ 14668
+ 14669
+ 14670
+ 14671
+ 14672
+ 14673
+ 14674
+ 14675
+ 14676
+ 14677
+ 14678
+ 14679
+ 14680
+ 14681
+ 14682
+ 14683
+ 14684
+ 14685
+ 14686
+ 14687
+ 14688
+ 14689
+ 14690
+ 14691
+ 14692
+ 14693
+ 14694
+ 14695
+ 14696
+ 14697
+ 14698
+ 14699
+ 14700
+ 14701
+ 14702
+ 14703
+ 14704
+ 14705
+ 14706
+ 14707
+ 14708
+ 14709
+ 14710
+ 14711
+ 14712
+ 14713
+ 14714
+ 14715
+ 14716
+ 14717
+ 14718
+ 14719
+ 14720
+ 14721
+ 14722
+ 14723
+ 14724
+ 14725
+ 14726
+ 14727
+ 14728
+ 14729
+ 14730
+ 14731
+ 14732
+ 14733
+ 14734
+ 14735
+ 14736
+ 14737
+ 14738
+ 14739
+ 14740
+ 14741
+ 14742
+ 14743
+ 14744
+ 14745
+ 14746
+ 14747
+ 14748
+ 14749
+ 14750
+ 14751
+ 14752
+ 14753
+ 14754
+ 14755
+ 14756
+ 14757
+ 14758
+ 14759
+ 14760
+ 14761
+ 14762
+ 14763
+ 14764
+ 14765
+ 14766
+ 14767
+ 14768
+ 14769
+ 14770
+ 14771
+ 14772
+ 14773
+ 14774
+ 14775
+ 14776
+ 14777
+ 14778
+ 14779
+ 14780
+ 14781
+ 14782
+ 14783
+ 14784
+ 14785
+ 14786
+ 14787
+ 14788
+ 14789
+ 14790
+ 14791
+ 14792
+ 14793
+ 14794
+ 14795
+ 14796
+ 14797
+ 14798
+ 14799
+ 14800
+ 14801
+ 14802
+ 14803
+ 14804
+ 14805
+ 14806
+ 14807
+ 14808
+ 14809
+ 14810
+ 14811
+ 14812
+ 14813
+ 14814
+ 14815
+ 14816
+ 14817
+ 14818
+ 14819
+ 14820
+ 14821
+ 14822
+ 14823
+ 14824
+ 14825
+ 14826
+ 14827
+ 14828
+ 14829
+ 14830
+ 14831
+ 14832
+ 14833
+ 14834
+ 14835
+ 14836
+ 14837
+ 14838
+ 14839
+ 14840
+ 14841
+ 14842
+ 14843
+ 14844
+ 14845
+ 14846
+ 14847
+ 14848
+ 14849
+ 14850
+ 14851
+ 14852
+ 14853
+ 14854
+ 14855
+ 14856
+ 14857
+ 14858
+ 14859
+ 14860
+ 14861
+ 14862
+ 14863
+ 14864
+ 14865
+ 14866
+ 14867
+ 14868
+ 14869
+ 12077
+ 12311
+ 12312
+ 12313
+ 12526
+ 12527
+ 12528
+ 12564
+ 12621
+ 12780
+ 12781
+ 12782
+ 16025
+ 13071
+ 13072
+ 13073
+ 13074
+ 13075
+ 13076
+ 14870
+ 14871
+ 14872
+ 14873
+ 14874
+ 14875
+ 14876
+ 14877
+ 14878
+ 14879
+ 14880
+ 14881
+ 14882
+ 14883
+ 14884
+ 14885
+ 14886
+ 14887
+ 14888
+ 14889
+ 14890
+ 14891
+ 14892
+ 14893
+ 14894
+ 14895
+ 14896
+ 14897
+ 14898
+ 14899
+ 14900
+ 14901
+ 14902
+ 14903
+ 14904
+ 14905
+ 14906
+ 14907
+ 14908
+ 14909
+ 14910
+ 14911
+ 14912
+ 14913
+ 14914
+ 14915
+ 16030
+ 16034
+ 16035
+ 16036
+ 16037
+ 16038
+ 16039
+ 16040
+ 16041
+ 16042
+ 16043
+ 16044
+ 16045
+ 16046
+ 14916
+ 14917
+ 14918
+ 16050
+ 16051
+ 16052
+ 16053
+ 16067
+ 16068
+ 16071
+ 16072
+
+
+ 32915
+ 32916
+ 33142
+ 33143
+ 33144
+ 33145
+ 33147
+ 33148
+ 33137
+
+
+ 32915
+ 32916
+ 32917
+ 32918
+ 32919
+ 32920
+ 33147
+ 33148
+ 32913
+ 32914
+ 33097
+
+
+ 90
+ 91
+ 99
+ 106
+
+
+ 88
+ 89
+ 113
+ 114
+ 118
+ 131
+
+
+ 93
+ 101
+ 108
+ 117
+
+
+ 92
+ 102
+ 109
+ 134
+
+
+ 95
+ 94
+ 103
+ 110
+ 132
+ 133
+
+
+ 96
+ 104
+ 111
+
+
+ 97
+ 105
+ 112
+
+
+ 98
+ 100
+ 107
+ 116
+ 115
+ 136
+
+
+ 19117
+ 19118
+
+
+ 32908
+
+
+ 14930
+ 14954
+ 14955
+ 14956
+ 14957
+ 14958
+ 14959
+ 14960
+ 14931
+ 14961
+ 14962
+ 14963
+ 14964
+ 14965
+ 14966
+ 14967
+ 15032
+ 15033
+ 15034
+ 15035
+ 15036
+ 15037
+ 15038
+ 15039
+ 15040
+ 15041
+ 15042
+ 15043
+ 15044
+ 15045
+ 15046
+ 15047
+ 15048
+ 15049
+ 15050
+ 15051
+ 14929
+ 14947
+ 14948
+ 14949
+ 14950
+ 14951
+ 14952
+ 14953
+ 15022
+ 15023
+ 15024
+ 15025
+ 15026
+ 15027
+ 15028
+ 15029
+ 15030
+ 15031
+
+
+ 0
+ 18
+ 31
+ 44
+ 53
+ 123
+ 124
+
+
+ 10
+ 25
+ 38
+ 49
+
+
+ 4
+ 19
+ 32
+
+
+ 1
+ 7
+ 22
+ 35
+ 45
+ 47
+ 125
+ 126
+ 50
+ 54
+ 56
+
+
+ 11
+ 26
+ 39
+
+
+ 15
+ 29
+ 42
+
+
+ 5
+ 6
+ 20
+ 33
+
+
+ 2
+ 3
+ 46
+ 48
+ 127
+ 128
+ 129
+ 57
+ 135
+
+
+ 8
+ 23
+ 36
+ 55
+
+
+ 12
+ 27
+ 40
+ 13
+
+
+ 9
+ 130
+ 37
+ 24
+
+
+ 17
+ 52
+
+
+ 14
+ 28
+ 41
+
+
+ 16
+ 30
+ 34
+ 43
+ 21
+ 51
+
+
+ 90
+ 91
+ 99
+ 106
+
+
+ 88
+ 89
+ 113
+ 114
+ 118
+ 131
+ 132
+ 133
+ 136
+
+
+ 93
+ 101
+ 108
+ 101
+ 117
+
+
+ 94
+ 103
+ 110
+ 95
+
+
+ 92
+ 102
+ 109
+ 134
+
+
+ 116
+ 98
+ 115
+
+
+ 96
+ 104
+ 111
+
+
+ 97
+ 105
+ 112
+ 107
+ 100
+
+
+ 5
+ 6
+ 20
+ 33
+ 90
+ 91
+ 99
+ 106
+ 139
+ 148
+ 149
+ 150
+ 151
+
+
+ 3
+ 2
+ 46
+ 48
+ 89
+ 88
+ 113
+ 114
+ 118
+ 140
+ 152
+ 153
+ 154
+ 155
+ 156
+
+
+ 8
+ 23
+ 36
+ 55
+ 93
+ 101
+ 108
+ 117
+ 141
+ 158
+ 159
+ 160
+ 161
+
+
+ 9
+ 24
+ 37
+ 92
+ 102
+ 109
+ 142
+ 162
+ 163
+ 164
+
+
+ 12
+ 13
+ 27
+ 40
+ 94
+ 95
+ 103
+ 110
+ 143
+ 166
+ 167
+ 168
+ 169
+
+
+ 14
+ 28
+ 41
+ 96
+ 104
+ 111
+ 145
+ 176
+ 177
+ 178
+
+
+ 16
+ 30
+ 43
+ 97
+ 105
+ 112
+ 146
+ 179
+ 180
+ 181
+
+
+ 17
+ 21
+ 34
+ 52
+ 98
+ 116
+ 100
+ 107
+ 115
+ 144
+ 171
+ 172
+ 173
+ 174
+ 175
+
+
+ 51
+ 57
+
+
+ 127
+ 130
+ 128
+ 129
+ 135
+ 131
+ 134
+ 132
+ 133
+ 136
+ 157
+ 170
+ 165
+
+
+ 0
+ 1
+ 2
+ 3
+ 4
+ 5
+ 6
+ 7
+ 8
+ 9
+ 18
+ 19
+ 20
+ 21
+ 22
+ 23
+ 24
+ 31
+ 32
+ 33
+ 34
+ 35
+ 36
+ 37
+ 44
+ 45
+ 46
+ 47
+ 48
+ 53
+ 54
+ 55
+ 56
+ 57
+ 88
+ 89
+ 90
+ 91
+ 92
+ 93
+ 99
+ 100
+ 101
+ 102
+ 106
+ 107
+ 108
+ 109
+ 113
+ 114
+ 117
+ 118
+ 139
+ 140
+ 141
+ 142
+ 144
+ 10
+ 11
+ 12
+ 13
+ 14
+ 15
+ 16
+ 17
+ 25
+ 26
+ 27
+ 28
+ 29
+ 30
+ 38
+ 39
+ 40
+ 41
+ 42
+ 43
+ 49
+ 50
+ 51
+ 52
+ 94
+ 95
+ 96
+ 97
+ 98
+ 103
+ 104
+ 105
+ 110
+ 111
+ 112
+ 115
+ 116
+ 143
+ 145
+ 146
+ 148
+ 149
+ 150
+ 151
+ 152
+ 153
+ 154
+ 155
+ 156
+ 158
+ 159
+ 160
+ 161
+ 162
+ 163
+ 164
+ 166
+ 167
+ 168
+ 169
+ 171
+ 172
+ 173
+ 174
+ 175
+ 176
+ 177
+ 178
+ 179
+ 180
+ 181
+ 182
+ 184
+ 186
+ 188
+ 183
+ 185
+ 187
+ 189
+
+
+ 143
+ 145
+ 146
+ 166
+ 167
+ 176
+ 179
+
+
+ 139
+ 140
+ 141
+ 142
+ 144
+ 148
+ 149
+ 152
+ 153
+ 158
+ 162
+ 171
+
+
+ 5
+ 6
+ 20
+ 33
+ 90
+ 91
+ 99
+ 106
+ 139
+ 148
+ 149
+ 150
+ 151
+
+
+ 3
+ 2
+ 46
+ 48
+ 127
+ 57
+ 89
+ 88
+ 113
+ 114
+ 118
+ 131
+ 140
+ 152
+ 153
+ 154
+ 155
+ 156
+ 184
+ 186
+ 188
+
+
+ 8
+ 23
+ 36
+ 55
+ 93
+ 101
+ 108
+ 117
+ 141
+ 158
+ 159
+ 160
+ 161
+
+
+ 9
+ 24
+ 37
+ 130
+ 92
+ 102
+ 109
+ 134
+ 142
+ 162
+ 163
+ 164
+ 165
+
+
+ 12
+ 13
+ 27
+ 40
+ 128
+ 129
+ 94
+ 95
+ 103
+ 110
+ 132
+ 133
+ 143
+ 166
+ 167
+ 168
+ 169
+ 170
+
+
+ 14
+ 28
+ 41
+ 96
+ 104
+ 111
+ 145
+ 176
+ 177
+ 178
+
+
+ 17
+ 21
+ 34
+ 52
+ 135
+ 51
+ 98
+ 116
+ 100
+ 107
+ 115
+ 136
+ 144
+ 171
+ 172
+ 173
+ 174
+ 175
+
+
+ 16
+ 30
+ 43
+ 97
+ 105
+ 112
+ 146
+ 179
+ 180
+ 181
+
+
+ 88
+ 89
+ 90
+ 91
+ 93
+ 92
+ 94
+ 95
+ 96
+ 97
+ 98
+
+
+ 99
+ 100
+ 101
+ 102
+ 103
+ 104
+ 105
+
+
+ 106
+ 107
+ 108
+ 109
+ 110
+ 111
+ 112
+
+
+ 113
+ 114
+ 115
+ 116
+
+
+ 117
+ 118
+
+
+ 8401
+ 8402
+ 8403
+ 8405
+ 8417
+ 8422
+ 8423
+ 8424
+ 8425
+ 8416
+
+
+ 8407
+ 8408
+ 8409
+ 8410
+ 8411
+ 8412
+ 8413
+ 8414
+ 8415
+ 8428
+ 8429
+ 8430
+ 8431
+ 8432
+
+
+ 8516
+ 8517
+ 8514
+ 8515
+ 8512
+ 8513
+
+
+ 182
+ 184
+ 186
+ 188
+ 183
+ 185
+ 187
+ 189
+
+
+ 182
+ 183
+
+
+ 184
+ 185
+
+
+ 186
+ 187
+
+
+ 188
+ 189
+
+
+ 183
+ 185
+ 187
+ 189
+
+
+ 182
+ 184
+ 186
+ 188
+
+
+ 187
+
+
+ 186
+
+
+ 0
+ 1
+ 2
+ 3
+ 4
+ 5
+ 6
+ 7
+ 8
+ 9
+ 18
+ 19
+ 20
+ 21
+ 22
+ 23
+ 24
+ 31
+ 32
+ 33
+ 34
+ 35
+ 36
+ 37
+ 44
+ 45
+ 46
+ 47
+ 48
+ 53
+ 54
+ 55
+ 56
+ 57
+ 88
+ 89
+ 90
+ 91
+ 92
+ 93
+ 99
+ 100
+ 101
+ 102
+ 106
+ 107
+ 108
+ 109
+ 113
+ 114
+ 117
+ 118
+ 123
+ 124
+ 125
+ 126
+ 127
+ 128
+ 129
+ 130
+ 131
+ 132
+ 133
+ 134
+ 135
+ 136
+ 139
+ 140
+ 141
+ 142
+ 144
+ 148
+ 149
+ 150
+ 151
+ 152
+ 153
+ 154
+ 155
+ 156
+ 157
+ 158
+ 159
+ 160
+ 161
+ 162
+ 163
+ 164
+ 165
+ 171
+ 172
+ 173
+ 174
+ 175
+ 10
+ 11
+ 12
+ 13
+ 14
+ 15
+ 16
+ 17
+ 25
+ 26
+ 27
+ 28
+ 29
+ 30
+ 38
+ 39
+ 40
+ 41
+ 42
+ 43
+ 49
+ 50
+ 51
+ 52
+ 94
+ 95
+ 96
+ 97
+ 98
+ 103
+ 104
+ 105
+ 110
+ 111
+ 112
+ 115
+ 116
+ 143
+ 145
+ 146
+ 166
+ 167
+ 168
+ 169
+ 170
+ 176
+ 177
+ 178
+ 179
+ 180
+ 181
+
+
+ 1
+ 2
+ 3
+ 4
+ 5
+ 6
+ 19
+ 20
+ 21
+ 32
+ 33
+ 34
+ 45
+ 46
+ 56
+ 57
+ 88
+ 89
+ 90
+ 91
+ 99
+ 100
+ 106
+ 107
+ 113
+ 118
+ 139
+ 140
+ 148
+ 149
+ 150
+ 151
+ 152
+ 153
+ 154
+ 155
+ 156
+ 157
+ 49
+ 50
+ 51
+ 52
+ 115
+ 116
+
+
+ 0
+ 7
+ 8
+ 9
+ 18
+ 22
+ 23
+ 24
+ 31
+ 35
+ 36
+ 37
+ 44
+ 47
+ 48
+ 53
+ 54
+ 55
+ 92
+ 93
+ 101
+ 102
+ 108
+ 109
+ 114
+ 123
+ 124
+ 125
+ 126
+ 127
+ 128
+ 129
+ 130
+ 131
+ 132
+ 133
+ 134
+ 135
+ 136
+ 141
+ 142
+ 144
+ 158
+ 159
+ 160
+ 161
+ 162
+ 163
+ 164
+ 165
+ 171
+ 172
+ 173
+ 174
+ 175
+ 182
+ 184
+ 186
+ 188
+
+
+ 10
+ 11
+ 12
+ 13
+ 14
+ 15
+ 16
+ 17
+ 25
+ 26
+ 27
+ 28
+ 29
+ 30
+ 38
+ 39
+ 40
+ 41
+ 42
+ 43
+ 94
+ 95
+ 96
+ 97
+ 98
+ 103
+ 104
+ 105
+ 110
+ 111
+ 112
+ 143
+ 145
+ 146
+ 166
+ 167
+ 168
+ 169
+ 170
+ 176
+ 177
+ 178
+ 179
+ 180
+ 181
+ 183
+ 185
+ 187
+ 189
+
\ No newline at end of file
diff --git a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/ai/areas/TalkingIsland/AwakeningMaster/AwakeningMaster.java b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/ai/areas/TalkingIsland/AwakeningMaster/AwakeningMaster.java
index 25db941e6f..1a41e95122 100644
--- a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/ai/areas/TalkingIsland/AwakeningMaster/AwakeningMaster.java
+++ b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/ai/areas/TalkingIsland/AwakeningMaster/AwakeningMaster.java
@@ -68,17 +68,16 @@ public final class AwakeningMaster extends AbstractNpcAI
private static final int CHAOS_POMANDER = 37374;
private static final int CHAOS_POMANDER_DUAL_CLASS = 37375;
private static final Map AWAKE_POWER = new HashMap<>();
-
static
{
- AWAKE_POWER.put(CategoryType.SIGEL_GROUP, 32264);
- AWAKE_POWER.put(CategoryType.TYRR_GROUP, 32265);
- AWAKE_POWER.put(CategoryType.OTHELL_GROUP, 32266);
- AWAKE_POWER.put(CategoryType.YUL_GROUP, 32267);
- AWAKE_POWER.put(CategoryType.FEOH_GROUP, 32268);
- AWAKE_POWER.put(CategoryType.ISS_GROUP, 32269);
- AWAKE_POWER.put(CategoryType.WYNN_GROUP, 32270);
- AWAKE_POWER.put(CategoryType.AEORE_GROUP, 32271);
+ AWAKE_POWER.put(CategoryType.SIXTH_SIGEL_GROUP, 32264);
+ AWAKE_POWER.put(CategoryType.SIXTH_TIR_GROUP, 32265);
+ AWAKE_POWER.put(CategoryType.SIXTH_OTHEL_GROUP, 32266);
+ AWAKE_POWER.put(CategoryType.SIXTH_YR_GROUP, 32267);
+ AWAKE_POWER.put(CategoryType.SIXTH_FEOH_GROUP, 32268);
+ AWAKE_POWER.put(CategoryType.SIXTH_WYNN_GROUP, 32269);
+ AWAKE_POWER.put(CategoryType.SIXTH_IS_GROUP, 32270);
+ AWAKE_POWER.put(CategoryType.SIXTH_EOLH_GROUP, 32271);
}
// Skills
@@ -117,7 +116,7 @@ public final class AwakeningMaster extends AbstractNpcAI
{
case SIGEL_MASTER:
{
- if (!player.isInCategory(CategoryType.SIGEL_CANDIDATE))
+ if (!player.isInCategory(CategoryType.TANKER_CATEGORY))
{
return SIGEL_MASTER + "-no_class.htm";
}
@@ -125,7 +124,7 @@ public final class AwakeningMaster extends AbstractNpcAI
}
case TYRR_MASTER:
{
- if (!player.isInCategory(CategoryType.TYRR_CANDIDATE))
+ if (!player.isInCategory(CategoryType.WARRIOR_CATEGORY))
{
return TYRR_MASTER + "-no_class.htm";
}
@@ -133,7 +132,7 @@ public final class AwakeningMaster extends AbstractNpcAI
}
case OTHELL_MASTER:
{
- if (!player.isInCategory(CategoryType.OTHELL_CANDIDATE))
+ if (!player.isInCategory(CategoryType.ROGUE_CATEGORY))
{
return OTHELL_MASTER + "-no_class.htm";
}
@@ -141,7 +140,7 @@ public final class AwakeningMaster extends AbstractNpcAI
}
case YUL_MASTER:
{
- if (!player.isInCategory(CategoryType.YUL_CANDIDATE))
+ if (!player.isInCategory(CategoryType.ARCHER_CATEGORY))
{
return YUL_MASTER + "-no_class.htm";
}
@@ -149,7 +148,7 @@ public final class AwakeningMaster extends AbstractNpcAI
}
case FEOH_MASTER:
{
- if (!player.isInCategory(CategoryType.FEOH_CANDIDATE))
+ if (!player.isInCategory(CategoryType.WIZARD_CATEGORY))
{
return FEOH_MASTER + "-no_class.htm";
}
@@ -157,7 +156,7 @@ public final class AwakeningMaster extends AbstractNpcAI
}
case ISS_MASTER:
{
- if (!player.isInCategory(CategoryType.ISS_CANDIDATE))
+ if (!player.isInCategory(CategoryType.ENCHANTER_CATEGORY))
{
return ISS_MASTER + "-no_class.htm";
}
@@ -165,7 +164,7 @@ public final class AwakeningMaster extends AbstractNpcAI
}
case WYNN_MASTER:
{
- if (!player.isInCategory(CategoryType.WYNN_CANDIDATE))
+ if (!player.isInCategory(CategoryType.SUMMONER_CATEGORY))
{
return WYNN_MASTER + "-no_class.htm";
}
@@ -173,7 +172,7 @@ public final class AwakeningMaster extends AbstractNpcAI
}
case AEORE_MASTER:
{
- if (!player.isInCategory(CategoryType.AEORE_CANDIDATE))
+ if (!player.isInCategory(CategoryType.HEALER_CATEGORY))
{
return AEORE_MASTER + "-no_class.htm";
}
diff --git a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/ai/areas/TalkingIsland/Hadel/Hadel.java b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/ai/areas/TalkingIsland/Hadel/Hadel.java
index fdb12a0bb9..3c673a0a70 100644
--- a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/ai/areas/TalkingIsland/Hadel/Hadel.java
+++ b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/ai/areas/TalkingIsland/Hadel/Hadel.java
@@ -62,7 +62,7 @@ public final class Hadel extends AbstractNpcAI
}
case "teleportToHarnak":
{
- if ((!player.isInCategory(CategoryType.AWAKEN_GROUP)) || (player.getLevel() < 85))
+ if ((!player.isInCategory(CategoryType.SIXTH_CLASS_GROUP)) || (player.getLevel() < 85))
{
htmltext = "33344-noClass.html";
break;
diff --git a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/ai/areas/TalkingIsland/Hardin/Hardin.java b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/ai/areas/TalkingIsland/Hardin/Hardin.java
index 2c4bc51193..9feadede0f 100644
--- a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/ai/areas/TalkingIsland/Hardin/Hardin.java
+++ b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/ai/areas/TalkingIsland/Hardin/Hardin.java
@@ -183,7 +183,7 @@ public final class Hardin extends AbstractNpcAI
return "33870-02.html";
}
}
- if (!player.isInCategory(CategoryType.AWAKEN_GROUP))
+ if (!player.isInCategory(CategoryType.SIXTH_CLASS_GROUP))
{
return "33870-no.html";
}
diff --git a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/ai/areas/TalkingIsland/MonkOfChaos/MonkOfChaos.java b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/ai/areas/TalkingIsland/MonkOfChaos/MonkOfChaos.java
index bd823959b4..9757b3464d 100644
--- a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/ai/areas/TalkingIsland/MonkOfChaos/MonkOfChaos.java
+++ b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/ai/areas/TalkingIsland/MonkOfChaos/MonkOfChaos.java
@@ -78,7 +78,7 @@ public final class MonkOfChaos extends AbstractNpcAI
}
case "LearnRevelationSkills":
{
- if ((player.getLevel() < MIN_LEVEL) || !player.isInCategory(CategoryType.AWAKEN_GROUP))
+ if ((player.getLevel() < MIN_LEVEL) || !player.isInCategory(CategoryType.SIXTH_CLASS_GROUP))
{
htmltext = "no-learn.html";
break;
@@ -139,7 +139,7 @@ public final class MonkOfChaos extends AbstractNpcAI
}
}
- if ((player.getLevel() < MIN_LEVEL) || !player.isInCategory(CategoryType.AWAKEN_GROUP) || (count == 0))
+ if ((player.getLevel() < MIN_LEVEL) || !player.isInCategory(CategoryType.SIXTH_CLASS_GROUP) || (count == 0))
{
htmltext = "no-cancel.html";
break;
diff --git a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/ai/areas/TalkingIsland/Raina/Raina.java b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/ai/areas/TalkingIsland/Raina/Raina.java
index 5f8ec667e9..f61345700f 100644
--- a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/ai/areas/TalkingIsland/Raina/Raina.java
+++ b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/ai/areas/TalkingIsland/Raina/Raina.java
@@ -111,14 +111,14 @@ public final class Raina extends AbstractNpcAI
private static final Map classCloak = new HashMap<>();
{
- classCloak.put(CategoryType.SIGEL_GROUP, 30310); // Abelius Cloak
- classCloak.put(CategoryType.TYRR_GROUP, 30311); // Sapyros Cloak Grade
- classCloak.put(CategoryType.OTHELL_GROUP, 30312); // Ashagen Cloak Grade
- classCloak.put(CategoryType.YUL_GROUP, 30313); // Cranigg Cloak Grade
- classCloak.put(CategoryType.FEOH_GROUP, 30314); // Soltkreig Cloak Grade
- classCloak.put(CategoryType.WYNN_GROUP, 30315); // Naviarope Cloak Grade
- classCloak.put(CategoryType.ISS_GROUP, 30316); // Leister Cloak Grade
- classCloak.put(CategoryType.AEORE_GROUP, 30317); // Laksis Cloak Grade
+ classCloak.put(CategoryType.SIXTH_SIGEL_GROUP, 30310); // Abelius Cloak
+ classCloak.put(CategoryType.SIXTH_TIR_GROUP, 30311); // Sapyros Cloak Grade
+ classCloak.put(CategoryType.SIXTH_OTHEL_GROUP, 30312); // Ashagen Cloak Grade
+ classCloak.put(CategoryType.SIXTH_YR_GROUP, 30313); // Cranigg Cloak Grade
+ classCloak.put(CategoryType.SIXTH_FEOH_GROUP, 30314); // Soltkreig Cloak Grade
+ classCloak.put(CategoryType.SIXTH_WYNN_GROUP, 30315); // Naviarope Cloak Grade
+ classCloak.put(CategoryType.SIXTH_IS_GROUP, 30316); // Leister Cloak Grade
+ classCloak.put(CategoryType.SIXTH_EOLH_GROUP, 30317); // Laksis Cloak Grade
}
private static final List dualClassList = new ArrayList<>();
@@ -290,7 +290,7 @@ public final class Raina extends AbstractNpcAI
case "ertheiaDualClass":
{
// TODO: Maybe html is different when you have 85lvl but you haven't completed quest
- if ((player.getRace() != Race.ERTHEIA) || (player.getLevel() < 85) || !player.isInCategory(CategoryType.AWAKEN_GROUP) || player.hasDualClass() || !haveDoneQuest(player, true))
+ if ((player.getRace() != Race.ERTHEIA) || (player.getLevel() < 85) || !player.isInCategory(CategoryType.SIXTH_CLASS_GROUP) || player.hasDualClass() || !haveDoneQuest(player, true))
{
htmltext = "addDualClassErtheiaFailed.html";
}
@@ -309,7 +309,7 @@ public final class Raina extends AbstractNpcAI
case "addDualClass_WYNN_GROUP":
case "addDualClass_AEORE_GROUP":
{
- if ((player.getRace() != Race.ERTHEIA) || (player.getLevel() < 85) || !player.isInCategory(CategoryType.AWAKEN_GROUP) || player.hasDualClass() || !haveDoneQuest(player, true))
+ if ((player.getRace() != Race.ERTHEIA) || (player.getLevel() < 85) || !player.isInCategory(CategoryType.SIXTH_CLASS_GROUP) || player.hasDualClass() || !haveDoneQuest(player, true))
{
htmltext = "addDualClassErtheiaFailed.html";
break;
@@ -659,31 +659,31 @@ public final class Raina extends AbstractNpcAI
private void addPowerItem(L2PcInstance player)
{
int itemId = ABELIUS_POWER; // Sigel
- if (player.isInCategory(CategoryType.TYRR_GROUP))
+ if (player.isInCategory(CategoryType.SIXTH_TIR_GROUP))
{
itemId = SAPYROS_POWER;
}
- else if (player.isInCategory(CategoryType.OTHELL_GROUP))
+ else if (player.isInCategory(CategoryType.SIXTH_OTHEL_GROUP))
{
itemId = ASHAGEN_POWER;
}
- else if (player.isInCategory(CategoryType.YUL_GROUP))
+ else if (player.isInCategory(CategoryType.SIXTH_YR_GROUP))
{
itemId = CRANIGG_POWER;
}
- else if (player.isInCategory(CategoryType.FEOH_GROUP))
+ else if (player.isInCategory(CategoryType.SIXTH_FEOH_GROUP))
{
itemId = SOLTKREIG_POWER;
}
- else if (player.isInCategory(CategoryType.WYNN_GROUP))
+ else if (player.isInCategory(CategoryType.SIXTH_WYNN_GROUP))
{
itemId = NAVIAROPE_POWER;
}
- else if (player.isInCategory(CategoryType.ISS_GROUP))
+ else if (player.isInCategory(CategoryType.SIXTH_IS_GROUP))
{
itemId = LEISTER_POWER;
}
- else if (player.isInCategory(CategoryType.AEORE_GROUP))
+ else if (player.isInCategory(CategoryType.SIXTH_EOLH_GROUP))
{
itemId = LAKCIS_POWER;
}
@@ -905,37 +905,37 @@ public final class Raina extends AbstractNpcAI
{
CategoryType catType = null;
- if (player.isInCategory(CategoryType.SIGEL_GROUP))
+ if (player.isInCategory(CategoryType.SIXTH_SIGEL_GROUP))
{
- catType = CategoryType.SIGEL_GROUP;
+ catType = CategoryType.SIXTH_SIGEL_GROUP;
}
- else if (player.isInCategory(CategoryType.TYRR_GROUP))
+ else if (player.isInCategory(CategoryType.SIXTH_TIR_GROUP))
{
- catType = CategoryType.TYRR_GROUP;
+ catType = CategoryType.SIXTH_TIR_GROUP;
}
- else if (player.isInCategory(CategoryType.OTHELL_GROUP))
+ else if (player.isInCategory(CategoryType.SIXTH_OTHEL_GROUP))
{
- catType = CategoryType.OTHELL_GROUP;
+ catType = CategoryType.SIXTH_OTHEL_GROUP;
}
- else if (player.isInCategory(CategoryType.YUL_GROUP))
+ else if (player.isInCategory(CategoryType.SIXTH_YR_GROUP))
{
- catType = CategoryType.YUL_GROUP;
+ catType = CategoryType.SIXTH_YR_GROUP;
}
- else if (player.isInCategory(CategoryType.FEOH_GROUP))
+ else if (player.isInCategory(CategoryType.SIXTH_FEOH_GROUP))
{
- catType = CategoryType.FEOH_GROUP;
+ catType = CategoryType.SIXTH_FEOH_GROUP;
}
- else if (player.isInCategory(CategoryType.ISS_GROUP))
+ else if (player.isInCategory(CategoryType.SIXTH_IS_GROUP))
{
- catType = CategoryType.ISS_GROUP;
+ catType = CategoryType.SIXTH_IS_GROUP;
}
- else if (player.isInCategory(CategoryType.WYNN_GROUP))
+ else if (player.isInCategory(CategoryType.SIXTH_WYNN_GROUP))
{
- catType = CategoryType.WYNN_GROUP;
+ catType = CategoryType.SIXTH_WYNN_GROUP;
}
- else if (player.isInCategory(CategoryType.AEORE_GROUP))
+ else if (player.isInCategory(CategoryType.SIXTH_EOLH_GROUP))
{
- catType = CategoryType.AEORE_GROUP;
+ catType = CategoryType.SIXTH_EOLH_GROUP;
}
return classCloak.get(catType);
}
diff --git a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/ai/bosses/Kimerian/KimerianCommon.java b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/ai/bosses/Kimerian/KimerianCommon.java
index 87ecf2699a..51ee3bad82 100644
--- a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/ai/bosses/Kimerian/KimerianCommon.java
+++ b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/ai/bosses/Kimerian/KimerianCommon.java
@@ -152,7 +152,7 @@ public final class KimerianCommon extends AbstractInstance
{
if (hasQuestItems(player, FLUTE))
{
- if (player.isInCategory(CategoryType.AEORE_GROUP))
+ if (player.isInCategory(CategoryType.SIXTH_EOLH_GROUP))
{
addSpawn(FAIRY_REBEL, player.getX() + 60, player.getY(), player.getZ(), 0, false, 0, false, instance.getId());
addSpawn(FAIRY_REBEL, player.getX() - 60, player.getY(), player.getZ(), 0, false, 0, false, instance.getId());
diff --git a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/ai/others/AdventurersGuide/AdventurersGuide.java b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/ai/others/AdventurersGuide/AdventurersGuide.java
index 7a0a53fcea..41870fd27c 100644
--- a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/ai/others/AdventurersGuide/AdventurersGuide.java
+++ b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/ai/others/AdventurersGuide/AdventurersGuide.java
@@ -53,6 +53,9 @@ public final class AdventurersGuide extends AbstractNpcAI
new SkillHolder(15652, 1), // Daring Sonata (Adventurer)
new SkillHolder(15653, 1), // Refreshing Sonata (Adventurer)
};
+ // Misc
+ private static int MAX_LEVEL_BUFFS = 90;
+ private static int MIN_LEVEL_PROTECTION = 40;
private AdventurersGuide()
{
@@ -115,7 +118,7 @@ public final class AdventurersGuide extends AbstractNpcAI
private String applyBuffs(L2Npc npc, L2PcInstance player, Skill skill)
{
- if (player.getLevel() > 90)
+ if (player.getLevel() > MAX_LEVEL_BUFFS)
{
return "guide-noBuffs.html";
}
@@ -126,7 +129,7 @@ public final class AdventurersGuide extends AbstractNpcAI
}
SkillCaster.triggerCast(npc, player, skill);
- if ((player.getLevel() < 40) && (player.getClassId().level() <= 1))
+ if ((player.getLevel() < MIN_LEVEL_PROTECTION) && (player.getClassId().level() <= 1))
{
SkillCaster.triggerCast(npc, player, BLESS_PROTECTION.getSkill());
}
diff --git a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/ai/others/CastleCourtMagician/CastleCourtMagician.java b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/ai/others/CastleCourtMagician/CastleCourtMagician.java
index ff6975b3f2..f01d1044ea 100644
--- a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/ai/others/CastleCourtMagician/CastleCourtMagician.java
+++ b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/ai/others/CastleCourtMagician/CastleCourtMagician.java
@@ -121,14 +121,14 @@ public final class CastleCourtMagician extends AbstractNpcAI
// Misc
private static final CategoryType[] AWAKENED_CT =
{
- CategoryType.SIGEL_GROUP,
- CategoryType.TYRR_GROUP,
- CategoryType.OTHELL_GROUP,
- CategoryType.YUL_GROUP,
- CategoryType.FEOH_GROUP,
- CategoryType.ISS_GROUP,
- CategoryType.WYNN_GROUP,
- CategoryType.AEORE_GROUP,
+ CategoryType.SIXTH_SIGEL_GROUP,
+ CategoryType.SIXTH_TIR_GROUP,
+ CategoryType.SIXTH_OTHEL_GROUP,
+ CategoryType.SIXTH_YR_GROUP,
+ CategoryType.SIXTH_FEOH_GROUP,
+ CategoryType.SIXTH_IS_GROUP,
+ CategoryType.SIXTH_WYNN_GROUP,
+ CategoryType.SIXTH_EOLH_GROUP,
};
private CastleCourtMagician()
@@ -266,7 +266,7 @@ public final class CastleCourtMagician extends AbstractNpcAI
}
case "giveTalismanR":
{
- htmltext = player.isInCategory(CategoryType.AWAKEN_GROUP) ? "courtmagician-09.html" : "courtmagician-10.html";
+ htmltext = player.isInCategory(CategoryType.SIXTH_CLASS_GROUP) ? "courtmagician-09.html" : "courtmagician-10.html";
break;
}
case "giveTalismanR_classSpecific":
diff --git a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/ai/others/ClassMaster/ClassMaster.java b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/ai/others/ClassMaster/ClassMaster.java
index 4d18eb5a3f..b5b3ab172b 100644
--- a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/ai/others/ClassMaster/ClassMaster.java
+++ b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/ai/others/ClassMaster/ClassMaster.java
@@ -297,7 +297,7 @@ public final class ClassMaster extends AbstractNpcAI implements IGameXmlReader
{
htmltext = "test_server_helper011.html";
}
- else if (player.isInCategory(CategoryType.AWAKEN_GROUP))
+ else if (player.isInCategory(CategoryType.SIXTH_CLASS_GROUP))
{
htmltext = "test_server_helper011a.html";
}
@@ -319,7 +319,7 @@ public final class ClassMaster extends AbstractNpcAI implements IGameXmlReader
htmltext = "test_server_helper021.html";
}
}
- else if (player.isInCategory(CategoryType.AWAKEN_GROUP))
+ else if (player.isInCategory(CategoryType.SIXTH_CLASS_GROUP))
{
htmltext = "test_server_helper011a.html";
}
@@ -352,7 +352,7 @@ public final class ClassMaster extends AbstractNpcAI implements IGameXmlReader
}
else if (player.isInCategory(CategoryType.FOURTH_CLASS_GROUP) && (player.getLevel() >= 85)) // 9
{
- canChange = CategoryData.getInstance().isInCategory(CategoryType.AWAKEN_GROUP, classId); // 11
+ canChange = CategoryData.getInstance().isInCategory(CategoryType.SIXTH_CLASS_GROUP, classId); // 11
}
if (canChange)
@@ -422,7 +422,7 @@ public final class ClassMaster extends AbstractNpcAI implements IGameXmlReader
{
player.setBaseClass(player.getActiveClass());
}
- if (player.isInCategory(CategoryType.AWAKEN_GROUP))
+ if (player.isInCategory(CategoryType.SIXTH_CLASS_GROUP))
{
SkillTreesData.getInstance().cleanSkillUponAwakening(player);
for (L2SkillLearn skill : SkillTreesData.getInstance().getRaceSkillTree(player.getRace()))
@@ -450,7 +450,7 @@ public final class ClassMaster extends AbstractNpcAI implements IGameXmlReader
case "learnskills":
{
// Retail class master only lets you learn all third class skills.
- if (player.isInCategory(CategoryType.AWAKEN_GROUP))
+ if (player.isInCategory(CategoryType.SIXTH_CLASS_GROUP))
{
htmltext = "test_server_helper001_failed.html";
}
@@ -578,7 +578,7 @@ public final class ClassMaster extends AbstractNpcAI implements IGameXmlReader
{
htmltext = "test_server_helper011.html";
}
- else if (player.isInCategory(CategoryType.AWAKEN_GROUP))
+ else if (player.isInCategory(CategoryType.SIXTH_CLASS_GROUP))
{
htmltext = "test_server_helper011a.html";
}
@@ -762,7 +762,7 @@ public final class ClassMaster extends AbstractNpcAI implements IGameXmlReader
{
htmltext = "test_server_helper011.html";
}
- else if (player.isInCategory(CategoryType.AWAKEN_GROUP))
+ else if (player.isInCategory(CategoryType.SIXTH_CLASS_GROUP))
{
htmltext = "test_server_helper011a.html";
}
@@ -853,7 +853,7 @@ public final class ClassMaster extends AbstractNpcAI implements IGameXmlReader
{
player.setBaseClass(player.getActiveClass());
}
- if (player.isInCategory(CategoryType.AWAKEN_GROUP))
+ if (player.isInCategory(CategoryType.SIXTH_CLASS_GROUP))
{
SkillTreesData.getInstance().cleanSkillUponAwakening(player);
for (L2SkillLearn skill : SkillTreesData.getInstance().getRaceSkillTree(player.getRace()))
diff --git a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/ai/others/HermuncusMinion/HermuncusMinion.java b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/ai/others/HermuncusMinion/HermuncusMinion.java
index d17067c902..6ac78443c9 100644
--- a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/ai/others/HermuncusMinion/HermuncusMinion.java
+++ b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/ai/others/HermuncusMinion/HermuncusMinion.java
@@ -97,7 +97,7 @@ public final class HermuncusMinion extends AbstractNpcAI
if (event.equals("teleportList"))
{
- if (!player.isInCategory(CategoryType.AWAKEN_GROUP))
+ if (!player.isInCategory(CategoryType.SIXTH_CLASS_GROUP))
{
htmltext = "HermuncusMinion-no.html";
}
@@ -155,7 +155,7 @@ public final class HermuncusMinion extends AbstractNpcAI
@Override
public String onFirstTalk(L2Npc npc, L2PcInstance player)
{
- return player.isInCategory(CategoryType.AWAKEN_GROUP) ? "HermuncusMinion.html" : "HermuncusMinion-no.html";
+ return player.isInCategory(CategoryType.SIXTH_CLASS_GROUP) ? "HermuncusMinion.html" : "HermuncusMinion-no.html";
}
private String generateButton(Integer locationId)
diff --git a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/ai/others/MentorGuide/MentorGuide.java b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/ai/others/MentorGuide/MentorGuide.java
index 9aba4c962c..8499c186a1 100644
--- a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/ai/others/MentorGuide/MentorGuide.java
+++ b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/ai/others/MentorGuide/MentorGuide.java
@@ -369,7 +369,7 @@ public final class MentorGuide extends AbstractNpcAI implements IGameXmlReader
handleMenteeSkills(player);
- if (player.isInCategory(CategoryType.AWAKEN_GROUP))
+ if (player.isInCategory(CategoryType.SIXTH_CLASS_GROUP))
{
handleGraduateMentee(player);
}
diff --git a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/ai/others/OlyManager/OlyManager.java b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/ai/others/OlyManager/OlyManager.java
index 073b459591..9e65f90f3a 100644
--- a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/ai/others/OlyManager/OlyManager.java
+++ b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/ai/others/OlyManager/OlyManager.java
@@ -57,16 +57,15 @@ public final class OlyManager extends AbstractNpcAI implements IBypassHandler
private static final int MANAGER = 31688;
// Misc
private static final Map EQUIPMENT_MULTISELL = new HashMap<>();
-
{
- EQUIPMENT_MULTISELL.put(CategoryType.SIGEL_GROUP, 917);
- EQUIPMENT_MULTISELL.put(CategoryType.TYRR_GROUP, 918);
- EQUIPMENT_MULTISELL.put(CategoryType.OTHELL_GROUP, 919);
- EQUIPMENT_MULTISELL.put(CategoryType.YUL_GROUP, 920);
- EQUIPMENT_MULTISELL.put(CategoryType.FEOH_GROUP, 921);
- EQUIPMENT_MULTISELL.put(CategoryType.ISS_GROUP, 923);
- EQUIPMENT_MULTISELL.put(CategoryType.WYNN_GROUP, 922);
- EQUIPMENT_MULTISELL.put(CategoryType.AEORE_GROUP, 924);
+ EQUIPMENT_MULTISELL.put(CategoryType.SIXTH_SIGEL_GROUP, 917);
+ EQUIPMENT_MULTISELL.put(CategoryType.SIXTH_TIR_GROUP, 918);
+ EQUIPMENT_MULTISELL.put(CategoryType.SIXTH_OTHEL_GROUP, 919);
+ EQUIPMENT_MULTISELL.put(CategoryType.SIXTH_YR_GROUP, 920);
+ EQUIPMENT_MULTISELL.put(CategoryType.SIXTH_FEOH_GROUP, 921);
+ EQUIPMENT_MULTISELL.put(CategoryType.SIXTH_IS_GROUP, 923);
+ EQUIPMENT_MULTISELL.put(CategoryType.SIXTH_WYNN_GROUP, 922);
+ EQUIPMENT_MULTISELL.put(CategoryType.SIXTH_EOLH_GROUP, 924);
}
private static final String[] BYPASSES =
@@ -144,7 +143,7 @@ public final class OlyManager extends AbstractNpcAI implements IBypassHandler
{
htmltext = "OlyManager-subclass.html";
}
- else if (!player.isInCategory(CategoryType.AWAKEN_GROUP))
+ else if (!player.isInCategory(CategoryType.SIXTH_CLASS_GROUP))
{
htmltext = "OlyManager-awaken.html";
}
diff --git a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/admincommandhandlers/AdminEditChar.java b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/admincommandhandlers/AdminEditChar.java
index 8524f559b0..5352c38082 100644
--- a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/admincommandhandlers/AdminEditChar.java
+++ b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/admincommandhandlers/AdminEditChar.java
@@ -416,7 +416,7 @@ public class AdminEditChar implements IAdminCommandHandler
}
final String newclass = ClassListData.getInstance().getClass(player.getClassId()).getClassName();
- if (player.isInCategory(CategoryType.AWAKEN_GROUP))
+ if (player.isInCategory(CategoryType.SIXTH_CLASS_GROUP))
{
SkillTreesData.getInstance().cleanSkillUponAwakening(player);
for (L2SkillLearn skill : SkillTreesData.getInstance().getRaceSkillTree(player.getRace()))
diff --git a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/effecthandlers/AirBind.java b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/effecthandlers/AirBind.java
index e1adc4c75d..2b1aed91f3 100644
--- a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/effecthandlers/AirBind.java
+++ b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/effecthandlers/AirBind.java
@@ -114,7 +114,7 @@ public final class AirBind extends AbstractEffect
for (L2PcInstance nearbyPlayer : L2World.getInstance().getVisibleObjects(effected, L2PcInstance.class, 1200))
{
if ((nearbyPlayer.getRace() != Race.ERTHEIA) && (nearbyPlayer.getTarget() == effected) //
- && nearbyPlayer.isInCategory(CategoryType.AWAKEN_GROUP) && !nearbyPlayer.isAlterSkillActive())
+ && nearbyPlayer.isInCategory(CategoryType.SIXTH_CLASS_GROUP) && !nearbyPlayer.isAlterSkillActive())
{
final int chainSkill = _chainedAirSkills.get(nearbyPlayer.getClassId());
if (nearbyPlayer.getSkillRemainingReuseTime(chainSkill) == -1)
diff --git a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/effecthandlers/KnockBack.java b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/effecthandlers/KnockBack.java
index f6fa9dc43e..81b8f8134c 100644
--- a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/effecthandlers/KnockBack.java
+++ b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/effecthandlers/KnockBack.java
@@ -173,7 +173,7 @@ public final class KnockBack extends AbstractEffect
{
continue;
}
- if ((nearbyPlayer.getTarget() == effected) && nearbyPlayer.isInCategory(CategoryType.AWAKEN_GROUP) && !nearbyPlayer.isAlterSkillActive())
+ if ((nearbyPlayer.getTarget() == effected) && nearbyPlayer.isInCategory(CategoryType.SIXTH_CLASS_GROUP) && !nearbyPlayer.isAlterSkillActive())
{
final int chainSkill = _chainKnockSkills.get(nearbyPlayer.getClassId());
if (nearbyPlayer.getSkillRemainingReuseTime(chainSkill) == -1)
diff --git a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/instances/HarnakUndergroundRuins/HarnakUndergroundRuins.java b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/instances/HarnakUndergroundRuins/HarnakUndergroundRuins.java
index 5a74053b38..49de099a70 100644
--- a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/instances/HarnakUndergroundRuins/HarnakUndergroundRuins.java
+++ b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/instances/HarnakUndergroundRuins/HarnakUndergroundRuins.java
@@ -79,17 +79,16 @@ public final class HarnakUndergroundRuins extends AbstractInstance
private static final int DOOR_ONE = 16240100;
private static final int DOOR_TWO = 16240102;
private static final Map MOB_CATEGORY = new HashMap<>();
-
static
{
- MOB_CATEGORY.put(CategoryType.SIGEL_CANDIDATE, RAKZAN);
- MOB_CATEGORY.put(CategoryType.TYRR_CANDIDATE, KRAKIA_BATHUS);
- MOB_CATEGORY.put(CategoryType.OTHELL_CANDIDATE, BAMONTI);
- MOB_CATEGORY.put(CategoryType.YUL_CANDIDATE, KRAKIA_CARCASS);
- MOB_CATEGORY.put(CategoryType.FEOH_CANDIDATE, WEISS_KHAN);
- MOB_CATEGORY.put(CategoryType.ISS_CANDIDATE, SEKNUS);
- MOB_CATEGORY.put(CategoryType.WYNN_CANDIDATE, KRAKIA_LOTUS);
- MOB_CATEGORY.put(CategoryType.AEORE_CANDIDATE, WEISS_ELE);
+ MOB_CATEGORY.put(CategoryType.SIXTH_SIGEL_GROUP, RAKZAN);
+ MOB_CATEGORY.put(CategoryType.SIXTH_TIR_GROUP, KRAKIA_BATHUS);
+ MOB_CATEGORY.put(CategoryType.SIXTH_OTHEL_GROUP, BAMONTI);
+ MOB_CATEGORY.put(CategoryType.SIXTH_YR_GROUP, KRAKIA_CARCASS);
+ MOB_CATEGORY.put(CategoryType.SIXTH_FEOH_GROUP, WEISS_KHAN);
+ MOB_CATEGORY.put(CategoryType.SIXTH_IS_GROUP, SEKNUS);
+ MOB_CATEGORY.put(CategoryType.SIXTH_WYNN_GROUP, KRAKIA_LOTUS);
+ MOB_CATEGORY.put(CategoryType.SIXTH_EOLH_GROUP, WEISS_ELE);
}
public HarnakUndergroundRuins()
diff --git a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/instances/Nursery/Nursery.java b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/instances/Nursery/Nursery.java
index cd0364efe8..f2affd49bf 100644
--- a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/instances/Nursery/Nursery.java
+++ b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/instances/Nursery/Nursery.java
@@ -363,27 +363,27 @@ public final class Nursery extends AbstractInstance
{
int pointsCount = getRandom(6) + 3;
- if (killer.isInCategory(CategoryType.SIGEL_GROUP) || killer.isInCategory(CategoryType.AEORE_GROUP))
+ if (killer.isInCategory(CategoryType.SIXTH_SIGEL_GROUP) || killer.isInCategory(CategoryType.SIXTH_EOLH_GROUP))
{
pointsCount += 6;
}
- else if (killer.isInCategory(CategoryType.TYRR_GROUP))
+ else if (killer.isInCategory(CategoryType.SIXTH_TIR_GROUP))
{
pointsCount -= 1;
}
- else if (killer.isInCategory(CategoryType.OTHELL_GROUP))
+ else if (killer.isInCategory(CategoryType.SIXTH_OTHEL_GROUP))
{
pointsCount += 2;
}
- else if (killer.isInCategory(CategoryType.YUL_GROUP))
+ else if (killer.isInCategory(CategoryType.SIXTH_YR_GROUP))
{
pointsCount += 1;
}
- else if (killer.isInCategory(CategoryType.FEOH_GROUP) || killer.isInCategory(CategoryType.ISS_GROUP))
+ else if (killer.isInCategory(CategoryType.SIXTH_FEOH_GROUP) || killer.isInCategory(CategoryType.SIXTH_IS_GROUP))
{
pointsCount += 0;
}
- else if (killer.isInCategory(CategoryType.WYNN_GROUP))
+ else if (killer.isInCategory(CategoryType.SIXTH_WYNN_GROUP))
{
pointsCount += 3;
}
diff --git a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/quests/Q00177_SplitDestiny/Q00177_SplitDestiny.java b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/quests/Q00177_SplitDestiny/Q00177_SplitDestiny.java
index a2ed81b2e7..4b9af8b327 100644
--- a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/quests/Q00177_SplitDestiny/Q00177_SplitDestiny.java
+++ b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/quests/Q00177_SplitDestiny/Q00177_SplitDestiny.java
@@ -239,39 +239,39 @@ public final class Q00177_SplitDestiny extends Quest
{
htmltext = "33344-02.htm";
}
- else if (!CategoryData.getInstance().isInCategory(CategoryType.AWAKEN_GROUP, player.getBaseClass()))
+ else if (!CategoryData.getInstance().isInCategory(CategoryType.SIXTH_CLASS_GROUP, player.getBaseClass()))
{
htmltext = "33344-03.htm";
}
- else if (CategoryData.getInstance().isInCategory(CategoryType.SIGEL_GROUP, player.getBaseClass()) && player.isInCategory(CategoryType.SIGEL_CANDIDATE))
+ else if (CategoryData.getInstance().isInCategory(CategoryType.SIXTH_SIGEL_GROUP, player.getBaseClass()) && player.isInCategory(CategoryType.TANKER_CATEGORY))
{
htmltext = "33344-sigel.htm";
}
- else if (CategoryData.getInstance().isInCategory(CategoryType.TYRR_GROUP, player.getBaseClass()) && player.isInCategory(CategoryType.TYRR_CANDIDATE))
+ else if (CategoryData.getInstance().isInCategory(CategoryType.SIXTH_TIR_GROUP, player.getBaseClass()) && player.isInCategory(CategoryType.WARRIOR_CATEGORY))
{
htmltext = "33344-tyrr.htm";
}
- else if (CategoryData.getInstance().isInCategory(CategoryType.OTHELL_GROUP, player.getBaseClass()) && player.isInCategory(CategoryType.OTHELL_CANDIDATE))
+ else if (CategoryData.getInstance().isInCategory(CategoryType.SIXTH_OTHEL_GROUP, player.getBaseClass()) && player.isInCategory(CategoryType.ROGUE_CATEGORY))
{
htmltext = "33344-othell.htm";
}
- else if (CategoryData.getInstance().isInCategory(CategoryType.YUL_GROUP, player.getBaseClass()) && player.isInCategory(CategoryType.YUL_CANDIDATE))
+ else if (CategoryData.getInstance().isInCategory(CategoryType.SIXTH_YR_GROUP, player.getBaseClass()) && player.isInCategory(CategoryType.ARCHER_CATEGORY))
{
htmltext = "33344-yul.htm";
}
- else if (CategoryData.getInstance().isInCategory(CategoryType.FEOH_GROUP, player.getBaseClass()) && player.isInCategory(CategoryType.FEOH_CANDIDATE))
+ else if (CategoryData.getInstance().isInCategory(CategoryType.SIXTH_FEOH_GROUP, player.getBaseClass()) && player.isInCategory(CategoryType.WIZARD_CATEGORY))
{
htmltext = "33344-feoh.htm";
}
- else if (CategoryData.getInstance().isInCategory(CategoryType.ISS_GROUP, player.getBaseClass()) && player.isInCategory(CategoryType.ISS_CANDIDATE))
+ else if (CategoryData.getInstance().isInCategory(CategoryType.SIXTH_IS_GROUP, player.getBaseClass()) && player.isInCategory(CategoryType.ENCHANTER_CATEGORY))
{
htmltext = "33344-iss.htm";
}
- else if (CategoryData.getInstance().isInCategory(CategoryType.WYNN_GROUP, player.getBaseClass()) && player.isInCategory(CategoryType.WYNN_CANDIDATE))
+ else if (CategoryData.getInstance().isInCategory(CategoryType.SIXTH_WYNN_GROUP, player.getBaseClass()) && player.isInCategory(CategoryType.SUMMONER_CATEGORY))
{
htmltext = "33344-wynn.htm";
}
- else if (CategoryData.getInstance().isInCategory(CategoryType.AEORE_GROUP, player.getBaseClass()) && player.isInCategory(CategoryType.AEORE_CANDIDATE))
+ else if (CategoryData.getInstance().isInCategory(CategoryType.SIXTH_EOLH_GROUP, player.getBaseClass()) && player.isInCategory(CategoryType.HEALER_CATEGORY))
{
htmltext = "33344-aeore.htm";
}
diff --git a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/quests/Q10338_SeizeYourDestiny/Q10338_SeizeYourDestiny.java b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/quests/Q10338_SeizeYourDestiny/Q10338_SeizeYourDestiny.java
index 64aac90a45..6ac9939d16 100644
--- a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/quests/Q10338_SeizeYourDestiny/Q10338_SeizeYourDestiny.java
+++ b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/quests/Q10338_SeizeYourDestiny/Q10338_SeizeYourDestiny.java
@@ -91,7 +91,7 @@ public final class Q10338_SeizeYourDestiny extends Quest
}
case "33477-03.html":
{
- if (!player.isInCategory(CategoryType.AWAKEN_GROUP))
+ if (!player.isInCategory(CategoryType.SIXTH_CLASS_GROUP))
{
qs.setSimulated(false);
qs.setState(State.CREATED);
@@ -149,7 +149,7 @@ public final class Q10338_SeizeYourDestiny extends Quest
{
htmltext = "33477-06.html";
}
- else if (player.isInCategory(CategoryType.AWAKEN_GROUP) || hasQuestItems(player, SCROLL_OF_AFTERLIFE.getId()))
+ else if (player.isInCategory(CategoryType.SIXTH_CLASS_GROUP) || hasQuestItems(player, SCROLL_OF_AFTERLIFE.getId()))
{
htmltext = "33477-05.html";
}
@@ -167,7 +167,7 @@ public final class Q10338_SeizeYourDestiny extends Quest
}
case HADEL:
{
- if (player.isInCategory(CategoryType.AWAKEN_GROUP) || hasQuestItems(player, SCROLL_OF_AFTERLIFE.getId()))
+ if (player.isInCategory(CategoryType.SIXTH_CLASS_GROUP) || hasQuestItems(player, SCROLL_OF_AFTERLIFE.getId()))
{
htmltext = "33344-07.html";
}
diff --git a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/quests/Q10339_FightingTheForgotten/Q10339_FightingTheForgotten.java b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/quests/Q10339_FightingTheForgotten/Q10339_FightingTheForgotten.java
index 78c2aaa6fa..8f582b0287 100644
--- a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/quests/Q10339_FightingTheForgotten/Q10339_FightingTheForgotten.java
+++ b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/quests/Q10339_FightingTheForgotten/Q10339_FightingTheForgotten.java
@@ -62,7 +62,7 @@ public final class Q10339_FightingTheForgotten extends Quest
addTalkId(THEODORE, HADEL);
addKillId(MONSTERS);
addCondMinLevel(MIN_LV, "32975-06.html");
- addCondInCategory(CategoryType.AWAKEN_GROUP, "32975-06.html");
+ addCondInCategory(CategoryType.SIXTH_CLASS_GROUP, "32975-06.html");
}
@Override
diff --git a/L2J_Mobius_2.5_Underground/dist/game/data/stats/npcs/19100-19199.xml b/L2J_Mobius_2.5_Underground/dist/game/data/stats/npcs/19100-19199.xml
index 248ec8566b..555a13759c 100644
--- a/L2J_Mobius_2.5_Underground/dist/game/data/stats/npcs/19100-19199.xml
+++ b/L2J_Mobius_2.5_Underground/dist/game/data/stats/npcs/19100-19199.xml
@@ -2101,7 +2101,7 @@
-
+
diff --git a/L2J_Mobius_2.5_Underground/dist/game/data/stats/npcs/25700-25799.xml b/L2J_Mobius_2.5_Underground/dist/game/data/stats/npcs/25700-25799.xml
index 197045d620..e2bce02301 100644
--- a/L2J_Mobius_2.5_Underground/dist/game/data/stats/npcs/25700-25799.xml
+++ b/L2J_Mobius_2.5_Underground/dist/game/data/stats/npcs/25700-25799.xml
@@ -4618,7 +4618,7 @@
-
+
@@ -4935,7 +4935,7 @@
-
+
@@ -5617,7 +5617,7 @@
-
+
@@ -5681,6 +5681,7 @@
+
@@ -5773,7 +5774,6 @@
-
@@ -5883,6 +5883,7 @@
+
@@ -5975,7 +5976,6 @@
-
diff --git a/L2J_Mobius_2.5_Underground/dist/game/data/stats/npcs/25800-25899.xml b/L2J_Mobius_2.5_Underground/dist/game/data/stats/npcs/25800-25899.xml
index 6cb21cb35f..da71676e0d 100644
--- a/L2J_Mobius_2.5_Underground/dist/game/data/stats/npcs/25800-25899.xml
+++ b/L2J_Mobius_2.5_Underground/dist/game/data/stats/npcs/25800-25899.xml
@@ -57,7 +57,7 @@
-
+
@@ -109,7 +109,7 @@
-
+
@@ -1027,7 +1027,7 @@
-
+
@@ -1087,6 +1087,7 @@
+
@@ -1616,6 +1617,7 @@
+
@@ -1697,6 +1699,7 @@
+
@@ -1770,6 +1773,7 @@
+
@@ -1846,6 +1850,7 @@
+
@@ -1923,6 +1928,7 @@
+
@@ -2005,7 +2011,7 @@
-
+
@@ -2046,7 +2052,7 @@
-
+
@@ -2100,7 +2106,7 @@
-
+
@@ -2155,6 +2161,7 @@
+
@@ -2239,6 +2246,7 @@
+
@@ -2310,7 +2318,7 @@
-
+
@@ -2366,7 +2374,7 @@
-
+
@@ -2956,7 +2964,7 @@
-
+
@@ -3012,7 +3020,7 @@
-
+
@@ -3065,7 +3073,7 @@
-
+
@@ -3394,7 +3402,7 @@
-
+
@@ -3450,7 +3458,7 @@
-
+
@@ -3637,7 +3645,7 @@
-
+
@@ -4708,7 +4716,7 @@
-
+
diff --git a/L2J_Mobius_2.5_Underground/dist/game/data/stats/npcs/29000-29099.xml b/L2J_Mobius_2.5_Underground/dist/game/data/stats/npcs/29000-29099.xml
index 5229b189e8..860de3fa21 100644
--- a/L2J_Mobius_2.5_Underground/dist/game/data/stats/npcs/29000-29099.xml
+++ b/L2J_Mobius_2.5_Underground/dist/game/data/stats/npcs/29000-29099.xml
@@ -1397,7 +1397,7 @@
-
+
@@ -3489,7 +3489,7 @@
-
+
diff --git a/L2J_Mobius_2.5_Underground/dist/game/data/stats/npcs/29100-29199.xml b/L2J_Mobius_2.5_Underground/dist/game/data/stats/npcs/29100-29199.xml
index 8e0c39a6e3..051f6d5eea 100644
--- a/L2J_Mobius_2.5_Underground/dist/game/data/stats/npcs/29100-29199.xml
+++ b/L2J_Mobius_2.5_Underground/dist/game/data/stats/npcs/29100-29199.xml
@@ -3420,7 +3420,7 @@
-
+
@@ -3949,7 +3949,7 @@
-
+
@@ -3988,7 +3988,7 @@
-
+
@@ -4028,7 +4028,7 @@
-
+
@@ -4070,7 +4070,7 @@
-
+
@@ -4211,7 +4211,7 @@
-
+
@@ -4369,7 +4369,7 @@
-
+
@@ -4524,7 +4524,7 @@
-
+
@@ -4672,7 +4672,7 @@
-
+
@@ -4718,7 +4718,7 @@
-
+
diff --git a/L2J_Mobius_2.5_Underground/dist/game/data/stats/npcs/29200-29299.xml b/L2J_Mobius_2.5_Underground/dist/game/data/stats/npcs/29200-29299.xml
index b2684ee46f..c9d00c656b 100644
--- a/L2J_Mobius_2.5_Underground/dist/game/data/stats/npcs/29200-29299.xml
+++ b/L2J_Mobius_2.5_Underground/dist/game/data/stats/npcs/29200-29299.xml
@@ -25,7 +25,7 @@
-
+
@@ -71,7 +71,7 @@
-
+
@@ -116,7 +116,7 @@
-
+
@@ -160,7 +160,7 @@
-
+
@@ -204,7 +204,7 @@
-
+
@@ -249,7 +249,7 @@
-
+
@@ -293,7 +293,7 @@
-
+
@@ -334,7 +334,7 @@
-
+
@@ -375,7 +375,7 @@
-
+
@@ -416,7 +416,7 @@
-
+
@@ -457,7 +457,7 @@
-
+
@@ -497,7 +497,7 @@
-
+
@@ -540,7 +540,7 @@
-
+
@@ -693,7 +693,7 @@
-
+
@@ -964,7 +964,7 @@
-
+
@@ -1116,7 +1116,7 @@
-
+
@@ -1157,7 +1157,7 @@
-
+
@@ -1197,7 +1197,7 @@
-
+
@@ -1248,7 +1248,7 @@
-
+
@@ -1472,7 +1472,7 @@
-
+
@@ -1595,7 +1595,7 @@
-
+
@@ -1678,7 +1678,7 @@
-
+
@@ -1726,7 +1726,7 @@
-
+
@@ -1774,7 +1774,7 @@
-
+
@@ -1814,7 +1814,7 @@
-
+
@@ -1922,7 +1922,7 @@
-
+
@@ -2030,7 +2030,7 @@
-
+
@@ -2069,7 +2069,7 @@
-
+
diff --git a/L2J_Mobius_2.5_Underground/dist/game/data/xsd/npcs.xsd b/L2J_Mobius_2.5_Underground/dist/game/data/xsd/npcs.xsd
index 4555d46531..6f00944cff 100644
--- a/L2J_Mobius_2.5_Underground/dist/game/data/xsd/npcs.xsd
+++ b/L2J_Mobius_2.5_Underground/dist/game/data/xsd/npcs.xsd
@@ -200,6 +200,7 @@
+
diff --git a/L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/data/xml/impl/SkillTreesData.java b/L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/data/xml/impl/SkillTreesData.java
index 5d2bd7a033..4b35d8bca8 100644
--- a/L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/data/xml/impl/SkillTreesData.java
+++ b/L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/data/xml/impl/SkillTreesData.java
@@ -689,7 +689,7 @@ public final class SkillTreesData implements IGameXmlReader
return result;
}
- final boolean isAwaken = player.isInCategory(CategoryType.AWAKEN_GROUP) && ((player.getRace() != Race.ERTHEIA) || player.isDualClassActive());
+ final boolean isAwaken = player.isInCategory(CategoryType.SIXTH_CLASS_GROUP) && ((player.getRace() != Race.ERTHEIA) || player.isDualClassActive());
for (Entry entry : skills.entrySet())
{
@@ -803,7 +803,7 @@ public final class SkillTreesData implements IGameXmlReader
}
final Race race = player.getRace();
- final boolean isAwaken = player.isInCategory(CategoryType.AWAKEN_GROUP);
+ final boolean isAwaken = player.isInCategory(CategoryType.SIXTH_CLASS_GROUP);
// Race skills
if (isAwaken)
diff --git a/L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/enums/CategoryType.java b/L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/enums/CategoryType.java
index c2e14659cd..3619287373 100644
--- a/L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/enums/CategoryType.java
+++ b/L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/enums/CategoryType.java
@@ -32,6 +32,17 @@ public enum CategoryType
SECOND_CLASS_GROUP,
THIRD_CLASS_GROUP,
FOURTH_CLASS_GROUP,
+ EQUIP_ENABLE_R,
+ FIFTH_CLASS_GROUP,
+ SIXTH_CLASS_GROUP,
+ SIXTH_SIGEL_GROUP,
+ SIXTH_TIR_GROUP,
+ SIXTH_OTHEL_GROUP,
+ SIXTH_YR_GROUP,
+ SIXTH_FEOH_GROUP,
+ SIXTH_IS_GROUP,
+ SIXTH_WYNN_GROUP,
+ SIXTH_EOLH_GROUP,
BOUNTY_HUNTER_GROUP,
WARSMITH_GROUP,
SUMMON_NPC_GROUP,
@@ -142,30 +153,158 @@ public enum CategoryType
RECOM_KAMAEL_GROUP,
RECOM_ORCF_GROUP,
RECOM_ORCM_GROUP,
+ RECOM_ERTHEIAF_GROUP,
+ RECOM_ERTHEIAM_GROUP,
DEINONYCHUS_PET_GROUP,
BEASTFARM_BEAST,
BEASTFARM_INVADER,
ICEQUEEN_NPC,
- AWAKEN_GROUP,
- SHILENS_FOLLOWERS,
- SIGEL_CANDIDATE,
- TYRR_CANDIDATE,
- OTHELL_CANDIDATE,
- YUL_CANDIDATE,
- FEOH_CANDIDATE,
- ISS_CANDIDATE,
- WYNN_CANDIDATE,
- AEORE_CANDIDATE,
- EVISCERATOR_CANDIDATE,
- SAYHA_SEER_CANDIDATE,
- SIGEL_GROUP,
- TYRR_GROUP,
- OTHELL_GROUP,
- YUL_GROUP,
- FEOH_GROUP,
- ISS_GROUP,
- WYNN_GROUP,
- AEORE_GROUP;
+ FAIRY_PC_SIDE,
+ FAIRY_WISP,
+ FAIRY_GLIMMER,
+ TANKER_CATEGORY,
+ WARRIOR_CATEGORY,
+ ROGUE_CATEGORY,
+ ARCHER_CATEGORY,
+ WIZARD_CATEGORY,
+ SUMMONER_CATEGORY,
+ HEALER_CATEGORY,
+ ENCHANTER_CATEGORY,
+ RUMBLE_MONSTERS,
+ RUMBLE_GUARDIANS,
+ TWO_POINT_MULTI_SUMMON,
+ APM_ZERO_WARRIOR_GROUP,
+ APM_ZERO_MAGE_GROUP,
+ APM_1ST_KNIGHT_GROUP,
+ APM_1ST_WARRIOR_GROUP,
+ APM_1ST_WIZARD_GROUP,
+ APM_1ST_HEALER_GROUP,
+ APM_2ND_KNIGHT_GROUP,
+ APM_2ND_WARRIOR_GROUP,
+ APM_2ND_ROGUE_GROUP,
+ APM_2ND_WIZARD_GROUP,
+ APM_2ND_ARCHER_GROUP,
+ APM_2ND_BUFFER_GROUP,
+ APM_2ND_SUMMONER_GROUP,
+ APM_2ND_ONLY_GROUP,
+ APM_3RD_KNIGHT_GROUP,
+ APM_3RD_WARRIOR_GROUP,
+ APM_3RD_ROGUE_GROUP,
+ APM_3RD_WIZARD_GROUP,
+ APM_3RD_ARCHER_GROUP,
+ APM_3RD_BUFFER_GROUP,
+ APM_3RD_SUMMONER_GROUP,
+ APM_3RD_ONLY_GROUP,
+ SUBCLASS_TANKER,
+ SUBCLASS_WARRIOR,
+ SUBCLASS_ROUGE,
+ SUBCLASS_ARCHER,
+ SUBCLASS_WIZARD,
+ SUBCLASS_SUMMON,
+ SUBCLASS_HEAL,
+ SUBCLASS_ENCHANTER,
+ SUBCLASS_SPEACIAL,
+ SUBCLASS_KAMAEL,
+ EXCEPT_KAMAEL_GROUP,
+ R_HUMANMAGE_GROUP,
+ R_HUMANFIGHTER_GROUP,
+ DIVISION_TANKER,
+ DIVISION_WARRIOR,
+ DIVISION_ROUGE,
+ DIVISION_ARCHER,
+ DIVISION_WIZARD,
+ DIVISION_SUMMON,
+ DIVISION_ENCHANTER,
+ DIVISION_HEAL,
+ HUMAN_FOURTH_CLASS_GROUP,
+ ELF_FOURTH_CLASS_GROUP,
+ DARKELF_FOURTH_CLASS_GROUP,
+ ORC_FOURTH_CLASS_GROUP,
+ DWARF_FOURTH_CLASS_GROUP,
+ FOURTH_LANCE_CLASS_GROUP,
+ FOURTH_BOW_CLASS_GROUP,
+ EQUIP_ENABLE_HEAVY_ATTACK,
+ EQUIP_ENABLE_HEAVY_DEFENSE,
+ EQUIP_ENABLE_LIGHT_HIT,
+ EQUIP_ENABLE_LIGHT_ENCHANT,
+ EQUIP_ENABLE_ROBE_MAGIC,
+ EQUIP_ENABLE_ROBE_RECOVERY,
+ DILLER_GROUP,
+ MAESTRO_GROUP,
+ MAESTRO_GROUP_CRAFT,
+ SUB_GROUP_WARRIOR2,
+ SUB_GROUP_ROGUE2,
+ SUB_GROUP_KNIGHT2,
+ SUB_GROUP_SUMMONER2,
+ SUB_GROUP_WIZARD2,
+ SUB_GROUP_HEALER2,
+ SUB_GROUP_ENCHANTER2,
+ G_CARTIA_PC_GROUP,
+ G_CARTIA_NPC_GROUP,
+ HEAVY_GROUP,
+ LIGHT_GROUP,
+ ROBE_GROUP,
+ M_WARRIOR_GROUP,
+ PHYSICS_CLASS_GROUP,
+ HEATSAND_SUMMON_CLASS_GROUP,
+ MAGIC_CLASS_GROUP,
+ LONG_DISTANCE_CLASS_GROUP,
+ CLOSE_DISTANCE_CLASS_GROUP,
+ HS_WIZARD_CLASS_GROUP,
+ HS_WARRIOR_CLASS_GROUP,
+ SUBCLASS_PALADIN,
+ SUBCLASS_DARKAVENGER,
+ SUBCLASS_TEMPLEKNIGHT,
+ SUBCLASS_SHILLIENKNIGHT,
+ SUBCLASS_GLADIATOR,
+ SUBCLASS_WARLORD,
+ SUBCLASS_DESTROYER,
+ SUBCLASS_TYRAN,
+ SUBCLASS_BERSERKER,
+ SUBCLASS_TREASUREHUNTER,
+ SUBCLASS_PLAINSWALKER,
+ SUBCLASS_ABYSSWALKER,
+ SUBCLASS_BOUNTYHUNTER,
+ SUBCLASS_HAWKEYE,
+ SUBCLASS_SILVERRANGER,
+ SUBCLASS_PHANTOMRANGER,
+ SUBCLASS_ARBALESTER,
+ SUBCLASS_SORCERER,
+ SUBCLASS_NECROMANCER,
+ SUBCLASS_SPELLSINGER,
+ SUBCLASS_SPELLHOWLER,
+ SUBCLASS_SOULBREAKER,
+ SUBCLASS_WARLOCK,
+ SUBCLASS_ELEMENTALSUMMONER,
+ SUBCLASS_PHANTOMSUMMONER,
+ SUBCLASS_BISHOP,
+ SUBCLASS_ELDER,
+ SUBCLASS_SHILLIENELDER,
+ SUBCLASS_PROPHET,
+ SUBCLASS_SWORDSINGER,
+ SUBCLASS_BLADEDANCER,
+ SUBCLASS_WARCRYER,
+ SUBCLASS_INSPECTOR,
+ WINDREFINE_ERTHEIA_GROUP,
+ WINDREFINE_ERTHEIA_GROUP1,
+ WINDREFINE_ERTHEIA_GROUP2,
+ ERTHEIA_ALL_CLASS,
+ ERTHEIA_FIRST_CLASS_GROUP,
+ ERTHEIA_SECOND_CLASS_GROUP,
+ ERTHEIA_THIRD_CLASS_GROUP,
+ ERTHEIA_FOURTH_CLASS_GROUP,
+ ERTHEIA_WIZARD_GROUP,
+ ERTHEIA_FIGHTER_GROUP,
+ ERTHEIA_THIRD_WIZARD_GROUP,
+ ERTHEIA_THIRD_FIGHTER_GROUP,
+ VANGUARD_OF_ADEN_FCC,
+ COMMON_MONSTER_FCC,
+ EQEIP_ENABLE_LHAND,
+ G_EV_MON_MINIGAME,
+ HEAVY_ARMOR_CLASS,
+ LIGHT_ARMOR_CLASS,
+ ROBE_CLASS,
+ EXCEPT_ERTHEIA_CLASS;
/**
* Finds category by it's name
diff --git a/L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/instancemanager/CeremonyOfChaosManager.java b/L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/instancemanager/CeremonyOfChaosManager.java
index 536650197b..7133977526 100644
--- a/L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/instancemanager/CeremonyOfChaosManager.java
+++ b/L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/instancemanager/CeremonyOfChaosManager.java
@@ -288,7 +288,7 @@ public class CeremonyOfChaosManager extends AbstractEventManager HERO_IDS = CategoryData.getInstance().getCategoryByType(CategoryType.AWAKEN_GROUP);
+ private static final Set HERO_IDS = CategoryData.getInstance().getCategoryByType(CategoryType.SIXTH_CLASS_GROUP);
private static final int COMP_START = Config.ALT_OLY_START_TIME; // 6PM
private static final int COMP_MIN = Config.ALT_OLY_MIN; // 00 mins
diff --git a/L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/model/zone/type/L2SayuneZone.java b/L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/model/zone/type/L2SayuneZone.java
index 0872062a68..ca1ec6ed1a 100644
--- a/L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/model/zone/type/L2SayuneZone.java
+++ b/L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/model/zone/type/L2SayuneZone.java
@@ -56,7 +56,7 @@ public class L2SayuneZone extends L2ZoneType
@Override
protected void onEnter(L2Character character)
{
- if (character.isPlayer() && (character.isInCategory(CategoryType.AWAKEN_GROUP) || Config.FREE_JUMPS_FOR_ALL) && !character.getActingPlayer().isMounted() && !character.isTransformed())
+ if (character.isPlayer() && (character.isInCategory(CategoryType.SIXTH_CLASS_GROUP) || Config.FREE_JUMPS_FOR_ALL) && !character.getActingPlayer().isMounted() && !character.isTransformed())
{
character.setInsideZone(ZoneId.SAYUNE, true);
ThreadPoolManager.execute(new FlyMoveStartTask(this, character.getActingPlayer()));
diff --git a/L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/network/clientpackets/RequestAcquireSkill.java b/L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/network/clientpackets/RequestAcquireSkill.java
index 5533d14129..9d97309efc 100644
--- a/L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/network/clientpackets/RequestAcquireSkill.java
+++ b/L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/network/clientpackets/RequestAcquireSkill.java
@@ -417,7 +417,7 @@ public final class RequestAcquireSkill implements IClientIncomingPacket
Util.handleIllegalPlayerAction(activeChar, "Player " + activeChar.getName() + " is requesting skill Id: " + _id + " level " + _level + " while Sub-Class is active!", IllegalActionPunishmentType.NONE);
return;
}
- if ((activeChar.getLevel() < 85) || !activeChar.isInCategory(CategoryType.AWAKEN_GROUP))
+ if ((activeChar.getLevel() < 85) || !activeChar.isInCategory(CategoryType.SIXTH_CLASS_GROUP))
{
activeChar.sendPacket(SystemMessageId.YOU_DO_NOT_HAVE_THE_NECESSARY_MATERIALS_OR_PREREQUISITES_TO_LEARN_THIS_SKILL);
Util.handleIllegalPlayerAction(activeChar, "Player " + activeChar.getName() + " is requesting skill Id: " + _id + " level " + _level + " while not being level 85 or awaken!", IllegalActionPunishmentType.NONE);
@@ -460,7 +460,7 @@ public final class RequestAcquireSkill implements IClientIncomingPacket
return;
}
- if ((activeChar.getLevel() < 85) || !activeChar.isInCategory(CategoryType.AWAKEN_GROUP))
+ if ((activeChar.getLevel() < 85) || !activeChar.isInCategory(CategoryType.SIXTH_CLASS_GROUP))
{
activeChar.sendPacket(SystemMessageId.YOU_DO_NOT_HAVE_THE_NECESSARY_MATERIALS_OR_PREREQUISITES_TO_LEARN_THIS_SKILL);
Util.handleIllegalPlayerAction(activeChar, "Player " + activeChar.getName() + " is requesting skill Id: " + _id + " level " + _level + " while not being level 85 or awaken!", IllegalActionPunishmentType.NONE);
diff --git a/L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/network/clientpackets/RequestAcquireSkillInfo.java b/L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/network/clientpackets/RequestAcquireSkillInfo.java
index 642b423b4b..6ceb8bc736 100644
--- a/L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/network/clientpackets/RequestAcquireSkillInfo.java
+++ b/L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/network/clientpackets/RequestAcquireSkillInfo.java
@@ -150,7 +150,7 @@ public final class RequestAcquireSkillInfo implements IClientIncomingPacket
}
case REVELATION:
{
- if ((activeChar.getLevel() < 85) || !activeChar.isInCategory(CategoryType.AWAKEN_GROUP))
+ if ((activeChar.getLevel() < 85) || !activeChar.isInCategory(CategoryType.SIXTH_CLASS_GROUP))
{
return;
}
diff --git a/L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/network/clientpackets/RequestExEnchantSkill.java b/L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/network/clientpackets/RequestExEnchantSkill.java
index 69d688bf34..c6547395b2 100644
--- a/L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/network/clientpackets/RequestExEnchantSkill.java
+++ b/L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/network/clientpackets/RequestExEnchantSkill.java
@@ -82,7 +82,7 @@ public final class RequestExEnchantSkill implements IClientIncomingPacket
return;
}
- if (!player.isInCategory(CategoryType.AWAKEN_GROUP))
+ if (!player.isInCategory(CategoryType.SIXTH_CLASS_GROUP))
{
return;
}
diff --git a/L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/network/clientpackets/RequestExEnchantSkillInfo.java b/L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/network/clientpackets/RequestExEnchantSkillInfo.java
index 596bc37bae..6c175300cf 100644
--- a/L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/network/clientpackets/RequestExEnchantSkillInfo.java
+++ b/L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/network/clientpackets/RequestExEnchantSkillInfo.java
@@ -61,7 +61,7 @@ public final class RequestExEnchantSkillInfo implements IClientIncomingPacket
return;
}
- if (!activeChar.isInCategory(CategoryType.AWAKEN_GROUP))
+ if (!activeChar.isInCategory(CategoryType.SIXTH_CLASS_GROUP))
{
return;
}
diff --git a/L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/network/clientpackets/mentoring/ConfirmMenteeAdd.java b/L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/network/clientpackets/mentoring/ConfirmMenteeAdd.java
index ec5e7516a8..0c907de10f 100644
--- a/L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/network/clientpackets/mentoring/ConfirmMenteeAdd.java
+++ b/L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/network/clientpackets/mentoring/ConfirmMenteeAdd.java
@@ -115,7 +115,7 @@ public class ConfirmMenteeAdd implements IClientIncomingPacket
mentor.sendPacket(SystemMessageId.THAT_PLAYER_IS_NOT_ONLINE);
return false;
}
- else if (!mentor.isInCategory(CategoryType.AWAKEN_GROUP))
+ else if (!mentor.isInCategory(CategoryType.SIXTH_CLASS_GROUP))
{
mentor.sendPacket(SystemMessageId.YOU_MUST_AWAKEN_IN_ORDER_TO_BECOME_A_MENTOR);
return false;
diff --git a/L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/network/clientpackets/sayune/RequestFlyMoveStart.java b/L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/network/clientpackets/sayune/RequestFlyMoveStart.java
index 4ddb30ba78..50b48de960 100644
--- a/L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/network/clientpackets/sayune/RequestFlyMoveStart.java
+++ b/L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/network/clientpackets/sayune/RequestFlyMoveStart.java
@@ -44,7 +44,7 @@ public class RequestFlyMoveStart implements IClientIncomingPacket
public void run(L2GameClient client)
{
final L2PcInstance activeChar = client.getActiveChar();
- if ((activeChar == null) || !activeChar.isInsideZone(ZoneId.SAYUNE) || activeChar.hasRequest(SayuneRequest.class) || !activeChar.isInCategory(CategoryType.AWAKEN_GROUP))
+ if ((activeChar == null) || !activeChar.isInsideZone(ZoneId.SAYUNE) || activeChar.hasRequest(SayuneRequest.class) || !activeChar.isInCategory(CategoryType.SIXTH_CLASS_GROUP))
{
return;
}
diff --git a/L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/network/serverpackets/mentoring/ExMentorList.java b/L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/network/serverpackets/mentoring/ExMentorList.java
index 81e7216e87..bfd2044055 100644
--- a/L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/network/serverpackets/mentoring/ExMentorList.java
+++ b/L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/network/serverpackets/mentoring/ExMentorList.java
@@ -48,7 +48,7 @@ public class ExMentorList implements IClientOutgoingPacket
_type = 0x02;
_mentees = Arrays.asList(MentorManager.getInstance().getMentor(activeChar.getObjectId()));
}
- else if (activeChar.isInCategory(CategoryType.AWAKEN_GROUP)) // Not a mentor, Not a mentee, so can be a mentor
+ else if (activeChar.isInCategory(CategoryType.SIXTH_CLASS_GROUP)) // Not a mentor, Not a mentee, so can be a mentor
{
_mentees = Collections.emptyList();
_type = 0x01;
diff --git a/L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/network/serverpackets/mentoring/ListMenteeWaiting.java b/L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/network/serverpackets/mentoring/ListMenteeWaiting.java
index 97226c02a6..3bd29141b5 100644
--- a/L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/network/serverpackets/mentoring/ListMenteeWaiting.java
+++ b/L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/network/serverpackets/mentoring/ListMenteeWaiting.java
@@ -40,7 +40,7 @@ public class ListMenteeWaiting implements IClientOutgoingPacket
_page = page;
for (L2PcInstance player : L2World.getInstance().getPlayers())
{
- if ((player.getLevel() >= minLevel) && (player.getLevel() <= maxLevel) && !player.isMentee() && !player.isMentor() && !player.isInCategory(CategoryType.AWAKEN_GROUP))
+ if ((player.getLevel() >= minLevel) && (player.getLevel() <= maxLevel) && !player.isMentee() && !player.isMentor() && !player.isInCategory(CategoryType.SIXTH_CLASS_GROUP))
{
_possibleCandiates.add(player);
}
diff --git a/L2J_Mobius_3.0_Helios/dist/game/config/ClassMaster.xml b/L2J_Mobius_3.0_Helios/dist/game/config/ClassMaster.xml
index 64fd4dc65d..e3efd06e2e 100644
--- a/L2J_Mobius_3.0_Helios/dist/game/config/ClassMaster.xml
+++ b/L2J_Mobius_3.0_Helios/dist/game/config/ClassMaster.xml
@@ -17,7 +17,7 @@
- SIGEL_CANDIDATE
+ TANKER_CATEGORY
@@ -26,7 +26,7 @@
- TYRR_CANDIDATE
+ WARRIOR_CATEGORY
@@ -35,7 +35,7 @@
- OTHELL_CANDIDATE
+ ROGUE_CATEGORY
@@ -44,7 +44,7 @@
- YUL_CANDIDATE
+ ARCHER_CATEGORY
@@ -53,7 +53,7 @@
- FEOH_CANDIDATE
+ WIZARD_CATEGORY
@@ -62,7 +62,7 @@
- WYNN_CANDIDATE
+ SUMMONER_CATEGORY
@@ -71,7 +71,7 @@
- ISS_CANDIDATE
+ ENCHANTER_CATEGORY
@@ -80,7 +80,7 @@
- AEORE_CANDIDATE
+ HEALER_CATEGORY
@@ -89,7 +89,7 @@
- EVISCERATOR_CANDIDATE
+ ERTHEIA_THIRD_FIGHTER_GROUP
@@ -98,7 +98,7 @@
- SAYHA_SEER_CANDIDATE
+ ERTHEIA_THIRD_WIZARD_GROUP
diff --git a/L2J_Mobius_3.0_Helios/dist/game/data/CategoryData.xml b/L2J_Mobius_3.0_Helios/dist/game/data/CategoryData.xml
index b4958b1379..a92e1c68c7 100644
--- a/L2J_Mobius_3.0_Helios/dist/game/data/CategoryData.xml
+++ b/L2J_Mobius_3.0_Helios/dist/game/data/CategoryData.xml
@@ -1,72 +1,77 @@
- 0
- 1
- 2
- 3
- 4
- 5
- 6
- 7
- 8
- 9
- 18
- 19
- 20
- 21
- 22
- 23
- 24
- 31
- 32
- 33
- 34
- 35
- 36
- 37
- 44
- 45
- 46
- 47
- 48
- 53
- 54
- 55
- 56
- 57
- 88
- 89
- 90
- 91
- 92
- 93
- 99
- 100
- 101
- 102
- 106
- 107
- 108
- 109
- 113
- 114
- 117
- 118
- 123
- 124
- 125
- 126
- 127
- 128
- 129
- 130
- 131
- 132
- 133
- 134
- 135
- 136
+ 0
+ 1
+ 2
+ 3
+ 4
+ 5
+ 6
+ 7
+ 8
+ 9
+ 18
+ 19
+ 20
+ 21
+ 22
+ 23
+ 24
+ 31
+ 32
+ 33
+ 34
+ 35
+ 36
+ 37
+ 44
+ 45
+ 46
+ 47
+ 48
+ 53
+ 54
+ 55
+ 56
+ 57
+ 88
+ 89
+ 90
+ 91
+ 92
+ 93
+ 99
+ 100
+ 101
+ 102
+ 106
+ 107
+ 108
+ 109
+ 113
+ 114
+ 117
+ 118
+ 123
+ 124
+ 125
+ 126
+ 127
+ 128
+ 129
+ 130
+ 131
+ 132
+ 133
+ 134
+ 135
+ 136
+ 139
+ 140
+ 141
+ 142
+ 144
148
149
150
@@ -85,49 +90,465 @@
163
164
165
+ 171
+ 172
+ 173
+ 174
+ 175
182
184
186
188
- 10
- 11
- 12
- 13
- 14
- 15
- 16
- 17
- 25
- 26
- 27
- 28
- 29
- 30
- 38
- 39
- 40
- 41
- 42
- 43
- 49
- 50
- 51
- 52
- 94
- 95
- 96
- 97
- 98
- 103
- 104
- 105
- 110
- 111
- 112
- 115
- 116
+ 10
+ 11
+ 12
+ 13
+ 14
+ 15
+ 16
+ 17
+ 25
+ 26
+ 27
+ 28
+ 29
+ 30
+ 38
+ 39
+ 40
+ 41
+ 42
+ 43
+ 49
+ 50
+ 51
+ 52
+ 94
+ 95
+ 96
+ 97
+ 98
+ 103
+ 104
+ 105
+ 110
+ 111
+ 112
+ 115
+ 116
+ 143
+ 145
+ 146
+ 166
+ 167
+ 168
+ 169
+ 170
+ 176
+ 177
+ 178
+ 179
+ 180
+ 181
+ 183
+ 185
+ 187
+ 189
+
+
+ 10
+ 11
+ 12
+ 13
+ 14
+ 25
+ 26
+ 27
+ 28
+ 38
+ 39
+ 40
+ 41
+ 94
+ 95
+ 96
+ 103
+ 104
+ 110
+ 111
+ 49
+ 50
+ 51
+ 52
+ 115
+ 116
+ 143
+ 145
+ 166
+ 167
+ 168
+ 169
+ 170
+ 176
+ 177
+ 178
+ 183
+ 185
+ 187
+ 189
+
+
+ 10
+ 15
+ 16
+ 17
+ 25
+ 29
+ 30
+ 38
+ 42
+ 43
+ 97
+ 98
+ 105
+ 146
+ 179
+ 180
+ 181
+
+
+ 0
+ 1
+ 2
+ 3
+ 7
+ 8
+ 9
+ 18
+ 22
+ 23
+ 24
+ 31
+ 35
+ 36
+ 37
+ 44
+ 45
+ 46
+ 47
+ 48
+ 53
+ 88
+ 89
+ 93
+ 92
+ 102
+ 101
+ 108
+ 109
+ 113
+ 114
+ 123
+ 124
+ 125
+ 126
+ 127
+ 128
+ 129
+ 130
+ 135
+ 131
+ 132
+ 133
+ 134
+ 136
+ 140
+ 141
+ 142
+ 144
+ 152
+ 153
+ 154
+ 155
+ 156
+ 157
+ 158
+ 159
+ 160
+ 161
+ 162
+ 163
+ 164
+ 165
+ 171
+ 172
+ 173
+ 174
+ 175
+ 182
+ 184
+ 186
+ 188
+
+
+ 4
+ 5
+ 6
+ 90
+ 91
+ 19
+ 20
+ 99
+ 32
+ 33
+ 106
+ 54
+ 56
+ 55
+ 57
+ 117
+ 118
+ 139
+ 148
+ 149
+ 150
+ 151
+
+
+ 0
+ 10
+ 18
+ 25
+ 31
+ 38
+ 44
+ 49
+ 53
+ 123
+ 124
+ 182
+ 183
+
+
+ 1
+ 4
+ 7
+ 11
+ 15
+ 19
+ 22
+ 26
+ 29
+ 32
+ 35
+ 39
+ 42
+ 45
+ 47
+ 50
+ 54
+ 56
+ 125
+ 126
+
+
+ 2
+ 3
+ 5
+ 6
+ 8
+ 9
+ 12
+ 13
+ 14
+ 16
+ 17
+ 20
+ 21
+ 23
+ 24
+ 27
+ 28
+ 30
+ 33
+ 34
+ 36
+ 37
+ 40
+ 41
+ 43
+ 46
+ 48
+ 51
+ 52
+ 55
+ 57
+ 127
+ 128
+ 129
+ 130
+ 135
+ 184
+ 185
+
+
+ 88
+ 89
+ 90
+ 91
+ 92
+ 93
+ 94
+ 95
+ 96
+ 97
+ 98
+ 99
+ 100
+ 101
+ 102
+ 103
+ 104
+ 105
+ 106
+ 107
+ 108
+ 109
+ 110
+ 111
+ 112
+ 113
+ 114
+ 115
+ 116
+ 117
+ 118
+ 131
+ 132
+ 133
+ 134
+ 136
+ 186
+ 187
+
+
+ 0
+ 10
+ 18
+ 25
+ 31
+ 38
+ 44
+ 49
+ 53
+ 1
+ 4
+ 7
+ 11
+ 15
+ 19
+ 22
+ 26
+ 29
+ 32
+ 35
+ 39
+ 42
+ 45
+ 47
+ 50
+ 54
+ 56
+ 2
+ 3
+ 5
+ 6
+ 8
+ 9
+ 12
+ 13
+ 14
+ 16
+ 17
+ 20
+ 21
+ 23
+ 24
+ 27
+ 28
+ 30
+ 33
+ 34
+ 36
+ 37
+ 40
+ 41
+ 43
+ 46
+ 48
+ 51
+ 52
+ 55
+ 57
+ 88
+ 89
+ 90
+ 91
+ 92
+ 93
+ 94
+ 95
+ 96
+ 97
+ 98
+ 99
+ 100
+ 101
+ 102
+ 103
+ 104
+ 105
+ 106
+ 107
+ 108
+ 109
+ 110
+ 111
+ 112
+ 113
+ 114
+ 115
+ 116
+ 117
+ 118
+ 139
+ 140
+ 141
+ 142
+ 143
+ 144
+ 145
+ 146
+ 148
+ 149
+ 150
+ 151
+ 152
+ 153
+ 154
+ 155
+ 156
+ 157
+ 158
+ 159
+ 160
+ 161
+ 162
+ 163
+ 164
+ 165
166
167
168
@@ -144,2396 +565,26 @@
179
180
181
+ 182
+ 184
+ 186
+ 188
183
185
- 187
+ 187
189
-
- 10
- 11
- 12
- 13
- 14
- 25
- 26
- 27
- 28
- 38
- 39
- 40
- 41
- 94
- 95
- 96
- 103
- 104
- 110
- 111
- 49
- 50
- 51
- 52
- 115
- 116
- 166
- 167
- 168
- 169
- 170
- 176
- 177
- 178
- 183
-
-
- 10
- 15
- 16
- 17
- 25
- 29
- 30
- 38
- 42
- 43
- 97
- 98
- 105
- 179
- 180
- 181
-
-
- 0
- 1
- 2
- 3
- 7
- 8
- 9
- 18
- 22
- 23
- 24
- 31
- 35
- 36
- 37
- 44
- 45
- 46
- 47
- 48
- 53
- 88
- 89
- 93
- 92
- 102
- 101
- 108
- 109
- 113
- 114
- 123
- 124
- 125
- 126
- 127
- 128
- 129
- 130
- 135
- 131
- 132
- 133
- 134
- 136
- 152
- 153
- 154
- 155
- 156
- 157
- 158
- 159
- 160
- 161
- 162
- 163
- 164
- 165
-
-
- 4
- 5
- 6
- 90
- 91
- 19
- 20
- 99
- 32
- 33
- 106
- 54
- 56
- 55
- 57
- 117
- 118
- 148
- 149
- 150
- 151
-
-
- 0
- 10
- 18
- 25
- 31
- 38
- 44
- 49
- 53
- 123
- 124
- 182
- 183
-
-
- 1
- 4
- 7
- 11
- 15
- 19
- 22
- 26
- 29
- 32
- 35
- 39
- 42
- 45
- 47
- 50
- 54
- 56
- 125
- 126
-
-
- 2
- 3
- 5
- 6
- 8
- 9
- 12
- 13
- 14
- 16
- 17
- 20
- 21
- 23
- 24
- 27
- 28
- 30
- 33
- 34
- 36
- 37
- 40
- 41
- 43
- 46
- 48
- 51
- 52
- 55
- 57
- 127
- 128
- 129
- 130
- 135
- 184
- 185
-
-
- 88
- 89
- 90
- 91
- 92
- 93
- 94
- 95
- 96
- 97
- 98
- 99
- 100
- 101
- 102
- 103
- 104
- 105
- 106
- 107
- 108
- 109
- 110
- 111
- 112
- 113
- 114
- 115
- 116
- 117
- 118
- 131
- 132
- 133
- 134
- 136
- 186
- 187
-
-
- 53
- 54
- 55
- 117
- 161
-
-
- 53
- 56
- 57
- 118
- 156
-
-
- 14001
- 14002
- 14003
- 14004
- 14005
- 14006
- 14007
- 14008
- 14009
- 14010
- 14011
- 14012
- 14013
- 14014
- 14015
- 14016
- 14017
- 14018
- 14019
- 14020
- 14021
- 14022
- 14023
- 14024
- 14025
- 14026
- 14027
- 14028
- 14029
- 14030
- 14031
- 14032
- 14033
- 14034
- 14035
- 14036
- 14037
- 14038
- 14039
- 14040
- 14041
- 14042
- 14043
- 14044
- 14045
- 14046
- 14047
- 14048
- 14049
- 14050
- 14051
- 14052
- 14053
- 14054
- 14055
- 14056
- 14057
- 14058
- 14059
- 14060
- 14061
- 14062
- 14063
- 14064
- 14065
- 14066
- 14067
- 14068
- 14069
- 14070
- 14071
- 14072
- 14073
- 14074
- 14075
- 14076
- 14077
- 14078
- 14079
- 14080
- 14081
- 14082
- 14083
- 14084
- 14085
- 14086
- 14087
- 14088
- 14089
- 14090
- 14091
- 14092
- 14093
- 14094
- 14095
- 14096
- 14097
- 14098
- 14099
- 14100
- 14101
- 14102
- 14103
- 14104
- 14105
- 14106
- 14107
- 14108
- 14109
- 14110
- 14111
- 14112
- 14113
- 14114
- 14115
- 14116
- 14117
- 14118
- 14119
- 14120
- 14121
- 14122
- 14123
- 14124
- 14125
- 14126
- 14127
- 14128
- 14129
- 14130
- 14131
- 14132
- 14133
- 14134
- 14135
- 14136
- 14137
- 14138
- 14139
- 14140
- 14141
- 14142
- 14143
- 14144
- 14145
- 14146
- 14147
- 14148
- 14149
- 14150
- 14151
- 14152
- 14153
- 14154
- 14155
- 14156
- 14157
- 14158
- 14159
- 14160
- 14161
- 14162
- 14163
- 14164
- 14165
- 14166
- 14167
- 14168
- 14169
- 14170
- 14171
- 14172
- 14173
- 14174
- 14175
- 14176
- 14177
- 14178
- 14179
- 14180
- 14181
- 14182
- 14183
- 14184
- 14185
- 14186
- 14187
- 14188
- 14189
- 14190
- 14191
- 14192
- 14193
- 14194
- 14195
- 14196
- 14197
- 14198
- 14199
- 14200
- 14201
- 14202
- 14203
- 14204
- 14205
- 14206
- 14207
- 14208
- 14209
- 14210
- 14211
- 14212
- 14213
- 14214
- 14215
- 14216
- 14217
- 14218
- 14219
- 14220
- 14221
- 14222
- 14223
- 14224
- 14225
- 14226
- 14227
- 14228
- 14229
- 14230
- 14231
- 14232
- 14233
- 14234
- 14235
- 14236
- 14237
- 14238
- 14239
- 14240
- 14241
- 14242
- 14243
- 14244
- 14245
- 14246
- 14247
- 14248
- 14249
- 14250
- 14251
- 14252
- 14253
- 14254
- 14255
- 14256
- 14257
- 14258
- 14259
- 14260
- 14265
- 14266
- 14267
- 14268
- 14269
- 14270
- 14271
- 14272
- 14273
- 14274
- 14275
- 14276
- 14277
- 14278
- 14279
- 14280
- 14281
- 14282
- 14283
- 14284
- 14285
- 14286
- 14287
- 14288
- 14289
- 14290
- 14291
- 14292
- 14293
- 14294
- 14295
- 14296
- 14297
- 14298
- 14299
- 14300
- 14301
- 14302
- 14303
- 14304
- 14305
- 14306
- 14307
- 14308
- 14309
- 14310
- 14311
- 14312
- 14313
- 14314
- 14315
- 14316
- 14317
- 14318
- 14319
- 14320
- 14321
- 14322
- 14323
- 14324
- 14325
- 14326
- 14327
- 14328
- 14329
- 14330
- 14331
- 14332
- 14333
- 14334
- 14335
- 14336
- 14337
- 14338
- 14339
- 14340
- 14341
- 14342
- 14343
- 14344
- 14345
- 14346
- 14347
- 14348
- 14349
- 14350
- 14351
- 14352
- 14353
- 14354
- 14355
- 14356
- 14357
- 14358
- 14359
- 14360
- 14361
- 14362
- 14363
- 14364
- 14365
- 14366
- 14367
- 14368
- 14369
- 14370
- 14371
- 14372
- 14373
- 14374
- 14375
- 14376
- 14377
- 14378
- 14379
- 14380
- 14381
- 14382
- 14383
- 14384
- 14385
- 14386
- 14387
- 14388
- 14389
- 14390
- 14391
- 14392
- 14393
- 14394
- 14395
- 14396
- 14397
- 14398
- 14399
- 14400
- 14401
- 14402
- 14403
- 14404
- 14405
- 14406
- 14407
- 14408
- 14409
- 14410
- 14411
- 14412
- 14413
- 14414
- 14415
- 14416
- 14417
- 14418
- 14419
- 14420
- 14421
- 14422
- 14423
- 14424
- 14425
- 14426
- 14427
- 14428
- 14429
- 14430
- 14431
- 14432
- 14433
- 14434
- 14435
- 14436
- 14437
- 14438
- 14439
- 14440
- 14441
- 14442
- 14443
- 14444
- 14449
- 14450
- 14451
- 14452
- 14453
- 14454
- 14455
- 14456
- 14457
- 14458
- 14459
- 14460
- 14461
- 14462
- 14463
- 14464
- 14465
- 14466
- 14467
- 14468
- 14469
- 14470
- 14471
- 14472
- 14473
- 14474
- 14475
- 14476
- 14477
- 14478
- 14479
- 14480
- 14481
- 14482
- 14483
- 14484
- 14485
- 14486
- 14487
- 14488
- 14489
- 14490
- 14491
- 14492
- 14493
- 14494
- 14495
- 14496
- 14497
- 14498
- 14499
- 14500
- 14501
- 14502
- 14503
- 14504
- 14505
- 14506
- 14507
- 14508
- 14509
- 14510
- 14511
- 14512
- 14513
- 14514
- 14515
- 14516
- 14517
- 14518
- 14519
- 14520
- 14521
- 14522
- 14523
- 14524
- 14525
- 14526
- 14527
- 14528
- 14529
- 14530
- 14531
- 14532
- 14533
- 14534
- 14535
- 14536
- 14537
- 14538
- 14539
- 14540
- 14541
- 14542
- 14543
- 14544
- 14545
- 14546
- 14547
- 14548
- 14549
- 14550
- 14551
- 14552
- 14553
- 14554
- 14555
- 14556
- 14557
- 14558
- 14559
- 14560
- 14561
- 14562
- 14563
- 14564
- 14565
- 14566
- 14567
- 14568
- 14569
- 14570
- 14571
- 14572
- 14573
- 14574
- 14575
- 14576
- 14577
- 14578
- 14579
- 14580
- 14581
- 14582
- 14583
- 14584
- 14585
- 14586
- 14587
- 14588
- 14589
- 14590
- 14591
- 14592
- 14593
- 14594
- 14595
- 14596
- 14597
- 14598
- 14599
- 14600
- 14601
- 14602
- 14603
- 14604
- 14605
- 14606
- 14607
- 14608
- 14609
- 14610
- 14611
- 14612
- 14613
- 14614
- 14615
- 14616
- 14617
- 14618
- 14619
- 14620
- 14621
- 14622
- 14623
- 14624
- 14625
- 14626
- 14627
- 14628
- 14633
- 14634
- 14635
- 14636
- 14637
- 14638
- 14639
- 14640
- 14641
- 14642
- 14643
- 14644
- 14645
- 14646
- 14647
- 14648
- 14649
- 14650
- 14651
- 14652
- 14653
- 14654
- 14655
- 14656
- 14657
- 14658
- 14659
- 14660
- 14661
- 14662
- 14663
- 14664
- 14665
- 14666
- 14667
- 14668
- 14669
- 14670
- 14671
- 14672
- 14673
- 14674
- 14675
- 14676
- 14677
- 14678
- 14679
- 14680
- 14681
- 14682
- 14683
- 14684
- 14685
- 14686
- 14687
- 14688
- 14689
- 14690
- 14691
- 14692
- 14693
- 14694
- 14695
- 14696
- 14697
- 14698
- 14699
- 14700
- 14701
- 14702
- 14703
- 14704
- 14705
- 14706
- 14707
- 14708
- 14709
- 14710
- 14711
- 14712
- 14713
- 14714
- 14715
- 14716
- 14717
- 14718
- 14719
- 14720
- 14721
- 14722
- 14723
- 14724
- 14725
- 14726
- 14727
- 14728
- 14729
- 14730
- 14731
- 14732
- 14733
- 14734
- 14735
- 14736
- 14737
- 14738
- 14739
- 14740
- 14741
- 14742
- 14743
- 14744
- 14745
- 14746
- 14747
- 14748
- 14749
- 14750
- 14751
- 14752
- 14753
- 14754
- 14755
- 14756
- 14757
- 14758
- 14759
- 14760
- 14761
- 14762
- 14763
- 14764
- 14765
- 14766
- 14767
- 14768
- 14769
- 14770
- 14771
- 14772
- 14773
- 14774
- 14775
- 14776
- 14777
- 14778
- 14779
- 14780
- 14781
- 14782
- 14783
- 14784
- 14785
- 14786
- 14787
- 14788
- 14789
- 14790
- 14791
- 14792
- 14793
- 14794
- 14795
- 14796
- 14797
- 14798
- 14799
- 14800
- 14801
- 14802
- 14803
- 14804
- 14805
- 14806
- 14807
- 14808
- 14809
- 14810
- 14811
- 14812
- 14813
- 14814
- 14815
- 14816
- 14817
- 14818
- 14819
- 14820
- 14821
- 14822
- 14823
- 14824
- 14825
- 14826
- 14827
- 14828
- 14829
- 14830
- 14831
- 14832
- 14833
- 14834
- 14835
- 14836
- 14837
- 14838
- 14839
- 14840
- 14841
- 14842
- 14843
- 14844
- 14845
- 14846
- 14847
- 14848
- 14849
- 14850
- 14851
- 14852
- 14853
- 14854
- 14855
- 14856
- 14857
- 14858
- 14859
- 14860
- 14861
- 14862
- 14863
- 14864
- 14865
- 14866
- 14867
- 14868
- 14869
- 12077
- 12311
- 12312
- 12313
- 12526
- 12527
- 12528
- 12564
- 12621
- 12780
- 12781
- 12782
- 16025
- 13071
- 13072
- 13073
- 13074
- 13075
- 13076
- 14870
- 14871
- 14872
- 14873
- 14874
- 14875
- 14876
- 14877
- 14878
- 14879
- 14880
- 14881
- 14882
- 14883
- 14884
- 14885
- 14886
- 14887
- 14888
- 14889
- 14890
- 14891
- 14892
- 14893
- 14894
- 14895
- 14896
- 14897
- 14898
- 14899
- 14900
- 14901
- 14902
- 14903
- 14904
- 14905
- 14906
- 14907
- 14908
- 14909
- 14910
- 14911
- 14912
- 14913
- 14914
- 14915
- 16030
- 16034
- 16035
- 16036
- 16037
- 16038
- 16039
- 16040
- 16041
- 16042
- 16043
- 16044
- 16045
- 16046
- 14916
- 14917
- 14918
- 16050
- 16051
- 16052
- 16053
- 16067
- 16068
- 16071
- 16072
-
-
- 4
- 19
- 32
-
-
- 15
- 29
- 5
- 19
- 4
-
-
- 15
- 29
- 42
- 50
-
-
- 15
- 42
-
-
- 1
- 19
- 32
- 45
- 47
-
-
- 1
- 4
- 7
- 11
- 15
-
-
- 22
- 19
- 26
- 29
-
-
- 35
- 32
- 39
- 42
-
-
- 50
- 45
- 47
-
-
- 54
- 56
-
-
- 12526
- 12527
- 12528
- 16038
- 16039
- 16040
- 16068
-
-
- 12526
- 12527
- 12528
-
-
- 16038
- 16039
- 16040
- 16068
-
-
- 16030
- 16037
- 16041
- 16042
-
-
- 16025
- 16030
- 16037
- 16041
- 16042
-
-
- 12311
- 12312
- 12313
-
-
- 12780
- 12781
- 12782
-
-
- 16034
- 16035
- 16036
-
-
- 12621
-
-
- 12077
- 16025
- 16030
- 16037
- 16041
- 16042
-
-
- 12077
-
-
- 12564
-
-
- 12077
- 12311
- 12312
- 12313
- 12526
- 12527
- 12528
- 12780
- 12781
- 12782
- 16025
- 16030
- 16034
- 16035
- 16036
- 16037
- 16038
- 16039
- 16040
- 16041
- 16042
- 16043
- 16044
- 16045
- 16046
- 16050
- 16051
- 16052
- 16053
- 16067
- 16068
- 16071
- 16072
- 1561
- 1538
- 1562
- 1563
- 1564
- 1565
- 1566
- 1567
- 1568
- 1569
- 1570
- 1571
- 1572
- 1573
-
-
- 12077
- 12311
- 12312
- 12313
- 12526
- 12527
- 12528
- 12780
- 12781
- 12782
- 16025
- 16030
- 16034
- 16035
- 16036
- 16037
- 16038
- 16039
- 16040
- 16041
- 16042
- 16068
- 16067
- 16071
- 16072
- 1561
-
-
- 8
- 23
- 36
- 93
- 101
- 108
-
-
- 9
- 24
- 37
- 92
- 102
- 109
-
-
- 5
- 6
- 33
- 20
- 90
- 91
- 106
- 99
-
-
- 14
- 28
- 41
- 96
- 104
- 111
-
-
- 30
- 43
- 105
- 112
-
-
- 21
- 34
- 100
- 107
-
-
- 12
- 27
- 40
- 94
- 103
- 110
-
-
- 0
- 1
- 4
- 7
- 2
- 3
- 5
- 6
- 8
- 9
- 88
- 89
- 90
- 91
- 92
- 93
-
-
- 10
- 11
- 12
- 13
- 14
- 94
- 95
- 96
-
-
- 10
- 11
- 12
- 13
- 14
- 10
- 15
- 16
- 17
- 95
- 96
- 97
- 98
-
-
- 10
- 15
- 16
- 17
- 97
- 98
-
-
- 18
- 19
- 22
- 20
- 21
- 23
- 24
- 99
- 100
- 101
- 102
-
-
- 25
- 26
- 27
- 28
- 25
- 29
- 30
- 103
- 104
- 105
-
-
- 25
- 26
- 27
- 28
- 103
- 104
-
-
- 25
- 29
- 30
- 105
-
-
- 31
- 32
- 35
- 33
- 34
- 36
- 37
- 106
- 107
- 108
- 109
-
-
- 38
- 39
- 42
- 40
- 41
- 43
- 110
- 111
- 112
-
-
- 38
- 39
- 40
- 41
- 110
- 111
-
-
- 38
- 42
- 43
- 112
-
-
- 44
- 45
- 47
- 46
- 48
- 113
- 114
-
-
- 49
- 50
- 51
- 52
- 115
- 116
-
-
- 53
- 54
- 56
- 55
- 57
- 117
- 118
-
-
- 53
- 54
- 55
- 117
-
-
- 53
- 56
- 57
- 118
-
-
- 123
- 124
- 125
- 126
- 127
- 128
- 129
- 130
- 131
- 132
- 133
- 134
- 135
- 136
-
-
- 123
- 124
-
-
- 125
- 126
-
-
- 127
- 128
- 129
- 130
- 135
-
-
- 131
- 132
- 133
- 134
- 136
-
-
- 0
- 1
- 2
- 3
- 4
- 5
- 6
- 7
- 8
- 9
- 18
- 19
- 20
- 21
- 22
- 23
- 24
- 31
- 32
- 33
- 34
- 35
- 36
- 37
- 44
- 45
- 46
- 47
- 48
- 49
- 50
- 51
- 52
- 53
- 54
- 55
- 56
- 57
- 123
- 124
- 125
- 126
- 127
- 128
- 129
- 130
- 135
-
-
- 10
- 11
- 12
- 13
- 14
- 15
- 16
- 17
- 25
- 26
- 27
- 28
- 29
- 30
- 38
- 39
- 40
- 41
- 42
- 43
-
-
- 123
- 125
- 127
- 128
- 131
- 132
- 129
- 133
- 135
- 136
-
-
- 124
- 126
- 129
- 130
- 133
- 134
- 128
- 132
- 135
- 136
-
-
- 9
- 24
- 37
- 92
- 102
- 109
-
-
- 90
- 91
- 99
- 106
-
-
- 100
- 107
-
-
- 88
- 114
-
-
- 89
- 113
- 117
- 118
- 131
- 132
- 133
-
-
- 92
- 102
- 109
- 134
-
-
- 93
- 101
- 108
- 117
- 158
- 159
- 160
- 161
-
-
- 97
- 105
- 112
-
-
- 94
- 103
- 110
- 95
-
-
- 98
- 115
- 116
- 136
-
-
- 96
- 104
- 111
-
-
- 90
- 91
- 99
- 106
- 100
- 107
- 88
- 114
- 89
- 113
- 117
- 118
-
-
- 92
- 102
- 109
- 134
- 93
- 101
- 108
-
-
- 97
- 105
- 112
- 94
- 103
- 110
- 95
- 98
- 115
- 116
- 136
- 96
- 104
- 111
-
-
- 20
- 33
- 5
- 6
- 90
- 91
- 99
- 106
-
-
- 21
- 34
- 100
- 107
-
-
- 48
- 2
- 88
- 114
-
-
- 3
- 127
- 128
- 129
- 46
- 55
- 57
- 89
- 113
- 117
- 118
- 131
- 132
- 133
-
-
- 24
- 130
- 37
- 9
- 92
- 102
- 109
- 134
-
-
- 36
- 23
- 8
- 93
- 101
- 108
-
-
- 16
- 30
- 43
- 97
- 105
- 112
-
-
- 27
- 40
- 12
- 13
- 94
- 103
- 110
- 95
-
-
- 135
- 17
- 51
- 52
- 98
- 115
- 116
- 136
-
-
- 14
- 28
- 41
- 96
- 104
- 111
-
-
- 14
- 28
- 41
- 96
- 104
- 111
-
-
- 3
- 127
- 128
- 129
- 46
- 55
- 57
- 48
- 2
- 89
- 131
- 113
- 117
- 118
- 132
- 133
- 114
- 88
-
-
- 8
- 23
- 36
- 93
- 101
- 108
- 9
- 24
- 37
- 92
- 102
- 109
- 130
- 134
-
-
- 5
- 6
- 33
- 20
- 90
- 91
- 106
- 99
-
-
- 14
- 28
- 41
- 96
- 104
- 111
-
-
- 12
- 27
- 40
- 13
- 94
- 103
- 110
- 95
-
-
- 16
- 30
- 43
- 97
- 105
- 112
-
-
- 17
- 51
- 52
- 21
- 34
- 135
- 98
- 115
- 116
- 100
- 107
- 136
-
-
- 16
- 30
- 97
- 105
- 17
- 98
-
-
- 12
- 94
- 27
- 103
- 13
- 95
- 14
- 96
- 28
- 104
-
-
- 2
- 88
- 3
- 89
- 5
- 90
- 6
- 91
- 8
- 93
- 9
- 92
- 20
- 99
- 21
- 100
- 23
- 101
- 24
- 102
-
-
- 46
- 113
- 48
- 114
- 51
- 115
- 52
- 116
-
-
- 55
- 117
-
-
- 57
- 118
-
-
- 36
- 108
- 37
- 109
- 33
- 106
- 41
- 111
- 40
- 110
- 43
- 112
- 34
- 107
-
-
- 127
- 131
- 128
- 132
- 129
- 133
- 135
- 136
- 130
- 134
-
-
- 5
- 20
- 90
- 99
-
-
- 6
- 33
- 91
- 106
-
-
- 0
- 1
- 2
- 3
- 4
- 5
- 6
- 7
- 8
- 18
- 19
- 20
- 21
- 22
- 23
- 31
- 32
- 33
- 34
- 35
- 36
- 44
- 45
- 46
- 47
- 48
- 53
- 54
- 55
- 56
- 57
- 88
- 89
- 90
- 91
- 93
- 99
- 100
- 101
- 106
- 107
- 108
- 113
- 114
- 117
- 118
- 123
- 124
- 125
- 126
- 127
- 128
- 129
- 131
- 132
- 133
- 135
- 136
-
-
- 4
- 5
- 6
- 19
- 32
- 20
- 21
- 33
- 34
- 90
- 91
- 99
- 100
- 106
- 107
-
-
- 11
- 15
- 26
- 29
- 39
- 42
- 12
- 13
- 14
- 16
- 17
- 27
- 28
- 30
- 40
- 41
- 43
- 94
- 95
- 96
- 97
- 98
- 103
- 104
- 105
- 110
- 111
- 112
-
-
- 1
- 2
- 3
- 54
- 56
- 55
- 57
- 117
- 118
- 88
- 89
-
-
- 7
- 22
- 35
- 8
- 9
- 23
- 24
- 36
- 37
- 92
- 93
- 101
- 102
- 108
- 109
-
-
- 125
- 126
- 127
- 128
- 129
- 130
- 135
- 131
- 132
- 133
- 134
- 136
-
-
- 45
- 47
- 46
- 48
- 113
- 114
-
-
- 50
- 51
- 52
- 115
- 116
-
-
- 16067
- 16071
- 16072
-
-
- 18869
- 18870
- 18871
- 18872
- 18873
- 18874
- 18875
- 18876
- 18877
- 18878
- 18879
- 18880
- 18881
- 18882
- 18883
- 18884
- 18885
- 18886
- 18887
- 18888
- 18889
- 18890
- 18891
- 18892
- 18893
- 18894
- 18895
- 18896
- 18897
- 18898
- 18899
- 18900
- 18901
- 18902
- 18903
- 18904
-
-
- 18905
- 18906
- 18907
-
-
- 18850
- 18851
- 18852
-
-
+
+ 139
+ 140
+ 141
+ 142
+ 143
+ 144
+ 145
+ 146
+
+
148
149
150
@@ -2571,99 +622,13 @@
188
189
-
- 25867
- 25868
- 19160
- 19172
- 25796
- 25881
- 25797
- 25799
- 29179
- 29180
- 25876
- 25877
- 29194
- 29212
- 29195
- 29196
- 29218
- 29213
- 25837
- 25840
- 25845
- 25841
- 25838
- 25839
- 25846
- 25825
- 29068
-
-
- 90
- 91
- 99
- 106
-
-
- 88
- 89
- 131
- 113
- 118
- 114
-
-
- 93
- 101
- 108
- 117
-
-
- 92
- 102
- 109
- 134
-
-
- 94
- 95
- 103
- 110
- 132
- 133
-
-
- 98
- 115
- 116
- 100
- 107
-
-
- 96
- 104
- 111
-
-
- 97
- 105
- 112
-
-
- 186
-
-
- 187
-
-
+
148
149
150
151
-
+
152
153
154
@@ -2671,40 +636,5098 @@
156
157
-
+
158
159
160
161
-
+
162
163
164
165
-
+
166
167
168
169
170
-
+
171
172
173
174
175
-
+
176
177
178
-
+
179
180
181
+
+ 53
+ 54
+ 55
+ 117
+ 161
+
+
+ 53
+ 56
+ 57
+ 118
+ 156
+
+
+ 14001
+ 14002
+ 14003
+ 14004
+ 14005
+ 14006
+ 14007
+ 14008
+ 14009
+ 14010
+ 14011
+ 14012
+ 14013
+ 14014
+ 14015
+ 14016
+ 14017
+ 14018
+ 14019
+ 14020
+ 14021
+ 14022
+ 14023
+ 14024
+ 14025
+ 14026
+ 14027
+ 14028
+ 14029
+ 14030
+ 14031
+ 14032
+ 14033
+ 14034
+ 14035
+ 14036
+ 14037
+ 14038
+ 14039
+ 14040
+ 14041
+ 14042
+ 14043
+ 14044
+ 14045
+ 14046
+ 14047
+ 14048
+ 14049
+ 14050
+ 14051
+ 14052
+ 14053
+ 14054
+ 14055
+ 14056
+ 14057
+ 14058
+ 14059
+ 14060
+ 14061
+ 14062
+ 14063
+ 14064
+ 14065
+ 14066
+ 14067
+ 14068
+ 14069
+ 14070
+ 14071
+ 14072
+ 14073
+ 14074
+ 14075
+ 14076
+ 14077
+ 14078
+ 14079
+ 14080
+ 14081
+ 14082
+ 14083
+ 14084
+ 14085
+ 14086
+ 14087
+ 14088
+ 14089
+ 14090
+ 14091
+ 14092
+ 14093
+ 14094
+ 14095
+ 14096
+ 14097
+ 14098
+ 14099
+ 14100
+ 14101
+ 14102
+ 14103
+ 14104
+ 14105
+ 14106
+ 14107
+ 14108
+ 14109
+ 14110
+ 14111
+ 14112
+ 14113
+ 14114
+ 14115
+ 14116
+ 14117
+ 14118
+ 14119
+ 14120
+ 14121
+ 14122
+ 14123
+ 14124
+ 14125
+ 14126
+ 14127
+ 14128
+ 14129
+ 14130
+ 14131
+ 14132
+ 14133
+ 14134
+ 14135
+ 14136
+ 14137
+ 14138
+ 14139
+ 14140
+ 14141
+ 14142
+ 14143
+ 14144
+ 14145
+ 14146
+ 14147
+ 14148
+ 14149
+ 14150
+ 14151
+ 14152
+ 14153
+ 14154
+ 14155
+ 14156
+ 14157
+ 14158
+ 14159
+ 14160
+ 14161
+ 14162
+ 14163
+ 14164
+ 14165
+ 14166
+ 14167
+ 14168
+ 14169
+ 14170
+ 14171
+ 14172
+ 14173
+ 14174
+ 14175
+ 14176
+ 14177
+ 14178
+ 14179
+ 14180
+ 14181
+ 14182
+ 14183
+ 14184
+ 14185
+ 14186
+ 14187
+ 14188
+ 14189
+ 14190
+ 14191
+ 14192
+ 14193
+ 14194
+ 14195
+ 14196
+ 14197
+ 14198
+ 14199
+ 14200
+ 14201
+ 14202
+ 14203
+ 14204
+ 14205
+ 14206
+ 14207
+ 14208
+ 14209
+ 14210
+ 14211
+ 14212
+ 14213
+ 14214
+ 14215
+ 14216
+ 14217
+ 14218
+ 14219
+ 14220
+ 14221
+ 14222
+ 14223
+ 14224
+ 14225
+ 14226
+ 14227
+ 14228
+ 14229
+ 14230
+ 14231
+ 14232
+ 14233
+ 14234
+ 14235
+ 14236
+ 14237
+ 14238
+ 14239
+ 14240
+ 14241
+ 14242
+ 14243
+ 14244
+ 14245
+ 14246
+ 14247
+ 14248
+ 14249
+ 14250
+ 14251
+ 14252
+ 14253
+ 14254
+ 14255
+ 14256
+ 14257
+ 14258
+ 14259
+ 14260
+ 14265
+ 14266
+ 14267
+ 14268
+ 14269
+ 14270
+ 14271
+ 14272
+ 14273
+ 14274
+ 14275
+ 14276
+ 14277
+ 14278
+ 14279
+ 14280
+ 14281
+ 14282
+ 14283
+ 14284
+ 14285
+ 14286
+ 14287
+ 14288
+ 14289
+ 14290
+ 14291
+ 14292
+ 14293
+ 14294
+ 14295
+ 14296
+ 14297
+ 14298
+ 14299
+ 14300
+ 14301
+ 14302
+ 14303
+ 14304
+ 14305
+ 14306
+ 14307
+ 14308
+ 14309
+ 14310
+ 14311
+ 14312
+ 14313
+ 14314
+ 14315
+ 14316
+ 14317
+ 14318
+ 14319
+ 14320
+ 14321
+ 14322
+ 14323
+ 14324
+ 14325
+ 14326
+ 14327
+ 14328
+ 14329
+ 14330
+ 14331
+ 14332
+ 14333
+ 14334
+ 14335
+ 14336
+ 14337
+ 14338
+ 14339
+ 14340
+ 14341
+ 14342
+ 14343
+ 14344
+ 14345
+ 14346
+ 14347
+ 14348
+ 14349
+ 14350
+ 14351
+ 14352
+ 14353
+ 14354
+ 14355
+ 14356
+ 14357
+ 14358
+ 14359
+ 14360
+ 14361
+ 14362
+ 14363
+ 14364
+ 14365
+ 14366
+ 14367
+ 14368
+ 14369
+ 14370
+ 14371
+ 14372
+ 14373
+ 14374
+ 14375
+ 14376
+ 14377
+ 14378
+ 14379
+ 14380
+ 14381
+ 14382
+ 14383
+ 14384
+ 14385
+ 14386
+ 14387
+ 14388
+ 14389
+ 14390
+ 14391
+ 14392
+ 14393
+ 14394
+ 14395
+ 14396
+ 14397
+ 14398
+ 14399
+ 14400
+ 14401
+ 14402
+ 14403
+ 14404
+ 14405
+ 14406
+ 14407
+ 14408
+ 14409
+ 14410
+ 14411
+ 14412
+ 14413
+ 14414
+ 14415
+ 14416
+ 14417
+ 14418
+ 14419
+ 14420
+ 14421
+ 14422
+ 14423
+ 14424
+ 14425
+ 14426
+ 14427
+ 14428
+ 14429
+ 14430
+ 14431
+ 14432
+ 14433
+ 14434
+ 14435
+ 14436
+ 14437
+ 14438
+ 14439
+ 14440
+ 14441
+ 14442
+ 14443
+ 14444
+ 14449
+ 14450
+ 14451
+ 14452
+ 14453
+ 14454
+ 14455
+ 14456
+ 14457
+ 14458
+ 14459
+ 14460
+ 14461
+ 14462
+ 14463
+ 14464
+ 14465
+ 14466
+ 14467
+ 14468
+ 14469
+ 14470
+ 14471
+ 14472
+ 14473
+ 14474
+ 14475
+ 14476
+ 14477
+ 14478
+ 14479
+ 14480
+ 14481
+ 14482
+ 14483
+ 14484
+ 14485
+ 14486
+ 14487
+ 14488
+ 14489
+ 14490
+ 14491
+ 14492
+ 14493
+ 14494
+ 14495
+ 14496
+ 14497
+ 14498
+ 14499
+ 14500
+ 14501
+ 14502
+ 14503
+ 14504
+ 14505
+ 14506
+ 14507
+ 14508
+ 14509
+ 14510
+ 14511
+ 14512
+ 14513
+ 14514
+ 14515
+ 14516
+ 14517
+ 14518
+ 14519
+ 14520
+ 14521
+ 14522
+ 14523
+ 14524
+ 14525
+ 14526
+ 14527
+ 14528
+ 14529
+ 14530
+ 14531
+ 14532
+ 14533
+ 14534
+ 14535
+ 14536
+ 14537
+ 14538
+ 14539
+ 14540
+ 14541
+ 14542
+ 14543
+ 14544
+ 14545
+ 14546
+ 14547
+ 14548
+ 14549
+ 14550
+ 14551
+ 14552
+ 14553
+ 14554
+ 14555
+ 14556
+ 14557
+ 14558
+ 14559
+ 14560
+ 14561
+ 14562
+ 14563
+ 14564
+ 14565
+ 14566
+ 14567
+ 14568
+ 14569
+ 14570
+ 14571
+ 14572
+ 14573
+ 14574
+ 14575
+ 14576
+ 14577
+ 14578
+ 14579
+ 14580
+ 14581
+ 14582
+ 14583
+ 14584
+ 14585
+ 14586
+ 14587
+ 14588
+ 14589
+ 14590
+ 14591
+ 14592
+ 14593
+ 14594
+ 14595
+ 14596
+ 14597
+ 14598
+ 14599
+ 14600
+ 14601
+ 14602
+ 14603
+ 14604
+ 14605
+ 14606
+ 14607
+ 14608
+ 14609
+ 14610
+ 14611
+ 14612
+ 14613
+ 14614
+ 14615
+ 14616
+ 14617
+ 14618
+ 14619
+ 14620
+ 14621
+ 14622
+ 14623
+ 14624
+ 14625
+ 14626
+ 14627
+ 14628
+ 14633
+ 14634
+ 14635
+ 14636
+ 14637
+ 14638
+ 14639
+ 14640
+ 14641
+ 14642
+ 14643
+ 14644
+ 14645
+ 14646
+ 14647
+ 14648
+ 14649
+ 14650
+ 14651
+ 14652
+ 14653
+ 14654
+ 14655
+ 14656
+ 14657
+ 14658
+ 14659
+ 14660
+ 14661
+ 14662
+ 14663
+ 14664
+ 14665
+ 14666
+ 14667
+ 14668
+ 14669
+ 14670
+ 14671
+ 14672
+ 14673
+ 14674
+ 14675
+ 14676
+ 14677
+ 14678
+ 14679
+ 14680
+ 14681
+ 14682
+ 14683
+ 14684
+ 14685
+ 14686
+ 14687
+ 14688
+ 14689
+ 14690
+ 14691
+ 14692
+ 14693
+ 14694
+ 14695
+ 14696
+ 14697
+ 14698
+ 14699
+ 14700
+ 14701
+ 14702
+ 14703
+ 14704
+ 14705
+ 14706
+ 14707
+ 14708
+ 14709
+ 14710
+ 14711
+ 14712
+ 14713
+ 14714
+ 14715
+ 14716
+ 14717
+ 14718
+ 14719
+ 14720
+ 14721
+ 14722
+ 14723
+ 14724
+ 14725
+ 14726
+ 14727
+ 14728
+ 14729
+ 14730
+ 14731
+ 14732
+ 14733
+ 14734
+ 14735
+ 14736
+ 14737
+ 14738
+ 14739
+ 14740
+ 14741
+ 14742
+ 14743
+ 14744
+ 14745
+ 14746
+ 14747
+ 14748
+ 14749
+ 14750
+ 14751
+ 14752
+ 14753
+ 14754
+ 14755
+ 14756
+ 14757
+ 14758
+ 14759
+ 14760
+ 14761
+ 14762
+ 14763
+ 14764
+ 14765
+ 14766
+ 14767
+ 14768
+ 14769
+ 14770
+ 14771
+ 14772
+ 14773
+ 14774
+ 14775
+ 14776
+ 14777
+ 14778
+ 14779
+ 14780
+ 14781
+ 14782
+ 14783
+ 14784
+ 14785
+ 14786
+ 14787
+ 14788
+ 14789
+ 14790
+ 14791
+ 14792
+ 14793
+ 14794
+ 14795
+ 14796
+ 14797
+ 14798
+ 14799
+ 14800
+ 14801
+ 14802
+ 14803
+ 14804
+ 14805
+ 14806
+ 14807
+ 14808
+ 14809
+ 14810
+ 14811
+ 14812
+ 14813
+ 14814
+ 14815
+ 14816
+ 14817
+ 14818
+ 14819
+ 14820
+ 14821
+ 14822
+ 14823
+ 14824
+ 14825
+ 14826
+ 14827
+ 14828
+ 14829
+ 14830
+ 14831
+ 14832
+ 14833
+ 14834
+ 14835
+ 14836
+ 14837
+ 14838
+ 14839
+ 14840
+ 14841
+ 14842
+ 14843
+ 14844
+ 14845
+ 14846
+ 14847
+ 14848
+ 14849
+ 14850
+ 14851
+ 14852
+ 14853
+ 14854
+ 14855
+ 14856
+ 14857
+ 14858
+ 14859
+ 14860
+ 14861
+ 14862
+ 14863
+ 14864
+ 14865
+ 14866
+ 14867
+ 14868
+ 14869
+ 12077
+ 12311
+ 12312
+ 12313
+ 12526
+ 12527
+ 12528
+ 12564
+ 12621
+ 12780
+ 12781
+ 12782
+ 16025
+ 13071
+ 13072
+ 13073
+ 13074
+ 13075
+ 13076
+ 14870
+ 14871
+ 14872
+ 14873
+ 14874
+ 14875
+ 14876
+ 14877
+ 14878
+ 14879
+ 14880
+ 14881
+ 14882
+ 14883
+ 14884
+ 14885
+ 14886
+ 14887
+ 14888
+ 14889
+ 14890
+ 14891
+ 14892
+ 14893
+ 14894
+ 14895
+ 14896
+ 14897
+ 14898
+ 14899
+ 14900
+ 14901
+ 14902
+ 14903
+ 14904
+ 14905
+ 14906
+ 14907
+ 14908
+ 14909
+ 14910
+ 14911
+ 14912
+ 14913
+ 14914
+ 14915
+ 16030
+ 16034
+ 16035
+ 16036
+ 16037
+ 16038
+ 16039
+ 16040
+ 16041
+ 16042
+ 16043
+ 16044
+ 16045
+ 16046
+ 14916
+ 14917
+ 14918
+ 16050
+ 16051
+ 16052
+ 16053
+ 16067
+ 16068
+ 16071
+ 16072
+ 13302
+ 13303
+ 13304
+ 13305
+ 14929
+ 14930
+ 14931
+ 14947
+ 14948
+ 14949
+ 14950
+ 14951
+ 14952
+ 14953
+ 14954
+ 14955
+ 14956
+ 14957
+ 14958
+ 14959
+ 14960
+ 14961
+ 14962
+ 14963
+ 14964
+ 14965
+ 14966
+ 14967
+ 14926
+ 14932
+ 14940
+ 14941
+ 14942
+ 14986
+ 14987
+ 14988
+ 14989
+ 14990
+ 14991
+ 14992
+ 14993
+ 14994
+ 14995
+ 14996
+ 14997
+ 14998
+ 14999
+ 14936
+ 14937
+ 14938
+ 14939
+ 14974
+ 14975
+ 14976
+ 14977
+ 14978
+ 14979
+ 14980
+ 14981
+ 14982
+ 14983
+ 14984
+ 14985
+ 14933
+ 14943
+ 15010
+ 15011
+ 15012
+ 15013
+ 15014
+ 15015
+ 15016
+ 15017
+ 15018
+ 15019
+ 15020
+ 15021
+ 14925
+ 14944
+ 14945
+ 14946
+ 15000
+ 15001
+ 15002
+ 15003
+ 15004
+ 15005
+ 15006
+ 15007
+ 15008
+ 15009
+ 14968
+ 14969
+ 14970
+ 14927
+ 14928
+ 15022
+ 15023
+ 15024
+ 15025
+ 15026
+ 15027
+ 15028
+ 15029
+ 15030
+ 15031
+ 15032
+ 15033
+ 15034
+ 15035
+ 15036
+ 15037
+ 15038
+ 15039
+ 15040
+ 15041
+ 15042
+ 15043
+ 15044
+ 15045
+ 15046
+ 15047
+ 15048
+ 15049
+ 15050
+ 15051
+ 15053
+ 15054
+ 15055
+ 15056
+ 15057
+ 15058
+ 15059
+ 15060
+ 15061
+ 15062
+ 15063
+ 15064
+ 15065
+ 1562
+ 1563
+ 1564
+ 1565
+ 1566
+ 1567
+ 1568
+ 1569
+ 1570
+ 1571
+ 1572
+ 1573
+ 16094
+ 16095
+ 16096
+ 16097
+
+
+ 4
+ 19
+ 32
+
+
+ 15
+ 29
+ 5
+ 19
+ 4
+
+
+ 15
+ 29
+ 42
+ 50
+
+
+ 15
+ 42
+
+
+ 1
+ 19
+ 32
+ 45
+ 47
+
+
+ 1
+ 4
+ 7
+ 11
+ 15
+
+
+ 22
+ 19
+ 26
+ 29
+
+
+ 35
+ 32
+ 39
+ 42
+
+
+ 50
+ 45
+ 47
+
+
+ 54
+ 56
+
+
+ 12526
+ 12527
+ 12528
+ 16038
+ 16039
+ 16040
+ 16068
+
+
+ 12526
+ 12527
+ 12528
+
+
+ 16038
+ 16039
+ 16040
+ 16068
+
+
+ 16030
+ 16037
+ 16041
+ 16042
+
+
+ 16025
+ 16030
+ 16037
+ 16041
+ 16042
+
+
+ 12311
+ 12312
+ 12313
+
+
+ 12780
+ 12781
+ 12782
+
+
+ 16034
+ 16035
+ 16036
+
+
+ 12621
+
+
+ 12077
+ 16025
+ 16030
+ 16037
+ 16041
+ 16042
+
+
+ 12077
+
+
+ 12564
+
+
+ 12077
+ 12311
+ 12312
+ 12313
+ 12526
+ 12527
+ 12528
+ 12780
+ 12781
+ 12782
+ 16025
+ 16030
+ 16034
+ 16035
+ 16036
+ 16037
+ 16038
+ 16039
+ 16040
+ 16041
+ 16042
+ 16043
+ 16044
+ 16045
+ 16046
+ 16050
+ 16051
+ 16052
+ 16053
+ 16067
+ 16068
+ 16071
+ 16072
+ 1561
+ 1538
+ 1562
+ 1563
+ 1564
+ 1565
+ 1566
+ 1567
+ 1568
+ 1569
+ 1570
+ 1571
+ 1572
+ 1573
+ 16094
+ 16095
+ 16096
+ 16097
+
+
+ 12077
+ 12311
+ 12312
+ 12313
+ 12526
+ 12527
+ 12528
+ 12780
+ 12781
+ 12782
+ 16025
+ 16030
+ 16034
+ 16035
+ 16036
+ 16037
+ 16038
+ 16039
+ 16040
+ 16041
+ 16042
+ 16068
+ 16067
+ 16071
+ 16072
+ 1561
+
+
+ 8
+ 23
+ 36
+ 93
+ 101
+ 108
+
+
+ 9
+ 24
+ 37
+ 92
+ 102
+ 109
+
+
+ 5
+ 6
+ 33
+ 20
+ 90
+ 91
+ 106
+ 99
+
+
+ 14
+ 28
+ 41
+ 96
+ 104
+ 111
+
+
+ 30
+ 43
+ 105
+ 112
+
+
+ 21
+ 34
+ 100
+ 107
+
+
+ 12
+ 27
+ 40
+ 94
+ 103
+ 110
+
+
+ 0
+ 1
+ 4
+ 7
+ 2
+ 3
+ 5
+ 6
+ 8
+ 9
+ 88
+ 89
+ 90
+ 91
+ 92
+ 93
+ 152
+ 153
+ 148
+ 149
+ 162
+ 158
+
+
+ 10
+ 11
+ 12
+ 13
+ 14
+ 94
+ 95
+ 96
+ 166
+ 167
+ 176
+
+
+ 10
+ 11
+ 12
+ 13
+ 14
+ 10
+ 15
+ 16
+ 17
+ 95
+ 96
+ 97
+ 98
+ 167
+ 176
+ 179
+ 171
+
+
+ 10
+ 15
+ 16
+ 17
+ 97
+ 98
+ 179
+ 171
+
+
+ 18
+ 19
+ 22
+ 20
+ 21
+ 23
+ 24
+ 99
+ 100
+ 101
+ 102
+ 150
+ 172
+ 159
+ 163
+
+
+ 25
+ 26
+ 27
+ 28
+ 25
+ 29
+ 30
+ 103
+ 104
+ 105
+ 168
+ 177
+ 180
+
+
+ 25
+ 26
+ 27
+ 28
+ 103
+ 104
+ 168
+ 177
+
+
+ 25
+ 29
+ 30
+ 105
+ 180
+
+
+ 31
+ 32
+ 35
+ 33
+ 34
+ 36
+ 37
+ 106
+ 107
+ 108
+ 109
+ 151
+ 173
+ 160
+ 164
+
+
+ 38
+ 39
+ 42
+ 40
+ 41
+ 43
+ 110
+ 111
+ 112
+ 169
+ 178
+ 181
+
+
+ 38
+ 39
+ 40
+ 41
+ 110
+ 111
+ 169
+ 178
+
+
+ 38
+ 42
+ 43
+ 112
+ 181
+
+
+ 44
+ 45
+ 47
+ 46
+ 48
+ 113
+ 114
+ 154
+ 155
+
+
+ 49
+ 50
+ 51
+ 52
+ 115
+ 116
+ 174
+ 175
+
+
+ 53
+ 54
+ 56
+ 55
+ 57
+ 117
+ 118
+ 161
+ 156
+
+
+ 53
+ 54
+ 55
+ 117
+ 161
+
+
+ 53
+ 56
+ 57
+ 118
+ 156
+
+
+ 123
+ 124
+ 125
+ 126
+ 127
+ 128
+ 129
+ 130
+ 131
+ 132
+ 133
+ 134
+ 135
+ 136
+ 157
+ 165
+ 170
+
+
+ 123
+ 124
+
+
+ 125
+ 126
+
+
+ 127
+ 128
+ 129
+ 130
+ 135
+
+
+ 131
+ 132
+ 133
+ 134
+ 136
+
+
+ 0
+ 1
+ 2
+ 3
+ 4
+ 5
+ 6
+ 7
+ 8
+ 9
+ 18
+ 19
+ 20
+ 21
+ 22
+ 23
+ 24
+ 31
+ 32
+ 33
+ 34
+ 35
+ 36
+ 37
+ 44
+ 45
+ 46
+ 47
+ 48
+ 49
+ 50
+ 51
+ 52
+ 53
+ 54
+ 55
+ 56
+ 57
+ 123
+ 124
+ 125
+ 126
+ 127
+ 128
+ 129
+ 130
+ 135
+ 182
+ 184
+
+
+ 10
+ 11
+ 12
+ 13
+ 14
+ 15
+ 16
+ 17
+ 25
+ 26
+ 27
+ 28
+ 29
+ 30
+ 38
+ 39
+ 40
+ 41
+ 42
+ 43
+ 183
+ 185
+
+
+ 123
+ 125
+ 127
+ 128
+ 131
+ 132
+ 129
+ 133
+ 135
+ 136
+
+
+ 124
+ 126
+ 129
+ 130
+ 133
+ 134
+ 128
+ 132
+ 135
+ 136
+
+
+ 9
+ 24
+ 37
+ 92
+ 102
+ 109
+
+
+ 90
+ 91
+ 99
+ 106
+
+
+ 100
+ 107
+
+
+ 88
+ 114
+
+
+ 89
+ 113
+ 117
+ 118
+ 131
+ 132
+ 133
+
+
+ 92
+ 102
+ 109
+ 134
+
+
+ 93
+ 101
+ 108
+ 117
+ 141
+ 139
+ 140
+ 141
+ 142
+ 143
+ 144
+ 145
+ 146
+ 148
+ 149
+ 150
+ 151
+ 152
+ 153
+ 154
+ 155
+ 156
+ 157
+ 158
+ 159
+ 160
+ 161
+ 162
+ 163
+ 164
+ 165
+ 166
+ 167
+ 168
+ 169
+ 170
+ 171
+ 172
+ 173
+ 174
+ 175
+ 176
+ 177
+ 178
+ 179
+ 180
+ 181
+
+
+ 97
+ 105
+ 112
+
+
+ 94
+ 103
+ 110
+ 95
+
+
+ 98
+ 115
+ 116
+ 136
+
+
+ 96
+ 104
+ 111
+
+
+ 90
+ 91
+ 99
+ 106
+ 100
+ 107
+ 88
+ 114
+ 89
+ 113
+ 117
+ 118
+
+
+ 92
+ 102
+ 109
+ 134
+ 93
+ 101
+ 108
+
+
+ 97
+ 105
+ 112
+ 94
+ 103
+ 110
+ 95
+ 98
+ 115
+ 116
+ 136
+ 96
+ 104
+ 111
+
+
+ 20
+ 33
+ 5
+ 6
+ 90
+ 91
+ 99
+ 106
+ 143
+ 145
+ 146
+ 139
+ 140
+ 141
+ 142
+ 144
+ 166
+ 167
+ 168
+ 169
+ 170
+ 176
+ 177
+ 178
+ 179
+ 180
+ 181
+ 148
+ 149
+ 150
+ 151
+ 152
+ 153
+ 154
+ 155
+ 156
+ 157
+ 158
+ 159
+ 160
+ 161
+ 162
+ 163
+ 164
+ 165
+ 171
+ 172
+ 173
+ 174
+ 175
+
+
+ 21
+ 34
+ 100
+ 107
+ 143
+ 145
+ 146
+ 139
+ 140
+ 141
+ 142
+ 144
+ 166
+ 167
+ 168
+ 169
+ 170
+ 176
+ 177
+ 178
+ 179
+ 180
+ 181
+ 148
+ 149
+ 150
+ 151
+ 152
+ 153
+ 154
+ 155
+ 156
+ 157
+ 158
+ 159
+ 160
+ 161
+ 162
+ 163
+ 164
+ 165
+ 171
+ 172
+ 173
+ 174
+ 175
+
+
+ 48
+ 2
+ 88
+ 114
+ 143
+ 145
+ 146
+ 139
+ 140
+ 141
+ 142
+ 144
+ 166
+ 167
+ 168
+ 169
+ 170
+ 176
+ 177
+ 178
+ 179
+ 180
+ 181
+ 148
+ 149
+ 150
+ 151
+ 152
+ 153
+ 154
+ 155
+ 156
+ 157
+ 158
+ 159
+ 160
+ 161
+ 162
+ 163
+ 164
+ 165
+ 171
+ 172
+ 173
+ 174
+ 175
+
+
+ 3
+ 127
+ 128
+ 129
+ 46
+ 55
+ 57
+ 89
+ 113
+ 117
+ 118
+ 131
+ 132
+ 133
+ 143
+ 145
+ 146
+ 139
+ 140
+ 141
+ 142
+ 144
+ 166
+ 167
+ 168
+ 169
+ 170
+ 176
+ 177
+ 178
+ 179
+ 180
+ 181
+ 148
+ 149
+ 150
+ 151
+ 152
+ 153
+ 154
+ 155
+ 156
+ 157
+ 158
+ 159
+ 160
+ 161
+ 162
+ 163
+ 164
+ 165
+ 171
+ 172
+ 173
+ 174
+ 175
+
+
+ 24
+ 130
+ 37
+ 9
+ 92
+ 102
+ 109
+ 134
+ 143
+ 145
+ 146
+ 139
+ 140
+ 141
+ 142
+ 144
+ 166
+ 167
+ 168
+ 169
+ 170
+ 176
+ 177
+ 178
+ 179
+ 180
+ 181
+ 148
+ 149
+ 150
+ 151
+ 152
+ 153
+ 154
+ 155
+ 156
+ 157
+ 158
+ 159
+ 160
+ 161
+ 162
+ 163
+ 164
+ 165
+ 171
+ 172
+ 173
+ 174
+ 175
+
+
+ 36
+ 23
+ 8
+ 93
+ 101
+ 108
+ 143
+ 145
+ 146
+ 139
+ 140
+ 141
+ 142
+ 144
+ 166
+ 167
+ 168
+ 169
+ 170
+ 176
+ 177
+ 178
+ 179
+ 180
+ 181
+ 148
+ 149
+ 150
+ 151
+ 152
+ 153
+ 154
+ 155
+ 156
+ 157
+ 158
+ 159
+ 160
+ 161
+ 162
+ 163
+ 164
+ 165
+ 171
+ 172
+ 173
+ 174
+ 175
+
+
+ 16
+ 30
+ 43
+ 97
+ 105
+ 112
+ 143
+ 145
+ 146
+ 139
+ 140
+ 141
+ 142
+ 144
+ 166
+ 167
+ 168
+ 169
+ 170
+ 176
+ 177
+ 178
+ 179
+ 180
+ 181
+ 148
+ 149
+ 150
+ 151
+ 152
+ 153
+ 154
+ 155
+ 156
+ 157
+ 158
+ 159
+ 160
+ 161
+ 162
+ 163
+ 164
+ 165
+ 171
+ 172
+ 173
+ 174
+ 175
+
+
+ 27
+ 40
+ 12
+ 13
+ 94
+ 103
+ 110
+ 95
+ 143
+ 145
+ 146
+ 139
+ 140
+ 141
+ 142
+ 144
+ 166
+ 167
+ 168
+ 169
+ 170
+ 176
+ 177
+ 178
+ 179
+ 180
+ 181
+ 148
+ 149
+ 150
+ 151
+ 152
+ 153
+ 154
+ 155
+ 156
+ 157
+ 158
+ 159
+ 160
+ 161
+ 162
+ 163
+ 164
+ 165
+ 171
+ 172
+ 173
+ 174
+ 175
+
+
+ 135
+ 17
+ 51
+ 52
+ 98
+ 115
+ 116
+ 136
+ 143
+ 145
+ 146
+ 139
+ 140
+ 141
+ 142
+ 144
+ 166
+ 167
+ 168
+ 169
+ 170
+ 176
+ 177
+ 178
+ 179
+ 180
+ 181
+ 148
+ 149
+ 150
+ 151
+ 152
+ 153
+ 154
+ 155
+ 156
+ 157
+ 158
+ 159
+ 160
+ 161
+ 162
+ 163
+ 164
+ 165
+ 171
+ 172
+ 173
+ 174
+ 175
+
+
+ 14
+ 28
+ 41
+ 96
+ 104
+ 111
+ 143
+ 145
+ 146
+ 139
+ 140
+ 141
+ 142
+ 144
+ 166
+ 167
+ 168
+ 169
+ 170
+ 176
+ 177
+ 178
+ 179
+ 180
+ 181
+ 148
+ 149
+ 150
+ 151
+ 152
+ 153
+ 154
+ 155
+ 156
+ 157
+ 158
+ 159
+ 160
+ 161
+ 162
+ 163
+ 164
+ 165
+ 171
+ 172
+ 173
+ 174
+ 175
+
+
+ 14
+ 28
+ 41
+ 96
+ 104
+ 111
+ 13
+ 95
+ 145
+ 176
+ 177
+ 178
+
+
+ 3
+ 127
+ 128
+ 129
+ 46
+ 55
+ 57
+ 48
+ 2
+ 89
+ 131
+ 113
+ 117
+ 118
+ 132
+ 133
+ 114
+ 88
+ 140
+ 152
+ 153
+ 154
+ 155
+ 156
+ 157
+
+
+ 8
+ 23
+ 36
+ 93
+ 101
+ 108
+ 9
+ 24
+ 37
+ 92
+ 102
+ 109
+ 130
+ 134
+ 141
+ 142
+ 158
+ 159
+ 160
+ 161
+ 162
+ 163
+ 164
+
+
+ 5
+ 6
+ 33
+ 20
+ 90
+ 91
+ 106
+ 99
+ 139
+ 148
+ 149
+ 150
+ 151
+
+
+ 14
+ 28
+ 41
+ 96
+ 104
+ 111
+ 145
+ 176
+ 177
+ 178
+
+
+ 12
+ 27
+ 40
+ 13
+ 94
+ 103
+ 110
+ 95
+ 143
+ 166
+ 167
+ 168
+ 169
+ 170
+
+
+ 16
+ 30
+ 43
+ 97
+ 105
+ 112
+ 146
+ 179
+ 180
+ 181
+
+
+ 17
+ 51
+ 52
+ 21
+ 34
+ 135
+ 98
+ 115
+ 116
+ 100
+ 107
+ 136
+ 144
+ 171
+ 172
+ 173
+ 174
+ 175
+
+
+ 16
+ 30
+ 97
+ 105
+ 17
+ 98
+ 179
+ 180
+ 171
+
+
+ 12
+ 94
+ 27
+ 103
+ 13
+ 95
+ 14
+ 96
+ 28
+ 104
+ 168
+ 167
+ 176
+ 177
+
+
+ 2
+ 88
+ 3
+ 89
+ 5
+ 90
+ 6
+ 91
+ 8
+ 93
+ 9
+ 92
+ 20
+ 99
+ 21
+ 100
+ 23
+ 101
+ 24
+ 102
+ 152
+ 153
+ 148
+ 149
+ 158
+ 162
+ 150
+ 172
+ 159
+ 163
+
+
+ 46
+ 113
+ 48
+ 114
+ 51
+ 115
+ 52
+ 116
+ 154
+ 155
+ 174
+ 175
+
+
+ 55
+ 117
+ 161
+
+
+ 57
+ 118
+ 156
+
+
+ 36
+ 108
+ 37
+ 109
+ 33
+ 106
+ 41
+ 111
+ 40
+ 110
+ 43
+ 112
+ 34
+ 107
+ 160
+ 164
+ 151
+ 178
+ 169
+ 181
+ 173
+
+
+ 127
+ 131
+ 128
+ 132
+ 129
+ 133
+ 135
+ 136
+ 130
+ 134
+ 157
+ 170
+ 165
+
+
+ 5
+ 20
+ 90
+ 99
+ 148
+ 150
+
+
+ 6
+ 33
+ 91
+ 106
+ 149
+ 151
+
+
+ 0
+ 1
+ 2
+ 3
+ 4
+ 5
+ 6
+ 7
+ 8
+ 18
+ 19
+ 20
+ 21
+ 22
+ 23
+ 31
+ 32
+ 33
+ 34
+ 35
+ 36
+ 44
+ 45
+ 46
+ 47
+ 48
+ 53
+ 54
+ 55
+ 56
+ 57
+ 88
+ 89
+ 90
+ 91
+ 93
+ 99
+ 100
+ 101
+ 106
+ 107
+ 108
+ 113
+ 114
+ 117
+ 118
+ 123
+ 124
+ 125
+ 126
+ 127
+ 128
+ 129
+ 131
+ 132
+ 133
+ 135
+ 136
+ 139
+ 140
+ 141
+ 144
+ 148
+ 149
+ 150
+ 151
+ 152
+ 153
+ 154
+ 155
+ 156
+ 157
+ 158
+ 159
+ 160
+ 161
+ 171
+ 172
+ 173
+ 174
+ 175
+ 182
+ 184
+ 186
+ 188
+
+
+ 4
+ 5
+ 6
+ 19
+ 32
+ 20
+ 21
+ 33
+ 34
+ 90
+ 91
+ 99
+ 100
+ 106
+ 107
+ 139
+ 148
+ 149
+ 150
+ 151
+
+
+ 11
+ 15
+ 26
+ 29
+ 39
+ 42
+ 12
+ 13
+ 14
+ 16
+ 17
+ 27
+ 28
+ 30
+ 40
+ 41
+ 43
+ 94
+ 95
+ 96
+ 97
+ 98
+ 103
+ 104
+ 105
+ 110
+ 111
+ 112
+ 143
+ 145
+ 146
+ 166
+ 167
+ 168
+ 169
+ 176
+ 177
+ 178
+ 179
+ 180
+ 181
+
+
+ 1
+ 2
+ 3
+ 54
+ 56
+ 55
+ 57
+ 117
+ 118
+ 88
+ 89
+ 140
+ 144
+ 152
+ 153
+ 156
+ 171
+ 172
+ 173
+
+
+ 7
+ 22
+ 35
+ 8
+ 9
+ 23
+ 24
+ 36
+ 37
+ 92
+ 93
+ 101
+ 102
+ 108
+ 109
+ 141
+ 142
+ 158
+ 159
+ 160
+ 161
+ 162
+ 163
+ 164
+
+
+ 125
+ 126
+ 127
+ 128
+ 129
+ 130
+ 135
+ 131
+ 132
+ 133
+ 134
+ 136
+ 157
+ 170
+ 165
+
+
+ 45
+ 47
+ 46
+ 48
+ 113
+ 114
+ 154
+ 155
+ 174
+ 175
+
+
+ 50
+ 51
+ 52
+ 115
+ 116
+
+
+ 182
+ 184
+ 186
+ 188
+
+
+ 183
+ 185
+ 187
+ 189
+
+
+ 16067
+ 16071
+ 16072
+
+
+ 18869
+ 18870
+ 18871
+ 18872
+ 18873
+ 18874
+ 18875
+ 18876
+ 18877
+ 18878
+ 18879
+ 18880
+ 18881
+ 18882
+ 18883
+ 18884
+ 18885
+ 18886
+ 18887
+ 18888
+ 18889
+ 18890
+ 18891
+ 18892
+ 18893
+ 18894
+ 18895
+ 18896
+ 18897
+ 18898
+ 18899
+ 18900
+ 18901
+ 18902
+ 18903
+ 18904
+
+
+ 18905
+ 18906
+ 18907
+
+
+ 18850
+ 18851
+ 18852
+
+
+ 32913
+ 32914
+ 33097
+ 32922
+ 33098
+ 33099
+ 33131
+ 33132
+ 14001
+ 14002
+ 14003
+ 14004
+ 14005
+ 14006
+ 14007
+ 14008
+ 14009
+ 14010
+ 14011
+ 14012
+ 14013
+ 14014
+ 14015
+ 14016
+ 14017
+ 14018
+ 14019
+ 14020
+ 14021
+ 14022
+ 14023
+ 14024
+ 14025
+ 14026
+ 14027
+ 14028
+ 14029
+ 14030
+ 14031
+ 14032
+ 14033
+ 14034
+ 14035
+ 14036
+ 14037
+ 14038
+ 14039
+ 14040
+ 14041
+ 14042
+ 14043
+ 14044
+ 14045
+ 14046
+ 14047
+ 14048
+ 14049
+ 14050
+ 14051
+ 14052
+ 14053
+ 14054
+ 14055
+ 14056
+ 14057
+ 14058
+ 14059
+ 14060
+ 14061
+ 14062
+ 14063
+ 14064
+ 14065
+ 14066
+ 14067
+ 14068
+ 14069
+ 14070
+ 14071
+ 14072
+ 14073
+ 14074
+ 14075
+ 14076
+ 14077
+ 14078
+ 14079
+ 14080
+ 14081
+ 14082
+ 14083
+ 14084
+ 14085
+ 14086
+ 14087
+ 14088
+ 14089
+ 14090
+ 14091
+ 14092
+ 14093
+ 14094
+ 14095
+ 14096
+ 14097
+ 14098
+ 14099
+ 14100
+ 14101
+ 14102
+ 14103
+ 14104
+ 14105
+ 14106
+ 14107
+ 14108
+ 14109
+ 14110
+ 14111
+ 14112
+ 14113
+ 14114
+ 14115
+ 14116
+ 14117
+ 14118
+ 14119
+ 14120
+ 14121
+ 14122
+ 14123
+ 14124
+ 14125
+ 14126
+ 14127
+ 14128
+ 14129
+ 14130
+ 14131
+ 14132
+ 14133
+ 14134
+ 14135
+ 14136
+ 14137
+ 14138
+ 14139
+ 14140
+ 14141
+ 14142
+ 14143
+ 14144
+ 14145
+ 14146
+ 14147
+ 14148
+ 14149
+ 14150
+ 14151
+ 14152
+ 14153
+ 14154
+ 14155
+ 14156
+ 14157
+ 14158
+ 14159
+ 14160
+ 14161
+ 14162
+ 14163
+ 14164
+ 14165
+ 14166
+ 14167
+ 14168
+ 14169
+ 14170
+ 14171
+ 14172
+ 14173
+ 14174
+ 14175
+ 14176
+ 14177
+ 14178
+ 14179
+ 14180
+ 14181
+ 14182
+ 14183
+ 14184
+ 14185
+ 14186
+ 14187
+ 14188
+ 14189
+ 14190
+ 14191
+ 14192
+ 14193
+ 14194
+ 14195
+ 14196
+ 14197
+ 14198
+ 14199
+ 14200
+ 14201
+ 14202
+ 14203
+ 14204
+ 14205
+ 14206
+ 14207
+ 14208
+ 14209
+ 14210
+ 14211
+ 14212
+ 14213
+ 14214
+ 14215
+ 14216
+ 14217
+ 14218
+ 14219
+ 14220
+ 14221
+ 14222
+ 14223
+ 14224
+ 14225
+ 14226
+ 14227
+ 14228
+ 14229
+ 14230
+ 14231
+ 14232
+ 14233
+ 14234
+ 14235
+ 14236
+ 14237
+ 14238
+ 14239
+ 14240
+ 14241
+ 14242
+ 14243
+ 14244
+ 14245
+ 14246
+ 14247
+ 14248
+ 14249
+ 14250
+ 14251
+ 14252
+ 14253
+ 14254
+ 14255
+ 14256
+ 14257
+ 14258
+ 14259
+ 14260
+ 14265
+ 14266
+ 14267
+ 14268
+ 14269
+ 14270
+ 14271
+ 14272
+ 14273
+ 14274
+ 14275
+ 14276
+ 14277
+ 14278
+ 14279
+ 14280
+ 14281
+ 14282
+ 14283
+ 14284
+ 14285
+ 14286
+ 14287
+ 14288
+ 14289
+ 14290
+ 14291
+ 14292
+ 14293
+ 14294
+ 14295
+ 14296
+ 14297
+ 14298
+ 14299
+ 14300
+ 14301
+ 14302
+ 14303
+ 14304
+ 14305
+ 14306
+ 14307
+ 14308
+ 14309
+ 14310
+ 14311
+ 14312
+ 14313
+ 14314
+ 14315
+ 14316
+ 14317
+ 14318
+ 14319
+ 14320
+ 14321
+ 14322
+ 14323
+ 14324
+ 14325
+ 14326
+ 14327
+ 14328
+ 14329
+ 14330
+ 14331
+ 14332
+ 14333
+ 14334
+ 14335
+ 14336
+ 14337
+ 14338
+ 14339
+ 14340
+ 14341
+ 14342
+ 14343
+ 14344
+ 14345
+ 14346
+ 14347
+ 14348
+ 14349
+ 14350
+ 14351
+ 14352
+ 14353
+ 14354
+ 14355
+ 14356
+ 14357
+ 14358
+ 14359
+ 14360
+ 14361
+ 14362
+ 14363
+ 14364
+ 14365
+ 14366
+ 14367
+ 14368
+ 14369
+ 14370
+ 14371
+ 14372
+ 14373
+ 14374
+ 14375
+ 14376
+ 14377
+ 14378
+ 14379
+ 14380
+ 14381
+ 14382
+ 14383
+ 14384
+ 14385
+ 14386
+ 14387
+ 14388
+ 14389
+ 14390
+ 14391
+ 14392
+ 14393
+ 14394
+ 14395
+ 14396
+ 14397
+ 14398
+ 14399
+ 14400
+ 14401
+ 14402
+ 14403
+ 14404
+ 14405
+ 14406
+ 14407
+ 14408
+ 14409
+ 14410
+ 14411
+ 14412
+ 14413
+ 14414
+ 14415
+ 14416
+ 14417
+ 14418
+ 14419
+ 14420
+ 14421
+ 14422
+ 14423
+ 14424
+ 14425
+ 14426
+ 14427
+ 14428
+ 14429
+ 14430
+ 14431
+ 14432
+ 14433
+ 14434
+ 14435
+ 14436
+ 14437
+ 14438
+ 14439
+ 14440
+ 14441
+ 14442
+ 14443
+ 14444
+ 14449
+ 14450
+ 14451
+ 14452
+ 14453
+ 14454
+ 14455
+ 14456
+ 14457
+ 14458
+ 14459
+ 14460
+ 14461
+ 14462
+ 14463
+ 14464
+ 14465
+ 14466
+ 14467
+ 14468
+ 14469
+ 14470
+ 14471
+ 14472
+ 14473
+ 14474
+ 14475
+ 14476
+ 14477
+ 14478
+ 14479
+ 14480
+ 14481
+ 14482
+ 14483
+ 14484
+ 14485
+ 14486
+ 14487
+ 14488
+ 14489
+ 14490
+ 14491
+ 14492
+ 14493
+ 14494
+ 14495
+ 14496
+ 14497
+ 14498
+ 14499
+ 14500
+ 14501
+ 14502
+ 14503
+ 14504
+ 14505
+ 14506
+ 14507
+ 14508
+ 14509
+ 14510
+ 14511
+ 14512
+ 14513
+ 14514
+ 14515
+ 14516
+ 14517
+ 14518
+ 14519
+ 14520
+ 14521
+ 14522
+ 14523
+ 14524
+ 14525
+ 14526
+ 14527
+ 14528
+ 14529
+ 14530
+ 14531
+ 14532
+ 14533
+ 14534
+ 14535
+ 14536
+ 14537
+ 14538
+ 14539
+ 14540
+ 14541
+ 14542
+ 14543
+ 14544
+ 14545
+ 14546
+ 14547
+ 14548
+ 14549
+ 14550
+ 14551
+ 14552
+ 14553
+ 14554
+ 14555
+ 14556
+ 14557
+ 14558
+ 14559
+ 14560
+ 14561
+ 14562
+ 14563
+ 14564
+ 14565
+ 14566
+ 14567
+ 14568
+ 14569
+ 14570
+ 14571
+ 14572
+ 14573
+ 14574
+ 14575
+ 14576
+ 14577
+ 14578
+ 14579
+ 14580
+ 14581
+ 14582
+ 14583
+ 14584
+ 14585
+ 14586
+ 14587
+ 14588
+ 14589
+ 14590
+ 14591
+ 14592
+ 14593
+ 14594
+ 14595
+ 14596
+ 14597
+ 14598
+ 14599
+ 14600
+ 14601
+ 14602
+ 14603
+ 14604
+ 14605
+ 14606
+ 14607
+ 14608
+ 14609
+ 14610
+ 14611
+ 14612
+ 14613
+ 14614
+ 14615
+ 14616
+ 14617
+ 14618
+ 14619
+ 14620
+ 14621
+ 14622
+ 14623
+ 14624
+ 14625
+ 14626
+ 14627
+ 14628
+ 14633
+ 14634
+ 14635
+ 14636
+ 14637
+ 14638
+ 14639
+ 14640
+ 14641
+ 14642
+ 14643
+ 14644
+ 14645
+ 14646
+ 14647
+ 14648
+ 14649
+ 14650
+ 14651
+ 14652
+ 14653
+ 14654
+ 14655
+ 14656
+ 14657
+ 14658
+ 14659
+ 14660
+ 14661
+ 14662
+ 14663
+ 14664
+ 14665
+ 14666
+ 14667
+ 14668
+ 14669
+ 14670
+ 14671
+ 14672
+ 14673
+ 14674
+ 14675
+ 14676
+ 14677
+ 14678
+ 14679
+ 14680
+ 14681
+ 14682
+ 14683
+ 14684
+ 14685
+ 14686
+ 14687
+ 14688
+ 14689
+ 14690
+ 14691
+ 14692
+ 14693
+ 14694
+ 14695
+ 14696
+ 14697
+ 14698
+ 14699
+ 14700
+ 14701
+ 14702
+ 14703
+ 14704
+ 14705
+ 14706
+ 14707
+ 14708
+ 14709
+ 14710
+ 14711
+ 14712
+ 14713
+ 14714
+ 14715
+ 14716
+ 14717
+ 14718
+ 14719
+ 14720
+ 14721
+ 14722
+ 14723
+ 14724
+ 14725
+ 14726
+ 14727
+ 14728
+ 14729
+ 14730
+ 14731
+ 14732
+ 14733
+ 14734
+ 14735
+ 14736
+ 14737
+ 14738
+ 14739
+ 14740
+ 14741
+ 14742
+ 14743
+ 14744
+ 14745
+ 14746
+ 14747
+ 14748
+ 14749
+ 14750
+ 14751
+ 14752
+ 14753
+ 14754
+ 14755
+ 14756
+ 14757
+ 14758
+ 14759
+ 14760
+ 14761
+ 14762
+ 14763
+ 14764
+ 14765
+ 14766
+ 14767
+ 14768
+ 14769
+ 14770
+ 14771
+ 14772
+ 14773
+ 14774
+ 14775
+ 14776
+ 14777
+ 14778
+ 14779
+ 14780
+ 14781
+ 14782
+ 14783
+ 14784
+ 14785
+ 14786
+ 14787
+ 14788
+ 14789
+ 14790
+ 14791
+ 14792
+ 14793
+ 14794
+ 14795
+ 14796
+ 14797
+ 14798
+ 14799
+ 14800
+ 14801
+ 14802
+ 14803
+ 14804
+ 14805
+ 14806
+ 14807
+ 14808
+ 14809
+ 14810
+ 14811
+ 14812
+ 14813
+ 14814
+ 14815
+ 14816
+ 14817
+ 14818
+ 14819
+ 14820
+ 14821
+ 14822
+ 14823
+ 14824
+ 14825
+ 14826
+ 14827
+ 14828
+ 14829
+ 14830
+ 14831
+ 14832
+ 14833
+ 14834
+ 14835
+ 14836
+ 14837
+ 14838
+ 14839
+ 14840
+ 14841
+ 14842
+ 14843
+ 14844
+ 14845
+ 14846
+ 14847
+ 14848
+ 14849
+ 14850
+ 14851
+ 14852
+ 14853
+ 14854
+ 14855
+ 14856
+ 14857
+ 14858
+ 14859
+ 14860
+ 14861
+ 14862
+ 14863
+ 14864
+ 14865
+ 14866
+ 14867
+ 14868
+ 14869
+ 12077
+ 12311
+ 12312
+ 12313
+ 12526
+ 12527
+ 12528
+ 12564
+ 12621
+ 12780
+ 12781
+ 12782
+ 16025
+ 13071
+ 13072
+ 13073
+ 13074
+ 13075
+ 13076
+ 14870
+ 14871
+ 14872
+ 14873
+ 14874
+ 14875
+ 14876
+ 14877
+ 14878
+ 14879
+ 14880
+ 14881
+ 14882
+ 14883
+ 14884
+ 14885
+ 14886
+ 14887
+ 14888
+ 14889
+ 14890
+ 14891
+ 14892
+ 14893
+ 14894
+ 14895
+ 14896
+ 14897
+ 14898
+ 14899
+ 14900
+ 14901
+ 14902
+ 14903
+ 14904
+ 14905
+ 14906
+ 14907
+ 14908
+ 14909
+ 14910
+ 14911
+ 14912
+ 14913
+ 14914
+ 14915
+ 16030
+ 16034
+ 16035
+ 16036
+ 16037
+ 16038
+ 16039
+ 16040
+ 16041
+ 16042
+ 16043
+ 16044
+ 16045
+ 16046
+ 14916
+ 14917
+ 14918
+ 16050
+ 16051
+ 16052
+ 16053
+ 16067
+ 16068
+ 16071
+ 16072
+
+
+ 32915
+ 32916
+ 33142
+ 33143
+ 33144
+ 33145
+ 33147
+ 33148
+ 33137
+
+
+ 32915
+ 32916
+ 32917
+ 32918
+ 32919
+ 32920
+ 33147
+ 33148
+ 32913
+ 32914
+ 33097
+
+
+ 90
+ 91
+ 99
+ 106
+
+
+ 88
+ 89
+ 113
+ 114
+ 118
+ 131
+
+
+ 93
+ 101
+ 108
+ 117
+
+
+ 92
+ 102
+ 109
+ 134
+
+
+ 95
+ 94
+ 103
+ 110
+ 132
+ 133
+
+
+ 96
+ 104
+ 111
+
+
+ 97
+ 105
+ 112
+
+
+ 98
+ 100
+ 107
+ 116
+ 115
+ 136
+
+
+ 19117
+ 19118
+
+
+ 32908
+
+
+ 14930
+ 14954
+ 14955
+ 14956
+ 14957
+ 14958
+ 14959
+ 14960
+ 14931
+ 14961
+ 14962
+ 14963
+ 14964
+ 14965
+ 14966
+ 14967
+ 15032
+ 15033
+ 15034
+ 15035
+ 15036
+ 15037
+ 15038
+ 15039
+ 15040
+ 15041
+ 15042
+ 15043
+ 15044
+ 15045
+ 15046
+ 15047
+ 15048
+ 15049
+ 15050
+ 15051
+ 14929
+ 14947
+ 14948
+ 14949
+ 14950
+ 14951
+ 14952
+ 14953
+ 15022
+ 15023
+ 15024
+ 15025
+ 15026
+ 15027
+ 15028
+ 15029
+ 15030
+ 15031
+
+
+ 0
+ 18
+ 31
+ 44
+ 53
+ 123
+ 124
+
+
+ 10
+ 25
+ 38
+ 49
+
+
+ 4
+ 19
+ 32
+
+
+ 1
+ 7
+ 22
+ 35
+ 45
+ 47
+ 125
+ 126
+ 50
+ 54
+ 56
+
+
+ 11
+ 26
+ 39
+
+
+ 15
+ 29
+ 42
+
+
+ 5
+ 6
+ 20
+ 33
+
+
+ 2
+ 3
+ 46
+ 48
+ 127
+ 128
+ 129
+ 57
+ 135
+
+
+ 8
+ 23
+ 36
+ 55
+
+
+ 12
+ 27
+ 40
+ 13
+
+
+ 9
+ 130
+ 37
+ 24
+
+
+ 17
+ 52
+
+
+ 14
+ 28
+ 41
+
+
+ 16
+ 30
+ 34
+ 43
+ 21
+ 51
+
+
+ 90
+ 91
+ 99
+ 106
+
+
+ 88
+ 89
+ 113
+ 114
+ 118
+ 131
+ 132
+ 133
+ 136
+
+
+ 93
+ 101
+ 108
+ 101
+ 117
+
+
+ 94
+ 103
+ 110
+ 95
+
+
+ 92
+ 102
+ 109
+ 134
+
+
+ 116
+ 98
+ 115
+
+
+ 96
+ 104
+ 111
+
+
+ 97
+ 105
+ 112
+ 107
+ 100
+
+
+ 5
+ 6
+ 20
+ 33
+ 90
+ 91
+ 99
+ 106
+ 139
+ 148
+ 149
+ 150
+ 151
+
+
+ 3
+ 2
+ 46
+ 48
+ 89
+ 88
+ 113
+ 114
+ 118
+ 140
+ 152
+ 153
+ 154
+ 155
+ 156
+
+
+ 8
+ 23
+ 36
+ 55
+ 93
+ 101
+ 108
+ 117
+ 141
+ 158
+ 159
+ 160
+ 161
+
+
+ 9
+ 24
+ 37
+ 92
+ 102
+ 109
+ 142
+ 162
+ 163
+ 164
+
+
+ 12
+ 13
+ 27
+ 40
+ 94
+ 95
+ 103
+ 110
+ 143
+ 166
+ 167
+ 168
+ 169
+
+
+ 14
+ 28
+ 41
+ 96
+ 104
+ 111
+ 145
+ 176
+ 177
+ 178
+
+
+ 16
+ 30
+ 43
+ 97
+ 105
+ 112
+ 146
+ 179
+ 180
+ 181
+
+
+ 17
+ 21
+ 34
+ 52
+ 98
+ 116
+ 100
+ 107
+ 115
+ 144
+ 171
+ 172
+ 173
+ 174
+ 175
+
+
+ 51
+ 57
+
+
+ 127
+ 130
+ 128
+ 129
+ 135
+ 131
+ 134
+ 132
+ 133
+ 136
+ 157
+ 170
+ 165
+
+
+ 0
+ 1
+ 2
+ 3
+ 4
+ 5
+ 6
+ 7
+ 8
+ 9
+ 18
+ 19
+ 20
+ 21
+ 22
+ 23
+ 24
+ 31
+ 32
+ 33
+ 34
+ 35
+ 36
+ 37
+ 44
+ 45
+ 46
+ 47
+ 48
+ 53
+ 54
+ 55
+ 56
+ 57
+ 88
+ 89
+ 90
+ 91
+ 92
+ 93
+ 99
+ 100
+ 101
+ 102
+ 106
+ 107
+ 108
+ 109
+ 113
+ 114
+ 117
+ 118
+ 139
+ 140
+ 141
+ 142
+ 144
+ 10
+ 11
+ 12
+ 13
+ 14
+ 15
+ 16
+ 17
+ 25
+ 26
+ 27
+ 28
+ 29
+ 30
+ 38
+ 39
+ 40
+ 41
+ 42
+ 43
+ 49
+ 50
+ 51
+ 52
+ 94
+ 95
+ 96
+ 97
+ 98
+ 103
+ 104
+ 105
+ 110
+ 111
+ 112
+ 115
+ 116
+ 143
+ 145
+ 146
+ 148
+ 149
+ 150
+ 151
+ 152
+ 153
+ 154
+ 155
+ 156
+ 158
+ 159
+ 160
+ 161
+ 162
+ 163
+ 164
+ 166
+ 167
+ 168
+ 169
+ 171
+ 172
+ 173
+ 174
+ 175
+ 176
+ 177
+ 178
+ 179
+ 180
+ 181
+ 182
+ 184
+ 186
+ 188
+ 183
+ 185
+ 187
+ 189
+
+
+ 143
+ 145
+ 146
+ 166
+ 167
+ 176
+ 179
+
+
+ 139
+ 140
+ 141
+ 142
+ 144
+ 148
+ 149
+ 152
+ 153
+ 158
+ 162
+ 171
+
+
+ 5
+ 6
+ 20
+ 33
+ 90
+ 91
+ 99
+ 106
+ 139
+ 148
+ 149
+ 150
+ 151
+
+
+ 3
+ 2
+ 46
+ 48
+ 127
+ 57
+ 89
+ 88
+ 113
+ 114
+ 118
+ 131
+ 140
+ 152
+ 153
+ 154
+ 155
+ 156
+ 184
+ 186
+ 188
+
+
+ 8
+ 23
+ 36
+ 55
+ 93
+ 101
+ 108
+ 117
+ 141
+ 158
+ 159
+ 160
+ 161
+
+
+ 9
+ 24
+ 37
+ 130
+ 92
+ 102
+ 109
+ 134
+ 142
+ 162
+ 163
+ 164
+ 165
+
+
+ 12
+ 13
+ 27
+ 40
+ 128
+ 129
+ 94
+ 95
+ 103
+ 110
+ 132
+ 133
+ 143
+ 166
+ 167
+ 168
+ 169
+ 170
+
+
+ 14
+ 28
+ 41
+ 96
+ 104
+ 111
+ 145
+ 176
+ 177
+ 178
+
+
+ 17
+ 21
+ 34
+ 52
+ 135
+ 51
+ 98
+ 116
+ 100
+ 107
+ 115
+ 136
+ 144
+ 171
+ 172
+ 173
+ 174
+ 175
+
+
+ 16
+ 30
+ 43
+ 97
+ 105
+ 112
+ 146
+ 179
+ 180
+ 181
+
+
+ 88
+ 89
+ 90
+ 91
+ 93
+ 92
+ 94
+ 95
+ 96
+ 97
+ 98
+
+
+ 99
+ 100
+ 101
+ 102
+ 103
+ 104
+ 105
+
+
+ 106
+ 107
+ 108
+ 109
+ 110
+ 111
+ 112
+
+
+ 113
+ 114
+ 115
+ 116
+
+
+ 117
+ 118
+
+
+ 8401
+ 8402
+ 8403
+ 8405
+ 8417
+ 8422
+ 8423
+ 8424
+ 8425
+ 8416
+
+
+ 8407
+ 8408
+ 8409
+ 8410
+ 8411
+ 8412
+ 8413
+ 8414
+ 8415
+ 8428
+ 8429
+ 8430
+ 8431
+ 8432
+
+
+ 8516
+ 8517
+ 8514
+ 8515
+ 8512
+ 8513
+
+
+ 182
+ 184
+ 186
+ 188
+ 183
+ 185
+ 187
+ 189
+
+
+ 182
+ 183
+
+
+ 184
+ 185
+
+
+ 186
+ 187
+
+
+ 188
+ 189
+
+
+ 183
+ 185
+ 187
+ 189
+
+
+ 182
+ 184
+ 186
+ 188
+
+
+ 187
+
+
+ 186
+
+
+ 0
+ 1
+ 2
+ 3
+ 4
+ 5
+ 6
+ 7
+ 8
+ 9
+ 18
+ 19
+ 20
+ 21
+ 22
+ 23
+ 24
+ 31
+ 32
+ 33
+ 34
+ 35
+ 36
+ 37
+ 44
+ 45
+ 46
+ 47
+ 48
+ 53
+ 54
+ 55
+ 56
+ 57
+ 88
+ 89
+ 90
+ 91
+ 92
+ 93
+ 99
+ 100
+ 101
+ 102
+ 106
+ 107
+ 108
+ 109
+ 113
+ 114
+ 117
+ 118
+ 123
+ 124
+ 125
+ 126
+ 127
+ 128
+ 129
+ 130
+ 131
+ 132
+ 133
+ 134
+ 135
+ 136
+ 139
+ 140
+ 141
+ 142
+ 144
+ 148
+ 149
+ 150
+ 151
+ 152
+ 153
+ 154
+ 155
+ 156
+ 157
+ 158
+ 159
+ 160
+ 161
+ 162
+ 163
+ 164
+ 165
+ 171
+ 172
+ 173
+ 174
+ 175
+ 10
+ 11
+ 12
+ 13
+ 14
+ 15
+ 16
+ 17
+ 25
+ 26
+ 27
+ 28
+ 29
+ 30
+ 38
+ 39
+ 40
+ 41
+ 42
+ 43
+ 49
+ 50
+ 51
+ 52
+ 94
+ 95
+ 96
+ 97
+ 98
+ 103
+ 104
+ 105
+ 110
+ 111
+ 112
+ 115
+ 116
+ 143
+ 145
+ 146
+ 166
+ 167
+ 168
+ 169
+ 170
+ 176
+ 177
+ 178
+ 179
+ 180
+ 181
+
+
+ 1
+ 2
+ 3
+ 4
+ 5
+ 6
+ 19
+ 20
+ 21
+ 32
+ 33
+ 34
+ 45
+ 46
+ 56
+ 57
+ 88
+ 89
+ 90
+ 91
+ 99
+ 100
+ 106
+ 107
+ 113
+ 118
+ 139
+ 140
+ 148
+ 149
+ 150
+ 151
+ 152
+ 153
+ 154
+ 155
+ 156
+ 157
+ 49
+ 50
+ 51
+ 52
+ 115
+ 116
+
+
+ 0
+ 7
+ 8
+ 9
+ 18
+ 22
+ 23
+ 24
+ 31
+ 35
+ 36
+ 37
+ 44
+ 47
+ 48
+ 53
+ 54
+ 55
+ 92
+ 93
+ 101
+ 102
+ 108
+ 109
+ 114
+ 123
+ 124
+ 125
+ 126
+ 127
+ 128
+ 129
+ 130
+ 131
+ 132
+ 133
+ 134
+ 135
+ 136
+ 141
+ 142
+ 144
+ 158
+ 159
+ 160
+ 161
+ 162
+ 163
+ 164
+ 165
+ 171
+ 172
+ 173
+ 174
+ 175
+ 182
+ 184
+ 186
+ 188
+
+
+ 10
+ 11
+ 12
+ 13
+ 14
+ 15
+ 16
+ 17
+ 25
+ 26
+ 27
+ 28
+ 29
+ 30
+ 38
+ 39
+ 40
+ 41
+ 42
+ 43
+ 94
+ 95
+ 96
+ 97
+ 98
+ 103
+ 104
+ 105
+ 110
+ 111
+ 112
+ 143
+ 145
+ 146
+ 166
+ 167
+ 168
+ 169
+ 170
+ 176
+ 177
+ 178
+ 179
+ 180
+ 181
+ 183
+ 185
+ 187
+ 189
+
\ No newline at end of file
diff --git a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/ai/areas/TalkingIsland/AwakeningMaster/AwakeningMaster.java b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/ai/areas/TalkingIsland/AwakeningMaster/AwakeningMaster.java
index 25db941e6f..1a41e95122 100644
--- a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/ai/areas/TalkingIsland/AwakeningMaster/AwakeningMaster.java
+++ b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/ai/areas/TalkingIsland/AwakeningMaster/AwakeningMaster.java
@@ -68,17 +68,16 @@ public final class AwakeningMaster extends AbstractNpcAI
private static final int CHAOS_POMANDER = 37374;
private static final int CHAOS_POMANDER_DUAL_CLASS = 37375;
private static final Map AWAKE_POWER = new HashMap<>();
-
static
{
- AWAKE_POWER.put(CategoryType.SIGEL_GROUP, 32264);
- AWAKE_POWER.put(CategoryType.TYRR_GROUP, 32265);
- AWAKE_POWER.put(CategoryType.OTHELL_GROUP, 32266);
- AWAKE_POWER.put(CategoryType.YUL_GROUP, 32267);
- AWAKE_POWER.put(CategoryType.FEOH_GROUP, 32268);
- AWAKE_POWER.put(CategoryType.ISS_GROUP, 32269);
- AWAKE_POWER.put(CategoryType.WYNN_GROUP, 32270);
- AWAKE_POWER.put(CategoryType.AEORE_GROUP, 32271);
+ AWAKE_POWER.put(CategoryType.SIXTH_SIGEL_GROUP, 32264);
+ AWAKE_POWER.put(CategoryType.SIXTH_TIR_GROUP, 32265);
+ AWAKE_POWER.put(CategoryType.SIXTH_OTHEL_GROUP, 32266);
+ AWAKE_POWER.put(CategoryType.SIXTH_YR_GROUP, 32267);
+ AWAKE_POWER.put(CategoryType.SIXTH_FEOH_GROUP, 32268);
+ AWAKE_POWER.put(CategoryType.SIXTH_WYNN_GROUP, 32269);
+ AWAKE_POWER.put(CategoryType.SIXTH_IS_GROUP, 32270);
+ AWAKE_POWER.put(CategoryType.SIXTH_EOLH_GROUP, 32271);
}
// Skills
@@ -117,7 +116,7 @@ public final class AwakeningMaster extends AbstractNpcAI
{
case SIGEL_MASTER:
{
- if (!player.isInCategory(CategoryType.SIGEL_CANDIDATE))
+ if (!player.isInCategory(CategoryType.TANKER_CATEGORY))
{
return SIGEL_MASTER + "-no_class.htm";
}
@@ -125,7 +124,7 @@ public final class AwakeningMaster extends AbstractNpcAI
}
case TYRR_MASTER:
{
- if (!player.isInCategory(CategoryType.TYRR_CANDIDATE))
+ if (!player.isInCategory(CategoryType.WARRIOR_CATEGORY))
{
return TYRR_MASTER + "-no_class.htm";
}
@@ -133,7 +132,7 @@ public final class AwakeningMaster extends AbstractNpcAI
}
case OTHELL_MASTER:
{
- if (!player.isInCategory(CategoryType.OTHELL_CANDIDATE))
+ if (!player.isInCategory(CategoryType.ROGUE_CATEGORY))
{
return OTHELL_MASTER + "-no_class.htm";
}
@@ -141,7 +140,7 @@ public final class AwakeningMaster extends AbstractNpcAI
}
case YUL_MASTER:
{
- if (!player.isInCategory(CategoryType.YUL_CANDIDATE))
+ if (!player.isInCategory(CategoryType.ARCHER_CATEGORY))
{
return YUL_MASTER + "-no_class.htm";
}
@@ -149,7 +148,7 @@ public final class AwakeningMaster extends AbstractNpcAI
}
case FEOH_MASTER:
{
- if (!player.isInCategory(CategoryType.FEOH_CANDIDATE))
+ if (!player.isInCategory(CategoryType.WIZARD_CATEGORY))
{
return FEOH_MASTER + "-no_class.htm";
}
@@ -157,7 +156,7 @@ public final class AwakeningMaster extends AbstractNpcAI
}
case ISS_MASTER:
{
- if (!player.isInCategory(CategoryType.ISS_CANDIDATE))
+ if (!player.isInCategory(CategoryType.ENCHANTER_CATEGORY))
{
return ISS_MASTER + "-no_class.htm";
}
@@ -165,7 +164,7 @@ public final class AwakeningMaster extends AbstractNpcAI
}
case WYNN_MASTER:
{
- if (!player.isInCategory(CategoryType.WYNN_CANDIDATE))
+ if (!player.isInCategory(CategoryType.SUMMONER_CATEGORY))
{
return WYNN_MASTER + "-no_class.htm";
}
@@ -173,7 +172,7 @@ public final class AwakeningMaster extends AbstractNpcAI
}
case AEORE_MASTER:
{
- if (!player.isInCategory(CategoryType.AEORE_CANDIDATE))
+ if (!player.isInCategory(CategoryType.HEALER_CATEGORY))
{
return AEORE_MASTER + "-no_class.htm";
}
diff --git a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/ai/areas/TalkingIsland/Hadel/Hadel.java b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/ai/areas/TalkingIsland/Hadel/Hadel.java
index fdb12a0bb9..3c673a0a70 100644
--- a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/ai/areas/TalkingIsland/Hadel/Hadel.java
+++ b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/ai/areas/TalkingIsland/Hadel/Hadel.java
@@ -62,7 +62,7 @@ public final class Hadel extends AbstractNpcAI
}
case "teleportToHarnak":
{
- if ((!player.isInCategory(CategoryType.AWAKEN_GROUP)) || (player.getLevel() < 85))
+ if ((!player.isInCategory(CategoryType.SIXTH_CLASS_GROUP)) || (player.getLevel() < 85))
{
htmltext = "33344-noClass.html";
break;
diff --git a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/ai/areas/TalkingIsland/Hardin/Hardin.java b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/ai/areas/TalkingIsland/Hardin/Hardin.java
index 2c4bc51193..9feadede0f 100644
--- a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/ai/areas/TalkingIsland/Hardin/Hardin.java
+++ b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/ai/areas/TalkingIsland/Hardin/Hardin.java
@@ -183,7 +183,7 @@ public final class Hardin extends AbstractNpcAI
return "33870-02.html";
}
}
- if (!player.isInCategory(CategoryType.AWAKEN_GROUP))
+ if (!player.isInCategory(CategoryType.SIXTH_CLASS_GROUP))
{
return "33870-no.html";
}
diff --git a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/ai/areas/TalkingIsland/MonkOfChaos/MonkOfChaos.java b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/ai/areas/TalkingIsland/MonkOfChaos/MonkOfChaos.java
index bd823959b4..9757b3464d 100644
--- a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/ai/areas/TalkingIsland/MonkOfChaos/MonkOfChaos.java
+++ b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/ai/areas/TalkingIsland/MonkOfChaos/MonkOfChaos.java
@@ -78,7 +78,7 @@ public final class MonkOfChaos extends AbstractNpcAI
}
case "LearnRevelationSkills":
{
- if ((player.getLevel() < MIN_LEVEL) || !player.isInCategory(CategoryType.AWAKEN_GROUP))
+ if ((player.getLevel() < MIN_LEVEL) || !player.isInCategory(CategoryType.SIXTH_CLASS_GROUP))
{
htmltext = "no-learn.html";
break;
@@ -139,7 +139,7 @@ public final class MonkOfChaos extends AbstractNpcAI
}
}
- if ((player.getLevel() < MIN_LEVEL) || !player.isInCategory(CategoryType.AWAKEN_GROUP) || (count == 0))
+ if ((player.getLevel() < MIN_LEVEL) || !player.isInCategory(CategoryType.SIXTH_CLASS_GROUP) || (count == 0))
{
htmltext = "no-cancel.html";
break;
diff --git a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/ai/areas/TalkingIsland/Raina/Raina.java b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/ai/areas/TalkingIsland/Raina/Raina.java
index 5f8ec667e9..f61345700f 100644
--- a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/ai/areas/TalkingIsland/Raina/Raina.java
+++ b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/ai/areas/TalkingIsland/Raina/Raina.java
@@ -111,14 +111,14 @@ public final class Raina extends AbstractNpcAI
private static final Map classCloak = new HashMap<>();
{
- classCloak.put(CategoryType.SIGEL_GROUP, 30310); // Abelius Cloak
- classCloak.put(CategoryType.TYRR_GROUP, 30311); // Sapyros Cloak Grade
- classCloak.put(CategoryType.OTHELL_GROUP, 30312); // Ashagen Cloak Grade
- classCloak.put(CategoryType.YUL_GROUP, 30313); // Cranigg Cloak Grade
- classCloak.put(CategoryType.FEOH_GROUP, 30314); // Soltkreig Cloak Grade
- classCloak.put(CategoryType.WYNN_GROUP, 30315); // Naviarope Cloak Grade
- classCloak.put(CategoryType.ISS_GROUP, 30316); // Leister Cloak Grade
- classCloak.put(CategoryType.AEORE_GROUP, 30317); // Laksis Cloak Grade
+ classCloak.put(CategoryType.SIXTH_SIGEL_GROUP, 30310); // Abelius Cloak
+ classCloak.put(CategoryType.SIXTH_TIR_GROUP, 30311); // Sapyros Cloak Grade
+ classCloak.put(CategoryType.SIXTH_OTHEL_GROUP, 30312); // Ashagen Cloak Grade
+ classCloak.put(CategoryType.SIXTH_YR_GROUP, 30313); // Cranigg Cloak Grade
+ classCloak.put(CategoryType.SIXTH_FEOH_GROUP, 30314); // Soltkreig Cloak Grade
+ classCloak.put(CategoryType.SIXTH_WYNN_GROUP, 30315); // Naviarope Cloak Grade
+ classCloak.put(CategoryType.SIXTH_IS_GROUP, 30316); // Leister Cloak Grade
+ classCloak.put(CategoryType.SIXTH_EOLH_GROUP, 30317); // Laksis Cloak Grade
}
private static final List dualClassList = new ArrayList<>();
@@ -290,7 +290,7 @@ public final class Raina extends AbstractNpcAI
case "ertheiaDualClass":
{
// TODO: Maybe html is different when you have 85lvl but you haven't completed quest
- if ((player.getRace() != Race.ERTHEIA) || (player.getLevel() < 85) || !player.isInCategory(CategoryType.AWAKEN_GROUP) || player.hasDualClass() || !haveDoneQuest(player, true))
+ if ((player.getRace() != Race.ERTHEIA) || (player.getLevel() < 85) || !player.isInCategory(CategoryType.SIXTH_CLASS_GROUP) || player.hasDualClass() || !haveDoneQuest(player, true))
{
htmltext = "addDualClassErtheiaFailed.html";
}
@@ -309,7 +309,7 @@ public final class Raina extends AbstractNpcAI
case "addDualClass_WYNN_GROUP":
case "addDualClass_AEORE_GROUP":
{
- if ((player.getRace() != Race.ERTHEIA) || (player.getLevel() < 85) || !player.isInCategory(CategoryType.AWAKEN_GROUP) || player.hasDualClass() || !haveDoneQuest(player, true))
+ if ((player.getRace() != Race.ERTHEIA) || (player.getLevel() < 85) || !player.isInCategory(CategoryType.SIXTH_CLASS_GROUP) || player.hasDualClass() || !haveDoneQuest(player, true))
{
htmltext = "addDualClassErtheiaFailed.html";
break;
@@ -659,31 +659,31 @@ public final class Raina extends AbstractNpcAI
private void addPowerItem(L2PcInstance player)
{
int itemId = ABELIUS_POWER; // Sigel
- if (player.isInCategory(CategoryType.TYRR_GROUP))
+ if (player.isInCategory(CategoryType.SIXTH_TIR_GROUP))
{
itemId = SAPYROS_POWER;
}
- else if (player.isInCategory(CategoryType.OTHELL_GROUP))
+ else if (player.isInCategory(CategoryType.SIXTH_OTHEL_GROUP))
{
itemId = ASHAGEN_POWER;
}
- else if (player.isInCategory(CategoryType.YUL_GROUP))
+ else if (player.isInCategory(CategoryType.SIXTH_YR_GROUP))
{
itemId = CRANIGG_POWER;
}
- else if (player.isInCategory(CategoryType.FEOH_GROUP))
+ else if (player.isInCategory(CategoryType.SIXTH_FEOH_GROUP))
{
itemId = SOLTKREIG_POWER;
}
- else if (player.isInCategory(CategoryType.WYNN_GROUP))
+ else if (player.isInCategory(CategoryType.SIXTH_WYNN_GROUP))
{
itemId = NAVIAROPE_POWER;
}
- else if (player.isInCategory(CategoryType.ISS_GROUP))
+ else if (player.isInCategory(CategoryType.SIXTH_IS_GROUP))
{
itemId = LEISTER_POWER;
}
- else if (player.isInCategory(CategoryType.AEORE_GROUP))
+ else if (player.isInCategory(CategoryType.SIXTH_EOLH_GROUP))
{
itemId = LAKCIS_POWER;
}
@@ -905,37 +905,37 @@ public final class Raina extends AbstractNpcAI
{
CategoryType catType = null;
- if (player.isInCategory(CategoryType.SIGEL_GROUP))
+ if (player.isInCategory(CategoryType.SIXTH_SIGEL_GROUP))
{
- catType = CategoryType.SIGEL_GROUP;
+ catType = CategoryType.SIXTH_SIGEL_GROUP;
}
- else if (player.isInCategory(CategoryType.TYRR_GROUP))
+ else if (player.isInCategory(CategoryType.SIXTH_TIR_GROUP))
{
- catType = CategoryType.TYRR_GROUP;
+ catType = CategoryType.SIXTH_TIR_GROUP;
}
- else if (player.isInCategory(CategoryType.OTHELL_GROUP))
+ else if (player.isInCategory(CategoryType.SIXTH_OTHEL_GROUP))
{
- catType = CategoryType.OTHELL_GROUP;
+ catType = CategoryType.SIXTH_OTHEL_GROUP;
}
- else if (player.isInCategory(CategoryType.YUL_GROUP))
+ else if (player.isInCategory(CategoryType.SIXTH_YR_GROUP))
{
- catType = CategoryType.YUL_GROUP;
+ catType = CategoryType.SIXTH_YR_GROUP;
}
- else if (player.isInCategory(CategoryType.FEOH_GROUP))
+ else if (player.isInCategory(CategoryType.SIXTH_FEOH_GROUP))
{
- catType = CategoryType.FEOH_GROUP;
+ catType = CategoryType.SIXTH_FEOH_GROUP;
}
- else if (player.isInCategory(CategoryType.ISS_GROUP))
+ else if (player.isInCategory(CategoryType.SIXTH_IS_GROUP))
{
- catType = CategoryType.ISS_GROUP;
+ catType = CategoryType.SIXTH_IS_GROUP;
}
- else if (player.isInCategory(CategoryType.WYNN_GROUP))
+ else if (player.isInCategory(CategoryType.SIXTH_WYNN_GROUP))
{
- catType = CategoryType.WYNN_GROUP;
+ catType = CategoryType.SIXTH_WYNN_GROUP;
}
- else if (player.isInCategory(CategoryType.AEORE_GROUP))
+ else if (player.isInCategory(CategoryType.SIXTH_EOLH_GROUP))
{
- catType = CategoryType.AEORE_GROUP;
+ catType = CategoryType.SIXTH_EOLH_GROUP;
}
return classCloak.get(catType);
}
diff --git a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/ai/bosses/Kimerian/KimerianCommon.java b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/ai/bosses/Kimerian/KimerianCommon.java
index 87ecf2699a..51ee3bad82 100644
--- a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/ai/bosses/Kimerian/KimerianCommon.java
+++ b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/ai/bosses/Kimerian/KimerianCommon.java
@@ -152,7 +152,7 @@ public final class KimerianCommon extends AbstractInstance
{
if (hasQuestItems(player, FLUTE))
{
- if (player.isInCategory(CategoryType.AEORE_GROUP))
+ if (player.isInCategory(CategoryType.SIXTH_EOLH_GROUP))
{
addSpawn(FAIRY_REBEL, player.getX() + 60, player.getY(), player.getZ(), 0, false, 0, false, instance.getId());
addSpawn(FAIRY_REBEL, player.getX() - 60, player.getY(), player.getZ(), 0, false, 0, false, instance.getId());
diff --git a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/ai/others/AdventureGuildsman/AdventureGuildsman.java b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/ai/others/AdventureGuildsman/AdventureGuildsman.java
new file mode 100644
index 0000000000..2427ae2c1d
--- /dev/null
+++ b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/ai/others/AdventureGuildsman/AdventureGuildsman.java
@@ -0,0 +1,491 @@
+/*
+ * This file is part of the L2J Mobius project.
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see .
+ */
+package ai.others.AdventureGuildsman;
+
+import java.util.HashMap;
+import java.util.Map;
+
+import com.l2jmobius.commons.util.CommonUtil;
+import com.l2jmobius.gameserver.data.xml.impl.MultisellData;
+import com.l2jmobius.gameserver.enums.CategoryType;
+import com.l2jmobius.gameserver.model.actor.L2Npc;
+import com.l2jmobius.gameserver.model.actor.instance.L2PcInstance;
+import com.l2jmobius.gameserver.model.holders.SkillHolder;
+import com.l2jmobius.gameserver.model.skills.Skill;
+import com.l2jmobius.gameserver.model.skills.SkillCaster;
+import com.l2jmobius.gameserver.network.serverpackets.ExShowQuestInfo;
+
+import ai.AbstractNpcAI;
+
+/**
+ * Adventure Guildsman AI.
+ * @author ChaosPaladin
+ */
+public class AdventureGuildsman extends AbstractNpcAI
+{
+ // NPC
+ private static final int ADVENTURE_GUILDSMAN = 33946;
+ // Items
+ private static final int PCCAFE_LOTTERY_TICKET_30DAYS = 15358;
+ private static final int PCCAFE_1ST_LOTTERY_TICKET_30DAYS = 15359;
+ private static final int PCCAFE_2ND_LOTTERY_TICKET_30DAYS = 15360;
+ private static final int PCCAFE_3RD_LOTTERY_TICKET_30DAYS = 15361;
+ private static final int PCCAFE_4TH_LOTTERY_TICKET_30DAYS = 15362;
+ private static final int PCCAFE_5TH_LOTTERY_TICKET_30DAYS = 15363;
+ private static final int VOUCHER_LEV_85 = 17739;
+ private static final int VOUCHER_LEV_90 = 17740;
+ private static final int VOUCHER_LEV_95 = 17741;
+ private static final int VOUCHER_LEV_97 = 17742;
+ private static final int SEAL_LEV_85 = 17743;
+ private static final int SEAL_LEV_90 = 17744;
+ private static final int SEAL_LEV_95 = 17745;
+ private static final int SEAL_LEV_97 = 17746;
+ // Skills
+ private static final SkillHolder KNIGHT = new SkillHolder(17294, 1); // Player Commendation - Knight's Harmony
+ private static final SkillHolder WARRIOR = new SkillHolder(17295, 1); // Player Commendation - Warrior's Harmony
+ private static final SkillHolder WIZARD = new SkillHolder(17296, 1); // Player Commendation - Wizard's Harmony
+ private static final SkillHolder[] GROUP_MELODY =
+ {
+ new SkillHolder(9273, 1), // Player Commendation - Horn Melody
+ new SkillHolder(9274, 1), // Player Commendation - Drum Melody
+ new SkillHolder(9275, 1), // Player Commendation - Lute Melody
+ new SkillHolder(9276, 1), // Player Commendation - Pipe Organ Melody
+ new SkillHolder(9277, 1), // Player Commendation - Guitar Melody
+ new SkillHolder(9278, 1), // Player Commendation - Harp Melody
+ };
+ private static final SkillHolder[] GROUP_SONATA =
+ {
+ new SkillHolder(17291, 1), // Player Commendation - Prevailing Sonata
+ new SkillHolder(17292, 1), // Player Commendation - Daring Sonata
+ new SkillHolder(17293, 1), // Player Commendation - Refreshing Sonata
+ };
+ // Misc
+ //@formatter:off
+ private static final Map R_CLASS_TALISMAN = new HashMap<>();
+ {
+ R_CLASS_TALISMAN.put(CategoryType.SIXTH_SIGEL_GROUP, 735);
+ R_CLASS_TALISMAN.put(CategoryType.SIXTH_TIR_GROUP, 736);
+ R_CLASS_TALISMAN.put(CategoryType.SIXTH_OTHEL_GROUP, 737);
+ R_CLASS_TALISMAN.put(CategoryType.SIXTH_YR_GROUP, 738);
+ R_CLASS_TALISMAN.put(CategoryType.SIXTH_WYNN_GROUP, 739);
+ R_CLASS_TALISMAN.put(CategoryType.SIXTH_IS_GROUP, 740);
+ R_CLASS_TALISMAN.put(CategoryType.SIXTH_FEOH_GROUP, 741);
+ R_CLASS_TALISMAN.put(CategoryType.SIXTH_EOLH_GROUP, 742);
+ R_CLASS_TALISMAN.put(CategoryType.ERTHEIA_FIGHTER_GROUP, 736);
+ R_CLASS_TALISMAN.put(CategoryType.ERTHEIA_WIZARD_GROUP, 741);
+ }
+ private static final Map R90_CLASS_TALISMAN = new HashMap<>();
+ {
+ R90_CLASS_TALISMAN.put(CategoryType.SIXTH_SIGEL_GROUP, 743);
+ R90_CLASS_TALISMAN.put(CategoryType.SIXTH_TIR_GROUP, 744);
+ R90_CLASS_TALISMAN.put(CategoryType.SIXTH_OTHEL_GROUP, 745);
+ R90_CLASS_TALISMAN.put(CategoryType.SIXTH_YR_GROUP, 746);
+ R90_CLASS_TALISMAN.put(CategoryType.SIXTH_WYNN_GROUP, 747);
+ R90_CLASS_TALISMAN.put(CategoryType.SIXTH_IS_GROUP, 748);
+ R90_CLASS_TALISMAN.put(CategoryType.SIXTH_FEOH_GROUP, 749);
+ R90_CLASS_TALISMAN.put(CategoryType.SIXTH_EOLH_GROUP, 750);
+ R90_CLASS_TALISMAN.put(CategoryType.ERTHEIA_FIGHTER_GROUP, 744);
+ R90_CLASS_TALISMAN.put(CategoryType.ERTHEIA_WIZARD_GROUP, 749);
+ }
+ private static final Map R95_CLASS_TALISMAN = new HashMap<>();
+ {
+ R95_CLASS_TALISMAN.put(CategoryType.SIXTH_SIGEL_GROUP, 751);
+ R95_CLASS_TALISMAN.put(CategoryType.SIXTH_TIR_GROUP, 752);
+ R95_CLASS_TALISMAN.put(CategoryType.SIXTH_OTHEL_GROUP, 753);
+ R95_CLASS_TALISMAN.put(CategoryType.SIXTH_YR_GROUP, 754);
+ R95_CLASS_TALISMAN.put(CategoryType.SIXTH_WYNN_GROUP, 755);
+ R95_CLASS_TALISMAN.put(CategoryType.SIXTH_IS_GROUP, 756);
+ R95_CLASS_TALISMAN.put(CategoryType.SIXTH_FEOH_GROUP, 757);
+ R95_CLASS_TALISMAN.put(CategoryType.SIXTH_EOLH_GROUP, 758);
+ R95_CLASS_TALISMAN.put(CategoryType.ERTHEIA_FIGHTER_GROUP, 752);
+ R95_CLASS_TALISMAN.put(CategoryType.ERTHEIA_WIZARD_GROUP, 757);
+ }
+ private static final Map R99_CLASS_TALISMAN = new HashMap<>();
+ {
+ R99_CLASS_TALISMAN.put(CategoryType.SIXTH_SIGEL_GROUP, 759);
+ R99_CLASS_TALISMAN.put(CategoryType.SIXTH_TIR_GROUP, 760);
+ R99_CLASS_TALISMAN.put(CategoryType.SIXTH_OTHEL_GROUP, 761);
+ R99_CLASS_TALISMAN.put(CategoryType.SIXTH_YR_GROUP, 762);
+ R99_CLASS_TALISMAN.put(CategoryType.SIXTH_WYNN_GROUP, 763);
+ R99_CLASS_TALISMAN.put(CategoryType.SIXTH_IS_GROUP, 764);
+ R99_CLASS_TALISMAN.put(CategoryType.SIXTH_FEOH_GROUP, 765);
+ R99_CLASS_TALISMAN.put(CategoryType.SIXTH_EOLH_GROUP, 766);
+ R99_CLASS_TALISMAN.put(CategoryType.ERTHEIA_FIGHTER_GROUP, 760);
+ R99_CLASS_TALISMAN.put(CategoryType.ERTHEIA_WIZARD_GROUP, 765);
+ }
+ //@formatter:on
+ private static final String USED_PC_LOTTERY_TICKET = "USED_PC_LOTTERY_TICKET";
+
+ private AdventureGuildsman()
+ {
+ addStartNpc(ADVENTURE_GUILDSMAN);
+ addTalkId(ADVENTURE_GUILDSMAN);
+ addFirstTalkId(ADVENTURE_GUILDSMAN);
+ }
+
+ @Override
+ public String onAdvEvent(String event, L2Npc npc, L2PcInstance player)
+ {
+ String htmltext = null;
+
+ switch (event)
+ {
+ case "pccafe_list":
+ {
+ htmltext = "pccafe_list001.htm";
+ break;
+ }
+ case "quest_list":
+ {
+ player.sendPacket(ExShowQuestInfo.STATIC_PACKET);
+ break;
+ }
+ case "buff_list":
+ {
+ htmltext = "pccafe_buff_1001.htm";
+ break;
+ }
+ case "item_list":
+ {
+ htmltext = "pccafe_item001.htm";
+ break;
+ }
+ case "pccafe_help_inzone001.htm":
+ case "pccafe_help_lottery001.htm":
+ case "pccafe_help_lottery002.htm":
+ case "adventurer_agent_town_voucher_change.htm":
+ case "life_crystal_merge001.htm":
+ case "life_crystal_merge002.htm":
+ case "voucher_trader1001.htm":
+ case "voucher_trader2001.htm":
+ case "voucher_trader3001.htm":
+ case "voucher_trader4001.htm":
+ case "voucher_trader1004.htm":
+ case "voucher_trader2004.htm":
+ case "voucher_trader3004.htm":
+ case "voucher_trader4004.htm":
+ case "voucher_trader1005.htm":
+ case "voucher_trader2005.htm":
+ case "voucher_trader3005.htm":
+ case "voucher_trader4005.htm":
+ case "voucher_trader1006.htm":
+ case "voucher_trader2006.htm":
+ case "voucher_trader3006.htm":
+ case "voucher_trader4006.htm":
+ {
+ htmltext = event;
+ break;
+ }
+ case "index":
+ {
+ htmltext = player.getLevel() < 40 ? "adventurer_agent_town_77001.htm" : "adventurer_agent_town_77001e.htm";
+ break;
+ }
+ case "buff_setlist":
+ {
+ htmltext = "pccafe_newbuff_001.htm";
+ break;
+ }
+ case "buff_group":
+ {
+ htmltext = player.getPcCafePoints() >= 120 ? applyBuffsGroup(npc, player, GROUP_MELODY.length) : "pccafe_buff_1001.htm";
+ break;
+ }
+ case "knight":
+ {
+ htmltext = player.getPcCafePoints() >= 200 ? applyBuffs(npc, player, KNIGHT.getSkill()) : "pccafe_buff_1001.htm";
+ break;
+ }
+ case "warrior":
+ {
+ htmltext = player.getPcCafePoints() >= 200 ? applyBuffs(npc, player, WARRIOR.getSkill()) : "pccafe_buff_1001.htm";
+ break;
+ }
+ case "wizard":
+ {
+ htmltext = player.getPcCafePoints() >= 200 ? applyBuffs(npc, player, WIZARD.getSkill()) : "pccafe_buff_1001.htm";
+ break;
+ }
+ case "give_lottery_ticket":
+ {
+ if (!player.getVariables().getBoolean(USED_PC_LOTTERY_TICKET, false))
+ {
+ player.getVariables().set(USED_PC_LOTTERY_TICKET, true);
+ giveItems(player, PCCAFE_LOTTERY_TICKET_30DAYS, 1);
+ }
+ else
+ {
+ htmltext = "pccafe_help_lottery_notoneday.htm";
+ }
+ break;
+ }
+ case "trade_10":
+ {
+ htmltext = tradeItem(player, PCCAFE_5TH_LOTTERY_TICKET_30DAYS, 10);
+ break;
+ }
+ case "trade_100":
+ {
+ htmltext = tradeItem(player, PCCAFE_4TH_LOTTERY_TICKET_30DAYS, 100);
+ break;
+ }
+ case "trade_200":
+ {
+ htmltext = tradeItem(player, PCCAFE_3RD_LOTTERY_TICKET_30DAYS, 200);
+ break;
+ }
+ case "trade_1000":
+ {
+ htmltext = tradeItem(player, PCCAFE_2ND_LOTTERY_TICKET_30DAYS, 1000);
+ break;
+ }
+ case "trade_10000":
+ {
+ htmltext = tradeItem(player, PCCAFE_1ST_LOTTERY_TICKET_30DAYS, 10000);
+ break;
+ }
+ case "trade_seal85":
+ {
+ if (player.isInCategory(CategoryType.SIXTH_CLASS_GROUP))
+ {
+ if (hasQuestItems(player, VOUCHER_LEV_85))
+ {
+ takeItems(player, VOUCHER_LEV_85, 1);
+ giveItems(player, SEAL_LEV_85, 20);
+ addExpAndSp(player, 60000000, 0);
+ }
+ else
+ {
+ htmltext = "voucher_trader1003b.htm";
+ }
+ }
+ else
+ {
+ htmltext = "voucher_trader1007.htm";
+ }
+ break;
+ }
+ case "trade_seal90":
+ {
+ if (player.isInCategory(CategoryType.SIXTH_CLASS_GROUP))
+ {
+ if (hasQuestItems(player, VOUCHER_LEV_90))
+ {
+ takeItems(player, VOUCHER_LEV_90, 1);
+ giveItems(player, SEAL_LEV_90, 20);
+ addExpAndSp(player, 66000000, 0);
+ }
+ else
+ {
+ htmltext = "voucher_trader2003b.htm";
+ }
+ }
+ else
+ {
+ htmltext = "voucher_trader1007.htm";
+ }
+ break;
+ }
+ case "trade_seal95":
+ {
+ if (player.isInCategory(CategoryType.SIXTH_CLASS_GROUP))
+ {
+ if (hasQuestItems(player, VOUCHER_LEV_95))
+ {
+ takeItems(player, VOUCHER_LEV_95, 1);
+ giveItems(player, SEAL_LEV_95, 20);
+ addExpAndSp(player, 68000000, 0);
+ }
+ else
+ {
+ htmltext = "voucher_trader3003b.htm";
+ }
+ }
+ else
+ {
+ htmltext = "voucher_trader1007.htm";
+ }
+ break;
+ }
+ case "trade_seal97":
+ {
+ if (player.isInCategory(CategoryType.SIXTH_CLASS_GROUP))
+ {
+ if (hasQuestItems(player, VOUCHER_LEV_97))
+ {
+ takeItems(player, VOUCHER_LEV_97, 1);
+ giveItems(player, SEAL_LEV_97, 20);
+ addExpAndSp(player, 76000000, 0);
+ }
+ else
+ {
+ htmltext = "voucher_trader3003b.htm";
+ }
+ }
+ else
+ {
+ htmltext = "voucher_trader1007.htm";
+ }
+ break;
+ }
+ case "give_talismanR_by_class":
+ {
+ int multisellId = -1;
+
+ for (CategoryType type : R_CLASS_TALISMAN.keySet())
+ {
+ if (player.isInCategory(type))
+ {
+ multisellId = R_CLASS_TALISMAN.get(type);
+ break;
+ }
+ }
+
+ if (multisellId > 0)
+ {
+ MultisellData.getInstance().separateAndSend(multisellId, player, npc, false);
+ }
+ break;
+ }
+ case "give_talismanR90_by_class":
+ {
+ int multisellId = -1;
+
+ for (CategoryType type : R90_CLASS_TALISMAN.keySet())
+ {
+ if (player.isInCategory(type))
+ {
+ multisellId = R90_CLASS_TALISMAN.get(type);
+ break;
+ }
+ }
+
+ if (multisellId > 0)
+ {
+ MultisellData.getInstance().separateAndSend(multisellId, player, npc, false);
+ }
+ break;
+ }
+ case "give_talismanR95_by_class":
+ {
+ int multisellId = -1;
+ for (CategoryType type : R95_CLASS_TALISMAN.keySet())
+ {
+ if (player.isInCategory(type))
+ {
+ multisellId = R95_CLASS_TALISMAN.get(type);
+ break;
+ }
+ }
+
+ if (multisellId > 0)
+ {
+ MultisellData.getInstance().separateAndSend(multisellId, player, npc, false);
+ }
+ break;
+ }
+
+ case "give_talismanR99_by_class":
+ {
+ int multisellId = -1;
+
+ for (CategoryType type : R99_CLASS_TALISMAN.keySet())
+ {
+ if (player.isInCategory(type))
+ {
+ multisellId = R99_CLASS_TALISMAN.get(type);
+ break;
+ }
+ }
+
+ if (multisellId > 0)
+ {
+ MultisellData.getInstance().separateAndSend(multisellId, player, npc, false);
+ }
+ break;
+ }
+ }
+ if (event.startsWith("melody"))
+ {
+ final int buffOffset = CommonUtil.constrain(Integer.parseInt(event.substring(event.indexOf(" ") + 1)), 0, GROUP_MELODY.length);
+ if (player.getPcCafePoints() >= 20)
+ {
+ npc.setTarget(player);
+ npc.doCast(GROUP_MELODY[buffOffset].getSkill());
+ player.setPcCafePoints(player.getPcCafePoints() - 20);
+ htmltext = "pccafe_buff_1001.htm";
+ }
+ else
+ {
+ htmltext = "pccafe_notpoint001.htm";
+ }
+
+ }
+ return htmltext;
+ }
+
+ private String applyBuffs(L2Npc npc, L2PcInstance player, Skill skill)
+ {
+ for (SkillHolder holder : GROUP_MELODY)
+ {
+ SkillCaster.triggerCast(npc, player, holder.getSkill());
+ }
+ for (SkillHolder holder : GROUP_SONATA)
+ {
+ SkillCaster.triggerCast(npc, player, holder.getSkill());
+ }
+ SkillCaster.triggerCast(npc, player, skill);
+ player.setPcCafePoints(player.getPcCafePoints() - 200);
+ return null;
+ }
+
+ private String applyBuffsGroup(L2Npc npc, L2PcInstance player, int length)
+ {
+ for (SkillHolder holder : GROUP_MELODY)
+ {
+ SkillCaster.triggerCast(npc, player, holder.getSkill());
+ }
+ player.setPcCafePoints(player.getPcCafePoints() - 120);
+ return null;
+ }
+
+ private String tradeItem(L2PcInstance player, int itemId, int points)
+ {
+ if (player.getPcCafePoints() >= 200000)
+ {
+ return "pccafe_help_lottery_fail2.htm";
+ }
+
+ if (takeItems(player, itemId, 1))
+ {
+ player.setPcCafePoints(player.getPcCafePoints() + points);
+ return "pccafe_help_lottery003.htm";
+ }
+ return "pccafe_help_lottery_fail.htm";
+ }
+
+ @Override
+ public String onFirstTalk(L2Npc npc, L2PcInstance player)
+ {
+ return player.getLevel() < 40 ? "adventurer_agent_town_77001.htm" : "adventurer_agent_town_77001e.htm";
+ }
+
+ public static void main(String[] args)
+ {
+ new AdventureGuildsman();
+ }
+}
diff --git a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/ai/others/AdventureGuildsman/adventurer_agent_town_77001.htm b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/ai/others/AdventureGuildsman/adventurer_agent_town_77001.htm
new file mode 100644
index 0000000000..02ba3cc74e
--- /dev/null
+++ b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/ai/others/AdventureGuildsman/adventurer_agent_town_77001.htm
@@ -0,0 +1,7 @@
+Adventure Guildsman:
+The Adventure Guild gathers information on all adventures in all over the world and gives to adventurers. We're all-round information merchants. As you can imagine, we get real busy whenever events occur on the Aden Continent.
+Now that we're exchanging Adventurer's Marks and Seals as well, we're even busier.
+
+
+
+
\ No newline at end of file
diff --git a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/ai/others/AdventureGuildsman/adventurer_agent_town_77001e.htm b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/ai/others/AdventureGuildsman/adventurer_agent_town_77001e.htm
new file mode 100644
index 0000000000..604b5be571
--- /dev/null
+++ b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/ai/others/AdventureGuildsman/adventurer_agent_town_77001e.htm
@@ -0,0 +1,8 @@
+Adventure Guildsman:
+The Adventure Guild gathers information on all adventures in all over the world and gives to adventurers. We're all-round information merchants. As you can imagine, we get real busy whenever events occur on the Aden Continent.
+Now that we're exchanging Adventurer's Marks and Seals as well, we're even busier.
+
+
+
+
+
\ No newline at end of file
diff --git a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/ai/others/AdventureGuildsman/adventurer_agent_town_voucher_change.htm b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/ai/others/AdventureGuildsman/adventurer_agent_town_voucher_change.htm
new file mode 100644
index 0000000000..58a591d62d
--- /dev/null
+++ b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/ai/others/AdventureGuildsman/adventurer_agent_town_voucher_change.htm
@@ -0,0 +1,10 @@
+Adventure Guildsman:
+Do you want to exchange Adventurer's Marks and Seals?
+Here at the Adventure Guild, you can exchange Marks or Seals of Loyalty, Pledge, Sincerity, and Spirit.
+Select the one you want to exchange.
+
+
+
+
+
+
\ No newline at end of file
diff --git a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/ai/others/AdventureGuildsman/life_crystal_merge001.htm b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/ai/others/AdventureGuildsman/life_crystal_merge001.htm
new file mode 100644
index 0000000000..62f383f1dd
--- /dev/null
+++ b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/ai/others/AdventureGuildsman/life_crystal_merge001.htm
@@ -0,0 +1,9 @@
+Adventure Guildsman:
+Do you carry any Life Crystals with you?
+Due to some strange new influence, it has become impossible to gain any Life Crystals from the monsters on the Aden Continent.
+Whatever life crystals you have will be exchanged at the same value as before. We are working to identify the cause... please rest assured nothing will go wrong, and exchange your crystals with the supplies we have prepared.
+
+
+
+
+
\ No newline at end of file
diff --git a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/ai/others/AdventureGuildsman/life_crystal_merge002.htm b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/ai/others/AdventureGuildsman/life_crystal_merge002.htm
new file mode 100644
index 0000000000..8abfbaf26d
--- /dev/null
+++ b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/ai/others/AdventureGuildsman/life_crystal_merge002.htm
@@ -0,0 +1,17 @@
+Adventure Guildsman:
+The Adventure Guild has arranged a new system for exchanging special commodities associated with crafting Life Crystals, for the convenience of our adventurers. Now, you can exchange the commodities of choice whenever and wherever. Please select the village you'd like.
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/ai/others/AdventureGuildsman/pccafe_buff_1001.htm b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/ai/others/AdventureGuildsman/pccafe_buff_1001.htm
new file mode 100644
index 0000000000..36860815f0
--- /dev/null
+++ b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/ai/others/AdventureGuildsman/pccafe_buff_1001.htm
@@ -0,0 +1,17 @@
+Adventure Guildsman:
Buffs are back, new and improved! And they're easier to use than ever with your PC Points!
+6 Melodies + Harmony (of your choice) + 3 Sonatas
+
+
+Set of 6 Melodies
+Horn Melody / Drum Melody / Pipe Organ Melody / Guitar Melody / Harp Melody / Lute Melody
+
+
+Individual Buffs
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/ai/others/AdventureGuildsman/pccafe_help_inzone001.htm b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/ai/others/AdventureGuildsman/pccafe_help_inzone001.htm
new file mode 100644
index 0000000000..16afa65341
--- /dev/null
+++ b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/ai/others/AdventureGuildsman/pccafe_help_inzone001.htm
@@ -0,0 +1,5 @@
+Adventure Guildsman:
+Interested in obtaining special benefits that you can enjoy with PC points?
+To visit the PC Cafe Instant Zones, visit the Gludio Castle, Town of Dion, Heine, Town of Oren, Town of Schuttgart, and Town of Rune, and find the Guard Captain or the Pathfinder Worker. See you soon!
+
+
\ No newline at end of file
diff --git a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/ai/others/AdventureGuildsman/pccafe_help_lottery001.htm b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/ai/others/AdventureGuildsman/pccafe_help_lottery001.htm
new file mode 100644
index 0000000000..6fe3a55752
--- /dev/null
+++ b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/ai/others/AdventureGuildsman/pccafe_help_lottery001.htm
@@ -0,0 +1,7 @@
+Adventure Guildsman:
+The PC Cafe Lottery Ticket is a lottery which gives out up to 10,000 PC Points!.
+It is available every day, free of charge, once a day, to PC Cafe users.
+
+
+
+
\ No newline at end of file
diff --git a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/ai/others/AdventureGuildsman/pccafe_help_lottery002.htm b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/ai/others/AdventureGuildsman/pccafe_help_lottery002.htm
new file mode 100644
index 0000000000..83d973fc09
--- /dev/null
+++ b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/ai/others/AdventureGuildsman/pccafe_help_lottery002.htm
@@ -0,0 +1,10 @@
+Adventure Guildsman:
+If you have a winning lottery ticket, give it to me and I'll give you the appropriate PC points.
+So, how much did you win?
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/ai/others/AdventureGuildsman/pccafe_help_lottery003.htm b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/ai/others/AdventureGuildsman/pccafe_help_lottery003.htm
new file mode 100644
index 0000000000..ca49a9657c
--- /dev/null
+++ b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/ai/others/AdventureGuildsman/pccafe_help_lottery003.htm
@@ -0,0 +1,5 @@
+Adventure Guildsman:
+Congratulations!
+More luck awaits you next time.
+
+
\ No newline at end of file
diff --git a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/ai/others/AdventureGuildsman/pccafe_help_lottery_fail.htm b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/ai/others/AdventureGuildsman/pccafe_help_lottery_fail.htm
new file mode 100644
index 0000000000..cab653eafc
--- /dev/null
+++ b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/ai/others/AdventureGuildsman/pccafe_help_lottery_fail.htm
@@ -0,0 +1,4 @@
+Adventure Guildsman:
+I couldn't find any lottery tickets that correspond to the PC Cafe points you have won. Please check your Lottery Tickets again.
+
+
\ No newline at end of file
diff --git a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/ai/others/AdventureGuildsman/pccafe_help_lottery_fail2.htm b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/ai/others/AdventureGuildsman/pccafe_help_lottery_fail2.htm
new file mode 100644
index 0000000000..194b2b4ee0
--- /dev/null
+++ b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/ai/others/AdventureGuildsman/pccafe_help_lottery_fail2.htm
@@ -0,0 +1,5 @@
+Adventure Guildsman:
+If the sum of your current PC Cafe Points and the new PC Cafe Points you have won exceeds 200,000 points, the points you have won cannot be issued.
+Please return after you have used up more PC Cafe Points.
+
+
\ No newline at end of file
diff --git a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/ai/others/AdventureGuildsman/pccafe_help_lottery_notoneday.htm b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/ai/others/AdventureGuildsman/pccafe_help_lottery_notoneday.htm
new file mode 100644
index 0000000000..db1cec841b
--- /dev/null
+++ b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/ai/others/AdventureGuildsman/pccafe_help_lottery_notoneday.htm
@@ -0,0 +1,5 @@
+Adventure Guildsman:
+You have already participated in the PC Cafe Lottery Ticket.
+The PC Cafe Lottery Ticket is issued only once a day. Your next ticket can be issued after 6:30 AM.
+
+
\ No newline at end of file
diff --git a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/ai/others/AdventureGuildsman/pccafe_help_lottery_notpccafe.htm b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/ai/others/AdventureGuildsman/pccafe_help_lottery_notpccafe.htm
new file mode 100644
index 0000000000..99aeb04967
--- /dev/null
+++ b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/ai/others/AdventureGuildsman/pccafe_help_lottery_notpccafe.htm
@@ -0,0 +1,5 @@
+Adventure Guildsman:
+You're not a PC Cafe user.
+PC Lottery Tickets are issued to users who have come online from a PC Cafe.
+
+
\ No newline at end of file
diff --git a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/ai/others/AdventureGuildsman/pccafe_item001.htm b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/ai/others/AdventureGuildsman/pccafe_item001.htm
new file mode 100644
index 0000000000..1e81626837
--- /dev/null
+++ b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/ai/others/AdventureGuildsman/pccafe_item001.htm
@@ -0,0 +1,10 @@
+Adventure Guildsman:
+Here are the items you can purchase using PC Cafe Points.
+All items bought with PC Points, except Firecrackers and Large Firecrackers, cannot be exchanged, dropped, sold in a private store, or stored in a warehouse.
+(Item Appearance Stones can be exchanged and sold.)
+Now, make your selection!
+
+
+
+
+
\ No newline at end of file
diff --git a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/ai/others/AdventureGuildsman/pccafe_list001.htm b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/ai/others/AdventureGuildsman/pccafe_list001.htm
new file mode 100644
index 0000000000..3e4b3d4910
--- /dev/null
+++ b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/ai/others/AdventureGuildsman/pccafe_list001.htm
@@ -0,0 +1,9 @@
+Adventure Guildsman:
+You're come from a PC Cafe! This special shop will enable you to buy all kinds of different items and services with your Player Commendation (PC) points.
+Just make your choice!
+
+
+
+
+
+
\ No newline at end of file
diff --git a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/ai/others/AdventureGuildsman/pccafe_newbuff_001.htm b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/ai/others/AdventureGuildsman/pccafe_newbuff_001.htm
new file mode 100644
index 0000000000..979384ab70
--- /dev/null
+++ b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/ai/others/AdventureGuildsman/pccafe_newbuff_001.htm
@@ -0,0 +1,9 @@
+Adventure Guildsman:
+Select either Knight's Harmony, Warrior's Harmony, or Wizard's Harmony, and I will give you the buffs below regardless of your selection.
+Shared Buffs
+Horn Melody / Drum Melody / Pipe Organ Melody / Guitar Melody / Harp Melody / Lute Melody / Prevailing Sonata / Daring Sonata / Refreshing Sonata(The 3 Sonatas have the same power as the Sonatas for Adventurers.)
+
+
+
+
+
\ No newline at end of file
diff --git a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/ai/others/AdventureGuildsman/pccafe_notpoint001.htm b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/ai/others/AdventureGuildsman/pccafe_notpoint001.htm
new file mode 100644
index 0000000000..3f6acb57fa
--- /dev/null
+++ b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/ai/others/AdventureGuildsman/pccafe_notpoint001.htm
@@ -0,0 +1,4 @@
+Adventure Guildsman:
+I'm sorry, you don't have enough Internet Cafe points to make that purchase. Please check your points balance and make another selection.
+
+
\ No newline at end of file
diff --git a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/ai/others/AdventureGuildsman/voucher_trader1000b.htm b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/ai/others/AdventureGuildsman/voucher_trader1000b.htm
new file mode 100644
index 0000000000..064c1453ac
--- /dev/null
+++ b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/ai/others/AdventureGuildsman/voucher_trader1000b.htm
@@ -0,0 +1,4 @@
+Adventure Guildsman:
+You don't have a Adventurer's Mark. Are you positive that you're an adventurer?
+
+
\ No newline at end of file
diff --git a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/ai/others/AdventureGuildsman/voucher_trader1001.htm b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/ai/others/AdventureGuildsman/voucher_trader1001.htm
new file mode 100644
index 0000000000..a6047f4b68
--- /dev/null
+++ b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/ai/others/AdventureGuildsman/voucher_trader1001.htm
@@ -0,0 +1,10 @@
+Adventure Guildsman:
+Would you like to exchange an Adventurer's Mark - Loyalty or a Seal of Loyalty?
+The Adventurer's Guild exchanges an Adventurer's Mark - Loyalty for a Seal of Loyalty once a day.
+If you have a seal, you can exchange it for useful items right here. However, we are having some trouble bringing in items, so please keep in mind that we had to raise our prices.
+Would you like to make an exchange?
+
+
+
+
+
\ No newline at end of file
diff --git a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/ai/others/AdventureGuildsman/voucher_trader1003b.htm b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/ai/others/AdventureGuildsman/voucher_trader1003b.htm
new file mode 100644
index 0000000000..064c1453ac
--- /dev/null
+++ b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/ai/others/AdventureGuildsman/voucher_trader1003b.htm
@@ -0,0 +1,4 @@
+Adventure Guildsman:
+You don't have a Adventurer's Mark. Are you positive that you're an adventurer?
+
+
\ No newline at end of file
diff --git a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/ai/others/AdventureGuildsman/voucher_trader1004.htm b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/ai/others/AdventureGuildsman/voucher_trader1004.htm
new file mode 100644
index 0000000000..0e498009b4
--- /dev/null
+++ b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/ai/others/AdventureGuildsman/voucher_trader1004.htm
@@ -0,0 +1,7 @@
+Adventure Guildsman:
+Do you need a talisman?
+Can I interest you in some lovely ordinary or occupational talismans? Hmm?
+
+
+
+
\ No newline at end of file
diff --git a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/ai/others/AdventureGuildsman/voucher_trader1005.htm b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/ai/others/AdventureGuildsman/voucher_trader1005.htm
new file mode 100644
index 0000000000..473b2b8b8a
--- /dev/null
+++ b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/ai/others/AdventureGuildsman/voucher_trader1005.htm
@@ -0,0 +1,6 @@
+Adventure Guildsman:
+You mean a regular talisman? I have active and passive talismans. Which would you like?
+
+
+
+
\ No newline at end of file
diff --git a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/ai/others/AdventureGuildsman/voucher_trader1006.htm b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/ai/others/AdventureGuildsman/voucher_trader1006.htm
new file mode 100644
index 0000000000..703ecb7245
--- /dev/null
+++ b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/ai/others/AdventureGuildsman/voucher_trader1006.htm
@@ -0,0 +1,11 @@
+Adventure Guildsman:
+Which occupational talisman do you seek?
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/ai/others/AdventureGuildsman/voucher_trader1007.htm b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/ai/others/AdventureGuildsman/voucher_trader1007.htm
new file mode 100644
index 0000000000..def37af7d6
--- /dev/null
+++ b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/ai/others/AdventureGuildsman/voucher_trader1007.htm
@@ -0,0 +1,4 @@
+Adventure Guildsman:
+I'm sorry, but I can only exchange marks with seals for an awakened adventurer.
+
+
\ No newline at end of file
diff --git a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/ai/others/AdventureGuildsman/voucher_trader2001.htm b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/ai/others/AdventureGuildsman/voucher_trader2001.htm
new file mode 100644
index 0000000000..860507fdaf
--- /dev/null
+++ b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/ai/others/AdventureGuildsman/voucher_trader2001.htm
@@ -0,0 +1,10 @@
+Adventure Guildsman:
+Would you like to exchange an Adventurer's Mark - Pledge or a Seal of Pledge?
+The Adventurer's Guild exchanges an Adventurer's Mark - Pledge for a Seal of Pledge once a day.
+If you have a seal, you can exchange it for useful items right here. However, we are having some trouble bringing in items, so please keep in mind that we had to raise our prices.
+Would you like to make an exchange?
+
+
+
+
+
\ No newline at end of file
diff --git a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/ai/others/AdventureGuildsman/voucher_trader2003b.htm b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/ai/others/AdventureGuildsman/voucher_trader2003b.htm
new file mode 100644
index 0000000000..064c1453ac
--- /dev/null
+++ b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/ai/others/AdventureGuildsman/voucher_trader2003b.htm
@@ -0,0 +1,4 @@
+Adventure Guildsman:
+You don't have a Adventurer's Mark. Are you positive that you're an adventurer?
+
+
\ No newline at end of file
diff --git a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/ai/others/AdventureGuildsman/voucher_trader2004.htm b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/ai/others/AdventureGuildsman/voucher_trader2004.htm
new file mode 100644
index 0000000000..b6c23d6f32
--- /dev/null
+++ b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/ai/others/AdventureGuildsman/voucher_trader2004.htm
@@ -0,0 +1,7 @@
+Adventure Guildsman:
+Do you need a talisman?
+Can I interest you in some lovely ordinary or occupational talismans? Hmm?
+
+
+
+
\ No newline at end of file
diff --git a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/ai/others/AdventureGuildsman/voucher_trader2005.htm b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/ai/others/AdventureGuildsman/voucher_trader2005.htm
new file mode 100644
index 0000000000..661ebecf6f
--- /dev/null
+++ b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/ai/others/AdventureGuildsman/voucher_trader2005.htm
@@ -0,0 +1,6 @@
+Adventure Guildsman:
+You mean a regular talisman? I have active and passive talismans. Which would you like?
+
+
+
+
\ No newline at end of file
diff --git a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/ai/others/AdventureGuildsman/voucher_trader2006.htm b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/ai/others/AdventureGuildsman/voucher_trader2006.htm
new file mode 100644
index 0000000000..9c92ae5918
--- /dev/null
+++ b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/ai/others/AdventureGuildsman/voucher_trader2006.htm
@@ -0,0 +1,11 @@
+Adventure Guildsman:
+Occupational talismans? Yes, I have a large selection. What type are you looking for?
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/ai/others/AdventureGuildsman/voucher_trader3001.htm b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/ai/others/AdventureGuildsman/voucher_trader3001.htm
new file mode 100644
index 0000000000..9e9a6be4bf
--- /dev/null
+++ b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/ai/others/AdventureGuildsman/voucher_trader3001.htm
@@ -0,0 +1,10 @@
+Adventure Guildsman:
+Would you like to exchange an Adventurer's Mark - Sincerity or a Seal of Sincerity?
+The Adventurer's Guild exchanges an Adventurer's Mark - Sincerity for a Seal of Sincerity once a day.
+If you have a seal, you can exchange it for useful items right here. However, we are having some trouble bringing in items, so please keep in mind that we had to raise our prices.
+Would you like to make an exchange?
+
+
+
+
+
\ No newline at end of file
diff --git a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/ai/others/AdventureGuildsman/voucher_trader3003b.htm b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/ai/others/AdventureGuildsman/voucher_trader3003b.htm
new file mode 100644
index 0000000000..064c1453ac
--- /dev/null
+++ b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/ai/others/AdventureGuildsman/voucher_trader3003b.htm
@@ -0,0 +1,4 @@
+Adventure Guildsman:
+You don't have a Adventurer's Mark. Are you positive that you're an adventurer?
+
+
\ No newline at end of file
diff --git a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/ai/others/AdventureGuildsman/voucher_trader3004.htm b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/ai/others/AdventureGuildsman/voucher_trader3004.htm
new file mode 100644
index 0000000000..5e728d2542
--- /dev/null
+++ b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/ai/others/AdventureGuildsman/voucher_trader3004.htm
@@ -0,0 +1,7 @@
+Adventure Guildsman:
+Do you need a talisman?
+Can I interest you in some lovely ordinary or occupational talismans? Hmm?
+
+
+
+
\ No newline at end of file
diff --git a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/ai/others/AdventureGuildsman/voucher_trader3005.htm b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/ai/others/AdventureGuildsman/voucher_trader3005.htm
new file mode 100644
index 0000000000..b5d3fc75e7
--- /dev/null
+++ b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/ai/others/AdventureGuildsman/voucher_trader3005.htm
@@ -0,0 +1,6 @@
+Adventure Guildsman:
+You mean a regular talisman? I have active and passive talismans. Which would you like?
+
+
+
+
\ No newline at end of file
diff --git a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/ai/others/AdventureGuildsman/voucher_trader3006.htm b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/ai/others/AdventureGuildsman/voucher_trader3006.htm
new file mode 100644
index 0000000000..c33c271b17
--- /dev/null
+++ b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/ai/others/AdventureGuildsman/voucher_trader3006.htm
@@ -0,0 +1,11 @@
+Adventure Guildsman:
+You're looking for talismans for your occupation? Which talismans do you seek?
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/ai/others/AdventureGuildsman/voucher_trader4001.htm b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/ai/others/AdventureGuildsman/voucher_trader4001.htm
new file mode 100644
index 0000000000..9002534d0d
--- /dev/null
+++ b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/ai/others/AdventureGuildsman/voucher_trader4001.htm
@@ -0,0 +1,10 @@
+Adventure Guildsman:
+Would you like to exchange an Adventurer's Mark - Spirit or a Seal of Spirit?
+The Adventurer's Guild exchanges an Adventurer's Mark - Spirit for a Seal of Spirit once a day.
+If you have a seal, you can exchange it for useful items right here. However, we are having some trouble bringing in items, so please keep in mind that we had to raise our prices.
+Would you like to make an exchange?
+
+
+
+
+
\ No newline at end of file
diff --git a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/ai/others/AdventureGuildsman/voucher_trader4003b.htm b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/ai/others/AdventureGuildsman/voucher_trader4003b.htm
new file mode 100644
index 0000000000..064c1453ac
--- /dev/null
+++ b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/ai/others/AdventureGuildsman/voucher_trader4003b.htm
@@ -0,0 +1,4 @@
+Adventure Guildsman:
+You don't have a Adventurer's Mark. Are you positive that you're an adventurer?
+
+
\ No newline at end of file
diff --git a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/ai/others/AdventureGuildsman/voucher_trader4004.htm b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/ai/others/AdventureGuildsman/voucher_trader4004.htm
new file mode 100644
index 0000000000..9b9b93e532
--- /dev/null
+++ b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/ai/others/AdventureGuildsman/voucher_trader4004.htm
@@ -0,0 +1,7 @@
+Adventure Guildsman:
+Do you need a talisman?
+Can I interest you in some lovely ordinary or occupational talismans? Hmm?
+
+
+
+
\ No newline at end of file
diff --git a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/ai/others/AdventureGuildsman/voucher_trader4005.htm b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/ai/others/AdventureGuildsman/voucher_trader4005.htm
new file mode 100644
index 0000000000..9b1a1da4e3
--- /dev/null
+++ b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/ai/others/AdventureGuildsman/voucher_trader4005.htm
@@ -0,0 +1,6 @@
+Adventure Guildsman:
+You mean a regular talisman? I have active and passive talismans. Which would you like?
+
+
+
+
\ No newline at end of file
diff --git a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/ai/others/AdventureGuildsman/voucher_trader4006.htm b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/ai/others/AdventureGuildsman/voucher_trader4006.htm
new file mode 100644
index 0000000000..f616eb8647
--- /dev/null
+++ b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/ai/others/AdventureGuildsman/voucher_trader4006.htm
@@ -0,0 +1,11 @@
+Adventure Guildsman:
+Occupational talismans? Hmm? Why, yes. I do have some. Which ones do you seek?
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/ai/others/AdventurersGuide/AdventurersGuide.java b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/ai/others/AdventurersGuide/AdventurersGuide.java
index 8d3f0e0325..871a851453 100644
--- a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/ai/others/AdventurersGuide/AdventurersGuide.java
+++ b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/ai/others/AdventurersGuide/AdventurersGuide.java
@@ -53,6 +53,9 @@ public final class AdventurersGuide extends AbstractNpcAI
new SkillHolder(15652, 1), // Daring Sonata (Adventurer)
new SkillHolder(15653, 1), // Refreshing Sonata (Adventurer)
};
+ // Misc
+ private static int MAX_LEVEL_BUFFS = 94;
+ private static int MIN_LEVEL_PROTECTION = 40;
private AdventurersGuide()
{
@@ -115,7 +118,7 @@ public final class AdventurersGuide extends AbstractNpcAI
private String applyBuffs(L2Npc npc, L2PcInstance player, Skill skill)
{
- if (player.getLevel() > 94)
+ if (player.getLevel() > MAX_LEVEL_BUFFS)
{
return "guide-noBuffs.html";
}
@@ -126,7 +129,7 @@ public final class AdventurersGuide extends AbstractNpcAI
}
SkillCaster.triggerCast(npc, player, skill);
- if ((player.getLevel() < 40) && (player.getClassId().level() <= 1))
+ if ((player.getLevel() < MIN_LEVEL_PROTECTION) && (player.getClassId().level() <= 1))
{
SkillCaster.triggerCast(npc, player, BLESS_PROTECTION.getSkill());
}
diff --git a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/ai/others/CastleCourtMagician/CastleCourtMagician.java b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/ai/others/CastleCourtMagician/CastleCourtMagician.java
index ff6975b3f2..f01d1044ea 100644
--- a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/ai/others/CastleCourtMagician/CastleCourtMagician.java
+++ b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/ai/others/CastleCourtMagician/CastleCourtMagician.java
@@ -121,14 +121,14 @@ public final class CastleCourtMagician extends AbstractNpcAI
// Misc
private static final CategoryType[] AWAKENED_CT =
{
- CategoryType.SIGEL_GROUP,
- CategoryType.TYRR_GROUP,
- CategoryType.OTHELL_GROUP,
- CategoryType.YUL_GROUP,
- CategoryType.FEOH_GROUP,
- CategoryType.ISS_GROUP,
- CategoryType.WYNN_GROUP,
- CategoryType.AEORE_GROUP,
+ CategoryType.SIXTH_SIGEL_GROUP,
+ CategoryType.SIXTH_TIR_GROUP,
+ CategoryType.SIXTH_OTHEL_GROUP,
+ CategoryType.SIXTH_YR_GROUP,
+ CategoryType.SIXTH_FEOH_GROUP,
+ CategoryType.SIXTH_IS_GROUP,
+ CategoryType.SIXTH_WYNN_GROUP,
+ CategoryType.SIXTH_EOLH_GROUP,
};
private CastleCourtMagician()
@@ -266,7 +266,7 @@ public final class CastleCourtMagician extends AbstractNpcAI
}
case "giveTalismanR":
{
- htmltext = player.isInCategory(CategoryType.AWAKEN_GROUP) ? "courtmagician-09.html" : "courtmagician-10.html";
+ htmltext = player.isInCategory(CategoryType.SIXTH_CLASS_GROUP) ? "courtmagician-09.html" : "courtmagician-10.html";
break;
}
case "giveTalismanR_classSpecific":
diff --git a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/ai/others/ClassMaster/ClassMaster.java b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/ai/others/ClassMaster/ClassMaster.java
index e9feba2163..639775dd63 100644
--- a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/ai/others/ClassMaster/ClassMaster.java
+++ b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/ai/others/ClassMaster/ClassMaster.java
@@ -297,7 +297,7 @@ public final class ClassMaster extends AbstractNpcAI implements IGameXmlReader
{
htmltext = "test_server_helper011.html";
}
- else if (player.isInCategory(CategoryType.AWAKEN_GROUP))
+ else if (player.isInCategory(CategoryType.SIXTH_CLASS_GROUP))
{
htmltext = "test_server_helper011a.html";
}
@@ -319,7 +319,7 @@ public final class ClassMaster extends AbstractNpcAI implements IGameXmlReader
htmltext = "test_server_helper021.html";
}
}
- else if (player.isInCategory(CategoryType.AWAKEN_GROUP))
+ else if (player.isInCategory(CategoryType.SIXTH_CLASS_GROUP))
{
htmltext = "test_server_helper011a.html";
}
@@ -352,7 +352,7 @@ public final class ClassMaster extends AbstractNpcAI implements IGameXmlReader
}
else if (player.isInCategory(CategoryType.FOURTH_CLASS_GROUP) && (player.getLevel() >= 85)) // 9
{
- canChange = CategoryData.getInstance().isInCategory(CategoryType.AWAKEN_GROUP, classId); // 11
+ canChange = CategoryData.getInstance().isInCategory(CategoryType.SIXTH_CLASS_GROUP, classId); // 11
}
if (canChange)
@@ -422,7 +422,7 @@ public final class ClassMaster extends AbstractNpcAI implements IGameXmlReader
{
player.setBaseClass(player.getActiveClass());
}
- if (player.isInCategory(CategoryType.AWAKEN_GROUP))
+ if (player.isInCategory(CategoryType.SIXTH_CLASS_GROUP))
{
SkillTreesData.getInstance().cleanSkillUponAwakening(player);
for (L2SkillLearn skill : SkillTreesData.getInstance().getRaceSkillTree(player.getRace()))
@@ -450,7 +450,7 @@ public final class ClassMaster extends AbstractNpcAI implements IGameXmlReader
case "learnskills":
{
// Retail class master only lets you learn all third class skills.
- if (player.isInCategory(CategoryType.AWAKEN_GROUP))
+ if (player.isInCategory(CategoryType.SIXTH_CLASS_GROUP))
{
htmltext = "test_server_helper001_failed.html";
}
@@ -578,7 +578,7 @@ public final class ClassMaster extends AbstractNpcAI implements IGameXmlReader
{
htmltext = "test_server_helper011.html";
}
- else if (player.isInCategory(CategoryType.AWAKEN_GROUP))
+ else if (player.isInCategory(CategoryType.SIXTH_CLASS_GROUP))
{
htmltext = "test_server_helper011a.html";
}
@@ -762,7 +762,7 @@ public final class ClassMaster extends AbstractNpcAI implements IGameXmlReader
{
htmltext = "test_server_helper011.html";
}
- else if (player.isInCategory(CategoryType.AWAKEN_GROUP))
+ else if (player.isInCategory(CategoryType.SIXTH_CLASS_GROUP))
{
htmltext = "test_server_helper011a.html";
}
@@ -853,7 +853,7 @@ public final class ClassMaster extends AbstractNpcAI implements IGameXmlReader
{
player.setBaseClass(player.getActiveClass());
}
- if (player.isInCategory(CategoryType.AWAKEN_GROUP))
+ if (player.isInCategory(CategoryType.SIXTH_CLASS_GROUP))
{
SkillTreesData.getInstance().cleanSkillUponAwakening(player);
for (L2SkillLearn skill : SkillTreesData.getInstance().getRaceSkillTree(player.getRace()))
diff --git a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/ai/others/HermuncusMinion/HermuncusMinion.java b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/ai/others/HermuncusMinion/HermuncusMinion.java
index d17067c902..6ac78443c9 100644
--- a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/ai/others/HermuncusMinion/HermuncusMinion.java
+++ b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/ai/others/HermuncusMinion/HermuncusMinion.java
@@ -97,7 +97,7 @@ public final class HermuncusMinion extends AbstractNpcAI
if (event.equals("teleportList"))
{
- if (!player.isInCategory(CategoryType.AWAKEN_GROUP))
+ if (!player.isInCategory(CategoryType.SIXTH_CLASS_GROUP))
{
htmltext = "HermuncusMinion-no.html";
}
@@ -155,7 +155,7 @@ public final class HermuncusMinion extends AbstractNpcAI
@Override
public String onFirstTalk(L2Npc npc, L2PcInstance player)
{
- return player.isInCategory(CategoryType.AWAKEN_GROUP) ? "HermuncusMinion.html" : "HermuncusMinion-no.html";
+ return player.isInCategory(CategoryType.SIXTH_CLASS_GROUP) ? "HermuncusMinion.html" : "HermuncusMinion-no.html";
}
private String generateButton(Integer locationId)
diff --git a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/ai/others/MentorGuide/MentorGuide.java b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/ai/others/MentorGuide/MentorGuide.java
index 9aba4c962c..8499c186a1 100644
--- a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/ai/others/MentorGuide/MentorGuide.java
+++ b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/ai/others/MentorGuide/MentorGuide.java
@@ -369,7 +369,7 @@ public final class MentorGuide extends AbstractNpcAI implements IGameXmlReader
handleMenteeSkills(player);
- if (player.isInCategory(CategoryType.AWAKEN_GROUP))
+ if (player.isInCategory(CategoryType.SIXTH_CLASS_GROUP))
{
handleGraduateMentee(player);
}
diff --git a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/ai/others/OlyManager/OlyManager.java b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/ai/others/OlyManager/OlyManager.java
index 073b459591..9e65f90f3a 100644
--- a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/ai/others/OlyManager/OlyManager.java
+++ b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/ai/others/OlyManager/OlyManager.java
@@ -57,16 +57,15 @@ public final class OlyManager extends AbstractNpcAI implements IBypassHandler
private static final int MANAGER = 31688;
// Misc
private static final Map EQUIPMENT_MULTISELL = new HashMap<>();
-
{
- EQUIPMENT_MULTISELL.put(CategoryType.SIGEL_GROUP, 917);
- EQUIPMENT_MULTISELL.put(CategoryType.TYRR_GROUP, 918);
- EQUIPMENT_MULTISELL.put(CategoryType.OTHELL_GROUP, 919);
- EQUIPMENT_MULTISELL.put(CategoryType.YUL_GROUP, 920);
- EQUIPMENT_MULTISELL.put(CategoryType.FEOH_GROUP, 921);
- EQUIPMENT_MULTISELL.put(CategoryType.ISS_GROUP, 923);
- EQUIPMENT_MULTISELL.put(CategoryType.WYNN_GROUP, 922);
- EQUIPMENT_MULTISELL.put(CategoryType.AEORE_GROUP, 924);
+ EQUIPMENT_MULTISELL.put(CategoryType.SIXTH_SIGEL_GROUP, 917);
+ EQUIPMENT_MULTISELL.put(CategoryType.SIXTH_TIR_GROUP, 918);
+ EQUIPMENT_MULTISELL.put(CategoryType.SIXTH_OTHEL_GROUP, 919);
+ EQUIPMENT_MULTISELL.put(CategoryType.SIXTH_YR_GROUP, 920);
+ EQUIPMENT_MULTISELL.put(CategoryType.SIXTH_FEOH_GROUP, 921);
+ EQUIPMENT_MULTISELL.put(CategoryType.SIXTH_IS_GROUP, 923);
+ EQUIPMENT_MULTISELL.put(CategoryType.SIXTH_WYNN_GROUP, 922);
+ EQUIPMENT_MULTISELL.put(CategoryType.SIXTH_EOLH_GROUP, 924);
}
private static final String[] BYPASSES =
@@ -144,7 +143,7 @@ public final class OlyManager extends AbstractNpcAI implements IBypassHandler
{
htmltext = "OlyManager-subclass.html";
}
- else if (!player.isInCategory(CategoryType.AWAKEN_GROUP))
+ else if (!player.isInCategory(CategoryType.SIXTH_CLASS_GROUP))
{
htmltext = "OlyManager-awaken.html";
}
diff --git a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/admincommandhandlers/AdminEditChar.java b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/admincommandhandlers/AdminEditChar.java
index 8524f559b0..5352c38082 100644
--- a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/admincommandhandlers/AdminEditChar.java
+++ b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/admincommandhandlers/AdminEditChar.java
@@ -416,7 +416,7 @@ public class AdminEditChar implements IAdminCommandHandler
}
final String newclass = ClassListData.getInstance().getClass(player.getClassId()).getClassName();
- if (player.isInCategory(CategoryType.AWAKEN_GROUP))
+ if (player.isInCategory(CategoryType.SIXTH_CLASS_GROUP))
{
SkillTreesData.getInstance().cleanSkillUponAwakening(player);
for (L2SkillLearn skill : SkillTreesData.getInstance().getRaceSkillTree(player.getRace()))
diff --git a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/effecthandlers/AirBind.java b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/effecthandlers/AirBind.java
index e1adc4c75d..2b1aed91f3 100644
--- a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/effecthandlers/AirBind.java
+++ b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/effecthandlers/AirBind.java
@@ -114,7 +114,7 @@ public final class AirBind extends AbstractEffect
for (L2PcInstance nearbyPlayer : L2World.getInstance().getVisibleObjects(effected, L2PcInstance.class, 1200))
{
if ((nearbyPlayer.getRace() != Race.ERTHEIA) && (nearbyPlayer.getTarget() == effected) //
- && nearbyPlayer.isInCategory(CategoryType.AWAKEN_GROUP) && !nearbyPlayer.isAlterSkillActive())
+ && nearbyPlayer.isInCategory(CategoryType.SIXTH_CLASS_GROUP) && !nearbyPlayer.isAlterSkillActive())
{
final int chainSkill = _chainedAirSkills.get(nearbyPlayer.getClassId());
if (nearbyPlayer.getSkillRemainingReuseTime(chainSkill) == -1)
diff --git a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/effecthandlers/KnockBack.java b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/effecthandlers/KnockBack.java
index f6fa9dc43e..81b8f8134c 100644
--- a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/effecthandlers/KnockBack.java
+++ b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/effecthandlers/KnockBack.java
@@ -173,7 +173,7 @@ public final class KnockBack extends AbstractEffect
{
continue;
}
- if ((nearbyPlayer.getTarget() == effected) && nearbyPlayer.isInCategory(CategoryType.AWAKEN_GROUP) && !nearbyPlayer.isAlterSkillActive())
+ if ((nearbyPlayer.getTarget() == effected) && nearbyPlayer.isInCategory(CategoryType.SIXTH_CLASS_GROUP) && !nearbyPlayer.isAlterSkillActive())
{
final int chainSkill = _chainKnockSkills.get(nearbyPlayer.getClassId());
if (nearbyPlayer.getSkillRemainingReuseTime(chainSkill) == -1)
diff --git a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/itemhandlers/PaulinasSupportBox.java b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/itemhandlers/PaulinasSupportBox.java
index b67ca1f63f..503721790e 100644
--- a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/itemhandlers/PaulinasSupportBox.java
+++ b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/itemhandlers/PaulinasSupportBox.java
@@ -148,7 +148,7 @@ public class PaulinasSupportBox implements IItemHandler
}
case ORC:
{
- if (player.isMageClass() || CategoryData.getInstance().isInCategory(CategoryType.TYRR_CANDIDATE, classId.getId()))
+ if (player.isMageClass() || CategoryData.getInstance().isInCategory(CategoryType.WARRIOR_CATEGORY, classId.getId()))
{
player.addItem(getClass().getSimpleName(), BOX_C_LIGHT, 1, player, true);
}
@@ -203,7 +203,7 @@ public class PaulinasSupportBox implements IItemHandler
}
case ORC:
{
- if (player.isMageClass() || CategoryData.getInstance().isInCategory(CategoryType.TYRR_CANDIDATE, classId.getId()))
+ if (player.isMageClass() || CategoryData.getInstance().isInCategory(CategoryType.WARRIOR_CATEGORY, classId.getId()))
{
player.addItem(getClass().getSimpleName(), BOX_A_LIGHT, 1, player, true);
}
@@ -258,7 +258,7 @@ public class PaulinasSupportBox implements IItemHandler
}
case ORC:
{
- if (player.isMageClass() || CategoryData.getInstance().isInCategory(CategoryType.TYRR_CANDIDATE, classId.getId()))
+ if (player.isMageClass() || CategoryData.getInstance().isInCategory(CategoryType.WARRIOR_CATEGORY, classId.getId()))
{
player.addItem(getClass().getSimpleName(), BOX_S_LIGHT, 1, player, true);
}
@@ -301,7 +301,7 @@ public class PaulinasSupportBox implements IItemHandler
{
player.addItem(getClass().getSimpleName(), BOX_R_ROBE, 1, player, true);
}
- else if (CategoryData.getInstance().isInCategory(CategoryType.OTHELL_GROUP, classId.getId()) || CategoryData.getInstance().isInCategory(CategoryType.YUL_GROUP, classId.getId()))
+ else if (CategoryData.getInstance().isInCategory(CategoryType.SIXTH_OTHEL_GROUP, classId.getId()) || CategoryData.getInstance().isInCategory(CategoryType.SIXTH_YR_GROUP, classId.getId()))
{
player.addItem(getClass().getSimpleName(), BOX_R_LIGHT, 1, player, true);
}
diff --git a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/instances/HarnakUndergroundRuins/HarnakUndergroundRuins.java b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/instances/HarnakUndergroundRuins/HarnakUndergroundRuins.java
index 5a74053b38..49de099a70 100644
--- a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/instances/HarnakUndergroundRuins/HarnakUndergroundRuins.java
+++ b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/instances/HarnakUndergroundRuins/HarnakUndergroundRuins.java
@@ -79,17 +79,16 @@ public final class HarnakUndergroundRuins extends AbstractInstance
private static final int DOOR_ONE = 16240100;
private static final int DOOR_TWO = 16240102;
private static final Map MOB_CATEGORY = new HashMap<>();
-
static
{
- MOB_CATEGORY.put(CategoryType.SIGEL_CANDIDATE, RAKZAN);
- MOB_CATEGORY.put(CategoryType.TYRR_CANDIDATE, KRAKIA_BATHUS);
- MOB_CATEGORY.put(CategoryType.OTHELL_CANDIDATE, BAMONTI);
- MOB_CATEGORY.put(CategoryType.YUL_CANDIDATE, KRAKIA_CARCASS);
- MOB_CATEGORY.put(CategoryType.FEOH_CANDIDATE, WEISS_KHAN);
- MOB_CATEGORY.put(CategoryType.ISS_CANDIDATE, SEKNUS);
- MOB_CATEGORY.put(CategoryType.WYNN_CANDIDATE, KRAKIA_LOTUS);
- MOB_CATEGORY.put(CategoryType.AEORE_CANDIDATE, WEISS_ELE);
+ MOB_CATEGORY.put(CategoryType.SIXTH_SIGEL_GROUP, RAKZAN);
+ MOB_CATEGORY.put(CategoryType.SIXTH_TIR_GROUP, KRAKIA_BATHUS);
+ MOB_CATEGORY.put(CategoryType.SIXTH_OTHEL_GROUP, BAMONTI);
+ MOB_CATEGORY.put(CategoryType.SIXTH_YR_GROUP, KRAKIA_CARCASS);
+ MOB_CATEGORY.put(CategoryType.SIXTH_FEOH_GROUP, WEISS_KHAN);
+ MOB_CATEGORY.put(CategoryType.SIXTH_IS_GROUP, SEKNUS);
+ MOB_CATEGORY.put(CategoryType.SIXTH_WYNN_GROUP, KRAKIA_LOTUS);
+ MOB_CATEGORY.put(CategoryType.SIXTH_EOLH_GROUP, WEISS_ELE);
}
public HarnakUndergroundRuins()
diff --git a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/instances/Nursery/Nursery.java b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/instances/Nursery/Nursery.java
index cd0364efe8..f2affd49bf 100644
--- a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/instances/Nursery/Nursery.java
+++ b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/instances/Nursery/Nursery.java
@@ -363,27 +363,27 @@ public final class Nursery extends AbstractInstance
{
int pointsCount = getRandom(6) + 3;
- if (killer.isInCategory(CategoryType.SIGEL_GROUP) || killer.isInCategory(CategoryType.AEORE_GROUP))
+ if (killer.isInCategory(CategoryType.SIXTH_SIGEL_GROUP) || killer.isInCategory(CategoryType.SIXTH_EOLH_GROUP))
{
pointsCount += 6;
}
- else if (killer.isInCategory(CategoryType.TYRR_GROUP))
+ else if (killer.isInCategory(CategoryType.SIXTH_TIR_GROUP))
{
pointsCount -= 1;
}
- else if (killer.isInCategory(CategoryType.OTHELL_GROUP))
+ else if (killer.isInCategory(CategoryType.SIXTH_OTHEL_GROUP))
{
pointsCount += 2;
}
- else if (killer.isInCategory(CategoryType.YUL_GROUP))
+ else if (killer.isInCategory(CategoryType.SIXTH_YR_GROUP))
{
pointsCount += 1;
}
- else if (killer.isInCategory(CategoryType.FEOH_GROUP) || killer.isInCategory(CategoryType.ISS_GROUP))
+ else if (killer.isInCategory(CategoryType.SIXTH_FEOH_GROUP) || killer.isInCategory(CategoryType.SIXTH_IS_GROUP))
{
pointsCount += 0;
}
- else if (killer.isInCategory(CategoryType.WYNN_GROUP))
+ else if (killer.isInCategory(CategoryType.SIXTH_WYNN_GROUP))
{
pointsCount += 3;
}
diff --git a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/quests/Q00177_SplitDestiny/Q00177_SplitDestiny.java b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/quests/Q00177_SplitDestiny/Q00177_SplitDestiny.java
index a2ed81b2e7..4b9af8b327 100644
--- a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/quests/Q00177_SplitDestiny/Q00177_SplitDestiny.java
+++ b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/quests/Q00177_SplitDestiny/Q00177_SplitDestiny.java
@@ -239,39 +239,39 @@ public final class Q00177_SplitDestiny extends Quest
{
htmltext = "33344-02.htm";
}
- else if (!CategoryData.getInstance().isInCategory(CategoryType.AWAKEN_GROUP, player.getBaseClass()))
+ else if (!CategoryData.getInstance().isInCategory(CategoryType.SIXTH_CLASS_GROUP, player.getBaseClass()))
{
htmltext = "33344-03.htm";
}
- else if (CategoryData.getInstance().isInCategory(CategoryType.SIGEL_GROUP, player.getBaseClass()) && player.isInCategory(CategoryType.SIGEL_CANDIDATE))
+ else if (CategoryData.getInstance().isInCategory(CategoryType.SIXTH_SIGEL_GROUP, player.getBaseClass()) && player.isInCategory(CategoryType.TANKER_CATEGORY))
{
htmltext = "33344-sigel.htm";
}
- else if (CategoryData.getInstance().isInCategory(CategoryType.TYRR_GROUP, player.getBaseClass()) && player.isInCategory(CategoryType.TYRR_CANDIDATE))
+ else if (CategoryData.getInstance().isInCategory(CategoryType.SIXTH_TIR_GROUP, player.getBaseClass()) && player.isInCategory(CategoryType.WARRIOR_CATEGORY))
{
htmltext = "33344-tyrr.htm";
}
- else if (CategoryData.getInstance().isInCategory(CategoryType.OTHELL_GROUP, player.getBaseClass()) && player.isInCategory(CategoryType.OTHELL_CANDIDATE))
+ else if (CategoryData.getInstance().isInCategory(CategoryType.SIXTH_OTHEL_GROUP, player.getBaseClass()) && player.isInCategory(CategoryType.ROGUE_CATEGORY))
{
htmltext = "33344-othell.htm";
}
- else if (CategoryData.getInstance().isInCategory(CategoryType.YUL_GROUP, player.getBaseClass()) && player.isInCategory(CategoryType.YUL_CANDIDATE))
+ else if (CategoryData.getInstance().isInCategory(CategoryType.SIXTH_YR_GROUP, player.getBaseClass()) && player.isInCategory(CategoryType.ARCHER_CATEGORY))
{
htmltext = "33344-yul.htm";
}
- else if (CategoryData.getInstance().isInCategory(CategoryType.FEOH_GROUP, player.getBaseClass()) && player.isInCategory(CategoryType.FEOH_CANDIDATE))
+ else if (CategoryData.getInstance().isInCategory(CategoryType.SIXTH_FEOH_GROUP, player.getBaseClass()) && player.isInCategory(CategoryType.WIZARD_CATEGORY))
{
htmltext = "33344-feoh.htm";
}
- else if (CategoryData.getInstance().isInCategory(CategoryType.ISS_GROUP, player.getBaseClass()) && player.isInCategory(CategoryType.ISS_CANDIDATE))
+ else if (CategoryData.getInstance().isInCategory(CategoryType.SIXTH_IS_GROUP, player.getBaseClass()) && player.isInCategory(CategoryType.ENCHANTER_CATEGORY))
{
htmltext = "33344-iss.htm";
}
- else if (CategoryData.getInstance().isInCategory(CategoryType.WYNN_GROUP, player.getBaseClass()) && player.isInCategory(CategoryType.WYNN_CANDIDATE))
+ else if (CategoryData.getInstance().isInCategory(CategoryType.SIXTH_WYNN_GROUP, player.getBaseClass()) && player.isInCategory(CategoryType.SUMMONER_CATEGORY))
{
htmltext = "33344-wynn.htm";
}
- else if (CategoryData.getInstance().isInCategory(CategoryType.AEORE_GROUP, player.getBaseClass()) && player.isInCategory(CategoryType.AEORE_CANDIDATE))
+ else if (CategoryData.getInstance().isInCategory(CategoryType.SIXTH_EOLH_GROUP, player.getBaseClass()) && player.isInCategory(CategoryType.HEALER_CATEGORY))
{
htmltext = "33344-aeore.htm";
}
diff --git a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/quests/Q10338_SeizeYourDestiny/Q10338_SeizeYourDestiny.java b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/quests/Q10338_SeizeYourDestiny/Q10338_SeizeYourDestiny.java
index 64aac90a45..6ac9939d16 100644
--- a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/quests/Q10338_SeizeYourDestiny/Q10338_SeizeYourDestiny.java
+++ b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/quests/Q10338_SeizeYourDestiny/Q10338_SeizeYourDestiny.java
@@ -91,7 +91,7 @@ public final class Q10338_SeizeYourDestiny extends Quest
}
case "33477-03.html":
{
- if (!player.isInCategory(CategoryType.AWAKEN_GROUP))
+ if (!player.isInCategory(CategoryType.SIXTH_CLASS_GROUP))
{
qs.setSimulated(false);
qs.setState(State.CREATED);
@@ -149,7 +149,7 @@ public final class Q10338_SeizeYourDestiny extends Quest
{
htmltext = "33477-06.html";
}
- else if (player.isInCategory(CategoryType.AWAKEN_GROUP) || hasQuestItems(player, SCROLL_OF_AFTERLIFE.getId()))
+ else if (player.isInCategory(CategoryType.SIXTH_CLASS_GROUP) || hasQuestItems(player, SCROLL_OF_AFTERLIFE.getId()))
{
htmltext = "33477-05.html";
}
@@ -167,7 +167,7 @@ public final class Q10338_SeizeYourDestiny extends Quest
}
case HADEL:
{
- if (player.isInCategory(CategoryType.AWAKEN_GROUP) || hasQuestItems(player, SCROLL_OF_AFTERLIFE.getId()))
+ if (player.isInCategory(CategoryType.SIXTH_CLASS_GROUP) || hasQuestItems(player, SCROLL_OF_AFTERLIFE.getId()))
{
htmltext = "33344-07.html";
}
diff --git a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/quests/Q10339_FightingTheForgotten/Q10339_FightingTheForgotten.java b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/quests/Q10339_FightingTheForgotten/Q10339_FightingTheForgotten.java
index 78c2aaa6fa..8f582b0287 100644
--- a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/quests/Q10339_FightingTheForgotten/Q10339_FightingTheForgotten.java
+++ b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/quests/Q10339_FightingTheForgotten/Q10339_FightingTheForgotten.java
@@ -62,7 +62,7 @@ public final class Q10339_FightingTheForgotten extends Quest
addTalkId(THEODORE, HADEL);
addKillId(MONSTERS);
addCondMinLevel(MIN_LV, "32975-06.html");
- addCondInCategory(CategoryType.AWAKEN_GROUP, "32975-06.html");
+ addCondInCategory(CategoryType.SIXTH_CLASS_GROUP, "32975-06.html");
}
@Override
diff --git a/L2J_Mobius_3.0_Helios/dist/game/data/stats/npcs/19100-19199.xml b/L2J_Mobius_3.0_Helios/dist/game/data/stats/npcs/19100-19199.xml
index a306bc6a38..490ad01bd4 100644
--- a/L2J_Mobius_3.0_Helios/dist/game/data/stats/npcs/19100-19199.xml
+++ b/L2J_Mobius_3.0_Helios/dist/game/data/stats/npcs/19100-19199.xml
@@ -1972,7 +1972,7 @@
-
+
diff --git a/L2J_Mobius_3.0_Helios/dist/game/data/stats/npcs/25700-25799.xml b/L2J_Mobius_3.0_Helios/dist/game/data/stats/npcs/25700-25799.xml
index 197045d620..e2bce02301 100644
--- a/L2J_Mobius_3.0_Helios/dist/game/data/stats/npcs/25700-25799.xml
+++ b/L2J_Mobius_3.0_Helios/dist/game/data/stats/npcs/25700-25799.xml
@@ -4618,7 +4618,7 @@
-
+
@@ -4935,7 +4935,7 @@
-
+
@@ -5617,7 +5617,7 @@
-
+
@@ -5681,6 +5681,7 @@
+
@@ -5773,7 +5774,6 @@
-
@@ -5883,6 +5883,7 @@
+
@@ -5975,7 +5976,6 @@
-
diff --git a/L2J_Mobius_3.0_Helios/dist/game/data/stats/npcs/25800-25899.xml b/L2J_Mobius_3.0_Helios/dist/game/data/stats/npcs/25800-25899.xml
index 6cb21cb35f..da71676e0d 100644
--- a/L2J_Mobius_3.0_Helios/dist/game/data/stats/npcs/25800-25899.xml
+++ b/L2J_Mobius_3.0_Helios/dist/game/data/stats/npcs/25800-25899.xml
@@ -57,7 +57,7 @@
-
+
@@ -109,7 +109,7 @@
-
+
@@ -1027,7 +1027,7 @@
-
+
@@ -1087,6 +1087,7 @@
+
@@ -1616,6 +1617,7 @@
+
@@ -1697,6 +1699,7 @@
+
@@ -1770,6 +1773,7 @@
+
@@ -1846,6 +1850,7 @@
+
@@ -1923,6 +1928,7 @@
+
@@ -2005,7 +2011,7 @@
-
+
@@ -2046,7 +2052,7 @@
-
+
@@ -2100,7 +2106,7 @@
-
+
@@ -2155,6 +2161,7 @@
+
@@ -2239,6 +2246,7 @@
+
@@ -2310,7 +2318,7 @@
-
+
@@ -2366,7 +2374,7 @@
-
+
@@ -2956,7 +2964,7 @@
-
+
@@ -3012,7 +3020,7 @@
-
+
@@ -3065,7 +3073,7 @@
-
+
@@ -3394,7 +3402,7 @@
-
+
@@ -3450,7 +3458,7 @@
-
+
@@ -3637,7 +3645,7 @@
-
+
@@ -4708,7 +4716,7 @@
-
+
diff --git a/L2J_Mobius_3.0_Helios/dist/game/data/stats/npcs/29000-29099.xml b/L2J_Mobius_3.0_Helios/dist/game/data/stats/npcs/29000-29099.xml
index 5229b189e8..860de3fa21 100644
--- a/L2J_Mobius_3.0_Helios/dist/game/data/stats/npcs/29000-29099.xml
+++ b/L2J_Mobius_3.0_Helios/dist/game/data/stats/npcs/29000-29099.xml
@@ -1397,7 +1397,7 @@
-
+
@@ -3489,7 +3489,7 @@
-
+
diff --git a/L2J_Mobius_3.0_Helios/dist/game/data/stats/npcs/29100-29199.xml b/L2J_Mobius_3.0_Helios/dist/game/data/stats/npcs/29100-29199.xml
index 8e0c39a6e3..051f6d5eea 100644
--- a/L2J_Mobius_3.0_Helios/dist/game/data/stats/npcs/29100-29199.xml
+++ b/L2J_Mobius_3.0_Helios/dist/game/data/stats/npcs/29100-29199.xml
@@ -3420,7 +3420,7 @@
-
+
@@ -3949,7 +3949,7 @@
-
+
@@ -3988,7 +3988,7 @@
-
+
@@ -4028,7 +4028,7 @@
-
+
@@ -4070,7 +4070,7 @@
-
+
@@ -4211,7 +4211,7 @@
-
+
@@ -4369,7 +4369,7 @@
-
+
@@ -4524,7 +4524,7 @@
-
+
@@ -4672,7 +4672,7 @@
-
+
@@ -4718,7 +4718,7 @@
-
+
diff --git a/L2J_Mobius_3.0_Helios/dist/game/data/stats/npcs/29200-29299.xml b/L2J_Mobius_3.0_Helios/dist/game/data/stats/npcs/29200-29299.xml
index 27600e47d9..786c684fc5 100644
--- a/L2J_Mobius_3.0_Helios/dist/game/data/stats/npcs/29200-29299.xml
+++ b/L2J_Mobius_3.0_Helios/dist/game/data/stats/npcs/29200-29299.xml
@@ -25,7 +25,7 @@
-
+
@@ -71,7 +71,7 @@
-
+
@@ -116,7 +116,7 @@
-
+
@@ -160,7 +160,7 @@
-
+
@@ -204,7 +204,7 @@
-
+
@@ -249,7 +249,7 @@
-
+
@@ -293,7 +293,7 @@
-
+
@@ -334,7 +334,7 @@
-
+
@@ -375,7 +375,7 @@
-
+
@@ -416,7 +416,7 @@
-
+
@@ -457,7 +457,7 @@
-
+
@@ -497,7 +497,7 @@
-
+
@@ -540,7 +540,7 @@
-
+
@@ -693,7 +693,7 @@
-
+
@@ -964,7 +964,7 @@
-
+
@@ -1116,7 +1116,7 @@
-
+
@@ -1157,7 +1157,7 @@
-
+
@@ -1197,7 +1197,7 @@
-
+
@@ -1248,7 +1248,7 @@
-
+
@@ -1472,7 +1472,7 @@
-
+
@@ -1595,7 +1595,7 @@
-
+
@@ -1678,7 +1678,7 @@
-
+
@@ -1726,7 +1726,7 @@
-
+
@@ -1774,7 +1774,7 @@
-
+
@@ -1814,7 +1814,7 @@
-
+
@@ -1922,7 +1922,7 @@
-
+
@@ -2030,7 +2030,7 @@
-
+
@@ -2069,7 +2069,7 @@
-
+
diff --git a/L2J_Mobius_3.0_Helios/dist/game/data/xsd/npcs.xsd b/L2J_Mobius_3.0_Helios/dist/game/data/xsd/npcs.xsd
index 4555d46531..6f00944cff 100644
--- a/L2J_Mobius_3.0_Helios/dist/game/data/xsd/npcs.xsd
+++ b/L2J_Mobius_3.0_Helios/dist/game/data/xsd/npcs.xsd
@@ -200,6 +200,7 @@
+
diff --git a/L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/data/xml/impl/SkillTreesData.java b/L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/data/xml/impl/SkillTreesData.java
index 5d2bd7a033..4b35d8bca8 100644
--- a/L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/data/xml/impl/SkillTreesData.java
+++ b/L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/data/xml/impl/SkillTreesData.java
@@ -689,7 +689,7 @@ public final class SkillTreesData implements IGameXmlReader
return result;
}
- final boolean isAwaken = player.isInCategory(CategoryType.AWAKEN_GROUP) && ((player.getRace() != Race.ERTHEIA) || player.isDualClassActive());
+ final boolean isAwaken = player.isInCategory(CategoryType.SIXTH_CLASS_GROUP) && ((player.getRace() != Race.ERTHEIA) || player.isDualClassActive());
for (Entry entry : skills.entrySet())
{
@@ -803,7 +803,7 @@ public final class SkillTreesData implements IGameXmlReader
}
final Race race = player.getRace();
- final boolean isAwaken = player.isInCategory(CategoryType.AWAKEN_GROUP);
+ final boolean isAwaken = player.isInCategory(CategoryType.SIXTH_CLASS_GROUP);
// Race skills
if (isAwaken)
diff --git a/L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/enums/CategoryType.java b/L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/enums/CategoryType.java
index c2e14659cd..3619287373 100644
--- a/L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/enums/CategoryType.java
+++ b/L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/enums/CategoryType.java
@@ -32,6 +32,17 @@ public enum CategoryType
SECOND_CLASS_GROUP,
THIRD_CLASS_GROUP,
FOURTH_CLASS_GROUP,
+ EQUIP_ENABLE_R,
+ FIFTH_CLASS_GROUP,
+ SIXTH_CLASS_GROUP,
+ SIXTH_SIGEL_GROUP,
+ SIXTH_TIR_GROUP,
+ SIXTH_OTHEL_GROUP,
+ SIXTH_YR_GROUP,
+ SIXTH_FEOH_GROUP,
+ SIXTH_IS_GROUP,
+ SIXTH_WYNN_GROUP,
+ SIXTH_EOLH_GROUP,
BOUNTY_HUNTER_GROUP,
WARSMITH_GROUP,
SUMMON_NPC_GROUP,
@@ -142,30 +153,158 @@ public enum CategoryType
RECOM_KAMAEL_GROUP,
RECOM_ORCF_GROUP,
RECOM_ORCM_GROUP,
+ RECOM_ERTHEIAF_GROUP,
+ RECOM_ERTHEIAM_GROUP,
DEINONYCHUS_PET_GROUP,
BEASTFARM_BEAST,
BEASTFARM_INVADER,
ICEQUEEN_NPC,
- AWAKEN_GROUP,
- SHILENS_FOLLOWERS,
- SIGEL_CANDIDATE,
- TYRR_CANDIDATE,
- OTHELL_CANDIDATE,
- YUL_CANDIDATE,
- FEOH_CANDIDATE,
- ISS_CANDIDATE,
- WYNN_CANDIDATE,
- AEORE_CANDIDATE,
- EVISCERATOR_CANDIDATE,
- SAYHA_SEER_CANDIDATE,
- SIGEL_GROUP,
- TYRR_GROUP,
- OTHELL_GROUP,
- YUL_GROUP,
- FEOH_GROUP,
- ISS_GROUP,
- WYNN_GROUP,
- AEORE_GROUP;
+ FAIRY_PC_SIDE,
+ FAIRY_WISP,
+ FAIRY_GLIMMER,
+ TANKER_CATEGORY,
+ WARRIOR_CATEGORY,
+ ROGUE_CATEGORY,
+ ARCHER_CATEGORY,
+ WIZARD_CATEGORY,
+ SUMMONER_CATEGORY,
+ HEALER_CATEGORY,
+ ENCHANTER_CATEGORY,
+ RUMBLE_MONSTERS,
+ RUMBLE_GUARDIANS,
+ TWO_POINT_MULTI_SUMMON,
+ APM_ZERO_WARRIOR_GROUP,
+ APM_ZERO_MAGE_GROUP,
+ APM_1ST_KNIGHT_GROUP,
+ APM_1ST_WARRIOR_GROUP,
+ APM_1ST_WIZARD_GROUP,
+ APM_1ST_HEALER_GROUP,
+ APM_2ND_KNIGHT_GROUP,
+ APM_2ND_WARRIOR_GROUP,
+ APM_2ND_ROGUE_GROUP,
+ APM_2ND_WIZARD_GROUP,
+ APM_2ND_ARCHER_GROUP,
+ APM_2ND_BUFFER_GROUP,
+ APM_2ND_SUMMONER_GROUP,
+ APM_2ND_ONLY_GROUP,
+ APM_3RD_KNIGHT_GROUP,
+ APM_3RD_WARRIOR_GROUP,
+ APM_3RD_ROGUE_GROUP,
+ APM_3RD_WIZARD_GROUP,
+ APM_3RD_ARCHER_GROUP,
+ APM_3RD_BUFFER_GROUP,
+ APM_3RD_SUMMONER_GROUP,
+ APM_3RD_ONLY_GROUP,
+ SUBCLASS_TANKER,
+ SUBCLASS_WARRIOR,
+ SUBCLASS_ROUGE,
+ SUBCLASS_ARCHER,
+ SUBCLASS_WIZARD,
+ SUBCLASS_SUMMON,
+ SUBCLASS_HEAL,
+ SUBCLASS_ENCHANTER,
+ SUBCLASS_SPEACIAL,
+ SUBCLASS_KAMAEL,
+ EXCEPT_KAMAEL_GROUP,
+ R_HUMANMAGE_GROUP,
+ R_HUMANFIGHTER_GROUP,
+ DIVISION_TANKER,
+ DIVISION_WARRIOR,
+ DIVISION_ROUGE,
+ DIVISION_ARCHER,
+ DIVISION_WIZARD,
+ DIVISION_SUMMON,
+ DIVISION_ENCHANTER,
+ DIVISION_HEAL,
+ HUMAN_FOURTH_CLASS_GROUP,
+ ELF_FOURTH_CLASS_GROUP,
+ DARKELF_FOURTH_CLASS_GROUP,
+ ORC_FOURTH_CLASS_GROUP,
+ DWARF_FOURTH_CLASS_GROUP,
+ FOURTH_LANCE_CLASS_GROUP,
+ FOURTH_BOW_CLASS_GROUP,
+ EQUIP_ENABLE_HEAVY_ATTACK,
+ EQUIP_ENABLE_HEAVY_DEFENSE,
+ EQUIP_ENABLE_LIGHT_HIT,
+ EQUIP_ENABLE_LIGHT_ENCHANT,
+ EQUIP_ENABLE_ROBE_MAGIC,
+ EQUIP_ENABLE_ROBE_RECOVERY,
+ DILLER_GROUP,
+ MAESTRO_GROUP,
+ MAESTRO_GROUP_CRAFT,
+ SUB_GROUP_WARRIOR2,
+ SUB_GROUP_ROGUE2,
+ SUB_GROUP_KNIGHT2,
+ SUB_GROUP_SUMMONER2,
+ SUB_GROUP_WIZARD2,
+ SUB_GROUP_HEALER2,
+ SUB_GROUP_ENCHANTER2,
+ G_CARTIA_PC_GROUP,
+ G_CARTIA_NPC_GROUP,
+ HEAVY_GROUP,
+ LIGHT_GROUP,
+ ROBE_GROUP,
+ M_WARRIOR_GROUP,
+ PHYSICS_CLASS_GROUP,
+ HEATSAND_SUMMON_CLASS_GROUP,
+ MAGIC_CLASS_GROUP,
+ LONG_DISTANCE_CLASS_GROUP,
+ CLOSE_DISTANCE_CLASS_GROUP,
+ HS_WIZARD_CLASS_GROUP,
+ HS_WARRIOR_CLASS_GROUP,
+ SUBCLASS_PALADIN,
+ SUBCLASS_DARKAVENGER,
+ SUBCLASS_TEMPLEKNIGHT,
+ SUBCLASS_SHILLIENKNIGHT,
+ SUBCLASS_GLADIATOR,
+ SUBCLASS_WARLORD,
+ SUBCLASS_DESTROYER,
+ SUBCLASS_TYRAN,
+ SUBCLASS_BERSERKER,
+ SUBCLASS_TREASUREHUNTER,
+ SUBCLASS_PLAINSWALKER,
+ SUBCLASS_ABYSSWALKER,
+ SUBCLASS_BOUNTYHUNTER,
+ SUBCLASS_HAWKEYE,
+ SUBCLASS_SILVERRANGER,
+ SUBCLASS_PHANTOMRANGER,
+ SUBCLASS_ARBALESTER,
+ SUBCLASS_SORCERER,
+ SUBCLASS_NECROMANCER,
+ SUBCLASS_SPELLSINGER,
+ SUBCLASS_SPELLHOWLER,
+ SUBCLASS_SOULBREAKER,
+ SUBCLASS_WARLOCK,
+ SUBCLASS_ELEMENTALSUMMONER,
+ SUBCLASS_PHANTOMSUMMONER,
+ SUBCLASS_BISHOP,
+ SUBCLASS_ELDER,
+ SUBCLASS_SHILLIENELDER,
+ SUBCLASS_PROPHET,
+ SUBCLASS_SWORDSINGER,
+ SUBCLASS_BLADEDANCER,
+ SUBCLASS_WARCRYER,
+ SUBCLASS_INSPECTOR,
+ WINDREFINE_ERTHEIA_GROUP,
+ WINDREFINE_ERTHEIA_GROUP1,
+ WINDREFINE_ERTHEIA_GROUP2,
+ ERTHEIA_ALL_CLASS,
+ ERTHEIA_FIRST_CLASS_GROUP,
+ ERTHEIA_SECOND_CLASS_GROUP,
+ ERTHEIA_THIRD_CLASS_GROUP,
+ ERTHEIA_FOURTH_CLASS_GROUP,
+ ERTHEIA_WIZARD_GROUP,
+ ERTHEIA_FIGHTER_GROUP,
+ ERTHEIA_THIRD_WIZARD_GROUP,
+ ERTHEIA_THIRD_FIGHTER_GROUP,
+ VANGUARD_OF_ADEN_FCC,
+ COMMON_MONSTER_FCC,
+ EQEIP_ENABLE_LHAND,
+ G_EV_MON_MINIGAME,
+ HEAVY_ARMOR_CLASS,
+ LIGHT_ARMOR_CLASS,
+ ROBE_CLASS,
+ EXCEPT_ERTHEIA_CLASS;
/**
* Finds category by it's name
diff --git a/L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/instancemanager/CeremonyOfChaosManager.java b/L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/instancemanager/CeremonyOfChaosManager.java
index 536650197b..7133977526 100644
--- a/L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/instancemanager/CeremonyOfChaosManager.java
+++ b/L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/instancemanager/CeremonyOfChaosManager.java
@@ -288,7 +288,7 @@ public class CeremonyOfChaosManager extends AbstractEventManager HERO_IDS = CategoryData.getInstance().getCategoryByType(CategoryType.AWAKEN_GROUP);
+ private static final Set HERO_IDS = CategoryData.getInstance().getCategoryByType(CategoryType.SIXTH_CLASS_GROUP);
private static final int COMP_START = Config.ALT_OLY_START_TIME; // 6PM
private static final int COMP_MIN = Config.ALT_OLY_MIN; // 00 mins
diff --git a/L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/model/zone/type/L2SayuneZone.java b/L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/model/zone/type/L2SayuneZone.java
index 0872062a68..ca1ec6ed1a 100644
--- a/L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/model/zone/type/L2SayuneZone.java
+++ b/L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/model/zone/type/L2SayuneZone.java
@@ -56,7 +56,7 @@ public class L2SayuneZone extends L2ZoneType
@Override
protected void onEnter(L2Character character)
{
- if (character.isPlayer() && (character.isInCategory(CategoryType.AWAKEN_GROUP) || Config.FREE_JUMPS_FOR_ALL) && !character.getActingPlayer().isMounted() && !character.isTransformed())
+ if (character.isPlayer() && (character.isInCategory(CategoryType.SIXTH_CLASS_GROUP) || Config.FREE_JUMPS_FOR_ALL) && !character.getActingPlayer().isMounted() && !character.isTransformed())
{
character.setInsideZone(ZoneId.SAYUNE, true);
ThreadPoolManager.execute(new FlyMoveStartTask(this, character.getActingPlayer()));
diff --git a/L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/network/clientpackets/RequestAcquireSkill.java b/L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/network/clientpackets/RequestAcquireSkill.java
index 5533d14129..9d97309efc 100644
--- a/L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/network/clientpackets/RequestAcquireSkill.java
+++ b/L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/network/clientpackets/RequestAcquireSkill.java
@@ -417,7 +417,7 @@ public final class RequestAcquireSkill implements IClientIncomingPacket
Util.handleIllegalPlayerAction(activeChar, "Player " + activeChar.getName() + " is requesting skill Id: " + _id + " level " + _level + " while Sub-Class is active!", IllegalActionPunishmentType.NONE);
return;
}
- if ((activeChar.getLevel() < 85) || !activeChar.isInCategory(CategoryType.AWAKEN_GROUP))
+ if ((activeChar.getLevel() < 85) || !activeChar.isInCategory(CategoryType.SIXTH_CLASS_GROUP))
{
activeChar.sendPacket(SystemMessageId.YOU_DO_NOT_HAVE_THE_NECESSARY_MATERIALS_OR_PREREQUISITES_TO_LEARN_THIS_SKILL);
Util.handleIllegalPlayerAction(activeChar, "Player " + activeChar.getName() + " is requesting skill Id: " + _id + " level " + _level + " while not being level 85 or awaken!", IllegalActionPunishmentType.NONE);
@@ -460,7 +460,7 @@ public final class RequestAcquireSkill implements IClientIncomingPacket
return;
}
- if ((activeChar.getLevel() < 85) || !activeChar.isInCategory(CategoryType.AWAKEN_GROUP))
+ if ((activeChar.getLevel() < 85) || !activeChar.isInCategory(CategoryType.SIXTH_CLASS_GROUP))
{
activeChar.sendPacket(SystemMessageId.YOU_DO_NOT_HAVE_THE_NECESSARY_MATERIALS_OR_PREREQUISITES_TO_LEARN_THIS_SKILL);
Util.handleIllegalPlayerAction(activeChar, "Player " + activeChar.getName() + " is requesting skill Id: " + _id + " level " + _level + " while not being level 85 or awaken!", IllegalActionPunishmentType.NONE);
diff --git a/L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/network/clientpackets/RequestAcquireSkillInfo.java b/L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/network/clientpackets/RequestAcquireSkillInfo.java
index 642b423b4b..6ceb8bc736 100644
--- a/L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/network/clientpackets/RequestAcquireSkillInfo.java
+++ b/L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/network/clientpackets/RequestAcquireSkillInfo.java
@@ -150,7 +150,7 @@ public final class RequestAcquireSkillInfo implements IClientIncomingPacket
}
case REVELATION:
{
- if ((activeChar.getLevel() < 85) || !activeChar.isInCategory(CategoryType.AWAKEN_GROUP))
+ if ((activeChar.getLevel() < 85) || !activeChar.isInCategory(CategoryType.SIXTH_CLASS_GROUP))
{
return;
}
diff --git a/L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/network/clientpackets/RequestExEnchantSkill.java b/L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/network/clientpackets/RequestExEnchantSkill.java
index 69d688bf34..c6547395b2 100644
--- a/L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/network/clientpackets/RequestExEnchantSkill.java
+++ b/L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/network/clientpackets/RequestExEnchantSkill.java
@@ -82,7 +82,7 @@ public final class RequestExEnchantSkill implements IClientIncomingPacket
return;
}
- if (!player.isInCategory(CategoryType.AWAKEN_GROUP))
+ if (!player.isInCategory(CategoryType.SIXTH_CLASS_GROUP))
{
return;
}
diff --git a/L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/network/clientpackets/RequestExEnchantSkillInfo.java b/L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/network/clientpackets/RequestExEnchantSkillInfo.java
index 596bc37bae..6c175300cf 100644
--- a/L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/network/clientpackets/RequestExEnchantSkillInfo.java
+++ b/L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/network/clientpackets/RequestExEnchantSkillInfo.java
@@ -61,7 +61,7 @@ public final class RequestExEnchantSkillInfo implements IClientIncomingPacket
return;
}
- if (!activeChar.isInCategory(CategoryType.AWAKEN_GROUP))
+ if (!activeChar.isInCategory(CategoryType.SIXTH_CLASS_GROUP))
{
return;
}
diff --git a/L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/network/clientpackets/mentoring/ConfirmMenteeAdd.java b/L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/network/clientpackets/mentoring/ConfirmMenteeAdd.java
index ec5e7516a8..0c907de10f 100644
--- a/L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/network/clientpackets/mentoring/ConfirmMenteeAdd.java
+++ b/L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/network/clientpackets/mentoring/ConfirmMenteeAdd.java
@@ -115,7 +115,7 @@ public class ConfirmMenteeAdd implements IClientIncomingPacket
mentor.sendPacket(SystemMessageId.THAT_PLAYER_IS_NOT_ONLINE);
return false;
}
- else if (!mentor.isInCategory(CategoryType.AWAKEN_GROUP))
+ else if (!mentor.isInCategory(CategoryType.SIXTH_CLASS_GROUP))
{
mentor.sendPacket(SystemMessageId.YOU_MUST_AWAKEN_IN_ORDER_TO_BECOME_A_MENTOR);
return false;
diff --git a/L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/network/clientpackets/sayune/RequestFlyMoveStart.java b/L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/network/clientpackets/sayune/RequestFlyMoveStart.java
index 4ddb30ba78..50b48de960 100644
--- a/L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/network/clientpackets/sayune/RequestFlyMoveStart.java
+++ b/L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/network/clientpackets/sayune/RequestFlyMoveStart.java
@@ -44,7 +44,7 @@ public class RequestFlyMoveStart implements IClientIncomingPacket
public void run(L2GameClient client)
{
final L2PcInstance activeChar = client.getActiveChar();
- if ((activeChar == null) || !activeChar.isInsideZone(ZoneId.SAYUNE) || activeChar.hasRequest(SayuneRequest.class) || !activeChar.isInCategory(CategoryType.AWAKEN_GROUP))
+ if ((activeChar == null) || !activeChar.isInsideZone(ZoneId.SAYUNE) || activeChar.hasRequest(SayuneRequest.class) || !activeChar.isInCategory(CategoryType.SIXTH_CLASS_GROUP))
{
return;
}
diff --git a/L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/network/serverpackets/mentoring/ExMentorList.java b/L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/network/serverpackets/mentoring/ExMentorList.java
index 81e7216e87..bfd2044055 100644
--- a/L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/network/serverpackets/mentoring/ExMentorList.java
+++ b/L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/network/serverpackets/mentoring/ExMentorList.java
@@ -48,7 +48,7 @@ public class ExMentorList implements IClientOutgoingPacket
_type = 0x02;
_mentees = Arrays.asList(MentorManager.getInstance().getMentor(activeChar.getObjectId()));
}
- else if (activeChar.isInCategory(CategoryType.AWAKEN_GROUP)) // Not a mentor, Not a mentee, so can be a mentor
+ else if (activeChar.isInCategory(CategoryType.SIXTH_CLASS_GROUP)) // Not a mentor, Not a mentee, so can be a mentor
{
_mentees = Collections.emptyList();
_type = 0x01;
diff --git a/L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/network/serverpackets/mentoring/ListMenteeWaiting.java b/L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/network/serverpackets/mentoring/ListMenteeWaiting.java
index 97226c02a6..3bd29141b5 100644
--- a/L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/network/serverpackets/mentoring/ListMenteeWaiting.java
+++ b/L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/network/serverpackets/mentoring/ListMenteeWaiting.java
@@ -40,7 +40,7 @@ public class ListMenteeWaiting implements IClientOutgoingPacket
_page = page;
for (L2PcInstance player : L2World.getInstance().getPlayers())
{
- if ((player.getLevel() >= minLevel) && (player.getLevel() <= maxLevel) && !player.isMentee() && !player.isMentor() && !player.isInCategory(CategoryType.AWAKEN_GROUP))
+ if ((player.getLevel() >= minLevel) && (player.getLevel() <= maxLevel) && !player.isMentee() && !player.isMentor() && !player.isInCategory(CategoryType.SIXTH_CLASS_GROUP))
{
_possibleCandiates.add(player);
}
diff --git a/L2J_Mobius_4.0_GrandCrusade/dist/game/config/ClassMaster.xml b/L2J_Mobius_4.0_GrandCrusade/dist/game/config/ClassMaster.xml
index 64fd4dc65d..e3efd06e2e 100644
--- a/L2J_Mobius_4.0_GrandCrusade/dist/game/config/ClassMaster.xml
+++ b/L2J_Mobius_4.0_GrandCrusade/dist/game/config/ClassMaster.xml
@@ -17,7 +17,7 @@
- SIGEL_CANDIDATE
+ TANKER_CATEGORY
@@ -26,7 +26,7 @@
- TYRR_CANDIDATE
+ WARRIOR_CATEGORY
@@ -35,7 +35,7 @@
- OTHELL_CANDIDATE
+ ROGUE_CATEGORY
@@ -44,7 +44,7 @@
- YUL_CANDIDATE
+ ARCHER_CATEGORY
@@ -53,7 +53,7 @@
- FEOH_CANDIDATE
+ WIZARD_CATEGORY
@@ -62,7 +62,7 @@
- WYNN_CANDIDATE
+ SUMMONER_CATEGORY
@@ -71,7 +71,7 @@
- ISS_CANDIDATE
+ ENCHANTER_CATEGORY
@@ -80,7 +80,7 @@
- AEORE_CANDIDATE
+ HEALER_CATEGORY
@@ -89,7 +89,7 @@
- EVISCERATOR_CANDIDATE
+ ERTHEIA_THIRD_FIGHTER_GROUP
@@ -98,7 +98,7 @@
- SAYHA_SEER_CANDIDATE
+ ERTHEIA_THIRD_WIZARD_GROUP
diff --git a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/CategoryData.xml b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/CategoryData.xml
index b4958b1379..a92e1c68c7 100644
--- a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/CategoryData.xml
+++ b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/CategoryData.xml
@@ -1,72 +1,77 @@
- 0
- 1
- 2
- 3
- 4
- 5
- 6
- 7
- 8
- 9
- 18
- 19
- 20
- 21
- 22
- 23
- 24
- 31
- 32
- 33
- 34
- 35
- 36
- 37
- 44
- 45
- 46
- 47
- 48
- 53
- 54
- 55
- 56
- 57
- 88
- 89
- 90
- 91
- 92
- 93
- 99
- 100
- 101
- 102
- 106
- 107
- 108
- 109
- 113
- 114
- 117
- 118
- 123
- 124
- 125
- 126
- 127
- 128
- 129
- 130
- 131
- 132
- 133
- 134
- 135
- 136
+ 0
+ 1
+ 2
+ 3
+ 4
+ 5
+ 6
+ 7
+ 8
+ 9
+ 18
+ 19
+ 20
+ 21
+ 22
+ 23
+ 24
+ 31
+ 32
+ 33
+ 34
+ 35
+ 36
+ 37
+ 44
+ 45
+ 46
+ 47
+ 48
+ 53
+ 54
+ 55
+ 56
+ 57
+ 88
+ 89
+ 90
+ 91
+ 92
+ 93
+ 99
+ 100
+ 101
+ 102
+ 106
+ 107
+ 108
+ 109
+ 113
+ 114
+ 117
+ 118
+ 123
+ 124
+ 125
+ 126
+ 127
+ 128
+ 129
+ 130
+ 131
+ 132
+ 133
+ 134
+ 135
+ 136
+ 139
+ 140
+ 141
+ 142
+ 144
148
149
150
@@ -85,49 +90,465 @@
163
164
165
+ 171
+ 172
+ 173
+ 174
+ 175
182
184
186
188
- 10
- 11
- 12
- 13
- 14
- 15
- 16
- 17
- 25
- 26
- 27
- 28
- 29
- 30
- 38
- 39
- 40
- 41
- 42
- 43
- 49
- 50
- 51
- 52
- 94
- 95
- 96
- 97
- 98
- 103
- 104
- 105
- 110
- 111
- 112
- 115
- 116
+ 10
+ 11
+ 12
+ 13
+ 14
+ 15
+ 16
+ 17
+ 25
+ 26
+ 27
+ 28
+ 29
+ 30
+ 38
+ 39
+ 40
+ 41
+ 42
+ 43
+ 49
+ 50
+ 51
+ 52
+ 94
+ 95
+ 96
+ 97
+ 98
+ 103
+ 104
+ 105
+ 110
+ 111
+ 112
+ 115
+ 116
+ 143
+ 145
+ 146
+ 166
+ 167
+ 168
+ 169
+ 170
+ 176
+ 177
+ 178
+ 179
+ 180
+ 181
+ 183
+ 185
+ 187
+ 189
+
+
+ 10
+ 11
+ 12
+ 13
+ 14
+ 25
+ 26
+ 27
+ 28
+ 38
+ 39
+ 40
+ 41
+ 94
+ 95
+ 96
+ 103
+ 104
+ 110
+ 111
+ 49
+ 50
+ 51
+ 52
+ 115
+ 116
+ 143
+ 145
+ 166
+ 167
+ 168
+ 169
+ 170
+ 176
+ 177
+ 178
+ 183
+ 185
+ 187
+ 189
+
+
+ 10
+ 15
+ 16
+ 17
+ 25
+ 29
+ 30
+ 38
+ 42
+ 43
+ 97
+ 98
+ 105
+ 146
+ 179
+ 180
+ 181
+
+
+ 0
+ 1
+ 2
+ 3
+ 7
+ 8
+ 9
+ 18
+ 22
+ 23
+ 24
+ 31
+ 35
+ 36
+ 37
+ 44
+ 45
+ 46
+ 47
+ 48
+ 53
+ 88
+ 89
+ 93
+ 92
+ 102
+ 101
+ 108
+ 109
+ 113
+ 114
+ 123
+ 124
+ 125
+ 126
+ 127
+ 128
+ 129
+ 130
+ 135
+ 131
+ 132
+ 133
+ 134
+ 136
+ 140
+ 141
+ 142
+ 144
+ 152
+ 153
+ 154
+ 155
+ 156
+ 157
+ 158
+ 159
+ 160
+ 161
+ 162
+ 163
+ 164
+ 165
+ 171
+ 172
+ 173
+ 174
+ 175
+ 182
+ 184
+ 186
+ 188
+
+
+ 4
+ 5
+ 6
+ 90
+ 91
+ 19
+ 20
+ 99
+ 32
+ 33
+ 106
+ 54
+ 56
+ 55
+ 57
+ 117
+ 118
+ 139
+ 148
+ 149
+ 150
+ 151
+
+
+ 0
+ 10
+ 18
+ 25
+ 31
+ 38
+ 44
+ 49
+ 53
+ 123
+ 124
+ 182
+ 183
+
+
+ 1
+ 4
+ 7
+ 11
+ 15
+ 19
+ 22
+ 26
+ 29
+ 32
+ 35
+ 39
+ 42
+ 45
+ 47
+ 50
+ 54
+ 56
+ 125
+ 126
+
+
+ 2
+ 3
+ 5
+ 6
+ 8
+ 9
+ 12
+ 13
+ 14
+ 16
+ 17
+ 20
+ 21
+ 23
+ 24
+ 27
+ 28
+ 30
+ 33
+ 34
+ 36
+ 37
+ 40
+ 41
+ 43
+ 46
+ 48
+ 51
+ 52
+ 55
+ 57
+ 127
+ 128
+ 129
+ 130
+ 135
+ 184
+ 185
+
+
+ 88
+ 89
+ 90
+ 91
+ 92
+ 93
+ 94
+ 95
+ 96
+ 97
+ 98
+ 99
+ 100
+ 101
+ 102
+ 103
+ 104
+ 105
+ 106
+ 107
+ 108
+ 109
+ 110
+ 111
+ 112
+ 113
+ 114
+ 115
+ 116
+ 117
+ 118
+ 131
+ 132
+ 133
+ 134
+ 136
+ 186
+ 187
+
+
+ 0
+ 10
+ 18
+ 25
+ 31
+ 38
+ 44
+ 49
+ 53
+ 1
+ 4
+ 7
+ 11
+ 15
+ 19
+ 22
+ 26
+ 29
+ 32
+ 35
+ 39
+ 42
+ 45
+ 47
+ 50
+ 54
+ 56
+ 2
+ 3
+ 5
+ 6
+ 8
+ 9
+ 12
+ 13
+ 14
+ 16
+ 17
+ 20
+ 21
+ 23
+ 24
+ 27
+ 28
+ 30
+ 33
+ 34
+ 36
+ 37
+ 40
+ 41
+ 43
+ 46
+ 48
+ 51
+ 52
+ 55
+ 57
+ 88
+ 89
+ 90
+ 91
+ 92
+ 93
+ 94
+ 95
+ 96
+ 97
+ 98
+ 99
+ 100
+ 101
+ 102
+ 103
+ 104
+ 105
+ 106
+ 107
+ 108
+ 109
+ 110
+ 111
+ 112
+ 113
+ 114
+ 115
+ 116
+ 117
+ 118
+ 139
+ 140
+ 141
+ 142
+ 143
+ 144
+ 145
+ 146
+ 148
+ 149
+ 150
+ 151
+ 152
+ 153
+ 154
+ 155
+ 156
+ 157
+ 158
+ 159
+ 160
+ 161
+ 162
+ 163
+ 164
+ 165
166
167
168
@@ -144,2396 +565,26 @@
179
180
181
+ 182
+ 184
+ 186
+ 188
183
185
- 187
+ 187
189
-
- 10
- 11
- 12
- 13
- 14
- 25
- 26
- 27
- 28
- 38
- 39
- 40
- 41
- 94
- 95
- 96
- 103
- 104
- 110
- 111
- 49
- 50
- 51
- 52
- 115
- 116
- 166
- 167
- 168
- 169
- 170
- 176
- 177
- 178
- 183
-
-
- 10
- 15
- 16
- 17
- 25
- 29
- 30
- 38
- 42
- 43
- 97
- 98
- 105
- 179
- 180
- 181
-
-
- 0
- 1
- 2
- 3
- 7
- 8
- 9
- 18
- 22
- 23
- 24
- 31
- 35
- 36
- 37
- 44
- 45
- 46
- 47
- 48
- 53
- 88
- 89
- 93
- 92
- 102
- 101
- 108
- 109
- 113
- 114
- 123
- 124
- 125
- 126
- 127
- 128
- 129
- 130
- 135
- 131
- 132
- 133
- 134
- 136
- 152
- 153
- 154
- 155
- 156
- 157
- 158
- 159
- 160
- 161
- 162
- 163
- 164
- 165
-
-
- 4
- 5
- 6
- 90
- 91
- 19
- 20
- 99
- 32
- 33
- 106
- 54
- 56
- 55
- 57
- 117
- 118
- 148
- 149
- 150
- 151
-
-
- 0
- 10
- 18
- 25
- 31
- 38
- 44
- 49
- 53
- 123
- 124
- 182
- 183
-
-
- 1
- 4
- 7
- 11
- 15
- 19
- 22
- 26
- 29
- 32
- 35
- 39
- 42
- 45
- 47
- 50
- 54
- 56
- 125
- 126
-
-
- 2
- 3
- 5
- 6
- 8
- 9
- 12
- 13
- 14
- 16
- 17
- 20
- 21
- 23
- 24
- 27
- 28
- 30
- 33
- 34
- 36
- 37
- 40
- 41
- 43
- 46
- 48
- 51
- 52
- 55
- 57
- 127
- 128
- 129
- 130
- 135
- 184
- 185
-
-
- 88
- 89
- 90
- 91
- 92
- 93
- 94
- 95
- 96
- 97
- 98
- 99
- 100
- 101
- 102
- 103
- 104
- 105
- 106
- 107
- 108
- 109
- 110
- 111
- 112
- 113
- 114
- 115
- 116
- 117
- 118
- 131
- 132
- 133
- 134
- 136
- 186
- 187
-
-
- 53
- 54
- 55
- 117
- 161
-
-
- 53
- 56
- 57
- 118
- 156
-
-
- 14001
- 14002
- 14003
- 14004
- 14005
- 14006
- 14007
- 14008
- 14009
- 14010
- 14011
- 14012
- 14013
- 14014
- 14015
- 14016
- 14017
- 14018
- 14019
- 14020
- 14021
- 14022
- 14023
- 14024
- 14025
- 14026
- 14027
- 14028
- 14029
- 14030
- 14031
- 14032
- 14033
- 14034
- 14035
- 14036
- 14037
- 14038
- 14039
- 14040
- 14041
- 14042
- 14043
- 14044
- 14045
- 14046
- 14047
- 14048
- 14049
- 14050
- 14051
- 14052
- 14053
- 14054
- 14055
- 14056
- 14057
- 14058
- 14059
- 14060
- 14061
- 14062
- 14063
- 14064
- 14065
- 14066
- 14067
- 14068
- 14069
- 14070
- 14071
- 14072
- 14073
- 14074
- 14075
- 14076
- 14077
- 14078
- 14079
- 14080
- 14081
- 14082
- 14083
- 14084
- 14085
- 14086
- 14087
- 14088
- 14089
- 14090
- 14091
- 14092
- 14093
- 14094
- 14095
- 14096
- 14097
- 14098
- 14099
- 14100
- 14101
- 14102
- 14103
- 14104
- 14105
- 14106
- 14107
- 14108
- 14109
- 14110
- 14111
- 14112
- 14113
- 14114
- 14115
- 14116
- 14117
- 14118
- 14119
- 14120
- 14121
- 14122
- 14123
- 14124
- 14125
- 14126
- 14127
- 14128
- 14129
- 14130
- 14131
- 14132
- 14133
- 14134
- 14135
- 14136
- 14137
- 14138
- 14139
- 14140
- 14141
- 14142
- 14143
- 14144
- 14145
- 14146
- 14147
- 14148
- 14149
- 14150
- 14151
- 14152
- 14153
- 14154
- 14155
- 14156
- 14157
- 14158
- 14159
- 14160
- 14161
- 14162
- 14163
- 14164
- 14165
- 14166
- 14167
- 14168
- 14169
- 14170
- 14171
- 14172
- 14173
- 14174
- 14175
- 14176
- 14177
- 14178
- 14179
- 14180
- 14181
- 14182
- 14183
- 14184
- 14185
- 14186
- 14187
- 14188
- 14189
- 14190
- 14191
- 14192
- 14193
- 14194
- 14195
- 14196
- 14197
- 14198
- 14199
- 14200
- 14201
- 14202
- 14203
- 14204
- 14205
- 14206
- 14207
- 14208
- 14209
- 14210
- 14211
- 14212
- 14213
- 14214
- 14215
- 14216
- 14217
- 14218
- 14219
- 14220
- 14221
- 14222
- 14223
- 14224
- 14225
- 14226
- 14227
- 14228
- 14229
- 14230
- 14231
- 14232
- 14233
- 14234
- 14235
- 14236
- 14237
- 14238
- 14239
- 14240
- 14241
- 14242
- 14243
- 14244
- 14245
- 14246
- 14247
- 14248
- 14249
- 14250
- 14251
- 14252
- 14253
- 14254
- 14255
- 14256
- 14257
- 14258
- 14259
- 14260
- 14265
- 14266
- 14267
- 14268
- 14269
- 14270
- 14271
- 14272
- 14273
- 14274
- 14275
- 14276
- 14277
- 14278
- 14279
- 14280
- 14281
- 14282
- 14283
- 14284
- 14285
- 14286
- 14287
- 14288
- 14289
- 14290
- 14291
- 14292
- 14293
- 14294
- 14295
- 14296
- 14297
- 14298
- 14299
- 14300
- 14301
- 14302
- 14303
- 14304
- 14305
- 14306
- 14307
- 14308
- 14309
- 14310
- 14311
- 14312
- 14313
- 14314
- 14315
- 14316
- 14317
- 14318
- 14319
- 14320
- 14321
- 14322
- 14323
- 14324
- 14325
- 14326
- 14327
- 14328
- 14329
- 14330
- 14331
- 14332
- 14333
- 14334
- 14335
- 14336
- 14337
- 14338
- 14339
- 14340
- 14341
- 14342
- 14343
- 14344
- 14345
- 14346
- 14347
- 14348
- 14349
- 14350
- 14351
- 14352
- 14353
- 14354
- 14355
- 14356
- 14357
- 14358
- 14359
- 14360
- 14361
- 14362
- 14363
- 14364
- 14365
- 14366
- 14367
- 14368
- 14369
- 14370
- 14371
- 14372
- 14373
- 14374
- 14375
- 14376
- 14377
- 14378
- 14379
- 14380
- 14381
- 14382
- 14383
- 14384
- 14385
- 14386
- 14387
- 14388
- 14389
- 14390
- 14391
- 14392
- 14393
- 14394
- 14395
- 14396
- 14397
- 14398
- 14399
- 14400
- 14401
- 14402
- 14403
- 14404
- 14405
- 14406
- 14407
- 14408
- 14409
- 14410
- 14411
- 14412
- 14413
- 14414
- 14415
- 14416
- 14417
- 14418
- 14419
- 14420
- 14421
- 14422
- 14423
- 14424
- 14425
- 14426
- 14427
- 14428
- 14429
- 14430
- 14431
- 14432
- 14433
- 14434
- 14435
- 14436
- 14437
- 14438
- 14439
- 14440
- 14441
- 14442
- 14443
- 14444
- 14449
- 14450
- 14451
- 14452
- 14453
- 14454
- 14455
- 14456
- 14457
- 14458
- 14459
- 14460
- 14461
- 14462
- 14463
- 14464
- 14465
- 14466
- 14467
- 14468
- 14469
- 14470
- 14471
- 14472
- 14473
- 14474
- 14475
- 14476
- 14477
- 14478
- 14479
- 14480
- 14481
- 14482
- 14483
- 14484
- 14485
- 14486
- 14487
- 14488
- 14489
- 14490
- 14491
- 14492
- 14493
- 14494
- 14495
- 14496
- 14497
- 14498
- 14499
- 14500
- 14501
- 14502
- 14503
- 14504
- 14505
- 14506
- 14507
- 14508
- 14509
- 14510
- 14511
- 14512
- 14513
- 14514
- 14515
- 14516
- 14517
- 14518
- 14519
- 14520
- 14521
- 14522
- 14523
- 14524
- 14525
- 14526
- 14527
- 14528
- 14529
- 14530
- 14531
- 14532
- 14533
- 14534
- 14535
- 14536
- 14537
- 14538
- 14539
- 14540
- 14541
- 14542
- 14543
- 14544
- 14545
- 14546
- 14547
- 14548
- 14549
- 14550
- 14551
- 14552
- 14553
- 14554
- 14555
- 14556
- 14557
- 14558
- 14559
- 14560
- 14561
- 14562
- 14563
- 14564
- 14565
- 14566
- 14567
- 14568
- 14569
- 14570
- 14571
- 14572
- 14573
- 14574
- 14575
- 14576
- 14577
- 14578
- 14579
- 14580
- 14581
- 14582
- 14583
- 14584
- 14585
- 14586
- 14587
- 14588
- 14589
- 14590
- 14591
- 14592
- 14593
- 14594
- 14595
- 14596
- 14597
- 14598
- 14599
- 14600
- 14601
- 14602
- 14603
- 14604
- 14605
- 14606
- 14607
- 14608
- 14609
- 14610
- 14611
- 14612
- 14613
- 14614
- 14615
- 14616
- 14617
- 14618
- 14619
- 14620
- 14621
- 14622
- 14623
- 14624
- 14625
- 14626
- 14627
- 14628
- 14633
- 14634
- 14635
- 14636
- 14637
- 14638
- 14639
- 14640
- 14641
- 14642
- 14643
- 14644
- 14645
- 14646
- 14647
- 14648
- 14649
- 14650
- 14651
- 14652
- 14653
- 14654
- 14655
- 14656
- 14657
- 14658
- 14659
- 14660
- 14661
- 14662
- 14663
- 14664
- 14665
- 14666
- 14667
- 14668
- 14669
- 14670
- 14671
- 14672
- 14673
- 14674
- 14675
- 14676
- 14677
- 14678
- 14679
- 14680
- 14681
- 14682
- 14683
- 14684
- 14685
- 14686
- 14687
- 14688
- 14689
- 14690
- 14691
- 14692
- 14693
- 14694
- 14695
- 14696
- 14697
- 14698
- 14699
- 14700
- 14701
- 14702
- 14703
- 14704
- 14705
- 14706
- 14707
- 14708
- 14709
- 14710
- 14711
- 14712
- 14713
- 14714
- 14715
- 14716
- 14717
- 14718
- 14719
- 14720
- 14721
- 14722
- 14723
- 14724
- 14725
- 14726
- 14727
- 14728
- 14729
- 14730
- 14731
- 14732
- 14733
- 14734
- 14735
- 14736
- 14737
- 14738
- 14739
- 14740
- 14741
- 14742
- 14743
- 14744
- 14745
- 14746
- 14747
- 14748
- 14749
- 14750
- 14751
- 14752
- 14753
- 14754
- 14755
- 14756
- 14757
- 14758
- 14759
- 14760
- 14761
- 14762
- 14763
- 14764
- 14765
- 14766
- 14767
- 14768
- 14769
- 14770
- 14771
- 14772
- 14773
- 14774
- 14775
- 14776
- 14777
- 14778
- 14779
- 14780
- 14781
- 14782
- 14783
- 14784
- 14785
- 14786
- 14787
- 14788
- 14789
- 14790
- 14791
- 14792
- 14793
- 14794
- 14795
- 14796
- 14797
- 14798
- 14799
- 14800
- 14801
- 14802
- 14803
- 14804
- 14805
- 14806
- 14807
- 14808
- 14809
- 14810
- 14811
- 14812
- 14813
- 14814
- 14815
- 14816
- 14817
- 14818
- 14819
- 14820
- 14821
- 14822
- 14823
- 14824
- 14825
- 14826
- 14827
- 14828
- 14829
- 14830
- 14831
- 14832
- 14833
- 14834
- 14835
- 14836
- 14837
- 14838
- 14839
- 14840
- 14841
- 14842
- 14843
- 14844
- 14845
- 14846
- 14847
- 14848
- 14849
- 14850
- 14851
- 14852
- 14853
- 14854
- 14855
- 14856
- 14857
- 14858
- 14859
- 14860
- 14861
- 14862
- 14863
- 14864
- 14865
- 14866
- 14867
- 14868
- 14869
- 12077
- 12311
- 12312
- 12313
- 12526
- 12527
- 12528
- 12564
- 12621
- 12780
- 12781
- 12782
- 16025
- 13071
- 13072
- 13073
- 13074
- 13075
- 13076
- 14870
- 14871
- 14872
- 14873
- 14874
- 14875
- 14876
- 14877
- 14878
- 14879
- 14880
- 14881
- 14882
- 14883
- 14884
- 14885
- 14886
- 14887
- 14888
- 14889
- 14890
- 14891
- 14892
- 14893
- 14894
- 14895
- 14896
- 14897
- 14898
- 14899
- 14900
- 14901
- 14902
- 14903
- 14904
- 14905
- 14906
- 14907
- 14908
- 14909
- 14910
- 14911
- 14912
- 14913
- 14914
- 14915
- 16030
- 16034
- 16035
- 16036
- 16037
- 16038
- 16039
- 16040
- 16041
- 16042
- 16043
- 16044
- 16045
- 16046
- 14916
- 14917
- 14918
- 16050
- 16051
- 16052
- 16053
- 16067
- 16068
- 16071
- 16072
-
-
- 4
- 19
- 32
-
-
- 15
- 29
- 5
- 19
- 4
-
-
- 15
- 29
- 42
- 50
-
-
- 15
- 42
-
-
- 1
- 19
- 32
- 45
- 47
-
-
- 1
- 4
- 7
- 11
- 15
-
-
- 22
- 19
- 26
- 29
-
-
- 35
- 32
- 39
- 42
-
-
- 50
- 45
- 47
-
-
- 54
- 56
-
-
- 12526
- 12527
- 12528
- 16038
- 16039
- 16040
- 16068
-
-
- 12526
- 12527
- 12528
-
-
- 16038
- 16039
- 16040
- 16068
-
-
- 16030
- 16037
- 16041
- 16042
-
-
- 16025
- 16030
- 16037
- 16041
- 16042
-
-
- 12311
- 12312
- 12313
-
-
- 12780
- 12781
- 12782
-
-
- 16034
- 16035
- 16036
-
-
- 12621
-
-
- 12077
- 16025
- 16030
- 16037
- 16041
- 16042
-
-
- 12077
-
-
- 12564
-
-
- 12077
- 12311
- 12312
- 12313
- 12526
- 12527
- 12528
- 12780
- 12781
- 12782
- 16025
- 16030
- 16034
- 16035
- 16036
- 16037
- 16038
- 16039
- 16040
- 16041
- 16042
- 16043
- 16044
- 16045
- 16046
- 16050
- 16051
- 16052
- 16053
- 16067
- 16068
- 16071
- 16072
- 1561
- 1538
- 1562
- 1563
- 1564
- 1565
- 1566
- 1567
- 1568
- 1569
- 1570
- 1571
- 1572
- 1573
-
-
- 12077
- 12311
- 12312
- 12313
- 12526
- 12527
- 12528
- 12780
- 12781
- 12782
- 16025
- 16030
- 16034
- 16035
- 16036
- 16037
- 16038
- 16039
- 16040
- 16041
- 16042
- 16068
- 16067
- 16071
- 16072
- 1561
-
-
- 8
- 23
- 36
- 93
- 101
- 108
-
-
- 9
- 24
- 37
- 92
- 102
- 109
-
-
- 5
- 6
- 33
- 20
- 90
- 91
- 106
- 99
-
-
- 14
- 28
- 41
- 96
- 104
- 111
-
-
- 30
- 43
- 105
- 112
-
-
- 21
- 34
- 100
- 107
-
-
- 12
- 27
- 40
- 94
- 103
- 110
-
-
- 0
- 1
- 4
- 7
- 2
- 3
- 5
- 6
- 8
- 9
- 88
- 89
- 90
- 91
- 92
- 93
-
-
- 10
- 11
- 12
- 13
- 14
- 94
- 95
- 96
-
-
- 10
- 11
- 12
- 13
- 14
- 10
- 15
- 16
- 17
- 95
- 96
- 97
- 98
-
-
- 10
- 15
- 16
- 17
- 97
- 98
-
-
- 18
- 19
- 22
- 20
- 21
- 23
- 24
- 99
- 100
- 101
- 102
-
-
- 25
- 26
- 27
- 28
- 25
- 29
- 30
- 103
- 104
- 105
-
-
- 25
- 26
- 27
- 28
- 103
- 104
-
-
- 25
- 29
- 30
- 105
-
-
- 31
- 32
- 35
- 33
- 34
- 36
- 37
- 106
- 107
- 108
- 109
-
-
- 38
- 39
- 42
- 40
- 41
- 43
- 110
- 111
- 112
-
-
- 38
- 39
- 40
- 41
- 110
- 111
-
-
- 38
- 42
- 43
- 112
-
-
- 44
- 45
- 47
- 46
- 48
- 113
- 114
-
-
- 49
- 50
- 51
- 52
- 115
- 116
-
-
- 53
- 54
- 56
- 55
- 57
- 117
- 118
-
-
- 53
- 54
- 55
- 117
-
-
- 53
- 56
- 57
- 118
-
-
- 123
- 124
- 125
- 126
- 127
- 128
- 129
- 130
- 131
- 132
- 133
- 134
- 135
- 136
-
-
- 123
- 124
-
-
- 125
- 126
-
-
- 127
- 128
- 129
- 130
- 135
-
-
- 131
- 132
- 133
- 134
- 136
-
-
- 0
- 1
- 2
- 3
- 4
- 5
- 6
- 7
- 8
- 9
- 18
- 19
- 20
- 21
- 22
- 23
- 24
- 31
- 32
- 33
- 34
- 35
- 36
- 37
- 44
- 45
- 46
- 47
- 48
- 49
- 50
- 51
- 52
- 53
- 54
- 55
- 56
- 57
- 123
- 124
- 125
- 126
- 127
- 128
- 129
- 130
- 135
-
-
- 10
- 11
- 12
- 13
- 14
- 15
- 16
- 17
- 25
- 26
- 27
- 28
- 29
- 30
- 38
- 39
- 40
- 41
- 42
- 43
-
-
- 123
- 125
- 127
- 128
- 131
- 132
- 129
- 133
- 135
- 136
-
-
- 124
- 126
- 129
- 130
- 133
- 134
- 128
- 132
- 135
- 136
-
-
- 9
- 24
- 37
- 92
- 102
- 109
-
-
- 90
- 91
- 99
- 106
-
-
- 100
- 107
-
-
- 88
- 114
-
-
- 89
- 113
- 117
- 118
- 131
- 132
- 133
-
-
- 92
- 102
- 109
- 134
-
-
- 93
- 101
- 108
- 117
- 158
- 159
- 160
- 161
-
-
- 97
- 105
- 112
-
-
- 94
- 103
- 110
- 95
-
-
- 98
- 115
- 116
- 136
-
-
- 96
- 104
- 111
-
-
- 90
- 91
- 99
- 106
- 100
- 107
- 88
- 114
- 89
- 113
- 117
- 118
-
-
- 92
- 102
- 109
- 134
- 93
- 101
- 108
-
-
- 97
- 105
- 112
- 94
- 103
- 110
- 95
- 98
- 115
- 116
- 136
- 96
- 104
- 111
-
-
- 20
- 33
- 5
- 6
- 90
- 91
- 99
- 106
-
-
- 21
- 34
- 100
- 107
-
-
- 48
- 2
- 88
- 114
-
-
- 3
- 127
- 128
- 129
- 46
- 55
- 57
- 89
- 113
- 117
- 118
- 131
- 132
- 133
-
-
- 24
- 130
- 37
- 9
- 92
- 102
- 109
- 134
-
-
- 36
- 23
- 8
- 93
- 101
- 108
-
-
- 16
- 30
- 43
- 97
- 105
- 112
-
-
- 27
- 40
- 12
- 13
- 94
- 103
- 110
- 95
-
-
- 135
- 17
- 51
- 52
- 98
- 115
- 116
- 136
-
-
- 14
- 28
- 41
- 96
- 104
- 111
-
-
- 14
- 28
- 41
- 96
- 104
- 111
-
-
- 3
- 127
- 128
- 129
- 46
- 55
- 57
- 48
- 2
- 89
- 131
- 113
- 117
- 118
- 132
- 133
- 114
- 88
-
-
- 8
- 23
- 36
- 93
- 101
- 108
- 9
- 24
- 37
- 92
- 102
- 109
- 130
- 134
-
-
- 5
- 6
- 33
- 20
- 90
- 91
- 106
- 99
-
-
- 14
- 28
- 41
- 96
- 104
- 111
-
-
- 12
- 27
- 40
- 13
- 94
- 103
- 110
- 95
-
-
- 16
- 30
- 43
- 97
- 105
- 112
-
-
- 17
- 51
- 52
- 21
- 34
- 135
- 98
- 115
- 116
- 100
- 107
- 136
-
-
- 16
- 30
- 97
- 105
- 17
- 98
-
-
- 12
- 94
- 27
- 103
- 13
- 95
- 14
- 96
- 28
- 104
-
-
- 2
- 88
- 3
- 89
- 5
- 90
- 6
- 91
- 8
- 93
- 9
- 92
- 20
- 99
- 21
- 100
- 23
- 101
- 24
- 102
-
-
- 46
- 113
- 48
- 114
- 51
- 115
- 52
- 116
-
-
- 55
- 117
-
-
- 57
- 118
-
-
- 36
- 108
- 37
- 109
- 33
- 106
- 41
- 111
- 40
- 110
- 43
- 112
- 34
- 107
-
-
- 127
- 131
- 128
- 132
- 129
- 133
- 135
- 136
- 130
- 134
-
-
- 5
- 20
- 90
- 99
-
-
- 6
- 33
- 91
- 106
-
-
- 0
- 1
- 2
- 3
- 4
- 5
- 6
- 7
- 8
- 18
- 19
- 20
- 21
- 22
- 23
- 31
- 32
- 33
- 34
- 35
- 36
- 44
- 45
- 46
- 47
- 48
- 53
- 54
- 55
- 56
- 57
- 88
- 89
- 90
- 91
- 93
- 99
- 100
- 101
- 106
- 107
- 108
- 113
- 114
- 117
- 118
- 123
- 124
- 125
- 126
- 127
- 128
- 129
- 131
- 132
- 133
- 135
- 136
-
-
- 4
- 5
- 6
- 19
- 32
- 20
- 21
- 33
- 34
- 90
- 91
- 99
- 100
- 106
- 107
-
-
- 11
- 15
- 26
- 29
- 39
- 42
- 12
- 13
- 14
- 16
- 17
- 27
- 28
- 30
- 40
- 41
- 43
- 94
- 95
- 96
- 97
- 98
- 103
- 104
- 105
- 110
- 111
- 112
-
-
- 1
- 2
- 3
- 54
- 56
- 55
- 57
- 117
- 118
- 88
- 89
-
-
- 7
- 22
- 35
- 8
- 9
- 23
- 24
- 36
- 37
- 92
- 93
- 101
- 102
- 108
- 109
-
-
- 125
- 126
- 127
- 128
- 129
- 130
- 135
- 131
- 132
- 133
- 134
- 136
-
-
- 45
- 47
- 46
- 48
- 113
- 114
-
-
- 50
- 51
- 52
- 115
- 116
-
-
- 16067
- 16071
- 16072
-
-
- 18869
- 18870
- 18871
- 18872
- 18873
- 18874
- 18875
- 18876
- 18877
- 18878
- 18879
- 18880
- 18881
- 18882
- 18883
- 18884
- 18885
- 18886
- 18887
- 18888
- 18889
- 18890
- 18891
- 18892
- 18893
- 18894
- 18895
- 18896
- 18897
- 18898
- 18899
- 18900
- 18901
- 18902
- 18903
- 18904
-
-
- 18905
- 18906
- 18907
-
-
- 18850
- 18851
- 18852
-
-
+
+ 139
+ 140
+ 141
+ 142
+ 143
+ 144
+ 145
+ 146
+
+
148
149
150
@@ -2571,99 +622,13 @@
188
189
-
- 25867
- 25868
- 19160
- 19172
- 25796
- 25881
- 25797
- 25799
- 29179
- 29180
- 25876
- 25877
- 29194
- 29212
- 29195
- 29196
- 29218
- 29213
- 25837
- 25840
- 25845
- 25841
- 25838
- 25839
- 25846
- 25825
- 29068
-
-
- 90
- 91
- 99
- 106
-
-
- 88
- 89
- 131
- 113
- 118
- 114
-
-
- 93
- 101
- 108
- 117
-
-
- 92
- 102
- 109
- 134
-
-
- 94
- 95
- 103
- 110
- 132
- 133
-
-
- 98
- 115
- 116
- 100
- 107
-
-
- 96
- 104
- 111
-
-
- 97
- 105
- 112
-
-
- 186
-
-
- 187
-
-
+
148
149
150
151
-
+
152
153
154
@@ -2671,40 +636,5098 @@
156
157
-
+
158
159
160
161
-
+
162
163
164
165
-
+
166
167
168
169
170
-
+
171
172
173
174
175
-
+
176
177
178
-
+
179
180
181
+
+ 53
+ 54
+ 55
+ 117
+ 161
+
+
+ 53
+ 56
+ 57
+ 118
+ 156
+
+
+ 14001
+ 14002
+ 14003
+ 14004
+ 14005
+ 14006
+ 14007
+ 14008
+ 14009
+ 14010
+ 14011
+ 14012
+ 14013
+ 14014
+ 14015
+ 14016
+ 14017
+ 14018
+ 14019
+ 14020
+ 14021
+ 14022
+ 14023
+ 14024
+ 14025
+ 14026
+ 14027
+ 14028
+ 14029
+ 14030
+ 14031
+ 14032
+ 14033
+ 14034
+ 14035
+ 14036
+ 14037
+ 14038
+ 14039
+ 14040
+ 14041
+ 14042
+ 14043
+ 14044
+ 14045
+ 14046
+ 14047
+ 14048
+ 14049
+ 14050
+ 14051
+ 14052
+ 14053
+ 14054
+ 14055
+ 14056
+ 14057
+ 14058
+ 14059
+ 14060
+ 14061
+ 14062
+ 14063
+ 14064
+ 14065
+ 14066
+ 14067
+ 14068
+ 14069
+ 14070
+ 14071
+ 14072
+ 14073
+ 14074
+ 14075
+ 14076
+ 14077
+ 14078
+ 14079
+ 14080
+ 14081
+ 14082
+ 14083
+ 14084
+ 14085
+ 14086
+ 14087
+ 14088
+ 14089
+ 14090
+ 14091
+ 14092
+ 14093
+ 14094
+ 14095
+ 14096
+ 14097
+ 14098
+ 14099
+ 14100
+ 14101
+ 14102
+ 14103
+ 14104
+ 14105
+ 14106
+ 14107
+ 14108
+ 14109
+ 14110
+ 14111
+ 14112
+ 14113
+ 14114
+ 14115
+ 14116
+ 14117
+ 14118
+ 14119
+ 14120
+ 14121
+ 14122
+ 14123
+ 14124
+ 14125
+ 14126
+ 14127
+ 14128
+ 14129
+ 14130
+ 14131
+ 14132
+ 14133
+ 14134
+ 14135
+ 14136
+ 14137
+ 14138
+ 14139
+ 14140
+ 14141
+ 14142
+ 14143
+ 14144
+ 14145
+ 14146
+ 14147
+ 14148
+ 14149
+ 14150
+ 14151
+ 14152
+ 14153
+ 14154
+ 14155
+ 14156
+ 14157
+ 14158
+ 14159
+ 14160
+ 14161
+ 14162
+ 14163
+ 14164
+ 14165
+ 14166
+ 14167
+ 14168
+ 14169
+ 14170
+ 14171
+ 14172
+ 14173
+ 14174
+ 14175
+ 14176
+ 14177
+ 14178
+ 14179
+ 14180
+ 14181
+ 14182
+ 14183
+ 14184
+ 14185
+ 14186
+ 14187
+ 14188
+ 14189
+ 14190
+ 14191
+ 14192
+ 14193
+ 14194
+ 14195
+ 14196
+ 14197
+ 14198
+ 14199
+ 14200
+ 14201
+ 14202
+ 14203
+ 14204
+ 14205
+ 14206
+ 14207
+ 14208
+ 14209
+ 14210
+ 14211
+ 14212
+ 14213
+ 14214
+ 14215
+ 14216
+ 14217
+ 14218
+ 14219
+ 14220
+ 14221
+ 14222
+ 14223
+ 14224
+ 14225
+ 14226
+ 14227
+ 14228
+ 14229
+ 14230
+ 14231
+ 14232
+ 14233
+ 14234
+ 14235
+ 14236
+ 14237
+ 14238
+ 14239
+ 14240
+ 14241
+ 14242
+ 14243
+ 14244
+ 14245
+ 14246
+ 14247
+ 14248
+ 14249
+ 14250
+ 14251
+ 14252
+ 14253
+ 14254
+ 14255
+ 14256
+ 14257
+ 14258
+ 14259
+ 14260
+ 14265
+ 14266
+ 14267
+ 14268
+ 14269
+ 14270
+ 14271
+ 14272
+ 14273
+ 14274
+ 14275
+ 14276
+ 14277
+ 14278
+ 14279
+ 14280
+ 14281
+ 14282
+ 14283
+ 14284
+ 14285
+ 14286
+ 14287
+ 14288
+ 14289
+ 14290
+ 14291
+ 14292
+ 14293
+ 14294
+ 14295
+ 14296
+ 14297
+ 14298
+ 14299
+ 14300
+ 14301
+ 14302
+ 14303
+ 14304
+ 14305
+ 14306
+ 14307
+ 14308
+ 14309
+ 14310
+ 14311
+ 14312
+ 14313
+ 14314
+ 14315
+ 14316
+ 14317
+ 14318
+ 14319
+ 14320
+ 14321
+ 14322
+ 14323
+ 14324
+ 14325
+ 14326
+ 14327
+ 14328
+ 14329
+ 14330
+ 14331
+ 14332
+ 14333
+ 14334
+ 14335
+ 14336
+ 14337
+ 14338
+ 14339
+ 14340
+ 14341
+ 14342
+ 14343
+ 14344
+ 14345
+ 14346
+ 14347
+ 14348
+ 14349
+ 14350
+ 14351
+ 14352
+ 14353
+ 14354
+ 14355
+ 14356
+ 14357
+ 14358
+ 14359
+ 14360
+ 14361
+ 14362
+ 14363
+ 14364
+ 14365
+ 14366
+ 14367
+ 14368
+ 14369
+ 14370
+ 14371
+ 14372
+ 14373
+ 14374
+ 14375
+ 14376
+ 14377
+ 14378
+ 14379
+ 14380
+ 14381
+ 14382
+ 14383
+ 14384
+ 14385
+ 14386
+ 14387
+ 14388
+ 14389
+ 14390
+ 14391
+ 14392
+ 14393
+ 14394
+ 14395
+ 14396
+ 14397
+ 14398
+ 14399
+ 14400
+ 14401
+ 14402
+ 14403
+ 14404
+ 14405
+ 14406
+ 14407
+ 14408
+ 14409
+ 14410
+ 14411
+ 14412
+ 14413
+ 14414
+ 14415
+ 14416
+ 14417
+ 14418
+ 14419
+ 14420
+ 14421
+ 14422
+ 14423
+ 14424
+ 14425
+ 14426
+ 14427
+ 14428
+ 14429
+ 14430
+ 14431
+ 14432
+ 14433
+ 14434
+ 14435
+ 14436
+ 14437
+ 14438
+ 14439
+ 14440
+ 14441
+ 14442
+ 14443
+ 14444
+ 14449
+ 14450
+ 14451
+ 14452
+ 14453
+ 14454
+ 14455
+ 14456
+ 14457
+ 14458
+ 14459
+ 14460
+ 14461
+ 14462
+ 14463
+ 14464
+ 14465
+ 14466
+ 14467
+ 14468
+ 14469
+ 14470
+ 14471
+ 14472
+ 14473
+ 14474
+ 14475
+ 14476
+ 14477
+ 14478
+ 14479
+ 14480
+ 14481
+ 14482
+ 14483
+ 14484
+ 14485
+ 14486
+ 14487
+ 14488
+ 14489
+ 14490
+ 14491
+ 14492
+ 14493
+ 14494
+ 14495
+ 14496
+ 14497
+ 14498
+ 14499
+ 14500
+ 14501
+ 14502
+ 14503
+ 14504
+ 14505
+ 14506
+ 14507
+ 14508
+ 14509
+ 14510
+ 14511
+ 14512
+ 14513
+ 14514
+ 14515
+ 14516
+ 14517
+ 14518
+ 14519
+ 14520
+ 14521
+ 14522
+ 14523
+ 14524
+ 14525
+ 14526
+ 14527
+ 14528
+ 14529
+ 14530
+ 14531
+ 14532
+ 14533
+ 14534
+ 14535
+ 14536
+ 14537
+ 14538
+ 14539
+ 14540
+ 14541
+ 14542
+ 14543
+ 14544
+ 14545
+ 14546
+ 14547
+ 14548
+ 14549
+ 14550
+ 14551
+ 14552
+ 14553
+ 14554
+ 14555
+ 14556
+ 14557
+ 14558
+ 14559
+ 14560
+ 14561
+ 14562
+ 14563
+ 14564
+ 14565
+ 14566
+ 14567
+ 14568
+ 14569
+ 14570
+ 14571
+ 14572
+ 14573
+ 14574
+ 14575
+ 14576
+ 14577
+ 14578
+ 14579
+ 14580
+ 14581
+ 14582
+ 14583
+ 14584
+ 14585
+ 14586
+ 14587
+ 14588
+ 14589
+ 14590
+ 14591
+ 14592
+ 14593
+ 14594
+ 14595
+ 14596
+ 14597
+ 14598
+ 14599
+ 14600
+ 14601
+ 14602
+ 14603
+ 14604
+ 14605
+ 14606
+ 14607
+ 14608
+ 14609
+ 14610
+ 14611
+ 14612
+ 14613
+ 14614
+ 14615
+ 14616
+ 14617
+ 14618
+ 14619
+ 14620
+ 14621
+ 14622
+ 14623
+ 14624
+ 14625
+ 14626
+ 14627
+ 14628
+ 14633
+ 14634
+ 14635
+ 14636
+ 14637
+ 14638
+ 14639
+ 14640
+ 14641
+ 14642
+ 14643
+ 14644
+ 14645
+ 14646
+ 14647
+ 14648
+ 14649
+ 14650
+ 14651
+ 14652
+ 14653
+ 14654
+ 14655
+ 14656
+ 14657
+ 14658
+ 14659
+ 14660
+ 14661
+ 14662
+ 14663
+ 14664
+ 14665
+ 14666
+ 14667
+ 14668
+ 14669
+ 14670
+ 14671
+ 14672
+ 14673
+ 14674
+ 14675
+ 14676
+ 14677
+ 14678
+ 14679
+ 14680
+ 14681
+ 14682
+ 14683
+ 14684
+ 14685
+ 14686
+ 14687
+ 14688
+ 14689
+ 14690
+ 14691
+ 14692
+ 14693
+ 14694
+ 14695
+ 14696
+ 14697
+ 14698
+ 14699
+ 14700
+ 14701
+ 14702
+ 14703
+ 14704
+ 14705
+ 14706
+ 14707
+ 14708
+ 14709
+ 14710
+ 14711
+ 14712
+ 14713
+ 14714
+ 14715
+ 14716
+ 14717
+ 14718
+ 14719
+ 14720
+ 14721
+ 14722
+ 14723
+ 14724
+ 14725
+ 14726
+ 14727
+ 14728
+ 14729
+ 14730
+ 14731
+ 14732
+ 14733
+ 14734
+ 14735
+ 14736
+ 14737
+ 14738
+ 14739
+ 14740
+ 14741
+ 14742
+ 14743
+ 14744
+ 14745
+ 14746
+ 14747
+ 14748
+ 14749
+ 14750
+ 14751
+ 14752
+ 14753
+ 14754
+ 14755
+ 14756
+ 14757
+ 14758
+ 14759
+ 14760
+ 14761
+ 14762
+ 14763
+ 14764
+ 14765
+ 14766
+ 14767
+ 14768
+ 14769
+ 14770
+ 14771
+ 14772
+ 14773
+ 14774
+ 14775
+ 14776
+ 14777
+ 14778
+ 14779
+ 14780
+ 14781
+ 14782
+ 14783
+ 14784
+ 14785
+ 14786
+ 14787
+ 14788
+ 14789
+ 14790
+ 14791
+ 14792
+ 14793
+ 14794
+ 14795
+ 14796
+ 14797
+ 14798
+ 14799
+ 14800
+ 14801
+ 14802
+ 14803
+ 14804
+ 14805
+ 14806
+ 14807
+ 14808
+ 14809
+ 14810
+ 14811
+ 14812
+ 14813
+ 14814
+ 14815
+ 14816
+ 14817
+ 14818
+ 14819
+ 14820
+ 14821
+ 14822
+ 14823
+ 14824
+ 14825
+ 14826
+ 14827
+ 14828
+ 14829
+ 14830
+ 14831
+ 14832
+ 14833
+ 14834
+ 14835
+ 14836
+ 14837
+ 14838
+ 14839
+ 14840
+ 14841
+ 14842
+ 14843
+ 14844
+ 14845
+ 14846
+ 14847
+ 14848
+ 14849
+ 14850
+ 14851
+ 14852
+ 14853
+ 14854
+ 14855
+ 14856
+ 14857
+ 14858
+ 14859
+ 14860
+ 14861
+ 14862
+ 14863
+ 14864
+ 14865
+ 14866
+ 14867
+ 14868
+ 14869
+ 12077
+ 12311
+ 12312
+ 12313
+ 12526
+ 12527
+ 12528
+ 12564
+ 12621
+ 12780
+ 12781
+ 12782
+ 16025
+ 13071
+ 13072
+ 13073
+ 13074
+ 13075
+ 13076
+ 14870
+ 14871
+ 14872
+ 14873
+ 14874
+ 14875
+ 14876
+ 14877
+ 14878
+ 14879
+ 14880
+ 14881
+ 14882
+ 14883
+ 14884
+ 14885
+ 14886
+ 14887
+ 14888
+ 14889
+ 14890
+ 14891
+ 14892
+ 14893
+ 14894
+ 14895
+ 14896
+ 14897
+ 14898
+ 14899
+ 14900
+ 14901
+ 14902
+ 14903
+ 14904
+ 14905
+ 14906
+ 14907
+ 14908
+ 14909
+ 14910
+ 14911
+ 14912
+ 14913
+ 14914
+ 14915
+ 16030
+ 16034
+ 16035
+ 16036
+ 16037
+ 16038
+ 16039
+ 16040
+ 16041
+ 16042
+ 16043
+ 16044
+ 16045
+ 16046
+ 14916
+ 14917
+ 14918
+ 16050
+ 16051
+ 16052
+ 16053
+ 16067
+ 16068
+ 16071
+ 16072
+ 13302
+ 13303
+ 13304
+ 13305
+ 14929
+ 14930
+ 14931
+ 14947
+ 14948
+ 14949
+ 14950
+ 14951
+ 14952
+ 14953
+ 14954
+ 14955
+ 14956
+ 14957
+ 14958
+ 14959
+ 14960
+ 14961
+ 14962
+ 14963
+ 14964
+ 14965
+ 14966
+ 14967
+ 14926
+ 14932
+ 14940
+ 14941
+ 14942
+ 14986
+ 14987
+ 14988
+ 14989
+ 14990
+ 14991
+ 14992
+ 14993
+ 14994
+ 14995
+ 14996
+ 14997
+ 14998
+ 14999
+ 14936
+ 14937
+ 14938
+ 14939
+ 14974
+ 14975
+ 14976
+ 14977
+ 14978
+ 14979
+ 14980
+ 14981
+ 14982
+ 14983
+ 14984
+ 14985
+ 14933
+ 14943
+ 15010
+ 15011
+ 15012
+ 15013
+ 15014
+ 15015
+ 15016
+ 15017
+ 15018
+ 15019
+ 15020
+ 15021
+ 14925
+ 14944
+ 14945
+ 14946
+ 15000
+ 15001
+ 15002
+ 15003
+ 15004
+ 15005
+ 15006
+ 15007
+ 15008
+ 15009
+ 14968
+ 14969
+ 14970
+ 14927
+ 14928
+ 15022
+ 15023
+ 15024
+ 15025
+ 15026
+ 15027
+ 15028
+ 15029
+ 15030
+ 15031
+ 15032
+ 15033
+ 15034
+ 15035
+ 15036
+ 15037
+ 15038
+ 15039
+ 15040
+ 15041
+ 15042
+ 15043
+ 15044
+ 15045
+ 15046
+ 15047
+ 15048
+ 15049
+ 15050
+ 15051
+ 15053
+ 15054
+ 15055
+ 15056
+ 15057
+ 15058
+ 15059
+ 15060
+ 15061
+ 15062
+ 15063
+ 15064
+ 15065
+ 1562
+ 1563
+ 1564
+ 1565
+ 1566
+ 1567
+ 1568
+ 1569
+ 1570
+ 1571
+ 1572
+ 1573
+ 16094
+ 16095
+ 16096
+ 16097
+
+
+ 4
+ 19
+ 32
+
+
+ 15
+ 29
+ 5
+ 19
+ 4
+
+
+ 15
+ 29
+ 42
+ 50
+
+
+ 15
+ 42
+
+
+ 1
+ 19
+ 32
+ 45
+ 47
+
+
+ 1
+ 4
+ 7
+ 11
+ 15
+
+
+ 22
+ 19
+ 26
+ 29
+
+
+ 35
+ 32
+ 39
+ 42
+
+
+ 50
+ 45
+ 47
+
+
+ 54
+ 56
+
+
+ 12526
+ 12527
+ 12528
+ 16038
+ 16039
+ 16040
+ 16068
+
+
+ 12526
+ 12527
+ 12528
+
+
+ 16038
+ 16039
+ 16040
+ 16068
+
+
+ 16030
+ 16037
+ 16041
+ 16042
+
+
+ 16025
+ 16030
+ 16037
+ 16041
+ 16042
+
+
+ 12311
+ 12312
+ 12313
+
+
+ 12780
+ 12781
+ 12782
+
+
+ 16034
+ 16035
+ 16036
+
+
+ 12621
+
+
+ 12077
+ 16025
+ 16030
+ 16037
+ 16041
+ 16042
+
+
+ 12077
+
+
+ 12564
+
+
+ 12077
+ 12311
+ 12312
+ 12313
+ 12526
+ 12527
+ 12528
+ 12780
+ 12781
+ 12782
+ 16025
+ 16030
+ 16034
+ 16035
+ 16036
+ 16037
+ 16038
+ 16039
+ 16040
+ 16041
+ 16042
+ 16043
+ 16044
+ 16045
+ 16046
+ 16050
+ 16051
+ 16052
+ 16053
+ 16067
+ 16068
+ 16071
+ 16072
+ 1561
+ 1538
+ 1562
+ 1563
+ 1564
+ 1565
+ 1566
+ 1567
+ 1568
+ 1569
+ 1570
+ 1571
+ 1572
+ 1573
+ 16094
+ 16095
+ 16096
+ 16097
+
+
+ 12077
+ 12311
+ 12312
+ 12313
+ 12526
+ 12527
+ 12528
+ 12780
+ 12781
+ 12782
+ 16025
+ 16030
+ 16034
+ 16035
+ 16036
+ 16037
+ 16038
+ 16039
+ 16040
+ 16041
+ 16042
+ 16068
+ 16067
+ 16071
+ 16072
+ 1561
+
+
+ 8
+ 23
+ 36
+ 93
+ 101
+ 108
+
+
+ 9
+ 24
+ 37
+ 92
+ 102
+ 109
+
+
+ 5
+ 6
+ 33
+ 20
+ 90
+ 91
+ 106
+ 99
+
+
+ 14
+ 28
+ 41
+ 96
+ 104
+ 111
+
+
+ 30
+ 43
+ 105
+ 112
+
+
+ 21
+ 34
+ 100
+ 107
+
+
+ 12
+ 27
+ 40
+ 94
+ 103
+ 110
+
+
+ 0
+ 1
+ 4
+ 7
+ 2
+ 3
+ 5
+ 6
+ 8
+ 9
+ 88
+ 89
+ 90
+ 91
+ 92
+ 93
+ 152
+ 153
+ 148
+ 149
+ 162
+ 158
+
+
+ 10
+ 11
+ 12
+ 13
+ 14
+ 94
+ 95
+ 96
+ 166
+ 167
+ 176
+
+
+ 10
+ 11
+ 12
+ 13
+ 14
+ 10
+ 15
+ 16
+ 17
+ 95
+ 96
+ 97
+ 98
+ 167
+ 176
+ 179
+ 171
+
+
+ 10
+ 15
+ 16
+ 17
+ 97
+ 98
+ 179
+ 171
+
+
+ 18
+ 19
+ 22
+ 20
+ 21
+ 23
+ 24
+ 99
+ 100
+ 101
+ 102
+ 150
+ 172
+ 159
+ 163
+
+
+ 25
+ 26
+ 27
+ 28
+ 25
+ 29
+ 30
+ 103
+ 104
+ 105
+ 168
+ 177
+ 180
+
+
+ 25
+ 26
+ 27
+ 28
+ 103
+ 104
+ 168
+ 177
+
+
+ 25
+ 29
+ 30
+ 105
+ 180
+
+
+ 31
+ 32
+ 35
+ 33
+ 34
+ 36
+ 37
+ 106
+ 107
+ 108
+ 109
+ 151
+ 173
+ 160
+ 164
+
+
+ 38
+ 39
+ 42
+ 40
+ 41
+ 43
+ 110
+ 111
+ 112
+ 169
+ 178
+ 181
+
+
+ 38
+ 39
+ 40
+ 41
+ 110
+ 111
+ 169
+ 178
+
+
+ 38
+ 42
+ 43
+ 112
+ 181
+
+
+ 44
+ 45
+ 47
+ 46
+ 48
+ 113
+ 114
+ 154
+ 155
+
+
+ 49
+ 50
+ 51
+ 52
+ 115
+ 116
+ 174
+ 175
+
+
+ 53
+ 54
+ 56
+ 55
+ 57
+ 117
+ 118
+ 161
+ 156
+
+
+ 53
+ 54
+ 55
+ 117
+ 161
+
+
+ 53
+ 56
+ 57
+ 118
+ 156
+
+
+ 123
+ 124
+ 125
+ 126
+ 127
+ 128
+ 129
+ 130
+ 131
+ 132
+ 133
+ 134
+ 135
+ 136
+ 157
+ 165
+ 170
+
+
+ 123
+ 124
+
+
+ 125
+ 126
+
+
+ 127
+ 128
+ 129
+ 130
+ 135
+
+
+ 131
+ 132
+ 133
+ 134
+ 136
+
+
+ 0
+ 1
+ 2
+ 3
+ 4
+ 5
+ 6
+ 7
+ 8
+ 9
+ 18
+ 19
+ 20
+ 21
+ 22
+ 23
+ 24
+ 31
+ 32
+ 33
+ 34
+ 35
+ 36
+ 37
+ 44
+ 45
+ 46
+ 47
+ 48
+ 49
+ 50
+ 51
+ 52
+ 53
+ 54
+ 55
+ 56
+ 57
+ 123
+ 124
+ 125
+ 126
+ 127
+ 128
+ 129
+ 130
+ 135
+ 182
+ 184
+
+
+ 10
+ 11
+ 12
+ 13
+ 14
+ 15
+ 16
+ 17
+ 25
+ 26
+ 27
+ 28
+ 29
+ 30
+ 38
+ 39
+ 40
+ 41
+ 42
+ 43
+ 183
+ 185
+
+
+ 123
+ 125
+ 127
+ 128
+ 131
+ 132
+ 129
+ 133
+ 135
+ 136
+
+
+ 124
+ 126
+ 129
+ 130
+ 133
+ 134
+ 128
+ 132
+ 135
+ 136
+
+
+ 9
+ 24
+ 37
+ 92
+ 102
+ 109
+
+
+ 90
+ 91
+ 99
+ 106
+
+
+ 100
+ 107
+
+
+ 88
+ 114
+
+
+ 89
+ 113
+ 117
+ 118
+ 131
+ 132
+ 133
+
+
+ 92
+ 102
+ 109
+ 134
+
+
+ 93
+ 101
+ 108
+ 117
+ 141
+ 139
+ 140
+ 141
+ 142
+ 143
+ 144
+ 145
+ 146
+ 148
+ 149
+ 150
+ 151
+ 152
+ 153
+ 154
+ 155
+ 156
+ 157
+ 158
+ 159
+ 160
+ 161
+ 162
+ 163
+ 164
+ 165
+ 166
+ 167
+ 168
+ 169
+ 170
+ 171
+ 172
+ 173
+ 174
+ 175
+ 176
+ 177
+ 178
+ 179
+ 180
+ 181
+
+
+ 97
+ 105
+ 112
+
+
+ 94
+ 103
+ 110
+ 95
+
+
+ 98
+ 115
+ 116
+ 136
+
+
+ 96
+ 104
+ 111
+
+
+ 90
+ 91
+ 99
+ 106
+ 100
+ 107
+ 88
+ 114
+ 89
+ 113
+ 117
+ 118
+
+
+ 92
+ 102
+ 109
+ 134
+ 93
+ 101
+ 108
+
+
+ 97
+ 105
+ 112
+ 94
+ 103
+ 110
+ 95
+ 98
+ 115
+ 116
+ 136
+ 96
+ 104
+ 111
+
+
+ 20
+ 33
+ 5
+ 6
+ 90
+ 91
+ 99
+ 106
+ 143
+ 145
+ 146
+ 139
+ 140
+ 141
+ 142
+ 144
+ 166
+ 167
+ 168
+ 169
+ 170
+ 176
+ 177
+ 178
+ 179
+ 180
+ 181
+ 148
+ 149
+ 150
+ 151
+ 152
+ 153
+ 154
+ 155
+ 156
+ 157
+ 158
+ 159
+ 160
+ 161
+ 162
+ 163
+ 164
+ 165
+ 171
+ 172
+ 173
+ 174
+ 175
+
+
+ 21
+ 34
+ 100
+ 107
+ 143
+ 145
+ 146
+ 139
+ 140
+ 141
+ 142
+ 144
+ 166
+ 167
+ 168
+ 169
+ 170
+ 176
+ 177
+ 178
+ 179
+ 180
+ 181
+ 148
+ 149
+ 150
+ 151
+ 152
+ 153
+ 154
+ 155
+ 156
+ 157
+ 158
+ 159
+ 160
+ 161
+ 162
+ 163
+ 164
+ 165
+ 171
+ 172
+ 173
+ 174
+ 175
+
+
+ 48
+ 2
+ 88
+ 114
+ 143
+ 145
+ 146
+ 139
+ 140
+ 141
+ 142
+ 144
+ 166
+ 167
+ 168
+ 169
+ 170
+ 176
+ 177
+ 178
+ 179
+ 180
+ 181
+ 148
+ 149
+ 150
+ 151
+ 152
+ 153
+ 154
+ 155
+ 156
+ 157
+ 158
+ 159
+ 160
+ 161
+ 162
+ 163
+ 164
+ 165
+ 171
+ 172
+ 173
+ 174
+ 175
+
+
+ 3
+ 127
+ 128
+ 129
+ 46
+ 55
+ 57
+ 89
+ 113
+ 117
+ 118
+ 131
+ 132
+ 133
+ 143
+ 145
+ 146
+ 139
+ 140
+ 141
+ 142
+ 144
+ 166
+ 167
+ 168
+ 169
+ 170
+ 176
+ 177
+ 178
+ 179
+ 180
+ 181
+ 148
+ 149
+ 150
+ 151
+ 152
+ 153
+ 154
+ 155
+ 156
+ 157
+ 158
+ 159
+ 160
+ 161
+ 162
+ 163
+ 164
+ 165
+ 171
+ 172
+ 173
+ 174
+ 175
+
+
+ 24
+ 130
+ 37
+ 9
+ 92
+ 102
+ 109
+ 134
+ 143
+ 145
+ 146
+ 139
+ 140
+ 141
+ 142
+ 144
+ 166
+ 167
+ 168
+ 169
+ 170
+ 176
+ 177
+ 178
+ 179
+ 180
+ 181
+ 148
+ 149
+ 150
+ 151
+ 152
+ 153
+ 154
+ 155
+ 156
+ 157
+ 158
+ 159
+ 160
+ 161
+ 162
+ 163
+ 164
+ 165
+ 171
+ 172
+ 173
+ 174
+ 175
+
+
+ 36
+ 23
+ 8
+ 93
+ 101
+ 108
+ 143
+ 145
+ 146
+ 139
+ 140
+ 141
+ 142
+ 144
+ 166
+ 167
+ 168
+ 169
+ 170
+ 176
+ 177
+ 178
+ 179
+ 180
+ 181
+ 148
+ 149
+ 150
+ 151
+ 152
+ 153
+ 154
+ 155
+ 156
+ 157
+ 158
+ 159
+ 160
+ 161
+ 162
+ 163
+ 164
+ 165
+ 171
+ 172
+ 173
+ 174
+ 175
+
+
+ 16
+ 30
+ 43
+ 97
+ 105
+ 112
+ 143
+ 145
+ 146
+ 139
+ 140
+ 141
+ 142
+ 144
+ 166
+ 167
+ 168
+ 169
+ 170
+ 176
+ 177
+ 178
+ 179
+ 180
+ 181
+ 148
+ 149
+ 150
+ 151
+ 152
+ 153
+ 154
+ 155
+ 156
+ 157
+ 158
+ 159
+ 160
+ 161
+ 162
+ 163
+ 164
+ 165
+ 171
+ 172
+ 173
+ 174
+ 175
+
+
+ 27
+ 40
+ 12
+ 13
+ 94
+ 103
+ 110
+ 95
+ 143
+ 145
+ 146
+ 139
+ 140
+ 141
+ 142
+ 144
+ 166
+ 167
+ 168
+ 169
+ 170
+ 176
+ 177
+ 178
+ 179
+ 180
+ 181
+ 148
+ 149
+ 150
+ 151
+ 152
+ 153
+ 154
+ 155
+ 156
+ 157
+ 158
+ 159
+ 160
+ 161
+ 162
+ 163
+ 164
+ 165
+ 171
+ 172
+ 173
+ 174
+ 175
+
+
+ 135
+ 17
+ 51
+ 52
+ 98
+ 115
+ 116
+ 136
+ 143
+ 145
+ 146
+ 139
+ 140
+ 141
+ 142
+ 144
+ 166
+ 167
+ 168
+ 169
+ 170
+ 176
+ 177
+ 178
+ 179
+ 180
+ 181
+ 148
+ 149
+ 150
+ 151
+ 152
+ 153
+ 154
+ 155
+ 156
+ 157
+ 158
+ 159
+ 160
+ 161
+ 162
+ 163
+ 164
+ 165
+ 171
+ 172
+ 173
+ 174
+ 175
+
+
+ 14
+ 28
+ 41
+ 96
+ 104
+ 111
+ 143
+ 145
+ 146
+ 139
+ 140
+ 141
+ 142
+ 144
+ 166
+ 167
+ 168
+ 169
+ 170
+ 176
+ 177
+ 178
+ 179
+ 180
+ 181
+ 148
+ 149
+ 150
+ 151
+ 152
+ 153
+ 154
+ 155
+ 156
+ 157
+ 158
+ 159
+ 160
+ 161
+ 162
+ 163
+ 164
+ 165
+ 171
+ 172
+ 173
+ 174
+ 175
+
+
+ 14
+ 28
+ 41
+ 96
+ 104
+ 111
+ 13
+ 95
+ 145
+ 176
+ 177
+ 178
+
+
+ 3
+ 127
+ 128
+ 129
+ 46
+ 55
+ 57
+ 48
+ 2
+ 89
+ 131
+ 113
+ 117
+ 118
+ 132
+ 133
+ 114
+ 88
+ 140
+ 152
+ 153
+ 154
+ 155
+ 156
+ 157
+
+
+ 8
+ 23
+ 36
+ 93
+ 101
+ 108
+ 9
+ 24
+ 37
+ 92
+ 102
+ 109
+ 130
+ 134
+ 141
+ 142
+ 158
+ 159
+ 160
+ 161
+ 162
+ 163
+ 164
+
+
+ 5
+ 6
+ 33
+ 20
+ 90
+ 91
+ 106
+ 99
+ 139
+ 148
+ 149
+ 150
+ 151
+
+
+ 14
+ 28
+ 41
+ 96
+ 104
+ 111
+ 145
+ 176
+ 177
+ 178
+
+
+ 12
+ 27
+ 40
+ 13
+ 94
+ 103
+ 110
+ 95
+ 143
+ 166
+ 167
+ 168
+ 169
+ 170
+
+
+ 16
+ 30
+ 43
+ 97
+ 105
+ 112
+ 146
+ 179
+ 180
+ 181
+
+
+ 17
+ 51
+ 52
+ 21
+ 34
+ 135
+ 98
+ 115
+ 116
+ 100
+ 107
+ 136
+ 144
+ 171
+ 172
+ 173
+ 174
+ 175
+
+
+ 16
+ 30
+ 97
+ 105
+ 17
+ 98
+ 179
+ 180
+ 171
+
+
+ 12
+ 94
+ 27
+ 103
+ 13
+ 95
+ 14
+ 96
+ 28
+ 104
+ 168
+ 167
+ 176
+ 177
+
+
+ 2
+ 88
+ 3
+ 89
+ 5
+ 90
+ 6
+ 91
+ 8
+ 93
+ 9
+ 92
+ 20
+ 99
+ 21
+ 100
+ 23
+ 101
+ 24
+ 102
+ 152
+ 153
+ 148
+ 149
+ 158
+ 162
+ 150
+ 172
+ 159
+ 163
+
+
+ 46
+ 113
+ 48
+ 114
+ 51
+ 115
+ 52
+ 116
+ 154
+ 155
+ 174
+ 175
+
+
+ 55
+ 117
+ 161
+
+
+ 57
+ 118
+ 156
+
+
+ 36
+ 108
+ 37
+ 109
+ 33
+ 106
+ 41
+ 111
+ 40
+ 110
+ 43
+ 112
+ 34
+ 107
+ 160
+ 164
+ 151
+ 178
+ 169
+ 181
+ 173
+
+
+ 127
+ 131
+ 128
+ 132
+ 129
+ 133
+ 135
+ 136
+ 130
+ 134
+ 157
+ 170
+ 165
+
+
+ 5
+ 20
+ 90
+ 99
+ 148
+ 150
+
+
+ 6
+ 33
+ 91
+ 106
+ 149
+ 151
+
+
+ 0
+ 1
+ 2
+ 3
+ 4
+ 5
+ 6
+ 7
+ 8
+ 18
+ 19
+ 20
+ 21
+ 22
+ 23
+ 31
+ 32
+ 33
+ 34
+ 35
+ 36
+ 44
+ 45
+ 46
+ 47
+ 48
+ 53
+ 54
+ 55
+ 56
+ 57
+ 88
+ 89
+ 90
+ 91
+ 93
+ 99
+ 100
+ 101
+ 106
+ 107
+ 108
+ 113
+ 114
+ 117
+ 118
+ 123
+ 124
+ 125
+ 126
+ 127
+ 128
+ 129
+ 131
+ 132
+ 133
+ 135
+ 136
+ 139
+ 140
+ 141
+ 144
+ 148
+ 149
+ 150
+ 151
+ 152
+ 153
+ 154
+ 155
+ 156
+ 157
+ 158
+ 159
+ 160
+ 161
+ 171
+ 172
+ 173
+ 174
+ 175
+ 182
+ 184
+ 186
+ 188
+
+
+ 4
+ 5
+ 6
+ 19
+ 32
+ 20
+ 21
+ 33
+ 34
+ 90
+ 91
+ 99
+ 100
+ 106
+ 107
+ 139
+ 148
+ 149
+ 150
+ 151
+
+
+ 11
+ 15
+ 26
+ 29
+ 39
+ 42
+ 12
+ 13
+ 14
+ 16
+ 17
+ 27
+ 28
+ 30
+ 40
+ 41
+ 43
+ 94
+ 95
+ 96
+ 97
+ 98
+ 103
+ 104
+ 105
+ 110
+ 111
+ 112
+ 143
+ 145
+ 146
+ 166
+ 167
+ 168
+ 169
+ 176
+ 177
+ 178
+ 179
+ 180
+ 181
+
+
+ 1
+ 2
+ 3
+ 54
+ 56
+ 55
+ 57
+ 117
+ 118
+ 88
+ 89
+ 140
+ 144
+ 152
+ 153
+ 156
+ 171
+ 172
+ 173
+
+
+ 7
+ 22
+ 35
+ 8
+ 9
+ 23
+ 24
+ 36
+ 37
+ 92
+ 93
+ 101
+ 102
+ 108
+ 109
+ 141
+ 142
+ 158
+ 159
+ 160
+ 161
+ 162
+ 163
+ 164
+
+
+ 125
+ 126
+ 127
+ 128
+ 129
+ 130
+ 135
+ 131
+ 132
+ 133
+ 134
+ 136
+ 157
+ 170
+ 165
+
+
+ 45
+ 47
+ 46
+ 48
+ 113
+ 114
+ 154
+ 155
+ 174
+ 175
+
+
+ 50
+ 51
+ 52
+ 115
+ 116
+
+
+ 182
+ 184
+ 186
+ 188
+
+
+ 183
+ 185
+ 187
+ 189
+
+
+ 16067
+ 16071
+ 16072
+
+
+ 18869
+ 18870
+ 18871
+ 18872
+ 18873
+ 18874
+ 18875
+ 18876
+ 18877
+ 18878
+ 18879
+ 18880
+ 18881
+ 18882
+ 18883
+ 18884
+ 18885
+ 18886
+ 18887
+ 18888
+ 18889
+ 18890
+ 18891
+ 18892
+ 18893
+ 18894
+ 18895
+ 18896
+ 18897
+ 18898
+ 18899
+ 18900
+ 18901
+ 18902
+ 18903
+ 18904
+
+
+ 18905
+ 18906
+ 18907
+
+
+ 18850
+ 18851
+ 18852
+
+
+ 32913
+ 32914
+ 33097
+ 32922
+ 33098
+ 33099
+ 33131
+ 33132
+ 14001
+ 14002
+ 14003
+ 14004
+ 14005
+ 14006
+ 14007
+ 14008
+ 14009
+ 14010
+ 14011
+ 14012
+ 14013
+ 14014
+ 14015
+ 14016
+ 14017
+ 14018
+ 14019
+ 14020
+ 14021
+ 14022
+ 14023
+ 14024
+ 14025
+ 14026
+ 14027
+ 14028
+ 14029
+ 14030
+ 14031
+ 14032
+ 14033
+ 14034
+ 14035
+ 14036
+ 14037
+ 14038
+ 14039
+ 14040
+ 14041
+ 14042
+ 14043
+ 14044
+ 14045
+ 14046
+ 14047
+ 14048
+ 14049
+ 14050
+ 14051
+ 14052
+ 14053
+ 14054
+ 14055
+ 14056
+ 14057
+ 14058
+ 14059
+ 14060
+ 14061
+ 14062
+ 14063
+ 14064
+ 14065
+ 14066
+ 14067
+ 14068
+ 14069
+ 14070
+ 14071
+ 14072
+ 14073
+ 14074
+ 14075
+ 14076
+ 14077
+ 14078
+ 14079
+ 14080
+ 14081
+ 14082
+ 14083
+ 14084
+ 14085
+ 14086
+ 14087
+ 14088
+ 14089
+ 14090
+ 14091
+ 14092
+ 14093
+ 14094
+ 14095
+ 14096
+ 14097
+ 14098
+ 14099
+ 14100
+ 14101
+ 14102
+ 14103
+ 14104
+ 14105
+ 14106
+ 14107
+ 14108
+ 14109
+ 14110
+ 14111
+ 14112
+ 14113
+ 14114
+ 14115
+ 14116
+ 14117
+ 14118
+ 14119
+ 14120
+ 14121
+ 14122
+ 14123
+ 14124
+ 14125
+ 14126
+ 14127
+ 14128
+ 14129
+ 14130
+ 14131
+ 14132
+ 14133
+ 14134
+ 14135
+ 14136
+ 14137
+ 14138
+ 14139
+ 14140
+ 14141
+ 14142
+ 14143
+ 14144
+ 14145
+ 14146
+ 14147
+ 14148
+ 14149
+ 14150
+ 14151
+ 14152
+ 14153
+ 14154
+ 14155
+ 14156
+ 14157
+ 14158
+ 14159
+ 14160
+ 14161
+ 14162
+ 14163
+ 14164
+ 14165
+ 14166
+ 14167
+ 14168
+ 14169
+ 14170
+ 14171
+ 14172
+ 14173
+ 14174
+ 14175
+ 14176
+ 14177
+ 14178
+ 14179
+ 14180
+ 14181
+ 14182
+ 14183
+ 14184
+ 14185
+ 14186
+ 14187
+ 14188
+ 14189
+ 14190
+ 14191
+ 14192
+ 14193
+ 14194
+ 14195
+ 14196
+ 14197
+ 14198
+ 14199
+ 14200
+ 14201
+ 14202
+ 14203
+ 14204
+ 14205
+ 14206
+ 14207
+ 14208
+ 14209
+ 14210
+ 14211
+ 14212
+ 14213
+ 14214
+ 14215
+ 14216
+ 14217
+ 14218
+ 14219
+ 14220
+ 14221
+ 14222
+ 14223
+ 14224
+ 14225
+ 14226
+ 14227
+ 14228
+ 14229
+ 14230
+ 14231
+ 14232
+ 14233
+ 14234
+ 14235
+ 14236
+ 14237
+ 14238
+ 14239
+ 14240
+ 14241
+ 14242
+ 14243
+ 14244
+ 14245
+ 14246
+ 14247
+ 14248
+ 14249
+ 14250
+ 14251
+ 14252
+ 14253
+ 14254
+ 14255
+ 14256
+ 14257
+ 14258
+ 14259
+ 14260
+ 14265
+ 14266
+ 14267
+ 14268
+ 14269
+ 14270
+ 14271
+ 14272
+ 14273
+ 14274
+ 14275
+ 14276
+ 14277
+ 14278
+ 14279
+ 14280
+ 14281
+ 14282
+ 14283
+ 14284
+ 14285
+ 14286
+ 14287
+ 14288
+ 14289
+ 14290
+ 14291
+ 14292
+ 14293
+ 14294
+ 14295
+ 14296
+ 14297
+ 14298
+ 14299
+ 14300
+ 14301
+ 14302
+ 14303
+ 14304
+ 14305
+ 14306
+ 14307
+ 14308
+ 14309
+ 14310
+ 14311
+ 14312
+ 14313
+ 14314
+ 14315
+ 14316
+ 14317
+ 14318
+ 14319
+ 14320
+ 14321
+ 14322
+ 14323
+ 14324
+ 14325
+ 14326
+ 14327
+ 14328
+ 14329
+ 14330
+ 14331
+ 14332
+ 14333
+ 14334
+ 14335
+ 14336
+ 14337
+ 14338
+ 14339
+ 14340
+ 14341
+ 14342
+ 14343
+ 14344
+ 14345
+ 14346
+ 14347
+ 14348
+ 14349
+ 14350
+ 14351
+ 14352
+ 14353
+ 14354
+ 14355
+ 14356
+ 14357
+ 14358
+ 14359
+ 14360
+ 14361
+ 14362
+ 14363
+ 14364
+ 14365
+ 14366
+ 14367
+ 14368
+ 14369
+ 14370
+ 14371
+ 14372
+ 14373
+ 14374
+ 14375
+ 14376
+ 14377
+ 14378
+ 14379
+ 14380
+ 14381
+ 14382
+ 14383
+ 14384
+ 14385
+ 14386
+ 14387
+ 14388
+ 14389
+ 14390
+ 14391
+ 14392
+ 14393
+ 14394
+ 14395
+ 14396
+ 14397
+ 14398
+ 14399
+ 14400
+ 14401
+ 14402
+ 14403
+ 14404
+ 14405
+ 14406
+ 14407
+ 14408
+ 14409
+ 14410
+ 14411
+ 14412
+ 14413
+ 14414
+ 14415
+ 14416
+ 14417
+ 14418
+ 14419
+ 14420
+ 14421
+ 14422
+ 14423
+ 14424
+ 14425
+ 14426
+ 14427
+ 14428
+ 14429
+ 14430
+ 14431
+ 14432
+ 14433
+ 14434
+ 14435
+ 14436
+ 14437
+ 14438
+ 14439
+ 14440
+ 14441
+ 14442
+ 14443
+ 14444
+ 14449
+ 14450
+ 14451
+ 14452
+ 14453
+ 14454
+ 14455
+ 14456
+ 14457
+ 14458
+ 14459
+ 14460
+ 14461
+ 14462
+ 14463
+ 14464
+ 14465
+ 14466
+ 14467
+ 14468
+ 14469
+ 14470
+ 14471
+ 14472
+ 14473
+ 14474
+ 14475
+ 14476
+ 14477
+ 14478
+ 14479
+ 14480
+ 14481
+ 14482
+ 14483
+ 14484
+ 14485
+ 14486
+ 14487
+ 14488
+ 14489
+ 14490
+ 14491
+ 14492
+ 14493
+ 14494
+ 14495
+ 14496
+ 14497
+ 14498
+ 14499
+ 14500
+ 14501
+ 14502
+ 14503
+ 14504
+ 14505
+ 14506
+ 14507
+ 14508
+ 14509
+ 14510
+ 14511
+ 14512
+ 14513
+ 14514
+ 14515
+ 14516
+ 14517
+ 14518
+ 14519
+ 14520
+ 14521
+ 14522
+ 14523
+ 14524
+ 14525
+ 14526
+ 14527
+ 14528
+ 14529
+ 14530
+ 14531
+ 14532
+ 14533
+ 14534
+ 14535
+ 14536
+ 14537
+ 14538
+ 14539
+ 14540
+ 14541
+ 14542
+ 14543
+ 14544
+ 14545
+ 14546
+ 14547
+ 14548
+ 14549
+ 14550
+ 14551
+ 14552
+ 14553
+ 14554
+ 14555
+ 14556
+ 14557
+ 14558
+ 14559
+ 14560
+ 14561
+ 14562
+ 14563
+ 14564
+ 14565
+ 14566
+ 14567
+ 14568
+ 14569
+ 14570
+ 14571
+ 14572
+ 14573
+ 14574
+ 14575
+ 14576
+ 14577
+ 14578
+ 14579
+ 14580
+ 14581
+ 14582
+ 14583
+ 14584
+ 14585
+ 14586
+ 14587
+ 14588
+ 14589
+ 14590
+ 14591
+ 14592
+ 14593
+ 14594
+ 14595
+ 14596
+ 14597
+ 14598
+ 14599
+ 14600
+ 14601
+ 14602
+ 14603
+ 14604
+ 14605
+ 14606
+ 14607
+ 14608
+ 14609
+ 14610
+ 14611
+ 14612
+ 14613
+ 14614
+ 14615
+ 14616
+ 14617
+ 14618
+ 14619
+ 14620
+ 14621
+ 14622
+ 14623
+ 14624
+ 14625
+ 14626
+ 14627
+ 14628
+ 14633
+ 14634
+ 14635
+ 14636
+ 14637
+ 14638
+ 14639
+ 14640
+ 14641
+ 14642
+ 14643
+ 14644
+ 14645
+ 14646
+ 14647
+ 14648
+ 14649
+ 14650
+ 14651
+ 14652
+ 14653
+ 14654
+ 14655
+ 14656
+ 14657
+ 14658
+ 14659
+ 14660
+ 14661
+ 14662
+ 14663
+ 14664
+ 14665
+ 14666
+ 14667
+ 14668
+ 14669
+ 14670
+ 14671
+ 14672
+ 14673
+ 14674
+ 14675
+ 14676
+ 14677
+ 14678
+ 14679
+ 14680
+ 14681
+ 14682
+ 14683
+ 14684
+ 14685
+ 14686
+ 14687
+ 14688
+ 14689
+ 14690
+ 14691
+ 14692
+ 14693
+ 14694
+ 14695
+ 14696
+ 14697
+ 14698
+ 14699
+ 14700
+ 14701
+ 14702
+ 14703
+ 14704
+ 14705
+ 14706
+ 14707
+ 14708
+ 14709
+ 14710
+ 14711
+ 14712
+ 14713
+ 14714
+ 14715
+ 14716
+ 14717
+ 14718
+ 14719
+ 14720
+ 14721
+ 14722
+ 14723
+ 14724
+ 14725
+ 14726
+ 14727
+ 14728
+ 14729
+ 14730
+ 14731
+ 14732
+ 14733
+ 14734
+ 14735
+ 14736
+ 14737
+ 14738
+ 14739
+ 14740
+ 14741
+ 14742
+ 14743
+ 14744
+ 14745
+ 14746
+ 14747
+ 14748
+ 14749
+ 14750
+ 14751
+ 14752
+ 14753
+ 14754
+ 14755
+ 14756
+ 14757
+ 14758
+ 14759
+ 14760
+ 14761
+ 14762
+ 14763
+ 14764
+ 14765
+ 14766
+ 14767
+ 14768
+ 14769
+ 14770
+ 14771
+ 14772
+ 14773
+ 14774
+ 14775
+ 14776
+ 14777
+ 14778
+ 14779
+ 14780
+ 14781
+ 14782
+ 14783
+ 14784
+ 14785
+ 14786
+ 14787
+ 14788
+ 14789
+ 14790
+ 14791
+ 14792
+ 14793
+ 14794
+ 14795
+ 14796
+ 14797
+ 14798
+ 14799
+ 14800
+ 14801
+ 14802
+ 14803
+ 14804
+ 14805
+ 14806
+ 14807
+ 14808
+ 14809
+ 14810
+ 14811
+ 14812
+ 14813
+ 14814
+ 14815
+ 14816
+ 14817
+ 14818
+ 14819
+ 14820
+ 14821
+ 14822
+ 14823
+ 14824
+ 14825
+ 14826
+ 14827
+ 14828
+ 14829
+ 14830
+ 14831
+ 14832
+ 14833
+ 14834
+ 14835
+ 14836
+ 14837
+ 14838
+ 14839
+ 14840
+ 14841
+ 14842
+ 14843
+ 14844
+ 14845
+ 14846
+ 14847
+ 14848
+ 14849
+ 14850
+ 14851
+ 14852
+ 14853
+ 14854
+ 14855
+ 14856
+ 14857
+ 14858
+ 14859
+ 14860
+ 14861
+ 14862
+ 14863
+ 14864
+ 14865
+ 14866
+ 14867
+ 14868
+ 14869
+ 12077
+ 12311
+ 12312
+ 12313
+ 12526
+ 12527
+ 12528
+ 12564
+ 12621
+ 12780
+ 12781
+ 12782
+ 16025
+ 13071
+ 13072
+ 13073
+ 13074
+ 13075
+ 13076
+ 14870
+ 14871
+ 14872
+ 14873
+ 14874
+ 14875
+ 14876
+ 14877
+ 14878
+ 14879
+ 14880
+ 14881
+ 14882
+ 14883
+ 14884
+ 14885
+ 14886
+ 14887
+ 14888
+ 14889
+ 14890
+ 14891
+ 14892
+ 14893
+ 14894
+ 14895
+ 14896
+ 14897
+ 14898
+ 14899
+ 14900
+ 14901
+ 14902
+ 14903
+ 14904
+ 14905
+ 14906
+ 14907
+ 14908
+ 14909
+ 14910
+ 14911
+ 14912
+ 14913
+ 14914
+ 14915
+ 16030
+ 16034
+ 16035
+ 16036
+ 16037
+ 16038
+ 16039
+ 16040
+ 16041
+ 16042
+ 16043
+ 16044
+ 16045
+ 16046
+ 14916
+ 14917
+ 14918
+ 16050
+ 16051
+ 16052
+ 16053
+ 16067
+ 16068
+ 16071
+ 16072
+
+
+ 32915
+ 32916
+ 33142
+ 33143
+ 33144
+ 33145
+ 33147
+ 33148
+ 33137
+
+
+ 32915
+ 32916
+ 32917
+ 32918
+ 32919
+ 32920
+ 33147
+ 33148
+ 32913
+ 32914
+ 33097
+
+
+ 90
+ 91
+ 99
+ 106
+
+
+ 88
+ 89
+ 113
+ 114
+ 118
+ 131
+
+
+ 93
+ 101
+ 108
+ 117
+
+
+ 92
+ 102
+ 109
+ 134
+
+
+ 95
+ 94
+ 103
+ 110
+ 132
+ 133
+
+
+ 96
+ 104
+ 111
+
+
+ 97
+ 105
+ 112
+
+
+ 98
+ 100
+ 107
+ 116
+ 115
+ 136
+
+
+ 19117
+ 19118
+
+
+ 32908
+
+
+ 14930
+ 14954
+ 14955
+ 14956
+ 14957
+ 14958
+ 14959
+ 14960
+ 14931
+ 14961
+ 14962
+ 14963
+ 14964
+ 14965
+ 14966
+ 14967
+ 15032
+ 15033
+ 15034
+ 15035
+ 15036
+ 15037
+ 15038
+ 15039
+ 15040
+ 15041
+ 15042
+ 15043
+ 15044
+ 15045
+ 15046
+ 15047
+ 15048
+ 15049
+ 15050
+ 15051
+ 14929
+ 14947
+ 14948
+ 14949
+ 14950
+ 14951
+ 14952
+ 14953
+ 15022
+ 15023
+ 15024
+ 15025
+ 15026
+ 15027
+ 15028
+ 15029
+ 15030
+ 15031
+
+
+ 0
+ 18
+ 31
+ 44
+ 53
+ 123
+ 124
+
+
+ 10
+ 25
+ 38
+ 49
+
+
+ 4
+ 19
+ 32
+
+
+ 1
+ 7
+ 22
+ 35
+ 45
+ 47
+ 125
+ 126
+ 50
+ 54
+ 56
+
+
+ 11
+ 26
+ 39
+
+
+ 15
+ 29
+ 42
+
+
+ 5
+ 6
+ 20
+ 33
+
+
+ 2
+ 3
+ 46
+ 48
+ 127
+ 128
+ 129
+ 57
+ 135
+
+
+ 8
+ 23
+ 36
+ 55
+
+
+ 12
+ 27
+ 40
+ 13
+
+
+ 9
+ 130
+ 37
+ 24
+
+
+ 17
+ 52
+
+
+ 14
+ 28
+ 41
+
+
+ 16
+ 30
+ 34
+ 43
+ 21
+ 51
+
+
+ 90
+ 91
+ 99
+ 106
+
+
+ 88
+ 89
+ 113
+ 114
+ 118
+ 131
+ 132
+ 133
+ 136
+
+
+ 93
+ 101
+ 108
+ 101
+ 117
+
+
+ 94
+ 103
+ 110
+ 95
+
+
+ 92
+ 102
+ 109
+ 134
+
+
+ 116
+ 98
+ 115
+
+
+ 96
+ 104
+ 111
+
+
+ 97
+ 105
+ 112
+ 107
+ 100
+
+
+ 5
+ 6
+ 20
+ 33
+ 90
+ 91
+ 99
+ 106
+ 139
+ 148
+ 149
+ 150
+ 151
+
+
+ 3
+ 2
+ 46
+ 48
+ 89
+ 88
+ 113
+ 114
+ 118
+ 140
+ 152
+ 153
+ 154
+ 155
+ 156
+
+
+ 8
+ 23
+ 36
+ 55
+ 93
+ 101
+ 108
+ 117
+ 141
+ 158
+ 159
+ 160
+ 161
+
+
+ 9
+ 24
+ 37
+ 92
+ 102
+ 109
+ 142
+ 162
+ 163
+ 164
+
+
+ 12
+ 13
+ 27
+ 40
+ 94
+ 95
+ 103
+ 110
+ 143
+ 166
+ 167
+ 168
+ 169
+
+
+ 14
+ 28
+ 41
+ 96
+ 104
+ 111
+ 145
+ 176
+ 177
+ 178
+
+
+ 16
+ 30
+ 43
+ 97
+ 105
+ 112
+ 146
+ 179
+ 180
+ 181
+
+
+ 17
+ 21
+ 34
+ 52
+ 98
+ 116
+ 100
+ 107
+ 115
+ 144
+ 171
+ 172
+ 173
+ 174
+ 175
+
+
+ 51
+ 57
+
+
+ 127
+ 130
+ 128
+ 129
+ 135
+ 131
+ 134
+ 132
+ 133
+ 136
+ 157
+ 170
+ 165
+
+
+ 0
+ 1
+ 2
+ 3
+ 4
+ 5
+ 6
+ 7
+ 8
+ 9
+ 18
+ 19
+ 20
+ 21
+ 22
+ 23
+ 24
+ 31
+ 32
+ 33
+ 34
+ 35
+ 36
+ 37
+ 44
+ 45
+ 46
+ 47
+ 48
+ 53
+ 54
+ 55
+ 56
+ 57
+ 88
+ 89
+ 90
+ 91
+ 92
+ 93
+ 99
+ 100
+ 101
+ 102
+ 106
+ 107
+ 108
+ 109
+ 113
+ 114
+ 117
+ 118
+ 139
+ 140
+ 141
+ 142
+ 144
+ 10
+ 11
+ 12
+ 13
+ 14
+ 15
+ 16
+ 17
+ 25
+ 26
+ 27
+ 28
+ 29
+ 30
+ 38
+ 39
+ 40
+ 41
+ 42
+ 43
+ 49
+ 50
+ 51
+ 52
+ 94
+ 95
+ 96
+ 97
+ 98
+ 103
+ 104
+ 105
+ 110
+ 111
+ 112
+ 115
+ 116
+ 143
+ 145
+ 146
+ 148
+ 149
+ 150
+ 151
+ 152
+ 153
+ 154
+ 155
+ 156
+ 158
+ 159
+ 160
+ 161
+ 162
+ 163
+ 164
+ 166
+ 167
+ 168
+ 169
+ 171
+ 172
+ 173
+ 174
+ 175
+ 176
+ 177
+ 178
+ 179
+ 180
+ 181
+ 182
+ 184
+ 186
+ 188
+ 183
+ 185
+ 187
+ 189
+
+
+ 143
+ 145
+ 146
+ 166
+ 167
+ 176
+ 179
+
+
+ 139
+ 140
+ 141
+ 142
+ 144
+ 148
+ 149
+ 152
+ 153
+ 158
+ 162
+ 171
+
+
+ 5
+ 6
+ 20
+ 33
+ 90
+ 91
+ 99
+ 106
+ 139
+ 148
+ 149
+ 150
+ 151
+
+
+ 3
+ 2
+ 46
+ 48
+ 127
+ 57
+ 89
+ 88
+ 113
+ 114
+ 118
+ 131
+ 140
+ 152
+ 153
+ 154
+ 155
+ 156
+ 184
+ 186
+ 188
+
+
+ 8
+ 23
+ 36
+ 55
+ 93
+ 101
+ 108
+ 117
+ 141
+ 158
+ 159
+ 160
+ 161
+
+
+ 9
+ 24
+ 37
+ 130
+ 92
+ 102
+ 109
+ 134
+ 142
+ 162
+ 163
+ 164
+ 165
+
+
+ 12
+ 13
+ 27
+ 40
+ 128
+ 129
+ 94
+ 95
+ 103
+ 110
+ 132
+ 133
+ 143
+ 166
+ 167
+ 168
+ 169
+ 170
+
+
+ 14
+ 28
+ 41
+ 96
+ 104
+ 111
+ 145
+ 176
+ 177
+ 178
+
+
+ 17
+ 21
+ 34
+ 52
+ 135
+ 51
+ 98
+ 116
+ 100
+ 107
+ 115
+ 136
+ 144
+ 171
+ 172
+ 173
+ 174
+ 175
+
+
+ 16
+ 30
+ 43
+ 97
+ 105
+ 112
+ 146
+ 179
+ 180
+ 181
+
+
+ 88
+ 89
+ 90
+ 91
+ 93
+ 92
+ 94
+ 95
+ 96
+ 97
+ 98
+
+
+ 99
+ 100
+ 101
+ 102
+ 103
+ 104
+ 105
+
+
+ 106
+ 107
+ 108
+ 109
+ 110
+ 111
+ 112
+
+
+ 113
+ 114
+ 115
+ 116
+
+
+ 117
+ 118
+
+
+ 8401
+ 8402
+ 8403
+ 8405
+ 8417
+ 8422
+ 8423
+ 8424
+ 8425
+ 8416
+
+
+ 8407
+ 8408
+ 8409
+ 8410
+ 8411
+ 8412
+ 8413
+ 8414
+ 8415
+ 8428
+ 8429
+ 8430
+ 8431
+ 8432
+
+
+ 8516
+ 8517
+ 8514
+ 8515
+ 8512
+ 8513
+
+
+ 182
+ 184
+ 186
+ 188
+ 183
+ 185
+ 187
+ 189
+
+
+ 182
+ 183
+
+
+ 184
+ 185
+
+
+ 186
+ 187
+
+
+ 188
+ 189
+
+
+ 183
+ 185
+ 187
+ 189
+
+
+ 182
+ 184
+ 186
+ 188
+
+
+ 187
+
+
+ 186
+
+
+ 0
+ 1
+ 2
+ 3
+ 4
+ 5
+ 6
+ 7
+ 8
+ 9
+ 18
+ 19
+ 20
+ 21
+ 22
+ 23
+ 24
+ 31
+ 32
+ 33
+ 34
+ 35
+ 36
+ 37
+ 44
+ 45
+ 46
+ 47
+ 48
+ 53
+ 54
+ 55
+ 56
+ 57
+ 88
+ 89
+ 90
+ 91
+ 92
+ 93
+ 99
+ 100
+ 101
+ 102
+ 106
+ 107
+ 108
+ 109
+ 113
+ 114
+ 117
+ 118
+ 123
+ 124
+ 125
+ 126
+ 127
+ 128
+ 129
+ 130
+ 131
+ 132
+ 133
+ 134
+ 135
+ 136
+ 139
+ 140
+ 141
+ 142
+ 144
+ 148
+ 149
+ 150
+ 151
+ 152
+ 153
+ 154
+ 155
+ 156
+ 157
+ 158
+ 159
+ 160
+ 161
+ 162
+ 163
+ 164
+ 165
+ 171
+ 172
+ 173
+ 174
+ 175
+ 10
+ 11
+ 12
+ 13
+ 14
+ 15
+ 16
+ 17
+ 25
+ 26
+ 27
+ 28
+ 29
+ 30
+ 38
+ 39
+ 40
+ 41
+ 42
+ 43
+ 49
+ 50
+ 51
+ 52
+ 94
+ 95
+ 96
+ 97
+ 98
+ 103
+ 104
+ 105
+ 110
+ 111
+ 112
+ 115
+ 116
+ 143
+ 145
+ 146
+ 166
+ 167
+ 168
+ 169
+ 170
+ 176
+ 177
+ 178
+ 179
+ 180
+ 181
+
+
+ 1
+ 2
+ 3
+ 4
+ 5
+ 6
+ 19
+ 20
+ 21
+ 32
+ 33
+ 34
+ 45
+ 46
+ 56
+ 57
+ 88
+ 89
+ 90
+ 91
+ 99
+ 100
+ 106
+ 107
+ 113
+ 118
+ 139
+ 140
+ 148
+ 149
+ 150
+ 151
+ 152
+ 153
+ 154
+ 155
+ 156
+ 157
+ 49
+ 50
+ 51
+ 52
+ 115
+ 116
+
+
+ 0
+ 7
+ 8
+ 9
+ 18
+ 22
+ 23
+ 24
+ 31
+ 35
+ 36
+ 37
+ 44
+ 47
+ 48
+ 53
+ 54
+ 55
+ 92
+ 93
+ 101
+ 102
+ 108
+ 109
+ 114
+ 123
+ 124
+ 125
+ 126
+ 127
+ 128
+ 129
+ 130
+ 131
+ 132
+ 133
+ 134
+ 135
+ 136
+ 141
+ 142
+ 144
+ 158
+ 159
+ 160
+ 161
+ 162
+ 163
+ 164
+ 165
+ 171
+ 172
+ 173
+ 174
+ 175
+ 182
+ 184
+ 186
+ 188
+
+
+ 10
+ 11
+ 12
+ 13
+ 14
+ 15
+ 16
+ 17
+ 25
+ 26
+ 27
+ 28
+ 29
+ 30
+ 38
+ 39
+ 40
+ 41
+ 42
+ 43
+ 94
+ 95
+ 96
+ 97
+ 98
+ 103
+ 104
+ 105
+ 110
+ 111
+ 112
+ 143
+ 145
+ 146
+ 166
+ 167
+ 168
+ 169
+ 170
+ 176
+ 177
+ 178
+ 179
+ 180
+ 181
+ 183
+ 185
+ 187
+ 189
+
\ No newline at end of file
diff --git a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/ai/areas/TalkingIsland/AwakeningMaster/AwakeningMaster.java b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/ai/areas/TalkingIsland/AwakeningMaster/AwakeningMaster.java
index 25db941e6f..1a41e95122 100644
--- a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/ai/areas/TalkingIsland/AwakeningMaster/AwakeningMaster.java
+++ b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/ai/areas/TalkingIsland/AwakeningMaster/AwakeningMaster.java
@@ -68,17 +68,16 @@ public final class AwakeningMaster extends AbstractNpcAI
private static final int CHAOS_POMANDER = 37374;
private static final int CHAOS_POMANDER_DUAL_CLASS = 37375;
private static final Map AWAKE_POWER = new HashMap<>();
-
static
{
- AWAKE_POWER.put(CategoryType.SIGEL_GROUP, 32264);
- AWAKE_POWER.put(CategoryType.TYRR_GROUP, 32265);
- AWAKE_POWER.put(CategoryType.OTHELL_GROUP, 32266);
- AWAKE_POWER.put(CategoryType.YUL_GROUP, 32267);
- AWAKE_POWER.put(CategoryType.FEOH_GROUP, 32268);
- AWAKE_POWER.put(CategoryType.ISS_GROUP, 32269);
- AWAKE_POWER.put(CategoryType.WYNN_GROUP, 32270);
- AWAKE_POWER.put(CategoryType.AEORE_GROUP, 32271);
+ AWAKE_POWER.put(CategoryType.SIXTH_SIGEL_GROUP, 32264);
+ AWAKE_POWER.put(CategoryType.SIXTH_TIR_GROUP, 32265);
+ AWAKE_POWER.put(CategoryType.SIXTH_OTHEL_GROUP, 32266);
+ AWAKE_POWER.put(CategoryType.SIXTH_YR_GROUP, 32267);
+ AWAKE_POWER.put(CategoryType.SIXTH_FEOH_GROUP, 32268);
+ AWAKE_POWER.put(CategoryType.SIXTH_WYNN_GROUP, 32269);
+ AWAKE_POWER.put(CategoryType.SIXTH_IS_GROUP, 32270);
+ AWAKE_POWER.put(CategoryType.SIXTH_EOLH_GROUP, 32271);
}
// Skills
@@ -117,7 +116,7 @@ public final class AwakeningMaster extends AbstractNpcAI
{
case SIGEL_MASTER:
{
- if (!player.isInCategory(CategoryType.SIGEL_CANDIDATE))
+ if (!player.isInCategory(CategoryType.TANKER_CATEGORY))
{
return SIGEL_MASTER + "-no_class.htm";
}
@@ -125,7 +124,7 @@ public final class AwakeningMaster extends AbstractNpcAI
}
case TYRR_MASTER:
{
- if (!player.isInCategory(CategoryType.TYRR_CANDIDATE))
+ if (!player.isInCategory(CategoryType.WARRIOR_CATEGORY))
{
return TYRR_MASTER + "-no_class.htm";
}
@@ -133,7 +132,7 @@ public final class AwakeningMaster extends AbstractNpcAI
}
case OTHELL_MASTER:
{
- if (!player.isInCategory(CategoryType.OTHELL_CANDIDATE))
+ if (!player.isInCategory(CategoryType.ROGUE_CATEGORY))
{
return OTHELL_MASTER + "-no_class.htm";
}
@@ -141,7 +140,7 @@ public final class AwakeningMaster extends AbstractNpcAI
}
case YUL_MASTER:
{
- if (!player.isInCategory(CategoryType.YUL_CANDIDATE))
+ if (!player.isInCategory(CategoryType.ARCHER_CATEGORY))
{
return YUL_MASTER + "-no_class.htm";
}
@@ -149,7 +148,7 @@ public final class AwakeningMaster extends AbstractNpcAI
}
case FEOH_MASTER:
{
- if (!player.isInCategory(CategoryType.FEOH_CANDIDATE))
+ if (!player.isInCategory(CategoryType.WIZARD_CATEGORY))
{
return FEOH_MASTER + "-no_class.htm";
}
@@ -157,7 +156,7 @@ public final class AwakeningMaster extends AbstractNpcAI
}
case ISS_MASTER:
{
- if (!player.isInCategory(CategoryType.ISS_CANDIDATE))
+ if (!player.isInCategory(CategoryType.ENCHANTER_CATEGORY))
{
return ISS_MASTER + "-no_class.htm";
}
@@ -165,7 +164,7 @@ public final class AwakeningMaster extends AbstractNpcAI
}
case WYNN_MASTER:
{
- if (!player.isInCategory(CategoryType.WYNN_CANDIDATE))
+ if (!player.isInCategory(CategoryType.SUMMONER_CATEGORY))
{
return WYNN_MASTER + "-no_class.htm";
}
@@ -173,7 +172,7 @@ public final class AwakeningMaster extends AbstractNpcAI
}
case AEORE_MASTER:
{
- if (!player.isInCategory(CategoryType.AEORE_CANDIDATE))
+ if (!player.isInCategory(CategoryType.HEALER_CATEGORY))
{
return AEORE_MASTER + "-no_class.htm";
}
diff --git a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/ai/areas/TalkingIsland/Hadel/Hadel.java b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/ai/areas/TalkingIsland/Hadel/Hadel.java
index fdb12a0bb9..3c673a0a70 100644
--- a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/ai/areas/TalkingIsland/Hadel/Hadel.java
+++ b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/ai/areas/TalkingIsland/Hadel/Hadel.java
@@ -62,7 +62,7 @@ public final class Hadel extends AbstractNpcAI
}
case "teleportToHarnak":
{
- if ((!player.isInCategory(CategoryType.AWAKEN_GROUP)) || (player.getLevel() < 85))
+ if ((!player.isInCategory(CategoryType.SIXTH_CLASS_GROUP)) || (player.getLevel() < 85))
{
htmltext = "33344-noClass.html";
break;
diff --git a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/ai/areas/TalkingIsland/Hardin/Hardin.java b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/ai/areas/TalkingIsland/Hardin/Hardin.java
index 2c4bc51193..9feadede0f 100644
--- a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/ai/areas/TalkingIsland/Hardin/Hardin.java
+++ b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/ai/areas/TalkingIsland/Hardin/Hardin.java
@@ -183,7 +183,7 @@ public final class Hardin extends AbstractNpcAI
return "33870-02.html";
}
}
- if (!player.isInCategory(CategoryType.AWAKEN_GROUP))
+ if (!player.isInCategory(CategoryType.SIXTH_CLASS_GROUP))
{
return "33870-no.html";
}
diff --git a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/ai/areas/TalkingIsland/MonkOfChaos/MonkOfChaos.java b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/ai/areas/TalkingIsland/MonkOfChaos/MonkOfChaos.java
index bd823959b4..9757b3464d 100644
--- a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/ai/areas/TalkingIsland/MonkOfChaos/MonkOfChaos.java
+++ b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/ai/areas/TalkingIsland/MonkOfChaos/MonkOfChaos.java
@@ -78,7 +78,7 @@ public final class MonkOfChaos extends AbstractNpcAI
}
case "LearnRevelationSkills":
{
- if ((player.getLevel() < MIN_LEVEL) || !player.isInCategory(CategoryType.AWAKEN_GROUP))
+ if ((player.getLevel() < MIN_LEVEL) || !player.isInCategory(CategoryType.SIXTH_CLASS_GROUP))
{
htmltext = "no-learn.html";
break;
@@ -139,7 +139,7 @@ public final class MonkOfChaos extends AbstractNpcAI
}
}
- if ((player.getLevel() < MIN_LEVEL) || !player.isInCategory(CategoryType.AWAKEN_GROUP) || (count == 0))
+ if ((player.getLevel() < MIN_LEVEL) || !player.isInCategory(CategoryType.SIXTH_CLASS_GROUP) || (count == 0))
{
htmltext = "no-cancel.html";
break;
diff --git a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/ai/areas/TalkingIsland/Raina/Raina.java b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/ai/areas/TalkingIsland/Raina/Raina.java
index 5f8ec667e9..f61345700f 100644
--- a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/ai/areas/TalkingIsland/Raina/Raina.java
+++ b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/ai/areas/TalkingIsland/Raina/Raina.java
@@ -111,14 +111,14 @@ public final class Raina extends AbstractNpcAI
private static final Map classCloak = new HashMap<>();
{
- classCloak.put(CategoryType.SIGEL_GROUP, 30310); // Abelius Cloak
- classCloak.put(CategoryType.TYRR_GROUP, 30311); // Sapyros Cloak Grade
- classCloak.put(CategoryType.OTHELL_GROUP, 30312); // Ashagen Cloak Grade
- classCloak.put(CategoryType.YUL_GROUP, 30313); // Cranigg Cloak Grade
- classCloak.put(CategoryType.FEOH_GROUP, 30314); // Soltkreig Cloak Grade
- classCloak.put(CategoryType.WYNN_GROUP, 30315); // Naviarope Cloak Grade
- classCloak.put(CategoryType.ISS_GROUP, 30316); // Leister Cloak Grade
- classCloak.put(CategoryType.AEORE_GROUP, 30317); // Laksis Cloak Grade
+ classCloak.put(CategoryType.SIXTH_SIGEL_GROUP, 30310); // Abelius Cloak
+ classCloak.put(CategoryType.SIXTH_TIR_GROUP, 30311); // Sapyros Cloak Grade
+ classCloak.put(CategoryType.SIXTH_OTHEL_GROUP, 30312); // Ashagen Cloak Grade
+ classCloak.put(CategoryType.SIXTH_YR_GROUP, 30313); // Cranigg Cloak Grade
+ classCloak.put(CategoryType.SIXTH_FEOH_GROUP, 30314); // Soltkreig Cloak Grade
+ classCloak.put(CategoryType.SIXTH_WYNN_GROUP, 30315); // Naviarope Cloak Grade
+ classCloak.put(CategoryType.SIXTH_IS_GROUP, 30316); // Leister Cloak Grade
+ classCloak.put(CategoryType.SIXTH_EOLH_GROUP, 30317); // Laksis Cloak Grade
}
private static final List dualClassList = new ArrayList<>();
@@ -290,7 +290,7 @@ public final class Raina extends AbstractNpcAI
case "ertheiaDualClass":
{
// TODO: Maybe html is different when you have 85lvl but you haven't completed quest
- if ((player.getRace() != Race.ERTHEIA) || (player.getLevel() < 85) || !player.isInCategory(CategoryType.AWAKEN_GROUP) || player.hasDualClass() || !haveDoneQuest(player, true))
+ if ((player.getRace() != Race.ERTHEIA) || (player.getLevel() < 85) || !player.isInCategory(CategoryType.SIXTH_CLASS_GROUP) || player.hasDualClass() || !haveDoneQuest(player, true))
{
htmltext = "addDualClassErtheiaFailed.html";
}
@@ -309,7 +309,7 @@ public final class Raina extends AbstractNpcAI
case "addDualClass_WYNN_GROUP":
case "addDualClass_AEORE_GROUP":
{
- if ((player.getRace() != Race.ERTHEIA) || (player.getLevel() < 85) || !player.isInCategory(CategoryType.AWAKEN_GROUP) || player.hasDualClass() || !haveDoneQuest(player, true))
+ if ((player.getRace() != Race.ERTHEIA) || (player.getLevel() < 85) || !player.isInCategory(CategoryType.SIXTH_CLASS_GROUP) || player.hasDualClass() || !haveDoneQuest(player, true))
{
htmltext = "addDualClassErtheiaFailed.html";
break;
@@ -659,31 +659,31 @@ public final class Raina extends AbstractNpcAI
private void addPowerItem(L2PcInstance player)
{
int itemId = ABELIUS_POWER; // Sigel
- if (player.isInCategory(CategoryType.TYRR_GROUP))
+ if (player.isInCategory(CategoryType.SIXTH_TIR_GROUP))
{
itemId = SAPYROS_POWER;
}
- else if (player.isInCategory(CategoryType.OTHELL_GROUP))
+ else if (player.isInCategory(CategoryType.SIXTH_OTHEL_GROUP))
{
itemId = ASHAGEN_POWER;
}
- else if (player.isInCategory(CategoryType.YUL_GROUP))
+ else if (player.isInCategory(CategoryType.SIXTH_YR_GROUP))
{
itemId = CRANIGG_POWER;
}
- else if (player.isInCategory(CategoryType.FEOH_GROUP))
+ else if (player.isInCategory(CategoryType.SIXTH_FEOH_GROUP))
{
itemId = SOLTKREIG_POWER;
}
- else if (player.isInCategory(CategoryType.WYNN_GROUP))
+ else if (player.isInCategory(CategoryType.SIXTH_WYNN_GROUP))
{
itemId = NAVIAROPE_POWER;
}
- else if (player.isInCategory(CategoryType.ISS_GROUP))
+ else if (player.isInCategory(CategoryType.SIXTH_IS_GROUP))
{
itemId = LEISTER_POWER;
}
- else if (player.isInCategory(CategoryType.AEORE_GROUP))
+ else if (player.isInCategory(CategoryType.SIXTH_EOLH_GROUP))
{
itemId = LAKCIS_POWER;
}
@@ -905,37 +905,37 @@ public final class Raina extends AbstractNpcAI
{
CategoryType catType = null;
- if (player.isInCategory(CategoryType.SIGEL_GROUP))
+ if (player.isInCategory(CategoryType.SIXTH_SIGEL_GROUP))
{
- catType = CategoryType.SIGEL_GROUP;
+ catType = CategoryType.SIXTH_SIGEL_GROUP;
}
- else if (player.isInCategory(CategoryType.TYRR_GROUP))
+ else if (player.isInCategory(CategoryType.SIXTH_TIR_GROUP))
{
- catType = CategoryType.TYRR_GROUP;
+ catType = CategoryType.SIXTH_TIR_GROUP;
}
- else if (player.isInCategory(CategoryType.OTHELL_GROUP))
+ else if (player.isInCategory(CategoryType.SIXTH_OTHEL_GROUP))
{
- catType = CategoryType.OTHELL_GROUP;
+ catType = CategoryType.SIXTH_OTHEL_GROUP;
}
- else if (player.isInCategory(CategoryType.YUL_GROUP))
+ else if (player.isInCategory(CategoryType.SIXTH_YR_GROUP))
{
- catType = CategoryType.YUL_GROUP;
+ catType = CategoryType.SIXTH_YR_GROUP;
}
- else if (player.isInCategory(CategoryType.FEOH_GROUP))
+ else if (player.isInCategory(CategoryType.SIXTH_FEOH_GROUP))
{
- catType = CategoryType.FEOH_GROUP;
+ catType = CategoryType.SIXTH_FEOH_GROUP;
}
- else if (player.isInCategory(CategoryType.ISS_GROUP))
+ else if (player.isInCategory(CategoryType.SIXTH_IS_GROUP))
{
- catType = CategoryType.ISS_GROUP;
+ catType = CategoryType.SIXTH_IS_GROUP;
}
- else if (player.isInCategory(CategoryType.WYNN_GROUP))
+ else if (player.isInCategory(CategoryType.SIXTH_WYNN_GROUP))
{
- catType = CategoryType.WYNN_GROUP;
+ catType = CategoryType.SIXTH_WYNN_GROUP;
}
- else if (player.isInCategory(CategoryType.AEORE_GROUP))
+ else if (player.isInCategory(CategoryType.SIXTH_EOLH_GROUP))
{
- catType = CategoryType.AEORE_GROUP;
+ catType = CategoryType.SIXTH_EOLH_GROUP;
}
return classCloak.get(catType);
}
diff --git a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/ai/bosses/Kimerian/KimerianCommon.java b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/ai/bosses/Kimerian/KimerianCommon.java
index 87ecf2699a..51ee3bad82 100644
--- a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/ai/bosses/Kimerian/KimerianCommon.java
+++ b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/ai/bosses/Kimerian/KimerianCommon.java
@@ -152,7 +152,7 @@ public final class KimerianCommon extends AbstractInstance
{
if (hasQuestItems(player, FLUTE))
{
- if (player.isInCategory(CategoryType.AEORE_GROUP))
+ if (player.isInCategory(CategoryType.SIXTH_EOLH_GROUP))
{
addSpawn(FAIRY_REBEL, player.getX() + 60, player.getY(), player.getZ(), 0, false, 0, false, instance.getId());
addSpawn(FAIRY_REBEL, player.getX() - 60, player.getY(), player.getZ(), 0, false, 0, false, instance.getId());
diff --git a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/ai/others/AdventureGuildsman/AdventureGuildsman.java b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/ai/others/AdventureGuildsman/AdventureGuildsman.java
new file mode 100644
index 0000000000..97f72187e2
--- /dev/null
+++ b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/ai/others/AdventureGuildsman/AdventureGuildsman.java
@@ -0,0 +1,491 @@
+/*
+ * This file is part of the L2J Mobius project.
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see .
+ */
+package ai.others.AdventureGuildsman;
+
+import java.util.HashMap;
+import java.util.Map;
+
+import com.l2jmobius.commons.util.CommonUtil;
+import com.l2jmobius.gameserver.data.xml.impl.MultisellData;
+import com.l2jmobius.gameserver.enums.CategoryType;
+import com.l2jmobius.gameserver.model.actor.L2Npc;
+import com.l2jmobius.gameserver.model.actor.instance.L2PcInstance;
+import com.l2jmobius.gameserver.model.holders.SkillHolder;
+import com.l2jmobius.gameserver.model.skills.Skill;
+import com.l2jmobius.gameserver.model.skills.SkillCaster;
+import com.l2jmobius.gameserver.network.serverpackets.ExShowQuestInfo;
+
+import ai.AbstractNpcAI;
+
+/**
+ * Adventure Guildsman AI.
+ * @author ChaosPaladin
+ */
+public class AdventureGuildsman extends AbstractNpcAI
+{
+ // NPC
+ private static final int ADVENTURE_GUILDSMAN = 33946;
+ // Items
+ private static final int PCCAFE_LOTTERY_TICKET_30DAYS = 15358;
+ private static final int PCCAFE_1ST_LOTTERY_TICKET_30DAYS = 15359;
+ private static final int PCCAFE_2ND_LOTTERY_TICKET_30DAYS = 15360;
+ private static final int PCCAFE_3RD_LOTTERY_TICKET_30DAYS = 15361;
+ private static final int PCCAFE_4TH_LOTTERY_TICKET_30DAYS = 15362;
+ private static final int PCCAFE_5TH_LOTTERY_TICKET_30DAYS = 15363;
+ private static final int VOUCHER_LEV_85 = 17739;
+ private static final int VOUCHER_LEV_90 = 17740;
+ private static final int VOUCHER_LEV_95 = 17741;
+ private static final int VOUCHER_LEV_97 = 17742;
+ private static final int SEAL_LEV_85 = 17743;
+ private static final int SEAL_LEV_90 = 17744;
+ private static final int SEAL_LEV_95 = 17745;
+ private static final int SEAL_LEV_97 = 17746;
+ // Skills
+ private static final SkillHolder KNIGHT = new SkillHolder(17294, 1); // Player Commendation - Knight's Harmony
+ private static final SkillHolder WARRIOR = new SkillHolder(17295, 1); // Player Commendation - Warrior's Harmony
+ private static final SkillHolder WIZARD = new SkillHolder(17296, 1); // Player Commendation - Wizard's Harmony
+ private static final SkillHolder[] GROUP_MELODY =
+ {
+ new SkillHolder(9273, 1), // Player Commendation - Horn Melody
+ new SkillHolder(9274, 1), // Player Commendation - Drum Melody
+ new SkillHolder(9275, 1), // Player Commendation - Lute Melody
+ new SkillHolder(9276, 1), // Player Commendation - Pipe Organ Melody
+ new SkillHolder(9277, 1), // Player Commendation - Guitar Melody
+ new SkillHolder(9278, 1), // Player Commendation - Harp Melody
+ };
+ private static final SkillHolder[] GROUP_SONATA =
+ {
+ new SkillHolder(17291, 1), // Player Commendation - Prevailing Sonata
+ new SkillHolder(17292, 1), // Player Commendation - Daring Sonata
+ new SkillHolder(17293, 1), // Player Commendation - Refreshing Sonata
+ };
+ // Misc
+ //@formatter:off
+ private static final Map R_CLASS_TALISMAN = new HashMap<>();
+ {
+ R_CLASS_TALISMAN.put(CategoryType.SIXTH_SIGEL_GROUP, 735);
+ R_CLASS_TALISMAN.put(CategoryType.SIXTH_TIR_GROUP, 736);
+ R_CLASS_TALISMAN.put(CategoryType.SIXTH_OTHEL_GROUP, 737);
+ R_CLASS_TALISMAN.put(CategoryType.SIXTH_YR_GROUP, 738);
+ R_CLASS_TALISMAN.put(CategoryType.SIXTH_WYNN_GROUP, 739);
+ R_CLASS_TALISMAN.put(CategoryType.SIXTH_IS_GROUP, 740);
+ R_CLASS_TALISMAN.put(CategoryType.SIXTH_FEOH_GROUP, 741);
+ R_CLASS_TALISMAN.put(CategoryType.SIXTH_EOLH_GROUP, 742);
+ R_CLASS_TALISMAN.put(CategoryType.ERTHEIA_FIGHTER_GROUP, 736);
+ R_CLASS_TALISMAN.put(CategoryType.ERTHEIA_WIZARD_GROUP, 741);
+ }
+ private static final Map R90_CLASS_TALISMAN = new HashMap<>();
+ {
+ R90_CLASS_TALISMAN.put(CategoryType.SIXTH_SIGEL_GROUP, 743);
+ R90_CLASS_TALISMAN.put(CategoryType.SIXTH_TIR_GROUP, 744);
+ R90_CLASS_TALISMAN.put(CategoryType.SIXTH_OTHEL_GROUP, 745);
+ R90_CLASS_TALISMAN.put(CategoryType.SIXTH_YR_GROUP, 746);
+ R90_CLASS_TALISMAN.put(CategoryType.SIXTH_WYNN_GROUP, 747);
+ R90_CLASS_TALISMAN.put(CategoryType.SIXTH_IS_GROUP, 748);
+ R90_CLASS_TALISMAN.put(CategoryType.SIXTH_FEOH_GROUP, 749);
+ R90_CLASS_TALISMAN.put(CategoryType.SIXTH_EOLH_GROUP, 750);
+ R90_CLASS_TALISMAN.put(CategoryType.ERTHEIA_FIGHTER_GROUP, 744);
+ R90_CLASS_TALISMAN.put(CategoryType.ERTHEIA_WIZARD_GROUP, 749);
+ }
+ private static final Map R95_CLASS_TALISMAN = new HashMap<>();
+ {
+ R95_CLASS_TALISMAN.put(CategoryType.SIXTH_SIGEL_GROUP, 751);
+ R95_CLASS_TALISMAN.put(CategoryType.SIXTH_TIR_GROUP, 752);
+ R95_CLASS_TALISMAN.put(CategoryType.SIXTH_OTHEL_GROUP, 753);
+ R95_CLASS_TALISMAN.put(CategoryType.SIXTH_YR_GROUP, 754);
+ R95_CLASS_TALISMAN.put(CategoryType.SIXTH_WYNN_GROUP, 755);
+ R95_CLASS_TALISMAN.put(CategoryType.SIXTH_IS_GROUP, 756);
+ R95_CLASS_TALISMAN.put(CategoryType.SIXTH_FEOH_GROUP, 757);
+ R95_CLASS_TALISMAN.put(CategoryType.SIXTH_EOLH_GROUP, 758);
+ R95_CLASS_TALISMAN.put(CategoryType.ERTHEIA_FIGHTER_GROUP, 752);
+ R95_CLASS_TALISMAN.put(CategoryType.ERTHEIA_WIZARD_GROUP, 757);
+ }
+ private static final Map R99_CLASS_TALISMAN = new HashMap<>();
+ {
+ R99_CLASS_TALISMAN.put(CategoryType.SIXTH_SIGEL_GROUP, 759);
+ R99_CLASS_TALISMAN.put(CategoryType.SIXTH_TIR_GROUP, 760);
+ R99_CLASS_TALISMAN.put(CategoryType.SIXTH_OTHEL_GROUP, 761);
+ R99_CLASS_TALISMAN.put(CategoryType.SIXTH_YR_GROUP, 762);
+ R99_CLASS_TALISMAN.put(CategoryType.SIXTH_WYNN_GROUP, 763);
+ R99_CLASS_TALISMAN.put(CategoryType.SIXTH_IS_GROUP, 764);
+ R99_CLASS_TALISMAN.put(CategoryType.SIXTH_FEOH_GROUP, 765);
+ R99_CLASS_TALISMAN.put(CategoryType.SIXTH_EOLH_GROUP, 766);
+ R99_CLASS_TALISMAN.put(CategoryType.ERTHEIA_FIGHTER_GROUP, 760);
+ R99_CLASS_TALISMAN.put(CategoryType.ERTHEIA_WIZARD_GROUP, 765);
+ }
+ //@formatter:on
+ private static final String USED_PC_LOTTERY_TICKET = "USED_PC_LOTTERY_TICKET";
+
+ private AdventureGuildsman()
+ {
+ addStartNpc(ADVENTURE_GUILDSMAN);
+ addTalkId(ADVENTURE_GUILDSMAN);
+ addFirstTalkId(ADVENTURE_GUILDSMAN);
+ }
+
+ @Override
+ public String onAdvEvent(String event, L2Npc npc, L2PcInstance player)
+ {
+ String htmltext = null;
+
+ switch (event)
+ {
+ case "pccafe_list":
+ {
+ htmltext = "pccafe_list001.htm";
+ break;
+ }
+ case "quest_list":
+ {
+ player.sendPacket(ExShowQuestInfo.STATIC_PACKET);
+ break;
+ }
+ case "buff_list":
+ {
+ htmltext = "pccafe_buff_1001.htm";
+ break;
+ }
+ case "item_list":
+ {
+ htmltext = "pccafe_item001.htm";
+ break;
+ }
+ case "pccafe_help_inzone001.htm":
+ case "pccafe_help_lottery001.htm":
+ case "pccafe_help_lottery002.htm":
+ case "adventurer_agent_town_voucher_change.htm":
+ case "life_crystal_merge001.htm":
+ case "life_crystal_merge002.htm":
+ case "voucher_trader1001.htm":
+ case "voucher_trader2001.htm":
+ case "voucher_trader3001.htm":
+ case "voucher_trader4001.htm":
+ case "voucher_trader1004.htm":
+ case "voucher_trader2004.htm":
+ case "voucher_trader3004.htm":
+ case "voucher_trader4004.htm":
+ case "voucher_trader1005.htm":
+ case "voucher_trader2005.htm":
+ case "voucher_trader3005.htm":
+ case "voucher_trader4005.htm":
+ case "voucher_trader1006.htm":
+ case "voucher_trader2006.htm":
+ case "voucher_trader3006.htm":
+ case "voucher_trader4006.htm":
+ {
+ htmltext = event;
+ break;
+ }
+ case "index":
+ {
+ htmltext = player.getLevel() < 40 ? "adventurer_agent_town_77001.htm" : "adventurer_agent_town_77001e.htm";
+ break;
+ }
+ case "buff_setlist":
+ {
+ htmltext = "pccafe_newbuff_001.htm";
+ break;
+ }
+ case "buff_group":
+ {
+ htmltext = player.getPcCafePoints() >= 120 ? applyBuffsGroup(npc, player, GROUP_MELODY.length) : "pccafe_buff_1001.htm";
+ break;
+ }
+ case "knight":
+ {
+ htmltext = player.getPcCafePoints() >= 200 ? applyBuffs(npc, player, KNIGHT.getSkill()) : "pccafe_buff_1001.htm";
+ break;
+ }
+ case "warrior":
+ {
+ htmltext = player.getPcCafePoints() >= 200 ? applyBuffs(npc, player, WARRIOR.getSkill()) : "pccafe_buff_1001.htm";
+ break;
+ }
+ case "wizard":
+ {
+ htmltext = player.getPcCafePoints() >= 200 ? applyBuffs(npc, player, WIZARD.getSkill()) : "pccafe_buff_1001.htm";
+ break;
+ }
+ case "give_lottery_ticket":
+ {
+ if (!player.getVariables().getBoolean(USED_PC_LOTTERY_TICKET, false))
+ {
+ player.getVariables().set(USED_PC_LOTTERY_TICKET, true);
+ giveItems(player, PCCAFE_LOTTERY_TICKET_30DAYS, 1);
+ }
+ else
+ {
+ htmltext = "pccafe_help_lottery_notoneday.htm";
+ }
+ break;
+ }
+ case "trade_10":
+ {
+ htmltext = tradeItem(player, PCCAFE_5TH_LOTTERY_TICKET_30DAYS, 10);
+ break;
+ }
+ case "trade_100":
+ {
+ htmltext = tradeItem(player, PCCAFE_4TH_LOTTERY_TICKET_30DAYS, 100);
+ break;
+ }
+ case "trade_200":
+ {
+ htmltext = tradeItem(player, PCCAFE_3RD_LOTTERY_TICKET_30DAYS, 200);
+ break;
+ }
+ case "trade_1000":
+ {
+ htmltext = tradeItem(player, PCCAFE_2ND_LOTTERY_TICKET_30DAYS, 1000);
+ break;
+ }
+ case "trade_10000":
+ {
+ htmltext = tradeItem(player, PCCAFE_1ST_LOTTERY_TICKET_30DAYS, 10000);
+ break;
+ }
+ case "trade_seal85":
+ {
+ if (player.isInCategory(CategoryType.SIXTH_CLASS_GROUP))
+ {
+ if (hasQuestItems(player, VOUCHER_LEV_85))
+ {
+ takeItems(player, VOUCHER_LEV_85, 1);
+ giveItems(player, SEAL_LEV_85, 20);
+ addExpAndSp(player, 60000000, 0);
+ }
+ else
+ {
+ htmltext = "voucher_trader1003b.htm";
+ }
+ }
+ else
+ {
+ htmltext = "voucher_trader1007.htm";
+ }
+ break;
+ }
+ case "trade_seal90":
+ {
+ if (player.isInCategory(CategoryType.SIXTH_CLASS_GROUP))
+ {
+ if (hasQuestItems(player, VOUCHER_LEV_90))
+ {
+ takeItems(player, VOUCHER_LEV_90, 1);
+ giveItems(player, SEAL_LEV_90, 20);
+ addExpAndSp(player, 66000000, 0);
+ }
+ else
+ {
+ htmltext = "voucher_trader2003b.htm";
+ }
+ }
+ else
+ {
+ htmltext = "voucher_trader1007.htm";
+ }
+ break;
+ }
+ case "trade_seal95":
+ {
+ if (player.isInCategory(CategoryType.SIXTH_CLASS_GROUP))
+ {
+ if (hasQuestItems(player, VOUCHER_LEV_95))
+ {
+ takeItems(player, VOUCHER_LEV_95, 1);
+ giveItems(player, SEAL_LEV_95, 20);
+ addExpAndSp(player, 68000000, 0);
+ }
+ else
+ {
+ htmltext = "voucher_trader3003b.htm";
+ }
+ }
+ else
+ {
+ htmltext = "voucher_trader1007.htm";
+ }
+ break;
+ }
+ case "trade_seal97":
+ {
+ if (player.isInCategory(CategoryType.SIXTH_CLASS_GROUP))
+ {
+ if (hasQuestItems(player, VOUCHER_LEV_97))
+ {
+ takeItems(player, VOUCHER_LEV_97, 1);
+ giveItems(player, SEAL_LEV_97, 20);
+ addExpAndSp(player, 76000000, 0);
+ }
+ else
+ {
+ htmltext = "voucher_trader3003b.htm";
+ }
+ }
+ else
+ {
+ htmltext = "voucher_trader1007.htm";
+ }
+ break;
+ }
+ case "give_talismanR_by_class":
+ {
+ int multisellId = -1;
+
+ for (CategoryType type : R_CLASS_TALISMAN.keySet())
+ {
+ if (player.isInCategory(type))
+ {
+ multisellId = R_CLASS_TALISMAN.get(type);
+ break;
+ }
+ }
+
+ if (multisellId > 0)
+ {
+ MultisellData.getInstance().separateAndSend(multisellId, player, npc, false);
+ }
+ break;
+ }
+ case "give_talismanR90_by_class":
+ {
+ int multisellId = -1;
+
+ for (CategoryType type : R90_CLASS_TALISMAN.keySet())
+ {
+ if (player.isInCategory(type))
+ {
+ multisellId = R90_CLASS_TALISMAN.get(type);
+ break;
+ }
+ }
+
+ if (multisellId > 0)
+ {
+ MultisellData.getInstance().separateAndSend(multisellId, player, npc, false);
+ }
+ break;
+ }
+ case "give_talismanR95_by_class":
+ {
+ int multisellId = -1;
+ for (CategoryType type : R95_CLASS_TALISMAN.keySet())
+ {
+ if (player.isInCategory(type))
+ {
+ multisellId = R95_CLASS_TALISMAN.get(type);
+ break;
+ }
+ }
+
+ if (multisellId > 0)
+ {
+ MultisellData.getInstance().separateAndSend(multisellId, player, npc, false);
+ }
+ break;
+ }
+
+ case "give_talismanR99_by_class":
+ {
+ int multisellId = -1;
+
+ for (CategoryType type : R99_CLASS_TALISMAN.keySet())
+ {
+ if (player.isInCategory(type))
+ {
+ multisellId = R99_CLASS_TALISMAN.get(type);
+ break;
+ }
+ }
+
+ if (multisellId > 0)
+ {
+ MultisellData.getInstance().separateAndSend(multisellId, player, npc, false);
+ }
+ break;
+ }
+ }
+ if (event.startsWith("melody"))
+ {
+ final int buffOffset = CommonUtil.constrain(Integer.parseInt(event.substring(event.indexOf(" ") + 1)), 0, GROUP_MELODY.length);
+ if (player.getPcCafePoints() >= 20)
+ {
+ npc.setTarget(player);
+ npc.doCast(GROUP_MELODY[buffOffset].getSkill());
+ player.setPcCafePoints(player.getPcCafePoints() - 20);
+ htmltext = "pccafe_buff_1001.htm";
+ }
+ else
+ {
+ htmltext = "pccafe_notpoint001.htm";
+ }
+
+ }
+ return htmltext;
+ }
+
+ private String applyBuffs(L2Npc npc, L2PcInstance player, Skill skill)
+ {
+ for (SkillHolder holder : GROUP_MELODY)
+ {
+ SkillCaster.triggerCast(npc, player, holder.getSkill());
+ }
+ for (SkillHolder holder : GROUP_SONATA)
+ {
+ SkillCaster.triggerCast(npc, player, holder.getSkill());
+ }
+ SkillCaster.triggerCast(npc, player, skill);
+ player.setPcCafePoints(player.getPcCafePoints() - 200);
+ return null;
+ }
+
+ private String applyBuffsGroup(L2Npc npc, L2PcInstance player, int length)
+ {
+ for (SkillHolder holder : GROUP_MELODY)
+ {
+ SkillCaster.triggerCast(npc, player, holder.getSkill());
+ }
+ player.setPcCafePoints(player.getPcCafePoints() - 120);
+ return null;
+ }
+
+ private String tradeItem(L2PcInstance player, int itemId, int points)
+ {
+ if (player.getPcCafePoints() >= 200000)
+ {
+ return "pccafe_help_lottery_fail2.htm";
+ }
+
+ if (takeItems(player, itemId, 1))
+ {
+ player.setPcCafePoints(player.getPcCafePoints() + points);
+ return "pccafe_help_lottery003.htm";
+ }
+ return "pccafe_help_lottery_fail.htm";
+ }
+
+ @Override
+ public String onFirstTalk(L2Npc npc, L2PcInstance player)
+ {
+ return player.getLevel() < 40 ? "adventurer_agent_town_77001.htm" : "adventurer_agent_town_77001e.htm";
+ }
+
+ public static void main(String[] args)
+ {
+ new AdventureGuildsman();
+ }
+}
diff --git a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/ai/others/AdventureGuildsman/adventurer_agent_town_77001.htm b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/ai/others/AdventureGuildsman/adventurer_agent_town_77001.htm
new file mode 100644
index 0000000000..02ba3cc74e
--- /dev/null
+++ b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/ai/others/AdventureGuildsman/adventurer_agent_town_77001.htm
@@ -0,0 +1,7 @@
+Adventure Guildsman:
+The Adventure Guild gathers information on all adventures in all over the world and gives to adventurers. We're all-round information merchants. As you can imagine, we get real busy whenever events occur on the Aden Continent.
+Now that we're exchanging Adventurer's Marks and Seals as well, we're even busier.
+
+
+
+
\ No newline at end of file
diff --git a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/ai/others/AdventureGuildsman/adventurer_agent_town_77001e.htm b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/ai/others/AdventureGuildsman/adventurer_agent_town_77001e.htm
new file mode 100644
index 0000000000..604b5be571
--- /dev/null
+++ b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/ai/others/AdventureGuildsman/adventurer_agent_town_77001e.htm
@@ -0,0 +1,8 @@
+Adventure Guildsman:
+The Adventure Guild gathers information on all adventures in all over the world and gives to adventurers. We're all-round information merchants. As you can imagine, we get real busy whenever events occur on the Aden Continent.
+Now that we're exchanging Adventurer's Marks and Seals as well, we're even busier.
+
+
+
+
+
\ No newline at end of file
diff --git a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/ai/others/AdventureGuildsman/adventurer_agent_town_voucher_change.htm b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/ai/others/AdventureGuildsman/adventurer_agent_town_voucher_change.htm
new file mode 100644
index 0000000000..58a591d62d
--- /dev/null
+++ b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/ai/others/AdventureGuildsman/adventurer_agent_town_voucher_change.htm
@@ -0,0 +1,10 @@
+Adventure Guildsman:
+Do you want to exchange Adventurer's Marks and Seals?
+Here at the Adventure Guild, you can exchange Marks or Seals of Loyalty, Pledge, Sincerity, and Spirit.
+Select the one you want to exchange.
+
+
+
+
+
+
\ No newline at end of file
diff --git a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/ai/others/AdventureGuildsman/life_crystal_merge001.htm b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/ai/others/AdventureGuildsman/life_crystal_merge001.htm
new file mode 100644
index 0000000000..62f383f1dd
--- /dev/null
+++ b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/ai/others/AdventureGuildsman/life_crystal_merge001.htm
@@ -0,0 +1,9 @@
+Adventure Guildsman:
+Do you carry any Life Crystals with you?
+Due to some strange new influence, it has become impossible to gain any Life Crystals from the monsters on the Aden Continent.
+Whatever life crystals you have will be exchanged at the same value as before. We are working to identify the cause... please rest assured nothing will go wrong, and exchange your crystals with the supplies we have prepared.
+
+
+
+
+
\ No newline at end of file
diff --git a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/ai/others/AdventureGuildsman/life_crystal_merge002.htm b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/ai/others/AdventureGuildsman/life_crystal_merge002.htm
new file mode 100644
index 0000000000..8abfbaf26d
--- /dev/null
+++ b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/ai/others/AdventureGuildsman/life_crystal_merge002.htm
@@ -0,0 +1,17 @@
+Adventure Guildsman:
+The Adventure Guild has arranged a new system for exchanging special commodities associated with crafting Life Crystals, for the convenience of our adventurers. Now, you can exchange the commodities of choice whenever and wherever. Please select the village you'd like.
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/ai/others/AdventureGuildsman/pccafe_buff_1001.htm b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/ai/others/AdventureGuildsman/pccafe_buff_1001.htm
new file mode 100644
index 0000000000..36860815f0
--- /dev/null
+++ b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/ai/others/AdventureGuildsman/pccafe_buff_1001.htm
@@ -0,0 +1,17 @@
+Adventure Guildsman:
Buffs are back, new and improved! And they're easier to use than ever with your PC Points!
+6 Melodies + Harmony (of your choice) + 3 Sonatas
+
+
+Set of 6 Melodies
+Horn Melody / Drum Melody / Pipe Organ Melody / Guitar Melody / Harp Melody / Lute Melody
+
+
+Individual Buffs
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/ai/others/AdventureGuildsman/pccafe_help_inzone001.htm b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/ai/others/AdventureGuildsman/pccafe_help_inzone001.htm
new file mode 100644
index 0000000000..16afa65341
--- /dev/null
+++ b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/ai/others/AdventureGuildsman/pccafe_help_inzone001.htm
@@ -0,0 +1,5 @@
+Adventure Guildsman:
+Interested in obtaining special benefits that you can enjoy with PC points?
+To visit the PC Cafe Instant Zones, visit the Gludio Castle, Town of Dion, Heine, Town of Oren, Town of Schuttgart, and Town of Rune, and find the Guard Captain or the Pathfinder Worker. See you soon!
+
+
\ No newline at end of file
diff --git a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/ai/others/AdventureGuildsman/pccafe_help_lottery001.htm b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/ai/others/AdventureGuildsman/pccafe_help_lottery001.htm
new file mode 100644
index 0000000000..6fe3a55752
--- /dev/null
+++ b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/ai/others/AdventureGuildsman/pccafe_help_lottery001.htm
@@ -0,0 +1,7 @@
+Adventure Guildsman:
+The PC Cafe Lottery Ticket is a lottery which gives out up to 10,000 PC Points!.
+It is available every day, free of charge, once a day, to PC Cafe users.
+
+
+
+
\ No newline at end of file
diff --git a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/ai/others/AdventureGuildsman/pccafe_help_lottery002.htm b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/ai/others/AdventureGuildsman/pccafe_help_lottery002.htm
new file mode 100644
index 0000000000..83d973fc09
--- /dev/null
+++ b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/ai/others/AdventureGuildsman/pccafe_help_lottery002.htm
@@ -0,0 +1,10 @@
+Adventure Guildsman:
+If you have a winning lottery ticket, give it to me and I'll give you the appropriate PC points.
+So, how much did you win?
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/ai/others/AdventureGuildsman/pccafe_help_lottery003.htm b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/ai/others/AdventureGuildsman/pccafe_help_lottery003.htm
new file mode 100644
index 0000000000..ca49a9657c
--- /dev/null
+++ b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/ai/others/AdventureGuildsman/pccafe_help_lottery003.htm
@@ -0,0 +1,5 @@
+Adventure Guildsman:
+Congratulations!
+More luck awaits you next time.
+
+
\ No newline at end of file
diff --git a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/ai/others/AdventureGuildsman/pccafe_help_lottery_fail.htm b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/ai/others/AdventureGuildsman/pccafe_help_lottery_fail.htm
new file mode 100644
index 0000000000..cab653eafc
--- /dev/null
+++ b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/ai/others/AdventureGuildsman/pccafe_help_lottery_fail.htm
@@ -0,0 +1,4 @@
+Adventure Guildsman:
+I couldn't find any lottery tickets that correspond to the PC Cafe points you have won. Please check your Lottery Tickets again.
+
+
\ No newline at end of file
diff --git a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/ai/others/AdventureGuildsman/pccafe_help_lottery_fail2.htm b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/ai/others/AdventureGuildsman/pccafe_help_lottery_fail2.htm
new file mode 100644
index 0000000000..194b2b4ee0
--- /dev/null
+++ b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/ai/others/AdventureGuildsman/pccafe_help_lottery_fail2.htm
@@ -0,0 +1,5 @@
+Adventure Guildsman:
+If the sum of your current PC Cafe Points and the new PC Cafe Points you have won exceeds 200,000 points, the points you have won cannot be issued.
+Please return after you have used up more PC Cafe Points.
+
+
\ No newline at end of file
diff --git a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/ai/others/AdventureGuildsman/pccafe_help_lottery_notoneday.htm b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/ai/others/AdventureGuildsman/pccafe_help_lottery_notoneday.htm
new file mode 100644
index 0000000000..db1cec841b
--- /dev/null
+++ b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/ai/others/AdventureGuildsman/pccafe_help_lottery_notoneday.htm
@@ -0,0 +1,5 @@
+Adventure Guildsman:
+You have already participated in the PC Cafe Lottery Ticket.
+The PC Cafe Lottery Ticket is issued only once a day. Your next ticket can be issued after 6:30 AM.
+
+
\ No newline at end of file
diff --git a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/ai/others/AdventureGuildsman/pccafe_help_lottery_notpccafe.htm b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/ai/others/AdventureGuildsman/pccafe_help_lottery_notpccafe.htm
new file mode 100644
index 0000000000..99aeb04967
--- /dev/null
+++ b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/ai/others/AdventureGuildsman/pccafe_help_lottery_notpccafe.htm
@@ -0,0 +1,5 @@
+Adventure Guildsman:
+You're not a PC Cafe user.
+PC Lottery Tickets are issued to users who have come online from a PC Cafe.
+
+
\ No newline at end of file
diff --git a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/ai/others/AdventureGuildsman/pccafe_item001.htm b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/ai/others/AdventureGuildsman/pccafe_item001.htm
new file mode 100644
index 0000000000..1e81626837
--- /dev/null
+++ b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/ai/others/AdventureGuildsman/pccafe_item001.htm
@@ -0,0 +1,10 @@
+Adventure Guildsman:
+Here are the items you can purchase using PC Cafe Points.
+All items bought with PC Points, except Firecrackers and Large Firecrackers, cannot be exchanged, dropped, sold in a private store, or stored in a warehouse.
+(Item Appearance Stones can be exchanged and sold.)
+Now, make your selection!
+
+
+
+
+
\ No newline at end of file
diff --git a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/ai/others/AdventureGuildsman/pccafe_list001.htm b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/ai/others/AdventureGuildsman/pccafe_list001.htm
new file mode 100644
index 0000000000..3e4b3d4910
--- /dev/null
+++ b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/ai/others/AdventureGuildsman/pccafe_list001.htm
@@ -0,0 +1,9 @@
+Adventure Guildsman:
+You're come from a PC Cafe! This special shop will enable you to buy all kinds of different items and services with your Player Commendation (PC) points.
+Just make your choice!
+
+
+
+
+
+
\ No newline at end of file
diff --git a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/ai/others/AdventureGuildsman/pccafe_newbuff_001.htm b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/ai/others/AdventureGuildsman/pccafe_newbuff_001.htm
new file mode 100644
index 0000000000..979384ab70
--- /dev/null
+++ b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/ai/others/AdventureGuildsman/pccafe_newbuff_001.htm
@@ -0,0 +1,9 @@
+Adventure Guildsman:
+Select either Knight's Harmony, Warrior's Harmony, or Wizard's Harmony, and I will give you the buffs below regardless of your selection.
+Shared Buffs
+Horn Melody / Drum Melody / Pipe Organ Melody / Guitar Melody / Harp Melody / Lute Melody / Prevailing Sonata / Daring Sonata / Refreshing Sonata(The 3 Sonatas have the same power as the Sonatas for Adventurers.)
+
+
+
+
+
\ No newline at end of file
diff --git a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/ai/others/AdventureGuildsman/pccafe_notpoint001.htm b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/ai/others/AdventureGuildsman/pccafe_notpoint001.htm
new file mode 100644
index 0000000000..3f6acb57fa
--- /dev/null
+++ b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/ai/others/AdventureGuildsman/pccafe_notpoint001.htm
@@ -0,0 +1,4 @@
+Adventure Guildsman:
+I'm sorry, you don't have enough Internet Cafe points to make that purchase. Please check your points balance and make another selection.
+
+
\ No newline at end of file
diff --git a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/ai/others/AdventureGuildsman/voucher_trader1000b.htm b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/ai/others/AdventureGuildsman/voucher_trader1000b.htm
new file mode 100644
index 0000000000..064c1453ac
--- /dev/null
+++ b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/ai/others/AdventureGuildsman/voucher_trader1000b.htm
@@ -0,0 +1,4 @@
+Adventure Guildsman:
+You don't have a Adventurer's Mark. Are you positive that you're an adventurer?
+
+
\ No newline at end of file
diff --git a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/ai/others/AdventureGuildsman/voucher_trader1001.htm b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/ai/others/AdventureGuildsman/voucher_trader1001.htm
new file mode 100644
index 0000000000..a6047f4b68
--- /dev/null
+++ b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/ai/others/AdventureGuildsman/voucher_trader1001.htm
@@ -0,0 +1,10 @@
+Adventure Guildsman:
+Would you like to exchange an Adventurer's Mark - Loyalty or a Seal of Loyalty?
+The Adventurer's Guild exchanges an Adventurer's Mark - Loyalty for a Seal of Loyalty once a day.
+If you have a seal, you can exchange it for useful items right here. However, we are having some trouble bringing in items, so please keep in mind that we had to raise our prices.
+Would you like to make an exchange?
+
+
+
+
+
\ No newline at end of file
diff --git a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/ai/others/AdventureGuildsman/voucher_trader1003b.htm b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/ai/others/AdventureGuildsman/voucher_trader1003b.htm
new file mode 100644
index 0000000000..064c1453ac
--- /dev/null
+++ b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/ai/others/AdventureGuildsman/voucher_trader1003b.htm
@@ -0,0 +1,4 @@
+Adventure Guildsman:
+You don't have a Adventurer's Mark. Are you positive that you're an adventurer?
+
+
\ No newline at end of file
diff --git a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/ai/others/AdventureGuildsman/voucher_trader1004.htm b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/ai/others/AdventureGuildsman/voucher_trader1004.htm
new file mode 100644
index 0000000000..0e498009b4
--- /dev/null
+++ b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/ai/others/AdventureGuildsman/voucher_trader1004.htm
@@ -0,0 +1,7 @@
+Adventure Guildsman:
+Do you need a talisman?
+Can I interest you in some lovely ordinary or occupational talismans? Hmm?
+
+
+
+
\ No newline at end of file
diff --git a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/ai/others/AdventureGuildsman/voucher_trader1005.htm b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/ai/others/AdventureGuildsman/voucher_trader1005.htm
new file mode 100644
index 0000000000..473b2b8b8a
--- /dev/null
+++ b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/ai/others/AdventureGuildsman/voucher_trader1005.htm
@@ -0,0 +1,6 @@
+Adventure Guildsman:
+You mean a regular talisman? I have active and passive talismans. Which would you like?
+
+
+
+
\ No newline at end of file
diff --git a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/ai/others/AdventureGuildsman/voucher_trader1006.htm b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/ai/others/AdventureGuildsman/voucher_trader1006.htm
new file mode 100644
index 0000000000..703ecb7245
--- /dev/null
+++ b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/ai/others/AdventureGuildsman/voucher_trader1006.htm
@@ -0,0 +1,11 @@
+Adventure Guildsman:
+Which occupational talisman do you seek?
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/ai/others/AdventureGuildsman/voucher_trader1007.htm b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/ai/others/AdventureGuildsman/voucher_trader1007.htm
new file mode 100644
index 0000000000..def37af7d6
--- /dev/null
+++ b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/ai/others/AdventureGuildsman/voucher_trader1007.htm
@@ -0,0 +1,4 @@
+Adventure Guildsman:
+I'm sorry, but I can only exchange marks with seals for an awakened adventurer.
+
+
\ No newline at end of file
diff --git a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/ai/others/AdventureGuildsman/voucher_trader2001.htm b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/ai/others/AdventureGuildsman/voucher_trader2001.htm
new file mode 100644
index 0000000000..860507fdaf
--- /dev/null
+++ b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/ai/others/AdventureGuildsman/voucher_trader2001.htm
@@ -0,0 +1,10 @@
+Adventure Guildsman:
+Would you like to exchange an Adventurer's Mark - Pledge or a Seal of Pledge?
+The Adventurer's Guild exchanges an Adventurer's Mark - Pledge for a Seal of Pledge once a day.
+If you have a seal, you can exchange it for useful items right here. However, we are having some trouble bringing in items, so please keep in mind that we had to raise our prices.
+Would you like to make an exchange?
+
+
+
+
+
\ No newline at end of file
diff --git a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/ai/others/AdventureGuildsman/voucher_trader2003b.htm b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/ai/others/AdventureGuildsman/voucher_trader2003b.htm
new file mode 100644
index 0000000000..064c1453ac
--- /dev/null
+++ b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/ai/others/AdventureGuildsman/voucher_trader2003b.htm
@@ -0,0 +1,4 @@
+Adventure Guildsman:
+You don't have a Adventurer's Mark. Are you positive that you're an adventurer?
+
+
\ No newline at end of file
diff --git a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/ai/others/AdventureGuildsman/voucher_trader2004.htm b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/ai/others/AdventureGuildsman/voucher_trader2004.htm
new file mode 100644
index 0000000000..b6c23d6f32
--- /dev/null
+++ b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/ai/others/AdventureGuildsman/voucher_trader2004.htm
@@ -0,0 +1,7 @@
+Adventure Guildsman:
+Do you need a talisman?
+Can I interest you in some lovely ordinary or occupational talismans? Hmm?
+
+
+
+
\ No newline at end of file
diff --git a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/ai/others/AdventureGuildsman/voucher_trader2005.htm b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/ai/others/AdventureGuildsman/voucher_trader2005.htm
new file mode 100644
index 0000000000..661ebecf6f
--- /dev/null
+++ b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/ai/others/AdventureGuildsman/voucher_trader2005.htm
@@ -0,0 +1,6 @@
+Adventure Guildsman:
+You mean a regular talisman? I have active and passive talismans. Which would you like?
+
+
+
+
\ No newline at end of file
diff --git a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/ai/others/AdventureGuildsman/voucher_trader2006.htm b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/ai/others/AdventureGuildsman/voucher_trader2006.htm
new file mode 100644
index 0000000000..9c92ae5918
--- /dev/null
+++ b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/ai/others/AdventureGuildsman/voucher_trader2006.htm
@@ -0,0 +1,11 @@
+Adventure Guildsman:
+Occupational talismans? Yes, I have a large selection. What type are you looking for?
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/ai/others/AdventureGuildsman/voucher_trader3001.htm b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/ai/others/AdventureGuildsman/voucher_trader3001.htm
new file mode 100644
index 0000000000..9e9a6be4bf
--- /dev/null
+++ b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/ai/others/AdventureGuildsman/voucher_trader3001.htm
@@ -0,0 +1,10 @@
+Adventure Guildsman:
+Would you like to exchange an Adventurer's Mark - Sincerity or a Seal of Sincerity?
+The Adventurer's Guild exchanges an Adventurer's Mark - Sincerity for a Seal of Sincerity once a day.
+If you have a seal, you can exchange it for useful items right here. However, we are having some trouble bringing in items, so please keep in mind that we had to raise our prices.
+Would you like to make an exchange?
+
+
+
+
+
\ No newline at end of file
diff --git a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/ai/others/AdventureGuildsman/voucher_trader3003b.htm b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/ai/others/AdventureGuildsman/voucher_trader3003b.htm
new file mode 100644
index 0000000000..064c1453ac
--- /dev/null
+++ b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/ai/others/AdventureGuildsman/voucher_trader3003b.htm
@@ -0,0 +1,4 @@
+Adventure Guildsman:
+You don't have a Adventurer's Mark. Are you positive that you're an adventurer?
+
+
\ No newline at end of file
diff --git a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/ai/others/AdventureGuildsman/voucher_trader3004.htm b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/ai/others/AdventureGuildsman/voucher_trader3004.htm
new file mode 100644
index 0000000000..5e728d2542
--- /dev/null
+++ b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/ai/others/AdventureGuildsman/voucher_trader3004.htm
@@ -0,0 +1,7 @@
+Adventure Guildsman:
+Do you need a talisman?
+Can I interest you in some lovely ordinary or occupational talismans? Hmm?
+
+
+
+
\ No newline at end of file
diff --git a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/ai/others/AdventureGuildsman/voucher_trader3005.htm b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/ai/others/AdventureGuildsman/voucher_trader3005.htm
new file mode 100644
index 0000000000..b5d3fc75e7
--- /dev/null
+++ b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/ai/others/AdventureGuildsman/voucher_trader3005.htm
@@ -0,0 +1,6 @@
+Adventure Guildsman:
+You mean a regular talisman? I have active and passive talismans. Which would you like?
+
+
+
+
\ No newline at end of file
diff --git a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/ai/others/AdventureGuildsman/voucher_trader3006.htm b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/ai/others/AdventureGuildsman/voucher_trader3006.htm
new file mode 100644
index 0000000000..c33c271b17
--- /dev/null
+++ b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/ai/others/AdventureGuildsman/voucher_trader3006.htm
@@ -0,0 +1,11 @@
+Adventure Guildsman:
+You're looking for talismans for your occupation? Which talismans do you seek?
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/ai/others/AdventureGuildsman/voucher_trader4001.htm b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/ai/others/AdventureGuildsman/voucher_trader4001.htm
new file mode 100644
index 0000000000..9002534d0d
--- /dev/null
+++ b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/ai/others/AdventureGuildsman/voucher_trader4001.htm
@@ -0,0 +1,10 @@
+Adventure Guildsman:
+Would you like to exchange an Adventurer's Mark - Spirit or a Seal of Spirit?
+The Adventurer's Guild exchanges an Adventurer's Mark - Spirit for a Seal of Spirit once a day.
+If you have a seal, you can exchange it for useful items right here. However, we are having some trouble bringing in items, so please keep in mind that we had to raise our prices.
+Would you like to make an exchange?
+
+
+
+
+
\ No newline at end of file
diff --git a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/ai/others/AdventureGuildsman/voucher_trader4003b.htm b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/ai/others/AdventureGuildsman/voucher_trader4003b.htm
new file mode 100644
index 0000000000..064c1453ac
--- /dev/null
+++ b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/ai/others/AdventureGuildsman/voucher_trader4003b.htm
@@ -0,0 +1,4 @@
+Adventure Guildsman:
+You don't have a Adventurer's Mark. Are you positive that you're an adventurer?
+
+
\ No newline at end of file
diff --git a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/ai/others/AdventureGuildsman/voucher_trader4004.htm b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/ai/others/AdventureGuildsman/voucher_trader4004.htm
new file mode 100644
index 0000000000..9b9b93e532
--- /dev/null
+++ b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/ai/others/AdventureGuildsman/voucher_trader4004.htm
@@ -0,0 +1,7 @@
+Adventure Guildsman:
+Do you need a talisman?
+Can I interest you in some lovely ordinary or occupational talismans? Hmm?
+
+
+
+
\ No newline at end of file
diff --git a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/ai/others/AdventureGuildsman/voucher_trader4005.htm b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/ai/others/AdventureGuildsman/voucher_trader4005.htm
new file mode 100644
index 0000000000..9b1a1da4e3
--- /dev/null
+++ b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/ai/others/AdventureGuildsman/voucher_trader4005.htm
@@ -0,0 +1,6 @@
+Adventure Guildsman:
+You mean a regular talisman? I have active and passive talismans. Which would you like?
+
+
+
+
\ No newline at end of file
diff --git a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/ai/others/AdventureGuildsman/voucher_trader4006.htm b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/ai/others/AdventureGuildsman/voucher_trader4006.htm
new file mode 100644
index 0000000000..f616eb8647
--- /dev/null
+++ b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/ai/others/AdventureGuildsman/voucher_trader4006.htm
@@ -0,0 +1,11 @@
+Adventure Guildsman:
+Occupational talismans? Hmm? Why, yes. I do have some. Which ones do you seek?
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/ai/others/AdventurersGuide/AdventurersGuide.java b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/ai/others/AdventurersGuide/AdventurersGuide.java
index 8d3f0e0325..871a851453 100644
--- a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/ai/others/AdventurersGuide/AdventurersGuide.java
+++ b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/ai/others/AdventurersGuide/AdventurersGuide.java
@@ -53,6 +53,9 @@ public final class AdventurersGuide extends AbstractNpcAI
new SkillHolder(15652, 1), // Daring Sonata (Adventurer)
new SkillHolder(15653, 1), // Refreshing Sonata (Adventurer)
};
+ // Misc
+ private static int MAX_LEVEL_BUFFS = 94;
+ private static int MIN_LEVEL_PROTECTION = 40;
private AdventurersGuide()
{
@@ -115,7 +118,7 @@ public final class AdventurersGuide extends AbstractNpcAI
private String applyBuffs(L2Npc npc, L2PcInstance player, Skill skill)
{
- if (player.getLevel() > 94)
+ if (player.getLevel() > MAX_LEVEL_BUFFS)
{
return "guide-noBuffs.html";
}
@@ -126,7 +129,7 @@ public final class AdventurersGuide extends AbstractNpcAI
}
SkillCaster.triggerCast(npc, player, skill);
- if ((player.getLevel() < 40) && (player.getClassId().level() <= 1))
+ if ((player.getLevel() < MIN_LEVEL_PROTECTION) && (player.getClassId().level() <= 1))
{
SkillCaster.triggerCast(npc, player, BLESS_PROTECTION.getSkill());
}
diff --git a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/ai/others/CastleCourtMagician/CastleCourtMagician.java b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/ai/others/CastleCourtMagician/CastleCourtMagician.java
index ff6975b3f2..f01d1044ea 100644
--- a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/ai/others/CastleCourtMagician/CastleCourtMagician.java
+++ b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/ai/others/CastleCourtMagician/CastleCourtMagician.java
@@ -121,14 +121,14 @@ public final class CastleCourtMagician extends AbstractNpcAI
// Misc
private static final CategoryType[] AWAKENED_CT =
{
- CategoryType.SIGEL_GROUP,
- CategoryType.TYRR_GROUP,
- CategoryType.OTHELL_GROUP,
- CategoryType.YUL_GROUP,
- CategoryType.FEOH_GROUP,
- CategoryType.ISS_GROUP,
- CategoryType.WYNN_GROUP,
- CategoryType.AEORE_GROUP,
+ CategoryType.SIXTH_SIGEL_GROUP,
+ CategoryType.SIXTH_TIR_GROUP,
+ CategoryType.SIXTH_OTHEL_GROUP,
+ CategoryType.SIXTH_YR_GROUP,
+ CategoryType.SIXTH_FEOH_GROUP,
+ CategoryType.SIXTH_IS_GROUP,
+ CategoryType.SIXTH_WYNN_GROUP,
+ CategoryType.SIXTH_EOLH_GROUP,
};
private CastleCourtMagician()
@@ -266,7 +266,7 @@ public final class CastleCourtMagician extends AbstractNpcAI
}
case "giveTalismanR":
{
- htmltext = player.isInCategory(CategoryType.AWAKEN_GROUP) ? "courtmagician-09.html" : "courtmagician-10.html";
+ htmltext = player.isInCategory(CategoryType.SIXTH_CLASS_GROUP) ? "courtmagician-09.html" : "courtmagician-10.html";
break;
}
case "giveTalismanR_classSpecific":
diff --git a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/ai/others/ClassMaster/ClassMaster.java b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/ai/others/ClassMaster/ClassMaster.java
index e9feba2163..639775dd63 100644
--- a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/ai/others/ClassMaster/ClassMaster.java
+++ b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/ai/others/ClassMaster/ClassMaster.java
@@ -297,7 +297,7 @@ public final class ClassMaster extends AbstractNpcAI implements IGameXmlReader
{
htmltext = "test_server_helper011.html";
}
- else if (player.isInCategory(CategoryType.AWAKEN_GROUP))
+ else if (player.isInCategory(CategoryType.SIXTH_CLASS_GROUP))
{
htmltext = "test_server_helper011a.html";
}
@@ -319,7 +319,7 @@ public final class ClassMaster extends AbstractNpcAI implements IGameXmlReader
htmltext = "test_server_helper021.html";
}
}
- else if (player.isInCategory(CategoryType.AWAKEN_GROUP))
+ else if (player.isInCategory(CategoryType.SIXTH_CLASS_GROUP))
{
htmltext = "test_server_helper011a.html";
}
@@ -352,7 +352,7 @@ public final class ClassMaster extends AbstractNpcAI implements IGameXmlReader
}
else if (player.isInCategory(CategoryType.FOURTH_CLASS_GROUP) && (player.getLevel() >= 85)) // 9
{
- canChange = CategoryData.getInstance().isInCategory(CategoryType.AWAKEN_GROUP, classId); // 11
+ canChange = CategoryData.getInstance().isInCategory(CategoryType.SIXTH_CLASS_GROUP, classId); // 11
}
if (canChange)
@@ -422,7 +422,7 @@ public final class ClassMaster extends AbstractNpcAI implements IGameXmlReader
{
player.setBaseClass(player.getActiveClass());
}
- if (player.isInCategory(CategoryType.AWAKEN_GROUP))
+ if (player.isInCategory(CategoryType.SIXTH_CLASS_GROUP))
{
SkillTreesData.getInstance().cleanSkillUponAwakening(player);
for (L2SkillLearn skill : SkillTreesData.getInstance().getRaceSkillTree(player.getRace()))
@@ -450,7 +450,7 @@ public final class ClassMaster extends AbstractNpcAI implements IGameXmlReader
case "learnskills":
{
// Retail class master only lets you learn all third class skills.
- if (player.isInCategory(CategoryType.AWAKEN_GROUP))
+ if (player.isInCategory(CategoryType.SIXTH_CLASS_GROUP))
{
htmltext = "test_server_helper001_failed.html";
}
@@ -578,7 +578,7 @@ public final class ClassMaster extends AbstractNpcAI implements IGameXmlReader
{
htmltext = "test_server_helper011.html";
}
- else if (player.isInCategory(CategoryType.AWAKEN_GROUP))
+ else if (player.isInCategory(CategoryType.SIXTH_CLASS_GROUP))
{
htmltext = "test_server_helper011a.html";
}
@@ -762,7 +762,7 @@ public final class ClassMaster extends AbstractNpcAI implements IGameXmlReader
{
htmltext = "test_server_helper011.html";
}
- else if (player.isInCategory(CategoryType.AWAKEN_GROUP))
+ else if (player.isInCategory(CategoryType.SIXTH_CLASS_GROUP))
{
htmltext = "test_server_helper011a.html";
}
@@ -853,7 +853,7 @@ public final class ClassMaster extends AbstractNpcAI implements IGameXmlReader
{
player.setBaseClass(player.getActiveClass());
}
- if (player.isInCategory(CategoryType.AWAKEN_GROUP))
+ if (player.isInCategory(CategoryType.SIXTH_CLASS_GROUP))
{
SkillTreesData.getInstance().cleanSkillUponAwakening(player);
for (L2SkillLearn skill : SkillTreesData.getInstance().getRaceSkillTree(player.getRace()))
diff --git a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/ai/others/HermuncusMinion/HermuncusMinion.java b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/ai/others/HermuncusMinion/HermuncusMinion.java
index d17067c902..6ac78443c9 100644
--- a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/ai/others/HermuncusMinion/HermuncusMinion.java
+++ b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/ai/others/HermuncusMinion/HermuncusMinion.java
@@ -97,7 +97,7 @@ public final class HermuncusMinion extends AbstractNpcAI
if (event.equals("teleportList"))
{
- if (!player.isInCategory(CategoryType.AWAKEN_GROUP))
+ if (!player.isInCategory(CategoryType.SIXTH_CLASS_GROUP))
{
htmltext = "HermuncusMinion-no.html";
}
@@ -155,7 +155,7 @@ public final class HermuncusMinion extends AbstractNpcAI
@Override
public String onFirstTalk(L2Npc npc, L2PcInstance player)
{
- return player.isInCategory(CategoryType.AWAKEN_GROUP) ? "HermuncusMinion.html" : "HermuncusMinion-no.html";
+ return player.isInCategory(CategoryType.SIXTH_CLASS_GROUP) ? "HermuncusMinion.html" : "HermuncusMinion-no.html";
}
private String generateButton(Integer locationId)
diff --git a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/ai/others/MentorGuide/MentorGuide.java b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/ai/others/MentorGuide/MentorGuide.java
index 9aba4c962c..8499c186a1 100644
--- a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/ai/others/MentorGuide/MentorGuide.java
+++ b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/ai/others/MentorGuide/MentorGuide.java
@@ -369,7 +369,7 @@ public final class MentorGuide extends AbstractNpcAI implements IGameXmlReader
handleMenteeSkills(player);
- if (player.isInCategory(CategoryType.AWAKEN_GROUP))
+ if (player.isInCategory(CategoryType.SIXTH_CLASS_GROUP))
{
handleGraduateMentee(player);
}
diff --git a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/ai/others/OlyManager/OlyManager.java b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/ai/others/OlyManager/OlyManager.java
index 073b459591..9e65f90f3a 100644
--- a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/ai/others/OlyManager/OlyManager.java
+++ b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/ai/others/OlyManager/OlyManager.java
@@ -57,16 +57,15 @@ public final class OlyManager extends AbstractNpcAI implements IBypassHandler
private static final int MANAGER = 31688;
// Misc
private static final Map EQUIPMENT_MULTISELL = new HashMap<>();
-
{
- EQUIPMENT_MULTISELL.put(CategoryType.SIGEL_GROUP, 917);
- EQUIPMENT_MULTISELL.put(CategoryType.TYRR_GROUP, 918);
- EQUIPMENT_MULTISELL.put(CategoryType.OTHELL_GROUP, 919);
- EQUIPMENT_MULTISELL.put(CategoryType.YUL_GROUP, 920);
- EQUIPMENT_MULTISELL.put(CategoryType.FEOH_GROUP, 921);
- EQUIPMENT_MULTISELL.put(CategoryType.ISS_GROUP, 923);
- EQUIPMENT_MULTISELL.put(CategoryType.WYNN_GROUP, 922);
- EQUIPMENT_MULTISELL.put(CategoryType.AEORE_GROUP, 924);
+ EQUIPMENT_MULTISELL.put(CategoryType.SIXTH_SIGEL_GROUP, 917);
+ EQUIPMENT_MULTISELL.put(CategoryType.SIXTH_TIR_GROUP, 918);
+ EQUIPMENT_MULTISELL.put(CategoryType.SIXTH_OTHEL_GROUP, 919);
+ EQUIPMENT_MULTISELL.put(CategoryType.SIXTH_YR_GROUP, 920);
+ EQUIPMENT_MULTISELL.put(CategoryType.SIXTH_FEOH_GROUP, 921);
+ EQUIPMENT_MULTISELL.put(CategoryType.SIXTH_IS_GROUP, 923);
+ EQUIPMENT_MULTISELL.put(CategoryType.SIXTH_WYNN_GROUP, 922);
+ EQUIPMENT_MULTISELL.put(CategoryType.SIXTH_EOLH_GROUP, 924);
}
private static final String[] BYPASSES =
@@ -144,7 +143,7 @@ public final class OlyManager extends AbstractNpcAI implements IBypassHandler
{
htmltext = "OlyManager-subclass.html";
}
- else if (!player.isInCategory(CategoryType.AWAKEN_GROUP))
+ else if (!player.isInCategory(CategoryType.SIXTH_CLASS_GROUP))
{
htmltext = "OlyManager-awaken.html";
}
diff --git a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/admincommandhandlers/AdminEditChar.java b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/admincommandhandlers/AdminEditChar.java
index 8524f559b0..5352c38082 100644
--- a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/admincommandhandlers/AdminEditChar.java
+++ b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/admincommandhandlers/AdminEditChar.java
@@ -416,7 +416,7 @@ public class AdminEditChar implements IAdminCommandHandler
}
final String newclass = ClassListData.getInstance().getClass(player.getClassId()).getClassName();
- if (player.isInCategory(CategoryType.AWAKEN_GROUP))
+ if (player.isInCategory(CategoryType.SIXTH_CLASS_GROUP))
{
SkillTreesData.getInstance().cleanSkillUponAwakening(player);
for (L2SkillLearn skill : SkillTreesData.getInstance().getRaceSkillTree(player.getRace()))
diff --git a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/AirBind.java b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/AirBind.java
index e1adc4c75d..2b1aed91f3 100644
--- a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/AirBind.java
+++ b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/AirBind.java
@@ -114,7 +114,7 @@ public final class AirBind extends AbstractEffect
for (L2PcInstance nearbyPlayer : L2World.getInstance().getVisibleObjects(effected, L2PcInstance.class, 1200))
{
if ((nearbyPlayer.getRace() != Race.ERTHEIA) && (nearbyPlayer.getTarget() == effected) //
- && nearbyPlayer.isInCategory(CategoryType.AWAKEN_GROUP) && !nearbyPlayer.isAlterSkillActive())
+ && nearbyPlayer.isInCategory(CategoryType.SIXTH_CLASS_GROUP) && !nearbyPlayer.isAlterSkillActive())
{
final int chainSkill = _chainedAirSkills.get(nearbyPlayer.getClassId());
if (nearbyPlayer.getSkillRemainingReuseTime(chainSkill) == -1)
diff --git a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/KnockBack.java b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/KnockBack.java
index f6fa9dc43e..81b8f8134c 100644
--- a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/KnockBack.java
+++ b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/KnockBack.java
@@ -173,7 +173,7 @@ public final class KnockBack extends AbstractEffect
{
continue;
}
- if ((nearbyPlayer.getTarget() == effected) && nearbyPlayer.isInCategory(CategoryType.AWAKEN_GROUP) && !nearbyPlayer.isAlterSkillActive())
+ if ((nearbyPlayer.getTarget() == effected) && nearbyPlayer.isInCategory(CategoryType.SIXTH_CLASS_GROUP) && !nearbyPlayer.isAlterSkillActive())
{
final int chainSkill = _chainKnockSkills.get(nearbyPlayer.getClassId());
if (nearbyPlayer.getSkillRemainingReuseTime(chainSkill) == -1)
diff --git a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/itemhandlers/PaulinasSupportBox.java b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/itemhandlers/PaulinasSupportBox.java
index b67ca1f63f..503721790e 100644
--- a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/itemhandlers/PaulinasSupportBox.java
+++ b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/itemhandlers/PaulinasSupportBox.java
@@ -148,7 +148,7 @@ public class PaulinasSupportBox implements IItemHandler
}
case ORC:
{
- if (player.isMageClass() || CategoryData.getInstance().isInCategory(CategoryType.TYRR_CANDIDATE, classId.getId()))
+ if (player.isMageClass() || CategoryData.getInstance().isInCategory(CategoryType.WARRIOR_CATEGORY, classId.getId()))
{
player.addItem(getClass().getSimpleName(), BOX_C_LIGHT, 1, player, true);
}
@@ -203,7 +203,7 @@ public class PaulinasSupportBox implements IItemHandler
}
case ORC:
{
- if (player.isMageClass() || CategoryData.getInstance().isInCategory(CategoryType.TYRR_CANDIDATE, classId.getId()))
+ if (player.isMageClass() || CategoryData.getInstance().isInCategory(CategoryType.WARRIOR_CATEGORY, classId.getId()))
{
player.addItem(getClass().getSimpleName(), BOX_A_LIGHT, 1, player, true);
}
@@ -258,7 +258,7 @@ public class PaulinasSupportBox implements IItemHandler
}
case ORC:
{
- if (player.isMageClass() || CategoryData.getInstance().isInCategory(CategoryType.TYRR_CANDIDATE, classId.getId()))
+ if (player.isMageClass() || CategoryData.getInstance().isInCategory(CategoryType.WARRIOR_CATEGORY, classId.getId()))
{
player.addItem(getClass().getSimpleName(), BOX_S_LIGHT, 1, player, true);
}
@@ -301,7 +301,7 @@ public class PaulinasSupportBox implements IItemHandler
{
player.addItem(getClass().getSimpleName(), BOX_R_ROBE, 1, player, true);
}
- else if (CategoryData.getInstance().isInCategory(CategoryType.OTHELL_GROUP, classId.getId()) || CategoryData.getInstance().isInCategory(CategoryType.YUL_GROUP, classId.getId()))
+ else if (CategoryData.getInstance().isInCategory(CategoryType.SIXTH_OTHEL_GROUP, classId.getId()) || CategoryData.getInstance().isInCategory(CategoryType.SIXTH_YR_GROUP, classId.getId()))
{
player.addItem(getClass().getSimpleName(), BOX_R_LIGHT, 1, player, true);
}
diff --git a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/instances/HarnakUndergroundRuins/HarnakUndergroundRuins.java b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/instances/HarnakUndergroundRuins/HarnakUndergroundRuins.java
index 5a74053b38..49de099a70 100644
--- a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/instances/HarnakUndergroundRuins/HarnakUndergroundRuins.java
+++ b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/instances/HarnakUndergroundRuins/HarnakUndergroundRuins.java
@@ -79,17 +79,16 @@ public final class HarnakUndergroundRuins extends AbstractInstance
private static final int DOOR_ONE = 16240100;
private static final int DOOR_TWO = 16240102;
private static final Map MOB_CATEGORY = new HashMap<>();
-
static
{
- MOB_CATEGORY.put(CategoryType.SIGEL_CANDIDATE, RAKZAN);
- MOB_CATEGORY.put(CategoryType.TYRR_CANDIDATE, KRAKIA_BATHUS);
- MOB_CATEGORY.put(CategoryType.OTHELL_CANDIDATE, BAMONTI);
- MOB_CATEGORY.put(CategoryType.YUL_CANDIDATE, KRAKIA_CARCASS);
- MOB_CATEGORY.put(CategoryType.FEOH_CANDIDATE, WEISS_KHAN);
- MOB_CATEGORY.put(CategoryType.ISS_CANDIDATE, SEKNUS);
- MOB_CATEGORY.put(CategoryType.WYNN_CANDIDATE, KRAKIA_LOTUS);
- MOB_CATEGORY.put(CategoryType.AEORE_CANDIDATE, WEISS_ELE);
+ MOB_CATEGORY.put(CategoryType.SIXTH_SIGEL_GROUP, RAKZAN);
+ MOB_CATEGORY.put(CategoryType.SIXTH_TIR_GROUP, KRAKIA_BATHUS);
+ MOB_CATEGORY.put(CategoryType.SIXTH_OTHEL_GROUP, BAMONTI);
+ MOB_CATEGORY.put(CategoryType.SIXTH_YR_GROUP, KRAKIA_CARCASS);
+ MOB_CATEGORY.put(CategoryType.SIXTH_FEOH_GROUP, WEISS_KHAN);
+ MOB_CATEGORY.put(CategoryType.SIXTH_IS_GROUP, SEKNUS);
+ MOB_CATEGORY.put(CategoryType.SIXTH_WYNN_GROUP, KRAKIA_LOTUS);
+ MOB_CATEGORY.put(CategoryType.SIXTH_EOLH_GROUP, WEISS_ELE);
}
public HarnakUndergroundRuins()
diff --git a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/instances/Nursery/Nursery.java b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/instances/Nursery/Nursery.java
index cd0364efe8..f2affd49bf 100644
--- a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/instances/Nursery/Nursery.java
+++ b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/instances/Nursery/Nursery.java
@@ -363,27 +363,27 @@ public final class Nursery extends AbstractInstance
{
int pointsCount = getRandom(6) + 3;
- if (killer.isInCategory(CategoryType.SIGEL_GROUP) || killer.isInCategory(CategoryType.AEORE_GROUP))
+ if (killer.isInCategory(CategoryType.SIXTH_SIGEL_GROUP) || killer.isInCategory(CategoryType.SIXTH_EOLH_GROUP))
{
pointsCount += 6;
}
- else if (killer.isInCategory(CategoryType.TYRR_GROUP))
+ else if (killer.isInCategory(CategoryType.SIXTH_TIR_GROUP))
{
pointsCount -= 1;
}
- else if (killer.isInCategory(CategoryType.OTHELL_GROUP))
+ else if (killer.isInCategory(CategoryType.SIXTH_OTHEL_GROUP))
{
pointsCount += 2;
}
- else if (killer.isInCategory(CategoryType.YUL_GROUP))
+ else if (killer.isInCategory(CategoryType.SIXTH_YR_GROUP))
{
pointsCount += 1;
}
- else if (killer.isInCategory(CategoryType.FEOH_GROUP) || killer.isInCategory(CategoryType.ISS_GROUP))
+ else if (killer.isInCategory(CategoryType.SIXTH_FEOH_GROUP) || killer.isInCategory(CategoryType.SIXTH_IS_GROUP))
{
pointsCount += 0;
}
- else if (killer.isInCategory(CategoryType.WYNN_GROUP))
+ else if (killer.isInCategory(CategoryType.SIXTH_WYNN_GROUP))
{
pointsCount += 3;
}
diff --git a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/quests/Q00177_SplitDestiny/Q00177_SplitDestiny.java b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/quests/Q00177_SplitDestiny/Q00177_SplitDestiny.java
index a2ed81b2e7..4b9af8b327 100644
--- a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/quests/Q00177_SplitDestiny/Q00177_SplitDestiny.java
+++ b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/quests/Q00177_SplitDestiny/Q00177_SplitDestiny.java
@@ -239,39 +239,39 @@ public final class Q00177_SplitDestiny extends Quest
{
htmltext = "33344-02.htm";
}
- else if (!CategoryData.getInstance().isInCategory(CategoryType.AWAKEN_GROUP, player.getBaseClass()))
+ else if (!CategoryData.getInstance().isInCategory(CategoryType.SIXTH_CLASS_GROUP, player.getBaseClass()))
{
htmltext = "33344-03.htm";
}
- else if (CategoryData.getInstance().isInCategory(CategoryType.SIGEL_GROUP, player.getBaseClass()) && player.isInCategory(CategoryType.SIGEL_CANDIDATE))
+ else if (CategoryData.getInstance().isInCategory(CategoryType.SIXTH_SIGEL_GROUP, player.getBaseClass()) && player.isInCategory(CategoryType.TANKER_CATEGORY))
{
htmltext = "33344-sigel.htm";
}
- else if (CategoryData.getInstance().isInCategory(CategoryType.TYRR_GROUP, player.getBaseClass()) && player.isInCategory(CategoryType.TYRR_CANDIDATE))
+ else if (CategoryData.getInstance().isInCategory(CategoryType.SIXTH_TIR_GROUP, player.getBaseClass()) && player.isInCategory(CategoryType.WARRIOR_CATEGORY))
{
htmltext = "33344-tyrr.htm";
}
- else if (CategoryData.getInstance().isInCategory(CategoryType.OTHELL_GROUP, player.getBaseClass()) && player.isInCategory(CategoryType.OTHELL_CANDIDATE))
+ else if (CategoryData.getInstance().isInCategory(CategoryType.SIXTH_OTHEL_GROUP, player.getBaseClass()) && player.isInCategory(CategoryType.ROGUE_CATEGORY))
{
htmltext = "33344-othell.htm";
}
- else if (CategoryData.getInstance().isInCategory(CategoryType.YUL_GROUP, player.getBaseClass()) && player.isInCategory(CategoryType.YUL_CANDIDATE))
+ else if (CategoryData.getInstance().isInCategory(CategoryType.SIXTH_YR_GROUP, player.getBaseClass()) && player.isInCategory(CategoryType.ARCHER_CATEGORY))
{
htmltext = "33344-yul.htm";
}
- else if (CategoryData.getInstance().isInCategory(CategoryType.FEOH_GROUP, player.getBaseClass()) && player.isInCategory(CategoryType.FEOH_CANDIDATE))
+ else if (CategoryData.getInstance().isInCategory(CategoryType.SIXTH_FEOH_GROUP, player.getBaseClass()) && player.isInCategory(CategoryType.WIZARD_CATEGORY))
{
htmltext = "33344-feoh.htm";
}
- else if (CategoryData.getInstance().isInCategory(CategoryType.ISS_GROUP, player.getBaseClass()) && player.isInCategory(CategoryType.ISS_CANDIDATE))
+ else if (CategoryData.getInstance().isInCategory(CategoryType.SIXTH_IS_GROUP, player.getBaseClass()) && player.isInCategory(CategoryType.ENCHANTER_CATEGORY))
{
htmltext = "33344-iss.htm";
}
- else if (CategoryData.getInstance().isInCategory(CategoryType.WYNN_GROUP, player.getBaseClass()) && player.isInCategory(CategoryType.WYNN_CANDIDATE))
+ else if (CategoryData.getInstance().isInCategory(CategoryType.SIXTH_WYNN_GROUP, player.getBaseClass()) && player.isInCategory(CategoryType.SUMMONER_CATEGORY))
{
htmltext = "33344-wynn.htm";
}
- else if (CategoryData.getInstance().isInCategory(CategoryType.AEORE_GROUP, player.getBaseClass()) && player.isInCategory(CategoryType.AEORE_CANDIDATE))
+ else if (CategoryData.getInstance().isInCategory(CategoryType.SIXTH_EOLH_GROUP, player.getBaseClass()) && player.isInCategory(CategoryType.HEALER_CATEGORY))
{
htmltext = "33344-aeore.htm";
}
diff --git a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/quests/Q10338_SeizeYourDestiny/Q10338_SeizeYourDestiny.java b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/quests/Q10338_SeizeYourDestiny/Q10338_SeizeYourDestiny.java
index 64aac90a45..6ac9939d16 100644
--- a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/quests/Q10338_SeizeYourDestiny/Q10338_SeizeYourDestiny.java
+++ b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/quests/Q10338_SeizeYourDestiny/Q10338_SeizeYourDestiny.java
@@ -91,7 +91,7 @@ public final class Q10338_SeizeYourDestiny extends Quest
}
case "33477-03.html":
{
- if (!player.isInCategory(CategoryType.AWAKEN_GROUP))
+ if (!player.isInCategory(CategoryType.SIXTH_CLASS_GROUP))
{
qs.setSimulated(false);
qs.setState(State.CREATED);
@@ -149,7 +149,7 @@ public final class Q10338_SeizeYourDestiny extends Quest
{
htmltext = "33477-06.html";
}
- else if (player.isInCategory(CategoryType.AWAKEN_GROUP) || hasQuestItems(player, SCROLL_OF_AFTERLIFE.getId()))
+ else if (player.isInCategory(CategoryType.SIXTH_CLASS_GROUP) || hasQuestItems(player, SCROLL_OF_AFTERLIFE.getId()))
{
htmltext = "33477-05.html";
}
@@ -167,7 +167,7 @@ public final class Q10338_SeizeYourDestiny extends Quest
}
case HADEL:
{
- if (player.isInCategory(CategoryType.AWAKEN_GROUP) || hasQuestItems(player, SCROLL_OF_AFTERLIFE.getId()))
+ if (player.isInCategory(CategoryType.SIXTH_CLASS_GROUP) || hasQuestItems(player, SCROLL_OF_AFTERLIFE.getId()))
{
htmltext = "33344-07.html";
}
diff --git a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/quests/Q10339_FightingTheForgotten/Q10339_FightingTheForgotten.java b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/quests/Q10339_FightingTheForgotten/Q10339_FightingTheForgotten.java
index 78c2aaa6fa..8f582b0287 100644
--- a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/quests/Q10339_FightingTheForgotten/Q10339_FightingTheForgotten.java
+++ b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/quests/Q10339_FightingTheForgotten/Q10339_FightingTheForgotten.java
@@ -62,7 +62,7 @@ public final class Q10339_FightingTheForgotten extends Quest
addTalkId(THEODORE, HADEL);
addKillId(MONSTERS);
addCondMinLevel(MIN_LV, "32975-06.html");
- addCondInCategory(CategoryType.AWAKEN_GROUP, "32975-06.html");
+ addCondInCategory(CategoryType.SIXTH_CLASS_GROUP, "32975-06.html");
}
@Override
diff --git a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/stats/npcs/19100-19199.xml b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/stats/npcs/19100-19199.xml
index 74355c29e7..a2c4a719ba 100644
--- a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/stats/npcs/19100-19199.xml
+++ b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/stats/npcs/19100-19199.xml
@@ -1972,7 +1972,7 @@
-
+
diff --git a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/stats/npcs/25700-25799.xml b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/stats/npcs/25700-25799.xml
index a389412159..104b989a96 100644
--- a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/stats/npcs/25700-25799.xml
+++ b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/stats/npcs/25700-25799.xml
@@ -5325,7 +5325,7 @@
-
+
@@ -5662,7 +5662,7 @@
-
+
@@ -6398,7 +6398,7 @@
-
+
@@ -6462,6 +6462,7 @@
+
@@ -6557,7 +6558,6 @@
-
@@ -6667,6 +6667,7 @@
+
@@ -6762,7 +6763,6 @@
-
diff --git a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/stats/npcs/25800-25899.xml b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/stats/npcs/25800-25899.xml
index f8d8b82536..10522c54ed 100644
--- a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/stats/npcs/25800-25899.xml
+++ b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/stats/npcs/25800-25899.xml
@@ -57,7 +57,7 @@
-
+
@@ -204,7 +204,7 @@
-
+
@@ -1453,7 +1453,7 @@
-
+
@@ -1585,6 +1585,7 @@
+
@@ -2236,6 +2237,7 @@
+
@@ -2327,6 +2329,7 @@
+
@@ -2410,6 +2413,7 @@
+
@@ -2496,6 +2500,7 @@
+
@@ -2583,6 +2588,7 @@
+
@@ -2675,7 +2681,7 @@
-
+
@@ -2716,7 +2722,7 @@
-
+
@@ -2820,7 +2826,7 @@
-
+
@@ -2925,6 +2931,7 @@
+
@@ -3019,6 +3026,7 @@
+
@@ -3100,7 +3108,7 @@
-
+
@@ -3258,7 +3266,7 @@
-
+
@@ -3642,7 +3650,7 @@
-
+
@@ -3698,7 +3706,7 @@
-
+
@@ -3751,7 +3759,7 @@
-
+
@@ -4133,7 +4141,7 @@
-
+
@@ -4291,7 +4299,7 @@
-
+
@@ -4655,7 +4663,7 @@
-
+
@@ -5910,7 +5918,7 @@
-
+
diff --git a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/stats/npcs/29000-29099.xml b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/stats/npcs/29000-29099.xml
index 0ceb4ea59b..c8378d1300 100644
--- a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/stats/npcs/29000-29099.xml
+++ b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/stats/npcs/29000-29099.xml
@@ -1437,7 +1437,7 @@
-
+
@@ -3676,7 +3676,7 @@
-
+
diff --git a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/stats/npcs/29100-29199.xml b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/stats/npcs/29100-29199.xml
index 2b0ae389e3..ee0245bd95 100644
--- a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/stats/npcs/29100-29199.xml
+++ b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/stats/npcs/29100-29199.xml
@@ -3420,7 +3420,7 @@
-
+
@@ -3949,7 +3949,7 @@
-
+
@@ -3988,7 +3988,7 @@
-
+
@@ -4028,7 +4028,7 @@
-
+
@@ -4070,7 +4070,7 @@
-
+
@@ -4211,7 +4211,7 @@
-
+
@@ -4369,7 +4369,7 @@
-
+
@@ -4524,7 +4524,7 @@
-
+
@@ -4672,7 +4672,7 @@
-
+
@@ -4718,7 +4718,7 @@
-
+
diff --git a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/stats/npcs/29200-29299.xml b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/stats/npcs/29200-29299.xml
index e3f7a314b3..756af348b1 100644
--- a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/stats/npcs/29200-29299.xml
+++ b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/stats/npcs/29200-29299.xml
@@ -25,7 +25,7 @@
-
+
@@ -71,7 +71,7 @@
-
+
@@ -116,7 +116,7 @@
-
+
@@ -160,7 +160,7 @@
-
+
@@ -204,7 +204,7 @@
-
+
@@ -249,7 +249,7 @@
-
+
@@ -293,7 +293,7 @@
-
+
@@ -334,7 +334,7 @@
-
+
@@ -375,7 +375,7 @@
-
+
@@ -416,7 +416,7 @@
-
+
@@ -457,7 +457,7 @@
-
+
@@ -497,7 +497,7 @@
-
+
@@ -540,7 +540,7 @@
-
+
@@ -693,7 +693,7 @@
-
+
@@ -999,7 +999,7 @@
-
+
@@ -1186,7 +1186,7 @@
-
+
@@ -1227,7 +1227,7 @@
-
+
@@ -1267,7 +1267,7 @@
-
+
@@ -1318,7 +1318,7 @@
-
+
@@ -1542,7 +1542,7 @@
-
+
@@ -1665,7 +1665,7 @@
-
+
@@ -1748,7 +1748,7 @@
-
+
@@ -1796,7 +1796,7 @@
-
+
@@ -1844,7 +1844,7 @@
-
+
@@ -1884,7 +1884,7 @@
-
+
@@ -1992,7 +1992,7 @@
-
+
@@ -2100,7 +2100,7 @@
-
+
@@ -2139,7 +2139,7 @@
-
+
diff --git a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/xsd/npcs.xsd b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/xsd/npcs.xsd
index 4555d46531..6f00944cff 100644
--- a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/xsd/npcs.xsd
+++ b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/xsd/npcs.xsd
@@ -200,6 +200,7 @@
+
diff --git a/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/gameserver/data/xml/impl/SkillTreesData.java b/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/gameserver/data/xml/impl/SkillTreesData.java
index 5d2bd7a033..4b35d8bca8 100644
--- a/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/gameserver/data/xml/impl/SkillTreesData.java
+++ b/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/gameserver/data/xml/impl/SkillTreesData.java
@@ -689,7 +689,7 @@ public final class SkillTreesData implements IGameXmlReader
return result;
}
- final boolean isAwaken = player.isInCategory(CategoryType.AWAKEN_GROUP) && ((player.getRace() != Race.ERTHEIA) || player.isDualClassActive());
+ final boolean isAwaken = player.isInCategory(CategoryType.SIXTH_CLASS_GROUP) && ((player.getRace() != Race.ERTHEIA) || player.isDualClassActive());
for (Entry entry : skills.entrySet())
{
@@ -803,7 +803,7 @@ public final class SkillTreesData implements IGameXmlReader
}
final Race race = player.getRace();
- final boolean isAwaken = player.isInCategory(CategoryType.AWAKEN_GROUP);
+ final boolean isAwaken = player.isInCategory(CategoryType.SIXTH_CLASS_GROUP);
// Race skills
if (isAwaken)
diff --git a/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/gameserver/enums/CategoryType.java b/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/gameserver/enums/CategoryType.java
index c2e14659cd..3619287373 100644
--- a/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/gameserver/enums/CategoryType.java
+++ b/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/gameserver/enums/CategoryType.java
@@ -32,6 +32,17 @@ public enum CategoryType
SECOND_CLASS_GROUP,
THIRD_CLASS_GROUP,
FOURTH_CLASS_GROUP,
+ EQUIP_ENABLE_R,
+ FIFTH_CLASS_GROUP,
+ SIXTH_CLASS_GROUP,
+ SIXTH_SIGEL_GROUP,
+ SIXTH_TIR_GROUP,
+ SIXTH_OTHEL_GROUP,
+ SIXTH_YR_GROUP,
+ SIXTH_FEOH_GROUP,
+ SIXTH_IS_GROUP,
+ SIXTH_WYNN_GROUP,
+ SIXTH_EOLH_GROUP,
BOUNTY_HUNTER_GROUP,
WARSMITH_GROUP,
SUMMON_NPC_GROUP,
@@ -142,30 +153,158 @@ public enum CategoryType
RECOM_KAMAEL_GROUP,
RECOM_ORCF_GROUP,
RECOM_ORCM_GROUP,
+ RECOM_ERTHEIAF_GROUP,
+ RECOM_ERTHEIAM_GROUP,
DEINONYCHUS_PET_GROUP,
BEASTFARM_BEAST,
BEASTFARM_INVADER,
ICEQUEEN_NPC,
- AWAKEN_GROUP,
- SHILENS_FOLLOWERS,
- SIGEL_CANDIDATE,
- TYRR_CANDIDATE,
- OTHELL_CANDIDATE,
- YUL_CANDIDATE,
- FEOH_CANDIDATE,
- ISS_CANDIDATE,
- WYNN_CANDIDATE,
- AEORE_CANDIDATE,
- EVISCERATOR_CANDIDATE,
- SAYHA_SEER_CANDIDATE,
- SIGEL_GROUP,
- TYRR_GROUP,
- OTHELL_GROUP,
- YUL_GROUP,
- FEOH_GROUP,
- ISS_GROUP,
- WYNN_GROUP,
- AEORE_GROUP;
+ FAIRY_PC_SIDE,
+ FAIRY_WISP,
+ FAIRY_GLIMMER,
+ TANKER_CATEGORY,
+ WARRIOR_CATEGORY,
+ ROGUE_CATEGORY,
+ ARCHER_CATEGORY,
+ WIZARD_CATEGORY,
+ SUMMONER_CATEGORY,
+ HEALER_CATEGORY,
+ ENCHANTER_CATEGORY,
+ RUMBLE_MONSTERS,
+ RUMBLE_GUARDIANS,
+ TWO_POINT_MULTI_SUMMON,
+ APM_ZERO_WARRIOR_GROUP,
+ APM_ZERO_MAGE_GROUP,
+ APM_1ST_KNIGHT_GROUP,
+ APM_1ST_WARRIOR_GROUP,
+ APM_1ST_WIZARD_GROUP,
+ APM_1ST_HEALER_GROUP,
+ APM_2ND_KNIGHT_GROUP,
+ APM_2ND_WARRIOR_GROUP,
+ APM_2ND_ROGUE_GROUP,
+ APM_2ND_WIZARD_GROUP,
+ APM_2ND_ARCHER_GROUP,
+ APM_2ND_BUFFER_GROUP,
+ APM_2ND_SUMMONER_GROUP,
+ APM_2ND_ONLY_GROUP,
+ APM_3RD_KNIGHT_GROUP,
+ APM_3RD_WARRIOR_GROUP,
+ APM_3RD_ROGUE_GROUP,
+ APM_3RD_WIZARD_GROUP,
+ APM_3RD_ARCHER_GROUP,
+ APM_3RD_BUFFER_GROUP,
+ APM_3RD_SUMMONER_GROUP,
+ APM_3RD_ONLY_GROUP,
+ SUBCLASS_TANKER,
+ SUBCLASS_WARRIOR,
+ SUBCLASS_ROUGE,
+ SUBCLASS_ARCHER,
+ SUBCLASS_WIZARD,
+ SUBCLASS_SUMMON,
+ SUBCLASS_HEAL,
+ SUBCLASS_ENCHANTER,
+ SUBCLASS_SPEACIAL,
+ SUBCLASS_KAMAEL,
+ EXCEPT_KAMAEL_GROUP,
+ R_HUMANMAGE_GROUP,
+ R_HUMANFIGHTER_GROUP,
+ DIVISION_TANKER,
+ DIVISION_WARRIOR,
+ DIVISION_ROUGE,
+ DIVISION_ARCHER,
+ DIVISION_WIZARD,
+ DIVISION_SUMMON,
+ DIVISION_ENCHANTER,
+ DIVISION_HEAL,
+ HUMAN_FOURTH_CLASS_GROUP,
+ ELF_FOURTH_CLASS_GROUP,
+ DARKELF_FOURTH_CLASS_GROUP,
+ ORC_FOURTH_CLASS_GROUP,
+ DWARF_FOURTH_CLASS_GROUP,
+ FOURTH_LANCE_CLASS_GROUP,
+ FOURTH_BOW_CLASS_GROUP,
+ EQUIP_ENABLE_HEAVY_ATTACK,
+ EQUIP_ENABLE_HEAVY_DEFENSE,
+ EQUIP_ENABLE_LIGHT_HIT,
+ EQUIP_ENABLE_LIGHT_ENCHANT,
+ EQUIP_ENABLE_ROBE_MAGIC,
+ EQUIP_ENABLE_ROBE_RECOVERY,
+ DILLER_GROUP,
+ MAESTRO_GROUP,
+ MAESTRO_GROUP_CRAFT,
+ SUB_GROUP_WARRIOR2,
+ SUB_GROUP_ROGUE2,
+ SUB_GROUP_KNIGHT2,
+ SUB_GROUP_SUMMONER2,
+ SUB_GROUP_WIZARD2,
+ SUB_GROUP_HEALER2,
+ SUB_GROUP_ENCHANTER2,
+ G_CARTIA_PC_GROUP,
+ G_CARTIA_NPC_GROUP,
+ HEAVY_GROUP,
+ LIGHT_GROUP,
+ ROBE_GROUP,
+ M_WARRIOR_GROUP,
+ PHYSICS_CLASS_GROUP,
+ HEATSAND_SUMMON_CLASS_GROUP,
+ MAGIC_CLASS_GROUP,
+ LONG_DISTANCE_CLASS_GROUP,
+ CLOSE_DISTANCE_CLASS_GROUP,
+ HS_WIZARD_CLASS_GROUP,
+ HS_WARRIOR_CLASS_GROUP,
+ SUBCLASS_PALADIN,
+ SUBCLASS_DARKAVENGER,
+ SUBCLASS_TEMPLEKNIGHT,
+ SUBCLASS_SHILLIENKNIGHT,
+ SUBCLASS_GLADIATOR,
+ SUBCLASS_WARLORD,
+ SUBCLASS_DESTROYER,
+ SUBCLASS_TYRAN,
+ SUBCLASS_BERSERKER,
+ SUBCLASS_TREASUREHUNTER,
+ SUBCLASS_PLAINSWALKER,
+ SUBCLASS_ABYSSWALKER,
+ SUBCLASS_BOUNTYHUNTER,
+ SUBCLASS_HAWKEYE,
+ SUBCLASS_SILVERRANGER,
+ SUBCLASS_PHANTOMRANGER,
+ SUBCLASS_ARBALESTER,
+ SUBCLASS_SORCERER,
+ SUBCLASS_NECROMANCER,
+ SUBCLASS_SPELLSINGER,
+ SUBCLASS_SPELLHOWLER,
+ SUBCLASS_SOULBREAKER,
+ SUBCLASS_WARLOCK,
+ SUBCLASS_ELEMENTALSUMMONER,
+ SUBCLASS_PHANTOMSUMMONER,
+ SUBCLASS_BISHOP,
+ SUBCLASS_ELDER,
+ SUBCLASS_SHILLIENELDER,
+ SUBCLASS_PROPHET,
+ SUBCLASS_SWORDSINGER,
+ SUBCLASS_BLADEDANCER,
+ SUBCLASS_WARCRYER,
+ SUBCLASS_INSPECTOR,
+ WINDREFINE_ERTHEIA_GROUP,
+ WINDREFINE_ERTHEIA_GROUP1,
+ WINDREFINE_ERTHEIA_GROUP2,
+ ERTHEIA_ALL_CLASS,
+ ERTHEIA_FIRST_CLASS_GROUP,
+ ERTHEIA_SECOND_CLASS_GROUP,
+ ERTHEIA_THIRD_CLASS_GROUP,
+ ERTHEIA_FOURTH_CLASS_GROUP,
+ ERTHEIA_WIZARD_GROUP,
+ ERTHEIA_FIGHTER_GROUP,
+ ERTHEIA_THIRD_WIZARD_GROUP,
+ ERTHEIA_THIRD_FIGHTER_GROUP,
+ VANGUARD_OF_ADEN_FCC,
+ COMMON_MONSTER_FCC,
+ EQEIP_ENABLE_LHAND,
+ G_EV_MON_MINIGAME,
+ HEAVY_ARMOR_CLASS,
+ LIGHT_ARMOR_CLASS,
+ ROBE_CLASS,
+ EXCEPT_ERTHEIA_CLASS;
/**
* Finds category by it's name
diff --git a/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/gameserver/instancemanager/CeremonyOfChaosManager.java b/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/gameserver/instancemanager/CeremonyOfChaosManager.java
index 536650197b..7133977526 100644
--- a/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/gameserver/instancemanager/CeremonyOfChaosManager.java
+++ b/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/gameserver/instancemanager/CeremonyOfChaosManager.java
@@ -288,7 +288,7 @@ public class CeremonyOfChaosManager extends AbstractEventManager HERO_IDS = CategoryData.getInstance().getCategoryByType(CategoryType.AWAKEN_GROUP);
+ private static final Set HERO_IDS = CategoryData.getInstance().getCategoryByType(CategoryType.SIXTH_CLASS_GROUP);
private static final int COMP_START = Config.ALT_OLY_START_TIME; // 6PM
private static final int COMP_MIN = Config.ALT_OLY_MIN; // 00 mins
diff --git a/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/gameserver/model/zone/type/L2SayuneZone.java b/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/gameserver/model/zone/type/L2SayuneZone.java
index 0872062a68..ca1ec6ed1a 100644
--- a/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/gameserver/model/zone/type/L2SayuneZone.java
+++ b/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/gameserver/model/zone/type/L2SayuneZone.java
@@ -56,7 +56,7 @@ public class L2SayuneZone extends L2ZoneType
@Override
protected void onEnter(L2Character character)
{
- if (character.isPlayer() && (character.isInCategory(CategoryType.AWAKEN_GROUP) || Config.FREE_JUMPS_FOR_ALL) && !character.getActingPlayer().isMounted() && !character.isTransformed())
+ if (character.isPlayer() && (character.isInCategory(CategoryType.SIXTH_CLASS_GROUP) || Config.FREE_JUMPS_FOR_ALL) && !character.getActingPlayer().isMounted() && !character.isTransformed())
{
character.setInsideZone(ZoneId.SAYUNE, true);
ThreadPoolManager.execute(new FlyMoveStartTask(this, character.getActingPlayer()));
diff --git a/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/gameserver/network/clientpackets/RequestAcquireSkill.java b/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/gameserver/network/clientpackets/RequestAcquireSkill.java
index 5533d14129..9d97309efc 100644
--- a/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/gameserver/network/clientpackets/RequestAcquireSkill.java
+++ b/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/gameserver/network/clientpackets/RequestAcquireSkill.java
@@ -417,7 +417,7 @@ public final class RequestAcquireSkill implements IClientIncomingPacket
Util.handleIllegalPlayerAction(activeChar, "Player " + activeChar.getName() + " is requesting skill Id: " + _id + " level " + _level + " while Sub-Class is active!", IllegalActionPunishmentType.NONE);
return;
}
- if ((activeChar.getLevel() < 85) || !activeChar.isInCategory(CategoryType.AWAKEN_GROUP))
+ if ((activeChar.getLevel() < 85) || !activeChar.isInCategory(CategoryType.SIXTH_CLASS_GROUP))
{
activeChar.sendPacket(SystemMessageId.YOU_DO_NOT_HAVE_THE_NECESSARY_MATERIALS_OR_PREREQUISITES_TO_LEARN_THIS_SKILL);
Util.handleIllegalPlayerAction(activeChar, "Player " + activeChar.getName() + " is requesting skill Id: " + _id + " level " + _level + " while not being level 85 or awaken!", IllegalActionPunishmentType.NONE);
@@ -460,7 +460,7 @@ public final class RequestAcquireSkill implements IClientIncomingPacket
return;
}
- if ((activeChar.getLevel() < 85) || !activeChar.isInCategory(CategoryType.AWAKEN_GROUP))
+ if ((activeChar.getLevel() < 85) || !activeChar.isInCategory(CategoryType.SIXTH_CLASS_GROUP))
{
activeChar.sendPacket(SystemMessageId.YOU_DO_NOT_HAVE_THE_NECESSARY_MATERIALS_OR_PREREQUISITES_TO_LEARN_THIS_SKILL);
Util.handleIllegalPlayerAction(activeChar, "Player " + activeChar.getName() + " is requesting skill Id: " + _id + " level " + _level + " while not being level 85 or awaken!", IllegalActionPunishmentType.NONE);
diff --git a/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/gameserver/network/clientpackets/RequestAcquireSkillInfo.java b/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/gameserver/network/clientpackets/RequestAcquireSkillInfo.java
index 642b423b4b..6ceb8bc736 100644
--- a/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/gameserver/network/clientpackets/RequestAcquireSkillInfo.java
+++ b/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/gameserver/network/clientpackets/RequestAcquireSkillInfo.java
@@ -150,7 +150,7 @@ public final class RequestAcquireSkillInfo implements IClientIncomingPacket
}
case REVELATION:
{
- if ((activeChar.getLevel() < 85) || !activeChar.isInCategory(CategoryType.AWAKEN_GROUP))
+ if ((activeChar.getLevel() < 85) || !activeChar.isInCategory(CategoryType.SIXTH_CLASS_GROUP))
{
return;
}
diff --git a/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/gameserver/network/clientpackets/RequestExEnchantSkill.java b/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/gameserver/network/clientpackets/RequestExEnchantSkill.java
index 69d688bf34..c6547395b2 100644
--- a/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/gameserver/network/clientpackets/RequestExEnchantSkill.java
+++ b/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/gameserver/network/clientpackets/RequestExEnchantSkill.java
@@ -82,7 +82,7 @@ public final class RequestExEnchantSkill implements IClientIncomingPacket
return;
}
- if (!player.isInCategory(CategoryType.AWAKEN_GROUP))
+ if (!player.isInCategory(CategoryType.SIXTH_CLASS_GROUP))
{
return;
}
diff --git a/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/gameserver/network/clientpackets/RequestExEnchantSkillInfo.java b/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/gameserver/network/clientpackets/RequestExEnchantSkillInfo.java
index 596bc37bae..6c175300cf 100644
--- a/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/gameserver/network/clientpackets/RequestExEnchantSkillInfo.java
+++ b/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/gameserver/network/clientpackets/RequestExEnchantSkillInfo.java
@@ -61,7 +61,7 @@ public final class RequestExEnchantSkillInfo implements IClientIncomingPacket
return;
}
- if (!activeChar.isInCategory(CategoryType.AWAKEN_GROUP))
+ if (!activeChar.isInCategory(CategoryType.SIXTH_CLASS_GROUP))
{
return;
}
diff --git a/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/gameserver/network/clientpackets/mentoring/ConfirmMenteeAdd.java b/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/gameserver/network/clientpackets/mentoring/ConfirmMenteeAdd.java
index ec5e7516a8..0c907de10f 100644
--- a/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/gameserver/network/clientpackets/mentoring/ConfirmMenteeAdd.java
+++ b/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/gameserver/network/clientpackets/mentoring/ConfirmMenteeAdd.java
@@ -115,7 +115,7 @@ public class ConfirmMenteeAdd implements IClientIncomingPacket
mentor.sendPacket(SystemMessageId.THAT_PLAYER_IS_NOT_ONLINE);
return false;
}
- else if (!mentor.isInCategory(CategoryType.AWAKEN_GROUP))
+ else if (!mentor.isInCategory(CategoryType.SIXTH_CLASS_GROUP))
{
mentor.sendPacket(SystemMessageId.YOU_MUST_AWAKEN_IN_ORDER_TO_BECOME_A_MENTOR);
return false;
diff --git a/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/gameserver/network/clientpackets/sayune/RequestFlyMoveStart.java b/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/gameserver/network/clientpackets/sayune/RequestFlyMoveStart.java
index 4ddb30ba78..50b48de960 100644
--- a/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/gameserver/network/clientpackets/sayune/RequestFlyMoveStart.java
+++ b/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/gameserver/network/clientpackets/sayune/RequestFlyMoveStart.java
@@ -44,7 +44,7 @@ public class RequestFlyMoveStart implements IClientIncomingPacket
public void run(L2GameClient client)
{
final L2PcInstance activeChar = client.getActiveChar();
- if ((activeChar == null) || !activeChar.isInsideZone(ZoneId.SAYUNE) || activeChar.hasRequest(SayuneRequest.class) || !activeChar.isInCategory(CategoryType.AWAKEN_GROUP))
+ if ((activeChar == null) || !activeChar.isInsideZone(ZoneId.SAYUNE) || activeChar.hasRequest(SayuneRequest.class) || !activeChar.isInCategory(CategoryType.SIXTH_CLASS_GROUP))
{
return;
}
diff --git a/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/gameserver/network/serverpackets/mentoring/ExMentorList.java b/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/gameserver/network/serverpackets/mentoring/ExMentorList.java
index 81e7216e87..bfd2044055 100644
--- a/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/gameserver/network/serverpackets/mentoring/ExMentorList.java
+++ b/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/gameserver/network/serverpackets/mentoring/ExMentorList.java
@@ -48,7 +48,7 @@ public class ExMentorList implements IClientOutgoingPacket
_type = 0x02;
_mentees = Arrays.asList(MentorManager.getInstance().getMentor(activeChar.getObjectId()));
}
- else if (activeChar.isInCategory(CategoryType.AWAKEN_GROUP)) // Not a mentor, Not a mentee, so can be a mentor
+ else if (activeChar.isInCategory(CategoryType.SIXTH_CLASS_GROUP)) // Not a mentor, Not a mentee, so can be a mentor
{
_mentees = Collections.emptyList();
_type = 0x01;
diff --git a/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/gameserver/network/serverpackets/mentoring/ListMenteeWaiting.java b/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/gameserver/network/serverpackets/mentoring/ListMenteeWaiting.java
index 97226c02a6..3bd29141b5 100644
--- a/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/gameserver/network/serverpackets/mentoring/ListMenteeWaiting.java
+++ b/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/gameserver/network/serverpackets/mentoring/ListMenteeWaiting.java
@@ -40,7 +40,7 @@ public class ListMenteeWaiting implements IClientOutgoingPacket
_page = page;
for (L2PcInstance player : L2World.getInstance().getPlayers())
{
- if ((player.getLevel() >= minLevel) && (player.getLevel() <= maxLevel) && !player.isMentee() && !player.isMentor() && !player.isInCategory(CategoryType.AWAKEN_GROUP))
+ if ((player.getLevel() >= minLevel) && (player.getLevel() <= maxLevel) && !player.isMentee() && !player.isMentor() && !player.isInCategory(CategoryType.SIXTH_CLASS_GROUP))
{
_possibleCandiates.add(player);
}
diff --git a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/CategoryData.xml b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/CategoryData.xml
index b4958b1379..a92e1c68c7 100644
--- a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/CategoryData.xml
+++ b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/CategoryData.xml
@@ -1,72 +1,77 @@
- 0
- 1
- 2
- 3
- 4
- 5
- 6
- 7
- 8
- 9
- 18
- 19
- 20
- 21
- 22
- 23
- 24
- 31
- 32
- 33
- 34
- 35
- 36
- 37
- 44
- 45
- 46
- 47
- 48
- 53
- 54
- 55
- 56
- 57
- 88
- 89
- 90
- 91
- 92
- 93
- 99
- 100
- 101
- 102
- 106
- 107
- 108
- 109
- 113
- 114
- 117
- 118
- 123
- 124
- 125
- 126
- 127
- 128
- 129
- 130
- 131
- 132
- 133
- 134
- 135
- 136
+ 0
+ 1
+ 2
+ 3
+ 4
+ 5
+ 6
+ 7
+ 8
+ 9
+ 18
+ 19
+ 20
+ 21
+ 22
+ 23
+ 24
+ 31
+ 32
+ 33
+ 34
+ 35
+ 36
+ 37
+ 44
+ 45
+ 46
+ 47
+ 48
+ 53
+ 54
+ 55
+ 56
+ 57
+ 88
+ 89
+ 90
+ 91
+ 92
+ 93
+ 99
+ 100
+ 101
+ 102
+ 106
+ 107
+ 108
+ 109
+ 113
+ 114
+ 117
+ 118
+ 123
+ 124
+ 125
+ 126
+ 127
+ 128
+ 129
+ 130
+ 131
+ 132
+ 133
+ 134
+ 135
+ 136
+ 139
+ 140
+ 141
+ 142
+ 144
148
149
150
@@ -85,49 +90,465 @@
163
164
165
+ 171
+ 172
+ 173
+ 174
+ 175
182
184
186
188
- 10
- 11
- 12
- 13
- 14
- 15
- 16
- 17
- 25
- 26
- 27
- 28
- 29
- 30
- 38
- 39
- 40
- 41
- 42
- 43
- 49
- 50
- 51
- 52
- 94
- 95
- 96
- 97
- 98
- 103
- 104
- 105
- 110
- 111
- 112
- 115
- 116
+ 10
+ 11
+ 12
+ 13
+ 14
+ 15
+ 16
+ 17
+ 25
+ 26
+ 27
+ 28
+ 29
+ 30
+ 38
+ 39
+ 40
+ 41
+ 42
+ 43
+ 49
+ 50
+ 51
+ 52
+ 94
+ 95
+ 96
+ 97
+ 98
+ 103
+ 104
+ 105
+ 110
+ 111
+ 112
+ 115
+ 116
+ 143
+ 145
+ 146
+ 166
+ 167
+ 168
+ 169
+ 170
+ 176
+ 177
+ 178
+ 179
+ 180
+ 181
+ 183
+ 185
+ 187
+ 189
+
+
+ 10
+ 11
+ 12
+ 13
+ 14
+ 25
+ 26
+ 27
+ 28
+ 38
+ 39
+ 40
+ 41
+ 94
+ 95
+ 96
+ 103
+ 104
+ 110
+ 111
+ 49
+ 50
+ 51
+ 52
+ 115
+ 116
+ 143
+ 145
+ 166
+ 167
+ 168
+ 169
+ 170
+ 176
+ 177
+ 178
+ 183
+ 185
+ 187
+ 189
+
+
+ 10
+ 15
+ 16
+ 17
+ 25
+ 29
+ 30
+ 38
+ 42
+ 43
+ 97
+ 98
+ 105
+ 146
+ 179
+ 180
+ 181
+
+
+ 0
+ 1
+ 2
+ 3
+ 7
+ 8
+ 9
+ 18
+ 22
+ 23
+ 24
+ 31
+ 35
+ 36
+ 37
+ 44
+ 45
+ 46
+ 47
+ 48
+ 53
+ 88
+ 89
+ 93
+ 92
+ 102
+ 101
+ 108
+ 109
+ 113
+ 114
+ 123
+ 124
+ 125
+ 126
+ 127
+ 128
+ 129
+ 130
+ 135
+ 131
+ 132
+ 133
+ 134
+ 136
+ 140
+ 141
+ 142
+ 144
+ 152
+ 153
+ 154
+ 155
+ 156
+ 157
+ 158
+ 159
+ 160
+ 161
+ 162
+ 163
+ 164
+ 165
+ 171
+ 172
+ 173
+ 174
+ 175
+ 182
+ 184
+ 186
+ 188
+
+
+ 4
+ 5
+ 6
+ 90
+ 91
+ 19
+ 20
+ 99
+ 32
+ 33
+ 106
+ 54
+ 56
+ 55
+ 57
+ 117
+ 118
+ 139
+ 148
+ 149
+ 150
+ 151
+
+
+ 0
+ 10
+ 18
+ 25
+ 31
+ 38
+ 44
+ 49
+ 53
+ 123
+ 124
+ 182
+ 183
+
+
+ 1
+ 4
+ 7
+ 11
+ 15
+ 19
+ 22
+ 26
+ 29
+ 32
+ 35
+ 39
+ 42
+ 45
+ 47
+ 50
+ 54
+ 56
+ 125
+ 126
+
+
+ 2
+ 3
+ 5
+ 6
+ 8
+ 9
+ 12
+ 13
+ 14
+ 16
+ 17
+ 20
+ 21
+ 23
+ 24
+ 27
+ 28
+ 30
+ 33
+ 34
+ 36
+ 37
+ 40
+ 41
+ 43
+ 46
+ 48
+ 51
+ 52
+ 55
+ 57
+ 127
+ 128
+ 129
+ 130
+ 135
+ 184
+ 185
+
+
+ 88
+ 89
+ 90
+ 91
+ 92
+ 93
+ 94
+ 95
+ 96
+ 97
+ 98
+ 99
+ 100
+ 101
+ 102
+ 103
+ 104
+ 105
+ 106
+ 107
+ 108
+ 109
+ 110
+ 111
+ 112
+ 113
+ 114
+ 115
+ 116
+ 117
+ 118
+ 131
+ 132
+ 133
+ 134
+ 136
+ 186
+ 187
+
+
+ 0
+ 10
+ 18
+ 25
+ 31
+ 38
+ 44
+ 49
+ 53
+ 1
+ 4
+ 7
+ 11
+ 15
+ 19
+ 22
+ 26
+ 29
+ 32
+ 35
+ 39
+ 42
+ 45
+ 47
+ 50
+ 54
+ 56
+ 2
+ 3
+ 5
+ 6
+ 8
+ 9
+ 12
+ 13
+ 14
+ 16
+ 17
+ 20
+ 21
+ 23
+ 24
+ 27
+ 28
+ 30
+ 33
+ 34
+ 36
+ 37
+ 40
+ 41
+ 43
+ 46
+ 48
+ 51
+ 52
+ 55
+ 57
+ 88
+ 89
+ 90
+ 91
+ 92
+ 93
+ 94
+ 95
+ 96
+ 97
+ 98
+ 99
+ 100
+ 101
+ 102
+ 103
+ 104
+ 105
+ 106
+ 107
+ 108
+ 109
+ 110
+ 111
+ 112
+ 113
+ 114
+ 115
+ 116
+ 117
+ 118
+ 139
+ 140
+ 141
+ 142
+ 143
+ 144
+ 145
+ 146
+ 148
+ 149
+ 150
+ 151
+ 152
+ 153
+ 154
+ 155
+ 156
+ 157
+ 158
+ 159
+ 160
+ 161
+ 162
+ 163
+ 164
+ 165
166
167
168
@@ -144,2396 +565,26 @@
179
180
181
+ 182
+ 184
+ 186
+ 188
183
185
- 187
+ 187
189
-
- 10
- 11
- 12
- 13
- 14
- 25
- 26
- 27
- 28
- 38
- 39
- 40
- 41
- 94
- 95
- 96
- 103
- 104
- 110
- 111
- 49
- 50
- 51
- 52
- 115
- 116
- 166
- 167
- 168
- 169
- 170
- 176
- 177
- 178
- 183
-
-
- 10
- 15
- 16
- 17
- 25
- 29
- 30
- 38
- 42
- 43
- 97
- 98
- 105
- 179
- 180
- 181
-
-
- 0
- 1
- 2
- 3
- 7
- 8
- 9
- 18
- 22
- 23
- 24
- 31
- 35
- 36
- 37
- 44
- 45
- 46
- 47
- 48
- 53
- 88
- 89
- 93
- 92
- 102
- 101
- 108
- 109
- 113
- 114
- 123
- 124
- 125
- 126
- 127
- 128
- 129
- 130
- 135
- 131
- 132
- 133
- 134
- 136
- 152
- 153
- 154
- 155
- 156
- 157
- 158
- 159
- 160
- 161
- 162
- 163
- 164
- 165
-
-
- 4
- 5
- 6
- 90
- 91
- 19
- 20
- 99
- 32
- 33
- 106
- 54
- 56
- 55
- 57
- 117
- 118
- 148
- 149
- 150
- 151
-
-
- 0
- 10
- 18
- 25
- 31
- 38
- 44
- 49
- 53
- 123
- 124
- 182
- 183
-
-
- 1
- 4
- 7
- 11
- 15
- 19
- 22
- 26
- 29
- 32
- 35
- 39
- 42
- 45
- 47
- 50
- 54
- 56
- 125
- 126
-
-
- 2
- 3
- 5
- 6
- 8
- 9
- 12
- 13
- 14
- 16
- 17
- 20
- 21
- 23
- 24
- 27
- 28
- 30
- 33
- 34
- 36
- 37
- 40
- 41
- 43
- 46
- 48
- 51
- 52
- 55
- 57
- 127
- 128
- 129
- 130
- 135
- 184
- 185
-
-
- 88
- 89
- 90
- 91
- 92
- 93
- 94
- 95
- 96
- 97
- 98
- 99
- 100
- 101
- 102
- 103
- 104
- 105
- 106
- 107
- 108
- 109
- 110
- 111
- 112
- 113
- 114
- 115
- 116
- 117
- 118
- 131
- 132
- 133
- 134
- 136
- 186
- 187
-
-
- 53
- 54
- 55
- 117
- 161
-
-
- 53
- 56
- 57
- 118
- 156
-
-
- 14001
- 14002
- 14003
- 14004
- 14005
- 14006
- 14007
- 14008
- 14009
- 14010
- 14011
- 14012
- 14013
- 14014
- 14015
- 14016
- 14017
- 14018
- 14019
- 14020
- 14021
- 14022
- 14023
- 14024
- 14025
- 14026
- 14027
- 14028
- 14029
- 14030
- 14031
- 14032
- 14033
- 14034
- 14035
- 14036
- 14037
- 14038
- 14039
- 14040
- 14041
- 14042
- 14043
- 14044
- 14045
- 14046
- 14047
- 14048
- 14049
- 14050
- 14051
- 14052
- 14053
- 14054
- 14055
- 14056
- 14057
- 14058
- 14059
- 14060
- 14061
- 14062
- 14063
- 14064
- 14065
- 14066
- 14067
- 14068
- 14069
- 14070
- 14071
- 14072
- 14073
- 14074
- 14075
- 14076
- 14077
- 14078
- 14079
- 14080
- 14081
- 14082
- 14083
- 14084
- 14085
- 14086
- 14087
- 14088
- 14089
- 14090
- 14091
- 14092
- 14093
- 14094
- 14095
- 14096
- 14097
- 14098
- 14099
- 14100
- 14101
- 14102
- 14103
- 14104
- 14105
- 14106
- 14107
- 14108
- 14109
- 14110
- 14111
- 14112
- 14113
- 14114
- 14115
- 14116
- 14117
- 14118
- 14119
- 14120
- 14121
- 14122
- 14123
- 14124
- 14125
- 14126
- 14127
- 14128
- 14129
- 14130
- 14131
- 14132
- 14133
- 14134
- 14135
- 14136
- 14137
- 14138
- 14139
- 14140
- 14141
- 14142
- 14143
- 14144
- 14145
- 14146
- 14147
- 14148
- 14149
- 14150
- 14151
- 14152
- 14153
- 14154
- 14155
- 14156
- 14157
- 14158
- 14159
- 14160
- 14161
- 14162
- 14163
- 14164
- 14165
- 14166
- 14167
- 14168
- 14169
- 14170
- 14171
- 14172
- 14173
- 14174
- 14175
- 14176
- 14177
- 14178
- 14179
- 14180
- 14181
- 14182
- 14183
- 14184
- 14185
- 14186
- 14187
- 14188
- 14189
- 14190
- 14191
- 14192
- 14193
- 14194
- 14195
- 14196
- 14197
- 14198
- 14199
- 14200
- 14201
- 14202
- 14203
- 14204
- 14205
- 14206
- 14207
- 14208
- 14209
- 14210
- 14211
- 14212
- 14213
- 14214
- 14215
- 14216
- 14217
- 14218
- 14219
- 14220
- 14221
- 14222
- 14223
- 14224
- 14225
- 14226
- 14227
- 14228
- 14229
- 14230
- 14231
- 14232
- 14233
- 14234
- 14235
- 14236
- 14237
- 14238
- 14239
- 14240
- 14241
- 14242
- 14243
- 14244
- 14245
- 14246
- 14247
- 14248
- 14249
- 14250
- 14251
- 14252
- 14253
- 14254
- 14255
- 14256
- 14257
- 14258
- 14259
- 14260
- 14265
- 14266
- 14267
- 14268
- 14269
- 14270
- 14271
- 14272
- 14273
- 14274
- 14275
- 14276
- 14277
- 14278
- 14279
- 14280
- 14281
- 14282
- 14283
- 14284
- 14285
- 14286
- 14287
- 14288
- 14289
- 14290
- 14291
- 14292
- 14293
- 14294
- 14295
- 14296
- 14297
- 14298
- 14299
- 14300
- 14301
- 14302
- 14303
- 14304
- 14305
- 14306
- 14307
- 14308
- 14309
- 14310
- 14311
- 14312
- 14313
- 14314
- 14315
- 14316
- 14317
- 14318
- 14319
- 14320
- 14321
- 14322
- 14323
- 14324
- 14325
- 14326
- 14327
- 14328
- 14329
- 14330
- 14331
- 14332
- 14333
- 14334
- 14335
- 14336
- 14337
- 14338
- 14339
- 14340
- 14341
- 14342
- 14343
- 14344
- 14345
- 14346
- 14347
- 14348
- 14349
- 14350
- 14351
- 14352
- 14353
- 14354
- 14355
- 14356
- 14357
- 14358
- 14359
- 14360
- 14361
- 14362
- 14363
- 14364
- 14365
- 14366
- 14367
- 14368
- 14369
- 14370
- 14371
- 14372
- 14373
- 14374
- 14375
- 14376
- 14377
- 14378
- 14379
- 14380
- 14381
- 14382
- 14383
- 14384
- 14385
- 14386
- 14387
- 14388
- 14389
- 14390
- 14391
- 14392
- 14393
- 14394
- 14395
- 14396
- 14397
- 14398
- 14399
- 14400
- 14401
- 14402
- 14403
- 14404
- 14405
- 14406
- 14407
- 14408
- 14409
- 14410
- 14411
- 14412
- 14413
- 14414
- 14415
- 14416
- 14417
- 14418
- 14419
- 14420
- 14421
- 14422
- 14423
- 14424
- 14425
- 14426
- 14427
- 14428
- 14429
- 14430
- 14431
- 14432
- 14433
- 14434
- 14435
- 14436
- 14437
- 14438
- 14439
- 14440
- 14441
- 14442
- 14443
- 14444
- 14449
- 14450
- 14451
- 14452
- 14453
- 14454
- 14455
- 14456
- 14457
- 14458
- 14459
- 14460
- 14461
- 14462
- 14463
- 14464
- 14465
- 14466
- 14467
- 14468
- 14469
- 14470
- 14471
- 14472
- 14473
- 14474
- 14475
- 14476
- 14477
- 14478
- 14479
- 14480
- 14481
- 14482
- 14483
- 14484
- 14485
- 14486
- 14487
- 14488
- 14489
- 14490
- 14491
- 14492
- 14493
- 14494
- 14495
- 14496
- 14497
- 14498
- 14499
- 14500
- 14501
- 14502
- 14503
- 14504
- 14505
- 14506
- 14507
- 14508
- 14509
- 14510
- 14511
- 14512
- 14513
- 14514
- 14515
- 14516
- 14517
- 14518
- 14519
- 14520
- 14521
- 14522
- 14523
- 14524
- 14525
- 14526
- 14527
- 14528
- 14529
- 14530
- 14531
- 14532
- 14533
- 14534
- 14535
- 14536
- 14537
- 14538
- 14539
- 14540
- 14541
- 14542
- 14543
- 14544
- 14545
- 14546
- 14547
- 14548
- 14549
- 14550
- 14551
- 14552
- 14553
- 14554
- 14555
- 14556
- 14557
- 14558
- 14559
- 14560
- 14561
- 14562
- 14563
- 14564
- 14565
- 14566
- 14567
- 14568
- 14569
- 14570
- 14571
- 14572
- 14573
- 14574
- 14575
- 14576
- 14577
- 14578
- 14579
- 14580
- 14581
- 14582
- 14583
- 14584
- 14585
- 14586
- 14587
- 14588
- 14589
- 14590
- 14591
- 14592
- 14593
- 14594
- 14595
- 14596
- 14597
- 14598
- 14599
- 14600
- 14601
- 14602
- 14603
- 14604
- 14605
- 14606
- 14607
- 14608
- 14609
- 14610
- 14611
- 14612
- 14613
- 14614
- 14615
- 14616
- 14617
- 14618
- 14619
- 14620
- 14621
- 14622
- 14623
- 14624
- 14625
- 14626
- 14627
- 14628
- 14633
- 14634
- 14635
- 14636
- 14637
- 14638
- 14639
- 14640
- 14641
- 14642
- 14643
- 14644
- 14645
- 14646
- 14647
- 14648
- 14649
- 14650
- 14651
- 14652
- 14653
- 14654
- 14655
- 14656
- 14657
- 14658
- 14659
- 14660
- 14661
- 14662
- 14663
- 14664
- 14665
- 14666
- 14667
- 14668
- 14669
- 14670
- 14671
- 14672
- 14673
- 14674
- 14675
- 14676
- 14677
- 14678
- 14679
- 14680
- 14681
- 14682
- 14683
- 14684
- 14685
- 14686
- 14687
- 14688
- 14689
- 14690
- 14691
- 14692
- 14693
- 14694
- 14695
- 14696
- 14697
- 14698
- 14699
- 14700
- 14701
- 14702
- 14703
- 14704
- 14705
- 14706
- 14707
- 14708
- 14709
- 14710
- 14711
- 14712
- 14713
- 14714
- 14715
- 14716
- 14717
- 14718
- 14719
- 14720
- 14721
- 14722
- 14723
- 14724
- 14725
- 14726
- 14727
- 14728
- 14729
- 14730
- 14731
- 14732
- 14733
- 14734
- 14735
- 14736
- 14737
- 14738
- 14739
- 14740
- 14741
- 14742
- 14743
- 14744
- 14745
- 14746
- 14747
- 14748
- 14749
- 14750
- 14751
- 14752
- 14753
- 14754
- 14755
- 14756
- 14757
- 14758
- 14759
- 14760
- 14761
- 14762
- 14763
- 14764
- 14765
- 14766
- 14767
- 14768
- 14769
- 14770
- 14771
- 14772
- 14773
- 14774
- 14775
- 14776
- 14777
- 14778
- 14779
- 14780
- 14781
- 14782
- 14783
- 14784
- 14785
- 14786
- 14787
- 14788
- 14789
- 14790
- 14791
- 14792
- 14793
- 14794
- 14795
- 14796
- 14797
- 14798
- 14799
- 14800
- 14801
- 14802
- 14803
- 14804
- 14805
- 14806
- 14807
- 14808
- 14809
- 14810
- 14811
- 14812
- 14813
- 14814
- 14815
- 14816
- 14817
- 14818
- 14819
- 14820
- 14821
- 14822
- 14823
- 14824
- 14825
- 14826
- 14827
- 14828
- 14829
- 14830
- 14831
- 14832
- 14833
- 14834
- 14835
- 14836
- 14837
- 14838
- 14839
- 14840
- 14841
- 14842
- 14843
- 14844
- 14845
- 14846
- 14847
- 14848
- 14849
- 14850
- 14851
- 14852
- 14853
- 14854
- 14855
- 14856
- 14857
- 14858
- 14859
- 14860
- 14861
- 14862
- 14863
- 14864
- 14865
- 14866
- 14867
- 14868
- 14869
- 12077
- 12311
- 12312
- 12313
- 12526
- 12527
- 12528
- 12564
- 12621
- 12780
- 12781
- 12782
- 16025
- 13071
- 13072
- 13073
- 13074
- 13075
- 13076
- 14870
- 14871
- 14872
- 14873
- 14874
- 14875
- 14876
- 14877
- 14878
- 14879
- 14880
- 14881
- 14882
- 14883
- 14884
- 14885
- 14886
- 14887
- 14888
- 14889
- 14890
- 14891
- 14892
- 14893
- 14894
- 14895
- 14896
- 14897
- 14898
- 14899
- 14900
- 14901
- 14902
- 14903
- 14904
- 14905
- 14906
- 14907
- 14908
- 14909
- 14910
- 14911
- 14912
- 14913
- 14914
- 14915
- 16030
- 16034
- 16035
- 16036
- 16037
- 16038
- 16039
- 16040
- 16041
- 16042
- 16043
- 16044
- 16045
- 16046
- 14916
- 14917
- 14918
- 16050
- 16051
- 16052
- 16053
- 16067
- 16068
- 16071
- 16072
-
-
- 4
- 19
- 32
-
-
- 15
- 29
- 5
- 19
- 4
-
-
- 15
- 29
- 42
- 50
-
-
- 15
- 42
-
-
- 1
- 19
- 32
- 45
- 47
-
-
- 1
- 4
- 7
- 11
- 15
-
-
- 22
- 19
- 26
- 29
-
-
- 35
- 32
- 39
- 42
-
-
- 50
- 45
- 47
-
-
- 54
- 56
-
-
- 12526
- 12527
- 12528
- 16038
- 16039
- 16040
- 16068
-
-
- 12526
- 12527
- 12528
-
-
- 16038
- 16039
- 16040
- 16068
-
-
- 16030
- 16037
- 16041
- 16042
-
-
- 16025
- 16030
- 16037
- 16041
- 16042
-
-
- 12311
- 12312
- 12313
-
-
- 12780
- 12781
- 12782
-
-
- 16034
- 16035
- 16036
-
-
- 12621
-
-
- 12077
- 16025
- 16030
- 16037
- 16041
- 16042
-
-
- 12077
-
-
- 12564
-
-
- 12077
- 12311
- 12312
- 12313
- 12526
- 12527
- 12528
- 12780
- 12781
- 12782
- 16025
- 16030
- 16034
- 16035
- 16036
- 16037
- 16038
- 16039
- 16040
- 16041
- 16042
- 16043
- 16044
- 16045
- 16046
- 16050
- 16051
- 16052
- 16053
- 16067
- 16068
- 16071
- 16072
- 1561
- 1538
- 1562
- 1563
- 1564
- 1565
- 1566
- 1567
- 1568
- 1569
- 1570
- 1571
- 1572
- 1573
-
-
- 12077
- 12311
- 12312
- 12313
- 12526
- 12527
- 12528
- 12780
- 12781
- 12782
- 16025
- 16030
- 16034
- 16035
- 16036
- 16037
- 16038
- 16039
- 16040
- 16041
- 16042
- 16068
- 16067
- 16071
- 16072
- 1561
-
-
- 8
- 23
- 36
- 93
- 101
- 108
-
-
- 9
- 24
- 37
- 92
- 102
- 109
-
-
- 5
- 6
- 33
- 20
- 90
- 91
- 106
- 99
-
-
- 14
- 28
- 41
- 96
- 104
- 111
-
-
- 30
- 43
- 105
- 112
-
-
- 21
- 34
- 100
- 107
-
-
- 12
- 27
- 40
- 94
- 103
- 110
-
-
- 0
- 1
- 4
- 7
- 2
- 3
- 5
- 6
- 8
- 9
- 88
- 89
- 90
- 91
- 92
- 93
-
-
- 10
- 11
- 12
- 13
- 14
- 94
- 95
- 96
-
-
- 10
- 11
- 12
- 13
- 14
- 10
- 15
- 16
- 17
- 95
- 96
- 97
- 98
-
-
- 10
- 15
- 16
- 17
- 97
- 98
-
-
- 18
- 19
- 22
- 20
- 21
- 23
- 24
- 99
- 100
- 101
- 102
-
-
- 25
- 26
- 27
- 28
- 25
- 29
- 30
- 103
- 104
- 105
-
-
- 25
- 26
- 27
- 28
- 103
- 104
-
-
- 25
- 29
- 30
- 105
-
-
- 31
- 32
- 35
- 33
- 34
- 36
- 37
- 106
- 107
- 108
- 109
-
-
- 38
- 39
- 42
- 40
- 41
- 43
- 110
- 111
- 112
-
-
- 38
- 39
- 40
- 41
- 110
- 111
-
-
- 38
- 42
- 43
- 112
-
-
- 44
- 45
- 47
- 46
- 48
- 113
- 114
-
-
- 49
- 50
- 51
- 52
- 115
- 116
-
-
- 53
- 54
- 56
- 55
- 57
- 117
- 118
-
-
- 53
- 54
- 55
- 117
-
-
- 53
- 56
- 57
- 118
-
-
- 123
- 124
- 125
- 126
- 127
- 128
- 129
- 130
- 131
- 132
- 133
- 134
- 135
- 136
-
-
- 123
- 124
-
-
- 125
- 126
-
-
- 127
- 128
- 129
- 130
- 135
-
-
- 131
- 132
- 133
- 134
- 136
-
-
- 0
- 1
- 2
- 3
- 4
- 5
- 6
- 7
- 8
- 9
- 18
- 19
- 20
- 21
- 22
- 23
- 24
- 31
- 32
- 33
- 34
- 35
- 36
- 37
- 44
- 45
- 46
- 47
- 48
- 49
- 50
- 51
- 52
- 53
- 54
- 55
- 56
- 57
- 123
- 124
- 125
- 126
- 127
- 128
- 129
- 130
- 135
-
-
- 10
- 11
- 12
- 13
- 14
- 15
- 16
- 17
- 25
- 26
- 27
- 28
- 29
- 30
- 38
- 39
- 40
- 41
- 42
- 43
-
-
- 123
- 125
- 127
- 128
- 131
- 132
- 129
- 133
- 135
- 136
-
-
- 124
- 126
- 129
- 130
- 133
- 134
- 128
- 132
- 135
- 136
-
-
- 9
- 24
- 37
- 92
- 102
- 109
-
-
- 90
- 91
- 99
- 106
-
-
- 100
- 107
-
-
- 88
- 114
-
-
- 89
- 113
- 117
- 118
- 131
- 132
- 133
-
-
- 92
- 102
- 109
- 134
-
-
- 93
- 101
- 108
- 117
- 158
- 159
- 160
- 161
-
-
- 97
- 105
- 112
-
-
- 94
- 103
- 110
- 95
-
-
- 98
- 115
- 116
- 136
-
-
- 96
- 104
- 111
-
-
- 90
- 91
- 99
- 106
- 100
- 107
- 88
- 114
- 89
- 113
- 117
- 118
-
-
- 92
- 102
- 109
- 134
- 93
- 101
- 108
-
-
- 97
- 105
- 112
- 94
- 103
- 110
- 95
- 98
- 115
- 116
- 136
- 96
- 104
- 111
-
-
- 20
- 33
- 5
- 6
- 90
- 91
- 99
- 106
-
-
- 21
- 34
- 100
- 107
-
-
- 48
- 2
- 88
- 114
-
-
- 3
- 127
- 128
- 129
- 46
- 55
- 57
- 89
- 113
- 117
- 118
- 131
- 132
- 133
-
-
- 24
- 130
- 37
- 9
- 92
- 102
- 109
- 134
-
-
- 36
- 23
- 8
- 93
- 101
- 108
-
-
- 16
- 30
- 43
- 97
- 105
- 112
-
-
- 27
- 40
- 12
- 13
- 94
- 103
- 110
- 95
-
-
- 135
- 17
- 51
- 52
- 98
- 115
- 116
- 136
-
-
- 14
- 28
- 41
- 96
- 104
- 111
-
-
- 14
- 28
- 41
- 96
- 104
- 111
-
-
- 3
- 127
- 128
- 129
- 46
- 55
- 57
- 48
- 2
- 89
- 131
- 113
- 117
- 118
- 132
- 133
- 114
- 88
-
-
- 8
- 23
- 36
- 93
- 101
- 108
- 9
- 24
- 37
- 92
- 102
- 109
- 130
- 134
-
-
- 5
- 6
- 33
- 20
- 90
- 91
- 106
- 99
-
-
- 14
- 28
- 41
- 96
- 104
- 111
-
-
- 12
- 27
- 40
- 13
- 94
- 103
- 110
- 95
-
-
- 16
- 30
- 43
- 97
- 105
- 112
-
-
- 17
- 51
- 52
- 21
- 34
- 135
- 98
- 115
- 116
- 100
- 107
- 136
-
-
- 16
- 30
- 97
- 105
- 17
- 98
-
-
- 12
- 94
- 27
- 103
- 13
- 95
- 14
- 96
- 28
- 104
-
-
- 2
- 88
- 3
- 89
- 5
- 90
- 6
- 91
- 8
- 93
- 9
- 92
- 20
- 99
- 21
- 100
- 23
- 101
- 24
- 102
-
-
- 46
- 113
- 48
- 114
- 51
- 115
- 52
- 116
-
-
- 55
- 117
-
-
- 57
- 118
-
-
- 36
- 108
- 37
- 109
- 33
- 106
- 41
- 111
- 40
- 110
- 43
- 112
- 34
- 107
-
-
- 127
- 131
- 128
- 132
- 129
- 133
- 135
- 136
- 130
- 134
-
-
- 5
- 20
- 90
- 99
-
-
- 6
- 33
- 91
- 106
-
-
- 0
- 1
- 2
- 3
- 4
- 5
- 6
- 7
- 8
- 18
- 19
- 20
- 21
- 22
- 23
- 31
- 32
- 33
- 34
- 35
- 36
- 44
- 45
- 46
- 47
- 48
- 53
- 54
- 55
- 56
- 57
- 88
- 89
- 90
- 91
- 93
- 99
- 100
- 101
- 106
- 107
- 108
- 113
- 114
- 117
- 118
- 123
- 124
- 125
- 126
- 127
- 128
- 129
- 131
- 132
- 133
- 135
- 136
-
-
- 4
- 5
- 6
- 19
- 32
- 20
- 21
- 33
- 34
- 90
- 91
- 99
- 100
- 106
- 107
-
-
- 11
- 15
- 26
- 29
- 39
- 42
- 12
- 13
- 14
- 16
- 17
- 27
- 28
- 30
- 40
- 41
- 43
- 94
- 95
- 96
- 97
- 98
- 103
- 104
- 105
- 110
- 111
- 112
-
-
- 1
- 2
- 3
- 54
- 56
- 55
- 57
- 117
- 118
- 88
- 89
-
-
- 7
- 22
- 35
- 8
- 9
- 23
- 24
- 36
- 37
- 92
- 93
- 101
- 102
- 108
- 109
-
-
- 125
- 126
- 127
- 128
- 129
- 130
- 135
- 131
- 132
- 133
- 134
- 136
-
-
- 45
- 47
- 46
- 48
- 113
- 114
-
-
- 50
- 51
- 52
- 115
- 116
-
-
- 16067
- 16071
- 16072
-
-
- 18869
- 18870
- 18871
- 18872
- 18873
- 18874
- 18875
- 18876
- 18877
- 18878
- 18879
- 18880
- 18881
- 18882
- 18883
- 18884
- 18885
- 18886
- 18887
- 18888
- 18889
- 18890
- 18891
- 18892
- 18893
- 18894
- 18895
- 18896
- 18897
- 18898
- 18899
- 18900
- 18901
- 18902
- 18903
- 18904
-
-
- 18905
- 18906
- 18907
-
-
- 18850
- 18851
- 18852
-
-
+
+ 139
+ 140
+ 141
+ 142
+ 143
+ 144
+ 145
+ 146
+
+
148
149
150
@@ -2571,99 +622,13 @@
188
189
-
- 25867
- 25868
- 19160
- 19172
- 25796
- 25881
- 25797
- 25799
- 29179
- 29180
- 25876
- 25877
- 29194
- 29212
- 29195
- 29196
- 29218
- 29213
- 25837
- 25840
- 25845
- 25841
- 25838
- 25839
- 25846
- 25825
- 29068
-
-
- 90
- 91
- 99
- 106
-
-
- 88
- 89
- 131
- 113
- 118
- 114
-
-
- 93
- 101
- 108
- 117
-
-
- 92
- 102
- 109
- 134
-
-
- 94
- 95
- 103
- 110
- 132
- 133
-
-
- 98
- 115
- 116
- 100
- 107
-
-
- 96
- 104
- 111
-
-
- 97
- 105
- 112
-
-
- 186
-
-
- 187
-
-
+
148
149
150
151
-
+
152
153
154
@@ -2671,40 +636,5098 @@
156
157
-
+
158
159
160
161
-
+
162
163
164
165
-
+
166
167
168
169
170
-
+
171
172
173
174
175
-
+
176
177
178
-
+
179
180
181
+
+ 53
+ 54
+ 55
+ 117
+ 161
+
+
+ 53
+ 56
+ 57
+ 118
+ 156
+
+
+ 14001
+ 14002
+ 14003
+ 14004
+ 14005
+ 14006
+ 14007
+ 14008
+ 14009
+ 14010
+ 14011
+ 14012
+ 14013
+ 14014
+ 14015
+ 14016
+ 14017
+ 14018
+ 14019
+ 14020
+ 14021
+ 14022
+ 14023
+ 14024
+ 14025
+ 14026
+ 14027
+ 14028
+ 14029
+ 14030
+ 14031
+ 14032
+ 14033
+ 14034
+ 14035
+ 14036
+ 14037
+ 14038
+ 14039
+ 14040
+ 14041
+ 14042
+ 14043
+ 14044
+ 14045
+ 14046
+ 14047
+ 14048
+ 14049
+ 14050
+ 14051
+ 14052
+ 14053
+ 14054
+ 14055
+ 14056
+ 14057
+ 14058
+ 14059
+ 14060
+ 14061
+ 14062
+ 14063
+ 14064
+ 14065
+ 14066
+ 14067
+ 14068
+ 14069
+ 14070
+ 14071
+ 14072
+ 14073
+ 14074
+ 14075
+ 14076
+ 14077
+ 14078
+ 14079
+ 14080
+ 14081
+ 14082
+ 14083
+ 14084
+ 14085
+ 14086
+ 14087
+ 14088
+ 14089
+ 14090
+ 14091
+ 14092
+ 14093
+ 14094
+ 14095
+ 14096
+ 14097
+ 14098
+ 14099
+ 14100
+ 14101
+ 14102
+ 14103
+ 14104
+ 14105
+ 14106
+ 14107
+ 14108
+ 14109
+ 14110
+ 14111
+ 14112
+ 14113
+ 14114
+ 14115
+ 14116
+ 14117
+ 14118
+ 14119
+ 14120
+ 14121
+ 14122
+ 14123
+ 14124
+ 14125
+ 14126
+ 14127
+ 14128
+ 14129
+ 14130
+ 14131
+ 14132
+ 14133
+ 14134
+ 14135
+ 14136
+ 14137
+ 14138
+ 14139
+ 14140
+ 14141
+ 14142
+ 14143
+ 14144
+ 14145
+ 14146
+ 14147
+ 14148
+ 14149
+ 14150
+ 14151
+ 14152
+ 14153
+ 14154
+ 14155
+ 14156
+ 14157
+ 14158
+ 14159
+ 14160
+ 14161
+ 14162
+ 14163
+ 14164
+ 14165
+ 14166
+ 14167
+ 14168
+ 14169
+ 14170
+ 14171
+ 14172
+ 14173
+ 14174
+ 14175
+ 14176
+ 14177
+ 14178
+ 14179
+ 14180
+ 14181
+ 14182
+ 14183
+ 14184
+ 14185
+ 14186
+ 14187
+ 14188
+ 14189
+ 14190
+ 14191
+ 14192
+ 14193
+ 14194
+ 14195
+ 14196
+ 14197
+ 14198
+ 14199
+ 14200
+ 14201
+ 14202
+ 14203
+ 14204
+ 14205
+ 14206
+ 14207
+ 14208
+ 14209
+ 14210
+ 14211
+ 14212
+ 14213
+ 14214
+ 14215
+ 14216
+ 14217
+ 14218
+ 14219
+ 14220
+ 14221
+ 14222
+ 14223
+ 14224
+ 14225
+ 14226
+ 14227
+ 14228
+ 14229
+ 14230
+ 14231
+ 14232
+ 14233
+ 14234
+ 14235
+ 14236
+ 14237
+ 14238
+ 14239
+ 14240
+ 14241
+ 14242
+ 14243
+ 14244
+ 14245
+ 14246
+ 14247
+ 14248
+ 14249
+ 14250
+ 14251
+ 14252
+ 14253
+ 14254
+ 14255
+ 14256
+ 14257
+ 14258
+ 14259
+ 14260
+ 14265
+ 14266
+ 14267
+ 14268
+ 14269
+ 14270
+ 14271
+ 14272
+ 14273
+ 14274
+ 14275
+ 14276
+ 14277
+ 14278
+ 14279
+ 14280
+ 14281
+ 14282
+ 14283
+ 14284
+ 14285
+ 14286
+ 14287
+ 14288
+ 14289
+ 14290
+ 14291
+ 14292
+ 14293
+ 14294
+ 14295
+ 14296
+ 14297
+ 14298
+ 14299
+ 14300
+ 14301
+ 14302
+ 14303
+ 14304
+ 14305
+ 14306
+ 14307
+ 14308
+ 14309
+ 14310
+ 14311
+ 14312
+ 14313
+ 14314
+ 14315
+ 14316
+ 14317
+ 14318
+ 14319
+ 14320
+ 14321
+ 14322
+ 14323
+ 14324
+ 14325
+ 14326
+ 14327
+ 14328
+ 14329
+ 14330
+ 14331
+ 14332
+ 14333
+ 14334
+ 14335
+ 14336
+ 14337
+ 14338
+ 14339
+ 14340
+ 14341
+ 14342
+ 14343
+ 14344
+ 14345
+ 14346
+ 14347
+ 14348
+ 14349
+ 14350
+ 14351
+ 14352
+ 14353
+ 14354
+ 14355
+ 14356
+ 14357
+ 14358
+ 14359
+ 14360
+ 14361
+ 14362
+ 14363
+ 14364
+ 14365
+ 14366
+ 14367
+ 14368
+ 14369
+ 14370
+ 14371
+ 14372
+ 14373
+ 14374
+ 14375
+ 14376
+ 14377
+ 14378
+ 14379
+ 14380
+ 14381
+ 14382
+ 14383
+ 14384
+ 14385
+ 14386
+ 14387
+ 14388
+ 14389
+ 14390
+ 14391
+ 14392
+ 14393
+ 14394
+ 14395
+ 14396
+ 14397
+ 14398
+ 14399
+ 14400
+ 14401
+ 14402
+ 14403
+ 14404
+ 14405
+ 14406
+ 14407
+ 14408
+ 14409
+ 14410
+ 14411
+ 14412
+ 14413
+ 14414
+ 14415
+ 14416
+ 14417
+ 14418
+ 14419
+ 14420
+ 14421
+ 14422
+ 14423
+ 14424
+ 14425
+ 14426
+ 14427
+ 14428
+ 14429
+ 14430
+ 14431
+ 14432
+ 14433
+ 14434
+ 14435
+ 14436
+ 14437
+ 14438
+ 14439
+ 14440
+ 14441
+ 14442
+ 14443
+ 14444
+ 14449
+ 14450
+ 14451
+ 14452
+ 14453
+ 14454
+ 14455
+ 14456
+ 14457
+ 14458
+ 14459
+ 14460
+ 14461
+ 14462
+ 14463
+ 14464
+ 14465
+ 14466
+ 14467
+ 14468
+ 14469
+ 14470
+ 14471
+ 14472
+ 14473
+ 14474
+ 14475
+ 14476
+ 14477
+ 14478
+ 14479
+ 14480
+ 14481
+ 14482
+ 14483
+ 14484
+ 14485
+ 14486
+ 14487
+ 14488
+ 14489
+ 14490
+ 14491
+ 14492
+ 14493
+ 14494
+ 14495
+ 14496
+ 14497
+ 14498
+ 14499
+ 14500
+ 14501
+ 14502
+ 14503
+ 14504
+ 14505
+ 14506
+ 14507
+ 14508
+ 14509
+ 14510
+ 14511
+ 14512
+ 14513
+ 14514
+ 14515
+ 14516
+ 14517
+ 14518
+ 14519
+ 14520
+ 14521
+ 14522
+ 14523
+ 14524
+ 14525
+ 14526
+ 14527
+ 14528
+ 14529
+ 14530
+ 14531
+ 14532
+ 14533
+ 14534
+ 14535
+ 14536
+ 14537
+ 14538
+ 14539
+ 14540
+ 14541
+ 14542
+ 14543
+ 14544
+ 14545
+ 14546
+ 14547
+ 14548
+ 14549
+ 14550
+ 14551
+ 14552
+ 14553
+ 14554
+ 14555
+ 14556
+ 14557
+ 14558
+ 14559
+ 14560
+ 14561
+ 14562
+ 14563
+ 14564
+ 14565
+ 14566
+ 14567
+ 14568
+ 14569
+ 14570
+ 14571
+ 14572
+ 14573
+ 14574
+ 14575
+ 14576
+ 14577
+ 14578
+ 14579
+ 14580
+ 14581
+ 14582
+ 14583
+ 14584
+ 14585
+ 14586
+ 14587
+ 14588
+ 14589
+ 14590
+ 14591
+ 14592
+ 14593
+ 14594
+ 14595
+ 14596
+ 14597
+ 14598
+ 14599
+ 14600
+ 14601
+ 14602
+ 14603
+ 14604
+ 14605
+ 14606
+ 14607
+ 14608
+ 14609
+ 14610
+ 14611
+ 14612
+ 14613
+ 14614
+ 14615
+ 14616
+ 14617
+ 14618
+ 14619
+ 14620
+ 14621
+ 14622
+ 14623
+ 14624
+ 14625
+ 14626
+ 14627
+ 14628
+ 14633
+ 14634
+ 14635
+ 14636
+ 14637
+ 14638
+ 14639
+ 14640
+ 14641
+ 14642
+ 14643
+ 14644
+ 14645
+ 14646
+ 14647
+ 14648
+ 14649
+ 14650
+ 14651
+ 14652
+ 14653
+ 14654
+ 14655
+ 14656
+ 14657
+ 14658
+ 14659
+ 14660
+ 14661
+ 14662
+ 14663
+ 14664
+ 14665
+ 14666
+ 14667
+ 14668
+ 14669
+ 14670
+ 14671
+ 14672
+ 14673
+ 14674
+ 14675
+ 14676
+ 14677
+ 14678
+ 14679
+ 14680
+ 14681
+ 14682
+ 14683
+ 14684
+ 14685
+ 14686
+ 14687
+ 14688
+ 14689
+ 14690
+ 14691
+ 14692
+ 14693
+ 14694
+ 14695
+ 14696
+ 14697
+ 14698
+ 14699
+ 14700
+ 14701
+ 14702
+ 14703
+ 14704
+ 14705
+ 14706
+ 14707
+ 14708
+ 14709
+ 14710
+ 14711
+ 14712
+ 14713
+ 14714
+ 14715
+ 14716
+ 14717
+ 14718
+ 14719
+ 14720
+ 14721
+ 14722
+ 14723
+ 14724
+ 14725
+ 14726
+ 14727
+ 14728
+ 14729
+ 14730
+ 14731
+ 14732
+ 14733
+ 14734
+ 14735
+ 14736
+ 14737
+ 14738
+ 14739
+ 14740
+ 14741
+ 14742
+ 14743
+ 14744
+ 14745
+ 14746
+ 14747
+ 14748
+ 14749
+ 14750
+ 14751
+ 14752
+ 14753
+ 14754
+ 14755
+ 14756
+ 14757
+ 14758
+ 14759
+ 14760
+ 14761
+ 14762
+ 14763
+ 14764
+ 14765
+ 14766
+ 14767
+ 14768
+ 14769
+ 14770
+ 14771
+ 14772
+ 14773
+ 14774
+ 14775
+ 14776
+ 14777
+ 14778
+ 14779
+ 14780
+ 14781
+ 14782
+ 14783
+ 14784
+ 14785
+ 14786
+ 14787
+ 14788
+ 14789
+ 14790
+ 14791
+ 14792
+ 14793
+ 14794
+ 14795
+ 14796
+ 14797
+ 14798
+ 14799
+ 14800
+ 14801
+ 14802
+ 14803
+ 14804
+ 14805
+ 14806
+ 14807
+ 14808
+ 14809
+ 14810
+ 14811
+ 14812
+ 14813
+ 14814
+ 14815
+ 14816
+ 14817
+ 14818
+ 14819
+ 14820
+ 14821
+ 14822
+ 14823
+ 14824
+ 14825
+ 14826
+ 14827
+ 14828
+ 14829
+ 14830
+ 14831
+ 14832
+ 14833
+ 14834
+ 14835
+ 14836
+ 14837
+ 14838
+ 14839
+ 14840
+ 14841
+ 14842
+ 14843
+ 14844
+ 14845
+ 14846
+ 14847
+ 14848
+ 14849
+ 14850
+ 14851
+ 14852
+ 14853
+ 14854
+ 14855
+ 14856
+ 14857
+ 14858
+ 14859
+ 14860
+ 14861
+ 14862
+ 14863
+ 14864
+ 14865
+ 14866
+ 14867
+ 14868
+ 14869
+ 12077
+ 12311
+ 12312
+ 12313
+ 12526
+ 12527
+ 12528
+ 12564
+ 12621
+ 12780
+ 12781
+ 12782
+ 16025
+ 13071
+ 13072
+ 13073
+ 13074
+ 13075
+ 13076
+ 14870
+ 14871
+ 14872
+ 14873
+ 14874
+ 14875
+ 14876
+ 14877
+ 14878
+ 14879
+ 14880
+ 14881
+ 14882
+ 14883
+ 14884
+ 14885
+ 14886
+ 14887
+ 14888
+ 14889
+ 14890
+ 14891
+ 14892
+ 14893
+ 14894
+ 14895
+ 14896
+ 14897
+ 14898
+ 14899
+ 14900
+ 14901
+ 14902
+ 14903
+ 14904
+ 14905
+ 14906
+ 14907
+ 14908
+ 14909
+ 14910
+ 14911
+ 14912
+ 14913
+ 14914
+ 14915
+ 16030
+ 16034
+ 16035
+ 16036
+ 16037
+ 16038
+ 16039
+ 16040
+ 16041
+ 16042
+ 16043
+ 16044
+ 16045
+ 16046
+ 14916
+ 14917
+ 14918
+ 16050
+ 16051
+ 16052
+ 16053
+ 16067
+ 16068
+ 16071
+ 16072
+ 13302
+ 13303
+ 13304
+ 13305
+ 14929
+ 14930
+ 14931
+ 14947
+ 14948
+ 14949
+ 14950
+ 14951
+ 14952
+ 14953
+ 14954
+ 14955
+ 14956
+ 14957
+ 14958
+ 14959
+ 14960
+ 14961
+ 14962
+ 14963
+ 14964
+ 14965
+ 14966
+ 14967
+ 14926
+ 14932
+ 14940
+ 14941
+ 14942
+ 14986
+ 14987
+ 14988
+ 14989
+ 14990
+ 14991
+ 14992
+ 14993
+ 14994
+ 14995
+ 14996
+ 14997
+ 14998
+ 14999
+ 14936
+ 14937
+ 14938
+ 14939
+ 14974
+ 14975
+ 14976
+ 14977
+ 14978
+ 14979
+ 14980
+ 14981
+ 14982
+ 14983
+ 14984
+ 14985
+ 14933
+ 14943
+ 15010
+ 15011
+ 15012
+ 15013
+ 15014
+ 15015
+ 15016
+ 15017
+ 15018
+ 15019
+ 15020
+ 15021
+ 14925
+ 14944
+ 14945
+ 14946
+ 15000
+ 15001
+ 15002
+ 15003
+ 15004
+ 15005
+ 15006
+ 15007
+ 15008
+ 15009
+ 14968
+ 14969
+ 14970
+ 14927
+ 14928
+ 15022
+ 15023
+ 15024
+ 15025
+ 15026
+ 15027
+ 15028
+ 15029
+ 15030
+ 15031
+ 15032
+ 15033
+ 15034
+ 15035
+ 15036
+ 15037
+ 15038
+ 15039
+ 15040
+ 15041
+ 15042
+ 15043
+ 15044
+ 15045
+ 15046
+ 15047
+ 15048
+ 15049
+ 15050
+ 15051
+ 15053
+ 15054
+ 15055
+ 15056
+ 15057
+ 15058
+ 15059
+ 15060
+ 15061
+ 15062
+ 15063
+ 15064
+ 15065
+ 1562
+ 1563
+ 1564
+ 1565
+ 1566
+ 1567
+ 1568
+ 1569
+ 1570
+ 1571
+ 1572
+ 1573
+ 16094
+ 16095
+ 16096
+ 16097
+
+
+ 4
+ 19
+ 32
+
+
+ 15
+ 29
+ 5
+ 19
+ 4
+
+
+ 15
+ 29
+ 42
+ 50
+
+
+ 15
+ 42
+
+
+ 1
+ 19
+ 32
+ 45
+ 47
+
+
+ 1
+ 4
+ 7
+ 11
+ 15
+
+
+ 22
+ 19
+ 26
+ 29
+
+
+ 35
+ 32
+ 39
+ 42
+
+
+ 50
+ 45
+ 47
+
+
+ 54
+ 56
+
+
+ 12526
+ 12527
+ 12528
+ 16038
+ 16039
+ 16040
+ 16068
+
+
+ 12526
+ 12527
+ 12528
+
+
+ 16038
+ 16039
+ 16040
+ 16068
+
+
+ 16030
+ 16037
+ 16041
+ 16042
+
+
+ 16025
+ 16030
+ 16037
+ 16041
+ 16042
+
+
+ 12311
+ 12312
+ 12313
+
+
+ 12780
+ 12781
+ 12782
+
+
+ 16034
+ 16035
+ 16036
+
+
+ 12621
+
+
+ 12077
+ 16025
+ 16030
+ 16037
+ 16041
+ 16042
+
+
+ 12077
+
+
+ 12564
+
+
+ 12077
+ 12311
+ 12312
+ 12313
+ 12526
+ 12527
+ 12528
+ 12780
+ 12781
+ 12782
+ 16025
+ 16030
+ 16034
+ 16035
+ 16036
+ 16037
+ 16038
+ 16039
+ 16040
+ 16041
+ 16042
+ 16043
+ 16044
+ 16045
+ 16046
+ 16050
+ 16051
+ 16052
+ 16053
+ 16067
+ 16068
+ 16071
+ 16072
+ 1561
+ 1538
+ 1562
+ 1563
+ 1564
+ 1565
+ 1566
+ 1567
+ 1568
+ 1569
+ 1570
+ 1571
+ 1572
+ 1573
+ 16094
+ 16095
+ 16096
+ 16097
+
+
+ 12077
+ 12311
+ 12312
+ 12313
+ 12526
+ 12527
+ 12528
+ 12780
+ 12781
+ 12782
+ 16025
+ 16030
+ 16034
+ 16035
+ 16036
+ 16037
+ 16038
+ 16039
+ 16040
+ 16041
+ 16042
+ 16068
+ 16067
+ 16071
+ 16072
+ 1561
+
+
+ 8
+ 23
+ 36
+ 93
+ 101
+ 108
+
+
+ 9
+ 24
+ 37
+ 92
+ 102
+ 109
+
+
+ 5
+ 6
+ 33
+ 20
+ 90
+ 91
+ 106
+ 99
+
+
+ 14
+ 28
+ 41
+ 96
+ 104
+ 111
+
+
+ 30
+ 43
+ 105
+ 112
+
+
+ 21
+ 34
+ 100
+ 107
+
+
+ 12
+ 27
+ 40
+ 94
+ 103
+ 110
+
+
+ 0
+ 1
+ 4
+ 7
+ 2
+ 3
+ 5
+ 6
+ 8
+ 9
+ 88
+ 89
+ 90
+ 91
+ 92
+ 93
+ 152
+ 153
+ 148
+ 149
+ 162
+ 158
+
+
+ 10
+ 11
+ 12
+ 13
+ 14
+ 94
+ 95
+ 96
+ 166
+ 167
+ 176
+
+
+ 10
+ 11
+ 12
+ 13
+ 14
+ 10
+ 15
+ 16
+ 17
+ 95
+ 96
+ 97
+ 98
+ 167
+ 176
+ 179
+ 171
+
+
+ 10
+ 15
+ 16
+ 17
+ 97
+ 98
+ 179
+ 171
+
+
+ 18
+ 19
+ 22
+ 20
+ 21
+ 23
+ 24
+ 99
+ 100
+ 101
+ 102
+ 150
+ 172
+ 159
+ 163
+
+
+ 25
+ 26
+ 27
+ 28
+ 25
+ 29
+ 30
+ 103
+ 104
+ 105
+ 168
+ 177
+ 180
+
+
+ 25
+ 26
+ 27
+ 28
+ 103
+ 104
+ 168
+ 177
+
+
+ 25
+ 29
+ 30
+ 105
+ 180
+
+
+ 31
+ 32
+ 35
+ 33
+ 34
+ 36
+ 37
+ 106
+ 107
+ 108
+ 109
+ 151
+ 173
+ 160
+ 164
+
+
+ 38
+ 39
+ 42
+ 40
+ 41
+ 43
+ 110
+ 111
+ 112
+ 169
+ 178
+ 181
+
+
+ 38
+ 39
+ 40
+ 41
+ 110
+ 111
+ 169
+ 178
+
+
+ 38
+ 42
+ 43
+ 112
+ 181
+
+
+ 44
+ 45
+ 47
+ 46
+ 48
+ 113
+ 114
+ 154
+ 155
+
+
+ 49
+ 50
+ 51
+ 52
+ 115
+ 116
+ 174
+ 175
+
+
+ 53
+ 54
+ 56
+ 55
+ 57
+ 117
+ 118
+ 161
+ 156
+
+
+ 53
+ 54
+ 55
+ 117
+ 161
+
+
+ 53
+ 56
+ 57
+ 118
+ 156
+
+
+ 123
+ 124
+ 125
+ 126
+ 127
+ 128
+ 129
+ 130
+ 131
+ 132
+ 133
+ 134
+ 135
+ 136
+ 157
+ 165
+ 170
+
+
+ 123
+ 124
+
+
+ 125
+ 126
+
+
+ 127
+ 128
+ 129
+ 130
+ 135
+
+
+ 131
+ 132
+ 133
+ 134
+ 136
+
+
+ 0
+ 1
+ 2
+ 3
+ 4
+ 5
+ 6
+ 7
+ 8
+ 9
+ 18
+ 19
+ 20
+ 21
+ 22
+ 23
+ 24
+ 31
+ 32
+ 33
+ 34
+ 35
+ 36
+ 37
+ 44
+ 45
+ 46
+ 47
+ 48
+ 49
+ 50
+ 51
+ 52
+ 53
+ 54
+ 55
+ 56
+ 57
+ 123
+ 124
+ 125
+ 126
+ 127
+ 128
+ 129
+ 130
+ 135
+ 182
+ 184
+
+
+ 10
+ 11
+ 12
+ 13
+ 14
+ 15
+ 16
+ 17
+ 25
+ 26
+ 27
+ 28
+ 29
+ 30
+ 38
+ 39
+ 40
+ 41
+ 42
+ 43
+ 183
+ 185
+
+
+ 123
+ 125
+ 127
+ 128
+ 131
+ 132
+ 129
+ 133
+ 135
+ 136
+
+
+ 124
+ 126
+ 129
+ 130
+ 133
+ 134
+ 128
+ 132
+ 135
+ 136
+
+
+ 9
+ 24
+ 37
+ 92
+ 102
+ 109
+
+
+ 90
+ 91
+ 99
+ 106
+
+
+ 100
+ 107
+
+
+ 88
+ 114
+
+
+ 89
+ 113
+ 117
+ 118
+ 131
+ 132
+ 133
+
+
+ 92
+ 102
+ 109
+ 134
+
+
+ 93
+ 101
+ 108
+ 117
+ 141
+ 139
+ 140
+ 141
+ 142
+ 143
+ 144
+ 145
+ 146
+ 148
+ 149
+ 150
+ 151
+ 152
+ 153
+ 154
+ 155
+ 156
+ 157
+ 158
+ 159
+ 160
+ 161
+ 162
+ 163
+ 164
+ 165
+ 166
+ 167
+ 168
+ 169
+ 170
+ 171
+ 172
+ 173
+ 174
+ 175
+ 176
+ 177
+ 178
+ 179
+ 180
+ 181
+
+
+ 97
+ 105
+ 112
+
+
+ 94
+ 103
+ 110
+ 95
+
+
+ 98
+ 115
+ 116
+ 136
+
+
+ 96
+ 104
+ 111
+
+
+ 90
+ 91
+ 99
+ 106
+ 100
+ 107
+ 88
+ 114
+ 89
+ 113
+ 117
+ 118
+
+
+ 92
+ 102
+ 109
+ 134
+ 93
+ 101
+ 108
+
+
+ 97
+ 105
+ 112
+ 94
+ 103
+ 110
+ 95
+ 98
+ 115
+ 116
+ 136
+ 96
+ 104
+ 111
+
+
+ 20
+ 33
+ 5
+ 6
+ 90
+ 91
+ 99
+ 106
+ 143
+ 145
+ 146
+ 139
+ 140
+ 141
+ 142
+ 144
+ 166
+ 167
+ 168
+ 169
+ 170
+ 176
+ 177
+ 178
+ 179
+ 180
+ 181
+ 148
+ 149
+ 150
+ 151
+ 152
+ 153
+ 154
+ 155
+ 156
+ 157
+ 158
+ 159
+ 160
+ 161
+ 162
+ 163
+ 164
+ 165
+ 171
+ 172
+ 173
+ 174
+ 175
+
+
+ 21
+ 34
+ 100
+ 107
+ 143
+ 145
+ 146
+ 139
+ 140
+ 141
+ 142
+ 144
+ 166
+ 167
+ 168
+ 169
+ 170
+ 176
+ 177
+ 178
+ 179
+ 180
+ 181
+ 148
+ 149
+ 150
+ 151
+ 152
+ 153
+ 154
+ 155
+ 156
+ 157
+ 158
+ 159
+ 160
+ 161
+ 162
+ 163
+ 164
+ 165
+ 171
+ 172
+ 173
+ 174
+ 175
+
+
+ 48
+ 2
+ 88
+ 114
+ 143
+ 145
+ 146
+ 139
+ 140
+ 141
+ 142
+ 144
+ 166
+ 167
+ 168
+ 169
+ 170
+ 176
+ 177
+ 178
+ 179
+ 180
+ 181
+ 148
+ 149
+ 150
+ 151
+ 152
+ 153
+ 154
+ 155
+ 156
+ 157
+ 158
+ 159
+ 160
+ 161
+ 162
+ 163
+ 164
+ 165
+ 171
+ 172
+ 173
+ 174
+ 175
+
+
+ 3
+ 127
+ 128
+ 129
+ 46
+ 55
+ 57
+ 89
+ 113
+ 117
+ 118
+ 131
+ 132
+ 133
+ 143
+ 145
+ 146
+ 139
+ 140
+ 141
+ 142
+ 144
+ 166
+ 167
+ 168
+ 169
+ 170
+ 176
+ 177
+ 178
+ 179
+ 180
+ 181
+ 148
+ 149
+ 150
+ 151
+ 152
+ 153
+ 154
+ 155
+ 156
+ 157
+ 158
+ 159
+ 160
+ 161
+ 162
+ 163
+ 164
+ 165
+ 171
+ 172
+ 173
+ 174
+ 175
+
+
+ 24
+ 130
+ 37
+ 9
+ 92
+ 102
+ 109
+ 134
+ 143
+ 145
+ 146
+ 139
+ 140
+ 141
+ 142
+ 144
+ 166
+ 167
+ 168
+ 169
+ 170
+ 176
+ 177
+ 178
+ 179
+ 180
+ 181
+ 148
+ 149
+ 150
+ 151
+ 152
+ 153
+ 154
+ 155
+ 156
+ 157
+ 158
+ 159
+ 160
+ 161
+ 162
+ 163
+ 164
+ 165
+ 171
+ 172
+ 173
+ 174
+ 175
+
+
+ 36
+ 23
+ 8
+ 93
+ 101
+ 108
+ 143
+ 145
+ 146
+ 139
+ 140
+ 141
+ 142
+ 144
+ 166
+ 167
+ 168
+ 169
+ 170
+ 176
+ 177
+ 178
+ 179
+ 180
+ 181
+ 148
+ 149
+ 150
+ 151
+ 152
+ 153
+ 154
+ 155
+ 156
+ 157
+ 158
+ 159
+ 160
+ 161
+ 162
+ 163
+ 164
+ 165
+ 171
+ 172
+ 173
+ 174
+ 175
+
+
+ 16
+ 30
+ 43
+ 97
+ 105
+ 112
+ 143
+ 145
+ 146
+ 139
+ 140
+ 141
+ 142
+ 144
+ 166
+ 167
+ 168
+ 169
+ 170
+ 176
+ 177
+ 178
+ 179
+ 180
+ 181
+ 148
+ 149
+ 150
+ 151
+ 152
+ 153
+ 154
+ 155
+ 156
+ 157
+ 158
+ 159
+ 160
+ 161
+ 162
+ 163
+ 164
+ 165
+ 171
+ 172
+ 173
+ 174
+ 175
+
+
+ 27
+ 40
+ 12
+ 13
+ 94
+ 103
+ 110
+ 95
+ 143
+ 145
+ 146
+ 139
+ 140
+ 141
+ 142
+ 144
+ 166
+ 167
+ 168
+ 169
+ 170
+ 176
+ 177
+ 178
+ 179
+ 180
+ 181
+ 148
+ 149
+ 150
+ 151
+ 152
+ 153
+ 154
+ 155
+ 156
+ 157
+ 158
+ 159
+ 160
+ 161
+ 162
+ 163
+ 164
+ 165
+ 171
+ 172
+ 173
+ 174
+ 175
+
+
+ 135
+ 17
+ 51
+ 52
+ 98
+ 115
+ 116
+ 136
+ 143
+ 145
+ 146
+ 139
+ 140
+ 141
+ 142
+ 144
+ 166
+ 167
+ 168
+ 169
+ 170
+ 176
+ 177
+ 178
+ 179
+ 180
+ 181
+ 148
+ 149
+ 150
+ 151
+ 152
+ 153
+ 154
+ 155
+ 156
+ 157
+ 158
+ 159
+ 160
+ 161
+ 162
+ 163
+ 164
+ 165
+ 171
+ 172
+ 173
+ 174
+ 175
+
+
+ 14
+ 28
+ 41
+ 96
+ 104
+ 111
+ 143
+ 145
+ 146
+ 139
+ 140
+ 141
+ 142
+ 144
+ 166
+ 167
+ 168
+ 169
+ 170
+ 176
+ 177
+ 178
+ 179
+ 180
+ 181
+ 148
+ 149
+ 150
+ 151
+ 152
+ 153
+ 154
+ 155
+ 156
+ 157
+ 158
+ 159
+ 160
+ 161
+ 162
+ 163
+ 164
+ 165
+ 171
+ 172
+ 173
+ 174
+ 175
+
+
+ 14
+ 28
+ 41
+ 96
+ 104
+ 111
+ 13
+ 95
+ 145
+ 176
+ 177
+ 178
+
+
+ 3
+ 127
+ 128
+ 129
+ 46
+ 55
+ 57
+ 48
+ 2
+ 89
+ 131
+ 113
+ 117
+ 118
+ 132
+ 133
+ 114
+ 88
+ 140
+ 152
+ 153
+ 154
+ 155
+ 156
+ 157
+
+
+ 8
+ 23
+ 36
+ 93
+ 101
+ 108
+ 9
+ 24
+ 37
+ 92
+ 102
+ 109
+ 130
+ 134
+ 141
+ 142
+ 158
+ 159
+ 160
+ 161
+ 162
+ 163
+ 164
+
+
+ 5
+ 6
+ 33
+ 20
+ 90
+ 91
+ 106
+ 99
+ 139
+ 148
+ 149
+ 150
+ 151
+
+
+ 14
+ 28
+ 41
+ 96
+ 104
+ 111
+ 145
+ 176
+ 177
+ 178
+
+
+ 12
+ 27
+ 40
+ 13
+ 94
+ 103
+ 110
+ 95
+ 143
+ 166
+ 167
+ 168
+ 169
+ 170
+
+
+ 16
+ 30
+ 43
+ 97
+ 105
+ 112
+ 146
+ 179
+ 180
+ 181
+
+
+ 17
+ 51
+ 52
+ 21
+ 34
+ 135
+ 98
+ 115
+ 116
+ 100
+ 107
+ 136
+ 144
+ 171
+ 172
+ 173
+ 174
+ 175
+
+
+ 16
+ 30
+ 97
+ 105
+ 17
+ 98
+ 179
+ 180
+ 171
+
+
+ 12
+ 94
+ 27
+ 103
+ 13
+ 95
+ 14
+ 96
+ 28
+ 104
+ 168
+ 167
+ 176
+ 177
+
+
+ 2
+ 88
+ 3
+ 89
+ 5
+ 90
+ 6
+ 91
+ 8
+ 93
+ 9
+ 92
+ 20
+ 99
+ 21
+ 100
+ 23
+ 101
+ 24
+ 102
+ 152
+ 153
+ 148
+ 149
+ 158
+ 162
+ 150
+ 172
+ 159
+ 163
+
+
+ 46
+ 113
+ 48
+ 114
+ 51
+ 115
+ 52
+ 116
+ 154
+ 155
+ 174
+ 175
+
+
+ 55
+ 117
+ 161
+
+
+ 57
+ 118
+ 156
+
+
+ 36
+ 108
+ 37
+ 109
+ 33
+ 106
+ 41
+ 111
+ 40
+ 110
+ 43
+ 112
+ 34
+ 107
+ 160
+ 164
+ 151
+ 178
+ 169
+ 181
+ 173
+
+
+ 127
+ 131
+ 128
+ 132
+ 129
+ 133
+ 135
+ 136
+ 130
+ 134
+ 157
+ 170
+ 165
+
+
+ 5
+ 20
+ 90
+ 99
+ 148
+ 150
+
+
+ 6
+ 33
+ 91
+ 106
+ 149
+ 151
+
+
+ 0
+ 1
+ 2
+ 3
+ 4
+ 5
+ 6
+ 7
+ 8
+ 18
+ 19
+ 20
+ 21
+ 22
+ 23
+ 31
+ 32
+ 33
+ 34
+ 35
+ 36
+ 44
+ 45
+ 46
+ 47
+ 48
+ 53
+ 54
+ 55
+ 56
+ 57
+ 88
+ 89
+ 90
+ 91
+ 93
+ 99
+ 100
+ 101
+ 106
+ 107
+ 108
+ 113
+ 114
+ 117
+ 118
+ 123
+ 124
+ 125
+ 126
+ 127
+ 128
+ 129
+ 131
+ 132
+ 133
+ 135
+ 136
+ 139
+ 140
+ 141
+ 144
+ 148
+ 149
+ 150
+ 151
+ 152
+ 153
+ 154
+ 155
+ 156
+ 157
+ 158
+ 159
+ 160
+ 161
+ 171
+ 172
+ 173
+ 174
+ 175
+ 182
+ 184
+ 186
+ 188
+
+
+ 4
+ 5
+ 6
+ 19
+ 32
+ 20
+ 21
+ 33
+ 34
+ 90
+ 91
+ 99
+ 100
+ 106
+ 107
+ 139
+ 148
+ 149
+ 150
+ 151
+
+
+ 11
+ 15
+ 26
+ 29
+ 39
+ 42
+ 12
+ 13
+ 14
+ 16
+ 17
+ 27
+ 28
+ 30
+ 40
+ 41
+ 43
+ 94
+ 95
+ 96
+ 97
+ 98
+ 103
+ 104
+ 105
+ 110
+ 111
+ 112
+ 143
+ 145
+ 146
+ 166
+ 167
+ 168
+ 169
+ 176
+ 177
+ 178
+ 179
+ 180
+ 181
+
+
+ 1
+ 2
+ 3
+ 54
+ 56
+ 55
+ 57
+ 117
+ 118
+ 88
+ 89
+ 140
+ 144
+ 152
+ 153
+ 156
+ 171
+ 172
+ 173
+
+
+ 7
+ 22
+ 35
+ 8
+ 9
+ 23
+ 24
+ 36
+ 37
+ 92
+ 93
+ 101
+ 102
+ 108
+ 109
+ 141
+ 142
+ 158
+ 159
+ 160
+ 161
+ 162
+ 163
+ 164
+
+
+ 125
+ 126
+ 127
+ 128
+ 129
+ 130
+ 135
+ 131
+ 132
+ 133
+ 134
+ 136
+ 157
+ 170
+ 165
+
+
+ 45
+ 47
+ 46
+ 48
+ 113
+ 114
+ 154
+ 155
+ 174
+ 175
+
+
+ 50
+ 51
+ 52
+ 115
+ 116
+
+
+ 182
+ 184
+ 186
+ 188
+
+
+ 183
+ 185
+ 187
+ 189
+
+
+ 16067
+ 16071
+ 16072
+
+
+ 18869
+ 18870
+ 18871
+ 18872
+ 18873
+ 18874
+ 18875
+ 18876
+ 18877
+ 18878
+ 18879
+ 18880
+ 18881
+ 18882
+ 18883
+ 18884
+ 18885
+ 18886
+ 18887
+ 18888
+ 18889
+ 18890
+ 18891
+ 18892
+ 18893
+ 18894
+ 18895
+ 18896
+ 18897
+ 18898
+ 18899
+ 18900
+ 18901
+ 18902
+ 18903
+ 18904
+
+
+ 18905
+ 18906
+ 18907
+
+
+ 18850
+ 18851
+ 18852
+
+
+ 32913
+ 32914
+ 33097
+ 32922
+ 33098
+ 33099
+ 33131
+ 33132
+ 14001
+ 14002
+ 14003
+ 14004
+ 14005
+ 14006
+ 14007
+ 14008
+ 14009
+ 14010
+ 14011
+ 14012
+ 14013
+ 14014
+ 14015
+ 14016
+ 14017
+ 14018
+ 14019
+ 14020
+ 14021
+ 14022
+ 14023
+ 14024
+ 14025
+ 14026
+ 14027
+ 14028
+ 14029
+ 14030
+ 14031
+ 14032
+ 14033
+ 14034
+ 14035
+ 14036
+ 14037
+ 14038
+ 14039
+ 14040
+ 14041
+ 14042
+ 14043
+ 14044
+ 14045
+ 14046
+ 14047
+ 14048
+ 14049
+ 14050
+ 14051
+ 14052
+ 14053
+ 14054
+ 14055
+ 14056
+ 14057
+ 14058
+ 14059
+ 14060
+ 14061
+ 14062
+ 14063
+ 14064
+ 14065
+ 14066
+ 14067
+ 14068
+ 14069
+ 14070
+ 14071
+ 14072
+ 14073
+ 14074
+ 14075
+ 14076
+ 14077
+ 14078
+ 14079
+ 14080
+ 14081
+ 14082
+ 14083
+ 14084
+ 14085
+ 14086
+ 14087
+ 14088
+ 14089
+ 14090
+ 14091
+ 14092
+ 14093
+ 14094
+ 14095
+ 14096
+ 14097
+ 14098
+ 14099
+ 14100
+ 14101
+ 14102
+ 14103
+ 14104
+ 14105
+ 14106
+ 14107
+ 14108
+ 14109
+ 14110
+ 14111
+ 14112
+ 14113
+ 14114
+ 14115
+ 14116
+ 14117
+ 14118
+ 14119
+ 14120
+ 14121
+ 14122
+ 14123
+ 14124
+ 14125
+ 14126
+ 14127
+ 14128
+ 14129
+ 14130
+ 14131
+ 14132
+ 14133
+ 14134
+ 14135
+ 14136
+ 14137
+ 14138
+ 14139
+ 14140
+ 14141
+ 14142
+ 14143
+ 14144
+ 14145
+ 14146
+ 14147
+ 14148
+ 14149
+ 14150
+ 14151
+ 14152
+ 14153
+ 14154
+ 14155
+ 14156
+ 14157
+ 14158
+ 14159
+ 14160
+ 14161
+ 14162
+ 14163
+ 14164
+ 14165
+ 14166
+ 14167
+ 14168
+ 14169
+ 14170
+ 14171
+ 14172
+ 14173
+ 14174
+ 14175
+ 14176
+ 14177
+ 14178
+ 14179
+ 14180
+ 14181
+ 14182
+ 14183
+ 14184
+ 14185
+ 14186
+ 14187
+ 14188
+ 14189
+ 14190
+ 14191
+ 14192
+ 14193
+ 14194
+ 14195
+ 14196
+ 14197
+ 14198
+ 14199
+ 14200
+ 14201
+ 14202
+ 14203
+ 14204
+ 14205
+ 14206
+ 14207
+ 14208
+ 14209
+ 14210
+ 14211
+ 14212
+ 14213
+ 14214
+ 14215
+ 14216
+ 14217
+ 14218
+ 14219
+ 14220
+ 14221
+ 14222
+ 14223
+ 14224
+ 14225
+ 14226
+ 14227
+ 14228
+ 14229
+ 14230
+ 14231
+ 14232
+ 14233
+ 14234
+ 14235
+ 14236
+ 14237
+ 14238
+ 14239
+ 14240
+ 14241
+ 14242
+ 14243
+ 14244
+ 14245
+ 14246
+ 14247
+ 14248
+ 14249
+ 14250
+ 14251
+ 14252
+ 14253
+ 14254
+ 14255
+ 14256
+ 14257
+ 14258
+ 14259
+ 14260
+ 14265
+ 14266
+ 14267
+ 14268
+ 14269
+ 14270
+ 14271
+ 14272
+ 14273
+ 14274
+ 14275
+ 14276
+ 14277
+ 14278
+ 14279
+ 14280
+ 14281
+ 14282
+ 14283
+ 14284
+ 14285
+ 14286
+ 14287
+ 14288
+ 14289
+ 14290
+ 14291
+ 14292
+ 14293
+ 14294
+ 14295
+ 14296
+ 14297
+ 14298
+ 14299
+ 14300
+ 14301
+ 14302
+ 14303
+ 14304
+ 14305
+ 14306
+ 14307
+ 14308
+ 14309
+ 14310
+ 14311
+ 14312
+ 14313
+ 14314
+ 14315
+ 14316
+ 14317
+ 14318
+ 14319
+ 14320
+ 14321
+ 14322
+ 14323
+ 14324
+ 14325
+ 14326
+ 14327
+ 14328
+ 14329
+ 14330
+ 14331
+ 14332
+ 14333
+ 14334
+ 14335
+ 14336
+ 14337
+ 14338
+ 14339
+ 14340
+ 14341
+ 14342
+ 14343
+ 14344
+ 14345
+ 14346
+ 14347
+ 14348
+ 14349
+ 14350
+ 14351
+ 14352
+ 14353
+ 14354
+ 14355
+ 14356
+ 14357
+ 14358
+ 14359
+ 14360
+ 14361
+ 14362
+ 14363
+ 14364
+ 14365
+ 14366
+ 14367
+ 14368
+ 14369
+ 14370
+ 14371
+ 14372
+ 14373
+ 14374
+ 14375
+ 14376
+ 14377
+ 14378
+ 14379
+ 14380
+ 14381
+ 14382
+ 14383
+ 14384
+ 14385
+ 14386
+ 14387
+ 14388
+ 14389
+ 14390
+ 14391
+ 14392
+ 14393
+ 14394
+ 14395
+ 14396
+ 14397
+ 14398
+ 14399
+ 14400
+ 14401
+ 14402
+ 14403
+ 14404
+ 14405
+ 14406
+ 14407
+ 14408
+ 14409
+ 14410
+ 14411
+ 14412
+ 14413
+ 14414
+ 14415
+ 14416
+ 14417
+ 14418
+ 14419
+ 14420
+ 14421
+ 14422
+ 14423
+ 14424
+ 14425
+ 14426
+ 14427
+ 14428
+ 14429
+ 14430
+ 14431
+ 14432
+ 14433
+ 14434
+ 14435
+ 14436
+ 14437
+ 14438
+ 14439
+ 14440
+ 14441
+ 14442
+ 14443
+ 14444
+ 14449
+ 14450
+ 14451
+ 14452
+ 14453
+ 14454
+ 14455
+ 14456
+ 14457
+ 14458
+ 14459
+ 14460
+ 14461
+ 14462
+ 14463
+ 14464
+ 14465
+ 14466
+ 14467
+ 14468
+ 14469
+ 14470
+ 14471
+ 14472
+ 14473
+ 14474
+ 14475
+ 14476
+ 14477
+ 14478
+ 14479
+ 14480
+ 14481
+ 14482
+ 14483
+ 14484
+ 14485
+ 14486
+ 14487
+ 14488
+ 14489
+ 14490
+ 14491
+ 14492
+ 14493
+ 14494
+ 14495
+ 14496
+ 14497
+ 14498
+ 14499
+ 14500
+ 14501
+ 14502
+ 14503
+ 14504
+ 14505
+ 14506
+ 14507
+ 14508
+ 14509
+ 14510
+ 14511
+ 14512
+ 14513
+ 14514
+ 14515
+ 14516
+ 14517
+ 14518
+ 14519
+ 14520
+ 14521
+ 14522
+ 14523
+ 14524
+ 14525
+ 14526
+ 14527
+ 14528
+ 14529
+ 14530
+ 14531
+ 14532
+ 14533
+ 14534
+ 14535
+ 14536
+ 14537
+ 14538
+ 14539
+ 14540
+ 14541
+ 14542
+ 14543
+ 14544
+ 14545
+ 14546
+ 14547
+ 14548
+ 14549
+ 14550
+ 14551
+ 14552
+ 14553
+ 14554
+ 14555
+ 14556
+ 14557
+ 14558
+ 14559
+ 14560
+ 14561
+ 14562
+ 14563
+ 14564
+ 14565
+ 14566
+ 14567
+ 14568
+ 14569
+ 14570
+ 14571
+ 14572
+ 14573
+ 14574
+ 14575
+ 14576
+ 14577
+ 14578
+ 14579
+ 14580
+ 14581
+ 14582
+ 14583
+ 14584
+ 14585
+ 14586
+ 14587
+ 14588
+ 14589
+ 14590
+ 14591
+ 14592
+ 14593
+ 14594
+ 14595
+ 14596
+ 14597
+ 14598
+ 14599
+ 14600
+ 14601
+ 14602
+ 14603
+ 14604
+ 14605
+ 14606
+ 14607
+ 14608
+ 14609
+ 14610
+ 14611
+ 14612
+ 14613
+ 14614
+ 14615
+ 14616
+ 14617
+ 14618
+ 14619
+ 14620
+ 14621
+ 14622
+ 14623
+ 14624
+ 14625
+ 14626
+ 14627
+ 14628
+ 14633
+ 14634
+ 14635
+ 14636
+ 14637
+ 14638
+ 14639
+ 14640
+ 14641
+ 14642
+ 14643
+ 14644
+ 14645
+ 14646
+ 14647
+ 14648
+ 14649
+ 14650
+ 14651
+ 14652
+ 14653
+ 14654
+ 14655
+ 14656
+ 14657
+ 14658
+ 14659
+ 14660
+ 14661
+ 14662
+ 14663
+ 14664
+ 14665
+ 14666
+ 14667
+ 14668
+ 14669
+ 14670
+ 14671
+ 14672
+ 14673
+ 14674
+ 14675
+ 14676
+ 14677
+ 14678
+ 14679
+ 14680
+ 14681
+ 14682
+ 14683
+ 14684
+ 14685
+ 14686
+ 14687
+ 14688
+ 14689
+ 14690
+ 14691
+ 14692
+ 14693
+ 14694
+ 14695
+ 14696
+ 14697
+ 14698
+ 14699
+ 14700
+ 14701
+ 14702
+ 14703
+ 14704
+ 14705
+ 14706
+ 14707
+ 14708
+ 14709
+ 14710
+ 14711
+ 14712
+ 14713
+ 14714
+ 14715
+ 14716
+ 14717
+ 14718
+ 14719
+ 14720
+ 14721
+ 14722
+ 14723
+ 14724
+ 14725
+ 14726
+ 14727
+ 14728
+ 14729
+ 14730
+ 14731
+ 14732
+ 14733
+ 14734
+ 14735
+ 14736
+ 14737
+ 14738
+ 14739
+ 14740
+ 14741
+ 14742
+ 14743
+ 14744
+ 14745
+ 14746
+ 14747
+ 14748
+ 14749
+ 14750
+ 14751
+ 14752
+ 14753
+ 14754
+ 14755
+ 14756
+ 14757
+ 14758
+ 14759
+ 14760
+ 14761
+ 14762
+ 14763
+ 14764
+ 14765
+ 14766
+ 14767
+ 14768
+ 14769
+ 14770
+ 14771
+ 14772
+ 14773
+ 14774
+ 14775
+ 14776
+ 14777
+ 14778
+ 14779
+ 14780
+ 14781
+ 14782
+ 14783
+ 14784
+ 14785
+ 14786
+ 14787
+ 14788
+ 14789
+ 14790
+ 14791
+ 14792
+ 14793
+ 14794
+ 14795
+ 14796
+ 14797
+ 14798
+ 14799
+ 14800
+ 14801
+ 14802
+ 14803
+ 14804
+ 14805
+ 14806
+ 14807
+ 14808
+ 14809
+ 14810
+ 14811
+ 14812
+ 14813
+ 14814
+ 14815
+ 14816
+ 14817
+ 14818
+ 14819
+ 14820
+ 14821
+ 14822
+ 14823
+ 14824
+ 14825
+ 14826
+ 14827
+ 14828
+ 14829
+ 14830
+ 14831
+ 14832
+ 14833
+ 14834
+ 14835
+ 14836
+ 14837
+ 14838
+ 14839
+ 14840
+ 14841
+ 14842
+ 14843
+ 14844
+ 14845
+ 14846
+ 14847
+ 14848
+ 14849
+ 14850
+ 14851
+ 14852
+ 14853
+ 14854
+ 14855
+ 14856
+ 14857
+ 14858
+ 14859
+ 14860
+ 14861
+ 14862
+ 14863
+ 14864
+ 14865
+ 14866
+ 14867
+ 14868
+ 14869
+ 12077
+ 12311
+ 12312
+ 12313
+ 12526
+ 12527
+ 12528
+ 12564
+ 12621
+ 12780
+ 12781
+ 12782
+ 16025
+ 13071
+ 13072
+ 13073
+ 13074
+ 13075
+ 13076
+ 14870
+ 14871
+ 14872
+ 14873
+ 14874
+ 14875
+ 14876
+ 14877
+ 14878
+ 14879
+ 14880
+ 14881
+ 14882
+ 14883
+ 14884
+ 14885
+ 14886
+ 14887
+ 14888
+ 14889
+ 14890
+ 14891
+ 14892
+ 14893
+ 14894
+ 14895
+ 14896
+ 14897
+ 14898
+ 14899
+ 14900
+ 14901
+ 14902
+ 14903
+ 14904
+ 14905
+ 14906
+ 14907
+ 14908
+ 14909
+ 14910
+ 14911
+ 14912
+ 14913
+ 14914
+ 14915
+ 16030
+ 16034
+ 16035
+ 16036
+ 16037
+ 16038
+ 16039
+ 16040
+ 16041
+ 16042
+ 16043
+ 16044
+ 16045
+ 16046
+ 14916
+ 14917
+ 14918
+ 16050
+ 16051
+ 16052
+ 16053
+ 16067
+ 16068
+ 16071
+ 16072
+
+
+ 32915
+ 32916
+ 33142
+ 33143
+ 33144
+ 33145
+ 33147
+ 33148
+ 33137
+
+
+ 32915
+ 32916
+ 32917
+ 32918
+ 32919
+ 32920
+ 33147
+ 33148
+ 32913
+ 32914
+ 33097
+
+
+ 90
+ 91
+ 99
+ 106
+
+
+ 88
+ 89
+ 113
+ 114
+ 118
+ 131
+
+
+ 93
+ 101
+ 108
+ 117
+
+
+ 92
+ 102
+ 109
+ 134
+
+
+ 95
+ 94
+ 103
+ 110
+ 132
+ 133
+
+
+ 96
+ 104
+ 111
+
+
+ 97
+ 105
+ 112
+
+
+ 98
+ 100
+ 107
+ 116
+ 115
+ 136
+
+
+ 19117
+ 19118
+
+
+ 32908
+
+
+ 14930
+ 14954
+ 14955
+ 14956
+ 14957
+ 14958
+ 14959
+ 14960
+ 14931
+ 14961
+ 14962
+ 14963
+ 14964
+ 14965
+ 14966
+ 14967
+ 15032
+ 15033
+ 15034
+ 15035
+ 15036
+ 15037
+ 15038
+ 15039
+ 15040
+ 15041
+ 15042
+ 15043
+ 15044
+ 15045
+ 15046
+ 15047
+ 15048
+ 15049
+ 15050
+ 15051
+ 14929
+ 14947
+ 14948
+ 14949
+ 14950
+ 14951
+ 14952
+ 14953
+ 15022
+ 15023
+ 15024
+ 15025
+ 15026
+ 15027
+ 15028
+ 15029
+ 15030
+ 15031
+
+
+ 0
+ 18
+ 31
+ 44
+ 53
+ 123
+ 124
+
+
+ 10
+ 25
+ 38
+ 49
+
+
+ 4
+ 19
+ 32
+
+
+ 1
+ 7
+ 22
+ 35
+ 45
+ 47
+ 125
+ 126
+ 50
+ 54
+ 56
+
+
+ 11
+ 26
+ 39
+
+
+ 15
+ 29
+ 42
+
+
+ 5
+ 6
+ 20
+ 33
+
+
+ 2
+ 3
+ 46
+ 48
+ 127
+ 128
+ 129
+ 57
+ 135
+
+
+ 8
+ 23
+ 36
+ 55
+
+
+ 12
+ 27
+ 40
+ 13
+
+
+ 9
+ 130
+ 37
+ 24
+
+
+ 17
+ 52
+
+
+ 14
+ 28
+ 41
+
+
+ 16
+ 30
+ 34
+ 43
+ 21
+ 51
+
+
+ 90
+ 91
+ 99
+ 106
+
+
+ 88
+ 89
+ 113
+ 114
+ 118
+ 131
+ 132
+ 133
+ 136
+
+
+ 93
+ 101
+ 108
+ 101
+ 117
+
+
+ 94
+ 103
+ 110
+ 95
+
+
+ 92
+ 102
+ 109
+ 134
+
+
+ 116
+ 98
+ 115
+
+
+ 96
+ 104
+ 111
+
+
+ 97
+ 105
+ 112
+ 107
+ 100
+
+
+ 5
+ 6
+ 20
+ 33
+ 90
+ 91
+ 99
+ 106
+ 139
+ 148
+ 149
+ 150
+ 151
+
+
+ 3
+ 2
+ 46
+ 48
+ 89
+ 88
+ 113
+ 114
+ 118
+ 140
+ 152
+ 153
+ 154
+ 155
+ 156
+
+
+ 8
+ 23
+ 36
+ 55
+ 93
+ 101
+ 108
+ 117
+ 141
+ 158
+ 159
+ 160
+ 161
+
+
+ 9
+ 24
+ 37
+ 92
+ 102
+ 109
+ 142
+ 162
+ 163
+ 164
+
+
+ 12
+ 13
+ 27
+ 40
+ 94
+ 95
+ 103
+ 110
+ 143
+ 166
+ 167
+ 168
+ 169
+
+
+ 14
+ 28
+ 41
+ 96
+ 104
+ 111
+ 145
+ 176
+ 177
+ 178
+
+
+ 16
+ 30
+ 43
+ 97
+ 105
+ 112
+ 146
+ 179
+ 180
+ 181
+
+
+ 17
+ 21
+ 34
+ 52
+ 98
+ 116
+ 100
+ 107
+ 115
+ 144
+ 171
+ 172
+ 173
+ 174
+ 175
+
+
+ 51
+ 57
+
+
+ 127
+ 130
+ 128
+ 129
+ 135
+ 131
+ 134
+ 132
+ 133
+ 136
+ 157
+ 170
+ 165
+
+
+ 0
+ 1
+ 2
+ 3
+ 4
+ 5
+ 6
+ 7
+ 8
+ 9
+ 18
+ 19
+ 20
+ 21
+ 22
+ 23
+ 24
+ 31
+ 32
+ 33
+ 34
+ 35
+ 36
+ 37
+ 44
+ 45
+ 46
+ 47
+ 48
+ 53
+ 54
+ 55
+ 56
+ 57
+ 88
+ 89
+ 90
+ 91
+ 92
+ 93
+ 99
+ 100
+ 101
+ 102
+ 106
+ 107
+ 108
+ 109
+ 113
+ 114
+ 117
+ 118
+ 139
+ 140
+ 141
+ 142
+ 144
+ 10
+ 11
+ 12
+ 13
+ 14
+ 15
+ 16
+ 17
+ 25
+ 26
+ 27
+ 28
+ 29
+ 30
+ 38
+ 39
+ 40
+ 41
+ 42
+ 43
+ 49
+ 50
+ 51
+ 52
+ 94
+ 95
+ 96
+ 97
+ 98
+ 103
+ 104
+ 105
+ 110
+ 111
+ 112
+ 115
+ 116
+ 143
+ 145
+ 146
+ 148
+ 149
+ 150
+ 151
+ 152
+ 153
+ 154
+ 155
+ 156
+ 158
+ 159
+ 160
+ 161
+ 162
+ 163
+ 164
+ 166
+ 167
+ 168
+ 169
+ 171
+ 172
+ 173
+ 174
+ 175
+ 176
+ 177
+ 178
+ 179
+ 180
+ 181
+ 182
+ 184
+ 186
+ 188
+ 183
+ 185
+ 187
+ 189
+
+
+ 143
+ 145
+ 146
+ 166
+ 167
+ 176
+ 179
+
+
+ 139
+ 140
+ 141
+ 142
+ 144
+ 148
+ 149
+ 152
+ 153
+ 158
+ 162
+ 171
+
+
+ 5
+ 6
+ 20
+ 33
+ 90
+ 91
+ 99
+ 106
+ 139
+ 148
+ 149
+ 150
+ 151
+
+
+ 3
+ 2
+ 46
+ 48
+ 127
+ 57
+ 89
+ 88
+ 113
+ 114
+ 118
+ 131
+ 140
+ 152
+ 153
+ 154
+ 155
+ 156
+ 184
+ 186
+ 188
+
+
+ 8
+ 23
+ 36
+ 55
+ 93
+ 101
+ 108
+ 117
+ 141
+ 158
+ 159
+ 160
+ 161
+
+
+ 9
+ 24
+ 37
+ 130
+ 92
+ 102
+ 109
+ 134
+ 142
+ 162
+ 163
+ 164
+ 165
+
+
+ 12
+ 13
+ 27
+ 40
+ 128
+ 129
+ 94
+ 95
+ 103
+ 110
+ 132
+ 133
+ 143
+ 166
+ 167
+ 168
+ 169
+ 170
+
+
+ 14
+ 28
+ 41
+ 96
+ 104
+ 111
+ 145
+ 176
+ 177
+ 178
+
+
+ 17
+ 21
+ 34
+ 52
+ 135
+ 51
+ 98
+ 116
+ 100
+ 107
+ 115
+ 136
+ 144
+ 171
+ 172
+ 173
+ 174
+ 175
+
+
+ 16
+ 30
+ 43
+ 97
+ 105
+ 112
+ 146
+ 179
+ 180
+ 181
+
+
+ 88
+ 89
+ 90
+ 91
+ 93
+ 92
+ 94
+ 95
+ 96
+ 97
+ 98
+
+
+ 99
+ 100
+ 101
+ 102
+ 103
+ 104
+ 105
+
+
+ 106
+ 107
+ 108
+ 109
+ 110
+ 111
+ 112
+
+
+ 113
+ 114
+ 115
+ 116
+
+
+ 117
+ 118
+
+
+ 8401
+ 8402
+ 8403
+ 8405
+ 8417
+ 8422
+ 8423
+ 8424
+ 8425
+ 8416
+
+
+ 8407
+ 8408
+ 8409
+ 8410
+ 8411
+ 8412
+ 8413
+ 8414
+ 8415
+ 8428
+ 8429
+ 8430
+ 8431
+ 8432
+
+
+ 8516
+ 8517
+ 8514
+ 8515
+ 8512
+ 8513
+
+
+ 182
+ 184
+ 186
+ 188
+ 183
+ 185
+ 187
+ 189
+
+
+ 182
+ 183
+
+
+ 184
+ 185
+
+
+ 186
+ 187
+
+
+ 188
+ 189
+
+
+ 183
+ 185
+ 187
+ 189
+
+
+ 182
+ 184
+ 186
+ 188
+
+
+ 187
+
+
+ 186
+
+
+ 0
+ 1
+ 2
+ 3
+ 4
+ 5
+ 6
+ 7
+ 8
+ 9
+ 18
+ 19
+ 20
+ 21
+ 22
+ 23
+ 24
+ 31
+ 32
+ 33
+ 34
+ 35
+ 36
+ 37
+ 44
+ 45
+ 46
+ 47
+ 48
+ 53
+ 54
+ 55
+ 56
+ 57
+ 88
+ 89
+ 90
+ 91
+ 92
+ 93
+ 99
+ 100
+ 101
+ 102
+ 106
+ 107
+ 108
+ 109
+ 113
+ 114
+ 117
+ 118
+ 123
+ 124
+ 125
+ 126
+ 127
+ 128
+ 129
+ 130
+ 131
+ 132
+ 133
+ 134
+ 135
+ 136
+ 139
+ 140
+ 141
+ 142
+ 144
+ 148
+ 149
+ 150
+ 151
+ 152
+ 153
+ 154
+ 155
+ 156
+ 157
+ 158
+ 159
+ 160
+ 161
+ 162
+ 163
+ 164
+ 165
+ 171
+ 172
+ 173
+ 174
+ 175
+ 10
+ 11
+ 12
+ 13
+ 14
+ 15
+ 16
+ 17
+ 25
+ 26
+ 27
+ 28
+ 29
+ 30
+ 38
+ 39
+ 40
+ 41
+ 42
+ 43
+ 49
+ 50
+ 51
+ 52
+ 94
+ 95
+ 96
+ 97
+ 98
+ 103
+ 104
+ 105
+ 110
+ 111
+ 112
+ 115
+ 116
+ 143
+ 145
+ 146
+ 166
+ 167
+ 168
+ 169
+ 170
+ 176
+ 177
+ 178
+ 179
+ 180
+ 181
+
+
+ 1
+ 2
+ 3
+ 4
+ 5
+ 6
+ 19
+ 20
+ 21
+ 32
+ 33
+ 34
+ 45
+ 46
+ 56
+ 57
+ 88
+ 89
+ 90
+ 91
+ 99
+ 100
+ 106
+ 107
+ 113
+ 118
+ 139
+ 140
+ 148
+ 149
+ 150
+ 151
+ 152
+ 153
+ 154
+ 155
+ 156
+ 157
+ 49
+ 50
+ 51
+ 52
+ 115
+ 116
+
+
+ 0
+ 7
+ 8
+ 9
+ 18
+ 22
+ 23
+ 24
+ 31
+ 35
+ 36
+ 37
+ 44
+ 47
+ 48
+ 53
+ 54
+ 55
+ 92
+ 93
+ 101
+ 102
+ 108
+ 109
+ 114
+ 123
+ 124
+ 125
+ 126
+ 127
+ 128
+ 129
+ 130
+ 131
+ 132
+ 133
+ 134
+ 135
+ 136
+ 141
+ 142
+ 144
+ 158
+ 159
+ 160
+ 161
+ 162
+ 163
+ 164
+ 165
+ 171
+ 172
+ 173
+ 174
+ 175
+ 182
+ 184
+ 186
+ 188
+
+
+ 10
+ 11
+ 12
+ 13
+ 14
+ 15
+ 16
+ 17
+ 25
+ 26
+ 27
+ 28
+ 29
+ 30
+ 38
+ 39
+ 40
+ 41
+ 42
+ 43
+ 94
+ 95
+ 96
+ 97
+ 98
+ 103
+ 104
+ 105
+ 110
+ 111
+ 112
+ 143
+ 145
+ 146
+ 166
+ 167
+ 168
+ 169
+ 170
+ 176
+ 177
+ 178
+ 179
+ 180
+ 181
+ 183
+ 185
+ 187
+ 189
+
\ No newline at end of file
diff --git a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/ai/others/ClassMaster/ClassMaster.java b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/ai/others/ClassMaster/ClassMaster.java
index f1e5d98e4e..b2f9b722f9 100644
--- a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/ai/others/ClassMaster/ClassMaster.java
+++ b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/ai/others/ClassMaster/ClassMaster.java
@@ -390,7 +390,7 @@ public final class ClassMaster extends AbstractNpcAI implements IGameXmlReader
{
player.setBaseClass(player.getActiveClass());
}
- if (player.isInCategory(CategoryType.AWAKEN_GROUP))
+ if (player.isInCategory(CategoryType.SIXTH_CLASS_GROUP))
{
SkillTreesData.getInstance().cleanSkillUponAwakening(player);
for (L2SkillLearn skill : SkillTreesData.getInstance().getRaceSkillTree(player.getRace()))
@@ -418,7 +418,7 @@ public final class ClassMaster extends AbstractNpcAI implements IGameXmlReader
case "learnskills":
{
// Retail class master only lets you learn all third class skills.
- if (player.isInCategory(CategoryType.AWAKEN_GROUP))
+ if (player.isInCategory(CategoryType.SIXTH_CLASS_GROUP))
{
htmltext = "test_server_helper001_failed.html";
}
@@ -821,7 +821,7 @@ public final class ClassMaster extends AbstractNpcAI implements IGameXmlReader
{
player.setBaseClass(player.getActiveClass());
}
- if (player.isInCategory(CategoryType.AWAKEN_GROUP))
+ if (player.isInCategory(CategoryType.SIXTH_CLASS_GROUP))
{
SkillTreesData.getInstance().cleanSkillUponAwakening(player);
for (L2SkillLearn skill : SkillTreesData.getInstance().getRaceSkillTree(player.getRace()))
diff --git a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/admincommandhandlers/AdminEditChar.java b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/admincommandhandlers/AdminEditChar.java
index 3abfb458ba..44329091c0 100644
--- a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/admincommandhandlers/AdminEditChar.java
+++ b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/admincommandhandlers/AdminEditChar.java
@@ -412,7 +412,7 @@ public class AdminEditChar implements IAdminCommandHandler
}
final String newclass = ClassListData.getInstance().getClass(player.getClassId()).getClassName();
- if (player.isInCategory(CategoryType.AWAKEN_GROUP))
+ if (player.isInCategory(CategoryType.SIXTH_CLASS_GROUP))
{
SkillTreesData.getInstance().cleanSkillUponAwakening(player);
for (L2SkillLearn skill : SkillTreesData.getInstance().getRaceSkillTree(player.getRace()))
diff --git a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/stats/npcs/29000-29099.xml b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/stats/npcs/29000-29099.xml
index 31c03f11cf..11211edf7f 100644
--- a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/stats/npcs/29000-29099.xml
+++ b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/stats/npcs/29000-29099.xml
@@ -1199,7 +1199,7 @@
-
+
@@ -2048,7 +2048,7 @@
-
+
diff --git a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/xsd/npcs.xsd b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/xsd/npcs.xsd
index 4555d46531..6f00944cff 100644
--- a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/xsd/npcs.xsd
+++ b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/xsd/npcs.xsd
@@ -200,6 +200,7 @@
+
diff --git a/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/gameserver/data/xml/impl/SkillTreesData.java b/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/gameserver/data/xml/impl/SkillTreesData.java
index 5d2bd7a033..4b35d8bca8 100644
--- a/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/gameserver/data/xml/impl/SkillTreesData.java
+++ b/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/gameserver/data/xml/impl/SkillTreesData.java
@@ -689,7 +689,7 @@ public final class SkillTreesData implements IGameXmlReader
return result;
}
- final boolean isAwaken = player.isInCategory(CategoryType.AWAKEN_GROUP) && ((player.getRace() != Race.ERTHEIA) || player.isDualClassActive());
+ final boolean isAwaken = player.isInCategory(CategoryType.SIXTH_CLASS_GROUP) && ((player.getRace() != Race.ERTHEIA) || player.isDualClassActive());
for (Entry entry : skills.entrySet())
{
@@ -803,7 +803,7 @@ public final class SkillTreesData implements IGameXmlReader
}
final Race race = player.getRace();
- final boolean isAwaken = player.isInCategory(CategoryType.AWAKEN_GROUP);
+ final boolean isAwaken = player.isInCategory(CategoryType.SIXTH_CLASS_GROUP);
// Race skills
if (isAwaken)
diff --git a/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/gameserver/enums/CategoryType.java b/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/gameserver/enums/CategoryType.java
index c2e14659cd..3619287373 100644
--- a/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/gameserver/enums/CategoryType.java
+++ b/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/gameserver/enums/CategoryType.java
@@ -32,6 +32,17 @@ public enum CategoryType
SECOND_CLASS_GROUP,
THIRD_CLASS_GROUP,
FOURTH_CLASS_GROUP,
+ EQUIP_ENABLE_R,
+ FIFTH_CLASS_GROUP,
+ SIXTH_CLASS_GROUP,
+ SIXTH_SIGEL_GROUP,
+ SIXTH_TIR_GROUP,
+ SIXTH_OTHEL_GROUP,
+ SIXTH_YR_GROUP,
+ SIXTH_FEOH_GROUP,
+ SIXTH_IS_GROUP,
+ SIXTH_WYNN_GROUP,
+ SIXTH_EOLH_GROUP,
BOUNTY_HUNTER_GROUP,
WARSMITH_GROUP,
SUMMON_NPC_GROUP,
@@ -142,30 +153,158 @@ public enum CategoryType
RECOM_KAMAEL_GROUP,
RECOM_ORCF_GROUP,
RECOM_ORCM_GROUP,
+ RECOM_ERTHEIAF_GROUP,
+ RECOM_ERTHEIAM_GROUP,
DEINONYCHUS_PET_GROUP,
BEASTFARM_BEAST,
BEASTFARM_INVADER,
ICEQUEEN_NPC,
- AWAKEN_GROUP,
- SHILENS_FOLLOWERS,
- SIGEL_CANDIDATE,
- TYRR_CANDIDATE,
- OTHELL_CANDIDATE,
- YUL_CANDIDATE,
- FEOH_CANDIDATE,
- ISS_CANDIDATE,
- WYNN_CANDIDATE,
- AEORE_CANDIDATE,
- EVISCERATOR_CANDIDATE,
- SAYHA_SEER_CANDIDATE,
- SIGEL_GROUP,
- TYRR_GROUP,
- OTHELL_GROUP,
- YUL_GROUP,
- FEOH_GROUP,
- ISS_GROUP,
- WYNN_GROUP,
- AEORE_GROUP;
+ FAIRY_PC_SIDE,
+ FAIRY_WISP,
+ FAIRY_GLIMMER,
+ TANKER_CATEGORY,
+ WARRIOR_CATEGORY,
+ ROGUE_CATEGORY,
+ ARCHER_CATEGORY,
+ WIZARD_CATEGORY,
+ SUMMONER_CATEGORY,
+ HEALER_CATEGORY,
+ ENCHANTER_CATEGORY,
+ RUMBLE_MONSTERS,
+ RUMBLE_GUARDIANS,
+ TWO_POINT_MULTI_SUMMON,
+ APM_ZERO_WARRIOR_GROUP,
+ APM_ZERO_MAGE_GROUP,
+ APM_1ST_KNIGHT_GROUP,
+ APM_1ST_WARRIOR_GROUP,
+ APM_1ST_WIZARD_GROUP,
+ APM_1ST_HEALER_GROUP,
+ APM_2ND_KNIGHT_GROUP,
+ APM_2ND_WARRIOR_GROUP,
+ APM_2ND_ROGUE_GROUP,
+ APM_2ND_WIZARD_GROUP,
+ APM_2ND_ARCHER_GROUP,
+ APM_2ND_BUFFER_GROUP,
+ APM_2ND_SUMMONER_GROUP,
+ APM_2ND_ONLY_GROUP,
+ APM_3RD_KNIGHT_GROUP,
+ APM_3RD_WARRIOR_GROUP,
+ APM_3RD_ROGUE_GROUP,
+ APM_3RD_WIZARD_GROUP,
+ APM_3RD_ARCHER_GROUP,
+ APM_3RD_BUFFER_GROUP,
+ APM_3RD_SUMMONER_GROUP,
+ APM_3RD_ONLY_GROUP,
+ SUBCLASS_TANKER,
+ SUBCLASS_WARRIOR,
+ SUBCLASS_ROUGE,
+ SUBCLASS_ARCHER,
+ SUBCLASS_WIZARD,
+ SUBCLASS_SUMMON,
+ SUBCLASS_HEAL,
+ SUBCLASS_ENCHANTER,
+ SUBCLASS_SPEACIAL,
+ SUBCLASS_KAMAEL,
+ EXCEPT_KAMAEL_GROUP,
+ R_HUMANMAGE_GROUP,
+ R_HUMANFIGHTER_GROUP,
+ DIVISION_TANKER,
+ DIVISION_WARRIOR,
+ DIVISION_ROUGE,
+ DIVISION_ARCHER,
+ DIVISION_WIZARD,
+ DIVISION_SUMMON,
+ DIVISION_ENCHANTER,
+ DIVISION_HEAL,
+ HUMAN_FOURTH_CLASS_GROUP,
+ ELF_FOURTH_CLASS_GROUP,
+ DARKELF_FOURTH_CLASS_GROUP,
+ ORC_FOURTH_CLASS_GROUP,
+ DWARF_FOURTH_CLASS_GROUP,
+ FOURTH_LANCE_CLASS_GROUP,
+ FOURTH_BOW_CLASS_GROUP,
+ EQUIP_ENABLE_HEAVY_ATTACK,
+ EQUIP_ENABLE_HEAVY_DEFENSE,
+ EQUIP_ENABLE_LIGHT_HIT,
+ EQUIP_ENABLE_LIGHT_ENCHANT,
+ EQUIP_ENABLE_ROBE_MAGIC,
+ EQUIP_ENABLE_ROBE_RECOVERY,
+ DILLER_GROUP,
+ MAESTRO_GROUP,
+ MAESTRO_GROUP_CRAFT,
+ SUB_GROUP_WARRIOR2,
+ SUB_GROUP_ROGUE2,
+ SUB_GROUP_KNIGHT2,
+ SUB_GROUP_SUMMONER2,
+ SUB_GROUP_WIZARD2,
+ SUB_GROUP_HEALER2,
+ SUB_GROUP_ENCHANTER2,
+ G_CARTIA_PC_GROUP,
+ G_CARTIA_NPC_GROUP,
+ HEAVY_GROUP,
+ LIGHT_GROUP,
+ ROBE_GROUP,
+ M_WARRIOR_GROUP,
+ PHYSICS_CLASS_GROUP,
+ HEATSAND_SUMMON_CLASS_GROUP,
+ MAGIC_CLASS_GROUP,
+ LONG_DISTANCE_CLASS_GROUP,
+ CLOSE_DISTANCE_CLASS_GROUP,
+ HS_WIZARD_CLASS_GROUP,
+ HS_WARRIOR_CLASS_GROUP,
+ SUBCLASS_PALADIN,
+ SUBCLASS_DARKAVENGER,
+ SUBCLASS_TEMPLEKNIGHT,
+ SUBCLASS_SHILLIENKNIGHT,
+ SUBCLASS_GLADIATOR,
+ SUBCLASS_WARLORD,
+ SUBCLASS_DESTROYER,
+ SUBCLASS_TYRAN,
+ SUBCLASS_BERSERKER,
+ SUBCLASS_TREASUREHUNTER,
+ SUBCLASS_PLAINSWALKER,
+ SUBCLASS_ABYSSWALKER,
+ SUBCLASS_BOUNTYHUNTER,
+ SUBCLASS_HAWKEYE,
+ SUBCLASS_SILVERRANGER,
+ SUBCLASS_PHANTOMRANGER,
+ SUBCLASS_ARBALESTER,
+ SUBCLASS_SORCERER,
+ SUBCLASS_NECROMANCER,
+ SUBCLASS_SPELLSINGER,
+ SUBCLASS_SPELLHOWLER,
+ SUBCLASS_SOULBREAKER,
+ SUBCLASS_WARLOCK,
+ SUBCLASS_ELEMENTALSUMMONER,
+ SUBCLASS_PHANTOMSUMMONER,
+ SUBCLASS_BISHOP,
+ SUBCLASS_ELDER,
+ SUBCLASS_SHILLIENELDER,
+ SUBCLASS_PROPHET,
+ SUBCLASS_SWORDSINGER,
+ SUBCLASS_BLADEDANCER,
+ SUBCLASS_WARCRYER,
+ SUBCLASS_INSPECTOR,
+ WINDREFINE_ERTHEIA_GROUP,
+ WINDREFINE_ERTHEIA_GROUP1,
+ WINDREFINE_ERTHEIA_GROUP2,
+ ERTHEIA_ALL_CLASS,
+ ERTHEIA_FIRST_CLASS_GROUP,
+ ERTHEIA_SECOND_CLASS_GROUP,
+ ERTHEIA_THIRD_CLASS_GROUP,
+ ERTHEIA_FOURTH_CLASS_GROUP,
+ ERTHEIA_WIZARD_GROUP,
+ ERTHEIA_FIGHTER_GROUP,
+ ERTHEIA_THIRD_WIZARD_GROUP,
+ ERTHEIA_THIRD_FIGHTER_GROUP,
+ VANGUARD_OF_ADEN_FCC,
+ COMMON_MONSTER_FCC,
+ EQEIP_ENABLE_LHAND,
+ G_EV_MON_MINIGAME,
+ HEAVY_ARMOR_CLASS,
+ LIGHT_ARMOR_CLASS,
+ ROBE_CLASS,
+ EXCEPT_ERTHEIA_CLASS;
/**
* Finds category by it's name
diff --git a/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/gameserver/instancemanager/CeremonyOfChaosManager.java b/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/gameserver/instancemanager/CeremonyOfChaosManager.java
index 536650197b..7133977526 100644
--- a/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/gameserver/instancemanager/CeremonyOfChaosManager.java
+++ b/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/gameserver/instancemanager/CeremonyOfChaosManager.java
@@ -288,7 +288,7 @@ public class CeremonyOfChaosManager extends AbstractEventManager HERO_IDS = CategoryData.getInstance().getCategoryByType(CategoryType.AWAKEN_GROUP);
+ private static final Set HERO_IDS = CategoryData.getInstance().getCategoryByType(CategoryType.SIXTH_CLASS_GROUP);
private static final int COMP_START = Config.ALT_OLY_START_TIME; // 6PM
private static final int COMP_MIN = Config.ALT_OLY_MIN; // 00 mins
diff --git a/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/gameserver/model/zone/type/L2SayuneZone.java b/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/gameserver/model/zone/type/L2SayuneZone.java
index 0872062a68..ca1ec6ed1a 100644
--- a/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/gameserver/model/zone/type/L2SayuneZone.java
+++ b/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/gameserver/model/zone/type/L2SayuneZone.java
@@ -56,7 +56,7 @@ public class L2SayuneZone extends L2ZoneType
@Override
protected void onEnter(L2Character character)
{
- if (character.isPlayer() && (character.isInCategory(CategoryType.AWAKEN_GROUP) || Config.FREE_JUMPS_FOR_ALL) && !character.getActingPlayer().isMounted() && !character.isTransformed())
+ if (character.isPlayer() && (character.isInCategory(CategoryType.SIXTH_CLASS_GROUP) || Config.FREE_JUMPS_FOR_ALL) && !character.getActingPlayer().isMounted() && !character.isTransformed())
{
character.setInsideZone(ZoneId.SAYUNE, true);
ThreadPoolManager.execute(new FlyMoveStartTask(this, character.getActingPlayer()));
diff --git a/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/gameserver/network/clientpackets/RequestAcquireSkill.java b/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/gameserver/network/clientpackets/RequestAcquireSkill.java
index 5533d14129..9d97309efc 100644
--- a/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/gameserver/network/clientpackets/RequestAcquireSkill.java
+++ b/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/gameserver/network/clientpackets/RequestAcquireSkill.java
@@ -417,7 +417,7 @@ public final class RequestAcquireSkill implements IClientIncomingPacket
Util.handleIllegalPlayerAction(activeChar, "Player " + activeChar.getName() + " is requesting skill Id: " + _id + " level " + _level + " while Sub-Class is active!", IllegalActionPunishmentType.NONE);
return;
}
- if ((activeChar.getLevel() < 85) || !activeChar.isInCategory(CategoryType.AWAKEN_GROUP))
+ if ((activeChar.getLevel() < 85) || !activeChar.isInCategory(CategoryType.SIXTH_CLASS_GROUP))
{
activeChar.sendPacket(SystemMessageId.YOU_DO_NOT_HAVE_THE_NECESSARY_MATERIALS_OR_PREREQUISITES_TO_LEARN_THIS_SKILL);
Util.handleIllegalPlayerAction(activeChar, "Player " + activeChar.getName() + " is requesting skill Id: " + _id + " level " + _level + " while not being level 85 or awaken!", IllegalActionPunishmentType.NONE);
@@ -460,7 +460,7 @@ public final class RequestAcquireSkill implements IClientIncomingPacket
return;
}
- if ((activeChar.getLevel() < 85) || !activeChar.isInCategory(CategoryType.AWAKEN_GROUP))
+ if ((activeChar.getLevel() < 85) || !activeChar.isInCategory(CategoryType.SIXTH_CLASS_GROUP))
{
activeChar.sendPacket(SystemMessageId.YOU_DO_NOT_HAVE_THE_NECESSARY_MATERIALS_OR_PREREQUISITES_TO_LEARN_THIS_SKILL);
Util.handleIllegalPlayerAction(activeChar, "Player " + activeChar.getName() + " is requesting skill Id: " + _id + " level " + _level + " while not being level 85 or awaken!", IllegalActionPunishmentType.NONE);
diff --git a/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/gameserver/network/clientpackets/RequestAcquireSkillInfo.java b/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/gameserver/network/clientpackets/RequestAcquireSkillInfo.java
index 642b423b4b..6ceb8bc736 100644
--- a/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/gameserver/network/clientpackets/RequestAcquireSkillInfo.java
+++ b/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/gameserver/network/clientpackets/RequestAcquireSkillInfo.java
@@ -150,7 +150,7 @@ public final class RequestAcquireSkillInfo implements IClientIncomingPacket
}
case REVELATION:
{
- if ((activeChar.getLevel() < 85) || !activeChar.isInCategory(CategoryType.AWAKEN_GROUP))
+ if ((activeChar.getLevel() < 85) || !activeChar.isInCategory(CategoryType.SIXTH_CLASS_GROUP))
{
return;
}
diff --git a/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/gameserver/network/clientpackets/RequestExEnchantSkill.java b/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/gameserver/network/clientpackets/RequestExEnchantSkill.java
index 69d688bf34..c6547395b2 100644
--- a/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/gameserver/network/clientpackets/RequestExEnchantSkill.java
+++ b/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/gameserver/network/clientpackets/RequestExEnchantSkill.java
@@ -82,7 +82,7 @@ public final class RequestExEnchantSkill implements IClientIncomingPacket
return;
}
- if (!player.isInCategory(CategoryType.AWAKEN_GROUP))
+ if (!player.isInCategory(CategoryType.SIXTH_CLASS_GROUP))
{
return;
}
diff --git a/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/gameserver/network/clientpackets/RequestExEnchantSkillInfo.java b/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/gameserver/network/clientpackets/RequestExEnchantSkillInfo.java
index 596bc37bae..6c175300cf 100644
--- a/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/gameserver/network/clientpackets/RequestExEnchantSkillInfo.java
+++ b/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/gameserver/network/clientpackets/RequestExEnchantSkillInfo.java
@@ -61,7 +61,7 @@ public final class RequestExEnchantSkillInfo implements IClientIncomingPacket
return;
}
- if (!activeChar.isInCategory(CategoryType.AWAKEN_GROUP))
+ if (!activeChar.isInCategory(CategoryType.SIXTH_CLASS_GROUP))
{
return;
}
diff --git a/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/gameserver/network/clientpackets/mentoring/ConfirmMenteeAdd.java b/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/gameserver/network/clientpackets/mentoring/ConfirmMenteeAdd.java
index ec5e7516a8..0c907de10f 100644
--- a/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/gameserver/network/clientpackets/mentoring/ConfirmMenteeAdd.java
+++ b/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/gameserver/network/clientpackets/mentoring/ConfirmMenteeAdd.java
@@ -115,7 +115,7 @@ public class ConfirmMenteeAdd implements IClientIncomingPacket
mentor.sendPacket(SystemMessageId.THAT_PLAYER_IS_NOT_ONLINE);
return false;
}
- else if (!mentor.isInCategory(CategoryType.AWAKEN_GROUP))
+ else if (!mentor.isInCategory(CategoryType.SIXTH_CLASS_GROUP))
{
mentor.sendPacket(SystemMessageId.YOU_MUST_AWAKEN_IN_ORDER_TO_BECOME_A_MENTOR);
return false;
diff --git a/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/gameserver/network/clientpackets/sayune/RequestFlyMoveStart.java b/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/gameserver/network/clientpackets/sayune/RequestFlyMoveStart.java
index 4ddb30ba78..50b48de960 100644
--- a/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/gameserver/network/clientpackets/sayune/RequestFlyMoveStart.java
+++ b/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/gameserver/network/clientpackets/sayune/RequestFlyMoveStart.java
@@ -44,7 +44,7 @@ public class RequestFlyMoveStart implements IClientIncomingPacket
public void run(L2GameClient client)
{
final L2PcInstance activeChar = client.getActiveChar();
- if ((activeChar == null) || !activeChar.isInsideZone(ZoneId.SAYUNE) || activeChar.hasRequest(SayuneRequest.class) || !activeChar.isInCategory(CategoryType.AWAKEN_GROUP))
+ if ((activeChar == null) || !activeChar.isInsideZone(ZoneId.SAYUNE) || activeChar.hasRequest(SayuneRequest.class) || !activeChar.isInCategory(CategoryType.SIXTH_CLASS_GROUP))
{
return;
}
diff --git a/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/gameserver/network/serverpackets/mentoring/ExMentorList.java b/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/gameserver/network/serverpackets/mentoring/ExMentorList.java
index 81e7216e87..bfd2044055 100644
--- a/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/gameserver/network/serverpackets/mentoring/ExMentorList.java
+++ b/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/gameserver/network/serverpackets/mentoring/ExMentorList.java
@@ -48,7 +48,7 @@ public class ExMentorList implements IClientOutgoingPacket
_type = 0x02;
_mentees = Arrays.asList(MentorManager.getInstance().getMentor(activeChar.getObjectId()));
}
- else if (activeChar.isInCategory(CategoryType.AWAKEN_GROUP)) // Not a mentor, Not a mentee, so can be a mentor
+ else if (activeChar.isInCategory(CategoryType.SIXTH_CLASS_GROUP)) // Not a mentor, Not a mentee, so can be a mentor
{
_mentees = Collections.emptyList();
_type = 0x01;
diff --git a/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/gameserver/network/serverpackets/mentoring/ListMenteeWaiting.java b/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/gameserver/network/serverpackets/mentoring/ListMenteeWaiting.java
index 97226c02a6..3bd29141b5 100644
--- a/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/gameserver/network/serverpackets/mentoring/ListMenteeWaiting.java
+++ b/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/gameserver/network/serverpackets/mentoring/ListMenteeWaiting.java
@@ -40,7 +40,7 @@ public class ListMenteeWaiting implements IClientOutgoingPacket
_page = page;
for (L2PcInstance player : L2World.getInstance().getPlayers())
{
- if ((player.getLevel() >= minLevel) && (player.getLevel() <= maxLevel) && !player.isMentee() && !player.isMentor() && !player.isInCategory(CategoryType.AWAKEN_GROUP))
+ if ((player.getLevel() >= minLevel) && (player.getLevel() <= maxLevel) && !player.isMentee() && !player.isMentor() && !player.isInCategory(CategoryType.SIXTH_CLASS_GROUP))
{
_possibleCandiates.add(player);
}