Add: Chapter B

campaign/event_20240815_cn/b1.py

@@ -0,0 +1,101 @@
+from .campaign_base import CampaignBase
+from module.map.map_base import CampaignMap
+from module.map.map_grids import SelectedGrids, RoadGrids
+from module.logger import logger
+
+MAP = CampaignMap('B1')
+MAP.shape = 'K9'
+MAP.camera_data = ['D2', 'D6', 'H3', 'H7']
+MAP.camera_data_spawn_point = ['D6']
+MAP.map_data = """
+    -- -- -- ME -- ++ ++ ++ -- -- ++
+    -- ++ ME -- ME ++ ++ ++ ME ME ++
+    ME -- -- -- -- ++ ++ ++ -- -- --
+    ++ -- Me -- -- -- MB -- -- ME --
+    ++ -- ++ ++ ++ -- __ -- ++ ++ --
+    SP -- -- MS -- -- ME -- -- ++ ME
+    -- -- MS ++ -- Me -- Me -- ME --
+    SP -- -- MS -- ++ ++ ++ -- -- --
+    ++ -- ++ -- -- -- ++ -- -- ME --
+"""
+MAP.weight_data = """
+    50 50 50 50 50 50 50 50 50 50 50
+    50 50 50 50 50 50 50 50 50 50 50
+    50 50 50 50 50 50 50 50 50 50 50
+    50 50 50 50 50 50 50 50 50 50 50
+    50 50 50 50 50 50 50 50 50 50 50
+    50 50 50 50 50 50 50 50 50 50 50
+    50 50 50 50 50 50 50 50 50 50 50
+    50 50 50 50 50 50 50 50 50 50 50
+    50 50 50 50 50 50 50 50 50 50 50
+"""
+MAP.spawn_data = [
+    {'battle': 0, 'enemy': 2, 'siren': 1},
+    {'battle': 1, 'enemy': 1},
+    {'battle': 2, 'enemy': 2},
+    {'battle': 3, 'enemy': 1},
+    {'battle': 4, 'enemy': 2, 'boss': 1},
+    {'battle': 5, 'enemy': 1},
+]
+A1, B1, C1, D1, E1, F1, G1, H1, I1, J1, K1, \
+A2, B2, C2, D2, E2, F2, G2, H2, I2, J2, K2, \
+A3, B3, C3, D3, E3, F3, G3, H3, I3, J3, K3, \
+A4, B4, C4, D4, E4, F4, G4, H4, I4, J4, K4, \
+A5, B5, C5, D5, E5, F5, G5, H5, I5, J5, K5, \
+A6, B6, C6, D6, E6, F6, G6, H6, I6, J6, K6, \
+A7, B7, C7, D7, E7, F7, G7, H7, I7, J7, K7, \
+A8, B8, C8, D8, E8, F8, G8, H8, I8, J8, K8, \
+A9, B9, C9, D9, E9, F9, G9, H9, I9, J9, K9, \
+    = MAP.flatten()
+
+
+class Config:
+    # ===== Start of generated config =====
+    MAP_SIREN_TEMPLATE = ['Intruder']
+    MOVABLE_ENEMY_TURN = (2,)
+    MAP_HAS_SIREN = True
+    MAP_HAS_MOVABLE_ENEMY = True
+    MAP_HAS_MAP_STORY = True
+    MAP_HAS_FLEET_STEP = True
+    MAP_HAS_AMBUSH = False
+    MAP_HAS_MYSTERY = False
+    # ===== End of generated config =====
+
+    INTERNAL_LINES_FIND_PEAKS_PARAMETERS = {
+        'height': (80, 255 - 33),
+        'width': (0.9, 10),
+        'prominence': 10,
+        'distance': 35,
+    }
+    EDGE_LINES_FIND_PEAKS_PARAMETERS = {
+        'height': (255 - 33, 255),
+        'prominence': 10,
+        'distance': 50,
+        # 'width': (0, 7),
+        'wlen': 1000
+    }
+    HOMO_EDGE_COLOR_RANGE = (0, 33)
+    HOMO_EDGE_HOUGHLINES_THRESHOLD = 300
+    MAP_HAS_MOVABLE_NORMAL_ENEMY = True
+    MAP_SWIPE_PREDICT = False
+    MAP_SIREN_MOVE_WAIT = 0.3
+    MAP_WALK_USE_CURRENT_FLEET = True
+    MAP_SWIPE_MULTIPLY = (1.025, 1.044)
+    MAP_SWIPE_MULTIPLY_MINITOUCH = (0.991, 1.009)
+    MAP_SWIPE_MULTIPLY_MAATOUCH = (0.962, 0.979)
+
+
+class Campaign(CampaignBase):
+    MAP = MAP
+    ENEMY_FILTER = '1L > 1M > 1E > 1C > 2L > 2M > 2E > 2C > 3L > 3M > 3E > 3C'
+
+    def battle_0(self):
+        if self.clear_siren():
+            return True
+        if self.clear_filter_enemy(self.ENEMY_FILTER, preserve=0):
+            return True
+
+        return self.battle_default()
+
+    def battle_4(self):
+        return self.clear_boss()

campaign/event_20240815_cn/b2.py

@@ -0,0 +1,98 @@
+from .campaign_base import CampaignBase
+from module.map.map_base import CampaignMap
+from module.map.map_grids import SelectedGrids, RoadGrids
+from module.logger import logger
+from .b1 import Config as ConfigBase
+
+MAP = CampaignMap('B2')
+MAP.shape = 'J8'
+MAP.camera_data = ['D3', 'D6', 'G3', 'G6']
+MAP.camera_data_spawn_point = ['D3']
+MAP.map_data = """
+    -- ++ -- -- -- ++ ++ -- -- --
+    -- ++ SP -- SP ++ ++ ME ME ++
+    -- Me -- -- -- Me -- -- -- --
+    -- -- -- MS -- -- ++ -- ME --
+    ++ -- MS -- MS -- ++ Me -- --
+    -- -- ++ ++ ++ -- Me -- -- ME
+    ++ -- Me -- -- __ -- -- ++ ++
+    MB -- ++ ME ME -- ME ME ++ ++
+"""
+MAP.weight_data = """
+    50 50 50 50 50 50 50 50 50 50
+    50 50 50 50 50 50 50 50 50 50
+    50 50 50 50 50 50 50 50 50 50
+    50 50 50 50 50 50 50 50 50 50
+    50 50 50 50 50 50 50 50 50 50
+    50 50 50 50 50 50 50 50 50 50
+    50 50 50 50 50 50 50 50 50 50
+    50 50 50 50 50 50 50 50 50 50
+"""
+MAP.spawn_data = [
+    {'battle': 0, 'enemy': 2, 'siren': 1},
+    {'battle': 1, 'enemy': 1},
+    {'battle': 2, 'enemy': 2},
+    {'battle': 3, 'enemy': 1},
+    {'battle': 4, 'enemy': 2},
+    {'battle': 5, 'enemy': 1, 'boss': 1},
+]
+A1, B1, C1, D1, E1, F1, G1, H1, I1, J1, \
+A2, B2, C2, D2, E2, F2, G2, H2, I2, J2, \
+A3, B3, C3, D3, E3, F3, G3, H3, I3, J3, \
+A4, B4, C4, D4, E4, F4, G4, H4, I4, J4, \
+A5, B5, C5, D5, E5, F5, G5, H5, I5, J5, \
+A6, B6, C6, D6, E6, F6, G6, H6, I6, J6, \
+A7, B7, C7, D7, E7, F7, G7, H7, I7, J7, \
+A8, B8, C8, D8, E8, F8, G8, H8, I8, J8, \
+    = MAP.flatten()
+
+
+class Config(ConfigBase):
+    # ===== Start of generated config =====
+    MAP_SIREN_TEMPLATE = []
+    MOVABLE_ENEMY_TURN = (2,)
+    MAP_HAS_SIREN = True
+    MAP_HAS_MOVABLE_ENEMY = True
+    MAP_HAS_MAP_STORY = True
+    MAP_HAS_FLEET_STEP = True
+    MAP_HAS_AMBUSH = False
+    MAP_HAS_MYSTERY = False
+    # ===== End of generated config =====
+
+    MAP_HAS_MOVABLE_NORMAL_ENEMY = False
+    MAP_SIREN_HAS_BOSS_ICON_SMALL = True
+    MAP_SWIPE_MULTIPLY = (1.206, 1.228)
+    MAP_SWIPE_MULTIPLY_MINITOUCH = (1.166, 1.188)
+    MAP_SWIPE_MULTIPLY_MAATOUCH = (1.132, 1.152)
+
+
+class Campaign(CampaignBase):
+    MAP = MAP
+    ENEMY_FILTER = '1L > 1M > 1E > 1C > 2L > 2M > 2E > 2C > 3L > 3M > 3E > 3C'
+
+    def battle_0(self):
+        if self.clear_siren():
+            return True
+        if self.clear_filter_enemy(self.ENEMY_FILTER, preserve=0):
+            return True
+
+        return self.battle_default()
+
+    def battle_5(self):
+        return self.fleet_boss.clear_boss()
+
+    def before_boss(self):
+        # Handle giant boss at A8
+        logger.info('B2 before boss')
+        grid = SelectedGrids([B6, C7]).sort('weight', 'cost')[0]
+        self.goto(grid)
+        self.goto(B8)
+
+    def clear_boss(self):
+        self.before_boss()
+        super().clear_boss()
+
+    def brute_clear_boss(self):
+        self.before_boss()
+        super().brute_clear_boss()
+

campaign/event_20240815_cn/b3.py

@@ -0,0 +1,85 @@
+from .campaign_base import CampaignBase
+from module.map.map_base import CampaignMap
+from module.map.map_grids import SelectedGrids, RoadGrids
+from module.logger import logger
+from .b1 import Config as ConfigBase
+
+MAP = CampaignMap('B3')
+MAP.shape = 'K9'
+MAP.camera_data = ['D3', 'D7', 'H3', 'H7']
+MAP.camera_data_spawn_point = ['D3']
+MAP.map_data = """
+    -- -- ++ -- -- -- -- -- ++ ++ --
+    ++ ++ ++ -- -- ++ -- ME ++ ++ --
+    ++ ++ ++ -- Me ++ ME -- ME ME --
+    ++ ++ ++ -- -- Me -- __ -- -- MB
+    SP -- SP -- -- -- -- ME -- -- MB
+    -- -- -- ++ ++ ME -- ++ ME ME --
+    -- MS -- -- ++ Me -- ++ ++ ++ ++
+    MS -- MS -- Me -- -- -- ME -- --
+    ++ ++ ++ -- -- -- ++ ME -- -- --
+"""
+MAP.weight_data = """
+    50 50 50 50 50 50 50 50 50 50 50
+    50 50 50 50 50 50 50 50 50 50 50
+    50 50 50 50 50 50 50 50 50 50 50
+    50 50 50 50 50 50 50 50 50 50 50
+    50 50 50 50 50 50 50 50 50 50 50
+    50 50 50 50 50 50 50 50 50 50 50
+    50 50 50 50 50 50 50 50 50 50 50
+    50 50 50 50 50 50 50 50 50 50 50
+    50 50 50 50 50 50 50 50 50 50 50
+"""
+MAP.spawn_data = [
+    {'battle': 0, 'enemy': 2, 'siren': 2},
+    {'battle': 1, 'enemy': 1},
+    {'battle': 2, 'enemy': 2},
+    {'battle': 3, 'enemy': 1},
+    {'battle': 4, 'enemy': 2},
+    {'battle': 5, 'enemy': 1, 'boss': 1},
+]
+A1, B1, C1, D1, E1, F1, G1, H1, I1, J1, K1, \
+A2, B2, C2, D2, E2, F2, G2, H2, I2, J2, K2, \
+A3, B3, C3, D3, E3, F3, G3, H3, I3, J3, K3, \
+A4, B4, C4, D4, E4, F4, G4, H4, I4, J4, K4, \
+A5, B5, C5, D5, E5, F5, G5, H5, I5, J5, K5, \
+A6, B6, C6, D6, E6, F6, G6, H6, I6, J6, K6, \
+A7, B7, C7, D7, E7, F7, G7, H7, I7, J7, K7, \
+A8, B8, C8, D8, E8, F8, G8, H8, I8, J8, K8, \
+A9, B9, C9, D9, E9, F9, G9, H9, I9, J9, K9, \
+    = MAP.flatten()
+
+
+class Config(ConfigBase):
+    # ===== Start of generated config =====
+    MAP_SIREN_TEMPLATE = ['AmagiMasked']
+    MOVABLE_ENEMY_TURN = (2,)
+    MAP_HAS_SIREN = True
+    MAP_HAS_MOVABLE_ENEMY = True
+    MAP_HAS_MAP_STORY = True
+    MAP_HAS_FLEET_STEP = True
+    MAP_HAS_AMBUSH = False
+    MAP_HAS_MYSTERY = False
+    # ===== End of generated config =====
+
+    MAP_HAS_MOVABLE_NORMAL_ENEMY = True
+    MAP_SIREN_HAS_BOSS_ICON_SMALL = False
+    MAP_SWIPE_MULTIPLY = (1.108, 1.129)
+    MAP_SWIPE_MULTIPLY_MINITOUCH = (1.072, 1.092)
+    MAP_SWIPE_MULTIPLY_MAATOUCH = (1.041, 1.059)
+
+
+class Campaign(CampaignBase):
+    MAP = MAP
+    ENEMY_FILTER = '1L > 1M > 1E > 1C > 2L > 2M > 2E > 2C > 3L > 3M > 3E > 3C'
+
+    def battle_0(self):
+        if self.clear_siren():
+            return True
+        if self.clear_filter_enemy(self.ENEMY_FILTER, preserve=0):
+            return True
+
+        return self.battle_default()
+
+    def battle_5(self):
+        return self.fleet_boss.clear_boss()

campaign/event_20240815_cn/campaign_base.py

@@ -1,4 +1,5 @@
 from module.base.timer import Timer
+from module.base.utils import area_in_area, area_pad
 from module.campaign.campaign_base import CampaignBase as CampaignBase_
 from module.combat.assets import GET_ITEMS_1
 from module.exception import CampaignNameError
@@ -15,9 +16,15 @@ class CampaignBase(CampaignBase_):
         """
         # 5 story stage after clearing A2
         # You can't go anywhere unless you clicked it
-        return self.image_color_button(
+        button = self.image_color_button(
             area=(66, 200, 1200, 690), color=(0, 0, 0),
             color_threshold=240, encourage=10, name='STORY_ENTRANCE')
+        if button is None:
+            return None
+        # Blacklisted area
+        if area_in_area(button.button, area_pad((424, 522, 444, 542), pad=-20)):
+            return None
+        return button
 
     def handle_story_entrance(self):
         if not self.entrance_timer.reached():

module/template/assets.py

@@ -44,6 +44,7 @@ TEMPLATE_SIREN_Akashi = Template(file={'cn': './assets/cn/template/TEMPLATE_SIRE
 TEMPLATE_SIREN_AlbacoreIdol = Template(file={'cn': './assets/cn/template/TEMPLATE_SIREN_AlbacoreIdol.gif', 'en': './assets/en/template/TEMPLATE_SIREN_AlbacoreIdol.gif', 'jp': './assets/jp/template/TEMPLATE_SIREN_AlbacoreIdol.gif', 'tw': './assets/tw/template/TEMPLATE_SIREN_AlbacoreIdol.gif'})
 TEMPLATE_SIREN_AlfredoOriani = Template(file={'cn': './assets/cn/template/TEMPLATE_SIREN_AlfredoOriani.gif', 'en': './assets/en/template/TEMPLATE_SIREN_AlfredoOriani.gif', 'jp': './assets/jp/template/TEMPLATE_SIREN_AlfredoOriani.gif', 'tw': './assets/tw/template/TEMPLATE_SIREN_AlfredoOriani.gif'})
 TEMPLATE_SIREN_Algerie = Template(file={'cn': './assets/cn/template/TEMPLATE_SIREN_Algerie.gif', 'en': './assets/en/template/TEMPLATE_SIREN_Algerie.gif', 'jp': './assets/jp/template/TEMPLATE_SIREN_Algerie.gif', 'tw': './assets/tw/template/TEMPLATE_SIREN_Algerie.gif'})
+TEMPLATE_SIREN_AmagiMasked = Template(file={'cn': './assets/cn/template/TEMPLATE_SIREN_AmagiMasked.gif', 'en': './assets/en/template/TEMPLATE_SIREN_AmagiMasked.gif', 'jp': './assets/jp/template/TEMPLATE_SIREN_AmagiMasked.gif', 'tw': './assets/tw/template/TEMPLATE_SIREN_AmagiMasked.gif'})
 TEMPLATE_SIREN_Amazon = Template(file={'cn': './assets/cn/template/TEMPLATE_SIREN_Amazon.gif', 'en': './assets/en/template/TEMPLATE_SIREN_Amazon.gif', 'jp': './assets/jp/template/TEMPLATE_SIREN_Amazon.gif', 'tw': './assets/tw/template/TEMPLATE_SIREN_Amazon.gif'})
 TEMPLATE_SIREN_Arethusa = Template(file={'cn': './assets/cn/template/TEMPLATE_SIREN_Arethusa.gif', 'en': './assets/en/template/TEMPLATE_SIREN_Arethusa.gif', 'jp': './assets/jp/template/TEMPLATE_SIREN_Arethusa.gif', 'tw': './assets/tw/template/TEMPLATE_SIREN_Arethusa.gif'})
 TEMPLATE_SIREN_Arizona = Template(file={'cn': './assets/cn/template/TEMPLATE_SIREN_Arizona.gif', 'en': './assets/en/template/TEMPLATE_SIREN_Arizona.gif', 'jp': './assets/jp/template/TEMPLATE_SIREN_Arizona.gif', 'tw': './assets/tw/template/TEMPLATE_SIREN_Arizona.gif'})