diff --git a/campaign/Readme.md b/campaign/Readme.md index 3310bb5fe..5ca92764f 100644 --- a/campaign/Readme.md +++ b/campaign/Readme.md @@ -272,4 +272,3 @@ To add a new event, add a new row in here, and run `python -m module.config.conf | 20251120 | coalition 20251120 | DATE A LANE | DATE A LANE | DATE A LANE | DATE A LANE | - | | 20251127 | coalition 20251120 | DATE A LANE | - | - | - | DATE A LANE | | 20251211 | event 20251023 cn | Tempesta and Islas de Libertád | - | - | - | 颶風與自由群島 | -| 20251218 | event 20251218 cn | A Note Through the Firmament | 响彻于天穹之音 | A Note Through the Firmament | 天穹に響く音謡 | - | diff --git a/campaign/event_20251218_cn/a1.py b/campaign/event_20251218_cn/a1.py deleted file mode 100644 index 36efe84e8..000000000 --- a/campaign/event_20251218_cn/a1.py +++ /dev/null @@ -1,102 +0,0 @@ -from module.campaign.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('A1') -MAP.shape = 'I8' -MAP.camera_data = ['D3', 'D6', 'E4', 'E6'] -MAP.camera_data_spawn_point = ['D3'] -MAP.map_data = """ - -- ++ ++ -- -- -- -- -- -- - -- SP ++ Me -- Me -- ME -- - SP -- -- -- -- ++ -- -- ++ - -- -- MS -- Me ++ ME -- -- - ++ MS -- -- -- -- -- ME -- - ++ -- __ ++ -- ME -- ME -- - MB -- ME -- -- ++ ++ -- ++ - -- ME -- ME -- ++ ++ -- -- -""" -MAP.weight_data = """ - 50 50 50 50 50 50 50 50 50 - 10 10 50 50 50 50 50 50 50 - 10 10 20 25 50 50 50 50 50 - 10 20 25 50 50 50 50 50 50 - 50 25 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': 1}, - {'battle': 3, 'enemy': 1, 'boss': 1}, - {'battle': 4, 'enemy': 1}, -] -A1, B1, C1, D1, E1, F1, G1, H1, I1, \ -A2, B2, C2, D2, E2, F2, G2, H2, I2, \ -A3, B3, C3, D3, E3, F3, G3, H3, I3, \ -A4, B4, C4, D4, E4, F4, G4, H4, I4, \ -A5, B5, C5, D5, E5, F5, G5, H5, I5, \ -A6, B6, C6, D6, E6, F6, G6, H6, I6, \ -A7, B7, C7, D7, E7, F7, G7, H7, I7, \ -A8, B8, C8, D8, E8, F8, G8, H8, I8, \ - = MAP.flatten() - - -class Config: - # ===== Start of generated config ===== - MAP_SIREN_TEMPLATE = [] - MOVABLE_ENEMY_TURN = (2,) - MAP_HAS_SIREN = True - MAP_HAS_MOVABLE_ENEMY = True - MAP_HAS_MAP_STORY = False - MAP_HAS_FLEET_STEP = True - MAP_HAS_AMBUSH = False - MAP_HAS_MYSTERY = False - # ===== End of generated config ===== - - MAP_CHAPTER_SWITCH_20241219 = True - MAP_HAS_MODE_SWITCH = True - STAGE_ENTRANCE = ['half', '20240725'] - STAGE_INCREASE_AB = True - - MAP_SIREN_HAS_BOSS_ICON_SMALL = True - MAP_ENSURE_EDGE_INSIGHT_CORNER = 'bottom' - INTERNAL_LINES_FIND_PEAKS_PARAMETERS = { - 'height': (120, 255 - 17), - 'width': (1.5, 10), - 'prominence': 10, - 'distance': 35, - } - EDGE_LINES_FIND_PEAKS_PARAMETERS = { - 'height': (255 - 17, 255), - 'prominence': 10, - 'distance': 50, - 'wlen': 1000 - } - HOMO_EDGE_COLOR_RANGE = (0, 17) - HOMO_EDGE_HOUGHLINES_THRESHOLD = 210 - MAP_HAS_MOVABLE_NORMAL_ENEMY = True - MAP_SIREN_MOVE_WAIT = 0.5 - MAP_WALK_USE_CURRENT_FLEET = True - MAP_SWIPE_MULTIPLY = (1.259, 1.283) - MAP_SWIPE_MULTIPLY_MINITOUCH = (1.218, 1.240) - MAP_SWIPE_MULTIPLY_MAATOUCH = (1.182, 1.204) - - -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_3(self): - return self.clear_boss() diff --git a/campaign/event_20251218_cn/a2.py b/campaign/event_20251218_cn/a2.py deleted file mode 100644 index cbb0f4463..000000000 --- a/campaign/event_20251218_cn/a2.py +++ /dev/null @@ -1,79 +0,0 @@ -from module.campaign.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 .a1 import Config as ConfigBase - -MAP = CampaignMap('A2') -MAP.shape = 'I8' -MAP.camera_data = ['D3', 'D6', 'E3', 'E6'] -MAP.camera_data_spawn_point = ['E3', 'D3'] -MAP.map_data = """ - ++ -- ++ ++ ++ -- -- -- -- - -- -- SP -- SP -- ++ ++ -- - -- -- -- -- -- -- Me ++ -- - -- ++ -- __ -- -- -- Me -- - -- ++ MS -- MS -- ME -- -- - -- -- -- MB -- -- -- ME -- - -- ME ++ ++ ++ ME -- ME -- - ME -- -- ++ -- -- ME ++ -- -""" -MAP.weight_data = """ - 50 50 50 50 50 50 50 50 50 - 20 10 10 10 10 10 50 50 50 - 50 10 10 10 10 10 20 50 50 - 50 50 10 10 10 20 50 50 50 - 50 50 20 20 20 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': 1}, - {'battle': 3, 'enemy': 1}, - {'battle': 4, 'enemy': 1, 'boss': 1}, -] -A1, B1, C1, D1, E1, F1, G1, H1, I1, \ -A2, B2, C2, D2, E2, F2, G2, H2, I2, \ -A3, B3, C3, D3, E3, F3, G3, H3, I3, \ -A4, B4, C4, D4, E4, F4, G4, H4, I4, \ -A5, B5, C5, D5, E5, F5, G5, H5, I5, \ -A6, B6, C6, D6, E6, F6, G6, H6, I6, \ -A7, B7, C7, D7, E7, F7, G7, H7, I7, \ -A8, B8, C8, D8, E8, F8, G8, H8, I8, \ - = 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 = False - MAP_HAS_FLEET_STEP = True - MAP_HAS_AMBUSH = False - MAP_HAS_MYSTERY = False - # ===== End of generated config ===== - - MAP_SWIPE_MULTIPLY = (1.234, 1.257) - MAP_SWIPE_MULTIPLY_MINITOUCH = (1.193, 1.215) - MAP_SWIPE_MULTIPLY_MAATOUCH = (1.158, 1.179) - - -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() diff --git a/campaign/event_20251218_cn/a3.py b/campaign/event_20251218_cn/a3.py deleted file mode 100644 index d72d8cceb..000000000 --- a/campaign/event_20251218_cn/a3.py +++ /dev/null @@ -1,82 +0,0 @@ -from module.campaign.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 .a1 import Config as ConfigBase - -MAP = CampaignMap('A3') -MAP.shape = 'I9' -MAP.camera_data = ['D5', 'D7', 'F5', 'F7'] -MAP.camera_data_spawn_point = ['F5', 'D5'] -MAP.map_data = """ - -- -- -- -- -- -- -- -- -- - -- -- -- ++ ++ ++ -- -- -- - ++ -- -- ++ ++ ++ -- -- -- - -- ME -- ++ ++ ++ -- ME ++ - ME -- -- SP -- SP -- -- ME - -- Me -- -- __ -- -- -- ME - -- ++ Me -- MB -- Me ++ ++ - -- ++ -- MS -- MS -- ++ ++ - -- -- 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 25 50 50 50 25 50 50 - 50 25 10 10 10 10 10 25 50 - 50 50 20 10 10 10 20 50 50 - 50 50 25 20 20 20 25 50 50 - 50 50 50 25 25 25 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': 1}, - {'battle': 3, 'enemy': 1}, - {'battle': 4, 'enemy': 1, 'boss': 1}, -] -A1, B1, C1, D1, E1, F1, G1, H1, I1, \ -A2, B2, C2, D2, E2, F2, G2, H2, I2, \ -A3, B3, C3, D3, E3, F3, G3, H3, I3, \ -A4, B4, C4, D4, E4, F4, G4, H4, I4, \ -A5, B5, C5, D5, E5, F5, G5, H5, I5, \ -A6, B6, C6, D6, E6, F6, G6, H6, I6, \ -A7, B7, C7, D7, E7, F7, G7, H7, I7, \ -A8, B8, C8, D8, E8, F8, G8, H8, I8, \ -A9, B9, C9, D9, E9, F9, G9, H9, I9, \ - = 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 = False - MAP_HAS_FLEET_STEP = True - MAP_HAS_AMBUSH = False - MAP_HAS_MYSTERY = False - # ===== End of generated config ===== - - MAP_SWIPE_MULTIPLY = (1.084, 1.104) - MAP_SWIPE_MULTIPLY_MINITOUCH = (1.048, 1.067) - MAP_SWIPE_MULTIPLY_MAATOUCH = (1.017, 1.036) - - -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() diff --git a/campaign/event_20251218_cn/b1.py b/campaign/event_20251218_cn/b1.py deleted file mode 100644 index 9c857f485..000000000 --- a/campaign/event_20251218_cn/b1.py +++ /dev/null @@ -1,104 +0,0 @@ -from module.campaign.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 = 'K8' -MAP.camera_data = ['E3', 'E6', 'H3', 'H6'] -MAP.camera_data_spawn_point = ['H6'] -MAP.map_data = """ - -- ++ -- -- -- -- -- -- -- -- -- - ++ -- ME -- ME -- -- ++ ++ ++ -- - -- ME -- -- ++ ME -- ++ ++ ++ -- - -- -- ++ -- ME -- -- ++ ++ ++ -- - -- -- -- -- -- -- -- SP -- SP -- - -- ME -- ++ -- Me -- -- __ -- -- - ++ -- ME -- ME ++ Me -- MS -- Me - -- ++ -- -- -- ++ -- MS MB MS -- -""" -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 20 20 50 50 50 50 - 50 50 50 50 50 20 10 10 10 10 10 - 50 50 50 50 50 20 10 10 10 10 10 - 50 50 50 50 50 50 20 20 20 20 20 - 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, \ - = MAP.flatten() - - -class Config: - # ===== Start of generated config ===== - MAP_SIREN_TEMPLATE = [] - MOVABLE_ENEMY_TURN = (2,) - MAP_HAS_SIREN = True - MAP_HAS_MOVABLE_ENEMY = True - MAP_HAS_MAP_STORY = False - MAP_HAS_FLEET_STEP = True - MAP_HAS_AMBUSH = False - MAP_HAS_MYSTERY = False - # ===== End of generated config ===== - - MAP_CHAPTER_SWITCH_20241219 = True - MAP_HAS_MODE_SWITCH = True - STAGE_ENTRANCE = ['half', '20240725'] - STAGE_INCREASE_AB = True - MAP_CLEAR_PERCENTAGE_SHORT = True - - MAP_SIREN_HAS_BOSS_ICON_SMALL = True - MAP_ENSURE_EDGE_INSIGHT_CORNER = 'bottom' - INTERNAL_LINES_FIND_PEAKS_PARAMETERS = { - 'height': (120, 255 - 17), - 'width': (1.5, 10), - 'prominence': 10, - 'distance': 35, - } - EDGE_LINES_FIND_PEAKS_PARAMETERS = { - 'height': (255 - 17, 255), - 'prominence': 10, - 'distance': 50, - 'wlen': 1000 - } - HOMO_EDGE_COLOR_RANGE = (0, 17) - HOMO_EDGE_HOUGHLINES_THRESHOLD = 210 - MAP_HAS_MOVABLE_NORMAL_ENEMY = True - MAP_SIREN_MOVE_WAIT = 0.5 - MAP_WALK_USE_CURRENT_FLEET = True - MAP_SWIPE_MULTIPLY = (1.126, 1.147) - MAP_SWIPE_MULTIPLY_MINITOUCH = (1.089, 1.109) - MAP_SWIPE_MULTIPLY_MAATOUCH = (1.057, 1.076) - - -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() diff --git a/campaign/event_20251218_cn/b2.py b/campaign/event_20251218_cn/b2.py deleted file mode 100644 index e3646b071..000000000 --- a/campaign/event_20251218_cn/b2.py +++ /dev/null @@ -1,80 +0,0 @@ -from module.campaign.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 = 'K8' -MAP.camera_data = ['D4', 'D6', 'G4', 'G6'] -MAP.camera_data_spawn_point = ['D4'] -MAP.map_data = """ - -- -- -- -- -- -- -- -- -- ++ -- - -- ++ ++ ++ -- -- -- ++ -- -- ++ - -- ++ ++ ++ -- ME -- ME ME -- -- - -- ++ ++ ++ -- ++ ME -- -- ME -- - -- SP -- SP -- -- -- -- ++ ++ ++ - -- -- __ -- -- Me -- -- -- ME -- - Me -- MS -- Me ++ ++ ME ME -- ++ - -- MS MB MS -- ++ ++ -- -- ++ -- -""" -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 20 50 50 50 50 50 50 - 10 10 10 10 10 20 50 50 50 50 50 - 20 10 10 10 20 20 50 50 50 50 50 - 20 20 20 20 20 50 50 50 50 50 50 - 20 20 20 20 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, 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, \ - = 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 = False - MAP_HAS_FLEET_STEP = True - MAP_HAS_AMBUSH = False - MAP_HAS_MYSTERY = False - # ===== End of generated config ===== - - MAP_SWIPE_MULTIPLY = (1.119, 1.140) - MAP_SWIPE_MULTIPLY_MINITOUCH = (1.082, 1.102) - MAP_SWIPE_MULTIPLY_MAATOUCH = (1.050, 1.069) - - -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() diff --git a/campaign/event_20251218_cn/b3.py b/campaign/event_20251218_cn/b3.py deleted file mode 100644 index f51098400..000000000 --- a/campaign/event_20251218_cn/b3.py +++ /dev/null @@ -1,106 +0,0 @@ -from module.campaign.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 = 'I10' -MAP.camera_data = ['D3', 'D7', 'E3', 'E7'] -MAP.camera_data_spawn_point = ['E3', 'D3'] -MAP.map_data = """ - -- -- -- -- -- -- -- -- -- - -- ++ ME ++ ++ ++ ME ++ -- - ++ Me -- ++ ++ ++ -- Me -- - ME -- -- ++ ++ ++ -- -- ++ - -- -- -- SP -- SP -- -- -- - -- ME -- -- __ -- -- ME ++ - ME ++ ME -- MS -- ME ++ ++ - -- ++ -- MS -- MS -- ++ ++ - ++ -- Me -- MB -- 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 20 10 10 10 10 10 50 50 - 50 30 20 10 10 10 20 30 50 - 50 50 30 20 25 20 30 50 50 - 50 50 50 25 25 25 50 50 50 - 50 50 50 50 30 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, \ -A2, B2, C2, D2, E2, F2, G2, H2, I2, \ -A3, B3, C3, D3, E3, F3, G3, H3, I3, \ -A4, B4, C4, D4, E4, F4, G4, H4, I4, \ -A5, B5, C5, D5, E5, F5, G5, H5, I5, \ -A6, B6, C6, D6, E6, F6, G6, H6, I6, \ -A7, B7, C7, D7, E7, F7, G7, H7, I7, \ -A8, B8, C8, D8, E8, F8, G8, H8, I8, \ -A9, B9, C9, D9, E9, F9, G9, H9, I9, \ -A10, B10, C10, D10, E10, F10, G10, H10, I10, \ - = 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 = False - MAP_HAS_FLEET_STEP = True - MAP_HAS_AMBUSH = False - MAP_HAS_MYSTERY = False - # ===== End of generated config ===== - - MAP_ENEMY_TEMPLATE = [] - MAP_SWIPE_MULTIPLY = (1.100, 1.121) - MAP_SWIPE_MULTIPLY_MINITOUCH = (1.064, 1.084) - MAP_SWIPE_MULTIPLY_MAATOUCH = (1.033, 1.052) - - -class Campaign(CampaignBase): - MAP = MAP - ENEMY_FILTER = '1L > 1M > 1E > 1C > 2L > 2M > 2E > 2C > 3L > 3M > 3E > 3C' - - def battle_function(self): - # soo many enemies coming from 3 sides - if self.config.MAP_CLEAR_ALL_THIS_TIME: - remain = self.map.select(is_enemy=True) - logger.info(f'Enemy remain: {remain}') - if remain: - if self.fleet_2_protect(): - return True - if not self.map_is_clear_mode: - remain = self.map.select(is_enemy=True) - logger.info(f'Enemy remain: {remain}') - boss = self.map.select(is_boss=True) - logger.info(f'Boss appear: {boss}') - if not boss: - if self.fleet_2_protect(): - return True - - return super().battle_function() - - 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() diff --git a/campaign/event_20251218_cn/c1.py b/campaign/event_20251218_cn/c1.py deleted file mode 100644 index 88a143918..000000000 --- a/campaign/event_20251218_cn/c1.py +++ /dev/null @@ -1,102 +0,0 @@ -from module.campaign.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('C1') -MAP.shape = 'I8' -MAP.camera_data = ['D3', 'D6', 'E3', 'E6'] -MAP.camera_data_spawn_point = ['D3'] -MAP.map_data = """ - -- ++ ++ -- -- -- -- -- -- - -- SP ++ Me -- Me -- ME -- - SP -- -- -- -- ++ -- -- ++ - -- -- MS -- Me ++ ME -- -- - ++ MS -- -- -- -- -- ME -- - ++ -- __ ++ -- ME -- ME -- - MB -- ME -- -- ++ ++ -- ++ - -- ME -- ME -- ++ ++ -- -- -""" -MAP.weight_data = """ - 50 50 50 50 50 50 50 50 50 - 10 10 50 50 50 50 50 50 50 - 10 10 20 25 50 50 50 50 50 - 10 20 25 50 50 50 50 50 50 - 50 25 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': 1, 'boss': 1}, -] -A1, B1, C1, D1, E1, F1, G1, H1, I1, \ -A2, B2, C2, D2, E2, F2, G2, H2, I2, \ -A3, B3, C3, D3, E3, F3, G3, H3, I3, \ -A4, B4, C4, D4, E4, F4, G4, H4, I4, \ -A5, B5, C5, D5, E5, F5, G5, H5, I5, \ -A6, B6, C6, D6, E6, F6, G6, H6, I6, \ -A7, B7, C7, D7, E7, F7, G7, H7, I7, \ -A8, B8, C8, D8, E8, F8, G8, H8, I8, \ - = MAP.flatten() - - -class Config: - # ===== Start of generated config ===== - MAP_SIREN_TEMPLATE = [] - MOVABLE_ENEMY_TURN = (2,) - MAP_HAS_SIREN = True - MAP_HAS_MOVABLE_ENEMY = True - MAP_HAS_MAP_STORY = False - MAP_HAS_FLEET_STEP = True - MAP_HAS_AMBUSH = False - MAP_HAS_MYSTERY = False - # ===== End of generated config ===== - - MAP_CHAPTER_SWITCH_20241219 = True - MAP_HAS_MODE_SWITCH = True - STAGE_ENTRANCE = ['half', '20240725'] - STAGE_INCREASE_AB = True - - MAP_SIREN_HAS_BOSS_ICON_SMALL = True - MAP_ENSURE_EDGE_INSIGHT_CORNER = 'bottom' - INTERNAL_LINES_FIND_PEAKS_PARAMETERS = { - 'height': (120, 255 - 17), - 'width': (1.5, 10), - 'prominence': 10, - 'distance': 35, - } - EDGE_LINES_FIND_PEAKS_PARAMETERS = { - 'height': (255 - 17, 255), - 'prominence': 10, - 'distance': 50, - 'wlen': 1000 - } - HOMO_EDGE_COLOR_RANGE = (0, 17) - HOMO_EDGE_HOUGHLINES_THRESHOLD = 210 - MAP_HAS_MOVABLE_NORMAL_ENEMY = True - MAP_SIREN_MOVE_WAIT = 0.5 - MAP_WALK_USE_CURRENT_FLEET = True - MAP_SWIPE_MULTIPLY = (1.259, 1.283) - MAP_SWIPE_MULTIPLY_MINITOUCH = (1.218, 1.240) - MAP_SWIPE_MULTIPLY_MAATOUCH = (1.182, 1.204) - - -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() diff --git a/campaign/event_20251218_cn/c2.py b/campaign/event_20251218_cn/c2.py deleted file mode 100644 index c6e2b1b7a..000000000 --- a/campaign/event_20251218_cn/c2.py +++ /dev/null @@ -1,79 +0,0 @@ -from module.campaign.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 .c1 import Config as ConfigBase - -MAP = CampaignMap('C2') -MAP.shape = 'I8' -MAP.camera_data = ['D3', 'D6', 'E3', 'E6'] -MAP.camera_data_spawn_point = ['E3', 'D3'] -MAP.map_data = """ - ++ -- ++ ++ ++ -- -- -- -- - -- -- SP -- SP -- ++ ++ -- - -- -- -- -- -- -- Me ++ -- - -- ++ -- __ -- -- -- Me -- - -- ++ MS -- MS -- ME -- -- - -- -- -- MB -- -- -- ME -- - -- ME ++ ++ ++ ME -- ME -- - ME -- -- ++ -- -- ME ++ -- -""" -MAP.weight_data = """ - 50 50 50 50 50 50 50 50 50 - 20 10 10 10 10 10 50 50 50 - 50 10 10 10 10 10 20 50 50 - 50 50 10 10 10 20 50 50 50 - 50 50 20 20 20 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': 1, 'boss': 1}, -] -A1, B1, C1, D1, E1, F1, G1, H1, I1, \ -A2, B2, C2, D2, E2, F2, G2, H2, I2, \ -A3, B3, C3, D3, E3, F3, G3, H3, I3, \ -A4, B4, C4, D4, E4, F4, G4, H4, I4, \ -A5, B5, C5, D5, E5, F5, G5, H5, I5, \ -A6, B6, C6, D6, E6, F6, G6, H6, I6, \ -A7, B7, C7, D7, E7, F7, G7, H7, I7, \ -A8, B8, C8, D8, E8, F8, G8, H8, I8, \ - = 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 = False - MAP_HAS_FLEET_STEP = True - MAP_HAS_AMBUSH = False - MAP_HAS_MYSTERY = False - # ===== End of generated config ===== - - MAP_SWIPE_MULTIPLY = (1.234, 1.257) - MAP_SWIPE_MULTIPLY_MINITOUCH = (1.193, 1.215) - MAP_SWIPE_MULTIPLY_MAATOUCH = (1.158, 1.179) - - -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() diff --git a/campaign/event_20251218_cn/c3.py b/campaign/event_20251218_cn/c3.py deleted file mode 100644 index c065e7b00..000000000 --- a/campaign/event_20251218_cn/c3.py +++ /dev/null @@ -1,83 +0,0 @@ -from module.campaign.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 .c1 import Config as ConfigBase - -MAP = CampaignMap('C3') -MAP.shape = 'I9' -MAP.camera_data = ['D5', 'D7', 'F5', 'F7'] -MAP.camera_data_spawn_point = ['F5', 'D5'] -MAP.map_data = """ - -- -- -- -- -- -- -- -- -- - -- -- -- ++ ++ ++ -- -- -- - ++ -- -- ++ ++ ++ -- -- -- - -- ME -- ++ ++ ++ -- ME ++ - ME -- -- SP -- SP -- -- ME - -- Me -- -- __ -- -- -- ME - -- ++ Me -- MB -- Me ++ ++ - -- ++ -- MS -- MS -- ++ ++ - -- -- 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 25 50 50 50 25 50 50 - 50 25 10 10 10 10 10 25 50 - 50 50 20 10 10 10 20 50 50 - 50 50 25 20 20 20 25 50 50 - 50 50 50 25 25 25 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': 1}, - {'battle': 5, 'boss': 1}, -] -A1, B1, C1, D1, E1, F1, G1, H1, I1, \ -A2, B2, C2, D2, E2, F2, G2, H2, I2, \ -A3, B3, C3, D3, E3, F3, G3, H3, I3, \ -A4, B4, C4, D4, E4, F4, G4, H4, I4, \ -A5, B5, C5, D5, E5, F5, G5, H5, I5, \ -A6, B6, C6, D6, E6, F6, G6, H6, I6, \ -A7, B7, C7, D7, E7, F7, G7, H7, I7, \ -A8, B8, C8, D8, E8, F8, G8, H8, I8, \ -A9, B9, C9, D9, E9, F9, G9, H9, I9, \ - = 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 = False - MAP_HAS_FLEET_STEP = True - MAP_HAS_AMBUSH = False - MAP_HAS_MYSTERY = False - # ===== End of generated config ===== - - MAP_SWIPE_MULTIPLY = (1.084, 1.104) - MAP_SWIPE_MULTIPLY_MINITOUCH = (1.048, 1.067) - MAP_SWIPE_MULTIPLY_MAATOUCH = (1.017, 1.036) - - -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() diff --git a/campaign/event_20251218_cn/d1.py b/campaign/event_20251218_cn/d1.py deleted file mode 100644 index d4c34a324..000000000 --- a/campaign/event_20251218_cn/d1.py +++ /dev/null @@ -1,104 +0,0 @@ -from module.campaign.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('D1') -MAP.shape = 'K8' -MAP.camera_data = ['E3', 'E6', 'H3', 'H6'] -MAP.camera_data_spawn_point = ['H6'] -MAP.map_data = """ - -- ++ -- -- -- -- -- -- -- -- -- - ++ -- ME -- ME -- -- ++ ++ ++ -- - -- ME -- -- ++ ME -- ++ ++ ++ -- - -- -- ++ -- ME -- -- ++ ++ ++ -- - -- -- -- -- -- -- -- SP -- SP -- - -- ME -- ++ -- Me -- -- __ -- -- - ++ -- ME -- ME ++ Me -- MS -- Me - -- ++ -- -- -- ++ -- MS MB MS -- -""" -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 20 20 50 50 50 50 - 50 50 50 50 50 20 10 10 10 10 10 - 50 50 50 50 50 20 10 10 10 10 10 - 50 50 50 50 50 50 20 20 20 20 20 - 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, \ - = MAP.flatten() - - -class Config: - # ===== Start of generated config ===== - MAP_SIREN_TEMPLATE = [] - MOVABLE_ENEMY_TURN = (2,) - MAP_HAS_SIREN = True - MAP_HAS_MOVABLE_ENEMY = True - MAP_HAS_MAP_STORY = False - MAP_HAS_FLEET_STEP = True - MAP_HAS_AMBUSH = False - MAP_HAS_MYSTERY = False - # ===== End of generated config ===== - - MAP_CHAPTER_SWITCH_20241219 = True - MAP_HAS_MODE_SWITCH = True - STAGE_ENTRANCE = ['half', '20240725'] - STAGE_INCREASE_AB = True - MAP_CLEAR_PERCENTAGE_SHORT = True - - MAP_SIREN_HAS_BOSS_ICON_SMALL = True - MAP_ENSURE_EDGE_INSIGHT_CORNER = 'bottom' - INTERNAL_LINES_FIND_PEAKS_PARAMETERS = { - 'height': (120, 255 - 17), - 'width': (1.5, 10), - 'prominence': 10, - 'distance': 35, - } - EDGE_LINES_FIND_PEAKS_PARAMETERS = { - 'height': (255 - 17, 255), - 'prominence': 10, - 'distance': 50, - 'wlen': 1000 - } - HOMO_EDGE_COLOR_RANGE = (0, 17) - HOMO_EDGE_HOUGHLINES_THRESHOLD = 210 - MAP_HAS_MOVABLE_NORMAL_ENEMY = True - MAP_SIREN_MOVE_WAIT = 0.5 - MAP_WALK_USE_CURRENT_FLEET = True - MAP_SWIPE_MULTIPLY = (1.126, 1.147) - MAP_SWIPE_MULTIPLY_MINITOUCH = (1.089, 1.109) - MAP_SWIPE_MULTIPLY_MAATOUCH = (1.057, 1.076) - - -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() diff --git a/campaign/event_20251218_cn/d2.py b/campaign/event_20251218_cn/d2.py deleted file mode 100644 index 88c54cf23..000000000 --- a/campaign/event_20251218_cn/d2.py +++ /dev/null @@ -1,88 +0,0 @@ -from module.campaign.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 .d1 import Config as ConfigBase - -MAP = CampaignMap('D2') -MAP.shape = 'K8' -MAP.camera_data = ['D4', 'D6', 'G4', 'G6'] -MAP.camera_data_spawn_point = ['D4'] -MAP.map_data = """ - -- -- -- -- -- -- -- -- -- ++ -- - -- ++ ++ ++ -- -- -- ++ -- -- ++ - -- ++ ++ ++ -- ME -- ME ME -- -- - -- ++ ++ ++ -- ++ ME -- -- ME -- - -- SP -- SP -- -- -- -- ++ ++ ++ - -- -- __ -- -- Me -- -- -- ME -- - Me -- MS -- Me ++ ++ ME ME -- ++ - -- MS MB MS -- ++ ++ -- -- ++ -- -""" -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 20 50 50 50 50 50 50 - 10 10 10 10 10 20 50 50 50 50 50 - 20 10 10 10 20 20 50 50 50 50 50 - 20 20 20 20 20 50 50 50 50 50 50 - 20 20 20 20 50 50 50 50 50 50 50 -""" -MAP.spawn_data = [ - {'battle': 0, 'enemy': 2, 'siren': 2}, - {'battle': 1, 'enemy': 1}, - {'battle': 2, 'enemy': 2, 'siren': 1}, - {'battle': 3, 'enemy': 1}, - {'battle': 4, 'enemy': 2}, - {'battle': 5, 'enemy': 1}, - {'battle': 6, '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, \ - = 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 = False - MAP_HAS_FLEET_STEP = True - MAP_HAS_AMBUSH = False - MAP_HAS_MYSTERY = False - # ===== End of generated config ===== - - MAP_SWIPE_MULTIPLY = (1.119, 1.140) - MAP_SWIPE_MULTIPLY_MINITOUCH = (1.082, 1.102) - MAP_SWIPE_MULTIPLY_MAATOUCH = (1.050, 1.069) - -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=1): - return True - - return self.battle_default() - - def battle_5(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_6(self): - return self.fleet_boss.clear_boss() diff --git a/campaign/event_20251218_cn/d3.py b/campaign/event_20251218_cn/d3.py deleted file mode 100644 index c3c3b9757..000000000 --- a/campaign/event_20251218_cn/d3.py +++ /dev/null @@ -1,119 +0,0 @@ -from module.campaign.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 .d1 import Config as ConfigBase - -MAP = CampaignMap('D3') -MAP.shape = 'I10' -MAP.camera_data = ['D3', 'D7', 'E3', 'E7'] -MAP.camera_data_spawn_point = ['E3', 'D3'] -MAP.map_data = """ - -- -- -- -- -- -- -- -- -- - -- ++ ME ++ ++ ++ ME ++ -- - ++ Me -- ++ ++ ++ -- Me -- - ME -- -- ++ ++ ++ -- -- ++ - -- -- -- SP -- SP -- -- -- - -- ME -- -- __ -- -- ME ++ - ME ++ ME -- MS -- ME ++ ++ - -- ++ -- MS -- MS -- ++ ++ - ++ -- Me -- MB -- 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 20 10 10 10 10 10 50 50 - 50 30 20 10 10 10 20 30 50 - 50 50 30 20 25 20 30 50 50 - 50 50 50 25 25 25 50 50 50 - 50 50 50 50 30 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, 'siren': 1}, - {'battle': 3, 'enemy': 1}, - {'battle': 4, 'enemy': 2}, - {'battle': 5, 'enemy': 1}, - {'battle': 6, 'boss': 1}, -] -A1, B1, C1, D1, E1, F1, G1, H1, I1, \ -A2, B2, C2, D2, E2, F2, G2, H2, I2, \ -A3, B3, C3, D3, E3, F3, G3, H3, I3, \ -A4, B4, C4, D4, E4, F4, G4, H4, I4, \ -A5, B5, C5, D5, E5, F5, G5, H5, I5, \ -A6, B6, C6, D6, E6, F6, G6, H6, I6, \ -A7, B7, C7, D7, E7, F7, G7, H7, I7, \ -A8, B8, C8, D8, E8, F8, G8, H8, I8, \ -A9, B9, C9, D9, E9, F9, G9, H9, I9, \ -A10, B10, C10, D10, E10, F10, G10, H10, I10, \ - = 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 = False - MAP_HAS_FLEET_STEP = True - MAP_HAS_AMBUSH = False - MAP_HAS_MYSTERY = False - # ===== End of generated config ===== - - MAP_ENEMY_TEMPLATE = [] - MAP_SWIPE_MULTIPLY = (1.100, 1.121) - MAP_SWIPE_MULTIPLY_MINITOUCH = (1.064, 1.084) - MAP_SWIPE_MULTIPLY_MAATOUCH = (1.033, 1.052) - - -class Campaign(CampaignBase): - MAP = MAP - ENEMY_FILTER = '1L > 1M > 1E > 1C > 2L > 2M > 2E > 2C > 3L > 3M > 3E > 3C' - - def battle_function(self): - # soo many enemies coming from 3 sides - if self.config.MAP_CLEAR_ALL_THIS_TIME: - remain = self.map.select(is_enemy=True) - logger.info(f'Enemy remain: {remain}') - if remain: - if self.fleet_2_protect(): - return True - elif self.clear_any_enemy(sort=('weight', 'cost_2', 'cost_1')): - return True - if not self.map_is_clear_mode: - remain = self.map.select(is_enemy=True) - logger.info(f'Enemy remain: {remain}') - boss = self.map.select(is_boss=True) - logger.info(f'Boss appear: {boss}') - if not boss: - if self.fleet_2_protect(): - return True - elif self.clear_any_enemy(sort=('weight', 'cost_2', 'cost_1')): - return True - - return super().battle_function() - - def battle_0(self): - if self.clear_siren(): - return True - if self.clear_filter_enemy(self.ENEMY_FILTER, preserve=1): - return True - - return self.battle_default() - - def battle_5(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_6(self): - return self.fleet_boss.clear_boss() diff --git a/campaign/event_20251218_cn/sp.py b/campaign/event_20251218_cn/sp.py deleted file mode 100644 index 46f0839fa..000000000 --- a/campaign/event_20251218_cn/sp.py +++ /dev/null @@ -1,121 +0,0 @@ -from module.campaign.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('SP') -MAP.shape = 'I10' -MAP.camera_data = ['E6', 'E8'] -MAP.camera_data_spawn_point = ['E8'] -MAP.map_data = """ - -- -- -- -- -- -- -- -- -- - -- ++ -- ++ ++ ++ -- ++ -- - ++ -- -- ++ ++ ++ -- -- -- - -- -- -- ++ ++ ++ -- -- ++ - -- -- ME -- MB -- ME -- -- - -- ME -- MS -- MS -- ME ++ - -- ++ ME -- MS -- ME ++ ++ - -- ++ -- -- __ -- -- ++ ++ - ++ ME -- SP -- SP -- 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 -""" -MAP.spawn_data = [ - {'battle': 0, 'enemy': 10, 'siren': 3}, - {'battle': 1}, - {'battle': 2}, - {'battle': 3}, - {'battle': 4}, - {'battle': 5}, - {'battle': 6}, - {'battle': 7, 'boss': 1}, -] -A1, B1, C1, D1, E1, F1, G1, H1, I1, \ -A2, B2, C2, D2, E2, F2, G2, H2, I2, \ -A3, B3, C3, D3, E3, F3, G3, H3, I3, \ -A4, B4, C4, D4, E4, F4, G4, H4, I4, \ -A5, B5, C5, D5, E5, F5, G5, H5, I5, \ -A6, B6, C6, D6, E6, F6, G6, H6, I6, \ -A7, B7, C7, D7, E7, F7, G7, H7, I7, \ -A8, B8, C8, D8, E8, F8, G8, H8, I8, \ -A9, B9, C9, D9, E9, F9, G9, H9, I9, \ -A10, B10, C10, D10, E10, F10, G10, H10, I10, \ - = MAP.flatten() - - -class Config: - # ===== Start of generated config ===== - MAP_SIREN_TEMPLATE = ['RoyalOak', 'Victorious'] - MOVABLE_ENEMY_TURN = (2,) - MAP_HAS_SIREN = True - MAP_HAS_MOVABLE_ENEMY = False - MAP_HAS_MAP_STORY = False - MAP_HAS_FLEET_STEP = False - MAP_HAS_AMBUSH = False - MAP_HAS_MYSTERY = False - STAR_REQUIRE_1 = 0 - STAR_REQUIRE_2 = 0 - STAR_REQUIRE_3 = 0 - # ===== End of generated config ===== - - MAP_CHAPTER_SWITCH_20241219 = True - STAGE_ENTRANCE = ['half', '20240725'] - MAP_IS_ONE_TIME_STAGE = True - - MAP_ENSURE_EDGE_INSIGHT_CORNER = 'bottom' - INTERNAL_LINES_FIND_PEAKS_PARAMETERS = { - 'height': (120, 255 - 17), - 'width': (1.5, 10), - 'prominence': 10, - 'distance': 35, - } - EDGE_LINES_FIND_PEAKS_PARAMETERS = { - 'height': (255 - 17, 255), - 'prominence': 10, - 'distance': 50, - 'wlen': 1000 - } - HOMO_STORAGE = ((9, 6), [(205.118, 96.796), (1192.803, 96.796), (71.385, 634.321), (1407.083, 634.321)]) - HOMO_EDGE_COLOR_RANGE = (0, 17) - HOMO_EDGE_HOUGHLINES_THRESHOLD = 210 - MAP_HAS_MOVABLE_NORMAL_ENEMY = True - MAP_SIREN_MOVE_WAIT = 0.5 - MAP_WALK_USE_CURRENT_FLEET = True - MAP_SWIPE_MULTIPLY = (1.014, 1.033) - MAP_SWIPE_MULTIPLY_MINITOUCH = (0.981, 0.999) - MAP_SWIPE_MULTIPLY_MAATOUCH = (0.952, 0.970) - - -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=2): - return True - - return self.battle_default() - - def battle_5(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_7(self): - return self.fleet_boss.clear_boss() diff --git a/module/config/argument/args.json b/module/config/argument/args.json index 0894d2561..6680954b1 100644 --- a/module/config/argument/args.json +++ b/module/config/argument/args.json @@ -1925,25 +1925,25 @@ "type": "select", "value": "campaign_main", "option": [ - "event_20251023_cn", - "event_20251218_cn" + "event_20230914_cn", + "event_20251023_cn" ], "display": "hide", "option_cn": [ - "event_20251218_cn" + "event_20230914_cn" ], "option_en": [ - "event_20251218_cn" + "event_20230914_cn" ], "option_jp": [ - "event_20251218_cn" + "event_20230914_cn" ], "option_tw": [ "event_20251023_cn" ], "option_bold": [ - "event_20251023_cn", - "event_20251218_cn" + "event_20230914_cn", + "event_20251023_cn" ] }, "Mode": { @@ -2335,24 +2335,24 @@ "type": "state", "value": "campaign_main", "option": [ - "event_20251023_cn", - "event_20251218_cn" + "event_20230914_cn", + "event_20251023_cn" ], "option_cn": [ - "event_20251218_cn" + "event_20230914_cn" ], "option_en": [ - "event_20251218_cn" + "event_20230914_cn" ], "option_jp": [ - "event_20251218_cn" + "event_20230914_cn" ], "option_tw": [ "event_20251023_cn" ], "option_bold": [ - "event_20251023_cn", - "event_20251218_cn" + "event_20230914_cn", + "event_20251023_cn" ] }, "Mode": { @@ -2739,24 +2739,24 @@ "type": "state", "value": "campaign_main", "option": [ - "event_20251023_cn", - "event_20251218_cn" + "event_20230914_cn", + "event_20251023_cn" ], "option_cn": [ - "event_20251218_cn" + "event_20230914_cn" ], "option_en": [ - "event_20251218_cn" + "event_20230914_cn" ], "option_jp": [ - "event_20251218_cn" + "event_20230914_cn" ], "option_tw": [ "event_20251023_cn" ], "option_bold": [ - "event_20251023_cn", - "event_20251218_cn" + "event_20230914_cn", + "event_20251023_cn" ] }, "Mode": { @@ -4509,24 +4509,24 @@ "type": "state", "value": "campaign_main", "option": [ - "event_20251023_cn", - "event_20251218_cn" + "event_20230914_cn", + "event_20251023_cn" ], "option_cn": [ - "event_20251218_cn" + "event_20230914_cn" ], "option_en": [ - "event_20251218_cn" + "event_20230914_cn" ], "option_jp": [ - "event_20251218_cn" + "event_20230914_cn" ], "option_tw": [ "event_20251023_cn" ], "option_bold": [ - "event_20251023_cn", - "event_20251218_cn" + "event_20230914_cn", + "event_20251023_cn" ] }, "Mode": { @@ -4930,24 +4930,24 @@ "type": "state", "value": "campaign_main", "option": [ - "event_20251023_cn", - "event_20251218_cn" + "event_20230914_cn", + "event_20251023_cn" ], "option_cn": [ - "event_20251218_cn" + "event_20230914_cn" ], "option_en": [ - "event_20251218_cn" + "event_20230914_cn" ], "option_jp": [ - "event_20251218_cn" + "event_20230914_cn" ], "option_tw": [ "event_20251023_cn" ], "option_bold": [ - "event_20251023_cn", - "event_20251218_cn" + "event_20230914_cn", + "event_20251023_cn" ] }, "Mode": { @@ -5351,24 +5351,24 @@ "type": "state", "value": "campaign_main", "option": [ - "event_20251023_cn", - "event_20251218_cn" + "event_20230914_cn", + "event_20251023_cn" ], "option_cn": [ - "event_20251218_cn" + "event_20230914_cn" ], "option_en": [ - "event_20251218_cn" + "event_20230914_cn" ], "option_jp": [ - "event_20251218_cn" + "event_20230914_cn" ], "option_tw": [ "event_20251023_cn" ], "option_bold": [ - "event_20251023_cn", - "event_20251218_cn" + "event_20230914_cn", + "event_20251023_cn" ] }, "Mode": { @@ -5772,24 +5772,24 @@ "type": "state", "value": "campaign_main", "option": [ - "event_20251023_cn", - "event_20251218_cn" + "event_20230914_cn", + "event_20251023_cn" ], "option_cn": [ - "event_20251218_cn" + "event_20230914_cn" ], "option_en": [ - "event_20251218_cn" + "event_20230914_cn" ], "option_jp": [ - "event_20251218_cn" + "event_20230914_cn" ], "option_tw": [ "event_20251023_cn" ], "option_bold": [ - "event_20251023_cn", - "event_20251218_cn" + "event_20230914_cn", + "event_20251023_cn" ] }, "Mode": { @@ -6183,24 +6183,24 @@ "type": "state", "value": "campaign_main", "option": [ - "event_20251023_cn", - "event_20251218_cn" + "event_20230914_cn", + "event_20251023_cn" ], "option_cn": [ - "event_20251218_cn" + "event_20230914_cn" ], "option_en": [ - "event_20251218_cn" + "event_20230914_cn" ], "option_jp": [ - "event_20251218_cn" + "event_20230914_cn" ], "option_tw": [ "event_20251023_cn" ], "option_bold": [ - "event_20251023_cn", - "event_20251218_cn" + "event_20230914_cn", + "event_20251023_cn" ] }, "Mode": { diff --git a/module/config/i18n/en-US.json b/module/config/i18n/en-US.json index 3c14fedd2..e66786dbc 100644 --- a/module/config/i18n/en-US.json +++ b/module/config/i18n/en-US.json @@ -781,7 +781,6 @@ "event_20250814_cn": "Secrets of the Abyss", "event_20250912_cn": "A Dance for Amahara Above", "event_20251023_cn": "Tempesta and Islas de Libertád", - "event_20251218_cn": "A Note Through the Firmament", "raid_20200624": "Air Raid Drills with Essex Rerun", "raid_20210708": "Cross Wave rerun", "raid_20220127": "Mystery Investigation", diff --git a/module/config/i18n/ja-JP.json b/module/config/i18n/ja-JP.json index f970948f1..ffe5ab229 100644 --- a/module/config/i18n/ja-JP.json +++ b/module/config/i18n/ja-JP.json @@ -781,7 +781,6 @@ "event_20250814_cn": "淵層界の秘密", "event_20250912_cn": "アマハラに舞い奉れ", "event_20251023_cn": "テンペスタと自由群島", - "event_20251218_cn": "天穹に響く音謡", "raid_20200624": "特別演習超空強襲波(復刻)", "raid_20210708": "交錯する新たな波 (復刻)", "raid_20220127": "秘密事件調査", diff --git a/module/config/i18n/zh-CN.json b/module/config/i18n/zh-CN.json index b2783cdfd..00ead2994 100644 --- a/module/config/i18n/zh-CN.json +++ b/module/config/i18n/zh-CN.json @@ -781,7 +781,6 @@ "event_20250814_cn": "奇渊下的秘密", "event_20250912_cn": "起舞于天原之上", "event_20251023_cn": "飓风与自由群岛", - "event_20251218_cn": "响彻于天穹之音", "raid_20200624": "复刻特别演习埃塞克斯级", "raid_20210708": "复刻穿越彼方的水线", "raid_20220127": "演习神秘事件调查", diff --git a/module/config/i18n/zh-TW.json b/module/config/i18n/zh-TW.json index dc4543711..b126000a7 100644 --- a/module/config/i18n/zh-TW.json +++ b/module/config/i18n/zh-TW.json @@ -781,7 +781,6 @@ "event_20250814_cn": "奇淵下的秘密", "event_20250912_cn": "起舞於天原之上", "event_20251023_cn": "颶風與自由群島", - "event_20251218_cn": "A Note Through the Firmament", "raid_20200624": "特別演習埃塞克斯級(復刻)", "raid_20210708": "復刻穿越彼方的水線", "raid_20220127": "演習神秘事件調查",