From 6272284ad51c38089243c7b5be8d4fe31c9f7d9e Mon Sep 17 00:00:00 2001 From: LmeSzinc Date: Wed, 1 Apr 2020 10:28:42 +0800 Subject: [PATCH] =?UTF-8?q?Fix:=20=E4=BF=AE=E5=A4=8D7-2=E6=8B=A3=E5=9E=83?= =?UTF-8?q?=E5=9C=BEBOSS=E9=98=9F=E8=B8=A9A3=20=E9=80=89=E5=90=A6=E7=9A=84?= =?UTF-8?q?=E6=83=85=E5=86=B5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../campaign_7_2_mystery_farming.py | 43 +++++++++++-------- 1 file changed, 25 insertions(+), 18 deletions(-) diff --git a/campaign/campaign_main/campaign_7_2_mystery_farming.py b/campaign/campaign_main/campaign_7_2_mystery_farming.py index 7d53e5bca..596f8828a 100644 --- a/campaign/campaign_main/campaign_7_2_mystery_farming.py +++ b/campaign/campaign_main/campaign_7_2_mystery_farming.py @@ -51,15 +51,19 @@ class Campaign(CampaignBase): MAP = MAP def battle_0(self): - if self.fleet_2_step_on(FLEET_2_STEP_ON, roadblocks=[ROAD_MAIN]): - return True + if self.config.C72_BOSS_FLEET_STEP_ON_A3: + if self.fleet_2_step_on(FLEET_2_STEP_ON, roadblocks=[ROAD_MAIN]): + return True - ignore = None - if self.fleet_at(A3, fleet=2): - ignore = SelectedGrids([A2]) - if self.fleet_at(G3, fleet=2): - ignore = SelectedGrids([H3]) - self.clear_all_mystery(nearby=False, ignore=ignore) + ignore = None + if self.fleet_at(A3, fleet=2): + ignore = SelectedGrids([A2]) + if self.fleet_at(G3, fleet=2): + ignore = SelectedGrids([H3]) + + self.clear_all_mystery(nearby=False, ignore=ignore) + else: + self.clear_all_mystery(nearby=False) grids = ROAD_MAIN.roadblocks().select(is_accessible=True, enemy_scale=3) if grids: @@ -94,17 +98,20 @@ class Campaign(CampaignBase): battle_2 = battle_0 def battle_3(self): - ignore = None - if self.fleet_at(A3, fleet=2): - ignore = SelectedGrids([A2]) - if self.fleet_at(G3, fleet=2): - ignore = SelectedGrids([H3]) - self.clear_all_mystery(nearby=False, ignore=ignore) + if self.config.C72_BOSS_FLEET_STEP_ON_A3: + ignore = None + if self.fleet_at(A3, fleet=2): + ignore = SelectedGrids([A2]) + if self.fleet_at(G3, fleet=2): + ignore = SelectedGrids([H3]) + self.clear_all_mystery(nearby=False, ignore=ignore) - if self.fleet_at(A3, fleet=2) and A2.is_mystery: - self.fleet_2.clear_chosen_mystery(A2) - if self.fleet_at(G3, fleet=2) and H3.is_mystery: - self.fleet_2.clear_chosen_mystery(H3) + if self.fleet_at(A3, fleet=2) and A2.is_mystery: + self.fleet_2.clear_chosen_mystery(A2) + if self.fleet_at(G3, fleet=2) and H3.is_mystery: + self.fleet_2.clear_chosen_mystery(H3) + else: + self.clear_all_mystery(nearby=False) if self.map.select(is_mystery=True, is_accessible=False): logger.info('Roadblock blocks mystery.')