Skip to content

Commit 719f225

Browse files
LmeSzincLmeSzinc
committed
Gui: Show event as stored to prevent someone trying to select it
1 parent 9ccf678 commit 719f225

3 files changed

Lines changed: 114 additions & 11 deletions

File tree

‎module/config/argument/args.json‎

Lines changed: 91 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -1657,6 +1657,9 @@
16571657
],
16581658
"option_tw": [
16591659
"event_20250814_cn"
1660+
],
1661+
"option_bold": [
1662+
"event_20250814_cn"
16601663
]
16611664
},
16621665
"Mode": {
@@ -1916,7 +1919,7 @@
19161919
"value": "12-4"
19171920
},
19181921
"Event": {
1919-
"type": "select",
1922+
"type": "state",
19201923
"value": "campaign_main",
19211924
"option": [
19221925
"event_20250814_cn"
@@ -1932,6 +1935,9 @@
19321935
],
19331936
"option_tw": [
19341937
"event_20250814_cn"
1938+
],
1939+
"option_bold": [
1940+
"event_20250814_cn"
19351941
]
19361942
},
19371943
"Mode": {
@@ -2306,7 +2312,7 @@
23062312
"value": "12-4"
23072313
},
23082314
"Event": {
2309-
"type": "select",
2315+
"type": "state",
23102316
"value": "campaign_main",
23112317
"option": [
23122318
"event_20250814_cn"
@@ -2322,6 +2328,9 @@
23222328
],
23232329
"option_tw": [
23242330
"event_20250814_cn"
2331+
],
2332+
"option_bold": [
2333+
"event_20250814_cn"
23252334
]
23262335
},
23272336
"Mode": {
@@ -2713,7 +2722,7 @@
27132722
"display": "hide"
27142723
},
27152724
"Event": {
2716-
"type": "select",
2725+
"type": "state",
27172726
"value": "campaign_main",
27182727
"option": [
27192728
"raid_20250116"
@@ -2729,6 +2738,9 @@
27292738
],
27302739
"option_tw": [
27312740
"raid_20250116"
2741+
],
2742+
"option_bold": [
2743+
"raid_20250116"
27322744
]
27332745
},
27342746
"Mode": {
@@ -3109,7 +3121,7 @@
31093121
"display": "hide"
31103122
},
31113123
"Event": {
3112-
"type": "select",
3124+
"type": "state",
31133125
"value": "campaign_main",
31143126
"option": [
31153127
"coalition_20240627",
@@ -3126,6 +3138,10 @@
31263138
],
31273139
"option_tw": [
31283140
"coalition_20240627"
3141+
],
3142+
"option_bold": [
3143+
"coalition_20240627",
3144+
"coalition_20250626"
31293145
]
31303146
},
31313147
"Mode": {
@@ -3614,6 +3630,48 @@
36143630
"war_archives_20190321_en",
36153631
"war_archives_20191031_en",
36163632
"war_archives_20181020_en"
3633+
],
3634+
"option_bold": [
3635+
"war_archives_20180607_cn",
3636+
"war_archives_20180726_cn",
3637+
"war_archives_20181020_en",
3638+
"war_archives_20181026_en",
3639+
"war_archives_20181227_cn",
3640+
"war_archives_20190221_en",
3641+
"war_archives_20190314_en",
3642+
"war_archives_20190321_en",
3643+
"war_archives_20190620_en",
3644+
"war_archives_20190911_cn",
3645+
"war_archives_20191010_en",
3646+
"war_archives_20191031_en",
3647+
"war_archives_20200312_cn",
3648+
"war_archives_20200507_cn",
3649+
"war_archives_20200603_cn",
3650+
"war_archives_20200806_cn",
3651+
"war_archives_20200820_cn",
3652+
"war_archives_20200903_cn",
3653+
"war_archives_20200917_cn",
3654+
"war_archives_20201012_cn",
3655+
"war_archives_20201029_cn",
3656+
"war_archives_20201229_cn",
3657+
"war_archives_20210225_cn",
3658+
"war_archives_20210325_cn",
3659+
"war_archives_20210422_cn",
3660+
"war_archives_20210527_cn",
3661+
"war_archives_20210624_cn",
3662+
"war_archives_20210819_cn",
3663+
"war_archives_20210916_cn",
3664+
"war_archives_20211014_cn",
3665+
"war_archives_20211028_cn",
3666+
"war_archives_20211111_cn",
3667+
"war_archives_20211229_cn",
3668+
"war_archives_20220210_cn",
3669+
"war_archives_20220224_cn",
3670+
"war_archives_20220324_cn",
3671+
"war_archives_20220414_cn",
3672+
"war_archives_20220428_cn",
3673+
"war_archives_20220526_cn",
3674+
"war_archives_20220728_cn"
36173675
]
36183676
},
36193677
"Mode": {
@@ -3999,7 +4057,7 @@
39994057
"display": "hide"
40004058
},
40014059
"Event": {
4002-
"type": "select",
4060+
"type": "state",
40034061
"value": "campaign_main",
40044062
"option": [
40054063
"event_20250814_cn"
@@ -4015,6 +4073,9 @@
40154073
],
40164074
"option_tw": [
40174075
"event_20250814_cn"
4076+
],
4077+
"option_bold": [
4078+
"event_20250814_cn"
40184079
]
40194080
},
40204081
"Mode": {
@@ -4406,7 +4467,7 @@
44064467
"display": "hide"
44074468
},
44084469
"Event": {
4409-
"type": "select",
4470+
"type": "state",
44104471
"value": "campaign_main",
44114472
"option": [
44124473
"event_20250814_cn"
@@ -4422,6 +4483,9 @@
44224483
],
44234484
"option_tw": [
44244485
"event_20250814_cn"
4486+
],
4487+
"option_bold": [
4488+
"event_20250814_cn"
44254489
]
44264490
},
44274491
"Mode": {
@@ -4813,7 +4877,7 @@
48134877
"display": "hide"
48144878
},
48154879
"Event": {
4816-
"type": "select",
4880+
"type": "state",
48174881
"value": "campaign_main",
48184882
"option": [
48194883
"event_20250814_cn"
@@ -4829,6 +4893,9 @@
48294893
],
48304894
"option_tw": [
48314895
"event_20250814_cn"
4896+
],
4897+
"option_bold": [
4898+
"event_20250814_cn"
48324899
]
48334900
},
48344901
"Mode": {
@@ -5220,7 +5287,7 @@
52205287
"display": "hide"
52215288
},
52225289
"Event": {
5223-
"type": "select",
5290+
"type": "state",
52245291
"value": "campaign_main",
52255292
"option": [
52265293
"event_20250814_cn"
@@ -5236,6 +5303,9 @@
52365303
],
52375304
"option_tw": [
52385305
"event_20250814_cn"
5306+
],
5307+
"option_bold": [
5308+
"event_20250814_cn"
52395309
]
52405310
},
52415311
"Mode": {
@@ -5617,7 +5687,7 @@
56175687
"display": "hide"
56185688
},
56195689
"Event": {
5620-
"type": "select",
5690+
"type": "state",
56215691
"value": "campaign_main",
56225692
"option": [
56235693
"event_20250814_cn"
@@ -5633,6 +5703,9 @@
56335703
],
56345704
"option_tw": [
56355705
"event_20250814_cn"
5706+
],
5707+
"option_bold": [
5708+
"event_20250814_cn"
56365709
]
56375710
},
56385711
"Mode": {
@@ -6021,7 +6094,7 @@
60216094
"display": "hide"
60226095
},
60236096
"Event": {
6024-
"type": "select",
6097+
"type": "state",
60256098
"value": "campaign_main",
60266099
"option": [
60276100
"raid_20250116"
@@ -6037,6 +6110,9 @@
60376110
],
60386111
"option_tw": [
60396112
"raid_20250116"
6113+
],
6114+
"option_bold": [
6115+
"raid_20250116"
60406116
]
60416117
},
60426118
"Mode": {
@@ -6245,7 +6321,7 @@
62456321
"display": "hide"
62466322
},
62476323
"Event": {
6248-
"type": "select",
6324+
"type": "state",
62496325
"value": "campaign_main",
62506326
"option": [
62516327
"coalition_20240627",
@@ -6262,6 +6338,10 @@
62626338
],
62636339
"option_tw": [
62646340
"coalition_20240627"
6341+
],
6342+
"option_bold": [
6343+
"coalition_20240627",
6344+
"coalition_20250626"
62656345
]
62666346
},
62676347
"Mode": {

‎module/config/argument/override.yaml‎

Lines changed: 22 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -52,10 +52,14 @@ GemsFarming:
5252
Event:
5353
Campaign:
5454
Mode: normal
55+
Event:
56+
type: state
5557
AmbushEvade: true
5658
Event2:
5759
Campaign:
5860
Mode: normal
61+
Event:
62+
type: state
5963
AmbushEvade: true
6064
EventA:
6165
Scheduler:
@@ -64,6 +68,8 @@ EventA:
6468
ServerUpdate: 00:00
6569
Campaign:
6670
Name: dynamic
71+
Event:
72+
type: state
6773
Mode: normal
6874
Use2xBook: false
6975
AmbushEvade: true
@@ -80,6 +86,8 @@ EventB:
8086
ServerUpdate: 00:00
8187
Campaign:
8288
Name: dynamic
89+
Event:
90+
type: state
8391
Mode: normal
8492
Use2xBook: false
8593
AmbushEvade: true
@@ -96,6 +104,8 @@ EventC:
96104
ServerUpdate: 00:00
97105
Campaign:
98106
Name: dynamic
107+
Event:
108+
type: state
99109
Mode: normal
100110
Use2xBook: false
101111
AmbushEvade: true
@@ -112,6 +122,8 @@ EventD:
112122
ServerUpdate: 00:00
113123
Campaign:
114124
Name: dynamic
125+
Event:
126+
type: state
115127
Mode: normal
116128
Use2xBook: false
117129
AmbushEvade: true
@@ -128,6 +140,8 @@ EventSp:
128140
ServerUpdate: 00:00
129141
Campaign:
130142
Name: sp
143+
Event:
144+
type: state
131145
Mode: normal
132146
Use2xBook: false
133147
AmbushEvade: true
@@ -142,6 +156,8 @@ EventSp:
142156
Raid:
143157
Campaign:
144158
Name: dynamic
159+
Event:
160+
type: state
145161
Mode: normal
146162
UseClearMode: true
147163
UseFleetLock: true
@@ -182,6 +198,8 @@ RaidDaily:
182198
ServerUpdate: 00:00
183199
Campaign:
184200
Name: dynamic
201+
Event:
202+
type: state
185203
Mode: normal
186204
UseClearMode: true
187205
UseFleetLock: true
@@ -211,6 +229,8 @@ Coalition:
211229
FailureInterval: 30
212230
ServerUpdate: 00:00
213231
Campaign:
232+
Event:
233+
type: state
214234
Name: dynamic
215235
Mode: normal
216236
UseClearMode: true
@@ -239,6 +259,8 @@ CoalitionSp:
239259
ServerUpdate: 00:00
240260
Campaign:
241261
Name: sp
262+
Event:
263+
type: state
242264
Mode: normal
243265
UseClearMode: true
244266
UseFleetLock: true

‎module/config/config_updater.py‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -466,6 +466,7 @@ def insert(key):
466466
latest[server] = deep_get(self.args, keys=f'{task}.Campaign.Event.option_{server}', default=[])
467467
options = set().union(*latest.values())
468468
options = sorted([option for option in options if option != 'campaign_main'])
469+
deep_set(self.args, keys=f'{task}.Campaign.Event.option_bold', value=options)
469470
deep_set(self.args, keys=f'{task}.Campaign.Event.option', value=options)
470471

471472
@staticmethod

0 commit comments

Comments
 (0)