Skip to content

Commit 3f9e7ed

Browse files
guoh064LmeSzinc
guoh064
authored and
LmeSzinc
committed
Add: hide_in_upper_left option for combat manual
1 parent 5611dce commit 3f9e7ed

10 files changed

Lines changed: 86 additions & 36 deletions

File tree

‎assets/cn/combat/MOVE_LEFT_UP.png‎

6.88 KB
Loading

‎module/combat/assets.py‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -39,6 +39,7 @@
3939
MAIN_FLEET_POWER_ZERO = Button(area={'cn': (131, 151, 232, 206), 'en': (131, 151, 232, 206), 'jp': (131, 151, 232, 206), 'tw': (131, 151, 232, 206)}, color={'cn': (63, 79, 98), 'en': (63, 79, 98), 'jp': (63, 79, 98), 'tw': (63, 79, 98)}, button={'cn': (131, 151, 232, 206), 'en': (131, 151, 232, 206), 'jp': (131, 151, 232, 206), 'tw': (131, 151, 232, 206)}, file={'cn': './assets/cn/combat/MAIN_FLEET_POWER_ZERO.png', 'en': './assets/en/combat/MAIN_FLEET_POWER_ZERO.png', 'jp': './assets/jp/combat/MAIN_FLEET_POWER_ZERO.png', 'tw': './assets/tw/combat/MAIN_FLEET_POWER_ZERO.png'})
4040
MOVE_DOWN = Button(area={'cn': (148, 647, 155, 669), 'en': (148, 647, 155, 669), 'jp': (148, 647, 155, 669), 'tw': (148, 647, 155, 669)}, color={'cn': (21, 28, 57), 'en': (21, 28, 57), 'jp': (21, 28, 57), 'tw': (21, 28, 57)}, button={'cn': (148, 647, 155, 669), 'en': (148, 647, 155, 669), 'jp': (148, 647, 155, 669), 'tw': (148, 647, 155, 669)}, file={'cn': './assets/cn/combat/MOVE_DOWN.png', 'en': './assets/en/combat/MOVE_DOWN.png', 'jp': './assets/jp/combat/MOVE_DOWN.png', 'tw': './assets/tw/combat/MOVE_DOWN.png'})
4141
MOVE_LEFT_DOWN = Button(area={'cn': (67, 668, 112, 707), 'en': (67, 668, 112, 707), 'jp': (67, 668, 112, 707), 'tw': (67, 668, 112, 707)}, color={'cn': (65, 80, 100), 'en': (65, 80, 100), 'jp': (65, 80, 100), 'tw': (65, 80, 100)}, button={'cn': (67, 668, 112, 707), 'en': (67, 668, 112, 707), 'jp': (67, 668, 112, 707), 'tw': (67, 668, 112, 707)}, file={'cn': './assets/cn/combat/MOVE_LEFT_DOWN.png', 'en': './assets/en/combat/MOVE_LEFT_DOWN.png', 'jp': './assets/jp/combat/MOVE_LEFT_DOWN.png', 'tw': './assets/tw/combat/MOVE_LEFT_DOWN.png'})
42+
MOVE_LEFT_UP = Button(area={'cn': (101, 539, 136, 574), 'en': (101, 539, 136, 574), 'jp': (101, 539, 136, 574), 'tw': (101, 539, 136, 574)}, color={'cn': (255, 255, 255), 'en': (255, 255, 255), 'jp': (255, 255, 255), 'tw': (255, 255, 255)}, button={'cn': (101, 539, 136, 574), 'en': (101, 539, 136, 574), 'jp': (101, 539, 136, 574), 'tw': (101, 539, 136, 574)}, file={'cn': './assets/cn/combat/MOVE_LEFT_UP.png', 'en': './assets/cn/combat/MOVE_LEFT_UP.png', 'jp': './assets/cn/combat/MOVE_LEFT_UP.png', 'tw': './assets/cn/combat/MOVE_LEFT_UP.png'})
4243
NEW_SHIP = Button(area={'cn': (206, 87, 213, 93), 'en': (206, 87, 213, 93), 'jp': (206, 87, 213, 93), 'tw': (206, 87, 213, 93)}, color={'cn': (235, 171, 60), 'en': (235, 171, 60), 'jp': (235, 171, 60), 'tw': (235, 171, 60)}, button={'cn': (206, 87, 213, 93), 'en': (206, 87, 213, 93), 'jp': (206, 87, 213, 93), 'tw': (206, 87, 213, 93)}, file={'cn': './assets/cn/combat/NEW_SHIP.png', 'en': './assets/en/combat/NEW_SHIP.png', 'jp': './assets/jp/combat/NEW_SHIP.png', 'tw': './assets/tw/combat/NEW_SHIP.png'})
4344
OPTS_INFO_D = Button(area={'cn': (602, 151, 703, 179), 'en': (565, 143, 692, 179), 'jp': (512, 154, 605, 176), 'tw': (602, 152, 702, 177)}, color={'cn': (157, 115, 123), 'en': (171, 116, 110), 'jp': (201, 187, 191), 'tw': (164, 130, 137)}, button={'cn': (583, 605, 677, 628), 'en': (590, 587, 627, 647), 'jp': (574, 596, 685, 635), 'tw': (583, 604, 676, 627)}, file={'cn': './assets/cn/combat/OPTS_INFO_D.png', 'en': './assets/en/combat/OPTS_INFO_D.png', 'jp': './assets/jp/combat/OPTS_INFO_D.png', 'tw': './assets/tw/combat/OPTS_INFO_D.png'})
4445
QUIT_RECONFIRM = Button(area={'cn': (749, 501, 828, 540), 'en': (761, 495, 818, 523), 'jp': (746, 490, 830, 530), 'tw': (754, 491, 825, 522)}, color={'cn': (207, 140, 133), 'en': (208, 147, 141), 'jp': (203, 138, 132), 'tw': (211, 158, 152)}, button={'cn': (749, 501, 828, 540), 'en': (761, 495, 818, 523), 'jp': (746, 490, 830, 530), 'tw': (754, 491, 825, 522)}, file={'cn': './assets/cn/combat/QUIT_RECONFIRM.png', 'en': './assets/en/combat/QUIT_RECONFIRM.png', 'jp': './assets/jp/combat/QUIT_RECONFIRM.png', 'tw': './assets/tw/combat/QUIT_RECONFIRM.png'})

‎module/combat/combat_manual.py‎

Lines changed: 17 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -42,6 +42,20 @@ def handle_combat_stand_still_bottom_left(self, auto):
4242
self.device.long_click(MOVE_LEFT_DOWN, duration=(3.5, 5.5))
4343
return True
4444

45+
def handle_combat_stand_still_upper_left(self, auto):
46+
"""
47+
Args:
48+
auto (str): Combat auto mode.
49+
50+
Returns:
51+
bool: If executed
52+
"""
53+
if auto != 'hide_in_upper_left':
54+
return False
55+
56+
self.device.long_click(MOVE_LEFT_UP, duration=(1.5, 3.5))
57+
return True
58+
4559
def handle_combat_weapon_release(self):
4660
if self.appear_then_click(READY_AIR_RAID, interval=10):
4761
return True
@@ -67,5 +81,8 @@ def handle_combat_manual(self, auto):
6781
if self.handle_combat_stand_still_bottom_left(auto):
6882
self.manual_executed = True
6983
return True
84+
if self.handle_combat_stand_still_upper_left(auto):
85+
self.manual_executed = True
86+
return True
7087

7188
return False

‎module/config/argument/args.json‎

Lines changed: 48 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -563,7 +563,8 @@
563563
"combat_auto",
564564
"combat_manual",
565565
"stand_still_in_the_middle",
566-
"hide_in_bottom_left"
566+
"hide_in_bottom_left",
567+
"hide_in_upper_left"
567568
]
568569
},
569570
"Fleet1Step": {
@@ -605,7 +606,8 @@
605606
"combat_auto",
606607
"combat_manual",
607608
"stand_still_in_the_middle",
608-
"hide_in_bottom_left"
609+
"hide_in_bottom_left",
610+
"hide_in_upper_left"
609611
]
610612
},
611613
"Fleet2Step": {
@@ -940,7 +942,8 @@
940942
"combat_auto",
941943
"combat_manual",
942944
"stand_still_in_the_middle",
943-
"hide_in_bottom_left"
945+
"hide_in_bottom_left",
946+
"hide_in_upper_left"
944947
]
945948
},
946949
"Fleet1Step": {
@@ -982,7 +985,8 @@
982985
"combat_auto",
983986
"combat_manual",
984987
"stand_still_in_the_middle",
985-
"hide_in_bottom_left"
988+
"hide_in_bottom_left",
989+
"hide_in_upper_left"
986990
]
987991
},
988992
"Fleet2Step": {
@@ -1317,7 +1321,8 @@
13171321
"combat_auto",
13181322
"combat_manual",
13191323
"stand_still_in_the_middle",
1320-
"hide_in_bottom_left"
1324+
"hide_in_bottom_left",
1325+
"hide_in_upper_left"
13211326
]
13221327
},
13231328
"Fleet1Step": {
@@ -1359,7 +1364,8 @@
13591364
"combat_auto",
13601365
"combat_manual",
13611366
"stand_still_in_the_middle",
1362-
"hide_in_bottom_left"
1367+
"hide_in_bottom_left",
1368+
"hide_in_upper_left"
13631369
]
13641370
},
13651371
"Fleet2Step": {
@@ -1755,7 +1761,8 @@
17551761
"combat_auto",
17561762
"combat_manual",
17571763
"stand_still_in_the_middle",
1758-
"hide_in_bottom_left"
1764+
"hide_in_bottom_left",
1765+
"hide_in_upper_left"
17591766
]
17601767
},
17611768
"Fleet1Step": {
@@ -1797,7 +1804,8 @@
17971804
"combat_auto",
17981805
"combat_manual",
17991806
"stand_still_in_the_middle",
1800-
"hide_in_bottom_left"
1807+
"hide_in_bottom_left",
1808+
"hide_in_upper_left"
18011809
]
18021810
},
18031811
"Fleet2Step": {
@@ -2025,7 +2033,8 @@
20252033
"combat_auto",
20262034
"combat_manual",
20272035
"stand_still_in_the_middle",
2028-
"hide_in_bottom_left"
2036+
"hide_in_bottom_left",
2037+
"hide_in_upper_left"
20292038
]
20302039
},
20312040
"Fleet1Step": {
@@ -2067,7 +2076,8 @@
20672076
"combat_auto",
20682077
"combat_manual",
20692078
"stand_still_in_the_middle",
2070-
"hide_in_bottom_left"
2079+
"hide_in_bottom_left",
2080+
"hide_in_upper_left"
20712081
]
20722082
},
20732083
"Fleet2Step": {
@@ -2418,7 +2428,8 @@
24182428
"combat_auto",
24192429
"combat_manual",
24202430
"stand_still_in_the_middle",
2421-
"hide_in_bottom_left"
2431+
"hide_in_bottom_left",
2432+
"hide_in_upper_left"
24222433
]
24232434
},
24242435
"Fleet1Step": {
@@ -2460,7 +2471,8 @@
24602471
"combat_auto",
24612472
"combat_manual",
24622473
"stand_still_in_the_middle",
2463-
"hide_in_bottom_left"
2474+
"hide_in_bottom_left",
2475+
"hide_in_upper_left"
24642476
]
24652477
},
24662478
"Fleet2Step": {
@@ -3735,7 +3747,8 @@
37353747
"combat_auto",
37363748
"combat_manual",
37373749
"stand_still_in_the_middle",
3738-
"hide_in_bottom_left"
3750+
"hide_in_bottom_left",
3751+
"hide_in_upper_left"
37393752
]
37403753
},
37413754
"Fleet1Step": {
@@ -3777,7 +3790,8 @@
37773790
"combat_auto",
37783791
"combat_manual",
37793792
"stand_still_in_the_middle",
3780-
"hide_in_bottom_left"
3793+
"hide_in_bottom_left",
3794+
"hide_in_upper_left"
37813795
]
37823796
},
37833797
"Fleet2Step": {
@@ -4145,7 +4159,8 @@
41454159
"combat_auto",
41464160
"combat_manual",
41474161
"stand_still_in_the_middle",
4148-
"hide_in_bottom_left"
4162+
"hide_in_bottom_left",
4163+
"hide_in_upper_left"
41494164
]
41504165
},
41514166
"Fleet1Step": {
@@ -4187,7 +4202,8 @@
41874202
"combat_auto",
41884203
"combat_manual",
41894204
"stand_still_in_the_middle",
4190-
"hide_in_bottom_left"
4205+
"hide_in_bottom_left",
4206+
"hide_in_upper_left"
41914207
]
41924208
},
41934209
"Fleet2Step": {
@@ -4555,7 +4571,8 @@
45554571
"combat_auto",
45564572
"combat_manual",
45574573
"stand_still_in_the_middle",
4558-
"hide_in_bottom_left"
4574+
"hide_in_bottom_left",
4575+
"hide_in_upper_left"
45594576
]
45604577
},
45614578
"Fleet1Step": {
@@ -4597,7 +4614,8 @@
45974614
"combat_auto",
45984615
"combat_manual",
45994616
"stand_still_in_the_middle",
4600-
"hide_in_bottom_left"
4617+
"hide_in_bottom_left",
4618+
"hide_in_upper_left"
46014619
]
46024620
},
46034621
"Fleet2Step": {
@@ -4965,7 +4983,8 @@
49654983
"combat_auto",
49664984
"combat_manual",
49674985
"stand_still_in_the_middle",
4968-
"hide_in_bottom_left"
4986+
"hide_in_bottom_left",
4987+
"hide_in_upper_left"
49694988
]
49704989
},
49714990
"Fleet1Step": {
@@ -5007,7 +5026,8 @@
50075026
"combat_auto",
50085027
"combat_manual",
50095028
"stand_still_in_the_middle",
5010-
"hide_in_bottom_left"
5029+
"hide_in_bottom_left",
5030+
"hide_in_upper_left"
50115031
]
50125032
},
50135033
"Fleet2Step": {
@@ -5375,7 +5395,8 @@
53755395
"combat_auto",
53765396
"combat_manual",
53775397
"stand_still_in_the_middle",
5378-
"hide_in_bottom_left"
5398+
"hide_in_bottom_left",
5399+
"hide_in_upper_left"
53795400
]
53805401
},
53815402
"Fleet1Step": {
@@ -5417,7 +5438,8 @@
54175438
"combat_auto",
54185439
"combat_manual",
54195440
"stand_still_in_the_middle",
5420-
"hide_in_bottom_left"
5441+
"hide_in_bottom_left",
5442+
"hide_in_upper_left"
54215443
]
54225444
},
54235445
"Fleet2Step": {
@@ -5775,7 +5797,8 @@
57755797
"combat_auto",
57765798
"combat_manual",
57775799
"stand_still_in_the_middle",
5778-
"hide_in_bottom_left"
5800+
"hide_in_bottom_left",
5801+
"hide_in_upper_left"
57795802
]
57805803
},
57815804
"Fleet1Step": {
@@ -5817,7 +5840,8 @@
58175840
"combat_auto",
58185841
"combat_manual",
58195842
"stand_still_in_the_middle",
5820-
"hide_in_bottom_left"
5843+
"hide_in_bottom_left",
5844+
"hide_in_upper_left"
58215845
]
58225846
},
58235847
"Fleet2Step": {

‎module/config/argument/argument.yaml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -175,7 +175,7 @@ Fleet:
175175
option: [ line_ahead, double_line, diamond ]
176176
Fleet1Mode:
177177
value: combat_auto
178-
option: [ combat_auto, combat_manual, stand_still_in_the_middle, hide_in_bottom_left ]
178+
option: [ combat_auto, combat_manual, stand_still_in_the_middle, hide_in_bottom_left, hide_in_upper_left ]
179179
Fleet1Step:
180180
value: 3
181181
option: [ 2, 3, 4, 5 ]
@@ -187,7 +187,7 @@ Fleet:
187187
option: [ line_ahead, double_line, diamond ]
188188
Fleet2Mode:
189189
value: combat_auto
190-
option: [ combat_auto, combat_manual, stand_still_in_the_middle, hide_in_bottom_left ]
190+
option: [ combat_auto, combat_manual, stand_still_in_the_middle, hide_in_bottom_left, hide_in_upper_left ]
191191
Fleet2Step:
192192
value: 2
193193
option: [ 2, 3, 4, 5 ]

‎module/config/config_generated.py‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -93,11 +93,11 @@ class GeneratedConfig:
9393
# Group `Fleet`
9494
Fleet_Fleet1 = 1 # 1, 2, 3, 4, 5, 6
9595
Fleet_Fleet1Formation = 'double_line' # line_ahead, double_line, diamond
96-
Fleet_Fleet1Mode = 'combat_auto' # combat_auto, combat_manual, stand_still_in_the_middle, hide_in_bottom_left
96+
Fleet_Fleet1Mode = 'combat_auto' # combat_auto, combat_manual, stand_still_in_the_middle, hide_in_bottom_left, hide_in_upper_left
9797
Fleet_Fleet1Step = 3 # 2, 3, 4, 5
9898
Fleet_Fleet2 = 2 # 0, 1, 2, 3, 4, 5, 6
9999
Fleet_Fleet2Formation = 'double_line' # line_ahead, double_line, diamond
100-
Fleet_Fleet2Mode = 'combat_auto' # combat_auto, combat_manual, stand_still_in_the_middle, hide_in_bottom_left
100+
Fleet_Fleet2Mode = 'combat_auto' # combat_auto, combat_manual, stand_still_in_the_middle, hide_in_bottom_left, hide_in_upper_left
101101
Fleet_Fleet2Step = 2 # 2, 3, 4, 5
102102
Fleet_FleetOrder = 'fleet1_mob_fleet2_boss' # fleet1_mob_fleet2_boss, fleet1_boss_fleet2_mob, fleet1_all_fleet2_standby, fleet1_standby_fleet2_all
103103

‎module/config/i18n/en-US.json‎

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -913,7 +913,8 @@
913913
"combat_auto": "combat_auto",
914914
"combat_manual": "combat_manual",
915915
"stand_still_in_the_middle": "stand_still_in_the_middle",
916-
"hide_in_bottom_left": "hide_in_bottom_left"
916+
"hide_in_bottom_left": "hide_in_bottom_left",
917+
"hide_in_upper_left": "hide_in_upper_left"
917918
},
918919
"Fleet1Step": {
919920
"name": "Fleet 1 Step Number",
@@ -947,7 +948,8 @@
947948
"combat_auto": "combat_auto",
948949
"combat_manual": "combat_manual",
949950
"stand_still_in_the_middle": "stand_still_in_the_middle",
950-
"hide_in_bottom_left": "hide_in_bottom_left"
951+
"hide_in_bottom_left": "hide_in_bottom_left",
952+
"hide_in_upper_left": "hide_in_upper_left"
951953
},
952954
"Fleet2Step": {
953955
"name": "Fleet 2 Step Number",

‎module/config/i18n/ja-JP.json‎

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -913,7 +913,8 @@
913913
"combat_auto": "combat_auto",
914914
"combat_manual": "combat_manual",
915915
"stand_still_in_the_middle": "stand_still_in_the_middle",
916-
"hide_in_bottom_left": "hide_in_bottom_left"
916+
"hide_in_bottom_left": "hide_in_bottom_left",
917+
"hide_in_upper_left": "hide_in_upper_left"
917918
},
918919
"Fleet1Step": {
919920
"name": "Fleet.Fleet1Step.name",
@@ -947,7 +948,8 @@
947948
"combat_auto": "combat_auto",
948949
"combat_manual": "combat_manual",
949950
"stand_still_in_the_middle": "stand_still_in_the_middle",
950-
"hide_in_bottom_left": "hide_in_bottom_left"
951+
"hide_in_bottom_left": "hide_in_bottom_left",
952+
"hide_in_upper_left": "hide_in_upper_left"
951953
},
952954
"Fleet2Step": {
953955
"name": "Fleet.Fleet2Step.name",

‎module/config/i18n/zh-CN.json‎

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -913,7 +913,8 @@
913913
"combat_auto": "自律战斗",
914914
"combat_manual": "手操",
915915
"stand_still_in_the_middle": "中路站桩",
916-
"hide_in_bottom_left": "躲左下角"
916+
"hide_in_bottom_left": "躲左下角",
917+
"hide_in_upper_left": "躲左上角"
917918
},
918919
"Fleet1Step": {
919920
"name": "一队步长",
@@ -947,7 +948,8 @@
947948
"combat_auto": "自律战斗",
948949
"combat_manual": "手操",
949950
"stand_still_in_the_middle": "中路站桩",
950-
"hide_in_bottom_left": "躲左下角"
951+
"hide_in_bottom_left": "躲左下角",
952+
"hide_in_upper_left": "躲左上角"
951953
},
952954
"Fleet2Step": {
953955
"name": "二队步长",

‎module/config/i18n/zh-TW.json‎

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -913,7 +913,8 @@
913913
"combat_auto": "自律戰鬥",
914914
"combat_manual": "手動",
915915
"stand_still_in_the_middle": "中路站樁",
916-
"hide_in_bottom_left": "躲左下角"
916+
"hide_in_bottom_left": "躲左下角",
917+
"hide_in_upper_left": "躲左上角"
917918
},
918919
"Fleet1Step": {
919920
"name": "一隊步幅",
@@ -947,7 +948,8 @@
947948
"combat_auto": "自律戰鬥",
948949
"combat_manual": "手動",
949950
"stand_still_in_the_middle": "中路站樁",
950-
"hide_in_bottom_left": "躲左下角"
951+
"hide_in_bottom_left": "躲左下角",
952+
"hide_in_upper_left": "躲左上角"
951953
},
952954
"Fleet2Step": {
953955
"name": "二隊步幅",

0 commit comments

Comments
 (0)