diff --git a/assets/cn/coalition/FASHION_FLEET_PREPARATION.png b/assets/cn/coalition/FASHION_FLEET_PREPARATION.png deleted file mode 100644 index cfdc24d13..000000000 Binary files a/assets/cn/coalition/FASHION_FLEET_PREPARATION.png and /dev/null differ diff --git a/assets/cn/coalition/FASHION_UI_BACK.png b/assets/cn/coalition/FASHION_UI_BACK.png deleted file mode 100644 index b00d54443..000000000 Binary files a/assets/cn/coalition/FASHION_UI_BACK.png and /dev/null differ diff --git a/assets/cn/coalition/FASHION_UI_HOME.png b/assets/cn/coalition/FASHION_UI_HOME.png deleted file mode 100644 index 77feba42d..000000000 Binary files a/assets/cn/coalition/FASHION_UI_HOME.png and /dev/null differ diff --git a/module/coalition/assets.py b/module/coalition/assets.py index 8fe47c59b..17239b660 100644 --- a/module/coalition/assets.py +++ b/module/coalition/assets.py @@ -42,7 +42,6 @@ EMPTY_VANGUARD = Button(area={'cn': (515, 237, 545, 267), 'en': (515, 237, 545, FASHION_COALITION_CHECK = Button(area={'cn': (102, 19, 177, 51), 'en': (118, 31, 183, 50), 'jp': (101, 18, 175, 51), 'tw': (102, 19, 177, 51)}, color={'cn': (109, 104, 89), 'en': (131, 124, 102), 'jp': (122, 116, 101), 'tw': (109, 104, 89)}, button={'cn': (102, 19, 177, 51), 'en': (118, 31, 183, 50), 'jp': (101, 18, 175, 51), 'tw': (102, 19, 177, 51)}, file={'cn': './assets/cn/coalition/FASHION_COALITION_CHECK.png', 'en': './assets/en/coalition/FASHION_COALITION_CHECK.png', 'jp': './assets/jp/coalition/FASHION_COALITION_CHECK.png', 'tw': './assets/cn/coalition/FASHION_COALITION_CHECK.png'}) FASHION_EASY = Button(area={'cn': (136, 223, 199, 263), 'en': (136, 223, 199, 263), 'jp': (136, 223, 199, 263), 'tw': (136, 223, 199, 263)}, color={'cn': (225, 199, 197), 'en': (225, 199, 197), 'jp': (225, 199, 197), 'tw': (225, 199, 197)}, button={'cn': (136, 223, 199, 263), 'en': (136, 223, 199, 263), 'jp': (136, 223, 199, 263), 'tw': (136, 223, 199, 263)}, file={'cn': './assets/cn/coalition/FASHION_EASY.png', 'en': './assets/cn/coalition/FASHION_EASY.png', 'jp': './assets/cn/coalition/FASHION_EASY.png', 'tw': './assets/cn/coalition/FASHION_EASY.png'}) FASHION_EX = Button(area={'cn': (844, 246, 923, 301), 'en': (844, 246, 923, 301), 'jp': (844, 246, 923, 301), 'tw': (844, 246, 923, 301)}, color={'cn': (140, 115, 114), 'en': (140, 115, 114), 'jp': (140, 115, 114), 'tw': (140, 115, 114)}, button={'cn': (844, 246, 923, 301), 'en': (844, 246, 923, 301), 'jp': (844, 246, 923, 301), 'tw': (844, 246, 923, 301)}, file={'cn': './assets/cn/coalition/FASHION_EX.png', 'en': './assets/cn/coalition/FASHION_EX.png', 'jp': './assets/cn/coalition/FASHION_EX.png', 'tw': './assets/cn/coalition/FASHION_EX.png'}) -FASHION_FLEET_PREPARATION = Button(area={'cn': (1021, 519, 1121, 545), 'en': (1021, 519, 1121, 545), 'jp': (1021, 519, 1121, 545), 'tw': (1021, 519, 1121, 545)}, color={'cn': (94, 129, 239), 'en': (94, 129, 239), 'jp': (94, 129, 239), 'tw': (94, 129, 239)}, button={'cn': (1021, 519, 1121, 545), 'en': (1021, 519, 1121, 545), 'jp': (1021, 519, 1121, 545), 'tw': (1021, 519, 1121, 545)}, file={'cn': './assets/cn/coalition/FASHION_FLEET_PREPARATION.png', 'en': './assets/cn/coalition/FASHION_FLEET_PREPARATION.png', 'jp': './assets/cn/coalition/FASHION_FLEET_PREPARATION.png', 'tw': './assets/cn/coalition/FASHION_FLEET_PREPARATION.png'}) FASHION_HARD = Button(area={'cn': (485, 167, 554, 215), 'en': (485, 167, 554, 215), 'jp': (485, 167, 554, 215), 'tw': (485, 167, 554, 215)}, color={'cn': (152, 136, 129), 'en': (152, 136, 129), 'jp': (152, 136, 129), 'tw': (152, 136, 129)}, button={'cn': (485, 167, 554, 215), 'en': (485, 167, 554, 215), 'jp': (485, 167, 554, 215), 'tw': (485, 167, 554, 215)}, file={'cn': './assets/cn/coalition/FASHION_HARD.png', 'en': './assets/cn/coalition/FASHION_HARD.png', 'jp': './assets/cn/coalition/FASHION_HARD.png', 'tw': './assets/cn/coalition/FASHION_HARD.png'}) FASHION_MODE_BATTLE = Button(area={'cn': (152, 635, 213, 669), 'en': (108, 644, 188, 668), 'jp': (150, 636, 215, 668), 'tw': (152, 635, 213, 669)}, color={'cn': (140, 133, 117), 'en': (150, 143, 128), 'jp': (144, 137, 119), 'tw': (140, 133, 117)}, button={'cn': (152, 635, 213, 669), 'en': (108, 644, 188, 668), 'jp': (150, 636, 215, 668), 'tw': (152, 635, 213, 669)}, file={'cn': './assets/cn/coalition/FASHION_MODE_BATTLE.png', 'en': './assets/en/coalition/FASHION_MODE_BATTLE.png', 'jp': './assets/jp/coalition/FASHION_MODE_BATTLE.png', 'tw': './assets/cn/coalition/FASHION_MODE_BATTLE.png'}) FASHION_MODE_STORY = Button(area={'cn': (154, 629, 220, 666), 'en': (117, 642, 195, 667), 'jp': (156, 629, 219, 665), 'tw': (154, 629, 220, 666)}, color={'cn': (141, 134, 116), 'en': (158, 148, 132), 'jp': (151, 143, 123), 'tw': (141, 134, 116)}, button={'cn': (154, 629, 220, 666), 'en': (117, 642, 195, 667), 'jp': (156, 629, 219, 665), 'tw': (154, 629, 220, 666)}, file={'cn': './assets/cn/coalition/FASHION_MODE_STORY.png', 'en': './assets/en/coalition/FASHION_MODE_STORY.png', 'jp': './assets/jp/coalition/FASHION_MODE_STORY.png', 'tw': './assets/cn/coalition/FASHION_MODE_STORY.png'}) @@ -51,8 +50,6 @@ FASHION_PT_OCR = Button(area={'cn': (881, 658, 937, 674), 'en': (881, 658, 937, FASHION_SP = Button(area={'cn': (704, 194, 762, 242), 'en': (704, 194, 762, 242), 'jp': (704, 194, 762, 242), 'tw': (704, 194, 762, 242)}, color={'cn': (146, 133, 135), 'en': (146, 133, 135), 'jp': (146, 133, 135), 'tw': (146, 133, 135)}, button={'cn': (704, 194, 762, 242), 'en': (704, 194, 762, 242), 'jp': (704, 194, 762, 242), 'tw': (704, 194, 762, 242)}, file={'cn': './assets/cn/coalition/FASHION_SP.png', 'en': './assets/cn/coalition/FASHION_SP.png', 'jp': './assets/cn/coalition/FASHION_SP.png', 'tw': './assets/cn/coalition/FASHION_SP.png'}) FASHION_SWITCH_MULTI = Button(area={'cn': (1075, 457, 1206, 485), 'en': (1076, 457, 1206, 485), 'jp': (1075, 457, 1206, 485), 'tw': (1075, 457, 1206, 485)}, color={'cn': (233, 183, 63), 'en': (201, 158, 54), 'jp': (227, 178, 61), 'tw': (233, 183, 63)}, button={'cn': (1075, 457, 1206, 485), 'en': (1076, 457, 1206, 485), 'jp': (1075, 457, 1206, 485), 'tw': (1075, 457, 1206, 485)}, file={'cn': './assets/cn/coalition/FASHION_SWITCH_MULTI.png', 'en': './assets/en/coalition/FASHION_SWITCH_MULTI.png', 'jp': './assets/jp/coalition/FASHION_SWITCH_MULTI.png', 'tw': './assets/cn/coalition/FASHION_SWITCH_MULTI.png'}) FASHION_SWITCH_SINGLE = Button(area={'cn': (929, 457, 1059, 485), 'en': (929, 457, 1059, 485), 'jp': (929, 457, 1059, 485), 'tw': (929, 457, 1059, 485)}, color={'cn': (230, 181, 62), 'en': (202, 159, 54), 'jp': (227, 178, 61), 'tw': (230, 181, 62)}, button={'cn': (929, 457, 1059, 485), 'en': (929, 457, 1059, 485), 'jp': (929, 457, 1059, 485), 'tw': (929, 457, 1059, 485)}, file={'cn': './assets/cn/coalition/FASHION_SWITCH_SINGLE.png', 'en': './assets/en/coalition/FASHION_SWITCH_SINGLE.png', 'jp': './assets/jp/coalition/FASHION_SWITCH_SINGLE.png', 'tw': './assets/cn/coalition/FASHION_SWITCH_SINGLE.png'}) -FASHION_UI_BACK = Button(area={'cn': (29, 28, 45, 45), 'en': (29, 28, 45, 45), 'jp': (29, 28, 45, 45), 'tw': (29, 28, 45, 45)}, color={'cn': (132, 125, 113), 'en': (132, 125, 113), 'jp': (132, 125, 113), 'tw': (132, 125, 113)}, button={'cn': (29, 28, 45, 45), 'en': (29, 28, 45, 45), 'jp': (29, 28, 45, 45), 'tw': (29, 28, 45, 45)}, file={'cn': './assets/cn/coalition/FASHION_UI_BACK.png', 'en': './assets/cn/coalition/FASHION_UI_BACK.png', 'jp': './assets/cn/coalition/FASHION_UI_BACK.png', 'tw': './assets/cn/coalition/FASHION_UI_BACK.png'}) -FASHION_UI_HOME = Button(area={'cn': (1210, 23, 1238, 47), 'en': (1210, 23, 1238, 47), 'jp': (1210, 23, 1238, 47), 'tw': (1210, 23, 1238, 47)}, color={'cn': (124, 120, 112), 'en': (124, 120, 112), 'jp': (124, 120, 112), 'tw': (124, 120, 112)}, button={'cn': (1210, 23, 1238, 47), 'en': (1210, 23, 1238, 47), 'jp': (1210, 23, 1238, 47), 'tw': (1210, 23, 1238, 47)}, file={'cn': './assets/cn/coalition/FASHION_UI_HOME.png', 'en': './assets/cn/coalition/FASHION_UI_HOME.png', 'jp': './assets/cn/coalition/FASHION_UI_HOME.png', 'tw': './assets/cn/coalition/FASHION_UI_HOME.png'}) FLEET_NOT_PREPARED = Button(area={'cn': (1008, 310, 1110, 334), 'en': (1008, 310, 1110, 334), 'jp': (936, 306, 1094, 340), 'tw': (1008, 310, 1110, 334)}, color={'cn': (106, 106, 112), 'en': (106, 106, 112), 'jp': (63, 62, 66), 'tw': (108, 107, 112)}, button={'cn': (1008, 310, 1110, 334), 'en': (1008, 310, 1110, 334), 'jp': (936, 306, 1094, 340), 'tw': (1008, 310, 1110, 334)}, file={'cn': './assets/cn/coalition/FLEET_NOT_PREPARED.png', 'en': './assets/cn/coalition/FLEET_NOT_PREPARED.png', 'jp': './assets/jp/coalition/FLEET_NOT_PREPARED.png', 'tw': './assets/tw/coalition/FLEET_NOT_PREPARED.png'}) FROSTFALL_COALITION_CHECK = Button(area={'cn': (118, 14, 227, 39), 'en': (118, 16, 221, 36), 'jp': (118, 14, 227, 39), 'tw': (118, 14, 227, 39)}, color={'cn': (145, 161, 200), 'en': (116, 130, 168), 'jp': (150, 166, 204), 'tw': (152, 168, 206)}, button={'cn': (118, 14, 227, 39), 'en': (118, 16, 221, 36), 'jp': (118, 14, 227, 39), 'tw': (118, 14, 227, 39)}, file={'cn': './assets/cn/coalition/FROSTFALL_COALITION_CHECK.png', 'en': './assets/en/coalition/FROSTFALL_COALITION_CHECK.png', 'jp': './assets/jp/coalition/FROSTFALL_COALITION_CHECK.png', 'tw': './assets/tw/coalition/FROSTFALL_COALITION_CHECK.png'}) FROSTFALL_EX = Button(area={'cn': (622, 372, 649, 384), 'en': (622, 372, 649, 384), 'jp': (622, 372, 649, 384), 'tw': (622, 372, 649, 384)}, color={'cn': (198, 152, 252), 'en': (198, 152, 252), 'jp': (198, 152, 252), 'tw': (182, 127, 252)}, button={'cn': (622, 372, 649, 384), 'en': (622, 372, 649, 384), 'jp': (622, 372, 649, 384), 'tw': (622, 372, 649, 384)}, file={'cn': './assets/cn/coalition/FROSTFALL_EX.png', 'en': './assets/en/coalition/FROSTFALL_EX.png', 'jp': './assets/jp/coalition/FROSTFALL_EX.png', 'tw': './assets/tw/coalition/FROSTFALL_EX.png'}) diff --git a/module/coalition/ui.py b/module/coalition/ui.py index fd184d37b..50ef64e24 100644 --- a/module/coalition/ui.py +++ b/module/coalition/ui.py @@ -393,15 +393,27 @@ class CoalitionUI(Combat): clicked = self.coalition_set_fleet(event, mode) if self.appear(FLEET_NOT_PREPARED, offset=(20, 20)): - logger.critical('FLEET_NOT_PREPARED') - logger.critical('Please prepare you fleets before running coalition battles') - raise RequestHumanTakeover + result = handle_fleet_recommend(stage) + if result == 'continue': + continue + elif result == False: + logger.critical('FLEET_NOT_PREPARED') + logger.critical('Please prepare you fleets before running coalition battles') + raise RequestHumanTakeover if self.appear(EMPTY_FLAGSHIP, offset=(20, 20)): - logger.critical('EMPTY_FLAGSHIP, Please prepare you fleets before running coalition battles') - raise RequestHumanTakeover + result = handle_fleet_recommend(stage) + if result == 'continue': + continue + elif result == False: + logger.critical('EMPTY_FLAGSHIP, Please prepare you fleets before running coalition battles') + raise RequestHumanTakeover if self.appear(EMPTY_VANGUARD, offset=(20, 20)): - logger.critical('EMPTY_VANGUARD, Please prepare you fleets before running coalition battles') - raise RequestHumanTakeover + result = handle_fleet_recommend(stage) + if result == 'continue': + continue + elif result == False: + logger.critical('EMPTY_VANGUARD, Please prepare you fleets before running coalition battles') + raise RequestHumanTakeover return clicked @@ -496,28 +508,6 @@ class CoalitionUI(Combat): return True else: return False - if self.appear(FLEET_NOT_PREPARED, offset=(20, 20)): - result = handle_fleet_recommend(stage) - if result == 'continue': - continue - elif result == False: - logger.critical('FLEET_NOT_PREPARED') - logger.critical('Please prepare you fleets before running coalition battles') - raise RequestHumanTakeover - if self.appear(EMPTY_FLAGSHIP, offset=(20, 20)): - result = handle_fleet_recommend(stage) - if result == 'continue': - continue - elif result == False: - logger.critical('EMPTY_FLAGSHIP, Please prepare you fleets before running coalition battles') - raise RequestHumanTakeover - if self.appear(EMPTY_VANGUARD, offset=(20, 20)): - result = handle_fleet_recommend(stage) - if result == 'continue': - continue - elif result == False: - logger.critical('EMPTY_VANGUARD, Please prepare you fleets before running coalition battles') - raise RequestHumanTakeover # End if self.appear(BATTLE_PREPARATION, offset=(20, 20)):