Refactor: Correct fleet_2 and fleet_boss uses

campaign/campaign_main/campaign_10_1.py

@@ -69,4 +69,4 @@ class Campaign(CampaignBase):
                 if self.clear_roadblocks([road_main]):
                     return True
 
-        return self.fleet_2.clear_boss()
+        return self.fleet_boss.clear_boss()

campaign/campaign_main/campaign_10_2.py

@@ -86,4 +86,4 @@ class Campaign(CampaignBase):
                 if self.clear_roadblocks([road_main]):
                     return True
 
-        return self.fleet_2.clear_boss()
+        return self.fleet_boss.clear_boss()

campaign/campaign_main/campaign_10_3.py

@@ -85,4 +85,4 @@ class Campaign(CampaignBase):
                 if self.clear_roadblocks([road_main]):
                     return True
 
-        return self.fleet_2.clear_boss()
+        return self.fleet_boss.clear_boss()

campaign/campaign_main/campaign_10_4.py

@@ -86,4 +86,4 @@ class Campaign(CampaignBase):
                 if self.clear_potential_roadblocks([road_main]):
                     return True
 
-        return self.fleet_2.clear_boss()
+        return self.fleet_boss.clear_boss()

campaign/campaign_main/campaign_11_1.py

@@ -68,4 +68,4 @@ class Campaign(CampaignBase):
                 if self.clear_roadblocks([road_main]):
                     return True
 
-        return self.fleet_2.clear_boss()
+        return self.fleet_boss.clear_boss()

campaign/campaign_main/campaign_11_2.py

@@ -83,7 +83,7 @@ class Campaign(CampaignBase):
                 if self.clear_roadblocks([road_main]):
                     return True
 
-        return self.fleet_2.clear_boss()
+        return self.fleet_boss.clear_boss()
 
     def handle_boss_appear_refocus(self, preset=(-3, -2)):
         return super().handle_boss_appear_refocus(preset)

campaign/campaign_main/campaign_12_1.py

@@ -85,4 +85,4 @@ class Campaign(CampaignBase):
                 if self.clear_roadblocks([road_main]):
                     return True
 
-        return self.fleet_2.clear_boss()
+        return self.fleet_boss.clear_boss()

campaign/campaign_main/campaign_12_2.py

@@ -65,4 +65,4 @@ class Campaign(CampaignBase):
                 if self.clear_roadblocks([road_main]):
                     return True
 
-        return self.fleet_2.clear_boss()
+        return self.fleet_boss.clear_boss()

campaign/campaign_main/campaign_12_3.py

@@ -65,4 +65,4 @@ class Campaign(CampaignBase):
                 if self.clear_roadblocks([road_main]):
                     return True
 
-        return self.fleet_2.clear_boss()
+        return self.fleet_boss.clear_boss()

campaign/campaign_main/campaign_7_1.py

@@ -52,7 +52,7 @@ class Campaign(CampaignBase):
     def battle_5(self):
         self.clear_all_mystery()
 
-        return self.fleet_2.brute_clear_boss()
+        return self.fleet_boss.brute_clear_boss()
 
     def handle_boss_appear_refocus(self, preset=(-3, -2)):
         return super().handle_boss_appear_refocus(preset)

campaign/campaign_main/campaign_7_2.py

@@ -87,4 +87,4 @@ class Campaign(CampaignBase):
         if self.fleet_at(G3, fleet=2) and H3.is_mystery:
             self.fleet_2.clear_chosen_mystery(H3)
 
-        return self.fleet_2.clear_boss()
+        return self.fleet_boss.clear_boss()

campaign/campaign_main/campaign_9_1.py

@@ -71,4 +71,4 @@ class Campaign(CampaignBase):
                 if self.clear_roadblocks([road_main]):
                     return True
 
-        return self.fleet_2.clear_boss()
+        return self.fleet_boss.clear_boss()

campaign/campaign_main/campaign_9_2.py

@@ -103,4 +103,4 @@ class Campaign(CampaignBase):
                 if self.clear_roadblocks([road_main]):
                     return True
 
-        return self.fleet_2.clear_boss()
+        return self.fleet_boss.clear_boss()

campaign/campaign_main/campaign_9_3.py

@@ -79,4 +79,4 @@ class Campaign(CampaignBase):
                 if self.clear_roadblocks([road_main]):
                     return True
 
-        return self.fleet_2.clear_boss()
+        return self.fleet_boss.clear_boss()

campaign/campaign_main/campaign_9_4.py

@@ -82,4 +82,4 @@ class Campaign(CampaignBase):
                 if self.clear_roadblocks([road_main]):
                     return True
 
-        return self.fleet_2.clear_boss()
+        return self.fleet_boss.clear_boss()

campaign/event_20200227_cn/d3.py

@@ -84,4 +84,4 @@ class Campaign(CampaignBase):
         return self.battle_default()
 
     def battle_6(self):
-        return self.fleet_2.clear_boss()
+        return self.fleet_boss.clear_boss()

campaign/event_20200312_cn/sp3.py

@@ -79,7 +79,7 @@ class Campaign(CampaignBase):
     battle_4 = battle_0
 
     def battle_5(self):
-        return self.fleet_2.clear_boss()
+        return self.fleet_boss.clear_boss()
 
     def handle_in_stage(self):
         """

campaign/event_20200326_cn/b2.py

@@ -52,4 +52,4 @@ class Campaign(CampaignBase):
         return self.battle_default()
 
     def battle_5(self):
-        return self.fleet_2.clear_boss()
+        return self.fleet_boss.clear_boss()

campaign/event_20200326_cn/b3.py

@@ -52,4 +52,4 @@ class Campaign(CampaignBase):
         return self.battle_default()
 
     def battle_5(self):
-        return self.fleet_2.clear_boss()
+        return self.fleet_boss.clear_boss()

campaign/event_20200326_cn/d3.py

@@ -80,4 +80,4 @@ class Campaign(CampaignBase):
         return self.battle_default()
 
     def battle_6(self):
-        return self.fleet_2.clear_boss()
+        return self.fleet_boss.clear_boss()

campaign/event_20200423_cn/d3.py

@@ -59,4 +59,4 @@ class Campaign(CampaignBase):
         return self.battle_default()
 
     def battle_6(self):
-        return self.fleet_2.clear_boss()
+        return self.fleet_boss.clear_boss()

campaign/event_20200521_cn/d1.py

@@ -81,4 +81,4 @@ class Campaign(CampaignBase):
         return self.battle_default()
 
     def battle_5(self):
-        return self.fleet_2.brute_clear_boss()
+        return self.fleet_boss.brute_clear_boss()

campaign/event_20200521_cn/d3.py

@@ -91,4 +91,4 @@ class Campaign(CampaignBase):
         return self.battle_default()
 
     def battle_6(self):
-        return self.fleet_2.brute_clear_boss()
+        return self.fleet_boss.brute_clear_boss()

campaign/event_20200521_en/b2.py

@@ -73,5 +73,5 @@ class Campaign(CampaignBase):
         return self.battle_default()
 
     def battle_5(self):
-        return self.fleet_2.clear_boss()
+        return self.fleet_boss.clear_boss()
 

campaign/event_20200521_en/b3.py

@@ -81,6 +81,6 @@ class Campaign(CampaignBase):
         return self.battle_default()
 
     def battle_5(self):
-        return self.fleet_2.clear_boss()
+        return self.fleet_boss.clear_boss()
 
 

campaign/event_20200521_en/d2.py

@@ -78,4 +78,4 @@ class Campaign(CampaignBase):
         return self.battle_default()
 
     def battle_6(self):
-        return self.fleet_2.clear_boss()
+        return self.fleet_boss.clear_boss()

campaign/event_20200521_en/d3.py

@@ -90,5 +90,5 @@ class Campaign(CampaignBase):
         return self.battle_default()
 
     def battle_6(self):
-        return self.fleet_2.clear_boss()
+        return self.fleet_boss.clear_boss()
 

campaign/event_20200611_en/a3.py

@@ -44,4 +44,4 @@ class Campaign(CampaignBase):
         return self.battle_default()
 
     def battle_4(self):
-        return self.fleet_2.clear_potential_boss()
+        return self.fleet_boss.clear_potential_boss()

campaign/event_20200611_en/b2.py

@@ -60,4 +60,4 @@ class Campaign(CampaignBase):
         return self.battle_default()
 
     def battle_5(self):
-        return self.fleet_2.brute_clear_boss()
+        return self.fleet_boss.brute_clear_boss()

campaign/event_20200611_en/b3.py

@@ -74,4 +74,4 @@ class Campaign(CampaignBase):
         return self.battle_default()
 
     def battle_5(self):
-        return self.fleet_2.brute_clear_boss()
+        return self.fleet_boss.brute_clear_boss()

campaign/event_20200611_en/c3.py

@@ -44,4 +44,4 @@ class Campaign(CampaignBase):
         return self.battle_default()
 
     def battle_5(self):
-        return self.fleet_2.brute_clear_boss()
+        return self.fleet_boss.brute_clear_boss()

campaign/event_20200611_en/d1.py

@@ -81,4 +81,4 @@ class Campaign(CampaignBase):
         return self.battle_default()
 
     def battle_5(self):
-        return self.fleet_2.brute_clear_boss()
+        return self.fleet_boss.brute_clear_boss()

campaign/event_20200611_en/d3.py

@@ -100,4 +100,4 @@ class Campaign(CampaignBase):
         return self.battle_default()
 
     def battle_6(self):
-        return self.fleet_2.brute_clear_boss()
+        return self.fleet_boss.brute_clear_boss()

campaign/event_20210624_tw/d3.py

@@ -114,4 +114,4 @@ class Campaign(CampaignBase):
         return self.battle_default()
 
     def battle_6(self):
-        return self.fleet_2.brute_clear_boss()
+        return self.fleet_boss.brute_clear_boss()

module/map/fleet.py

@@ -33,7 +33,7 @@ class Fleet(Camera, AmbushHandler):
 
     @property
     def fleet_2(self):
-        if self.config.FLEET_2 and self.config.FLEET_BOSS == 2:
+        if self.config.FLEET_2:
             if self.fleet_current_index != 2:
                 self.fleet_ensure(index=2)
         return self

module/map/map.py

@@ -508,7 +508,7 @@ class Map(Fleet):
         Returns:
             bool: if clear an enemy.
         """
-        if self.fleet_boss_index != 2:
+        if not self.config.FLEET_2:
             return False
         for grid in grids:
             if self.fleet_at(grid=grid, fleet=2):