1
0
mirror of https://gitee.com/sui-feng-cb/AzurLaneAutoScript1 synced 2026-03-12 15:36:59 +08:00

Revert "Upd: MAP_WALK_USE_CURRENT_FLEET in 16-3 and 16-4"

This reverts commit c4d469e22c.
This commit is contained in:
sui-feng-cb
2026-01-18 22:34:53 +08:00
parent d6a0eb1a7c
commit 7a2acf219d
4 changed files with 5 additions and 35 deletions

View File

@@ -60,7 +60,6 @@ class Config:
MAP_HAS_AMBUSH = True
# ===== End of generated config =====
MAP_HAS_SUBMARINE_SUPPORT = True

View File

@@ -56,7 +56,6 @@ class Config(ConfigBase):
MAP_HAS_FLEET_STEP = False
MAP_HAS_AMBUSH = True
# ===== End of generated config =====
MAP_HAS_SUBMARINE_SUPPORT = True

View File

@@ -49,7 +49,6 @@ class Config(ConfigBase):
MAP_HAS_FLEET_STEP = False
MAP_HAS_AMBUSH = True
# ===== End of generated config =====
INTERNAL_LINES_FIND_PEAKS_PARAMETERS = {
'height': (120, 255 - 17),
'width': (0.9, 10),
@@ -64,7 +63,6 @@ class Config(ConfigBase):
}
INTERNAL_LINES_HOUGHLINES_THRESHOLD = 25
EDGE_LINES_HOUGHLINES_THRESHOLD = 25
MAP_WALK_USE_CURRENT_FLEET = True
class Campaign(CampaignBase):

View File

@@ -56,7 +56,6 @@ class Config(ConfigBase):
MAP_HAS_FLEET_STEP = False
MAP_HAS_AMBUSH = True
# ===== End of generated config =====
INTERNAL_LINES_FIND_PEAKS_PARAMETERS = {
'height': (120, 255 - 17),
'width': (0.9, 10),
@@ -71,13 +70,15 @@ class Config(ConfigBase):
}
INTERNAL_LINES_HOUGHLINES_THRESHOLD = 25
EDGE_LINES_HOUGHLINES_THRESHOLD = 25
MAP_WALK_USE_CURRENT_FLEET = True
class Campaign(CampaignBase):
MAP = MAP
def battle_default(self):
def battle_0(self):
if not self.map_is_clear_mode:
self.destroy_land_base(C1, D1, D1)
if self.clear_roadblocks(roads):
return True
if self.clear_potential_roadblocks(roads):
@@ -85,33 +86,6 @@ class Campaign(CampaignBase):
if self.clear_filter_enemy(self.ENEMY_FILTER, preserve=1):
return True
return super().battle_default()
def battle_0(self):
if self.clear_chosen_enemy(D4):
return True
return self.battle_default()
def battle_1(self):
if not self.map_is_clear_mode:
self.destroy_land_base(C1, D1, D1)
if self.clear_chosen_enemy(F5):
return True
return self.battle_default()
def battle_2(self):
if self.clear_chosen_enemy(G4):
return True
return self.battle_default()
def battle_3(self):
if self.clear_chosen_enemy(H3):
return True
return self.battle_default()
def battle_4(self):
@@ -129,5 +103,5 @@ class Campaign(CampaignBase):
return True
if self.clear_filter_enemy(self.ENEMY_FILTER, preserve=0):
return True
return self.battle_default()