Skip to content

Commit 6223e9e

Browse files
LmeSzincLmeSzinc
committed
Opt: Parameters in chapter CD
1 parent 788d486 commit 6223e9e

6 files changed

Lines changed: 122 additions & 10 deletions

File tree

‎campaign/event_20230817_cn/c1.py‎

Lines changed: 31 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,8 +5,8 @@
55

66
MAP = CampaignMap('C1')
77
MAP.shape = 'K7'
8-
MAP.camera_data = ['D2', 'D5', 'H2', 'H5']
9-
MAP.camera_data_spawn_point = ['H5', 'D5']
8+
MAP.camera_data = ['D2', 'G3', 'E5']
9+
MAP.camera_data_spawn_point = ['E5']
1010
MAP.map_data = """
1111
-- ME ++ ++ ++ -- ++ ++ ++ ME --
1212
ME -- -- Me -- ++ -- Me -- -- ME
@@ -54,6 +54,35 @@ class Config:
5454
MAP_HAS_MYSTERY = False
5555
# ===== End of generated config =====
5656

57+
INTERNAL_LINES_FIND_PEAKS_PARAMETERS = {
58+
'height': (150, 255 - 17),
59+
'width': (0.9, 10),
60+
'prominence': 10,
61+
'distance': 35,
62+
}
63+
EDGE_LINES_FIND_PEAKS_PARAMETERS = {
64+
'height': (255 - 17, 255),
65+
'prominence': 10,
66+
'distance': 50,
67+
# 'width': (0, 7),
68+
'wlen': 1000
69+
}
70+
HOMO_EDGE_HOUGHLINES_THRESHOLD = 180
71+
HOMO_EDGE_COLOR_RANGE = (0, 17)
72+
MAP_WALK_USE_CURRENT_FLEET = True
73+
MAP_ENSURE_EDGE_INSIGHT_CORNER = 'bottom'
74+
75+
MAP_ENEMY_GENRE_DETECTION_SCALING = {
76+
'DD': 1.111,
77+
'CL': 1.111,
78+
'CA': 1.111,
79+
'CV': 1.111,
80+
'BB': 1.111,
81+
}
82+
MAP_SWIPE_MULTIPLY = (1.108, 1.129)
83+
MAP_SWIPE_MULTIPLY_MINITOUCH = (1.072, 1.092)
84+
MAP_SWIPE_MULTIPLY_MAATOUCH = (1.041, 1.059)
85+
5786

5887
class Campaign(CampaignBase):
5988
MAP = MAP

‎campaign/event_20230817_cn/c2.py‎

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,8 +6,8 @@
66

77
MAP = CampaignMap('C2')
88
MAP.shape = 'I10'
9-
MAP.camera_data = ['D4', 'D8', 'F4', 'F8']
10-
MAP.camera_data_spawn_point = ['D8', 'F8']
9+
MAP.camera_data = ['D4', 'D6', 'E8', 'G5']
10+
MAP.camera_data_spawn_point = ['E8']
1111
MAP.map_data = """
1212
++ ++ ++ -- -- -- ++ ++ ++
1313
-- -- ++ -- -- -- ++ -- --
@@ -64,6 +64,10 @@ class Config(ConfigBase):
6464
MAP_HAS_MYSTERY = False
6565
# ===== End of generated config =====
6666

67+
MAP_SWIPE_MULTIPLY = (0.997, 1.016)
68+
MAP_SWIPE_MULTIPLY_MINITOUCH = (0.964, 0.982)
69+
MAP_SWIPE_MULTIPLY_MAATOUCH = (0.936, 0.953)
70+
6771

6872
class Campaign(CampaignBase):
6973
MAP = MAP

‎campaign/event_20230817_cn/c3.py‎

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,8 +6,8 @@
66

77
MAP = CampaignMap('C3')
88
MAP.shape = 'I10'
9-
MAP.camera_data = ['D3', 'D7', 'D8', 'F3', 'F7', 'F8']
10-
MAP.camera_data_spawn_point = ['D8', 'F8']
9+
MAP.camera_data = ['D4', 'D6', 'F4', 'F6']
10+
MAP.camera_data_spawn_point = ['E8']
1111
MAP.map_data = """
1212
++ ++ ++ -- -- -- ++ ++ ++
1313
-- -- ++ -- MB -- ++ -- --
@@ -65,6 +65,10 @@ class Config(ConfigBase):
6565
MAP_HAS_MYSTERY = False
6666
# ===== End of generated config =====
6767

68+
MAP_SWIPE_MULTIPLY = (1.156, 1.178)
69+
MAP_SWIPE_MULTIPLY_MINITOUCH = (1.118, 1.139)
70+
MAP_SWIPE_MULTIPLY_MAATOUCH = (1.085, 1.105)
71+
6872

6973
class Campaign(CampaignBase):
7074
MAP = MAP

‎campaign/event_20230817_cn/d1.py‎

Lines changed: 30 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@
1111
-- Me ME ++ ++ ++ ME --
1212
ME -- -- Me -- -- -- ME
1313
++ ME -- -- __ ME ++ ++
14-
MS -- -- ++ -- -- ++ ++
14+
MS -- -- ++ ++ -- ++ ++
1515
-- -- MS ++ -- -- -- MB
1616
-- SP -- MS __ -- ME --
1717
SP -- Me ++ Me -- -- ME
@@ -58,6 +58,35 @@ class Config:
5858
MAP_HAS_MYSTERY = False
5959
# ===== End of generated config =====
6060

61+
INTERNAL_LINES_FIND_PEAKS_PARAMETERS = {
62+
'height': (150, 255 - 17),
63+
'width': (0.9, 10),
64+
'prominence': 10,
65+
'distance': 35,
66+
}
67+
EDGE_LINES_FIND_PEAKS_PARAMETERS = {
68+
'height': (255 - 17, 255),
69+
'prominence': 10,
70+
'distance': 50,
71+
# 'width': (0, 7),
72+
'wlen': 1000
73+
}
74+
HOMO_EDGE_HOUGHLINES_THRESHOLD = 180
75+
HOMO_EDGE_COLOR_RANGE = (0, 17)
76+
MAP_WALK_USE_CURRENT_FLEET = True
77+
MAP_ENSURE_EDGE_INSIGHT_CORNER = 'bottom'
78+
79+
MAP_ENEMY_GENRE_DETECTION_SCALING = {
80+
'DD': 1.111,
81+
'CL': 1.111,
82+
'CA': 1.111,
83+
'CV': 1.111,
84+
'BB': 1.111,
85+
}
86+
MAP_SWIPE_MULTIPLY = (1.082, 1.102)
87+
MAP_SWIPE_MULTIPLY_MINITOUCH = (1.046, 1.065)
88+
MAP_SWIPE_MULTIPLY_MAATOUCH = (1.016, 1.034)
89+
6190

6291
class Campaign(CampaignBase):
6392
MAP = MAP

‎campaign/event_20230817_cn/d2.py‎

Lines changed: 21 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66

77
MAP = CampaignMap('D2')
88
MAP.shape = 'K7'
9-
MAP.camera_data = ['D2', 'D4', 'H2', 'H4']
9+
MAP.camera_data = ['D2', 'D4', 'F2', 'H2']
1010
MAP.camera_data_spawn_point = ['H4']
1111
MAP.map_data = """
1212
-- ME ME ME ++ ME -- -- ME ++ --
@@ -26,6 +26,21 @@
2626
50 50 50 50 50 50 50 50 50 50 50
2727
50 50 50 50 50 50 50 50 50 50 50
2828
"""
29+
MAP.wall_data = """
30+
· · | · · · · · · · · · ,
31+
+ ,
32+
· · · · · · · · · · | · ,
33+
+ + + + + ,
34+
· · | · · | · | · · · · | · · ,
35+
+---+---+ | | + ,
36+
· · · | · · | · · · · | · | · ,
37+
+---+ +---+ +---+ +-- ,
38+
· · · · · · · · · · · ,
39+
,
40+
· · · · · · · · · · · ,
41+
,
42+
· · · · · · · · · · · ,
43+
"""
2944
MAP.spawn_data = [
3045
{'battle': 0, 'enemy': 2, 'siren': 2},
3146
{'battle': 1, 'enemy': 1},
@@ -57,6 +72,11 @@ class Config(ConfigBase):
5772
MAP_HAS_MYSTERY = False
5873
# ===== End of generated config =====
5974

75+
MAP_HAS_WALL = True
76+
MAP_SWIPE_MULTIPLY = (1.125, 1.146)
77+
MAP_SWIPE_MULTIPLY_MINITOUCH = (1.088, 1.108)
78+
MAP_SWIPE_MULTIPLY_MAATOUCH = (1.056, 1.075)
79+
6080

6181
class Campaign(CampaignBase):
6282
MAP = MAP

‎campaign/event_20230817_cn/d3.py‎

Lines changed: 28 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,8 +6,8 @@
66

77
MAP = CampaignMap('D3')
88
MAP.shape = 'N10'
9-
MAP.camera_data = ['F2', 'F6', 'F8', 'I2', 'I6', 'I8']
10-
MAP.camera_data_spawn_point = ['F8', 'I8']
9+
MAP.camera_data = ['G6', 'F3', 'H4']
10+
MAP.camera_data_spawn_point = ['G8']
1111
MAP.map_data = """
1212
-- -- -- -- -- ME -- -- ME -- -- -- -- ++
1313
-- -- -- ME -- -- MB MB -- -- ME -- -- --
@@ -32,6 +32,27 @@
3232
50 50 50 50 50 50 50 50 50 50 50 50 50 50
3333
50 50 50 50 50 50 50 50 50 50 50 50 50 50
3434
"""
35+
MAP.wall_data = """
36+
· · · · · | · · · · | · · · · · ,
37+
+-----------+ +-----------+ ,
38+
· · | · · · | · · · · | · · · | · · ,
39+
| | | | ,
40+
· · | · · · | · · · · | · · · | · · ,
41+
+---+ +---+ +----+ +---+ ,
42+
· · · | · · · · · · · · | · · · ,
43+
| | ,
44+
· · · | · · · · · · · · | · · · ,
45+
| | ,
46+
· · · | · · · · · · · · | · · · ,
47+
| | ,
48+
· · · | · · · · · · · · | · · · ,
49+
| | ,
50+
· · · | · · · · · · · · | · · · ,
51+
| | ,
52+
· · · | · · · · · · · · | · · · ,
53+
+-----------+ +-----------+ ,
54+
· · · · · · | · · | · · · · · · ,
55+
"""
3556
MAP.spawn_data = [
3657
{'battle': 0, 'enemy': 2, 'siren': 2},
3758
{'battle': 1, 'enemy': 1},
@@ -66,6 +87,11 @@ class Config(ConfigBase):
6687
MAP_HAS_MYSTERY = False
6788
# ===== End of generated config =====
6889

90+
MAP_HAS_WALL = True
91+
MAP_SWIPE_MULTIPLY = (1.001, 1.020)
92+
MAP_SWIPE_MULTIPLY_MINITOUCH = (0.968, 0.986)
93+
MAP_SWIPE_MULTIPLY_MAATOUCH = (0.940, 0.957)
94+
6995

7096
class Campaign(CampaignBase):
7197
MAP = MAP

0 commit comments

Comments
 (0)