diff --git a/assets/en/retire/RETIRE_SETTING_1.png b/assets/en/retire/RETIRE_SETTING_1.png index f3a048388..607f6edc9 100644 Binary files a/assets/en/retire/RETIRE_SETTING_1.png and b/assets/en/retire/RETIRE_SETTING_1.png differ diff --git a/assets/en/retire/RETIRE_SETTING_2.png b/assets/en/retire/RETIRE_SETTING_2.png index fdfad7796..a628fa673 100644 Binary files a/assets/en/retire/RETIRE_SETTING_2.png and b/assets/en/retire/RETIRE_SETTING_2.png differ diff --git a/assets/en/retire/RETIRE_SETTING_3.png b/assets/en/retire/RETIRE_SETTING_3.png index 0b2e8334d..5a6b4e1e7 100644 Binary files a/assets/en/retire/RETIRE_SETTING_3.png and b/assets/en/retire/RETIRE_SETTING_3.png differ diff --git a/assets/en/retire/RETIRE_SETTING_4.png b/assets/en/retire/RETIRE_SETTING_4.png index 321988cb2..0e5d936c6 100644 Binary files a/assets/en/retire/RETIRE_SETTING_4.png and b/assets/en/retire/RETIRE_SETTING_4.png differ diff --git a/assets/en/retire/RETIRE_SETTING_5_ALL.png b/assets/en/retire/RETIRE_SETTING_5_ALL.png index 162182120..925d7658c 100644 Binary files a/assets/en/retire/RETIRE_SETTING_5_ALL.png and b/assets/en/retire/RETIRE_SETTING_5_ALL.png differ diff --git a/assets/en/retire/RETIRE_SETTING_5_PRESERVE.png b/assets/en/retire/RETIRE_SETTING_5_PRESERVE.png index 5955068be..12f593625 100644 Binary files a/assets/en/retire/RETIRE_SETTING_5_PRESERVE.png and b/assets/en/retire/RETIRE_SETTING_5_PRESERVE.png differ diff --git a/assets/jp/retire/RETIRE_SETTING_1.png b/assets/jp/retire/RETIRE_SETTING_1.png new file mode 100644 index 000000000..9b7ffa4b5 Binary files /dev/null and b/assets/jp/retire/RETIRE_SETTING_1.png differ diff --git a/assets/jp/retire/RETIRE_SETTING_2.png b/assets/jp/retire/RETIRE_SETTING_2.png new file mode 100644 index 000000000..19b32773d Binary files /dev/null and b/assets/jp/retire/RETIRE_SETTING_2.png differ diff --git a/assets/jp/retire/RETIRE_SETTING_3.png b/assets/jp/retire/RETIRE_SETTING_3.png new file mode 100644 index 000000000..639079638 Binary files /dev/null and b/assets/jp/retire/RETIRE_SETTING_3.png differ diff --git a/assets/jp/retire/RETIRE_SETTING_4.png b/assets/jp/retire/RETIRE_SETTING_4.png new file mode 100644 index 000000000..2e70eaac6 Binary files /dev/null and b/assets/jp/retire/RETIRE_SETTING_4.png differ diff --git a/assets/jp/retire/RETIRE_SETTING_5_ALL.png b/assets/jp/retire/RETIRE_SETTING_5_ALL.png new file mode 100644 index 000000000..8f9cde051 Binary files /dev/null and b/assets/jp/retire/RETIRE_SETTING_5_ALL.png differ diff --git a/assets/jp/retire/RETIRE_SETTING_5_PRESERVE.png b/assets/jp/retire/RETIRE_SETTING_5_PRESERVE.png new file mode 100644 index 000000000..c86b16b73 Binary files /dev/null and b/assets/jp/retire/RETIRE_SETTING_5_PRESERVE.png differ diff --git a/module/retire/assets.py b/module/retire/assets.py index 6e54a12dd..2cf3da530 100644 --- a/module/retire/assets.py +++ b/module/retire/assets.py @@ -27,12 +27,12 @@ RETIRE_APPEAR_1 = Button(area={'cn': (404, 501, 477, 532), 'en': (408, 497, 472, RETIRE_APPEAR_2 = Button(area={'cn': (604, 501, 677, 533), 'en': (585, 496, 694, 527), 'jp': (604, 497, 677, 529), 'tw': (603, 501, 677, 533)}, color={'cn': (146, 178, 219), 'en': (146, 179, 220), 'jp': (136, 171, 215), 'tw': (145, 177, 218)}, button={'cn': (604, 501, 677, 533), 'en': (585, 496, 694, 527), 'jp': (604, 497, 677, 529), 'tw': (603, 501, 677, 533)}, file={'cn': './assets/cn/retire/RETIRE_APPEAR_2.png', 'en': './assets/en/retire/RETIRE_APPEAR_2.png', 'jp': './assets/jp/retire/RETIRE_APPEAR_2.png', 'tw': './assets/tw/retire/RETIRE_APPEAR_2.png'}) RETIRE_APPEAR_3 = Button(area={'cn': (804, 501, 876, 533), 'en': (776, 496, 904, 521), 'jp': (804, 497, 876, 529), 'tw': (804, 501, 877, 533)}, color={'cn': (148, 179, 219), 'en': (155, 184, 222), 'jp': (136, 170, 214), 'tw': (147, 179, 219)}, button={'cn': (804, 501, 876, 533), 'en': (776, 496, 904, 521), 'jp': (804, 497, 876, 529), 'tw': (804, 501, 877, 533)}, file={'cn': './assets/cn/retire/RETIRE_APPEAR_3.png', 'en': './assets/en/retire/RETIRE_APPEAR_3.png', 'jp': './assets/jp/retire/RETIRE_APPEAR_3.png', 'tw': './assets/tw/retire/RETIRE_APPEAR_3.png'}) RETIRE_COIN = Button(area={'cn': (307, 638, 351, 661), 'en': (361, 638, 401, 661), 'jp': (326, 637, 365, 662), 'tw': (307, 638, 351, 661)}, color={'cn': (150, 158, 165), 'en': (152, 157, 165), 'jp': (173, 176, 182), 'tw': (150, 158, 165)}, button={'cn': (307, 638, 351, 661), 'en': (361, 638, 401, 661), 'jp': (326, 637, 365, 662), 'tw': (307, 638, 351, 661)}, file={'cn': './assets/cn/retire/RETIRE_COIN.png', 'en': './assets/en/retire/RETIRE_COIN.png', 'jp': './assets/jp/retire/RETIRE_COIN.png', 'tw': './assets/tw/retire/RETIRE_COIN.png'}) -RETIRE_SETTING_1 = Button(area={'cn': (818, 259, 847, 290), 'en': (817, 187, 849, 219), 'jp': (818, 259, 847, 290), 'tw': (818, 259, 847, 290)}, color={'cn': (102, 122, 147), 'en': (96, 115, 140), 'jp': (102, 122, 147), 'tw': (102, 122, 147)}, button={'cn': (818, 259, 847, 290), 'en': (817, 187, 849, 219), 'jp': (818, 259, 847, 290), 'tw': (818, 259, 847, 290)}, file={'cn': './assets/cn/retire/RETIRE_SETTING_1.png', 'en': './assets/en/retire/RETIRE_SETTING_1.png', 'jp': './assets/cn/retire/RETIRE_SETTING_1.png', 'tw': './assets/cn/retire/RETIRE_SETTING_1.png'}) -RETIRE_SETTING_2 = Button(area={'cn': (746, 316, 775, 346), 'en': (745, 247, 777, 279), 'jp': (746, 316, 775, 346), 'tw': (746, 316, 775, 346)}, color={'cn': (104, 124, 149), 'en': (96, 114, 139), 'jp': (104, 124, 149), 'tw': (104, 124, 149)}, button={'cn': (746, 316, 775, 346), 'en': (745, 247, 777, 279), 'jp': (746, 316, 775, 346), 'tw': (746, 316, 775, 346)}, file={'cn': './assets/cn/retire/RETIRE_SETTING_2.png', 'en': './assets/en/retire/RETIRE_SETTING_2.png', 'jp': './assets/cn/retire/RETIRE_SETTING_2.png', 'tw': './assets/cn/retire/RETIRE_SETTING_2.png'}) -RETIRE_SETTING_3 = Button(area={'cn': (894, 372, 923, 404), 'en': (893, 307, 925, 339), 'jp': (894, 372, 923, 404), 'tw': (894, 372, 923, 404)}, color={'cn': (101, 120, 145), 'en': (96, 115, 140), 'jp': (101, 120, 145), 'tw': (101, 120, 145)}, button={'cn': (894, 372, 923, 404), 'en': (893, 307, 925, 339), 'jp': (894, 372, 923, 404), 'tw': (894, 372, 923, 404)}, file={'cn': './assets/cn/retire/RETIRE_SETTING_3.png', 'en': './assets/en/retire/RETIRE_SETTING_3.png', 'jp': './assets/cn/retire/RETIRE_SETTING_3.png', 'tw': './assets/cn/retire/RETIRE_SETTING_3.png'}) -RETIRE_SETTING_4 = Button(area={'cn': (970, 471, 997, 498), 'en': (969, 435, 998, 464), 'jp': (970, 471, 997, 498), 'tw': (970, 471, 997, 498)}, color={'cn': (104, 125, 151), 'en': (100, 121, 147), 'jp': (104, 125, 151), 'tw': (104, 125, 151)}, button={'cn': (970, 471, 997, 498), 'en': (969, 435, 998, 464), 'jp': (970, 471, 997, 498), 'tw': (970, 471, 997, 498)}, file={'cn': './assets/cn/retire/RETIRE_SETTING_4.png', 'en': './assets/en/retire/RETIRE_SETTING_4.png', 'jp': './assets/cn/retire/RETIRE_SETTING_4.png', 'tw': './assets/cn/retire/RETIRE_SETTING_4.png'}) -RETIRE_SETTING_5_ALL = Button(area={'cn': (969, 567, 997, 595), 'en': (969, 436, 998, 465), 'jp': (969, 567, 997, 595), 'tw': (969, 567, 997, 595)}, color={'cn': (66, 75, 92), 'en': (100, 121, 147), 'jp': (66, 75, 92), 'tw': (66, 75, 92)}, button={'cn': (969, 567, 997, 595), 'en': (969, 436, 998, 465), 'jp': (969, 567, 997, 595), 'tw': (969, 567, 997, 595)}, file={'cn': './assets/cn/retire/RETIRE_SETTING_5_ALL.png', 'en': './assets/en/retire/RETIRE_SETTING_5_ALL.png', 'jp': './assets/cn/retire/RETIRE_SETTING_5_ALL.png', 'tw': './assets/cn/retire/RETIRE_SETTING_5_ALL.png'}) -RETIRE_SETTING_5_PRESERVE = Button(area={'cn': (863, 567, 890, 595), 'en': (832, 562, 861, 591), 'jp': (863, 567, 890, 595), 'tw': (863, 567, 890, 595)}, color={'cn': (103, 123, 149), 'en': (60, 69, 91), 'jp': (103, 123, 149), 'tw': (103, 123, 149)}, button={'cn': (863, 567, 890, 595), 'en': (832, 562, 861, 591), 'jp': (863, 567, 890, 595), 'tw': (863, 567, 890, 595)}, file={'cn': './assets/cn/retire/RETIRE_SETTING_5_PRESERVE.png', 'en': './assets/en/retire/RETIRE_SETTING_5_PRESERVE.png', 'jp': './assets/cn/retire/RETIRE_SETTING_5_PRESERVE.png', 'tw': './assets/cn/retire/RETIRE_SETTING_5_PRESERVE.png'}) +RETIRE_SETTING_1 = Button(area={'cn': (818, 259, 847, 290), 'en': (989, 260, 1017, 289), 'jp': (965, 265, 996, 296), 'tw': (818, 259, 847, 290)}, color={'cn': (102, 122, 147), 'en': (61, 71, 92), 'jp': (61, 70, 91), 'tw': (102, 122, 147)}, button={'cn': (818, 259, 847, 290), 'en': (989, 260, 1017, 289), 'jp': (965, 265, 996, 296), 'tw': (818, 259, 847, 290)}, file={'cn': './assets/cn/retire/RETIRE_SETTING_1.png', 'en': './assets/en/retire/RETIRE_SETTING_1.png', 'jp': './assets/jp/retire/RETIRE_SETTING_1.png', 'tw': './assets/cn/retire/RETIRE_SETTING_1.png'}) +RETIRE_SETTING_2 = Button(area={'cn': (746, 316, 775, 346), 'en': (990, 317, 1017, 345), 'jp': (965, 325, 996, 356), 'tw': (746, 316, 775, 346)}, color={'cn': (104, 124, 149), 'en': (62, 73, 93), 'jp': (62, 73, 91), 'tw': (104, 124, 149)}, button={'cn': (746, 316, 775, 346), 'en': (990, 317, 1017, 345), 'jp': (965, 325, 996, 356), 'tw': (746, 316, 775, 346)}, file={'cn': './assets/cn/retire/RETIRE_SETTING_2.png', 'en': './assets/en/retire/RETIRE_SETTING_2.png', 'jp': './assets/jp/retire/RETIRE_SETTING_2.png', 'tw': './assets/cn/retire/RETIRE_SETTING_2.png'}) +RETIRE_SETTING_3 = Button(area={'cn': (894, 372, 923, 404), 'en': (990, 374, 1017, 402), 'jp': (965, 385, 996, 416), 'tw': (894, 372, 923, 404)}, color={'cn': (101, 120, 145), 'en': (107, 129, 155), 'jp': (103, 121, 143), 'tw': (101, 120, 145)}, button={'cn': (894, 372, 923, 404), 'en': (990, 374, 1017, 402), 'jp': (965, 385, 996, 416), 'tw': (894, 372, 923, 404)}, file={'cn': './assets/cn/retire/RETIRE_SETTING_3.png', 'en': './assets/en/retire/RETIRE_SETTING_3.png', 'jp': './assets/jp/retire/RETIRE_SETTING_3.png', 'tw': './assets/cn/retire/RETIRE_SETTING_3.png'}) +RETIRE_SETTING_4 = Button(area={'cn': (970, 471, 997, 498), 'en': (970, 471, 997, 498), 'jp': (967, 486, 995, 515), 'tw': (970, 471, 997, 498)}, color={'cn': (104, 125, 151), 'en': (104, 126, 153), 'jp': (61, 70, 91), 'tw': (104, 125, 151)}, button={'cn': (970, 471, 997, 498), 'en': (970, 471, 997, 498), 'jp': (967, 486, 995, 515), 'tw': (970, 471, 997, 498)}, file={'cn': './assets/cn/retire/RETIRE_SETTING_4.png', 'en': './assets/en/retire/RETIRE_SETTING_4.png', 'jp': './assets/jp/retire/RETIRE_SETTING_4.png', 'tw': './assets/cn/retire/RETIRE_SETTING_4.png'}) +RETIRE_SETTING_5_ALL = Button(area={'cn': (969, 567, 997, 595), 'en': (969, 567, 997, 595), 'jp': (967, 586, 995, 615), 'tw': (969, 567, 997, 595)}, color={'cn': (66, 75, 92), 'en': (102, 123, 150), 'jp': (61, 70, 91), 'tw': (66, 75, 92)}, button={'cn': (969, 567, 997, 595), 'en': (969, 567, 997, 595), 'jp': (967, 586, 995, 615), 'tw': (969, 567, 997, 595)}, file={'cn': './assets/cn/retire/RETIRE_SETTING_5_ALL.png', 'en': './assets/en/retire/RETIRE_SETTING_5_ALL.png', 'jp': './assets/jp/retire/RETIRE_SETTING_5_ALL.png', 'tw': './assets/cn/retire/RETIRE_SETTING_5_ALL.png'}) +RETIRE_SETTING_5_PRESERVE = Button(area={'cn': (863, 567, 890, 595), 'en': (836, 567, 863, 595), 'jp': (719, 586, 747, 615), 'tw': (863, 567, 890, 595)}, color={'cn': (103, 123, 149), 'en': (62, 72, 92), 'jp': (61, 70, 91), 'tw': (103, 123, 149)}, button={'cn': (863, 567, 890, 595), 'en': (836, 567, 863, 595), 'jp': (719, 586, 747, 615), 'tw': (863, 567, 890, 595)}, file={'cn': './assets/cn/retire/RETIRE_SETTING_5_PRESERVE.png', 'en': './assets/en/retire/RETIRE_SETTING_5_PRESERVE.png', 'jp': './assets/jp/retire/RETIRE_SETTING_5_PRESERVE.png', 'tw': './assets/cn/retire/RETIRE_SETTING_5_PRESERVE.png'}) RETIRE_SETTING_ENTER = Button(area={'cn': (20, 501, 50, 531), 'en': (20, 501, 50, 531), 'jp': (20, 501, 50, 531), 'tw': (20, 501, 50, 531)}, color={'cn': (181, 181, 182), 'en': (181, 181, 182), 'jp': (181, 181, 182), 'tw': (181, 181, 182)}, button={'cn': (20, 501, 50, 531), 'en': (20, 501, 50, 531), 'jp': (20, 501, 50, 531), 'tw': (20, 501, 50, 531)}, file={'cn': './assets/cn/retire/RETIRE_SETTING_ENTER.png', 'en': './assets/en/retire/RETIRE_SETTING_ENTER.png', 'jp': './assets/jp/retire/RETIRE_SETTING_ENTER.png', 'tw': './assets/tw/retire/RETIRE_SETTING_ENTER.png'}) RETIRE_SETTING_QUIT = Button(area={'cn': (986, 140, 1016, 169), 'en': (983, 113, 1019, 149), 'jp': (986, 140, 1016, 169), 'tw': (986, 140, 1016, 169)}, color={'cn': (224, 118, 113), 'en': (208, 99, 95), 'jp': (224, 118, 113), 'tw': (224, 118, 113)}, button={'cn': (986, 140, 1016, 169), 'en': (983, 113, 1019, 149), 'jp': (986, 140, 1016, 169), 'tw': (986, 140, 1016, 169)}, file={'cn': './assets/cn/retire/RETIRE_SETTING_QUIT.png', 'en': './assets/en/retire/RETIRE_SETTING_QUIT.png', 'jp': './assets/jp/retire/RETIRE_SETTING_QUIT.png', 'tw': './assets/tw/retire/RETIRE_SETTING_QUIT.png'}) SHIP_CONFIRM = Button(area={'cn': (1069, 641, 1241, 698), 'en': (1076, 644, 1235, 688), 'jp': (1069, 641, 1242, 697), 'tw': (1071, 641, 1241, 698)}, color={'cn': (84, 131, 190), 'en': (108, 147, 198), 'jp': (82, 128, 187), 'tw': (83, 130, 190)}, button={'cn': (1069, 641, 1241, 698), 'en': (1076, 644, 1235, 688), 'jp': (1069, 641, 1242, 697), 'tw': (1071, 641, 1241, 698)}, file={'cn': './assets/cn/retire/SHIP_CONFIRM.png', 'en': './assets/en/retire/SHIP_CONFIRM.png', 'jp': './assets/jp/retire/SHIP_CONFIRM.png', 'tw': './assets/tw/retire/SHIP_CONFIRM.png'}) diff --git a/module/retire/setting.py b/module/retire/setting.py index 1799f49f2..48eea60df 100644 --- a/module/retire/setting.py +++ b/module/retire/setting.py @@ -95,4 +95,4 @@ class QuickRetireSettingHandler(UI): """ Fallback to the correct quick retire settings if user has wrong set. """ - return self.config.SERVER in ['cn', 'en'] + return self.config.SERVER in ['cn', 'en', 'jp']