Skip to content

Commit 00f8d6d

Browse files
LmeSzincLmeSzinc
authored
Merge pull request LmeSzinc#5301 from LmeSzinc/dev
Bug fix
2 parents cfe9ec5 + c235247 commit 00f8d6d

File tree

27 files changed

+1122
-73
lines changed

27 files changed

+1122
-73
lines changed

‎assets/cn/handler/USE_DATA_KEY_NOTIFIED.png‎

-2.54 KB
Loading

‎assets/cn/war_archives/TEMPLATE_VIOLET_TEMPEST_BLOOMING_LYCORIS.png‎

7.62 KB
Loading

‎campaign/Readme.md‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -55,6 +55,7 @@ To add a new event, add a new row in here, and run `python -m module.config.conf
5555
| 20250619 | war archives 20220728 cn | Aquilifer's Ballade | 雄鹰的叙事歌 | Aquilifer's Ballade | 鋼鷲の冒険譚 | 雄鷹的敘事歌 |
5656
| 20250717 | war archives 20220428 cn | Rondo at Rainbow's End | 虹彩的终幕曲 | Rondo at Rainbow's End | 吟ずる瑠璃の楽章 | 虹彩的終幕曲 |
5757
| 20251016 | war archives 20231026 cn | Tempesta and the Fountain of Youth | 飓风与青春之泉 | Tempesta and the Fountain of Youth | テンペスタと若返りの泉 | 飓風與青春之泉 |
58+
| 20251106 | war archives 20220915 cn | Violet Tempest Blooming Lycoris | 紫绛槿岚 | Violet Tempest Blooming Lycoris | 赫の涙月 菫の暁風 | 紫絳槿嵐 |
5859
| 20200227 | event 20200227 cn | Northern Overture | 北境序曲 | Northern Overture | 凍絶の北海 | - |
5960
| 20200312 | event 20200312 cn | The Solomon Ranger | 复刻斯图尔特的硝烟 | The Solomon Ranger Rerun | 南洋に靡く硝煙（復刻） | - |
6061
| 20200326 | event 20200326 cn | Microlayer Medley | 微层混合 | Microlayer Medley | 闇靄払う銀翼 | - |
@@ -263,3 +264,5 @@ To add a new event, add a new row in here, and run `python -m module.config.conf
263264
| 20251009 | coalition 20250626 | The Neon City Investigator | - | - | - | 迷彩都市的尋蹤者 |
264265
| 20251016 | event 20230817 cn | The Fool's Scales | 复刻愚者的天平 | The Fool's Scales Rerun | 愚者の天秤（復刻） | - |
265266
| 20251023 | event 20251023 cn | Tempesta and Islas de Libertád | 飓风与自由群岛 | Tempesta and Islas de Libertád | テンペスタと自由群島 | - |
267+
| 20251106 | event 20230803 cn | Anthem of Remembrance | 复刻奏响鸢尾之歌 | Anthem of Remembrance Rerun | 燃ゆる聖都の回想曲（復刻） | - |
268+
| 20251106 | event 20250227 cn | Paradiso of Shackled Light | - | - | - | 樊籠內的神光 |

‎campaign/war_archives_20220915_cn/a1.py‎

Lines changed: 94 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,94 @@
1+
from .campaign_base import CampaignBase
2+
from module.map.map_base import CampaignMap
3+
from module.map.map_grids import SelectedGrids, RoadGrids
4+
from module.logger import logger
5+
6+
MAP = CampaignMap('A1')
7+
MAP.shape = 'H8'
8+
MAP.camera_data = ['D3', 'E4', 'E6']
9+
MAP.camera_data_spawn_point = ['D6']
10+
MAP.map_data = """
11+
-- ++ ++ -- -- -- -- --
12+
-- ME ++ ME Me ++ ++ --
13+
ME -- -- -- -- ++ ++ --
14+
MS -- MS -- Me -- MB --
15+
-- -- ++ ME __ -- -- ME
16+
-- -- ++ MS -- Me ME --
17+
SP -- -- -- Me ++ ++ --
18+
-- SP -- ME -- ++ ++ --
19+
"""
20+
MAP.weight_data = """
21+
50 50 50 50 50 50 50 50
22+
50 50 50 50 50 50 50 50
23+
50 50 50 50 50 50 50 50
24+
50 50 50 50 50 50 50 50
25+
50 50 50 50 50 50 50 50
26+
50 50 50 50 50 50 50 50
27+
50 50 50 50 50 50 50 50
28+
50 50 50 50 50 50 50 50
29+
"""
30+
MAP.spawn_data = [
31+
{'battle': 0, 'enemy': 2, 'siren': 1},
32+
{'battle': 1, 'enemy': 1},
33+
{'battle': 2, 'enemy': 1},
34+
{'battle': 3, 'enemy': 1, 'boss': 1},
35+
{'battle': 4, 'enemy': 1},
36+
]
37+
A1, B1, C1, D1, E1, F1, G1, H1, \
38+
A2, B2, C2, D2, E2, F2, G2, H2, \
39+
A3, B3, C3, D3, E3, F3, G3, H3, \
40+
A4, B4, C4, D4, E4, F4, G4, H4, \
41+
A5, B5, C5, D5, E5, F5, G5, H5, \
42+
A6, B6, C6, D6, E6, F6, G6, H6, \
43+
A7, B7, C7, D7, E7, F7, G7, H7, \
44+
A8, B8, C8, D8, E8, F8, G8, H8, \
45+
= MAP.flatten()
46+
47+
48+
class Config:
49+
# ===== Start of generated config =====
50+
MAP_SIREN_TEMPLATE = ['Wakaba', 'Suzutsuki']
51+
MOVABLE_ENEMY_TURN = (2,)
52+
MAP_HAS_SIREN = True
53+
MAP_HAS_MOVABLE_ENEMY = True
54+
MAP_HAS_MAP_STORY = True
55+
MAP_HAS_FLEET_STEP = True
56+
MAP_HAS_AMBUSH = False
57+
MAP_HAS_MYSTERY = False
58+
# ===== End of generated config =====
59+
60+
INTERNAL_LINES_FIND_PEAKS_PARAMETERS = {
61+
'height': (80, 255 - 33),
62+
'width': (0.9, 10),
63+
'prominence': 10,
64+
'distance': 35,
65+
}
66+
EDGE_LINES_FIND_PEAKS_PARAMETERS = {
67+
'height': (255 - 33, 255),
68+
'prominence': 10,
69+
'distance': 50,
70+
# 'width': (0, 7),
71+
'wlen': 1000
72+
}
73+
MAP_SWIPE_MULTIPLY = (1.093, 1.113)
74+
MAP_SWIPE_MULTIPLY_MINITOUCH = (1.057, 1.076)
75+
MAP_SWIPE_MULTIPLY_MAATOUCH = (1.026, 1.045)
76+
HOMO_EDGE_HOUGHLINES_THRESHOLD = 210
77+
MAP_WALK_USE_CURRENT_FLEET = True
78+
79+
80+
class Campaign(CampaignBase):
81+
MAP = MAP
82+
ENEMY_FILTER = '1L > 1M > 1E > 1C > 2L > 2M > 2E > 2C > 3L > 3M > 3E > 3C'
83+
MAP_ENEMY_SEARCHING_OVERLAY_TRANSPARENCY_THRESHOLD = 0.65
84+
85+
def battle_0(self):
86+
if self.clear_siren():
87+
return True
88+
if self.clear_filter_enemy(self.ENEMY_FILTER, preserve=0):
89+
return True
90+
91+
return self.battle_default()
92+
93+
def battle_3(self):
94+
return self.clear_boss()

‎campaign/war_archives_20220915_cn/a2.py‎

Lines changed: 80 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,80 @@
1+
from .campaign_base import CampaignBase
2+
from module.map.map_base import CampaignMap
3+
from module.map.map_grids import SelectedGrids, RoadGrids
4+
from module.logger import logger
5+
from .a1 import Config as ConfigBase
6+
7+
MAP = CampaignMap('A2')
8+
MAP.shape = 'H8'
9+
MAP.camera_data = ['D4', 'D6', 'E3']
10+
MAP.camera_data_spawn_point = ['D2']
11+
MAP.map_data = """
12+
-- SP ++ ++ -- ME -- ME
13+
SP -- -- ++ Me -- -- --
14+
-- -- ME MS -- Me -- ++
15+
Me -- -- -- __ -- -- ++
16+
-- MS Me -- -- -- MB --
17+
-- ++ ++ ++ -- ++ ++ --
18+
ME -- -- ME -- ++ ++ --
19+
-- ME ++ -- ME -- -- ++
20+
"""
21+
MAP.weight_data = """
22+
50 50 50 50 50 50 50 50
23+
50 50 50 50 50 50 50 50
24+
50 50 50 50 50 50 50 50
25+
50 50 50 50 50 50 50 50
26+
50 50 50 50 50 50 50 50
27+
50 50 50 50 50 50 50 50
28+
50 50 50 50 50 50 50 50
29+
50 50 50 50 50 50 50 50
30+
"""
31+
MAP.spawn_data = [
32+
{'battle': 0, 'enemy': 2, 'siren': 1},
33+
{'battle': 1, 'enemy': 1},
34+
{'battle': 2, 'enemy': 1},
35+
{'battle': 3, 'enemy': 1},
36+
{'battle': 4, 'enemy': 1, 'boss': 1},
37+
]
38+
A1, B1, C1, D1, E1, F1, G1, H1, \
39+
A2, B2, C2, D2, E2, F2, G2, H2, \
40+
A3, B3, C3, D3, E3, F3, G3, H3, \
41+
A4, B4, C4, D4, E4, F4, G4, H4, \
42+
A5, B5, C5, D5, E5, F5, G5, H5, \
43+
A6, B6, C6, D6, E6, F6, G6, H6, \
44+
A7, B7, C7, D7, E7, F7, G7, H7, \
45+
A8, B8, C8, D8, E8, F8, G8, H8, \
46+
= MAP.flatten()
47+
48+
49+
class Config(ConfigBase):
50+
# ===== Start of generated config =====
51+
MAP_SIREN_TEMPLATE = ['Miyuki', 'Jintsuu']
52+
MOVABLE_ENEMY_TURN = (2,)
53+
MAP_HAS_SIREN = True
54+
MAP_HAS_MOVABLE_ENEMY = True
55+
MAP_HAS_MAP_STORY = True
56+
MAP_HAS_FLEET_STEP = True
57+
MAP_HAS_AMBUSH = False
58+
MAP_HAS_MYSTERY = False
59+
# ===== End of generated config =====
60+
61+
MAP_SWIPE_MULTIPLY = (1.220, 1.243)
62+
MAP_SWIPE_MULTIPLY_MINITOUCH = (1.180, 1.201)
63+
MAP_SWIPE_MULTIPLY_MAATOUCH = (1.145, 1.166)
64+
65+
66+
class Campaign(CampaignBase):
67+
MAP = MAP
68+
ENEMY_FILTER = '1L > 1M > 1E > 1C > 2L > 2M > 2E > 2C > 3L > 3M > 3E > 3C'
69+
MAP_ENEMY_SEARCHING_OVERLAY_TRANSPARENCY_THRESHOLD = 0.65
70+
71+
def battle_0(self):
72+
if self.clear_siren():
73+
return True
74+
if self.clear_filter_enemy(self.ENEMY_FILTER, preserve=0):
75+
return True
76+
77+
return self.battle_default()
78+
79+
def battle_4(self):
80+
return self.clear_boss()

‎campaign/war_archives_20220915_cn/a3.py‎

Lines changed: 80 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,80 @@
1+
from .campaign_base import CampaignBase
2+
from module.map.map_base import CampaignMap
3+
from module.map.map_grids import SelectedGrids, RoadGrids
4+
from module.logger import logger
5+
from .a1 import Config as ConfigBase
6+
7+
MAP = CampaignMap('A3')
8+
MAP.shape = 'H8'
9+
MAP.camera_data = ['D3', 'E4', 'E6']
10+
MAP.camera_data_spawn_point = ['E2']
11+
MAP.map_data = """
12+
++ ++ ++ ME -- -- SP --
13+
ME -- Me -- MS -- -- SP
14+
-- -- -- -- -- ++ -- --
15+
ME -- ME -- Me -- MS --
16+
-- ++ ++ ++ ME __ -- ME
17+
-- ++ ++ ++ -- -- Me --
18+
-- ++ ++ MB -- ME ++ ++
19+
-- -- -- -- Me -- ++ ++
20+
"""
21+
MAP.weight_data = """
22+
50 50 50 50 50 50 50 50
23+
50 50 50 50 50 50 50 50
24+
50 50 50 50 50 50 50 50
25+
50 50 50 50 50 50 50 50
26+
50 50 50 50 50 50 50 50
27+
50 50 50 50 50 50 50 50
28+
50 50 50 50 50 50 50 50
29+
50 50 50 50 50 50 50 50
30+
"""
31+
MAP.spawn_data = [
32+
{'battle': 0, 'enemy': 2, 'siren': 1},
33+
{'battle': 1, 'enemy': 1},
34+
{'battle': 2, 'enemy': 1},
35+
{'battle': 3, 'enemy': 1},
36+
{'battle': 4, 'enemy': 1, 'boss': 1},
37+
]
38+
A1, B1, C1, D1, E1, F1, G1, H1, \
39+
A2, B2, C2, D2, E2, F2, G2, H2, \
40+
A3, B3, C3, D3, E3, F3, G3, H3, \
41+
A4, B4, C4, D4, E4, F4, G4, H4, \
42+
A5, B5, C5, D5, E5, F5, G5, H5, \
43+
A6, B6, C6, D6, E6, F6, G6, H6, \
44+
A7, B7, C7, D7, E7, F7, G7, H7, \
45+
A8, B8, C8, D8, E8, F8, G8, H8, \
46+
= MAP.flatten()
47+
48+
49+
class Config(ConfigBase):
50+
# ===== Start of generated config =====
51+
MAP_SIREN_TEMPLATE = ['Hatakaze', 'Kinu', 'Haguro']
52+
MOVABLE_ENEMY_TURN = (2,)
53+
MAP_HAS_SIREN = True
54+
MAP_HAS_MOVABLE_ENEMY = True
55+
MAP_HAS_MAP_STORY = True
56+
MAP_HAS_FLEET_STEP = True
57+
MAP_HAS_AMBUSH = False
58+
MAP_HAS_MYSTERY = False
59+
# ===== End of generated config =====
60+
61+
MAP_SWIPE_MULTIPLY = (1.220, 1.243)
62+
MAP_SWIPE_MULTIPLY_MINITOUCH = (1.180, 1.201)
63+
MAP_SWIPE_MULTIPLY_MAATOUCH = (1.145, 1.166)
64+
65+
66+
class Campaign(CampaignBase):
67+
MAP = MAP
68+
ENEMY_FILTER = '1L > 1M > 1E > 1C > 2L > 2M > 2E > 2C > 3L > 3M > 3E > 3C'
69+
MAP_ENEMY_SEARCHING_OVERLAY_TRANSPARENCY_THRESHOLD = 0.65
70+
71+
def battle_0(self):
72+
if self.clear_siren():
73+
return True
74+
if self.clear_filter_enemy(self.ENEMY_FILTER, preserve=0):
75+
return True
76+
77+
return self.battle_default()
78+
79+
def battle_4(self):
80+
return self.clear_boss()

‎campaign/war_archives_20220915_cn/b1.py‎

Lines changed: 94 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,94 @@
1+
from .campaign_base import CampaignBase
2+
from module.map.map_base import CampaignMap
3+
from module.map.map_grids import SelectedGrids, RoadGrids
4+
from module.logger import logger
5+
6+
MAP = CampaignMap('B1')
7+
MAP.shape = 'H8'
8+
MAP.camera_data = ['D3', 'D5']
9+
MAP.camera_data_spawn_point = ['E6']
10+
MAP.map_data = """
11+
++ -- -- -- ME -- -- --
12+
-- -- -- ME -- ME ++ --
13+
-- ++ ++ ME -- Me ++ ME
14+
-- MB -- -- -- -- -- --
15+
Me -- -- __ Me ME MS --
16+
++ ME -- ME -- ++ -- --
17+
-- -- Me -- MS -- -- SP
18+
-- ++ ++ ++ -- -- SP --
19+
"""
20+
MAP.weight_data = """
21+
50 50 50 50 50 50 50 50
22+
50 50 50 50 50 50 50 50
23+
50 50 50 50 50 50 50 50
24+
50 50 50 50 50 50 50 50
25+
50 50 50 50 50 50 50 50
26+
50 50 50 50 50 50 50 50
27+
50 50 50 50 50 50 50 50
28+
50 50 50 50 50 50 50 50
29+
"""
30+
MAP.spawn_data = [
31+
{'battle': 0, 'enemy': 2, 'siren': 1},
32+
{'battle': 1, 'enemy': 1},
33+
{'battle': 2, 'enemy': 2},
34+
{'battle': 3, 'enemy': 1},
35+
{'battle': 4, 'enemy': 2, 'boss': 1},
36+
{'battle': 5, 'enemy': 1},
37+
]
38+
A1, B1, C1, D1, E1, F1, G1, H1, \
39+
A2, B2, C2, D2, E2, F2, G2, H2, \
40+
A3, B3, C3, D3, E3, F3, G3, H3, \
41+
A4, B4, C4, D4, E4, F4, G4, H4, \
42+
A5, B5, C5, D5, E5, F5, G5, H5, \
43+
A6, B6, C6, D6, E6, F6, G6, H6, \
44+
A7, B7, C7, D7, E7, F7, G7, H7, \
45+
A8, B8, C8, D8, E8, F8, G8, H8, \
46+
= MAP.flatten()
47+
48+
49+
class Config:
50+
# ===== Start of generated config =====
51+
MAP_SIREN_TEMPLATE = ['Harutsuki', 'Kawakaze', 'Hiei']
52+
MOVABLE_ENEMY_TURN = (2,)
53+
MAP_HAS_SIREN = True
54+
MAP_HAS_MOVABLE_ENEMY = True
55+
MAP_HAS_MAP_STORY = True
56+
MAP_HAS_FLEET_STEP = True
57+
MAP_HAS_AMBUSH = False
58+
MAP_HAS_MYSTERY = False
59+
# ===== End of generated config =====
60+
61+
INTERNAL_LINES_FIND_PEAKS_PARAMETERS = {
62+
'height': (80, 255 - 33),
63+
'width': (0.9, 10),
64+
'prominence': 10,
65+
'distance': 35,
66+
}
67+
EDGE_LINES_FIND_PEAKS_PARAMETERS = {
68+
'height': (255 - 33, 255),
69+
'prominence': 10,
70+
'distance': 50,
71+
# 'width': (0, 7),
72+
'wlen': 1000
73+
}
74+
MAP_WALK_USE_CURRENT_FLEET = True
75+
MAP_SWIPE_MULTIPLY = (1.023, 1.043)
76+
MAP_SWIPE_MULTIPLY_MINITOUCH = (0.990, 1.008)
77+
MAP_SWIPE_MULTIPLY_MAATOUCH = (0.961, 0.978)
78+
79+
80+
class Campaign(CampaignBase):
81+
MAP = MAP
82+
ENEMY_FILTER = '1L > 1M > 1E > 1C > 2L > 2M > 2E > 2C > 3L > 3M > 3E > 3C'
83+
MAP_ENEMY_SEARCHING_OVERLAY_TRANSPARENCY_THRESHOLD = 0.65
84+
85+
def battle_0(self):
86+
if self.clear_siren():
87+
return True
88+
if self.clear_filter_enemy(self.ENEMY_FILTER, preserve=0):
89+
return True
90+
91+
return self.battle_default()
92+
93+
def battle_4(self):
94+
return self.clear_boss()

0 commit comments

Comments
 (0)