Merge pull request #5746 from LmeSzinc/dev

Bug fix

campaign/war_archives_20240725_cn/campaign_base.py

@@ -4,6 +4,12 @@ from ..campaign_war_archives.campaign_base import CampaignBase as CampaignBase_
 class CampaignBase(CampaignBase_):
     def campaign_set_chapter_event(self, chapter, mode='normal'):
         self.ui_goto_sp()
+        if chapter in ['a', 'b', 'as', 'bs', 't', 'ts', 'tss']:
+            self.campaign_ensure_mode('normal')
+        elif chapter in ['c', 'd', 'cs', 'ds', 'ht', 'hts']:
+            self.campaign_ensure_mode('hard')
+        elif chapter == 'ex_sp':
+            self.campaign_ensure_mode('ex')
         self.campaign_ensure_chapter(chapter)
         return True
 
@@ -18,4 +24,6 @@ class CampaignBase(CampaignBase_):
         if mode == 'hard':
             self.config.override(Campaign_Mode='hard')
 
-        self.campaign_ensure_mode_20241219(mode)
+        # this event only have chapter T/HT and chapter SP, and war archive does not have SP
+        # so there is no mode switch buttons
+        # self.campaign_ensure_mode_20241219(mode)

module/config/config_manual.py

@@ -121,7 +121,7 @@ class ManualConfig:
     MAP_CHAPTER_SWITCH_20241219_SPEX = False
     # Since event_20241219_cn chapter B unlocks event startup
     # which means chapter AB are continuous
-    STAGE_INCREASE_AB = False
+    STAGE_INCREASE_AB = True
     # Insert anything to STAGE_INCREASE
     STAGE_INCREASE_CUSTOM = ''
     MAP_HAS_CLEAR_PERCENTAGE = True

module/handler/enemy_searching.py

@@ -120,6 +120,10 @@ class EnemySearchingHandler(InfoHandler):
             # although here expects an enemy searching animation.
             if self.handle_in_stage():
                 return True
+            # immediately enter submarine combat in W16
+            if hasattr(self, 'is_combat_loading') and self.is_combat_loading():
+                logger.warning('Entered map with is_combat_loading appeared')
+                break
             if self.handle_auto_search_exit(drop=drop):
                 timeout.limit = 10
                 timeout.reset()

module/handler/fast_forward.py

@@ -372,8 +372,7 @@ class FastForwardHandler(AutoSearchHandler):
         # Insert custom increase logic
         if self.config.STAGE_INCREASE_AB:
             stage_increase = [
-                'A1 > A2 > A3 > B1 > B2 > B3',
+                'A1 > A2 > A3 > B1 > B2 > B3',                
-                'C1 > C2 > C3 > D1 > D2 > D3',
             ] + stage_increase
         custom = self.config.STAGE_INCREASE_CUSTOM
         if custom:

module/map/fleet.py

@@ -102,7 +102,7 @@ class Fleet(Camera, AmbushHandler):
             self.show_fleet()
             self.hp_get()
             self.lv_get()
-            self.handle_strategy(index=self.fleet_current_index)
+            self.handle_strategy(index=self.fleet_show_index)
             return True
         else:
             return False