Upd: [tw] PRIVATE_QUARTERS

Author: whjhs1010203

assets/tw/private_quarters/PRIVATE_QUARTERS_DAILY_COUNT.png

@@ -2061,29 +2061,29 @@
   },
   "PrivateQuarters": {
     "_info": {
-      "name": "宿舍計劃",
-      "help": "PrivateQuarters._info.help"
+      "name": "宿舍計劃設定",
+      "help": ""
     },
     "BuyRoses": {
-      "name": "PrivateQuarters.BuyRoses.name",
-      "help": "PrivateQuarters.BuyRoses.help"
+      "name": "購買每週浪漫滿分",
+      "help": "浪漫滿分購買數量每週一刷新\n每次執行會嘗試一次性全部購買，若物資不夠（24K物資）則取消購買並延後至明日執行"
     },
     "BuyCake": {
-      "name": "PrivateQuarters.BuyCake.name",
-      "help": "PrivateQuarters.BuyCake.help"
+      "name": "購買每週蛋糕禮盒",
+      "help": "蛋糕禮盒購買數量每週一刷新\n每次執行會嘗試一次性全部購買，若鑽石不夠（210鑽石）則取消購買並延後至明日執行"
     },
     "TargetInteract": {
-      "name": "PrivateQuarters.TargetInteract.name",
-      "help": "PrivateQuarters.TargetInteract.help"
+      "name": "清空每日精力",
+      "help": "與選擇的艦娘互動清空今日精力"
     },
     "TargetShip": {
-      "name": "PrivateQuarters.TargetShip.name",
-      "help": "PrivateQuarters.TargetShip.help",
-      "anchorage": "anchorage",
-      "noshiro": "noshiro",
-      "sirius": "sirius",
-      "new_jersey": "new_jersey",
-      "taihou": "taihou"
+      "name": "選擇每日互動的艦娘",
+      "help": "選擇需要與之每日互動的艦娘",
+      "anchorage": "安克拉治",
+      "noshiro": "能代",
+      "sirius": "天狼星",
+      "new_jersey": "紐澤西",
+      "taihou": "大鳳"
     }
   },
   "Daily": {

assets/tw/private_quarters/PRIVATE_QUARTERS_PAGE_LOCALE_BEACH.png

@@ -4,15 +4,15 @@
 # This file was automatically generated by dev_tools/button_extract.py.
 # Don't modify it manually.
 
-PRIVATE_QUARTERS_DAILY_COUNT = Button(area={'cn': (107, 129, 154, 154), 'en': (135, 125, 177, 157), 'jp': (132, 129, 171, 151), 'tw': (135, 125, 177, 157)}, color={'cn': (99, 102, 106), 'en': (105, 109, 114), 'jp': (110, 113, 117), 'tw': (105, 109, 114)}, button={'cn': (107, 129, 154, 154), 'en': (135, 125, 177, 157), 'jp': (132, 129, 171, 151), 'tw': (135, 125, 177, 157)}, file={'cn': './assets/cn/private_quarters/PRIVATE_QUARTERS_DAILY_COUNT.png', 'en': './assets/en/private_quarters/PRIVATE_QUARTERS_DAILY_COUNT.png', 'jp': './assets/jp/private_quarters/PRIVATE_QUARTERS_DAILY_COUNT.png', 'tw': './assets/tw/private_quarters/PRIVATE_QUARTERS_DAILY_COUNT.png'})
+PRIVATE_QUARTERS_DAILY_COUNT = Button(area={'cn': (107, 129, 154, 154), 'en': (135, 125, 177, 157), 'jp': (132, 129, 171, 151), 'tw': (107, 129, 154, 154)}, color={'cn': (99, 102, 106), 'en': (105, 109, 114), 'jp': (110, 113, 117), 'tw': (99, 102, 106)}, button={'cn': (107, 129, 154, 154), 'en': (135, 125, 177, 157), 'jp': (132, 129, 171, 151), 'tw': (107, 129, 154, 154)}, file={'cn': './assets/cn/private_quarters/PRIVATE_QUARTERS_DAILY_COUNT.png', 'en': './assets/en/private_quarters/PRIVATE_QUARTERS_DAILY_COUNT.png', 'jp': './assets/jp/private_quarters/PRIVATE_QUARTERS_DAILY_COUNT.png', 'tw': './assets/tw/private_quarters/PRIVATE_QUARTERS_DAILY_COUNT.png'})
 PRIVATE_QUARTERS_INTERACT = Button(area={'cn': (832, 446, 857, 471), 'en': (832, 446, 857, 471), 'jp': (832, 446, 857, 471), 'tw': (832, 446, 857, 471)}, color={'cn': (167, 165, 167), 'en': (167, 165, 167), 'jp': (167, 165, 167), 'tw': (167, 165, 167)}, button={'cn': (832, 446, 1107, 471), 'en': (832, 446, 1107, 471), 'jp': (832, 446, 1107, 471), 'tw': (832, 446, 1107, 471)}, file={'cn': './assets/cn/private_quarters/PRIVATE_QUARTERS_INTERACT.png', 'en': './assets/en/private_quarters/PRIVATE_QUARTERS_INTERACT.png', 'jp': './assets/jp/private_quarters/PRIVATE_QUARTERS_INTERACT.png', 'tw': './assets/tw/private_quarters/PRIVATE_QUARTERS_INTERACT.png'})
 PRIVATE_QUARTERS_INTERACT_CHECK = Button(area={'cn': (1223, 653, 1245, 675), 'en': (1223, 653, 1245, 675), 'jp': (1223, 653, 1245, 675), 'tw': (1223, 653, 1245, 675)}, color={'cn': (196, 192, 187), 'en': (196, 192, 187), 'jp': (196, 192, 187), 'tw': (196, 192, 187)}, button={'cn': (1223, 653, 1245, 675), 'en': (1223, 653, 1245, 675), 'jp': (1223, 653, 1245, 675), 'tw': (1223, 653, 1245, 675)}, file={'cn': './assets/cn/private_quarters/PRIVATE_QUARTERS_INTERACT_CHECK.png', 'en': './assets/en/private_quarters/PRIVATE_QUARTERS_INTERACT_CHECK.png', 'jp': './assets/jp/private_quarters/PRIVATE_QUARTERS_INTERACT_CHECK.png', 'tw': './assets/tw/private_quarters/PRIVATE_QUARTERS_INTERACT_CHECK.png'})
 PRIVATE_QUARTERS_LOADING_CHECK = Button(area={'cn': (582, 376, 702, 391), 'en': (582, 376, 702, 391), 'jp': (582, 376, 702, 391), 'tw': (582, 376, 702, 391)}, color={'cn': (200, 232, 255), 'en': (200, 232, 255), 'jp': (200, 232, 255), 'tw': (200, 232, 255)}, button={'cn': (582, 376, 702, 391), 'en': (582, 376, 702, 391), 'jp': (582, 376, 702, 391), 'tw': (582, 376, 702, 391)}, file={'cn': './assets/cn/private_quarters/PRIVATE_QUARTERS_LOADING_CHECK.png', 'en': './assets/en/private_quarters/PRIVATE_QUARTERS_LOADING_CHECK.png', 'jp': './assets/jp/private_quarters/PRIVATE_QUARTERS_LOADING_CHECK.png', 'tw': './assets/tw/private_quarters/PRIVATE_QUARTERS_LOADING_CHECK.png'})
 PRIVATE_QUARTERS_PAGE_LEFT = Button(area={'cn': (20, 329, 40, 359), 'en': (20, 329, 40, 359), 'jp': (20, 329, 40, 359), 'tw': (20, 329, 40, 359)}, color={'cn': (231, 234, 238), 'en': (231, 234, 238), 'jp': (231, 234, 238), 'tw': (231, 234, 238)}, button={'cn': (20, 329, 40, 359), 'en': (20, 329, 40, 359), 'jp': (20, 329, 40, 359), 'tw': (20, 329, 40, 359)}, file={'cn': './assets/cn/private_quarters/PRIVATE_QUARTERS_PAGE_LEFT.png', 'en': './assets/en/private_quarters/PRIVATE_QUARTERS_PAGE_LEFT.png', 'jp': './assets/jp/private_quarters/PRIVATE_QUARTERS_PAGE_LEFT.png', 'tw': './assets/tw/private_quarters/PRIVATE_QUARTERS_PAGE_LEFT.png'})
-PRIVATE_QUARTERS_PAGE_LOCALE_BEACH = Button(area={'cn': (24, 504, 99, 527), 'en': (38, 509, 86, 522), 'jp': (36, 506, 87, 525), 'tw': (38, 509, 86, 522)}, color={'cn': (198, 198, 198), 'en': (154, 154, 154), 'jp': (221, 221, 221), 'tw': (154, 154, 154)}, button={'cn': (24, 504, 99, 527), 'en': (38, 509, 86, 522), 'jp': (36, 506, 87, 525), 'tw': (38, 509, 86, 522)}, file={'cn': './assets/cn/private_quarters/PRIVATE_QUARTERS_PAGE_LOCALE_BEACH.png', 'en': './assets/en/private_quarters/PRIVATE_QUARTERS_PAGE_LOCALE_BEACH.png', 'jp': './assets/jp/private_quarters/PRIVATE_QUARTERS_PAGE_LOCALE_BEACH.png', 'tw': './assets/tw/private_quarters/PRIVATE_QUARTERS_PAGE_LOCALE_BEACH.png'})
+PRIVATE_QUARTERS_PAGE_LOCALE_BEACH = Button(area={'cn': (24, 504, 99, 527), 'en': (38, 509, 86, 522), 'jp': (36, 506, 87, 525), 'tw': (25, 506, 93, 526)}, color={'cn': (198, 198, 198), 'en': (154, 154, 154), 'jp': (221, 221, 221), 'tw': (200, 200, 200)}, button={'cn': (24, 504, 99, 527), 'en': (38, 509, 86, 522), 'jp': (36, 506, 87, 525), 'tw': (25, 506, 93, 526)}, file={'cn': './assets/cn/private_quarters/PRIVATE_QUARTERS_PAGE_LOCALE_BEACH.png', 'en': './assets/en/private_quarters/PRIVATE_QUARTERS_PAGE_LOCALE_BEACH.png', 'jp': './assets/jp/private_quarters/PRIVATE_QUARTERS_PAGE_LOCALE_BEACH.png', 'tw': './assets/tw/private_quarters/PRIVATE_QUARTERS_PAGE_LOCALE_BEACH.png'})
 PRIVATE_QUARTERS_PAGE_LOCALE_LOFT = Button(area={'cn': (23, 502, 99, 528), 'en': (41, 505, 81, 525), 'jp': (35, 507, 86, 525), 'tw': (41, 505, 81, 525)}, color={'cn': (206, 206, 207), 'en': (196, 196, 197), 'jp': (211, 212, 212), 'tw': (196, 196, 197)}, button={'cn': (23, 502, 99, 528), 'en': (41, 505, 81, 525), 'jp': (35, 507, 86, 525), 'tw': (41, 505, 81, 525)}, file={'cn': './assets/cn/private_quarters/PRIVATE_QUARTERS_PAGE_LOCALE_LOFT.png', 'en': './assets/en/private_quarters/PRIVATE_QUARTERS_PAGE_LOCALE_LOFT.png', 'jp': './assets/jp/private_quarters/PRIVATE_QUARTERS_PAGE_LOCALE_LOFT.png', 'tw': './assets/tw/private_quarters/PRIVATE_QUARTERS_PAGE_LOCALE_LOFT.png'})
 PRIVATE_QUARTERS_PAGE_RIGHT = Button(area={'cn': (1240, 329, 1260, 359), 'en': (1240, 329, 1260, 359), 'jp': (1240, 329, 1260, 359), 'tw': (1240, 329, 1260, 359)}, color={'cn': (232, 234, 237), 'en': (232, 234, 237), 'jp': (232, 234, 237), 'tw': (232, 234, 237)}, button={'cn': (1240, 329, 1260, 359), 'en': (1240, 329, 1260, 359), 'jp': (1240, 329, 1260, 359), 'tw': (1240, 329, 1260, 359)}, file={'cn': './assets/cn/private_quarters/PRIVATE_QUARTERS_PAGE_RIGHT.png', 'en': './assets/en/private_quarters/PRIVATE_QUARTERS_PAGE_RIGHT.png', 'jp': './assets/jp/private_quarters/PRIVATE_QUARTERS_PAGE_RIGHT.png', 'tw': './assets/tw/private_quarters/PRIVATE_QUARTERS_PAGE_RIGHT.png'})
-PRIVATE_QUARTERS_ROOM_BACK = Button(area={'cn': (28, 40, 43, 60), 'en': (28, 40, 43, 60), 'jp': (28, 40, 43, 60), 'tw': (28, 40, 43, 60)}, color={'cn': (185, 184, 186), 'en': (185, 184, 186), 'jp': (185, 184, 186), 'tw': (185, 184, 186)}, button={'cn': (16, 31, 139, 69), 'en': (27, 30, 147, 70), 'jp': (27, 30, 147, 70), 'tw': (27, 30, 147, 70)}, file={'cn': './assets/cn/private_quarters/PRIVATE_QUARTERS_ROOM_BACK.png', 'en': './assets/en/private_quarters/PRIVATE_QUARTERS_ROOM_BACK.png', 'jp': './assets/jp/private_quarters/PRIVATE_QUARTERS_ROOM_BACK.png', 'tw': './assets/tw/private_quarters/PRIVATE_QUARTERS_ROOM_BACK.png'})
+PRIVATE_QUARTERS_ROOM_BACK = Button(area={'cn': (28, 40, 43, 60), 'en': (28, 40, 43, 60), 'jp': (28, 40, 43, 60), 'tw': (28, 40, 43, 60)}, color={'cn': (185, 184, 186), 'en': (185, 184, 186), 'jp': (185, 184, 186), 'tw': (185, 184, 186)}, button={'cn': (16, 31, 139, 69), 'en': (27, 30, 147, 70), 'jp': (27, 30, 147, 70), 'tw': (21, 31, 126, 68)}, file={'cn': './assets/cn/private_quarters/PRIVATE_QUARTERS_ROOM_BACK.png', 'en': './assets/en/private_quarters/PRIVATE_QUARTERS_ROOM_BACK.png', 'jp': './assets/jp/private_quarters/PRIVATE_QUARTERS_ROOM_BACK.png', 'tw': './assets/tw/private_quarters/PRIVATE_QUARTERS_ROOM_BACK.png'})
 PRIVATE_QUARTERS_ROOM_CHECK = Button(area={'cn': (1218, 651, 1238, 666), 'en': (1218, 651, 1238, 666), 'jp': (1218, 651, 1238, 666), 'tw': (1218, 651, 1238, 666)}, color={'cn': (68, 98, 113), 'en': (68, 98, 113), 'jp': (68, 98, 113), 'tw': (68, 98, 113)}, button={'cn': (1218, 651, 1238, 666), 'en': (1218, 651, 1238, 666), 'jp': (1218, 651, 1238, 666), 'tw': (1218, 651, 1238, 666)}, file={'cn': './assets/cn/private_quarters/PRIVATE_QUARTERS_ROOM_CHECK.png', 'en': './assets/en/private_quarters/PRIVATE_QUARTERS_ROOM_CHECK.png', 'jp': './assets/jp/private_quarters/PRIVATE_QUARTERS_ROOM_CHECK.png', 'tw': './assets/tw/private_quarters/PRIVATE_QUARTERS_ROOM_CHECK.png'})
 PRIVATE_QUARTERS_ROOM_SAFE_CLICK_AREA = Button(area={'cn': (950, 95, 1275, 595), 'en': (950, 95, 1275, 595), 'jp': (950, 95, 1275, 595), 'tw': (950, 95, 1275, 595)}, color={'cn': (255, 255, 255), 'en': (255, 255, 255), 'jp': (255, 255, 255), 'tw': (255, 255, 255)}, button={'cn': (950, 95, 1275, 595), 'en': (950, 95, 1275, 595), 'jp': (950, 95, 1275, 595), 'tw': (950, 95, 1275, 595)}, file={'cn': './assets/cn/private_quarters/PRIVATE_QUARTERS_ROOM_SAFE_CLICK_AREA.png', 'en': './assets/en/private_quarters/PRIVATE_QUARTERS_ROOM_SAFE_CLICK_AREA.png', 'jp': './assets/jp/private_quarters/PRIVATE_QUARTERS_ROOM_SAFE_CLICK_AREA.png', 'tw': './assets/tw/private_quarters/PRIVATE_QUARTERS_ROOM_SAFE_CLICK_AREA.png'})
 PRIVATE_QUARTERS_ROOM_TARGET_CHECK_1 = Button(area={'cn': (721, 17, 781, 37), 'en': (721, 17, 781, 37), 'jp': (721, 17, 781, 37), 'tw': (721, 17, 781, 37)}, color={'cn': (206, 202, 201), 'en': (206, 202, 201), 'jp': (206, 202, 201), 'tw': (206, 202, 201)}, button={'cn': (721, 17, 781, 37), 'en': (721, 17, 781, 37), 'jp': (721, 17, 781, 37), 'tw': (721, 17, 781, 37)}, file={'cn': './assets/cn/private_quarters/PRIVATE_QUARTERS_ROOM_TARGET_CHECK_1.png', 'en': './assets/en/private_quarters/PRIVATE_QUARTERS_ROOM_TARGET_CHECK_1.png', 'jp': './assets/jp/private_quarters/PRIVATE_QUARTERS_ROOM_TARGET_CHECK_1.png', 'tw': './assets/tw/private_quarters/PRIVATE_QUARTERS_ROOM_TARGET_CHECK_1.png'})

assets/tw/private_quarters/PRIVATE_QUARTERS_ROOM_BACK.BUTTON.png

@@ -137,7 +137,10 @@ def pq_run(self, buy_roses, buy_cake, target_interact, target_ship):
 
         # Enter shop and buy weekly items (if any)
         if self.shop_filter:
-            self.pq_shop_weekly_items()
+            if server.server not in ['tw']:
+                self.pq_shop_weekly_items()
+            else:
+                logger.info(f'Private Quarters shop not supported for {server.server} server.')
 
         # Interact with target if enabled
         if target_interact:
@@ -146,7 +149,9 @@ def pq_run(self, buy_roses, buy_cake, target_interact, target_ship):
             if count == 0:
                 logger.info('Daily intimacy count exhausted, exit subtask')
                 return
-
+            if server.server in ['tw'] and target_ship not in ['anchorage', 'noshiro', 'sirius']:
+                logger.info(f'Target ship:{target_ship} not supported for {server.server} server.')
+                return
             # Able to interact with target, execute
             self.pq_execute_interact(target_ship)
 
@@ -156,18 +161,17 @@ def run(self):
             in: Any page
             out: page_main, may have info_bar
         """
-        if server.server in ['cn', 'en', 'jp']:
-            self.ui_ensure(page_dormmenu)
-            self.ui_goto(page_private_quarters, get_ship=False)
-            self.handle_info_bar()
-
-            self.pq_run(
-                buy_roses=self.config.PrivateQuarters_BuyRoses,
-                buy_cake=self.config.PrivateQuarters_BuyCake,
-                target_interact=self.config.PrivateQuarters_TargetInteract,
-                target_ship=self.config.PrivateQuarters_TargetShip
-            )
-        else:
+        
+        self.ui_ensure(page_dormmenu)
+        self.ui_goto(page_private_quarters, get_ship=False)
+        self.handle_info_bar()
+        self.pq_run(
+            buy_roses=self.config.PrivateQuarters_BuyRoses,
+            buy_cake=self.config.PrivateQuarters_BuyCake,
+            target_interact=self.config.PrivateQuarters_TargetInteract,
+            target_ship=self.config.PrivateQuarters_TargetShip
+        )
+        if server.server in ['tw']:
             logger.info(f'Private Quarters task not presently supported for {server.server} server.')
             logger.info('If want to address, review necessary assets, replace, update above condition, and test')
 

module/config/i18n/zh-TW.json

@@ -3,7 +3,7 @@
 from module.private_quarters.assets import *
 from module.shop.shop_status import ShopStatus
 
-if server.server in ['cn', 'jp']:
+if server.server in ['cn', 'jp', 'tw']:
     OCR_DAILY_COUNT = DigitCounter(PRIVATE_QUARTERS_DAILY_COUNT, letter=(218, 219, 221))
 else:
     OCR_DAILY_COUNT = DigitCounter(PRIVATE_QUARTERS_DAILY_COUNT, letter=(255, 247, 247))