Merge branch 'LmeSzinc:master' into dev-minigame-for-pr

module/config/config.py

@@ -261,7 +261,7 @@ class AzurLaneConfig(ConfigUpdater, ManualConfig, GeneratedConfig, ConfigWatcher
         self.bind(self.task)
         self.save()
 
-    def config_override(self):
+    def override(self, **kwargs):
         now = datetime.now().replace(microsecond=0)
         limited = set()
 
@@ -295,7 +295,6 @@ class AzurLaneConfig(ConfigUpdater, ManualConfig, GeneratedConfig, ConfigWatcher
         limit_next_run(["OpsiArchive"], limit=now + timedelta(days=7, seconds=-1))
         limit_next_run(self.args.keys(), limit=now + timedelta(hours=24, seconds=-1))
 
-    def override(self, **kwargs):
         """
         Override anything you want.
         Variables stall remain overridden even config is reloaded from yaml file.
@@ -305,6 +304,8 @@ class AzurLaneConfig(ConfigUpdater, ManualConfig, GeneratedConfig, ConfigWatcher
             self.overridden[arg] = value
             super().__setattr__(arg, value)
 
+    config_override = override
+
     def set_record(self, **kwargs):
         """
         Args:

module/map/map_base.py

@@ -199,8 +199,10 @@ class CampaignMap:
     @fortress_data.setter
     def fortress_data(self, data):
         enemy, block = data
-        enemy = self.to_selected((enemy,) if not isinstance(enemy, (tuple, list)) else enemy)
-        block = self.to_selected((block,) if not isinstance(block, (tuple, list)) else block)
+        if not isinstance(enemy, SelectedGrids):
+            enemy = self.to_selected((enemy,) if not isinstance(enemy, (tuple, list)) else enemy)
+        if not isinstance(block, SelectedGrids):
+            block = self.to_selected((block,) if not isinstance(block, (tuple, list)) else block)
         self._fortress_data = [enemy, block]
 
     def _load_fortress_data(self, data):