Skip to content

Commit 65c3033

Browse files
LmeSzincguoh064
LmeSzinc
and
guoh064
authored
Add: Event The Vagabond’s Recruitment Plan (event_20260326_cn) (#5571)
* Upd: ocr model azur_lane_jp (#5553) * Upd: Event entrance of The Vagabond’s Recruitment Plan * Add: Chapter T HT * Add: Chapter SP --------- Co-authored-by: guoh064 <50830808+guoh064@users.noreply.github.com>
2 parents 3bd8a21 + 17a3852 commit 65c3033

18 files changed

Lines changed: 678 additions & 47 deletions

File tree

‎bin/cnocr_models/azur_lane_jp/cnocr-v1.2.0-densenet-lite-gru-0020.params‎

3.25 MB
Binary file not shown.

‎bin/cnocr_models/azur_lane_jp/cnocr-v1.2.0-densenet-lite-gru-0093.params‎

-3.25 MB
Binary file not shown.

‎bin/cnocr_models/azur_lane_jp/cnocr-v1.2.0-densenet-lite-gru-symbol.json‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1901,5 +1901,5 @@
19011901
183
19021902
],
19031903
"heads": [[146, 0, 0], [150, 0, 0]],
1904-
"attrs": {"mxnet_version": ["int", 10600]}
1904+
"attrs": {"mxnet_version": ["int", 10901]}
19051905
}

‎campaign/Readme.md‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -284,3 +284,4 @@ To add a new event, add a new row in here, and run `python -m module.config.conf
284284
| 20260226 | event 20260226 cn | Springtide Inn Online | 春满客栈Online | Springtide Inn Online | 春色旅籠Online | 春滿客棧Online |
285285
| 20260312 | event 20240229 cn | Snowrealm Peregrination Rerun | 复刻雪境迷踪 | Snowrealm Peregrination Rerun | 銀界遊廻（復刻） | - |
286286
| 20260319 | event 20220728 cn | Aquilifer's Ballade | - | - | - | 復刻雄鷹的敘事歌 |
287+
| 20260326 | event 20260326 cn | The Vagabond’s Recruitment Plan | 漫游者招募计划 | The Vagabond’s Recruitment Plan | ワンダラー募集計画 | - |

‎campaign/event_20260326_cn/ht1.py‎

Lines changed: 95 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,95 @@
1+
from module.campaign.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('HT1')
7+
MAP.shape = 'I7'
8+
MAP.camera_data = ['E2', 'F5']
9+
MAP.camera_data_spawn_point = ['E5']
10+
MAP.map_data = """
11+
-- -- MB -- ++ -- ME -- --
12+
-- ME -- Me ++ ME -- ME --
13+
-- ++ Me -- -- -- -- -- ++
14+
-- MS ++ MS -- Me -- ME --
15+
-- -- MS -- ++ ++ ME -- --
16+
++ -- __ -- ++ ++ -- -- ME
17+
++ SP -- SP -- -- -- ME --
18+
"""
19+
MAP.weight_data = """
20+
50 50 50 50 50 50 50 50 50
21+
50 50 50 50 50 50 50 50 50
22+
50 50 50 50 50 50 50 50 50
23+
50 50 50 50 50 50 50 50 50
24+
50 50 50 50 50 50 50 50 50
25+
50 50 50 50 50 50 50 50 50
26+
50 50 50 50 50 50 50 50 50
27+
"""
28+
MAP.spawn_data = [
29+
{'battle': 0, 'enemy': 3, 'siren': 2},
30+
{'battle': 1, 'enemy': 2},
31+
{'battle': 2, 'enemy': 1},
32+
{'battle': 3, 'enemy': 1},
33+
{'battle': 4, 'enemy': 1},
34+
{'battle': 5, 'boss': 1},
35+
]
36+
A1, B1, C1, D1, E1, F1, G1, H1, I1, \
37+
A2, B2, C2, D2, E2, F2, G2, H2, I2, \
38+
A3, B3, C3, D3, E3, F3, G3, H3, I3, \
39+
A4, B4, C4, D4, E4, F4, G4, H4, I4, \
40+
A5, B5, C5, D5, E5, F5, G5, H5, I5, \
41+
A6, B6, C6, D6, E6, F6, G6, H6, I6, \
42+
A7, B7, C7, D7, E7, F7, G7, H7, I7, \
43+
= MAP.flatten()
44+
45+
46+
class Config:
47+
# ===== Start of generated config =====
48+
MAP_SIREN_TEMPLATE = []
49+
MOVABLE_ENEMY_TURN = (2,)
50+
MAP_HAS_SIREN = True
51+
MAP_HAS_MOVABLE_ENEMY = True
52+
MAP_HAS_MAP_STORY = False
53+
MAP_HAS_FLEET_STEP = True
54+
MAP_HAS_AMBUSH = False
55+
MAP_HAS_MYSTERY = False
56+
# ===== End of generated config =====
57+
58+
MAP_CHAPTER_SWITCH_20241219_SP = True
59+
STAGE_ENTRANCE = ['half', '20240725']
60+
MAP_HAS_MODE_SWITCH = True
61+
MAP_WALK_USE_CURRENT_FLEET = True
62+
MAP_SIREN_HAS_BOSS_ICON_SMALL = True
63+
INTERNAL_LINES_FIND_PEAKS_PARAMETERS = {
64+
'height': (120, 255 - 33),
65+
'width': (1.5, 10),
66+
'prominence': 10,
67+
'distance': 35,
68+
}
69+
EDGE_LINES_FIND_PEAKS_PARAMETERS = {
70+
'height': (255 - 33, 255),
71+
'prominence': 10,
72+
'distance': 50,
73+
'wlen': 1000
74+
}
75+
HOMO_EDGE_COLOR_RANGE = (0, 33)
76+
HOMO_EDGE_HOUGHLINES_THRESHOLD = 210
77+
MAP_SWIPE_MULTIPLY = (1.147, 1.168)
78+
MAP_SWIPE_MULTIPLY_MINITOUCH = (1.109, 1.129)
79+
MAP_SWIPE_MULTIPLY_MAATOUCH = (1.077, 1.096)
80+
81+
82+
class Campaign(CampaignBase):
83+
MAP = MAP
84+
ENEMY_FILTER = '1L > 1M > 1E > 1C > 2L > 2M > 2E > 2C > 3L > 3M > 3E > 3C'
85+
86+
def battle_0(self):
87+
if self.clear_siren():
88+
return True
89+
if self.clear_filter_enemy(self.ENEMY_FILTER, preserve=0):
90+
return True
91+
92+
return self.battle_default()
93+
94+
def battle_5(self):
95+
return self.fleet_boss.clear_boss()

‎campaign/event_20260326_cn/ht2.py‎

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

‎campaign/event_20260326_cn/ht3.py‎

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

‎campaign/event_20260326_cn/sp.py‎

Lines changed: 120 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,120 @@
1+
from module.campaign.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('SP')
7+
MAP.shape = 'G8'
8+
MAP.camera_data = ['D2', 'D6']
9+
MAP.camera_data_spawn_point = ['D2']
10+
MAP.map_data = """
11+
++ ++ MS -- MS ++ ++
12+
++ ME -- MS -- ME ++
13+
ME -- -- -- -- -- ME
14+
ME -- SP __ SP -- ME
15+
ME -- -- -- -- -- ME
16+
++ ME ME -- ME ME ++
17+
-- ++ ++ -- ++ ++ --
18+
-- ++ ++ MB ++ ++ --
19+
"""
20+
MAP.weight_data = """
21+
50 50 50 50 50 50 50
22+
50 50 50 50 50 50 50
23+
50 50 50 50 50 50 50
24+
50 50 50 50 50 50 50
25+
50 50 50 50 50 50 50
26+
50 50 50 50 50 50 50
27+
50 50 50 50 50 50 50
28+
50 50 50 50 50 50 50
29+
"""
30+
MAP.spawn_data = [
31+
{'battle': 0, 'enemy': 12, 'siren': 3},
32+
{'battle': 1},
33+
{'battle': 2},
34+
{'battle': 3},
35+
{'battle': 4},
36+
{'battle': 5},
37+
{'battle': 6},
38+
{'battle': 7, 'boss': 1},
39+
]
40+
A1, B1, C1, D1, E1, F1, G1, \
41+
A2, B2, C2, D2, E2, F2, G2, \
42+
A3, B3, C3, D3, E3, F3, G3, \
43+
A4, B4, C4, D4, E4, F4, G4, \
44+
A5, B5, C5, D5, E5, F5, G5, \
45+
A6, B6, C6, D6, E6, F6, G6, \
46+
A7, B7, C7, D7, E7, F7, G7, \
47+
A8, B8, C8, D8, E8, F8, G8, \
48+
= MAP.flatten()
49+
50+
51+
class Config:
52+
# ===== Start of generated config =====
53+
MAP_SIREN_TEMPLATE = []
54+
MOVABLE_ENEMY_TURN = (2,)
55+
MAP_HAS_SIREN = True
56+
MAP_HAS_MOVABLE_ENEMY = True
57+
MAP_HAS_MAP_STORY = False
58+
MAP_HAS_FLEET_STEP = False
59+
MAP_HAS_AMBUSH = False
60+
MAP_HAS_MYSTERY = False
61+
STAR_REQUIRE_1 = 0
62+
STAR_REQUIRE_2 = 0
63+
STAR_REQUIRE_3 = 0
64+
# ===== End of generated config =====
65+
66+
MAP_CHAPTER_SWITCH_20241219_SP = True
67+
STAGE_ENTRANCE = ['half', '20240725']
68+
MAP_WALK_USE_CURRENT_FLEET = True
69+
MAP_SIREN_HAS_BOSS_ICON_SMALL = True
70+
INTERNAL_LINES_FIND_PEAKS_PARAMETERS = {
71+
'height': (120, 255 - 33),
72+
'width': (1.5, 10),
73+
'prominence': 10,
74+
'distance': 35,
75+
}
76+
EDGE_LINES_FIND_PEAKS_PARAMETERS = {
77+
'height': (255 - 33, 255),
78+
'prominence': 10,
79+
'distance': 50,
80+
'wlen': 1000
81+
}
82+
HOMO_EDGE_COLOR_RANGE = (0, 33)
83+
HOMO_EDGE_HOUGHLINES_THRESHOLD = 210
84+
HOMO_STORAGE = ((7, 6), [(135.178, 83.137), (919.07, 83.137), (-16.807, 613.173), (1000.053, 613.173)])
85+
MAP_ENSURE_EDGE_INSIGHT_CORNER = 'bottom'
86+
MAP_IS_ONE_TIME_STAGE = True
87+
88+
MAP_SWIPE_MULTIPLY = (1.127, 1.148)
89+
MAP_SWIPE_MULTIPLY_MINITOUCH = (1.090, 1.110)
90+
MAP_SWIPE_MULTIPLY_MAATOUCH = (1.058, 1.077)
91+
92+
93+
class Campaign(CampaignBase):
94+
MAP = MAP
95+
ENEMY_FILTER = '1L > 1M > 1E > 1C > 2L > 2M > 2E > 2C > 3L > 3M > 3E > 3C'
96+
97+
def map_data_init(self, map_):
98+
super().map_data_init(map_)
99+
C1.is_siren = True
100+
D2.is_siren = True
101+
E1.is_siren = True
102+
103+
def battle_0(self):
104+
if self.clear_siren():
105+
return True
106+
if self.clear_filter_enemy(self.ENEMY_FILTER, preserve=2):
107+
return True
108+
109+
return self.battle_default()
110+
111+
def battle_5(self):
112+
if self.clear_siren():
113+
return True
114+
if self.clear_filter_enemy(self.ENEMY_FILTER, preserve=0):
115+
return True
116+
117+
return self.battle_default()
118+
119+
def battle_7(self):
120+
return self.fleet_boss.clear_boss()

0 commit comments

Comments
 (0)