Upd: Copy SHIPYARD_SERIES_SELECT_CHECK to all servers

module/shipyard/assets.py

@@ -20,7 +20,7 @@ SHIPYARD_PROGRESS_FATE = Button(area={'cn': (1141, 153, 1278, 190), 'en': (1141,
 SHIPYARD_RESEARCH_COMPLETE = Button(area={'cn': (548, 498, 740, 531), 'en': (548, 498, 740, 531), 'jp': (536, 494, 731, 538), 'tw': (548, 498, 740, 531)}, color={'cn': (214, 142, 124), 'en': (214, 142, 124), 'jp': (208, 120, 95), 'tw': (214, 142, 124)}, button={'cn': (548, 498, 740, 531), 'en': (548, 498, 740, 531), 'jp': (536, 494, 731, 538), 'tw': (548, 498, 740, 531)}, file={'cn': './assets/cn/shipyard/SHIPYARD_RESEARCH_COMPLETE.png', 'en': './assets/en/shipyard/SHIPYARD_RESEARCH_COMPLETE.png', 'jp': './assets/jp/shipyard/SHIPYARD_RESEARCH_COMPLETE.png', 'tw': './assets/tw/shipyard/SHIPYARD_RESEARCH_COMPLETE.png'})
 SHIPYARD_RESEARCH_INCOMPLETE = Button(area={'cn': (616, 490, 740, 531), 'en': (616, 490, 740, 531), 'jp': (614, 493, 735, 521), 'tw': (616, 490, 740, 531)}, color={'cn': (229, 192, 121), 'en': (229, 192, 121), 'jp': (244, 219, 164), 'tw': (229, 192, 121)}, button={'cn': (616, 490, 740, 531), 'en': (616, 490, 740, 531), 'jp': (614, 493, 735, 521), 'tw': (616, 490, 740, 531)}, file={'cn': './assets/cn/shipyard/SHIPYARD_RESEARCH_INCOMPLETE.png', 'en': './assets/en/shipyard/SHIPYARD_RESEARCH_INCOMPLETE.png', 'jp': './assets/jp/shipyard/SHIPYARD_RESEARCH_INCOMPLETE.png', 'tw': './assets/tw/shipyard/SHIPYARD_RESEARCH_INCOMPLETE.png'})
 SHIPYARD_RESEARCH_IN_PROGRESS = Button(area={'cn': (465, 479, 482, 501), 'en': (465, 479, 482, 501), 'jp': (465, 479, 482, 501), 'tw': (465, 479, 482, 501)}, color={'cn': (105, 135, 173), 'en': (105, 135, 173), 'jp': (105, 135, 173), 'tw': (105, 135, 173)}, button={'cn': (465, 479, 482, 501), 'en': (465, 479, 482, 501), 'jp': (465, 479, 482, 501), 'tw': (465, 479, 482, 501)}, file={'cn': './assets/cn/shipyard/SHIPYARD_RESEARCH_IN_PROGRESS.png', 'en': './assets/en/shipyard/SHIPYARD_RESEARCH_IN_PROGRESS.png', 'jp': './assets/jp/shipyard/SHIPYARD_RESEARCH_IN_PROGRESS.png', 'tw': './assets/tw/shipyard/SHIPYARD_RESEARCH_IN_PROGRESS.png'})
-SHIPYARD_SERIES_SELECT_CHECK = Button(area={'cn': (567, 209, 717, 228), 'en': (565, 194, 715, 212), 'jp': (566, 210, 718, 228), 'tw': (567, 209, 717, 228)}, color={'cn': (21, 30, 58), 'en': (18, 28, 56), 'jp': (21, 30, 58), 'tw': (21, 30, 58)}, button={'cn': (567, 209, 717, 228), 'en': (565, 194, 715, 212), 'jp': (566, 210, 718, 228), 'tw': (567, 209, 717, 228)}, file={'cn': './assets/cn/shipyard/SHIPYARD_SERIES_SELECT_CHECK.png', 'en': './assets/en/shipyard/SHIPYARD_SERIES_SELECT_CHECK.png', 'jp': './assets/jp/shipyard/SHIPYARD_SERIES_SELECT_CHECK.png', 'tw': './assets/tw/shipyard/SHIPYARD_SERIES_SELECT_CHECK.png'})
+SHIPYARD_SERIES_SELECT_CHECK = Button(area={'cn': (565, 194, 715, 212), 'en': (565, 194, 715, 212), 'jp': (565, 194, 715, 212), 'tw': (565, 194, 715, 212)}, color={'cn': (18, 28, 56), 'en': (18, 28, 56), 'jp': (18, 28, 56), 'tw': (18, 28, 56)}, button={'cn': (565, 194, 715, 212), 'en': (565, 194, 715, 212), 'jp': (565, 194, 715, 212), 'tw': (565, 194, 715, 212)}, file={'cn': './assets/cn/shipyard/SHIPYARD_SERIES_SELECT_CHECK.png', 'en': './assets/en/shipyard/SHIPYARD_SERIES_SELECT_CHECK.png', 'jp': './assets/jp/shipyard/SHIPYARD_SERIES_SELECT_CHECK.png', 'tw': './assets/tw/shipyard/SHIPYARD_SERIES_SELECT_CHECK.png'})
 SHIPYARD_SERIES_SELECT_ENTER = Button(area={'cn': (33, 659, 161, 701), 'en': (34, 659, 160, 700), 'jp': (36, 674, 154, 696), 'tw': (33, 657, 157, 697)}, color={'cn': (91, 110, 155), 'en': (66, 87, 138), 'jp': (112, 126, 161), 'tw': (98, 117, 164)}, button={'cn': (33, 659, 161, 701), 'en': (34, 659, 160, 700), 'jp': (36, 674, 154, 696), 'tw': (33, 657, 157, 697)}, file={'cn': './assets/cn/shipyard/SHIPYARD_SERIES_SELECT_ENTER.png', 'en': './assets/en/shipyard/SHIPYARD_SERIES_SELECT_ENTER.png', 'jp': './assets/jp/shipyard/SHIPYARD_SERIES_SELECT_ENTER.png', 'tw': './assets/tw/shipyard/SHIPYARD_SERIES_SELECT_ENTER.png'})
 SHIPYARD_TOTAL_DEV = Button(area={'cn': (1086, 429, 1147, 463), 'en': (1091, 426, 1142, 466), 'jp': (1086, 429, 1147, 463), 'tw': (1086, 429, 1147, 463)}, color={'cn': (39, 46, 55), 'en': (45, 48, 55), 'jp': (39, 46, 55), 'tw': (39, 46, 55)}, button={'cn': (1086, 429, 1147, 463), 'en': (1091, 426, 1142, 466), 'jp': (1086, 429, 1147, 463), 'tw': (1086, 429, 1147, 463)}, file={'cn': './assets/cn/shipyard/SHIPYARD_TOTAL_DEV.png', 'en': './assets/en/shipyard/SHIPYARD_TOTAL_DEV.png', 'jp': './assets/jp/shipyard/SHIPYARD_TOTAL_DEV.png', 'tw': './assets/tw/shipyard/SHIPYARD_TOTAL_DEV.png'})
 SHIPYARD_TOTAL_FATE = Button(area={'cn': (1067, 457, 1126, 484), 'en': (1108, 462, 1158, 497), 'jp': (1067, 457, 1126, 484), 'tw': (1067, 457, 1126, 484)}, color={'cn': (43, 50, 59), 'en': (51, 58, 66), 'jp': (43, 50, 59), 'tw': (43, 50, 59)}, button={'cn': (1067, 457, 1126, 484), 'en': (1108, 462, 1158, 497), 'jp': (1067, 457, 1126, 484), 'tw': (1067, 457, 1126, 484)}, file={'cn': './assets/cn/shipyard/SHIPYARD_TOTAL_FATE.png', 'en': './assets/en/shipyard/SHIPYARD_TOTAL_FATE.png', 'jp': './assets/jp/shipyard/SHIPYARD_TOTAL_FATE.png', 'tw': './assets/tw/shipyard/SHIPYARD_TOTAL_FATE.png'})

module/shipyard/shipyard_reward.py

@@ -159,13 +159,6 @@ class RewardShipyard(ShipyardUI, GeneralShop):
             in: Any page
             out: page_shipyard
         """
-        # Remove this when your server is updated for PR5
-        logger.warning('Task "Shipyard" is forced delayed 2 hours before PR5 support. '
-                       'Please do shipyard manually and contact server maintainers')
-        if self.config.SERVER in ['cn', 'jp', 'tw']:
-            self.config.task_delay(minute=120)
-            self.config.task_stop()
-
         if self.config.Shipyard_BuyAmount <= 0:
             self.config.Scheduler_Enable = False
             self.config.task_stop()