Skip to content

Commit ccd2063

Browse files
sync[bot]sync[bot]
committed
Merge remote-tracking branch 'upstream/master'
2 parents 1345a21 + b4dd4be commit ccd2063

26 files changed

Lines changed: 1217 additions & 120 deletions

File tree

‎assets/cn/combat_ui/PAUSE_GildedReverie.png‎

3.53 KB
Loading

‎assets/cn/combat_ui/QUIT_GildedReverie.png‎

6.17 KB
Loading

‎assets/jp/template/TEMPLATE_COMBAT_LOADING.png‎

-35 Bytes
Loading

‎campaign/Readme.md‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -295,3 +295,4 @@ To add a new event, add a new row in here, and run `python -m module.config.conf
295295
| 20260417 | event 20260417 cn | Vacation Lane – Beachside Brilliance | - | - | - | 假日航線閃耀海濱 |
296296
| 20260417 | event 20201126 cn | Vacation Lane Rerun | - | - | - | 復刻假日航線 |
297297
| 20260514 | event 20221222 cn | Parallel Superimposition | - | - | - | 復刻定向折疊 |
298+
| 20260520 | event 20260520 cn | Alliance Before the Hagiobull | 圣印前的同盟 | Alliance Before the Hagiobull | 聖印前の同盟 | - |

‎campaign/event_20260520_cn/a1.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+
6+
MAP = CampaignMap('A1')
7+
MAP.shape = 'I8'
8+
MAP.camera_data = ['D2', 'D6', 'F2', 'F6']
9+
MAP.camera_data_spawn_point = ['D2']
10+
MAP.map_data = """
11+
-- -- -- SP -- SP -- -- --
12+
-- ME ++ -- -- -- -- ME --
13+
-- ++ Me -- __ -- ++ ++ --
14+
-- ++ -- MS -- MS -- ++ --
15+
ME -- ME -- -- -- Me Me --
16+
++ -- -- -- ++ -- -- -- ME
17+
++ ME -- -- MB -- ME -- ++
18+
ME -- 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+
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': 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, 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+
MAP_CHAPTER_SWITCH_20241219 = True
59+
STAGE_ENTRANCE = ['half', '20240725']
60+
MAP_HAS_MODE_SWITCH = True
61+
STAGE_INCREASE_AB = True
62+
MAP_WALK_USE_CURRENT_FLEET = True
63+
# ===== End of generated config =====
64+
65+
MAP_SIREN_HAS_BOSS_ICON_SMALL = True
66+
HOMO_EDGE_HOUGHLINES_THRESHOLD = 210
67+
MAP_SWIPE_MULTIPLY = (1.238, 1.261)
68+
MAP_SWIPE_MULTIPLY_MINITOUCH = (1.197, 1.219)
69+
MAP_SWIPE_MULTIPLY_MAATOUCH = (1.162, 1.183)
70+
71+
72+
class Campaign(CampaignBase):
73+
MAP = MAP
74+
ENEMY_FILTER = '1L > 1M > 1E > 1C > 2L > 2M > 2E > 2C > 3L > 3M > 3E > 3C'
75+
76+
def battle_0(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_3(self):
85+
return self.clear_boss()

‎campaign/event_20260520_cn/a2.py‎

Lines changed: 77 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,77 @@
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 .a1 import Config as ConfigBase
6+
7+
MAP = CampaignMap('A2')
8+
MAP.shape = 'I7'
9+
MAP.camera_data = ['D2', 'D5', 'E2', 'E5']
10+
MAP.camera_data_spawn_point = ['D2']
11+
MAP.map_data = """
12+
-- ++ ++ -- Me ++ ME -- --
13+
ME ++ ++ SP -- -- -- ME --
14+
-- -- SP -- -- MS ++ ++ ++
15+
Me -- -- -- MS -- Me -- --
16+
-- ++ -- MS -- __ -- ME --
17+
-- ME -- -- ME -- -- ++ ++
18+
ME -- -- ++ -- ME -- MB ++
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': 2, 'siren': 1},
31+
{'battle': 1, 'enemy': 1},
32+
{'battle': 2, 'enemy': 1},
33+
{'battle': 3, 'enemy': 1},
34+
{'battle': 4, 'enemy': 1, '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(ConfigBase):
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+
MAP_CHAPTER_SWITCH_20241219 = True
57+
STAGE_ENTRANCE = ['half', '20240725']
58+
MAP_HAS_MODE_SWITCH = True
59+
STAGE_INCREASE_AB = True
60+
MAP_WALK_USE_CURRENT_FLEET = True
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=0):
72+
return True
73+
74+
return self.battle_default()
75+
76+
def battle_4(self):
77+
return self.clear_boss()

‎campaign/event_20260520_cn/a3.py‎

Lines changed: 86 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,86 @@
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 .a1 import Config as ConfigBase
6+
7+
MAP = CampaignMap('A3')
8+
MAP.shape = 'H9'
9+
MAP.camera_data = ['E3', 'E5', 'E7']
10+
MAP.camera_data_spawn_point = ['D6']
11+
# Big pillar at G5 covering G1:H4
12+
# Smoke covering fleet ammo icon and current fleet indicator if fleet is at F4
13+
# mark covering grids as land, since we won't go there anyway
14+
MAP.map_data = """
15+
-- -- ++ -- -- ME ++ ++
16+
-- -- ++ Me Me -- ++ ++
17+
++ ++ ++ -- -- ME ++ ++
18+
SP -- -- MS -- ++ ++ ++
19+
-- -- MS -- __ Me ++ ++
20+
SP -- -- MS -- -- MB --
21+
++ ++ ++ -- -- -- -- ME
22+
-- -- ++ -- Me -- ME --
23+
-- -- ++ ME -- ME -- ME
24+
"""
25+
MAP.weight_data = """
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+
50 50 50 50 50 50 50 50
31+
50 50 50 50 50 50 50 50
32+
50 50 50 50 50 50 50 50
33+
50 50 50 50 50 50 50 50
34+
50 50 50 50 50 50 50 50
35+
"""
36+
MAP.spawn_data = [
37+
{'battle': 0, 'enemy': 2, 'siren': 1},
38+
{'battle': 1, 'enemy': 1},
39+
{'battle': 2, 'enemy': 1},
40+
{'battle': 3, 'enemy': 1},
41+
{'battle': 4, 'enemy': 1, 'boss': 1},
42+
]
43+
A1, B1, C1, D1, E1, F1, G1, H1, \
44+
A2, B2, C2, D2, E2, F2, G2, H2, \
45+
A3, B3, C3, D3, E3, F3, G3, H3, \
46+
A4, B4, C4, D4, E4, F4, G4, H4, \
47+
A5, B5, C5, D5, E5, F5, G5, H5, \
48+
A6, B6, C6, D6, E6, F6, G6, H6, \
49+
A7, B7, C7, D7, E7, F7, G7, H7, \
50+
A8, B8, C8, D8, E8, F8, G8, H8, \
51+
A9, B9, C9, D9, E9, F9, G9, H9, \
52+
= MAP.flatten()
53+
54+
55+
class Config(ConfigBase):
56+
# ===== Start of generated config =====
57+
MAP_SIREN_TEMPLATE = []
58+
MOVABLE_ENEMY_TURN = (2,)
59+
MAP_HAS_SIREN = True
60+
MAP_HAS_MOVABLE_ENEMY = True
61+
MAP_HAS_MAP_STORY = False
62+
MAP_HAS_FLEET_STEP = True
63+
MAP_HAS_AMBUSH = False
64+
MAP_HAS_MYSTERY = False
65+
MAP_CHAPTER_SWITCH_20241219 = True
66+
STAGE_ENTRANCE = ['half', '20240725']
67+
MAP_HAS_MODE_SWITCH = True
68+
STAGE_INCREASE_AB = True
69+
MAP_WALK_USE_CURRENT_FLEET = True
70+
# ===== End of generated config =====
71+
72+
73+
class Campaign(CampaignBase):
74+
MAP = MAP
75+
ENEMY_FILTER = '1L > 1M > 1E > 1C > 2L > 2M > 2E > 2C > 3L > 3M > 3E > 3C'
76+
77+
def battle_0(self):
78+
if self.clear_siren():
79+
return True
80+
if self.clear_filter_enemy(self.ENEMY_FILTER, preserve=0):
81+
return True
82+
83+
return self.battle_default()
84+
85+
def battle_4(self):
86+
return self.clear_boss()

‎campaign/event_20260520_cn/b1.py‎

Lines changed: 83 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,83 @@
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('B1')
7+
MAP.shape = 'I7'
8+
MAP.camera_data = ['D2', 'D5', 'F2', 'F5']
9+
MAP.camera_data_spawn_point = ['D5']
10+
MAP.map_data = """
11+
-- Me -- -- -- -- -- ++ --
12+
ME -- ME ++ ++ -- ME ++ --
13+
++ -- ++ ++ ++ Me -- ME --
14+
-- MS -- ME Me -- -- ++ ++
15+
-- -- MS -- -- __ -- MB ++
16+
SP -- -- MS -- Me -- -- ME
17+
-- SP -- ++ ++ ++ ME 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': 2, 'siren': 1},
30+
{'battle': 1, 'enemy': 1},
31+
{'battle': 2, 'enemy': 2},
32+
{'battle': 3, 'enemy': 1},
33+
{'battle': 4, 'enemy': 2, 'boss': 1},
34+
{'battle': 5, 'enemy': 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+
MAP_CHAPTER_SWITCH_20241219 = True
57+
STAGE_ENTRANCE = ['half', '20240725']
58+
MAP_HAS_MODE_SWITCH = True
59+
STAGE_INCREASE_AB = True
60+
MAP_WALK_USE_CURRENT_FLEET = True
61+
# ===== End of generated config =====
62+
63+
MAP_SIREN_HAS_BOSS_ICON_SMALL = True
64+
HOMO_EDGE_HOUGHLINES_THRESHOLD = 210
65+
MAP_SWIPE_MULTIPLY = (1.132, 1.154)
66+
MAP_SWIPE_MULTIPLY_MINITOUCH = (1.095, 1.115)
67+
MAP_SWIPE_MULTIPLY_MAATOUCH = (1.063, 1.082)
68+
69+
70+
class Campaign(CampaignBase):
71+
MAP = MAP
72+
ENEMY_FILTER = '1L > 1M > 1E > 1C > 2L > 2M > 2E > 2C > 3L > 3M > 3E > 3C'
73+
74+
def battle_0(self):
75+
if self.clear_siren():
76+
return True
77+
if self.clear_filter_enemy(self.ENEMY_FILTER, preserve=0):
78+
return True
79+
80+
return self.battle_default()
81+
82+
def battle_4(self):
83+
return self.clear_boss()

0 commit comments

Comments
 (0)