Skip to content

Commit f83325f

Browse files
committed
Fix: equipment code slot 5 could be locked
1 parent a46fb59 commit f83325f

File tree

6 files changed

+7
-1
lines changed

6 files changed

+7
-1
lines changed
19.7 KB
Loading
19.7 KB
Loading
19.7 KB
Loading
19.7 KB
Loading

module/equipment/assets.py

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,7 @@
1616
EQUIPMENT_CODE_EQUIP_3 = Button(area={'cn': (624, 356, 707, 439), 'en': (624, 356, 707, 439), 'jp': (624, 356, 707, 439), 'tw': (624, 356, 707, 439)}, color={'cn': (40, 62, 87), 'en': (40, 62, 87), 'jp': (40, 62, 87), 'tw': (40, 62, 87)}, button={'cn': (624, 356, 707, 439), 'en': (624, 356, 707, 439), 'jp': (624, 356, 707, 439), 'tw': (624, 356, 707, 439)}, file={'cn': './assets/cn/equipment/EQUIPMENT_CODE_EQUIP_3.png', 'en': './assets/en/equipment/EQUIPMENT_CODE_EQUIP_3.png', 'jp': './assets/jp/equipment/EQUIPMENT_CODE_EQUIP_3.png', 'tw': './assets/tw/equipment/EQUIPMENT_CODE_EQUIP_3.png'})
1717
EQUIPMENT_CODE_EQUIP_4 = Button(area={'cn': (724, 356, 807, 439), 'en': (724, 356, 807, 439), 'jp': (724, 356, 807, 439), 'tw': (724, 356, 807, 439)}, color={'cn': (40, 63, 87), 'en': (40, 63, 87), 'jp': (40, 63, 87), 'tw': (40, 63, 87)}, button={'cn': (724, 356, 807, 439), 'en': (724, 356, 807, 439), 'jp': (724, 356, 807, 439), 'tw': (724, 356, 807, 439)}, file={'cn': './assets/cn/equipment/EQUIPMENT_CODE_EQUIP_4.png', 'en': './assets/en/equipment/EQUIPMENT_CODE_EQUIP_4.png', 'jp': './assets/jp/equipment/EQUIPMENT_CODE_EQUIP_4.png', 'tw': './assets/tw/equipment/EQUIPMENT_CODE_EQUIP_4.png'})
1818
EQUIPMENT_CODE_EQUIP_5 = Button(area={'cn': (823, 355, 916, 440), 'en': (823, 355, 916, 440), 'jp': (823, 355, 916, 440), 'tw': (823, 355, 916, 440)}, color={'cn': (55, 79, 104), 'en': (55, 79, 104), 'jp': (55, 79, 104), 'tw': (55, 79, 104)}, button={'cn': (823, 355, 916, 440), 'en': (823, 355, 916, 440), 'jp': (823, 355, 916, 440), 'tw': (823, 355, 916, 440)}, file={'cn': './assets/cn/equipment/EQUIPMENT_CODE_EQUIP_5.png', 'en': './assets/en/equipment/EQUIPMENT_CODE_EQUIP_5.png', 'jp': './assets/jp/equipment/EQUIPMENT_CODE_EQUIP_5.png', 'tw': './assets/tw/equipment/EQUIPMENT_CODE_EQUIP_5.png'})
19+
EQUIPMENT_CODE_EQUIP_5_LOCKED = Button(area={'cn': (823, 355, 916, 440), 'en': (823, 355, 916, 440), 'jp': (823, 355, 916, 440), 'tw': (823, 355, 916, 440)}, color={'cn': (65, 84, 107), 'en': (65, 84, 107), 'jp': (65, 84, 107), 'tw': (65, 84, 107)}, button={'cn': (823, 355, 916, 440), 'en': (823, 355, 916, 440), 'jp': (823, 355, 916, 440), 'tw': (823, 355, 916, 440)}, file={'cn': './assets/cn/equipment/EQUIPMENT_CODE_EQUIP_5_LOCKED.png', 'en': './assets/en/equipment/EQUIPMENT_CODE_EQUIP_5_LOCKED.png', 'jp': './assets/jp/equipment/EQUIPMENT_CODE_EQUIP_5_LOCKED.png', 'tw': './assets/tw/equipment/EQUIPMENT_CODE_EQUIP_5_LOCKED.png'})
1920
EQUIPMENT_CODE_EXPORT = Button(area={'cn': (1000, 200, 1121, 241), 'en': (1000, 200, 1121, 241), 'jp': (1000, 200, 1121, 241), 'tw': (1000, 200, 1121, 241)}, color={'cn': (81, 138, 203), 'en': (88, 144, 206), 'jp': (92, 145, 205), 'tw': (85, 140, 204)}, button={'cn': (1000, 200, 1121, 241), 'en': (1000, 200, 1121, 241), 'jp': (1000, 200, 1121, 241), 'tw': (1000, 200, 1121, 241)}, file={'cn': './assets/cn/equipment/EQUIPMENT_CODE_EXPORT.png', 'en': './assets/en/equipment/EQUIPMENT_CODE_EXPORT.png', 'jp': './assets/jp/equipment/EQUIPMENT_CODE_EXPORT.png', 'tw': './assets/tw/equipment/EQUIPMENT_CODE_EXPORT.png'})
2021
EQUIPMENT_CODE_PAGE_CHECK = Button(area={'cn': (1000, 113, 1050, 160), 'en': (1000, 113, 1050, 160), 'jp': (1000, 113, 1050, 160), 'tw': (1000, 113, 1050, 160)}, color={'cn': (102, 122, 154), 'en': (102, 122, 154), 'jp': (102, 122, 154), 'tw': (102, 122, 154)}, button={'cn': (1000, 113, 1050, 160), 'en': (1000, 113, 1050, 160), 'jp': (1000, 113, 1050, 160), 'tw': (1000, 113, 1050, 160)}, file={'cn': './assets/cn/equipment/EQUIPMENT_CODE_PAGE_CHECK.png', 'en': './assets/en/equipment/EQUIPMENT_CODE_PAGE_CHECK.png', 'jp': './assets/jp/equipment/EQUIPMENT_CODE_PAGE_CHECK.png', 'tw': './assets/tw/equipment/EQUIPMENT_CODE_PAGE_CHECK.png'})
2122
EQUIPMENT_CODE_TEXTBOX = Button(area={'cn': (446, 668, 834, 706), 'en': (444, 667, 836, 707), 'jp': (444, 667, 836, 707), 'tw': (444, 667, 836, 707)}, color={'cn': (45, 47, 60), 'en': (47, 50, 62), 'jp': (48, 51, 63), 'tw': (45, 48, 60)}, button={'cn': (446, 668, 834, 706), 'en': (444, 667, 836, 707), 'jp': (444, 667, 836, 707), 'tw': (444, 667, 836, 707)}, file={'cn': './assets/cn/equipment/EQUIPMENT_CODE_TEXTBOX.png', 'en': './assets/en/equipment/EQUIPMENT_CODE_TEXTBOX.png', 'jp': './assets/jp/equipment/EQUIPMENT_CODE_TEXTBOX.png', 'tw': './assets/tw/equipment/EQUIPMENT_CODE_TEXTBOX.png'})

module/equipment/equipment_code.py

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -144,9 +144,14 @@ def export_equip_code(self, ship=None):
144144
self.codes.export_to_config()
145145

146146
def equip_preview_empty(self):
147-
for index in range(6):
147+
if self.appear(EQUIPMENT_CODE_EQUIP_5_LOCKED):
148+
max_index = 5
149+
else:
150+
max_index = 6
151+
for index in range(max_index):
148152
if not self.appear(globals()['EQUIPMENT_CODE_EQUIP_{index}'.format(index=index)]):
149153
return False
154+
150155
return True
151156

152157
def clear_equip_preview(self, skip_first_screenshot=True):

0 commit comments

Comments
 (0)