Add: Logic fleet_2_rescue, Logic for chapter 3

- Fix camera outside map caused by info bar
- Fix mis-detection of is_caught_by_siren
- Fix grid attribute is_caught_by_siren will be kept to next attack
- Fix find_current_fleet when ammo icon of another fleet is covered by the green arrow of current fleet
- Fix fleet_boss_index
- Fix can not predict when boss appear on fleet's face

campaign/campaign_main/campaign_3_1.py

@@ -14,9 +14,9 @@ MAP.map_data = '''
 '''
 MAP.weight_data = '''
     30 30 30 20 10 10 10
-    30 30 30 20 10 10 10
-    40 40 40 20 10 10 10
+    30 30 30 20 10 09 10
     40 40 40 20 10 10 10
+    40 40 40 20 20 10 10
 '''
 MAP.spawn_data = [
     {'battle': 0, 'enemy': 2, 'mystery': 1},
@@ -36,6 +36,9 @@ class Config:
     FLEET_BOSS = 1
 
     MAP_MYSTERY_HAS_CARRIER = True
+
+    INTERNAL_LINES_HOUGHLINES_THRESHOLD = 40
+    EDGE_LINES_HOUGHLINES_THRESHOLD = 40
     INTERNAL_LINES_FIND_PEAKS_PARAMETERS = {
         'height': (120, 255 - 40),
         'width': (1.5, 10),
@@ -54,6 +57,11 @@ class Campaign(CampaignBase):
     MAP = MAP
 
     def battle_0(self):
+        self.fleet_2_push_forward()
+
+        if self.fleet_2_rescue(G2):
+            return True
+
         self.clear_all_mystery()
 
         return self.battle_default()
@@ -64,4 +72,4 @@ class Campaign(CampaignBase):
         if not self.check_accessibility(G2, fleet='boss'):
             return self.fleet_boss.battle_default()
 
-        return self.clear_boss()
+        return self.fleet_boss.clear_boss()

campaign/campaign_main/campaign_3_2.py

@@ -15,10 +15,10 @@ MAP.map_data = '''
     SP ME -- -- ME MM -- ++
 '''
 MAP.weight_data = '''
-    50 50 50 30 30 20 10 10
+    50 50 50 30 30 20 10 09
     50 50 40 40 30 20 10 10
-    50 50 50 40 40 20 20 20
-    50 50 50 50 35 30 30 30
+    50 50 50 40 40 50 20 20
+    50 50 50 50 35 50 50 50
 '''
 MAP.spawn_data = [
     {'battle': 0, 'enemy': 2, 'mystery': 1},
@@ -38,11 +38,17 @@ class Campaign(CampaignBase):
     MAP = MAP
 
     def battle_0(self):
+        self.fleet_2_push_forward()
+
+        if self.fleet_2_rescue(H1):
+            return True
+
         self.clear_all_mystery()
 
         return self.battle_default()
 
     def battle_3(self):
+        # print(H1.__dict__)
         self.clear_all_mystery()
 
         if not self.check_accessibility(H1, fleet='boss'):

campaign/campaign_main/campaign_3_3.py

@@ -18,8 +18,8 @@ MAP.weight_data = '''
     50 50 30 30 50 50
     50 50 30 30 50 50
     50 50 20 30 50 50
-    10 10 10 20 50 50
-    10 10 10 50 50 50
+    09 10 11 20 50 50
+    10 10 11 50 50 50
 '''
 MAP.spawn_data = [
     {'battle': 0, 'enemy': 2, 'mystery': 1},
@@ -40,6 +40,11 @@ class Campaign(CampaignBase):
     MAP = MAP
 
     def battle_0(self):
+        self.fleet_2_push_forward()
+
+        if self.fleet_2_rescue(A4):
+            return True
+
         self.clear_all_mystery()
 
         return self.battle_default()

campaign/campaign_main/campaign_3_4.py

@@ -18,8 +18,8 @@ MAP.map_data = '''
 MAP.weight_data = '''
     40 40 40 40 40 40 40 40
     40 40 40 30 30 30 30 30
-    40 40 30 30 20 10 10 10
-    40 40 30 20 20 10 10 10
+    40 40 30 30 20 10 10 09
+    40 40 30 20 20 10 10 09
 '''
 MAP.spawn_data = [
     {'battle': 0, 'enemy': 2},
@@ -38,15 +38,16 @@ A4, B4, C4, D4, E4, F4, G4, H4, \
 class Config(Config31):
     MAP_MYSTERY_HAS_CARRIER = False
 
-    # Map 3-4 is relatively small for the density of enemies.
-    INTERNAL_LINES_HOUGHLINES_THRESHOLD = 40
-    EDGE_LINES_HOUGHLINES_THRESHOLD = 40
-
 
 class Campaign(CampaignBase):
     MAP = MAP
 
     def battle_0(self):
+        self.fleet_2_push_forward()
+
+        if self.fleet_2_rescue(H3):
+            return True
+
         return self.battle_default()
 
     def battle_3(self):