Skip to content

Commit 8beab16

Browse files
LmeSzincLmeSzinc
authored
Merge pull request LmeSzinc#5258 from LmeSzinc/dev
Add: Event Tempesta and Islas de Libertád (event_20251023_cn)
2 parents fc7f5a1 + 3bf5ca9 commit 8beab16

32 files changed

Lines changed: 773 additions & 134 deletions

‎assets/cn/map/FLEET_2_IN_USE.png‎

-2.59 KB
Loading

‎assets/cn/map/FLEET_2_IN_USE_W15.png‎

9.2 KB
Loading

‎assets/en/map/FLEET_2_IN_USE.png‎

-5.75 KB
Loading

‎assets/en/map/FLEET_2_IN_USE_W15.png‎

9.2 KB
Loading

‎assets/jp/map/FLEET_2_IN_USE.png‎

-8.08 KB
Binary file not shown.

‎assets/tw/map/FLEET_2_IN_USE.png‎

-13.6 KB
Binary file not shown.

‎campaign/Readme.md‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -262,3 +262,4 @@ To add a new event, add a new row in here, and run `python -m module.config.conf
262262
| 20250919 | event 20250912 cn | A Dance for Amahara Above | - | - | - | 起舞於天原之上 |
263263
| 20251009 | coalition 20250626 | The Neon City Investigator | - | - | - | 迷彩都市的尋蹤者 |
264264
| 20251016 | event 20230817 cn | The Fool's Scales | 复刻愚者的天平 | The Fool's Scales Rerun | 愚者の天秤（復刻） | - |
265+
| 20251023 | event 20251023 cn | Tempesta and Islas de Libertád | 飓风与自由群岛 | Tempesta and Islas de Libertád | テンペスタと自由群島 | - |

‎campaign/event_20251023_cn/campaign_base.py‎

Lines changed: 25 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,25 @@
1+
from module.campaign.campaign_base import CampaignBase as CampaignBase_
2+
from module.logger import logger
3+
4+
5+
class CampaignBase(CampaignBase_):
6+
def campaign_set_chapter_20241219(self, chapter, stage, mode='combat'):
7+
if self.config.MAP_CHAPTER_SWITCH_20241219:
8+
if chapter in ['t']:
9+
self.ui_goto_sp()
10+
self.campaign_ensure_mode_20241219('combat')
11+
if stage in ['1', '2', '3']:
12+
self.campaign_ensure_aside_20241219('part1')
13+
elif stage in ['4', '5', '6']:
14+
self.campaign_ensure_aside_20241219('part2')
15+
else:
16+
logger.warning(f'Stage {chapter}{stage} is not in event_20241024')
17+
self.campaign_ensure_chapter(chapter)
18+
return True
19+
if chapter in ['ex_sp']:
20+
self.ui_goto_sp()
21+
self.campaign_ensure_mode_20241219('combat')
22+
self.campaign_ensure_aside_20241219('sp')
23+
self.campaign_ensure_chapter(chapter)
24+
return True
25+
return super().campaign_set_chapter_20241219(chapter, stage, mode)

‎campaign/event_20251023_cn/sp.py‎

Lines changed: 120 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,120 @@
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('SP')
7+
MAP.shape = 'I9'
8+
MAP.camera_data = ['E3', 'E6', 'F3', 'F6']
9+
MAP.camera_data_spawn_point = ['F3', 'F6']
10+
MAP.map_data = """
11+
++ ++ -- ++ ++ ++ -- ++ ++
12+
++ ++ -- ME -- ME -- ++ ++
13+
++ ME -- -- -- -- -- -- ++
14+
-- -- -- ME -- MS -- -- SP
15+
-- MB -- -- ++ -- MS __ --
16+
-- -- -- ME -- MS -- -- SP
17+
++ ME -- -- -- -- -- -- ++
18+
++ ++ -- ME -- ME -- ++ ++
19+
++ ++ -- ++ ++ ++ -- ++ ++
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+
50 50 50 50 50 50 50 50 50
31+
"""
32+
MAP.spawn_data = [
33+
{'battle': 0, 'enemy': 8, 'siren': 3},
34+
{'battle': 1},
35+
{'battle': 2},
36+
{'battle': 3},
37+
{'battle': 4},
38+
{'battle': 5},
39+
{'battle': 6},
40+
{'battle': 7, 'boss': 1},
41+
]
42+
A1, B1, C1, D1, E1, F1, G1, H1, I1, \
43+
A2, B2, C2, D2, E2, F2, G2, H2, I2, \
44+
A3, B3, C3, D3, E3, F3, G3, H3, I3, \
45+
A4, B4, C4, D4, E4, F4, G4, H4, I4, \
46+
A5, B5, C5, D5, E5, F5, G5, H5, I5, \
47+
A6, B6, C6, D6, E6, F6, G6, H6, I6, \
48+
A7, B7, C7, D7, E7, F7, G7, H7, I7, \
49+
A8, B8, C8, D8, E8, F8, G8, H8, I8, \
50+
A9, B9, C9, D9, E9, F9, G9, H9, I9, \
51+
= MAP.flatten()
52+
53+
54+
class Config:
55+
# ===== Start of generated config =====
56+
MAP_SIREN_TEMPLATE = []
57+
MOVABLE_ENEMY_TURN = (2,)
58+
MAP_HAS_SIREN = True
59+
MAP_HAS_MOVABLE_ENEMY = False
60+
MAP_HAS_MAP_STORY = False
61+
MAP_HAS_FLEET_STEP = False
62+
MAP_HAS_AMBUSH = False
63+
MAP_HAS_MYSTERY = False
64+
STAR_REQUIRE_1 = 0
65+
STAR_REQUIRE_2 = 0
66+
STAR_REQUIRE_3 = 0
67+
# ===== End of generated config =====
68+
69+
MAP_IS_ONE_TIME_STAGE = True
70+
MAP_CHAPTER_SWITCH_20241219 = True
71+
STAGE_ENTRANCE = ['half', '20240725']
72+
INTERNAL_LINES_FIND_PEAKS_PARAMETERS = {
73+
'height': (80, 255 - 17),
74+
'width': (0.9, 10),
75+
'prominence': 10,
76+
'distance': 35,
77+
}
78+
EDGE_LINES_FIND_PEAKS_PARAMETERS = {
79+
'height': (255 - 17, 255),
80+
'prominence': 10,
81+
'distance': 50,
82+
'wlen': 1000
83+
}
84+
HOMO_EDGE_COLOR_RANGE = (0, 17)
85+
HOMO_EDGE_HOUGHLINES_THRESHOLD = 210
86+
# too many islands on top
87+
MAP_ENSURE_EDGE_INSIGHT_CORNER = 'bottom-right'
88+
MAP_SWIPE_MULTIPLY = (1.115, 1.136)
89+
MAP_SWIPE_MULTIPLY_MINITOUCH = (1.078, 1.098)
90+
MAP_SWIPE_MULTIPLY_MAATOUCH = (1.047, 1.065)
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+
F4.is_siren = True
100+
F6.is_siren = True
101+
G5.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()

‎campaign/event_20251023_cn/t1.py‎

Lines changed: 95 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,95 @@
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('T1')
7+
MAP.shape = 'I8'
8+
MAP.camera_data = ['D2', 'D5', 'E2', 'E5']
9+
MAP.camera_data_spawn_point = ['D5']
10+
MAP.map_data = """
11+
-- -- ME -- ++ -- -- ++ ++
12+
++ Me -- -- Me -- MB ++ ++
13+
++ -- __ -- -- -- -- MB --
14+
SP -- -- MS ++ ME -- -- --
15+
SP -- -- MS ++ ME -- ME --
16+
-- -- -- -- -- -- ++ -- --
17+
ME -- Me -- ME -- -- ME --
18+
++ -- ++ ++ ++ -- -- ++ --
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+
50 50 50 50 50 50 50 50 50
29+
"""
30+
MAP.spawn_data = [
31+
{'battle': 0, 'enemy': 2, 'siren': 1},
32+
{'battle': 1, 'enemy': 2},
33+
{'battle': 2, 'enemy': 1},
34+
{'battle': 3, 'enemy': 1},
35+
{'battle': 4, 'boss': 1},
36+
]
37+
A1, B1, C1, D1, E1, F1, G1, H1, I1, \
38+
A2, B2, C2, D2, E2, F2, G2, H2, I2, \
39+
A3, B3, C3, D3, E3, F3, G3, H3, I3, \
40+
A4, B4, C4, D4, E4, F4, G4, H4, I4, \
41+
A5, B5, C5, D5, E5, F5, G5, H5, I5, \
42+
A6, B6, C6, D6, E6, F6, G6, H6, I6, \
43+
A7, B7, C7, D7, E7, F7, G7, H7, I7, \
44+
A8, B8, C8, D8, E8, F8, G8, H8, I8, \
45+
= MAP.flatten()
46+
47+
48+
class Config:
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+
MAP_CHAPTER_SWITCH_20241219 = True
61+
STAGE_ENTRANCE = ['half', '20240725']
62+
INTERNAL_LINES_FIND_PEAKS_PARAMETERS = {
63+
'height': (80, 255 - 17),
64+
'width': (0.9, 10),
65+
'prominence': 10,
66+
'distance': 35,
67+
}
68+
EDGE_LINES_FIND_PEAKS_PARAMETERS = {
69+
'height': (255 - 17, 255),
70+
'prominence': 10,
71+
'distance': 50,
72+
'wlen': 1000
73+
}
74+
HOMO_EDGE_COLOR_RANGE = (0, 17)
75+
HOMO_EDGE_HOUGHLINES_THRESHOLD = 210
76+
MAP_SIREN_HAS_BOSS_ICON_SMALL = True
77+
MAP_SWIPE_MULTIPLY = (1.089, 1.109)
78+
MAP_SWIPE_MULTIPLY_MINITOUCH = (1.053, 1.072)
79+
MAP_SWIPE_MULTIPLY_MAATOUCH = (1.022, 1.041)
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_4(self):
95+
return self.clear_boss()

0 commit comments

Comments
 (0)