Fix: Disable raid tasks if another event is ongoing

module/campaign/campaign_event.py

@@ -17,14 +17,18 @@ class CampaignEvent(CampaignStatus):
             tasks (list[str]): Task name
         """
         with self.config.multi_set():
+            # Disable normal events
             for task in tasks:
-                if task in ['GemsFarming']:
+                if task in GEMS_FARMINGS:
                     continue
                 keys = f'{task}.Scheduler.Enable'
                 logger.info(f'Disable task `{task}`')
                 self.config.cross_set(keys=keys, value=False)
 
-            for task in ['GemsFarming']:
+            # Reset GemsFarming
+            for task in tasks:
+                if task not in GEMS_FARMINGS:
+                    continue
                 name = self.config.cross_get(keys=f'{task}.Campaign.Name', default='2-4')
                 if not self.stage_is_main(name):
                     logger.info(f'Reset GemsFarming to 2-4')
@@ -50,7 +54,7 @@ class CampaignEvent(CampaignStatus):
         command = self.config.Scheduler_Command
         if limit <= 0 or command not in tasks:
             return False
-        if command == 'GemsFarming' and self.stage_is_main(self.config.Campaign_Name):
+        if command in GEMS_FARMINGS and self.stage_is_main(self.config.Campaign_Name):
             return False
 
         pt = self.get_event_pt()
@@ -75,7 +79,7 @@ class CampaignEvent(CampaignStatus):
         command = self.config.Scheduler_Command
         if command not in tasks or limit == DEFAULT_TIME:
             return False
-        if command == 'GemsFarming' and self.stage_is_main(self.config.Campaign_Name):
+        if command in GEMS_FARMINGS and self.stage_is_main(self.config.Campaign_Name):
             return False
 
         now = datetime.now().replace(microsecond=0)
@@ -128,7 +132,7 @@ class CampaignEvent(CampaignStatus):
         """
         if self.appear(CAMPAIGN_MENU_NO_EVENT, offset=(20, 20)):
             logger.info('Event unavailable, disable task')
-            tasks = EVENTS + COALITIONS + GEMS_FARMINGS
+            tasks = EVENTS + RAIDS + COALITIONS + GEMS_FARMINGS
             self._disable_tasks(tasks)
             self.config.task_stop()
         else:
@@ -177,6 +181,26 @@ class CampaignEvent(CampaignStatus):
                 self.ui_goto(page_coalition)
                 return True
 
+    def disable_raid_on_event(self):
+        """
+        Disable raid tasks (or coalition) when entered an event,
+        to be foolproof if user forgot to disable raid tasks when raid is over and another event is ongoing
+        """
+        command = self.config.Scheduler_Command
+        if command not in EVENTS + GEMS_FARMINGS:
+            return False
+        if command in GEMS_FARMINGS and self.stage_is_main(self.config.Campaign_Name):
+            return False
+
+        tasks = RAIDS + COALITIONS + MARITIME_ESCORTS
+        tasks = [t for t in tasks if self.config.is_task_enabled(t)]
+        if tasks:
+            logger.info('New event ongoing, disable old event tasks')
+            self._disable_tasks(tasks)
+            return True
+        else:
+            return False
+
     @staticmethod
     def stage_is_main(name) -> bool:
         """

module/campaign/run.py

@@ -372,6 +372,7 @@ class CampaignRun(CampaignEvent):
                     self.campaign.ensure_campaign_ui(name=self.stage, mode=mode)
             else:
                 self.campaign.ensure_campaign_ui(name=self.stage, mode=mode)
+            self.disable_raid_on_event()
             self.handle_commission_notice()
 
             # if in hard mode, check remain times