diff --git a/assets/cn/handler/AIR_STRIKE_CANCEL.png b/assets/cn/handler/AIR_STRIKE_CANCEL.png new file mode 100644 index 000000000..19a18eb60 Binary files /dev/null and b/assets/cn/handler/AIR_STRIKE_CANCEL.png differ diff --git a/assets/cn/handler/AIR_STRIKE_CONFIRM.png b/assets/cn/handler/AIR_STRIKE_CONFIRM.png new file mode 100644 index 000000000..0d5a6890f Binary files /dev/null and b/assets/cn/handler/AIR_STRIKE_CONFIRM.png differ diff --git a/assets/cn/handler/AIR_STRIKE_ENTER.png b/assets/cn/handler/AIR_STRIKE_ENTER.png new file mode 100644 index 000000000..ef8b8b975 Binary files /dev/null and b/assets/cn/handler/AIR_STRIKE_ENTER.png differ diff --git a/assets/cn/handler/MAP_AIR_STRIKE.png b/assets/cn/handler/MAP_AIR_STRIKE.png new file mode 100644 index 000000000..6c1d5fc21 Binary files /dev/null and b/assets/cn/handler/MAP_AIR_STRIKE.png differ diff --git a/assets/cn/map/FLEET_SUPPORT_EMPTY.png b/assets/cn/map/FLEET_SUPPORT_EMPTY.png new file mode 100644 index 000000000..cdb45ca5c Binary files /dev/null and b/assets/cn/map/FLEET_SUPPORT_EMPTY.png differ diff --git a/assets/cn/template/TEMPLATE_AIR_STRIKE_ICON.png b/assets/cn/template/TEMPLATE_AIR_STRIKE_ICON.png new file mode 100644 index 000000000..fb7d0b64c Binary files /dev/null and b/assets/cn/template/TEMPLATE_AIR_STRIKE_ICON.png differ diff --git a/assets/en/handler/MAP_AIR_STRIKE.png b/assets/en/handler/MAP_AIR_STRIKE.png new file mode 100644 index 000000000..6c1d5fc21 Binary files /dev/null and b/assets/en/handler/MAP_AIR_STRIKE.png differ diff --git a/assets/en/template/TEMPLATE_AIR_STRIKE_ICON.png b/assets/en/template/TEMPLATE_AIR_STRIKE_ICON.png new file mode 100644 index 000000000..fb7d0b64c Binary files /dev/null and b/assets/en/template/TEMPLATE_AIR_STRIKE_ICON.png differ diff --git a/assets/jp/handler/AIR_STRIKE_CANCEL.png b/assets/jp/handler/AIR_STRIKE_CANCEL.png new file mode 100644 index 000000000..b8282cb66 Binary files /dev/null and b/assets/jp/handler/AIR_STRIKE_CANCEL.png differ diff --git a/assets/jp/handler/AIR_STRIKE_CONFIRM.png b/assets/jp/handler/AIR_STRIKE_CONFIRM.png new file mode 100644 index 000000000..a45dc9982 Binary files /dev/null and b/assets/jp/handler/AIR_STRIKE_CONFIRM.png differ diff --git a/assets/jp/handler/MAP_AIR_STRIKE.png b/assets/jp/handler/MAP_AIR_STRIKE.png new file mode 100644 index 000000000..6c1d5fc21 Binary files /dev/null and b/assets/jp/handler/MAP_AIR_STRIKE.png differ diff --git a/assets/jp/template/TEMPLATE_AIR_STRIKE_ICON.png b/assets/jp/template/TEMPLATE_AIR_STRIKE_ICON.png new file mode 100644 index 000000000..fb7d0b64c Binary files /dev/null and b/assets/jp/template/TEMPLATE_AIR_STRIKE_ICON.png differ diff --git a/assets/mask/MASK_MAP_UI_W15.png b/assets/mask/MASK_MAP_UI_SUPPORT.png similarity index 100% rename from assets/mask/MASK_MAP_UI_W15.png rename to assets/mask/MASK_MAP_UI_SUPPORT.png diff --git a/assets/tw/handler/MAP_AIR_STRIKE.png b/assets/tw/handler/MAP_AIR_STRIKE.png new file mode 100644 index 000000000..6c1d5fc21 Binary files /dev/null and b/assets/tw/handler/MAP_AIR_STRIKE.png differ diff --git a/assets/tw/template/TEMPLATE_AIR_STRIKE_ICON.png b/assets/tw/template/TEMPLATE_AIR_STRIKE_ICON.png new file mode 100644 index 000000000..fb7d0b64c Binary files /dev/null and b/assets/tw/template/TEMPLATE_AIR_STRIKE_ICON.png differ diff --git a/campaign/campaign_main/campaign_15_base.py b/campaign/campaign_main/campaign_15_base.py index af7a5b841..24c9928e9 100644 --- a/campaign/campaign_main/campaign_15_base.py +++ b/campaign/campaign_main/campaign_15_base.py @@ -1,15 +1,13 @@ from module.base.mask import Mask from module.base.timer import Timer -from module.campaign.campaign_base import CampaignBase as CampaignBase_ from module.handler.assets import STRATEGY_OPENED from module.handler.strategy import MOB_MOVE_OFFSET from module.logger import logger from module.map.map_grids import SelectedGrids from module.map.utils import location_ensure from module.map_detection.grid import GridInfo -from module.map_detection.utils_assets import ASSETS -MASK_MAP_UI_W15 = Mask(file='./assets/mask/MASK_MAP_UI_W15.png') +from .campaign_support_fleet import CampaignBase as CampaignBase_ class Config: @@ -45,12 +43,6 @@ class W15GridInfo(GridInfo): class CampaignBase(CampaignBase_): ENEMY_FILTER = '1L > 1M > 1E > 2L > 3L > 2M > 2E > 1C > 2C > 3M > 3E > 3C' - def map_data_init(self, map_): - super().map_data_init(map_) - # Patch ui_mask, get rid of supporting fleet - _ = ASSETS.ui_mask - ASSETS.ui_mask = MASK_MAP_UI_W15.image - map_has_mob_move = True def strategy_set_execute(self, formation=None, sub_view=None, sub_hunt=None): @@ -61,10 +53,6 @@ class CampaignBase(CampaignBase_): ) logger.attr("Map has mob move", self.strategy_has_mob_move()) - def _map_swipe(self, vector, box=(239, 159, 1175, 628)): - # Left border to 239, avoid swiping on support fleet - return super()._map_swipe(vector, box=box) - def mob_movable(self, location, target): """ Check if mob is movable from location to target. @@ -217,3 +205,4 @@ class CampaignBase(CampaignBase_): self._mob_move_info_change(location, target) self.find_path_initial() self.map.show() + return True diff --git a/campaign/campaign_main/campaign_16_1.py b/campaign/campaign_main/campaign_16_1.py new file mode 100644 index 000000000..1e801f1d2 --- /dev/null +++ b/campaign/campaign_main/campaign_16_1.py @@ -0,0 +1,86 @@ +from module.map.map_base import CampaignMap +from module.map.map_grids import SelectedGrids, RoadGrids +from module.logger import logger + +from .campaign_16_base_submarine import CampaignBase +from .campaign_16_base_submarine import Config as ConfigBase + +MAP = CampaignMap('16-1') +MAP.shape = 'I9' +MAP.camera_data = ['C2', 'C6', 'F2', 'F5'] +MAP.camera_data_spawn_point = ['F7'] +MAP.camera_sight = (-2, -1, 3, 2) +MAP.map_data = """ + ++ ME -- -- ME -- -- ME -- + ME -- -- ME ++ ME -- -- ME + -- -- ME -- ME -- -- ME ++ + -- ME ++ ME -- ME -- ME Me + -- -- ME -- Me ++ __ -- -- + -- ME -- __ ME -- -- -- MB + -- ++ Me -- -- -- Me ++ ++ + -- ME -- -- -- -- -- ++ ++ + -- -- -- -- SP SP ++ ++ -- +""" +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': 2}, + {'battle': 1, 'enemy': 2}, + {'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): + MAP_HAS_MAP_STORY = False + MAP_HAS_FLEET_STEP = False + MAP_HAS_AMBUSH = True + + MAP_ENSURE_EDGE_INSIGHT_CORNER = 'bottom-right' + MAP_SWIPE_MULTIPLY = (1.050, 1.069) + MAP_SWIPE_MULTIPLY_MINITOUCH = (1.015, 1.034) + MAP_SWIPE_MULTIPLY_MAATOUCH = (0.985, 1.003) + + +class Campaign(CampaignBase): + MAP = MAP + + def battle_0(self): + if self.clear_filter_enemy(self.ENEMY_FILTER, preserve=1): + return True + + return self.battle_default() + + def battle_5(self): + boss = self.map.select(is_boss=True) + if boss: + return self.fleet_boss.clear_boss() + + 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/campaign_main/campaign_16_2.py b/campaign/campaign_main/campaign_16_2.py new file mode 100644 index 000000000..b2b35f563 --- /dev/null +++ b/campaign/campaign_main/campaign_16_2.py @@ -0,0 +1,83 @@ +from module.map.map_base import CampaignMap +from module.map.map_grids import SelectedGrids, RoadGrids +from module.logger import logger + +from .campaign_16_base_submarine import CampaignBase +from .campaign_16_base_submarine import Config as ConfigBase + +MAP = CampaignMap('16-2') +MAP.shape = 'J8' +MAP.camera_data = ['C2', 'C6', 'G2', 'G6'] +MAP.camera_data_spawn_point = ['C6'] +MAP.camera_sight = (-2, -1, 3, 2) +MAP.map_data = """ + MB ++ -- ME -- -- -- -- -- -- + -- Me ME -- ME ++ ME -- -- -- + -- __ -- -- -- -- -- ME ++ ++ + ME -- ME ME ME -- ME -- ++ -- + Me -- -- Me ++ -- Me -- -- -- + ++ ME -- ME ME -- ME ++ ++ -- + -- -- -- -- -- Me -- -- ++ -- + -- SP SP -- ++ ++ ++ -- -- -- +""" +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': 3}, + {'battle': 1, 'enemy': 2}, + {'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, 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): + MAP_HAS_MAP_STORY = False + MAP_HAS_FLEET_STEP = False + MAP_HAS_AMBUSH = True + + MAP_ENSURE_EDGE_INSIGHT_CORNER = 'bottom-left' + MAP_SWIPE_MULTIPLY = (1.093, 1.113) + MAP_SWIPE_MULTIPLY_MINITOUCH = (1.057, 1.077) + MAP_SWIPE_MULTIPLY_MAATOUCH = (1.026, 1.045) + + +class Campaign(CampaignBase): + MAP = MAP + + def battle_0(self): + if self.clear_filter_enemy(self.ENEMY_FILTER, preserve=1): + return True + + return self.battle_default() + + def battle_5(self): + boss = self.map.select(is_boss=True) + if boss: + return self.fleet_boss.clear_boss() + + 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/campaign_main/campaign_16_3.py b/campaign/campaign_main/campaign_16_3.py new file mode 100644 index 000000000..1fb9910ad --- /dev/null +++ b/campaign/campaign_main/campaign_16_3.py @@ -0,0 +1,116 @@ +from module.map.map_base import CampaignMap +from module.map.map_grids import SelectedGrids, RoadGrids +from module.logger import logger + +from .campaign_16_base_aircraft import CampaignBase +from .campaign_16_base_aircraft import Config as ConfigBase + +MAP = CampaignMap('16-3') +MAP.shape = 'K6' +MAP.camera_data = ['D3', 'E4', 'G2', 'H2'] +MAP.camera_data_spawn_point = ['C5'] +MAP.camera_sight = (-2, -1, 3, 2) +MAP.map_data = """ + -- -- ++ ++ ++ -- -- ME ++ -- MB + -- ME -- ++ -- ME -- -- ++ -- -- + -- -- ME ME -- ME ++ ME ++ -- -- + -- -- -- ++ ++ __ ME ME -- -- -- + SP -- -- ++ -- ME ++ -- -- -- -- + SP -- -- 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 +""" +MAP.spawn_data = [ + {'battle': 0, 'enemy': 3}, + {'battle': 1, 'enemy': 6}, + {'battle': 2, 'enemy': 3}, + {'battle': 3}, + {'battle': 4}, + {'battle': 5}, + {'battle': 6}, + {'battle': 7, 'boss': 1}, +] +MAP.spawn_data_loop = [ + {'battle': 0, 'enemy': 3}, + {'battle': 1, 'enemy': 6}, + {'battle': 2, 'enemy': 3}, + {'battle': 3}, + {'battle': 4}, + {'battle': 5, '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, \ + = MAP.flatten() + +road_main = RoadGrids([G4, H4]) + + +class Config(ConfigBase): + MAP_HAS_MAP_STORY = False + MAP_HAS_FLEET_STEP = False + MAP_HAS_AMBUSH = True + + MAP_ENSURE_EDGE_INSIGHT_CORNER = 'bottom-left' + MAP_SWIPE_MULTIPLY = (1.180, 1.202) + MAP_SWIPE_MULTIPLY_MINITOUCH = (1.141, 1.162) + MAP_SWIPE_MULTIPLY_MAATOUCH = (1.108, 1.128) + + +class Campaign(CampaignBase): + MAP = MAP + use_single_fleet = False + + def map_init(self, map_): + super().map_init(map_) + self.map_has_mob_move = self.use_support_fleet and self.map_is_clear_mode + self.use_single_fleet = 'standby' in self.config.Fleet_FleetOrder + + def battle_0(self): + if self.map_has_mob_move: + if self.mob_move(C3, C2): + return self.clear_chosen_enemy(D6) + self.map_has_mob_move = False + + return self.clear_chosen_enemy(C3) + + def battle_1(self): + if self.map_has_mob_move: + self.mob_move(E6, E5) + if not self.use_single_fleet: + self.fleet_boss.goto(F4) + self.fleet_ensure(index=3 - self.fleet_boss_index) + return self.clear_chosen_enemy(G4) + + if self.use_support_fleet and not self.map_is_clear_mode: + self.goto(C3) + self.air_strike(E3) + return self.clear_chosen_enemy(D3) + + def battle_2(self): + return self.clear_chosen_enemy(F3) + + def battle_3(self): + boss = self.map.select(is_boss=True) + if boss: + if not self.check_accessibility(boss[0], fleet='boss'): + return self.clear_roadblocks([road_main]) + if self.use_support_fleet and not self.map_is_clear_mode: + # at this stage the most right zone should be accessible + self.goto(K5) + self.air_strike(J6) + return self.fleet_boss.clear_boss() + if self.clear_roadblocks([road_main]): + return True + if self.clear_any_enemy(genre=("Light",), strongest=True): + return True + return self.battle_default() \ No newline at end of file diff --git a/campaign/campaign_main/campaign_16_4.py b/campaign/campaign_main/campaign_16_4.py new file mode 100644 index 000000000..8a7bd6c0a --- /dev/null +++ b/campaign/campaign_main/campaign_16_4.py @@ -0,0 +1,165 @@ +from module.map.map_base import CampaignMap +from module.map.map_grids import SelectedGrids, RoadGrids +from module.logger import logger + +from .campaign_16_base_aircraft import CampaignBase +from .campaign_16_base_aircraft import Config as ConfigBase + +MAP = CampaignMap('16-4') +MAP.shape = 'K8' +MAP.camera_data = ['C2', 'F5', 'F2', 'H2', 'H5'] +MAP.camera_data_spawn_point = ['C6'] +MAP.camera_sight = (-2, -1, 3, 2) +MAP.map_data = """ + -- -- ++ -- -- -- ++ ME -- -- MB + ME ++ ++ ++ -- -- ME ++ -- -- -- + -- -- ME -- -- ++ ++ ME -- -- -- + -- -- -- ME ++ -- ME -- ++ ++ -- + -- -- -- ME -- ME ++ -- ME ++ -- + -- __ -- ++ ++ -- ++ ME ME -- -- + SP -- -- ME -- -- -- ++ -- ++ ++ + SP -- -- -- ++ -- ++ ++ -- -- ++ +""" +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 +""" +MAP.spawn_data = [ + {'battle': 0, 'enemy': 5}, + {'battle': 1, 'enemy': 3}, + {'battle': 2, 'enemy': 5}, + {'battle': 3}, + {'battle': 4}, + {'battle': 5}, + {'battle': 6}, + {'battle': 7}, + {'battle': 8, 'boss': 1}, +] +MAP.spawn_data_loop = [ + {'battle': 0, 'enemy': 5}, + {'battle': 1, 'enemy': 3}, + {'battle': 2, 'enemy': 5}, + {'battle': 3}, + {'battle': 4, '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() + +road_main = RoadGrids([D5, F5, G4, H3]) + +class Config(ConfigBase): + MAP_HAS_MAP_STORY = False + MAP_HAS_FLEET_STEP = False + MAP_HAS_AMBUSH = True + + MAP_ENSURE_EDGE_INSIGHT_CORNER = 'bottom-left' + MAP_SWIPE_MULTIPLY = (1.003, 1.022) + MAP_SWIPE_MULTIPLY_MINITOUCH = (0.970, 0.988) + MAP_SWIPE_MULTIPLY_MAATOUCH = (0.942, 0.959) + + +class Campaign(CampaignBase): + MAP = MAP + F5_is_moved = False + use_single_fleet = False + + def map_init(self, map_): + super().map_init(map_) + self.F5_is_moved = False + self.map_has_mob_move = self.use_support_fleet and self.map_is_clear_mode + self.use_single_fleet = 'standby' in self.config.Fleet_FleetOrder + + def battle_0(self): + if self.map_has_mob_move and not self.use_single_fleet: + if self.mob_move(D7, D8): + self.fleet_boss.goto(J1) + self.fleet_ensure(index=3 - self.fleet_boss_index) + if self.clear_filter_enemy(self.ENEMY_FILTER, preserve=0): + return True + return self.battle_default() + + self.map_has_mob_move = False + + return self.clear_chosen_enemy(D5) + + def battle_1(self): + if not self.map_has_mob_move: + return self.clear_chosen_enemy(F5) + + if not self.use_single_fleet: + if self.clear_filter_enemy(self.ENEMY_FILTER, preserve=0): + return True + return self.battle_default() + + grids = SelectedGrids([H6, I5]) + grid = grids.delete(grids.select(enemy_genre='Main')).first_or_none() + if grid is not None and self.mob_move(F5, F6): + self.F5_is_moved = True + return self.clear_chosen_enemy(grid) + + self.F5_is_moved = False + return self.clear_chosen_enemy(F5) + + def battle_2(self): + if not self.map_has_mob_move or self.use_single_fleet: + return self.clear_chosen_enemy(G4) + + if self.clear_filter_enemy(self.ENEMY_FILTER, preserve=0): + return True + return self.battle_default() + + def battle_3(self): + if not self.map_has_mob_move: + return self.clear_chosen_enemy(H3) + + if not self.use_single_fleet: + if self.clear_filter_enemy(self.ENEMY_FILTER, preserve=0): + return True + return self.battle_default() + + if self.F5_is_moved: + if I6.enemy_genre == "Main" and self.mob_move(I6, I7): + return self.clear_any_enemy(genre=("Light",), strongest=True) + return self.clear_chosen_enemy(I6) + + self.mob_move(H3, I3) + self.mob_move(I3, I2) + return self.clear_any_enemy(genre=("Light",), strongest=True) + + def battle_4(self): + if self.map_is_clear_mode: + return self.fleet_boss.clear_boss() + + boss = self.map.select(is_boss=True) + if boss: + if not self.check_accessibility(boss[0], fleet='boss'): + return self.clear_roadblocks([road_main]) + + if self.use_support_fleet: + # at this stage the most right zone should be accessible + self.goto(J6) + self.air_strike(I8) + + return self.fleet_boss.clear_boss() + + if self.clear_roadblocks([road_main]): + return True + if self.clear_potential_roadblocks([road_main]): + return True + if self.clear_filter_enemy(self.ENEMY_FILTER, preserve=0): + return True + + return self.battle_default() \ No newline at end of file diff --git a/campaign/campaign_main/campaign_16_base_aircraft.py b/campaign/campaign_main/campaign_16_base_aircraft.py new file mode 100644 index 000000000..ca1c437ff --- /dev/null +++ b/campaign/campaign_main/campaign_16_base_aircraft.py @@ -0,0 +1,95 @@ +from module.base.decorator import del_cached_property +from module.base.timer import Timer +from module.base.utils import red_overlay_transparency, get_color +from module.handler.assets import MAP_AIR_STRIKE, STRATEGY_OPENED, AIR_STRIKE_CONFIRM +from module.handler.strategy import AIR_STRIKE_OFFSET +from module.logger import logger +from module.map.utils import location_ensure + +from .campaign_15_base import CampaignBase as CampaignBase_ + + +class Config: + MAP_WALK_TURNING_OPTIMIZE = False + MAP_HAS_MYSTERY = False + INTERNAL_LINES_FIND_PEAKS_PARAMETERS = { + 'height': (80, 255 - 33), + 'prominence': 10, + 'distance': 35, + } + # Handle fog on map, static homography parameters and lower canny threshold + HOMO_STORAGE = ((8, 6), [(137.405, 104.804), (1046.044, 104.804), (-12.171, 652.093), (1166.717, 652.093)]) + HOMO_CANNY_THRESHOLD = (50, 80) + + +class CampaignBase(CampaignBase_): + MAP_AIR_STRIKE_OVERLAY_TRANSPARENCY_THRESHOLD = 0.35 + ENEMY_FILTER = '1L > 1M > 1E > 2L > 3L > 2M > 2E > 1C > 2C > 3M > 3E > 3C' + + def _air_strike_appear(self): + return red_overlay_transparency(MAP_AIR_STRIKE.color, get_color(self.device.image, MAP_AIR_STRIKE.area)) > \ + self.MAP_AIR_STRIKE_OVERLAY_TRANSPARENCY_THRESHOLD + + def _air_strike(self, location): + self.in_sight(location) + attack_grid = self.convert_global_to_local(location) + attack_grid.__str__ = location + + logger.info('Select grid to air strike') + skip_first_screenshot = True + interval = Timer(5, count=10) + for _ in self.loop(skip_first=skip_first_screenshot): + # End + if self.is_in_strategy_air_strike(): + self.view.update(image=self.device.image) + del_cached_property(attack_grid, "image_trans") + if attack_grid.predict_air_strike_icon(): + break + # Click + if interval.reached() and self.is_in_strategy_air_strike(): + self.device.click(attack_grid) + interval.reset() + continue + + logger.info('Confirm air strike') + skip_first_screenshot = True + interval = Timer(3, count=6) + MAP_AIR_STRIKE.load_color(self.device.image) + for _ in self.loop(skip_first=skip_first_screenshot): + if self._air_strike_appear(): + interval.reset() + continue + # End + if self.appear(STRATEGY_OPENED, offset=AIR_STRIKE_OFFSET): + break + # Click + if interval.reached() and self.is_in_strategy_air_strike(): + self.device.click(AIR_STRIKE_CONFIRM) + interval.reset() + continue + + def air_strike(self, location): + """ + Open strategy, air strike on location, close strategy. + + Air strike at location X = (x, y) will hit range [x-2, y-1, x+2, y] as follows: + + OOOOO + OOXOO + + Args: + location (typle, str, GridInfo): Location of air strike + """ + location = location_ensure(location) + if self.map[location].is_land: + logger.warning(f'Air strike location {location} is on land, will abandon attacking') + return False + self.strategy_open() + if not self.strategy_has_air_strike(): + logger.warning(f'No remain air strike trials, will abandon attacking') + self.strategy_close() + return False + self.strategy_air_strike_enter() + self._air_strike(location) + self.strategy_close(skip_first_screenshot=False) + return True diff --git a/campaign/campaign_main/campaign_16_base_submarine.py b/campaign/campaign_main/campaign_16_base_submarine.py new file mode 100644 index 000000000..67b4dff60 --- /dev/null +++ b/campaign/campaign_main/campaign_16_base_submarine.py @@ -0,0 +1,27 @@ +from module.logger import logger + +from .campaign_support_fleet import CampaignBase as CampaignBase_ + + +class Config: + MAP_WALK_TURNING_OPTIMIZE = False + MAP_HAS_MYSTERY = False + HOMO_EDGE_COLOR_RANGE = (0, 12) + HOMO_EDGE_HOUGHLINES_THRESHOLD = 210 + + +class CampaignBase(CampaignBase_): + ENEMY_FILTER = '1T > 1L > 1E > 1M > 2T > 2L > 2E > 2M > 3T > 3L > 3E > 3M' + + def map_init(self, map_): + # submarine battle after entering map + # all emenies spawned already, so no need to wait enemy searching + if self.use_support_fleet: + logger.hr(f'{self.FUNCTION_NAME_BASE}SUBMARINE', level=2) + self.combat(balance_hp=False, emotion_reduce=False, save_get_items=False, expected_end='no_searching') + super().map_init(map_) + + def handle_submarine_support_popup(self): + if self.use_support_fleet and self.handle_popup_confirm("SUBMARINE_SUPPORT"): + return True + return False diff --git a/campaign/campaign_main/campaign_support_fleet.py b/campaign/campaign_main/campaign_support_fleet.py new file mode 100644 index 000000000..fceed45ae --- /dev/null +++ b/campaign/campaign_main/campaign_support_fleet.py @@ -0,0 +1,28 @@ +from module.base.mask import Mask +from module.campaign.campaign_base import CampaignBase as CampaignBase_ +from module.logger import logger +from module.map.assets import FLEET_SUPPORT_EMPTY +from module.map_detection.utils_assets import ASSETS + +MASK_MAP_UI_SUPPORT = Mask(file='./assets/mask/MASK_MAP_UI_SUPPORT.png') + + +class CampaignBase(CampaignBase_): + use_support_fleet = True + + def fleet_preparation(self): + if self.appear(FLEET_SUPPORT_EMPTY, offset=(5, 5)): + self.use_support_fleet = False + logger.attr("use_support_fleet", self.use_support_fleet) + super().fleet_preparation() + + def _map_swipe(self, vector, box=(239, 159, 1175, 628)): + # Left border to 239, avoid swiping on support fleet + return super()._map_swipe(vector, box=box) + + def map_data_init(self, map_): + super().map_data_init(map_) + if self.use_support_fleet: + # Patch ui_mask, get rid of supporting fleet + _ = ASSETS.ui_mask + ASSETS.ui_mask = MASK_MAP_UI_SUPPORT.image diff --git a/dev_tools/map_extractor.py b/dev_tools/map_extractor.py index b61bbf6cd..3d7166b2f 100644 --- a/dev_tools/map_extractor.py +++ b/dev_tools/map_extractor.py @@ -343,9 +343,18 @@ class MapData: self.map_id = data['id'] try: - self.spawn_data = self.parse_spawn_data(data) + self.event_enemy_data = None + self.event_enemy_data_loop = None + if self.map_id in MAP_EVENT_LIST: + self.event_enemy_data = self.extract_event_enemy_data(MAP_EVENT_LIST[self.map_id]['event_list']) + if data_loop is not None: + self.event_enemy_data_loop = self.extract_event_enemy_data(MAP_EVENT_LIST[self.map_id]['event_list_loop']) + else: + self.event_enemy_data_loop = None + + self.spawn_data = self.parse_spawn_data(data, self.event_enemy_data) if data_loop is not None: - self.spawn_data_loop = self.parse_spawn_data(data_loop) + self.spawn_data_loop = self.parse_spawn_data(data_loop, self.event_enemy_data_loop) if len(self.spawn_data) == len(self.spawn_data_loop) \ and all([s1 == s2 for s1, s2 in zip(self.spawn_data, self.spawn_data_loop)]): self.spawn_data_loop = None @@ -354,10 +363,10 @@ class MapData: # map_data # {0: {0: 6, 1: 8, 2: False, 3: 0}, ...} - self.map_data = self.parse_map_data(data['grids']) + self.map_data = self.parse_map_data(data['grids'], self.event_enemy_data) self.shape = tuple(np.max(list(self.map_data.keys()), axis=0)) if self.data_loop is not None: - self.map_data_loop = self.parse_map_data(data_loop['grids']) + self.map_data_loop = self.parse_map_data(data_loop['grids'], self.event_enemy_data_loop) if all([d1 == d2 for d1, d2 in zip(self.map_data.values(), self.map_data_loop.values())]): self.map_data_loop = None else: @@ -422,7 +431,7 @@ class MapData: __repr__ = __str__ - def parse_map_data(self, grids): + def parse_map_data(self, grids, event_enemy_data=None): map_data = {} offset_y = min([grid[0] for grid in grids.values()]) offset_x = min([grid[1] for grid in grids.values()]) @@ -435,11 +444,16 @@ class MapData: if info == '??': print(f'Unknown grid info. grid={location2node(loca)}, info={grid[3]}') map_data[loca] = info + if isinstance(event_enemy_data, list): + for wave in event_enemy_data: + for enemy in wave.values(): + loca = (enemy[1][1] - offset_x, enemy[1][0] - offset_y) + map_data[loca] = 'ME' return map_data @staticmethod - def parse_spawn_data(data): + def parse_spawn_data(data, event_enemy_data=None): try: battle_count = max(data['boss_refresh'], max(data['enemy_refresh'].keys())) except ValueError: @@ -450,6 +464,11 @@ class MapData: if count: spawn = spawn_data[index] spawn['enemy'] = spawn.get('enemy', 0) + count + if isinstance(event_enemy_data, list): + for index, wave in enumerate(event_enemy_data): + if len(wave): + spawn = spawn_data[index] + spawn['enemy'] = spawn.get('enemy', 0) + len(wave) if ''.join([str(item) for item in data['elite_refresh'].values()]) != '100': # Some data is incorrect for index, count in data['elite_refresh'].items(): if count: @@ -470,6 +489,15 @@ class MapData: return spawn_data + def extract_event_enemy_data(self, data): + extracted_data = [] + for event_id in data.values(): + event = MAP_EVENT_TEMPLATE[event_id] + for effect in event['effect'].values(): + if effect[0] == 'enemy': + extracted_data.append(effect[1]) + return extracted_data + def map_file_name(self): name = self.chapter_name.replace('-', '_').lower() if name[0].isdigit(): @@ -751,8 +779,8 @@ ENEMY_FILTER = '1L > 1M > 1E > 1C > 2L > 2M > 2E > 2C > 3L > 3M > 3E > 3C' LOADER = LuaLoader(FILE, server='CN') DATA = LOADER.load('./sharecfgdata/chapter_template.lua') DATA_LOOP = LOADER.load('./sharecfgdata/chapter_template_loop.lua') -# MAP_EVENT_LIST = LOADER.load('./sharecfg/map_event_list.lua') -# MAP_EVENT_TEMPLATE = LOADER.load('./sharecfg/map_event_template.lua') +MAP_EVENT_LIST = LOADER.load('./sharecfg/map_event_list.lua') +MAP_EVENT_TEMPLATE = LOADER.load('./sharecfg/map_event_template.lua') EXPECTATION_DATA = LOADER.load('./sharecfgdata/expedition_data_template.lua') ct = ChapterTemplate() diff --git a/module/handler/assets.py b/module/handler/assets.py index 63b8de7d1..71834ed33 100644 --- a/module/handler/assets.py +++ b/module/handler/assets.py @@ -4,6 +4,9 @@ from module.base.template import Template # This file was automatically generated by dev_tools/button_extract.py. # Don't modify it manually. +AIR_STRIKE_CANCEL = Button(area={'cn': (887, 644, 948, 676), 'en': (887, 644, 948, 676), 'jp': (948, 644, 1009, 676), 'tw': (887, 644, 948, 676)}, color={'cn': (193, 141, 135), 'en': (193, 141, 135), 'jp': (194, 124, 117), 'tw': (193, 141, 135)}, button={'cn': (887, 644, 948, 676), 'en': (887, 644, 948, 676), 'jp': (948, 644, 1009, 676), 'tw': (887, 644, 948, 676)}, file={'cn': './assets/cn/handler/AIR_STRIKE_CANCEL.png', 'en': './assets/cn/handler/AIR_STRIKE_CANCEL.png', 'jp': './assets/jp/handler/AIR_STRIKE_CANCEL.png', 'tw': './assets/cn/handler/AIR_STRIKE_CANCEL.png'}) +AIR_STRIKE_CONFIRM = Button(area={'cn': (1100, 644, 1161, 675), 'en': (1100, 644, 1161, 675), 'jp': (1161, 644, 1222, 675), 'tw': (1100, 644, 1161, 675)}, color={'cn': (129, 161, 199), 'en': (129, 161, 199), 'jp': (137, 170, 211), 'tw': (129, 161, 199)}, button={'cn': (1100, 644, 1161, 675), 'en': (1100, 644, 1161, 675), 'jp': (1161, 644, 1222, 675), 'tw': (1100, 644, 1161, 675)}, file={'cn': './assets/cn/handler/AIR_STRIKE_CONFIRM.png', 'en': './assets/cn/handler/AIR_STRIKE_CONFIRM.png', 'jp': './assets/jp/handler/AIR_STRIKE_CONFIRM.png', 'tw': './assets/cn/handler/AIR_STRIKE_CONFIRM.png'}) +AIR_STRIKE_ENTER = Button(area={'cn': (1194, 456, 1249, 530), 'en': (1194, 456, 1249, 530), 'jp': (1194, 456, 1249, 530), 'tw': (1194, 456, 1249, 530)}, color={'cn': (123, 124, 131), 'en': (123, 124, 131), 'jp': (123, 124, 131), 'tw': (123, 124, 131)}, button={'cn': (1194, 456, 1249, 530), 'en': (1194, 456, 1249, 530), 'jp': (1194, 456, 1249, 530), 'tw': (1194, 456, 1249, 530)}, file={'cn': './assets/cn/handler/AIR_STRIKE_ENTER.png', 'en': './assets/cn/handler/AIR_STRIKE_ENTER.png', 'jp': './assets/cn/handler/AIR_STRIKE_ENTER.png', 'tw': './assets/cn/handler/AIR_STRIKE_ENTER.png'}) ANDROID_NO_RESPOND = Button(area={'cn': (341, 433, 391, 472), 'en': (341, 433, 391, 472), 'jp': (341, 433, 391, 472), 'tw': (341, 433, 391, 472)}, color={'cn': (217, 237, 235), 'en': (217, 237, 235), 'jp': (217, 237, 235), 'tw': (217, 237, 235)}, button={'cn': (341, 433, 391, 472), 'en': (341, 433, 391, 472), 'jp': (341, 433, 391, 472), 'tw': (341, 433, 391, 472)}, file={'cn': './assets/cn/handler/ANDROID_NO_RESPOND.png', 'en': './assets/en/handler/ANDROID_NO_RESPOND.png', 'jp': './assets/jp/handler/ANDROID_NO_RESPOND.png', 'tw': './assets/tw/handler/ANDROID_NO_RESPOND.png'}) AUTO_SEARCH_MAP_OPTION_OFF = Button(area={'cn': (1205, 549, 1275, 566), 'en': (1203, 552, 1277, 564), 'jp': (1204, 547, 1276, 568), 'tw': (1205, 546, 1275, 567)}, color={'cn': (196, 169, 169), 'en': (151, 132, 138), 'jp': (179, 153, 156), 'tw': (153, 132, 137)}, button={'cn': (1205, 549, 1275, 566), 'en': (1203, 552, 1277, 564), 'jp': (1204, 547, 1276, 568), 'tw': (1205, 546, 1275, 567)}, file={'cn': './assets/cn/handler/AUTO_SEARCH_MAP_OPTION_OFF.png', 'en': './assets/en/handler/AUTO_SEARCH_MAP_OPTION_OFF.png', 'jp': './assets/jp/handler/AUTO_SEARCH_MAP_OPTION_OFF.png', 'tw': './assets/tw/handler/AUTO_SEARCH_MAP_OPTION_OFF.png'}) AUTO_SEARCH_MAP_OPTION_ON = Button(area={'cn': (1205, 549, 1275, 566), 'en': (1203, 552, 1277, 564), 'jp': (1203, 547, 1276, 568), 'tw': (1204, 546, 1276, 567)}, color={'cn': (149, 176, 193), 'en': (113, 135, 157), 'jp': (132, 158, 177), 'tw': (110, 133, 156)}, button={'cn': (1205, 549, 1275, 566), 'en': (1203, 552, 1277, 564), 'jp': (1203, 547, 1276, 568), 'tw': (1204, 546, 1276, 567)}, file={'cn': './assets/cn/handler/AUTO_SEARCH_MAP_OPTION_ON.png', 'en': './assets/en/handler/AUTO_SEARCH_MAP_OPTION_ON.png', 'jp': './assets/jp/handler/AUTO_SEARCH_MAP_OPTION_ON.png', 'tw': './assets/tw/handler/AUTO_SEARCH_MAP_OPTION_ON.png'}) @@ -62,6 +65,7 @@ LOGIN_RETURN_SIGN = Button(area={'cn': (1, 7, 104, 47), 'en': (1, 7, 118, 39), ' MAINTENANCE_ANNOUNCE = Button(area={'cn': (923, 141, 990, 186), 'en': (923, 141, 990, 186), 'jp': (923, 141, 990, 186), 'tw': (923, 141, 990, 186)}, color={'cn': (207, 95, 91), 'en': (207, 95, 91), 'jp': (207, 95, 91), 'tw': (207, 95, 91)}, button={'cn': (923, 141, 990, 186), 'en': (923, 141, 990, 186), 'jp': (923, 141, 990, 186), 'tw': (923, 141, 990, 186)}, file={'cn': './assets/cn/handler/MAINTENANCE_ANNOUNCE.png', 'en': './assets/en/handler/MAINTENANCE_ANNOUNCE.png', 'jp': './assets/jp/handler/MAINTENANCE_ANNOUNCE.png', 'tw': './assets/tw/handler/MAINTENANCE_ANNOUNCE.png'}) MANJUU_AREA = Button(area={'cn': (520, 240, 760, 400), 'en': (520, 240, 760, 400), 'jp': (520, 240, 760, 400), 'tw': (520, 240, 760, 400)}, color={'cn': (255, 255, 255), 'en': (255, 255, 255), 'jp': (255, 255, 255), 'tw': (255, 255, 255)}, button={'cn': (520, 240, 760, 400), 'en': (520, 240, 760, 400), 'jp': (520, 240, 760, 400), 'tw': (520, 240, 760, 400)}, file={'cn': './assets/cn/handler/MANJUU_AREA.png', 'en': './assets/cn/handler/MANJUU_AREA.png', 'jp': './assets/cn/handler/MANJUU_AREA.png', 'tw': './assets/cn/handler/MANJUU_AREA.png'}) MAP_AIR_RAID = Button(area={'cn': (350, 447, 1280, 472), 'en': (350, 447, 1280, 472), 'jp': (350, 447, 1280, 472), 'tw': (350, 447, 1280, 472)}, color={'cn': (154, 43, 46), 'en': (154, 43, 46), 'jp': (154, 43, 46), 'tw': (154, 43, 46)}, button={'cn': (350, 447, 1280, 472), 'en': (350, 447, 1280, 472), 'jp': (350, 447, 1280, 472), 'tw': (350, 447, 1280, 472)}, file={'cn': './assets/cn/handler/MAP_AIR_RAID.png', 'en': './assets/en/handler/MAP_AIR_RAID.png', 'jp': './assets/jp/handler/MAP_AIR_RAID.png', 'tw': './assets/tw/handler/MAP_AIR_RAID.png'}) +MAP_AIR_STRIKE = Button(area={'cn': (0, 0, 1280, 720), 'en': (0, 0, 1280, 720), 'jp': (0, 0, 1280, 720), 'tw': (0, 0, 1280, 720)}, color={'cn': (20, 17, 17), 'en': (20, 17, 17), 'jp': (20, 17, 17), 'tw': (20, 17, 17)}, button={'cn': (0, 0, 1280, 720), 'en': (0, 0, 1280, 720), 'jp': (0, 0, 1280, 720), 'tw': (0, 0, 1280, 720)}, file={'cn': './assets/cn/handler/MAP_AIR_STRIKE.png', 'en': './assets/en/handler/MAP_AIR_STRIKE.png', 'jp': './assets/jp/handler/MAP_AIR_STRIKE.png', 'tw': './assets/tw/handler/MAP_AIR_STRIKE.png'}) MAP_AMBUSH = Button(area={'cn': (261, 433, 1280, 449), 'en': (261, 433, 1280, 449), 'jp': (261, 433, 1280, 449), 'tw': (261, 433, 1280, 449)}, color={'cn': (161, 41, 43), 'en': (161, 41, 43), 'jp': (161, 41, 43), 'tw': (161, 41, 43)}, button={'cn': (261, 433, 1280, 449), 'en': (261, 433, 1280, 449), 'jp': (261, 433, 1280, 449), 'tw': (261, 433, 1280, 449)}, file={'cn': './assets/cn/handler/MAP_AMBUSH.png', 'en': './assets/en/handler/MAP_AMBUSH.png', 'jp': './assets/jp/handler/MAP_AMBUSH.png', 'tw': './assets/tw/handler/MAP_AMBUSH.png'}) MAP_AMBUSH_ATTACK = Button(area={'cn': (804, 457, 876, 488), 'en': (791, 463, 888, 485), 'jp': (804, 457, 876, 488), 'tw': (804, 455, 876, 486)}, color={'cn': (139, 168, 210), 'en': (164, 187, 221), 'jp': (150, 175, 212), 'tw': (149, 175, 213)}, button={'cn': (755, 446, 925, 501), 'en': (753, 443, 927, 503), 'jp': (757, 447, 925, 501), 'tw': (762, 443, 927, 499)}, file={'cn': './assets/cn/handler/MAP_AMBUSH_ATTACK.png', 'en': './assets/en/handler/MAP_AMBUSH_ATTACK.png', 'jp': './assets/jp/handler/MAP_AMBUSH_ATTACK.png', 'tw': './assets/tw/handler/MAP_AMBUSH_ATTACK.png'}) MAP_AMBUSH_EVADE = Button(area={'cn': (1029, 457, 1101, 487), 'en': (1021, 459, 1110, 483), 'jp': (1031, 458, 1101, 487), 'tw': (1071, 457, 1101, 487)}, color={'cn': (199, 195, 196), 'en': (200, 197, 198), 'jp': (239, 194, 138), 'tw': (247, 209, 164)}, button={'cn': (979, 444, 1152, 502), 'en': (978, 443, 1153, 503), 'jp': (979, 444, 1151, 502), 'tw': (979, 444, 1152, 502)}, file={'cn': './assets/cn/handler/MAP_AMBUSH_EVADE.png', 'en': './assets/en/handler/MAP_AMBUSH_EVADE.png', 'jp': './assets/jp/handler/MAP_AMBUSH_EVADE.png', 'tw': './assets/tw/handler/MAP_AMBUSH_EVADE.png'}) diff --git a/module/handler/fast_forward.py b/module/handler/fast_forward.py index dd9de15f3..a7b86ea8d 100644 --- a/module/handler/fast_forward.py +++ b/module/handler/fast_forward.py @@ -122,6 +122,7 @@ class FastForwardHandler(AutoSearchHandler): > 13-1 > 13-2 > 13-3 > 13-4 > 14-1 > 14-2 > 14-3 > 14-4 > 15-1 > 15-2 > 15-3 > 15-4 + > 16-1 > 16-2 > 16-3 > 16-4 """, 'A1 > A2 > A3', 'B1 > B2 > B3', @@ -543,6 +544,12 @@ class FastForwardHandler(AutoSearchHandler): return False + def handle_submarine_support_popup(self): + """ + Should be rewritten in W16 submarine base class + """ + return False + def handle_map_walk_speedup(self, skip_first_screenshot=True): """ Turn on walk speedup, no reason to turn it off diff --git a/module/handler/strategy.py b/module/handler/strategy.py index 4cf9a4956..e4f1c37ee 100644 --- a/module/handler/strategy.py +++ b/module/handler/strategy.py @@ -21,6 +21,7 @@ SUBMARINE_VIEW.add_state('on', check_button=SUBMARINE_VIEW_ON) SUBMARINE_VIEW.add_state('off', check_button=SUBMARINE_VIEW_OFF) MOB_MOVE_OFFSET = (120, 200) +AIR_STRIKE_OFFSET = (120, 200) class StrategyHandler(InfoHandler): @@ -259,3 +260,43 @@ class StrategyHandler(InfoHandler): if self.appear_then_click(MOB_MOVE_CANCEL, offset=(20, 20), interval=5): continue + + def is_in_strategy_air_strike(self): + return self.appear(AIR_STRIKE_CONFIRM, offset=(20, 20)) + + def strategy_has_air_strike(self): + """ + Pages: + in: STRATEGY_OPENED + out: STRATEGY_OPENED + """ + if self.match_template_color(AIR_STRIKE_ENTER, offset=(150, 200)): + return True + else: + return False + + def strategy_air_strike_enter(self, skip_first_screenshot=True): + """ + Pages: + in: STRATEGY_OPENED, AIR_STRIKE_ENTER + out: AIR_STRIKE_CONFIRM + """ + logger.info('Air strike enter') + for _ in self.loop(skip_first=skip_first_screenshot): + if self.appear(AIR_STRIKE_CONFIRM, offset=(20, 20)): + break + if self.appear_then_click(AIR_STRIKE_ENTER, offset=(150, 200), interval=5): + continue + + def strategy_air_strike_cancel(self, skip_first_screenshot=True): + """ + Pages: + in: AIR_STRIKE_CONFIRM + out: STRATEGY_OPENED, AIR_STRIKE_ENTER + """ + logger.info('Air strike cancel') + for _ in self.loop(skip_first=skip_first_screenshot): + if self.appear(AIR_STRIKE_ENTER, offset=(150, 200)): + break + if self.appear_then_click(AIR_STRIKE_CANCEL, offset=(20, 20), interval=5): + continue diff --git a/module/map/assets.py b/module/map/assets.py index 2b2713fdf..5263daa87 100644 --- a/module/map/assets.py +++ b/module/map/assets.py @@ -21,6 +21,7 @@ FLEET_NUM_1 = Button(area={'cn': (213, 76, 224, 101), 'en': (213, 76, 224, 101), FLEET_NUM_2 = Button(area={'cn': (212, 75, 226, 101), 'en': (212, 75, 226, 101), 'jp': (212, 75, 226, 101), 'tw': (212, 75, 226, 101)}, color={'cn': (52, 150, 194), 'en': (52, 150, 194), 'jp': (52, 150, 194), 'tw': (52, 150, 194)}, button={'cn': (212, 75, 226, 101), 'en': (212, 75, 226, 101), 'jp': (212, 75, 226, 101), 'tw': (212, 75, 226, 101)}, file={'cn': './assets/cn/map/FLEET_NUM_2.png', 'en': './assets/en/map/FLEET_NUM_2.png', 'jp': './assets/jp/map/FLEET_NUM_2.png', 'tw': './assets/tw/map/FLEET_NUM_2.png'}) FLEET_PREPARATION = Button(area={'cn': (1013, 558, 1141, 588), 'en': (1048, 569, 1086, 595), 'jp': (1046, 558, 1107, 587), 'tw': (1014, 557, 1142, 588)}, color={'cn': (242, 211, 160), 'en': (241, 201, 148), 'jp': (241, 205, 151), 'tw': (242, 208, 157)}, button={'cn': (980, 549, 1181, 612), 'en': (988, 556, 1145, 606), 'jp': (983, 549, 1185, 612), 'tw': (980, 548, 1180, 612)}, file={'cn': './assets/cn/map/FLEET_PREPARATION.png', 'en': './assets/en/map/FLEET_PREPARATION.png', 'jp': './assets/jp/map/FLEET_PREPARATION.png', 'tw': './assets/tw/map/FLEET_PREPARATION.png'}) FLEET_PREPARATION_CHECK = Button(area={'cn': (1146, 107, 1174, 136), 'en': (1129, 111, 1158, 140), 'jp': (1146, 107, 1174, 136), 'tw': (1145, 106, 1175, 136)}, color={'cn': (180, 98, 111), 'en': (189, 105, 109), 'jp': (180, 98, 111), 'tw': (180, 90, 92)}, button={'cn': (1146, 107, 1174, 136), 'en': (1129, 111, 1158, 140), 'jp': (1146, 107, 1174, 136), 'tw': (1145, 106, 1175, 136)}, file={'cn': './assets/cn/map/FLEET_PREPARATION_CHECK.png', 'en': './assets/en/map/FLEET_PREPARATION_CHECK.png', 'jp': './assets/jp/map/FLEET_PREPARATION_CHECK.png', 'tw': './assets/tw/map/FLEET_PREPARATION_CHECK.png'}) +FLEET_SUPPORT_EMPTY = Button(area={'cn': (454, 470, 538, 540), 'en': (454, 470, 538, 540), 'jp': (454, 470, 538, 540), 'tw': (454, 470, 538, 540)}, color={'cn': (47, 54, 77), 'en': (47, 54, 77), 'jp': (47, 54, 77), 'tw': (47, 54, 77)}, button={'cn': (454, 470, 538, 540), 'en': (454, 470, 538, 540), 'jp': (454, 470, 538, 540), 'tw': (454, 470, 538, 540)}, file={'cn': './assets/cn/map/FLEET_SUPPORT_EMPTY.png', 'en': './assets/cn/map/FLEET_SUPPORT_EMPTY.png', 'jp': './assets/cn/map/FLEET_SUPPORT_EMPTY.png', 'tw': './assets/cn/map/FLEET_SUPPORT_EMPTY.png'}) MAP_CAT_ATTACK = Button(area={'cn': (1237, 103, 1252, 153), 'en': (1237, 103, 1252, 153), 'jp': (1237, 103, 1252, 153), 'tw': (1237, 103, 1252, 153)}, color={'cn': (43, 45, 52), 'en': (43, 45, 52), 'jp': (43, 45, 52), 'tw': (43, 45, 52)}, button={'cn': (1148, 653, 1262, 705), 'en': (1147, 651, 1263, 701), 'jp': (1149, 653, 1261, 704), 'tw': (1148, 653, 1262, 705)}, file={'cn': './assets/cn/map/MAP_CAT_ATTACK.png', 'en': './assets/en/map/MAP_CAT_ATTACK.png', 'jp': './assets/jp/map/MAP_CAT_ATTACK.png', 'tw': './assets/tw/map/MAP_CAT_ATTACK.png'}) MAP_CAT_ATTACK_MIRROR = Button(area={'cn': (147, 145, 187, 157), 'en': (147, 145, 187, 157), 'jp': (147, 145, 187, 157), 'tw': (147, 145, 187, 157)}, color={'cn': (214, 191, 99), 'en': (214, 191, 99), 'jp': (214, 191, 99), 'tw': (214, 191, 99)}, button={'cn': (147, 145, 187, 157), 'en': (147, 145, 187, 157), 'jp': (147, 145, 187, 157), 'tw': (147, 145, 187, 157)}, file={'cn': './assets/cn/map/MAP_CAT_ATTACK_MIRROR.png', 'en': './assets/en/map/MAP_CAT_ATTACK_MIRROR.png', 'jp': './assets/jp/map/MAP_CAT_ATTACK_MIRROR.png', 'tw': './assets/tw/map/MAP_CAT_ATTACK_MIRROR.png'}) MAP_MODE_SWITCH_HARD = Button(area={'cn': (341, 580, 374, 617), 'en': (341, 580, 374, 617), 'jp': (341, 580, 374, 617), 'tw': (341, 580, 374, 617)}, color={'cn': (234, 179, 179), 'en': (234, 179, 179), 'jp': (234, 179, 179), 'tw': (234, 179, 179)}, button={'cn': (341, 580, 374, 617), 'en': (341, 580, 374, 617), 'jp': (341, 580, 374, 617), 'tw': (341, 580, 374, 617)}, file={'cn': './assets/cn/map/MAP_MODE_SWITCH_HARD.png', 'en': './assets/cn/map/MAP_MODE_SWITCH_HARD.png', 'jp': './assets/cn/map/MAP_MODE_SWITCH_HARD.png', 'tw': './assets/cn/map/MAP_MODE_SWITCH_HARD.png'}) diff --git a/module/map/camera.py b/module/map/camera.py index 280a71712..9fa9cba26 100644 --- a/module/map/camera.py +++ b/module/map/camera.py @@ -114,7 +114,8 @@ class Camera(MapOperation): try: if not self.is_in_map() \ and not self.is_in_strategy_submarine_move() \ - and not self.is_in_strategy_mob_move(): + and not self.is_in_strategy_mob_move() \ + and not self.is_in_strategy_air_strike(): logger.warning('Image to detect is not in_map') raise MapDetectionError('Image to detect is not in_map') self.view.load(self.device.image) diff --git a/module/map/map_operation.py b/module/map/map_operation.py index 4e2b79177..af5fa9695 100644 --- a/module/map/map_operation.py +++ b/module/map/map_operation.py @@ -199,6 +199,10 @@ class MapOperation(MysteryHandler, FleetPreparation, Retirement, FastForwardHand if self.handle_use_data_key(): continue + # 16-1/16-2 submarine support popup + if self.handle_submarine_support_popup(): + continue + # Emotion if self.handle_combat_low_emotion(): continue diff --git a/module/map_detection/grid_predictor.py b/module/map_detection/grid_predictor.py index b58034a02..64884b26d 100644 --- a/module/map_detection/grid_predictor.py +++ b/module/map_detection/grid_predictor.py @@ -314,6 +314,13 @@ class GridPredictor: image = rgb2gray(self.relative_crop(area=(-0.5, -0.5, 0.5, 0.5), shape=(60, 60))) return TEMPLATE_MOB_MOVE_ICON.match(image) + def predict_air_strike_icon(self): + # area = area_pad((0, 0, 140, 140), pad=5) + # image = color_similarity_2d(crop(self.image_trans, area=area, copy=False), color=(255, 255, 160)) + image = color_similarity_2d(self.image_trans, color=(255, 255, 160)) + cv2.threshold(image, 175, 255, cv2.THRESH_BINARY, dst=image) + return TEMPLATE_AIR_STRIKE_ICON.match(image, similarity=0.7) + @cached_property def _image_similar_piece(self): return rgb2gray(self.relative_crop(area=(-0.5, -0.5, 0.5, 0.5), shape=(60, 60))) diff --git a/module/template/assets.py b/module/template/assets.py index 3973aded9..6d10181b6 100644 --- a/module/template/assets.py +++ b/module/template/assets.py @@ -4,6 +4,7 @@ from module.base.template import Template # This file was automatically generated by dev_tools/button_extract.py. # Don't modify it manually. +TEMPLATE_AIR_STRIKE_ICON = Template(file={'cn': './assets/cn/template/TEMPLATE_AIR_STRIKE_ICON.png', 'en': './assets/en/template/TEMPLATE_AIR_STRIKE_ICON.png', 'jp': './assets/jp/template/TEMPLATE_AIR_STRIKE_ICON.png', 'tw': './assets/tw/template/TEMPLATE_AIR_STRIKE_ICON.png'}) TEMPLATE_AMBUSH_EVADE_FAILED = Template(file={'cn': './assets/cn/template/TEMPLATE_AMBUSH_EVADE_FAILED.png', 'en': './assets/en/template/TEMPLATE_AMBUSH_EVADE_FAILED.png', 'jp': './assets/jp/template/TEMPLATE_AMBUSH_EVADE_FAILED.png', 'tw': './assets/tw/template/TEMPLATE_AMBUSH_EVADE_FAILED.png'}) TEMPLATE_AMBUSH_EVADE_SUCCESS = Template(file={'cn': './assets/cn/template/TEMPLATE_AMBUSH_EVADE_SUCCESS.png', 'en': './assets/en/template/TEMPLATE_AMBUSH_EVADE_SUCCESS.png', 'jp': './assets/jp/template/TEMPLATE_AMBUSH_EVADE_SUCCESS.png', 'tw': './assets/tw/template/TEMPLATE_AMBUSH_EVADE_SUCCESS.png'}) TEMPLATE_CAUGHT_BY_SIREN = Template(file={'cn': './assets/cn/template/TEMPLATE_CAUGHT_BY_SIREN.png', 'en': './assets/en/template/TEMPLATE_CAUGHT_BY_SIREN.png', 'jp': './assets/jp/template/TEMPLATE_CAUGHT_BY_SIREN.png', 'tw': './assets/tw/template/TEMPLATE_CAUGHT_BY_SIREN.png'})