Merge remote-tracking branch 'upstream/master'

campaign/Readme.md

@@ -196,3 +196,4 @@ To add a new event, add a new row in here, and run `python -m module.config.conf
 | 20240509   | event 20210916 cn        | Upon the Shimmering Blue                     | -      | -  | -  | 復刻碧海光粼                        |
 | 20240521 | event 20240521 cn | Light of the Martyrium | 绽放于辉光之城 | Light of the Martyrium | 赫輝のマルティリウム | - |
 | 20240523 | event 20230525 cn | Confluence of Nothingness | - | - | -                                    | 空相交會點 |
+| 20240613   | event 20201012 cn    | Sundered Blue   | -       | -       | -     |   復刻劃破海空之翼       |

module/config/argument/args.json

@@ -1721,13 +1721,13 @@
         ],
         "display": "hide",
         "option_bold": [
-          "event_20230525_cn",
+          "event_20201012_cn",
           "event_20240521_cn"
         ],
         "cn": "event_20240521_cn",
         "en": "event_20240521_cn",
         "jp": "event_20240521_cn",
-        "tw": "event_20230525_cn"
+        "tw": "event_20201012_cn"
       },
       "Mode": {
         "type": "select",
@@ -2056,13 +2056,13 @@
           "event_20240521_cn"
         ],
         "option_bold": [
-          "event_20230525_cn",
+          "event_20201012_cn",
           "event_20240521_cn"
         ],
         "cn": "event_20240521_cn",
         "en": "event_20240521_cn",
         "jp": "event_20240521_cn",
-        "tw": "event_20230525_cn"
+        "tw": "event_20201012_cn"
       },
       "Mode": {
         "type": "select",
@@ -2506,13 +2506,13 @@
           "event_20240521_cn"
         ],
         "option_bold": [
-          "event_20230525_cn",
+          "event_20201012_cn",
           "event_20240521_cn"
         ],
         "cn": "event_20240521_cn",
         "en": "event_20240521_cn",
         "jp": "event_20240521_cn",
-        "tw": "event_20230525_cn"
+        "tw": "event_20201012_cn"
       },
       "Mode": {
         "type": "select",
@@ -4350,13 +4350,13 @@
           "event_20240521_cn"
         ],
         "option_bold": [
-          "event_20230525_cn",
+          "event_20201012_cn",
           "event_20240521_cn"
         ],
         "cn": "event_20240521_cn",
         "en": "event_20240521_cn",
         "jp": "event_20240521_cn",
-        "tw": "event_20230525_cn"
+        "tw": "event_20201012_cn"
       },
       "Mode": {
         "type": "select",
@@ -4817,13 +4817,13 @@
           "event_20240521_cn"
         ],
         "option_bold": [
-          "event_20230525_cn",
+          "event_20201012_cn",
           "event_20240521_cn"
         ],
         "cn": "event_20240521_cn",
         "en": "event_20240521_cn",
         "jp": "event_20240521_cn",
-        "tw": "event_20230525_cn"
+        "tw": "event_20201012_cn"
       },
       "Mode": {
         "type": "select",
@@ -5284,13 +5284,13 @@
           "event_20240521_cn"
         ],
         "option_bold": [
-          "event_20230525_cn",
+          "event_20201012_cn",
           "event_20240521_cn"
         ],
         "cn": "event_20240521_cn",
         "en": "event_20240521_cn",
         "jp": "event_20240521_cn",
-        "tw": "event_20230525_cn"
+        "tw": "event_20201012_cn"
       },
       "Mode": {
         "type": "select",
@@ -5751,13 +5751,13 @@
           "event_20240521_cn"
         ],
         "option_bold": [
-          "event_20230525_cn",
+          "event_20201012_cn",
           "event_20240521_cn"
         ],
         "cn": "event_20240521_cn",
         "en": "event_20240521_cn",
         "jp": "event_20240521_cn",
-        "tw": "event_20230525_cn"
+        "tw": "event_20201012_cn"
       },
       "Mode": {
         "type": "select",
@@ -6208,13 +6208,13 @@
           "event_20240521_cn"
         ],
         "option_bold": [
-          "event_20230525_cn",
+          "event_20201012_cn",
           "event_20240521_cn"
         ],
         "cn": "event_20240521_cn",
         "en": "event_20240521_cn",
         "jp": "event_20240521_cn",
-        "tw": "event_20230525_cn"
+        "tw": "event_20201012_cn"
       },
       "Mode": {
         "type": "select",

module/config/i18n/zh-TW.json

@@ -681,7 +681,7 @@
       "event_20200903_en": "復刻峽灣間的星辰",
       "event_20200917_cn": "復刻-蝶海夢花",
       "event_20201002_en": "Counterattack Within the Fjord",
-      "event_20201012_cn": "劃破海空之翼",
+      "event_20201012_cn": "復刻劃破海空之翼",
       "event_20201029_cn": "激唱的UNIVERSE",
       "event_20201126_cn": "假日航線",
       "event_20201229_cn": "復刻-負象限作戰",

module/freebies/battle_pass.py

@@ -23,7 +23,7 @@ class BattlePass(Combat, UI):
             BATTLE_PASS_RED_DOT.load_offset(REWARD_GOTO_BATTLE_PASS)
             # Not using self.appear() here, because it's transparent,
             # color may be different depending on background.
-            r, _, _ = get_color(self.device.image, BATTLE_PASS_RED_DOT.area)
+            r, _, _ = get_color(self.device.image, BATTLE_PASS_RED_DOT.button)
             if r > BATTLE_PASS_RED_DOT.color[0] - 40:
                 logger.info('Found battle pass red dot')
                 return True

module/shipyard/shipyard_reward.py

@@ -188,7 +188,7 @@ class RewardShipyard(ShipyardUI, GeneralShop):
         # due to both text and number being
         # right-aligned together
         # Retrieve information from page_reshmenu instead
-        self.ui_goto(page_reshmenu)
+        self.ui_ensure(page_reshmenu)
         # OCR_SHOP_GOLD_COINS is slower than RESHMENU_CHECK
         timeout = Timer(1, count=1).start()
         skip_first_screenshot = True