diff --git a/assets/cn/template/TEMPLATE_SIREN_BonhommeRichard_SS.gif b/assets/cn/template/TEMPLATE_SIREN_BonhommeRichard_SS.gif new file mode 100644 index 000000000..6873088f8 Binary files /dev/null and b/assets/cn/template/TEMPLATE_SIREN_BonhommeRichard_SS.gif differ diff --git a/assets/en/template/TEMPLATE_SIREN_BonhommeRichard_SS.gif b/assets/en/template/TEMPLATE_SIREN_BonhommeRichard_SS.gif new file mode 100644 index 000000000..6873088f8 Binary files /dev/null and b/assets/en/template/TEMPLATE_SIREN_BonhommeRichard_SS.gif differ diff --git a/assets/jp/template/TEMPLATE_SIREN_BonhommeRichard_SS.gif b/assets/jp/template/TEMPLATE_SIREN_BonhommeRichard_SS.gif new file mode 100644 index 000000000..6873088f8 Binary files /dev/null and b/assets/jp/template/TEMPLATE_SIREN_BonhommeRichard_SS.gif differ diff --git a/assets/tw/template/TEMPLATE_SIREN_BonhommeRichard_SS.gif b/assets/tw/template/TEMPLATE_SIREN_BonhommeRichard_SS.gif new file mode 100644 index 000000000..6873088f8 Binary files /dev/null and b/assets/tw/template/TEMPLATE_SIREN_BonhommeRichard_SS.gif differ diff --git a/campaign/event_20260813_cn/b1.py b/campaign/event_20260813_cn/b1.py index 36b385e4c..382f0ba92 100644 --- a/campaign/event_20260813_cn/b1.py +++ b/campaign/event_20260813_cn/b1.py @@ -59,7 +59,6 @@ class Config: STAGE_ENTRANCE = ['half', '20240725'] MAP_HAS_MODE_SWITCH = True STAGE_INCREASE_AB = True - MAP_SIREN_HAS_BOSS_ICON_SMALL = True MAP_WALK_USE_CURRENT_FLEET = True INTERNAL_LINES_FIND_PEAKS_PARAMETERS = { 'height': (80, 255 - 17), diff --git a/campaign/event_20260813_cn/d1.py b/campaign/event_20260813_cn/d1.py index 6439e8fe1..cca2982a8 100644 --- a/campaign/event_20260813_cn/d1.py +++ b/campaign/event_20260813_cn/d1.py @@ -59,7 +59,6 @@ class Config: STAGE_ENTRANCE = ['half', '20240725'] MAP_HAS_MODE_SWITCH = True STAGE_INCREASE_AB = True - MAP_SIREN_HAS_BOSS_ICON_SMALL = True MAP_WALK_USE_CURRENT_FLEET = True INTERNAL_LINES_FIND_PEAKS_PARAMETERS = { 'height': (80, 255 - 17), diff --git a/campaign/event_20260813_cn/sp.py b/campaign/event_20260813_cn/sp.py new file mode 100644 index 000000000..03d3c1931 --- /dev/null +++ b/campaign/event_20260813_cn/sp.py @@ -0,0 +1,112 @@ +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 = 'I9' +MAP.camera_data = ['D4', 'D6', 'F4', 'F6'] +MAP.camera_data_spawn_point = ['D4', 'F4'] +MAP.map_data = """ + ++ ++ ++ -- ++ -- ++ ++ ++ + -- ++ -- ++ ++ ++ -- ++ -- + -- ME -- -- ++ -- -- ME -- + ME -- -- SP -- SP -- -- ME + -- ME -- -- __ -- -- ME -- + ++ -- ME -- MS -- ME -- ++ + ++ ME -- MS -- MS -- ME ++ + ++ ++ 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 50 50 50 50 50 50 50 50 + 50 50 50 50 50 50 50 50 50 + 50 50 50 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': 12, '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, \ + = MAP.flatten() + + +class Config: + # ===== Start of generated config ===== + MAP_SIREN_TEMPLATE = ['BonhommeRichard_SS'] + 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 + 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'] + STAGE_INCREASE_AB = True + INTERNAL_LINES_FIND_PEAKS_PARAMETERS = { + 'height': (80, 255 - 17), + 'width': (0.9, 10), + 'prominence': 10, + 'distance': 35, + } + EDGE_LINES_FIND_PEAKS_PARAMETERS = { + 'height': (255 - 17, 255), + 'prominence': 10, + 'distance': 50, + 'wlen': 1000 + } + MAP_ENSURE_EDGE_INSIGHT_CORNER = 'bottom' + MAP_IS_ONE_TIME_STAGE = True + MAP_SWIPE_MULTIPLY = (1.149, 1.170) + MAP_SWIPE_MULTIPLY_MINITOUCH = (1.111, 1.132) + MAP_SWIPE_MULTIPLY_MAATOUCH = (1.079, 1.098) + + +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/template/assets.py b/module/template/assets.py index a2beba43d..10d45214f 100644 --- a/module/template/assets.py +++ b/module/template/assets.py @@ -72,6 +72,7 @@ TEMPLATE_SIREN_BlackDragonBoss02 = Template(file={'cn': './assets/cn/template/TE TEMPLATE_SIREN_BolzanoAlter = Template(file={'cn': './assets/cn/template/TEMPLATE_SIREN_BolzanoAlter.gif', 'en': './assets/en/template/TEMPLATE_SIREN_BolzanoAlter.gif', 'jp': './assets/jp/template/TEMPLATE_SIREN_BolzanoAlter.gif', 'tw': './assets/tw/template/TEMPLATE_SIREN_BolzanoAlter.gif'}) TEMPLATE_SIREN_BonhommeRichard_BB = Template(file={'cn': './assets/cn/template/TEMPLATE_SIREN_BonhommeRichard_BB.gif', 'en': './assets/en/template/TEMPLATE_SIREN_BonhommeRichard_BB.gif', 'jp': './assets/jp/template/TEMPLATE_SIREN_BonhommeRichard_BB.gif', 'tw': './assets/tw/template/TEMPLATE_SIREN_BonhommeRichard_BB.gif'}) TEMPLATE_SIREN_BonhommeRichard_CV = Template(file={'cn': './assets/cn/template/TEMPLATE_SIREN_BonhommeRichard_CV.gif', 'en': './assets/en/template/TEMPLATE_SIREN_BonhommeRichard_CV.gif', 'jp': './assets/jp/template/TEMPLATE_SIREN_BonhommeRichard_CV.gif', 'tw': './assets/tw/template/TEMPLATE_SIREN_BonhommeRichard_CV.gif'}) +TEMPLATE_SIREN_BonhommeRichard_SS = Template(file={'cn': './assets/cn/template/TEMPLATE_SIREN_BonhommeRichard_SS.gif', 'en': './assets/en/template/TEMPLATE_SIREN_BonhommeRichard_SS.gif', 'jp': './assets/jp/template/TEMPLATE_SIREN_BonhommeRichard_SS.gif', 'tw': './assets/tw/template/TEMPLATE_SIREN_BonhommeRichard_SS.gif'}) TEMPLATE_SIREN_Bremerton = Template(file={'cn': './assets/cn/template/TEMPLATE_SIREN_Bremerton.gif', 'en': './assets/en/template/TEMPLATE_SIREN_Bremerton.gif', 'jp': './assets/jp/template/TEMPLATE_SIREN_Bremerton.gif', 'tw': './assets/tw/template/TEMPLATE_SIREN_Bremerton.gif'}) TEMPLATE_SIREN_CA = Template(file={'cn': './assets/cn/template/TEMPLATE_SIREN_CA.gif', 'en': './assets/en/template/TEMPLATE_SIREN_CA.gif', 'jp': './assets/jp/template/TEMPLATE_SIREN_CA.gif', 'tw': './assets/tw/template/TEMPLATE_SIREN_CA.gif'}) TEMPLATE_SIREN_CAalchemist = Template(file={'cn': './assets/cn/template/TEMPLATE_SIREN_CAalchemist.gif', 'en': './assets/en/template/TEMPLATE_SIREN_CAalchemist.gif', 'jp': './assets/jp/template/TEMPLATE_SIREN_CAalchemist.gif', 'tw': './assets/tw/template/TEMPLATE_SIREN_CAalchemist.gif'})