Add: distangle Gemsfarming.Campaign.Event from Event.Campaign.Event for multi event

Author: guoh064

module/campaign/run.py

@@ -170,7 +170,7 @@ def handle_stage_name(self, name, folder, mode='normal'):
                 logger.info(f'Stage name {name} is from campaign_main')
                 folder = 'campaign_main'
             else:
-                folder = self.config.cross_get('Event.Campaign.Event')
+                folder = self.config.cross_get('GemsFarming.Campaign.Event')
                 if folder is not None:
                     logger.info(f'Stage name {name} is from event {folder}')
                 else:

module/config/argument/args.json

@@ -1645,7 +1645,6 @@
           "event_20220915_cn",
           "event_20260417_cn"
         ],
-        "display": "hide",
         "option_cn": [
           "event_20260417_cn"
         ],

module/config/argument/override.yaml

@@ -28,8 +28,6 @@ Main3:
     Event: campaign_main
 GemsFarming:
   Campaign:
-    Event:
-      value: campaign_main
     Mode: normal
     UseClearMode: true
     UseFleetLock: true

module/config/config_updater.py

@@ -647,22 +647,24 @@ def config_update(self, old, is_template=False):
         if not is_template:
             for task in EVENTS + RAIDS + COALITIONS:
                 opts = deep_get(self.args, keys=f'{task}.Campaign.Event.option_{server}', default=[])
-                if not deep_get(new, keys=f'{task}.Campaign.Event', default='campaign_main') in opts:
+                if opts and not deep_get(new, keys=f'{task}.Campaign.Event', default='campaign_main') in opts:
                     deep_set(new,
                              keys=f'{task}.Campaign.Event',
                              value=opts[0])
 
             for task in ['GemsFarming']:
-                if deep_get(new, keys=f'{task}.Campaign.Event', default='campaign_main') != 'campaign_main':
+                opts = deep_get(self.args, keys=f'{task}.Campaign.Event.option_{server}', default=[])
+                if opts and deep_get(new, keys=f'{task}.Campaign.Event', default='campaign_main') not in opts:
                     deep_set(new,
                              keys=f'{task}.Campaign.Event',
-                             value=deep_get(self.args, f'{task}.Campaign.Event.option_{server}')[0])
+                             value=opts[0])
         # War archive does not allow campaign_main
         for task in WAR_ARCHIVES:
-            if deep_get(new, keys=f'{task}.Campaign.Event', default='campaign_main') == 'campaign_main':
+            opts = deep_get(self.args, keys=f'{task}.Campaign.Event.option_{server}', default=[])
+            if opts and deep_get(new, keys=f'{task}.Campaign.Event', default='campaign_main') == 'campaign_main':
                 deep_set(new,
                          keys=f'{task}.Campaign.Event',
-                         value=deep_get(self.args, f'{task}.Campaign.Event.option_{server}')[0])
+                         value=opts[0])
 
         # Events does not allow default stage 12-4
         def default_stage(t, stage):

module/webui/app.py

@@ -349,6 +349,14 @@ def set_group(self, group, arg_dict, config, task):
             if output_kwargs["widget_type"] == "select" and isinstance(server_options, list) and server_options:
                 options = server_options
             output_kwargs["options"] = options
+            if (
+                task == "GemsFarming"
+                and group_name == "Campaign"
+                and arg_name == "Event"
+                and output_kwargs["widget_type"] == "select"
+                and len(options) == 1
+            ):
+                continue
             if output_kwargs["widget_type"] == "select" and len(options) == 1:
                 only_option = options[0]
                 if only_option in output_kwargs.get("option_bold", []):