fix: update assets file

With the addition of the Grand Assault, the Joint Firing Drill button was moved to the top half of where the Tactical Challenge button previously was, and the new Tactical Challenge button is only the lower half.

README.en.md

@@ -12,7 +12,7 @@
 
 The script is still under active development. The following features have been implemented:
 
-- [x] **Cafe** Claim rewards / Interact / Second floor
+- [x] **Cafe** Claim rewards / Interact / Invitation / Second floor
 - [x] **Club** Claim AP
 - [x] **Mailbox** Claim rewards
 - [x] **Bounty** Auto sweep

README.md

@@ -12,7 +12,7 @@
 
 当前脚本还在活跃开发中，已经实现的功能有：
 
-- [x] **咖啡厅** 领取奖励 / 互动 / 第二咖啡厅
+- [x] **咖啡厅** 领取奖励 / 互动 / 邀请 / 第二咖啡厅
 - [x] **公会** 领取体力
 - [x] **邮箱** 领取奖励
 - [x] **悬赏通缉** 自动扫荡

config/template.json

@@ -81,15 +81,15 @@
       "OnError": "skip"
     },
     "Highway": {
-      "Stage": 1,
+      "Stage": 0,
       "Count": 2
     },
     "DesertRailroad": {
-      "Stage": 1,
+      "Stage": 0,
       "Count": 2
     },
     "Schoolhouse": {
-      "Stage": 1,
+      "Stage": 0,
       "Count": 2
     }
   },
@@ -104,15 +104,15 @@
       "OnError": "skip"
     },
     "Trinity": {
-      "Stage": 1,
+      "Stage": 0,
       "Count": 2
     },
     "Gehenna": {
-      "Stage": 1,
+      "Stage": 0,
       "Count": 2
     },
     "Millennium": {
-      "Stage": 1,
+      "Stage": 0,
       "Count": 2
     }
   },

module/config/argument/args.json

@@ -332,8 +332,9 @@
     "Highway": {
       "Stage": {
         "type": "select",
-        "value": 1,
+        "value": 0,
         "option": [
+          0,
           1,
           2,
           3,
@@ -342,7 +343,8 @@
           6,
           7,
           8,
-          9
+          9,
+          10
         ]
       },
       "Count": {
@@ -353,8 +355,9 @@
     "DesertRailroad": {
       "Stage": {
         "type": "select",
-        "value": 1,
+        "value": 0,
         "option": [
+          0,
           1,
           2,
           3,
@@ -363,7 +366,8 @@
           6,
           7,
           8,
-          9
+          9,
+          10
         ]
       },
       "Count": {
@@ -374,8 +378,9 @@
     "Schoolhouse": {
       "Stage": {
         "type": "select",
-        "value": 1,
+        "value": 0,
         "option": [
+          0,
           1,
           2,
           3,
@@ -384,7 +389,8 @@
           6,
           7,
           8,
-          9
+          9,
+          10
         ]
       },
       "Count": {
@@ -432,8 +438,9 @@
     "Trinity": {
       "Stage": {
         "type": "select",
-        "value": 1,
+        "value": 0,
         "option": [
+          0,
           1,
           2,
           3,
@@ -448,8 +455,9 @@
     "Gehenna": {
       "Stage": {
         "type": "select",
-        "value": 1,
+        "value": 0,
         "option": [
+          0,
           1,
           2,
           3,
@@ -464,8 +472,9 @@
     "Millennium": {
       "Stage": {
         "type": "select",
-        "value": 1,
+        "value": 0,
         "option": [
+          0,
           1,
           2,
           3,

module/config/argument/argument.yaml

@@ -100,18 +100,18 @@ Bounty:
 
 Highway:
   Stage:
-    value: 1
-    option: [ 1, 2, 3, 4, 5, 6, 7, 8, 9 ]
+    value: 0
+    option: [ 0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10 ]
   Count: 2
 DesertRailroad:
   Stage:
-    value: 1
-    option: [ 1, 2, 3, 4, 5, 6, 7, 8, 9 ]
+    value: 0
+    option: [ 0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10 ]
   Count: 2
 Schoolhouse:
   Stage:
-    value: 1
-    option: [ 1, 2, 3, 4, 5, 6, 7, 8, 9 ]
+    value: 0
+    option: [ 0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10 ]
   Count: 2
 
 Scrimmage:
@@ -121,18 +121,18 @@ Scrimmage:
 
 Trinity:
   Stage:
-    value: 1
-    option: [ 1, 2, 3, 4 ]
+    value: 0
+    option: [ 0, 1, 2, 3, 4 ]
   Count: 2
 Gehenna:
   Stage:
-    value: 1
-    option: [ 1, 2, 3, 4 ]
+    value: 0
+    option: [ 0, 1, 2, 3, 4 ]
   Count: 2
 Millennium:
   Stage:
-    value: 1
-    option: [ 1, 2, 3, 4 ]
+    value: 0
+    option: [ 0, 1, 2, 3, 4 ]
   Count: 2
 
 TacticalChallenge:

module/config/config_generated.py

@@ -56,30 +56,30 @@ class GeneratedConfig:
     Bounty_OnError = 'skip'  # stop, skip
 
     # Group `Highway`
-    Highway_Stage = 1  # 1, 2, 3, 4, 5, 6, 7, 8, 9
+    Highway_Stage = 0  # 0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10
     Highway_Count = 2
 
     # Group `DesertRailroad`
-    DesertRailroad_Stage = 1  # 1, 2, 3, 4, 5, 6, 7, 8, 9
+    DesertRailroad_Stage = 0  # 0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10
     DesertRailroad_Count = 2
 
     # Group `Schoolhouse`
-    Schoolhouse_Stage = 1  # 1, 2, 3, 4, 5, 6, 7, 8, 9
+    Schoolhouse_Stage = 0  # 0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10
     Schoolhouse_Count = 2
 
     # Group `Scrimmage`
     Scrimmage_OnError = 'skip'  # stop, skip
 
     # Group `Trinity`
-    Trinity_Stage = 1  # 1, 2, 3, 4
+    Trinity_Stage = 0  # 0, 1, 2, 3, 4
     Trinity_Count = 2
 
     # Group `Gehenna`
-    Gehenna_Stage = 1  # 1, 2, 3, 4
+    Gehenna_Stage = 0  # 0, 1, 2, 3, 4
     Gehenna_Count = 2
 
     # Group `Millennium`
-    Millennium_Stage = 1  # 1, 2, 3, 4
+    Millennium_Stage = 0  # 0, 1, 2, 3, 4
     Millennium_Count = 2
 
     # Group `TacticalChallenge`

module/config/i18n/en-US.json

@@ -218,7 +218,7 @@
     },
     "SecondCafe": {
       "name": "Second Floor",
-      "help": "JP server only\nEnable auto switch to second floor and perform interaction"
+      "help": "Enable auto switch to second floor and perform interaction"
     }
   },
   "Invitation": {
@@ -273,6 +273,7 @@
     "Stage": {
       "name": "Select Stage",
       "help": "",
+      "0": "Auto select",
       "1": "01 - Overpass A",
       "2": "02 - Overpass B",
       "3": "03 - Overpass C",
@@ -281,7 +282,8 @@
       "6": "06 - Overpass F",
       "7": "07 - Overpass G",
       "8": "08 - Overpass H",
-      "9": "09 - Overpass I"
+      "9": "09 - Overpass I",
+      "10": "10 - Overpass J"
     },
     "Count": {
       "name": "Sweep X times",
@@ -296,6 +298,7 @@
     "Stage": {
       "name": "Select Stage",
       "help": "",
+      "0": "Auto select",
       "1": "01 - Abandoned Train A",
       "2": "02 - Abandoned Train B",
       "3": "03 - Abandoned Train C",
@@ -304,7 +307,8 @@
       "6": "06 - Abandoned Train F",
       "7": "07 - Abandoned Train G",
       "8": "08 - Abandoned Train H",
-      "9": "09 - Abandoned Train I"
+      "9": "09 - Abandoned Train I",
+      "10": "10 - Abandoned Train J"
     },
     "Count": {
       "name": "Sweep X times",
@@ -319,6 +323,7 @@
     "Stage": {
       "name": "Select Stage",
       "help": "",
+      "0": "Auto select",
       "1": "01 - Besieged Classroom A",
       "2": "02 - Besieged Classroom B",
       "3": "03 - Besieged Classroom C",
@@ -327,7 +332,8 @@
       "6": "06 - Besieged Classroom F",
       "7": "07 - Besieged Classroom G",
       "8": "08 - Besieged Classroom H",
-      "9": "09 - Besieged Classroom I"
+      "9": "09 - Besieged Classroom I",
+      "10": "10 - Besieged Classroom J"
     },
     "Count": {
       "name": "Sweep X times",
@@ -354,6 +360,7 @@
     "Stage": {
       "name": "Select Stage",
       "help": "",
+      "0": "Auto select",
       "1": "01 - Trinity A",
       "2": "02 - Trinity B",
       "3": "03 - Trinity C",
@@ -372,6 +379,7 @@
     "Stage": {
       "name": "Select Stage",
       "help": "",
+      "0": "Auto select",
       "1": "01 - Gehenna A",
       "2": "02 - Gehenna B",
       "3": "03 - Gehenna C",
@@ -390,6 +398,7 @@
     "Stage": {
       "name": "Select Stage",
       "help": "",
+      "0": "Auto select",
       "1": "01 - Millennium A",
       "2": "02 - Millennium B",
       "3": "03 - Millennium C",

module/config/i18n/zh-CN.json

@@ -218,7 +218,7 @@
     },
     "SecondCafe": {
       "name": "第二咖啡厅",
-      "help": "仅支持日服\n自动切换第二咖啡厅进行互动点击"
+      "help": "自动切换第二咖啡厅进行互动点击"
     }
   },
   "Invitation": {
@@ -273,6 +273,7 @@
     "Stage": {
       "name": "选择关卡",
       "help": "",
+      "0": "自动选择",
       "1": "01 - 高架公路 A",
       "2": "02 - 高架公路 B",
       "3": "03 - 高架公路 C",
@@ -281,7 +282,8 @@
       "6": "06 - 高架公路 F",
       "7": "07 - 高架公路 G",
       "8": "08 - 高架公路 H",
-      "9": "09 - 高架公路 I"
+      "9": "09 - 高架公路 I",
+      "10": "10 - 高架公路 J"
     },
     "Count": {
       "name": "扫荡次数",
@@ -296,6 +298,7 @@
     "Stage": {
       "name": "选择关卡",
       "help": "",
+      "0": "自动选择",
       "1": "01 - 被遗弃的列车 A",
       "2": "02 - 被遗弃的列车 B",
       "3": "03 - 被遗弃的列车 C",
@@ -304,7 +307,8 @@
       "6": "06 - 被遗弃的列车 F",
       "7": "07 - 被遗弃的列车 G",
       "8": "08 - 被遗弃的列车 H",
-      "9": "09 - 被遗弃的列车 I"
+      "9": "09 - 被遗弃的列车 I",
+      "10": "10 - 被遗弃的列车 J"
     },
     "Count": {
       "name": "扫荡次数",
@@ -319,6 +323,7 @@
     "Stage": {
       "name": "选择关卡",
       "help": "",
+      "0": "自动选择",
       "1": "01 - 被袭击的教室 A",
       "2": "02 - 被袭击的教室 B",
       "3": "03 - 被袭击的教室 C",
@@ -327,7 +332,8 @@
       "6": "06 - 被袭击的教室 F",
       "7": "07 - 被袭击的教室 G",
       "8": "08 - 被袭击的教室 H",
-      "9": "09 - 被袭击的教室 I"
+      "9": "09 - 被袭击的教室 I",
+      "10": "10 - 被袭击的教室 J"
     },
     "Count": {
       "name": "扫荡次数",
@@ -354,6 +360,7 @@
     "Stage": {
       "name": "选择关卡",
       "help": "",
+      "0": "自动选择",
       "1": "01 - 三一 A",
       "2": "02 - 三一 B",
       "3": "03 - 三一 C",
@@ -372,6 +379,7 @@
     "Stage": {
       "name": "选择关卡",
       "help": "",
+      "0": "自动选择",
       "1": "01 - 格黑娜 A",
       "2": "02 - 格黑娜 B",
       "3": "03 - 格黑娜 C",
@@ -390,6 +398,7 @@
     "Stage": {
       "name": "选择关卡",
       "help": "",
+      "0": "自动选择",
       "1": "01 - 千年 A",
       "2": "02 - 千年 B",
       "3": "03 - 千年 C",

tasks/base/assets/assets_base_page.py

@@ -51,17 +51,17 @@ CAFE_CHECK = ButtonWrapper(
     name='CAFE_CHECK',
     jp=Button(
         file='./assets/jp/base/page/CAFE_CHECK.png',
-        area=(264, 11, 337, 35),
-        search=(244, 0, 357, 55),
-        color=(188, 197, 205),
-        button=(264, 11, 337, 35),
+        area=(108, 11, 182, 36),
+        search=(88, 0, 202, 56),
+        color=(191, 200, 208),
+        button=(108, 11, 182, 36),
     ),
     en=Button(
         file='./assets/en/base/page/CAFE_CHECK.png',
-        area=(196, 8, 259, 37),
-        search=(176, 0, 279, 57),
-        color=(188, 197, 206),
-        button=(196, 8, 259, 37),
+        area=(106, 12, 167, 36),
+        search=(86, 0, 187, 56),
+        color=(173, 184, 194),
+        button=(106, 12, 167, 36),
     ),
 )
 CIRCLE_CHECK = ButtonWrapper(
@@ -134,6 +134,13 @@ GACHA_CHECK = ButtonWrapper(
 )
 HOME = ButtonWrapper(
     name='HOME',
+    jp=Button(
+        file='./assets/jp/base/page/HOME.png',
+        area=(1224, 10, 1250, 35),
+        search=(1204, 0, 1270, 55),
+        color=(162, 176, 202),
+        button=(1224, 10, 1250, 35),
+    ),
     share=Button(
         file='./assets/share/base/page/HOME.png',
         area=(1218, 8, 1253, 41),
@@ -171,6 +178,13 @@ MAIL_CHECK = ButtonWrapper(
 )
 MAIN_GO_TO_CAFE = ButtonWrapper(
     name='MAIN_GO_TO_CAFE',
+    jp=Button(
+        file='./assets/jp/base/page/MAIN_GO_TO_CAFE.png',
+        area=(86, 632, 113, 670),
+        search=(66, 612, 133, 690),
+        color=(174, 222, 246),
+        button=(86, 632, 113, 670),
+    ),
     share=Button(
         file='./assets/share/base/page/MAIN_GO_TO_CAFE.png',
         area=(81, 638, 102, 668),
@@ -181,16 +195,30 @@ MAIN_GO_TO_CAFE = ButtonWrapper(
 )
 MAIN_GO_TO_CIRCLE = ButtonWrapper(
     name='MAIN_GO_TO_CIRCLE',
+    jp=Button(
+        file='./assets/jp/base/page/MAIN_GO_TO_CIRCLE.png',
+        area=(531, 631, 561, 659),
+        search=(511, 611, 581, 679),
+        color=(182, 230, 254),
+        button=(531, 631, 561, 659),
+    ),
     share=Button(
         file='./assets/share/base/page/MAIN_GO_TO_CIRCLE.png',
-        area=(540, 631, 583, 660),
-        search=(520, 611, 603, 680),
-        color=(131, 204, 234),
-        button=(540, 631, 583, 660),
+        area=(542, 630, 581, 665),
+        search=(522, 610, 601, 685),
+        color=(163, 225, 242),
+        button=(542, 630, 581, 665),
     ),
 )
 MAIN_GO_TO_CRAFTING = ButtonWrapper(
     name='MAIN_GO_TO_CRAFTING',
+    jp=Button(
+        file='./assets/jp/base/page/MAIN_GO_TO_CRAFTING.png',
+        area=(645, 627, 667, 662),
+        search=(625, 607, 687, 682),
+        color=(206, 235, 251),
+        button=(645, 627, 667, 662),
+    ),
     share=Button(
         file='./assets/share/base/page/MAIN_GO_TO_CRAFTING.png',
         area=(665, 622, 693, 664),
@@ -201,6 +229,13 @@ MAIN_GO_TO_CRAFTING = ButtonWrapper(
 )
 MAIN_GO_TO_GACHA = ButtonWrapper(
     name='MAIN_GO_TO_GACHA',
+    jp=Button(
+        file='./assets/jp/base/page/MAIN_GO_TO_GACHA.png',
+        area=(871, 626, 893, 671),
+        search=(851, 606, 913, 691),
+        color=(172, 223, 242),
+        button=(871, 626, 893, 671),
+    ),
     share=Button(
         file='./assets/share/base/page/MAIN_GO_TO_GACHA.png',
         area=(900, 623, 924, 670),
@@ -211,6 +246,13 @@ MAIN_GO_TO_GACHA = ButtonWrapper(
 )
 MAIN_GO_TO_MAIL = ButtonWrapper(
     name='MAIN_GO_TO_MAIL',
+    jp=Button(
+        file='./assets/jp/base/page/MAIN_GO_TO_MAIL.png',
+        area=(1144, 27, 1165, 44),
+        search=(1124, 7, 1185, 64),
+        color=(102, 125, 168),
+        button=(1144, 27, 1165, 44),
+    ),
     share=Button(
         file='./assets/share/base/page/MAIN_GO_TO_MAIL.png',
         area=(1130, 29, 1156, 49),
@@ -221,26 +263,47 @@ MAIN_GO_TO_MAIL = ButtonWrapper(
 )
 MAIN_GO_TO_MOMOTALK = ButtonWrapper(
     name='MAIN_GO_TO_MOMOTALK',
+    jp=Button(
+        file='./assets/jp/base/page/MAIN_GO_TO_MOMOTALK.png',
+        area=(125, 118, 146, 151),
+        search=(105, 98, 166, 171),
+        color=(244, 200, 211),
+        button=(125, 118, 146, 151),
+    ),
     share=Button(
         file='./assets/share/base/page/MAIN_GO_TO_MOMOTALK.png',
-        area=(154, 134, 177, 158),
-        search=(134, 114, 197, 178),
-        color=(255, 219, 227),
-        button=(154, 134, 177, 158),
+        area=(138, 130, 159, 161),
+        search=(118, 110, 179, 181),
+        color=(251, 215, 224),
+        button=(138, 130, 159, 161),
     ),
 )
 MAIN_GO_TO_PURCHASE = ButtonWrapper(
     name='MAIN_GO_TO_PURCHASE',
+    jp=Button(
+        file='./assets/jp/base/page/MAIN_GO_TO_PURCHASE.png',
+        area=(122, 209, 148, 243),
+        search=(102, 189, 168, 263),
+        color=(190, 222, 246),
+        button=(122, 209, 148, 243),
+    ),
     share=Button(
         file='./assets/share/base/page/MAIN_GO_TO_PURCHASE.png',
-        area=(148, 204, 183, 253),
-        search=(128, 184, 203, 273),
-        color=(172, 214, 239),
-        button=(148, 204, 183, 253),
+        area=(136, 210, 165, 250),
+        search=(116, 190, 185, 270),
+        color=(175, 216, 240),
+        button=(136, 210, 165, 250),
     ),
 )
 MAIN_GO_TO_SCHEDULE = ButtonWrapper(
     name='MAIN_GO_TO_SCHEDULE',
+    jp=Button(
+        file='./assets/jp/base/page/MAIN_GO_TO_SCHEDULE.png',
+        area=(198, 634, 217, 667),
+        search=(178, 614, 237, 687),
+        color=(176, 222, 243),
+        button=(198, 634, 217, 667),
+    ),
     share=Button(
         file='./assets/share/base/page/MAIN_GO_TO_SCHEDULE.png',
         area=(194, 638, 216, 672),
@@ -251,6 +314,13 @@ MAIN_GO_TO_SCHEDULE = ButtonWrapper(
 )
 MAIN_GO_TO_SHOP = ButtonWrapper(
     name='MAIN_GO_TO_SHOP',
+    jp=Button(
+        file='./assets/jp/base/page/MAIN_GO_TO_SHOP.png',
+        area=(752, 628, 786, 665),
+        search=(732, 608, 806, 685),
+        color=(168, 221, 248),
+        button=(752, 628, 786, 665),
+    ),
     share=Button(
         file='./assets/share/base/page/MAIN_GO_TO_SHOP.png',
         area=(773, 630, 816, 667),
@@ -261,29 +331,36 @@ MAIN_GO_TO_SHOP = ButtonWrapper(
 )
 MAIN_GO_TO_TASK = ButtonWrapper(
     name='MAIN_GO_TO_TASK',
+    jp=Button(
+        file='./assets/jp/base/page/MAIN_GO_TO_TASK.png',
+        area=(30, 214, 55, 248),
+        search=(10, 194, 75, 268),
+        color=(186, 218, 245),
+        button=(30, 214, 55, 248),
+    ),
     share=Button(
         file='./assets/share/base/page/MAIN_GO_TO_TASK.png',
-        area=(52, 220, 78, 248),
-        search=(32, 200, 98, 268),
-        color=(226, 207, 203),
-        button=(52, 220, 78, 248),
+        area=(47, 219, 70, 246),
+        search=(27, 199, 90, 266),
+        color=(212, 204, 208),
+        button=(47, 219, 70, 246),
     ),
 )
 MAIN_GO_TO_WORK = ButtonWrapper(
     name='MAIN_GO_TO_WORK',
     jp=Button(
         file='./assets/jp/base/page/MAIN_GO_TO_WORK.png',
-        area=(1167, 605, 1241, 632),
-        search=(1147, 585, 1261, 652),
-        color=(135, 149, 169),
-        button=(1167, 605, 1241, 632),
+        area=(1167, 668, 1222, 688),
+        search=(1147, 648, 1242, 708),
+        color=(141, 156, 174),
+        button=(1167, 668, 1222, 688),
     ),
     en=Button(
         file='./assets/en/base/page/MAIN_GO_TO_WORK.png',
-        area=(1127, 605, 1250, 637),
-        search=(1107, 585, 1270, 657),
-        color=(90, 112, 141),
-        button=(1127, 605, 1250, 637),
+        area=(1143, 591, 1241, 613),
+        search=(1123, 571, 1261, 633),
+        color=(110, 129, 154),
+        button=(1143, 591, 1241, 613),
     ),
 )
 MISSION_CHECK = ButtonWrapper(
@@ -305,6 +382,13 @@ MISSION_CHECK = ButtonWrapper(
 )
 MOMOTALK_CHECK = ButtonWrapper(
     name='MOMOTALK_CHECK',
+    jp=Button(
+        file='./assets/jp/base/page/MOMOTALK_CHECK.png',
+        area=(144, 107, 169, 130),
+        search=(124, 87, 189, 150),
+        color=(253, 211, 219),
+        button=(144, 107, 169, 130),
+    ),
     share=Button(
         file='./assets/share/base/page/MOMOTALK_CHECK.png',
         area=(144, 107, 169, 130),
@@ -446,101 +530,101 @@ WORK_GO_TO_BOUNTY = ButtonWrapper(
     name='WORK_GO_TO_BOUNTY',
     jp=Button(
         file='./assets/jp/base/page/WORK_GO_TO_BOUNTY.png',
-        area=(669, 412, 765, 436),
-        search=(649, 392, 785, 456),
-        color=(165, 181, 208),
-        button=(669, 412, 765, 436),
+        area=(679, 401, 741, 417),
+        search=(659, 381, 761, 437),
+        color=(155, 164, 186),
+        button=(679, 401, 741, 417),
     ),
     en=Button(
         file='./assets/en/base/page/WORK_GO_TO_BOUNTY.png',
-        area=(671, 409, 760, 440),
-        search=(651, 389, 780, 460),
-        color=(183, 202, 227),
-        button=(671, 409, 760, 440),
+        area=(668, 385, 756, 412),
+        search=(648, 365, 776, 432),
+        color=(180, 198, 223),
+        button=(668, 385, 756, 412),
     ),
 )
 WORK_GO_TO_COMMISSIONS = ButtonWrapper(
     name='WORK_GO_TO_COMMISSIONS',
     jp=Button(
         file='./assets/jp/base/page/WORK_GO_TO_COMMISSIONS.png',
-        area=(655, 494, 751, 518),
-        search=(635, 474, 771, 538),
-        color=(165, 179, 204),
-        button=(655, 494, 751, 518),
+        area=(661, 504, 724, 521),
+        search=(641, 484, 744, 541),
+        color=(155, 163, 184),
+        button=(661, 504, 724, 521),
     ),
     en=Button(
         file='./assets/en/base/page/WORK_GO_TO_COMMISSIONS.png',
-        area=(656, 494, 803, 517),
-        search=(636, 474, 823, 537),
-        color=(192, 204, 221),
-        button=(656, 494, 803, 517),
+        area=(653, 477, 787, 496),
+        search=(633, 457, 807, 516),
+        color=(187, 199, 218),
+        button=(653, 477, 787, 496),
     ),
 )
 WORK_GO_TO_MISSION = ButtonWrapper(
     name='WORK_GO_TO_MISSION',
     jp=Button(
         file='./assets/jp/base/page/WORK_GO_TO_MISSION.png',
-        area=(720, 160, 803, 199),
-        search=(700, 140, 823, 219),
-        color=(165, 178, 204),
-        button=(720, 160, 803, 199),
+        area=(710, 220, 769, 249),
+        search=(690, 200, 789, 269),
+        color=(137, 153, 180),
+        button=(710, 220, 769, 249),
     ),
     en=Button(
         file='./assets/en/base/page/WORK_GO_TO_MISSION.png',
-        area=(720, 160, 871, 206),
-        search=(700, 140, 891, 226),
-        color=(192, 204, 221),
-        button=(720, 160, 871, 206),
+        area=(721, 158, 873, 197),
+        search=(701, 138, 893, 217),
+        color=(180, 195, 215),
+        button=(721, 158, 873, 197),
     ),
 )
 WORK_GO_TO_SCHOOL_EXCHANGE = ButtonWrapper(
     name='WORK_GO_TO_SCHOOL_EXCHANGE',
     jp=Button(
         file='./assets/jp/base/page/WORK_GO_TO_SCHOOL_EXCHANGE.png',
-        area=(641, 575, 758, 599),
-        search=(621, 555, 778, 619),
-        color=(165, 179, 204),
-        button=(641, 575, 758, 599),
+        area=(642, 606, 721, 624),
+        search=(622, 586, 741, 644),
+        color=(167, 174, 192),
+        button=(642, 606, 721, 624),
     ),
     en=Button(
         file='./assets/en/base/page/WORK_GO_TO_SCHOOL_EXCHANGE.png',
-        area=(643, 572, 778, 602),
-        search=(623, 552, 798, 622),
-        color=(190, 203, 221),
-        button=(643, 572, 778, 602),
+        area=(635, 569, 769, 597),
+        search=(615, 549, 789, 617),
+        color=(198, 204, 216),
+        button=(635, 569, 769, 597),
     ),
 )
 WORK_GO_TO_STORY = ButtonWrapper(
     name='WORK_GO_TO_STORY',
     jp=Button(
         file='./assets/jp/base/page/WORK_GO_TO_STORY.png',
-        area=(995, 163, 1032, 197),
-        search=(975, 143, 1052, 217),
-        color=(191, 201, 219),
-        button=(995, 163, 1032, 197),
+        area=(993, 220, 1081, 250),
+        search=(973, 200, 1101, 270),
+        color=(209, 214, 224),
+        button=(993, 220, 1081, 250),
     ),
     en=Button(
         file='./assets/en/base/page/WORK_GO_TO_STORY.png',
-        area=(994, 159, 1109, 211),
-        search=(974, 139, 1129, 231),
-        color=(208, 215, 228),
-        button=(994, 159, 1109, 211),
+        area=(996, 159, 1112, 205),
+        search=(976, 139, 1132, 225),
+        color=(200, 209, 225),
+        button=(996, 159, 1112, 205),
     ),
 )
 WORK_GO_TO_TACTICAL_CHALLENGE = ButtonWrapper(
     name='WORK_GO_TO_TACTICAL_CHALLENGE',
     jp=Button(
         file='./assets/jp/base/page/WORK_GO_TO_TACTICAL_CHALLENGE.png',
-        area=(1012, 535, 1151, 562),
-        search=(992, 515, 1171, 582),
-        color=(159, 174, 200),
-        button=(1012, 535, 1151, 562),
+        area=(821, 600, 911, 620),
+        search=(801, 580, 931, 640),
+        color=(156, 164, 185),
+        button=(821, 600, 911, 620),
     ),
     en=Button(
         file='./assets/en/base/page/WORK_GO_TO_TACTICAL_CHALLENGE.png',
-        area=(1034, 435, 1162, 466),
-        search=(1014, 415, 1182, 486),
-        color=(179, 199, 221),
-        button=(1034, 435, 1162, 466),
+        area=(803, 566, 922, 623),
+        search=(783, 546, 942, 643),
+        color=(186, 201, 220),
+        button=(803, 566, 922, 623),
     ),
 )

tasks/bounty/ui.py

@@ -22,6 +22,8 @@ class BountyUI(UI):
                 return False
 
     def enter_stage(self, index: int) -> bool:
+        if not index:
+            index = BOUNTY_LIST.insight_max_sweepable_index(self)
         if BOUNTY_LIST.select_index_enter(self, index):
             return True
         return False

tasks/cafe/assets/assets_cafe.py

@@ -27,102 +27,68 @@ CAFE_FIRST = ButtonWrapper(
     name='CAFE_FIRST',
     jp=Button(
         file='./assets/jp/cafe/CAFE_FIRST.png',
-        area=(82, 152, 136, 175),
-        search=(62, 132, 156, 195),
-        color=(111, 127, 147),
-        button=(82, 152, 136, 175),
+        area=(96, 92, 111, 110),
+        search=(76, 72, 131, 130),
+        color=(185, 192, 200),
+        button=(96, 92, 111, 110),
     ),
     en=Button(
         file='./assets/en/cafe/CAFE_FIRST.png',
-        area=(82, 152, 136, 175),
-        search=(62, 132, 156, 195),
-        color=(111, 127, 147),
-        button=(82, 152, 136, 175),
+        area=(205, 96, 215, 107),
+        search=(185, 76, 235, 127),
+        color=(176, 184, 194),
+        button=(205, 96, 215, 107),
     ),
 )
 CAFE_INVITE = ButtonWrapper(
     name='CAFE_INVITE',
     jp=Button(
         file='./assets/jp/cafe/CAFE_INVITE.png',
-        area=(816, 635, 845, 655),
-        search=(796, 615, 865, 675),
-        color=(173, 182, 192),
-        button=(816, 635, 845, 655),
+        area=(870, 637, 903, 663),
+        search=(850, 617, 923, 683),
+        color=(253, 217, 235),
+        button=(870, 637, 903, 663),
     ),
     en=Button(
         file='./assets/en/cafe/CAFE_INVITE.png',
-        area=(816, 635, 845, 655),
-        search=(796, 615, 865, 675),
-        color=(173, 182, 192),
-        button=(816, 635, 845, 655),
+        area=(870, 637, 903, 663),
+        search=(850, 617, 923, 683),
+        color=(253, 217, 235),
+        button=(870, 637, 903, 663),
     ),
 )
 CAFE_INVITED = ButtonWrapper(
     name='CAFE_INVITED',
     jp=Button(
         file='./assets/jp/cafe/CAFE_INVITED.png',
-        area=(815, 633, 847, 657),
-        search=(795, 613, 867, 677),
-        color=(144, 144, 146),
-        button=(815, 633, 847, 657),
+        area=(870, 637, 903, 663),
+        search=(850, 617, 923, 683),
+        color=(111, 109, 109),
+        button=(870, 637, 903, 663),
     ),
     en=Button(
         file='./assets/en/cafe/CAFE_INVITED.png',
-        area=(815, 633, 847, 657),
-        search=(795, 613, 867, 677),
-        color=(144, 144, 146),
-        button=(815, 633, 847, 657),
+        area=(870, 637, 903, 663),
+        search=(850, 617, 923, 683),
+        color=(111, 109, 109),
+        button=(870, 637, 903, 663),
     ),
 )
 CAFE_SECOND = ButtonWrapper(
     name='CAFE_SECOND',
     jp=Button(
         file='./assets/jp/cafe/CAFE_SECOND.png',
-        area=(219, 152, 279, 175),
-        search=(199, 132, 299, 195),
-        color=(110, 126, 146),
-        button=(219, 152, 279, 175),
+        area=(99, 92, 108, 110),
+        search=(79, 72, 128, 130),
+        color=(193, 200, 209),
+        button=(99, 92, 108, 110),
     ),
     en=Button(
         file='./assets/en/cafe/CAFE_SECOND.png',
-        area=(219, 152, 279, 175),
-        search=(199, 132, 299, 195),
-        color=(110, 126, 146),
-        button=(219, 152, 279, 175),
-    ),
-)
-CHANGE_CAFE_NOT_SELECTED = ButtonWrapper(
-    name='CHANGE_CAFE_NOT_SELECTED',
-    jp=Button(
-        file='./assets/jp/cafe/CHANGE_CAFE_NOT_SELECTED.png',
-        area=(84, 89, 178, 109),
-        search=(64, 69, 198, 129),
-        color=(185, 193, 203),
-        button=(84, 89, 178, 109),
-    ),
-    en=Button(
-        file='./assets/en/cafe/CHANGE_CAFE_NOT_SELECTED.png',
-        area=(84, 89, 178, 109),
-        search=(64, 69, 198, 129),
-        color=(185, 193, 203),
-        button=(84, 89, 178, 109),
-    ),
-)
-CHANGE_CAFE_SELECTED = ButtonWrapper(
-    name='CHANGE_CAFE_SELECTED',
-    jp=Button(
-        file='./assets/jp/cafe/CHANGE_CAFE_SELECTED.png',
-        area=(40, 87, 191, 112),
-        search=(20, 67, 211, 132),
-        color=(82, 105, 130),
-        button=(40, 87, 191, 112),
-    ),
-    en=Button(
-        file='./assets/en/cafe/CHANGE_CAFE_SELECTED.png',
-        area=(40, 87, 191, 112),
-        search=(20, 67, 211, 132),
-        color=(82, 105, 130),
-        button=(40, 87, 191, 112),
+        area=(207, 96, 214, 107),
+        search=(187, 76, 234, 127),
+        color=(174, 182, 192),
+        button=(207, 96, 214, 107),
     ),
 )
 CHECK_MOMOTALK = ButtonWrapper(
@@ -146,17 +112,17 @@ CHECK_REWARD = ButtonWrapper(
     name='CHECK_REWARD',
     jp=Button(
         file='./assets/jp/cafe/CHECK_REWARD.png',
-        area=(1095, 621, 1146, 637),
-        search=(1075, 601, 1166, 657),
-        color=(82, 105, 129),
-        button=(1086, 607, 1225, 685),
+        area=(1120, 635, 1166, 651),
+        search=(1100, 615, 1186, 671),
+        color=(79, 102, 127),
+        button=(1109, 627, 1239, 691),
     ),
     en=Button(
         file='./assets/en/cafe/CHECK_REWARD.png',
-        area=(1090, 613, 1229, 644),
-        search=(1070, 593, 1249, 664),
-        color=(64, 88, 115),
-        button=(1086, 611, 1229, 685),
+        area=(1116, 636, 1218, 654),
+        search=(1096, 616, 1238, 674),
+        color=(77, 100, 125),
+        button=(1113, 625, 1239, 692),
     ),
 )
 CLICKABLE_TEMPLATE = ButtonWrapper(
@@ -180,10 +146,10 @@ GET_REWARD = ButtonWrapper(
     ),
     en=Button(
         file='./assets/en/cafe/GET_REWARD.png',
-        area=(581, 503, 692, 536),
-        search=(561, 483, 712, 556),
-        color=(208, 190, 63),
-        button=(539, 491, 741, 555),
+        area=(593, 506, 687, 548),
+        search=(573, 486, 707, 568),
+        color=(211, 193, 64),
+        button=(543, 492, 736, 564),
     ),
 )
 GET_REWARD_CLOSE = ButtonWrapper(
@@ -197,10 +163,10 @@ GET_REWARD_CLOSE = ButtonWrapper(
     ),
     en=Button(
         file='./assets/en/cafe/GET_REWARD_CLOSE.png',
-        area=(883, 134, 926, 178),
-        search=(863, 114, 946, 198),
-        color=(215, 220, 224),
-        button=(883, 134, 926, 178),
+        area=(968, 132, 997, 162),
+        search=(948, 112, 1017, 182),
+        color=(187, 193, 201),
+        button=(968, 132, 997, 162),
     ),
 )
 GOT_REWARD = ButtonWrapper(
@@ -214,10 +180,10 @@ GOT_REWARD = ButtonWrapper(
     ),
     en=Button(
         file='./assets/en/cafe/GOT_REWARD.png',
-        area=(543, 489, 741, 558),
-        search=(523, 469, 761, 578),
-        color=(211, 212, 212),
-        button=(543, 489, 741, 558),
+        area=(544, 493, 735, 563),
+        search=(524, 473, 755, 583),
+        color=(213, 213, 212),
+        button=(544, 493, 735, 563),
     ),
 )
 INVENTORY = ButtonWrapper(
@@ -377,17 +343,17 @@ OCR_CAFE = ButtonWrapper(
     name='OCR_CAFE',
     jp=Button(
         file='./assets/jp/cafe/OCR_CAFE.png',
-        area=(1103, 642, 1202, 672),
-        search=(1083, 622, 1222, 692),
-        color=(87, 107, 129),
-        button=(1103, 642, 1202, 672),
+        area=(1127, 657, 1219, 682),
+        search=(1107, 637, 1239, 702),
+        color=(93, 112, 134),
+        button=(1127, 657, 1219, 682),
     ),
     en=Button(
         file='./assets/en/cafe/OCR_CAFE.png',
-        area=(1105, 639, 1195, 674),
-        search=(1085, 619, 1215, 694),
-        color=(84, 104, 127),
-        button=(1105, 639, 1195, 674),
+        area=(1127, 657, 1219, 682),
+        search=(1107, 637, 1239, 702),
+        color=(93, 112, 134),
+        button=(1127, 657, 1219, 682),
     ),
 )
 OCR_NAME = ButtonWrapper(

tasks/cafe/cafe.py

@@ -1,6 +1,5 @@
 from enum import Enum
 
-from module.base.decorator import Config
 from module.base.timer import Timer
 from module.logger import logger
 from module.ui.switch import Switch
@@ -9,10 +8,6 @@ from tasks.cafe.assets.assets_cafe import *
 from tasks.cafe.invitation import handle_invitation
 from tasks.cafe.ui import CafeUI
 
-SWITCH_CAFE = Switch('Cafe_switch')
-SWITCH_CAFE.add_state('off', CHANGE_CAFE_NOT_SELECTED)
-SWITCH_CAFE.add_state('on', CHANGE_CAFE_SELECTED)
-
 SWITCH_CAFE_SELECT = Switch('Cafe_switch_select')
 SWITCH_CAFE_SELECT.add_state('1', CAFE_FIRST)
 SWITCH_CAFE_SELECT.add_state('2', CAFE_SECOND)
@@ -30,16 +25,10 @@ class CafeStatus(Enum):
 
 
 class Cafe(CafeUI):
-    @Config.when(Emulator_GameLanguage='jp')
-    def _is_second_cafe_on(self):
+    @property
+    def is_second_cafe_on(self):
         return self.config.Cafe_SecondCafe
 
-    @Config.when(Emulator_GameLanguage=None)
-    def _is_second_cafe_on(self):
-        return False
-
-    is_second_cafe_on = property(_is_second_cafe_on)
-
     def _handle_cafe(self, status):
         match status:
             case CafeStatus.STUDENT_LIST:
@@ -70,7 +59,7 @@ class Cafe(CafeUI):
                 if handle_invitation(self):
                     return CafeStatus.CLICK
             case CafeStatus.CLICK:
-                buttons = self.get_clickable_buttons(offset=(45, 10))
+                buttons = self.get_clickable_buttons()
                 self.click = len(buttons)
                 logger.attr('Clickable', self.click)
                 if not buttons:
@@ -116,7 +105,6 @@ class Cafe(CafeUI):
         status = CafeStatus.STUDENT_LIST
         loading_timer = Timer(2).start()
         action_timer = Timer(1, count=1)
-        is_list = False
         is_reset = False
         is_second = False
         is_enable = is_reward_on or is_touch_on
@@ -133,11 +121,6 @@ class Cafe(CafeUI):
             if not loading_timer.reached():
                 continue
 
-            if not is_list and status == CafeStatus.STUDENT_LIST and self.appear(STUDENT_LIST):
-                is_list = True
-                loading_timer = Timer(3).start()
-                continue
-
             if not is_reward_on and status == CafeStatus.OCR:
                 logger.info('Skip reward')
                 status = CafeStatus.CLICK
@@ -154,26 +137,19 @@ class Cafe(CafeUI):
                 continue
 
             if self.is_second_cafe_on and not is_second and status == CafeStatus.FINISHED:
-                if not SWITCH_CAFE.appear(main=self):
-                    logger.warning('Cafe switch not found')
-                    continue
-                if SWITCH_CAFE.get(main=self) == 'off':
-                    SWITCH_CAFE.set('on', main=self)
-                    logger.info('Switching to second cafe')
                 if not SWITCH_CAFE_SELECT.appear(main=self):
-                    logger.info('Cafe switch select not found')
+                    logger.info('Cafe switch not found')
                     continue
-                match (SWITCH_CAFE_SELECT.get(main=self)):
+                match SWITCH_CAFE_SELECT.get(main=self):
                     case '1':
-                        if self.click_with_interval(CAFE_SECOND):
+                        if self.click_with_interval(CAFE_FIRST):
                             continue
                     case '2':
                         logger.info('Cafe second arrived')
-                        SWITCH_CAFE.set('off', main=self)
                         status = CafeStatus.STUDENT_LIST
-                        is_list = False
                         is_second = True
                         self.check = 0
+                        loading_timer.reset().start()
 
             if action_timer.reached_and_reset():
                 logger.attr('Status', status)

tasks/cafe/invitation.py

@@ -6,7 +6,7 @@ import numpy as np
 
 from module.base.base import ModuleBase
 from module.base.timer import Timer
-from module.base.utils import area_size, area_offset
+from module.base.utils import area_offset, area_size
 from module.config.utils import get_server_next_update
 from module.logger import logger
 from module.ocr.ocr import Ocr
@@ -223,7 +223,7 @@ def handle_invitation_status(status: InvitationStatus, main: ModuleBase) -> Invi
             if not invitation.is_invitation:
                 logger.info('Invitation waiting until next refresh')
                 return InvitationStatus.FINISHED
-            if main.appear(CAFE_INVITED):
+            if main.match_color(CAFE_INVITED):
                 logger.info('Invitation in cooldown')
                 return InvitationStatus.FINISHED
             if invitation.choice != 'list_top' and invitation.target_name is None:
@@ -243,7 +243,7 @@ def handle_invitation_status(status: InvitationStatus, main: ModuleBase) -> Invi
         case InvitationStatus.SELECT:
             if main.appear(INVITE_CONFIRM):
                 return InvitationStatus.CONFIRM
-            if main.config.LANG == 'jp' and main.appear(INVITE_IN_SECOND):
+            if main.appear(INVITE_IN_SECOND):
                 return InvitationStatus.IN_SECOND
             if main.appear(INVITE_SUBSTITUTE):
                 return InvitationStatus.SUBSTITUTE

tasks/cafe/ui.py

@@ -31,7 +31,7 @@ class CafeUI(UI):
         # generate result
         return cv2.bitwise_and(image, image, mask=mask)
 
-    def get_clickable_buttons(self, similarity=0.8, offset=(45, 10)):
+    def get_clickable_buttons(self, similarity=0.8, offset=(40, 10)):
         image = self.extract_clickable_from_image(self.device.image)
         self.template.matched_button._button_offset = offset
         self.template.load_offset(self.template)

tasks/circle/assets/assets_circle.py

@@ -3,6 +3,23 @@ from module.base.button import Button, ButtonWrapper
 # This file was auto-generated, do not modify it manually. To generate:
 # ``` python -m dev_tools.button_extract ```
 
+CIRCLE = ButtonWrapper(
+    name='CIRCLE',
+    jp=Button(
+        file='./assets/jp/circle/CIRCLE.png',
+        area=(191, 314, 233, 356),
+        search=(171, 294, 253, 376),
+        color=(191, 224, 240),
+        button=(188, 299, 435, 456),
+    ),
+    en=Button(
+        file='./assets/en/circle/CIRCLE.png',
+        area=(196, 314, 235, 355),
+        search=(176, 294, 255, 375),
+        color=(183, 221, 238),
+        button=(191, 298, 434, 457),
+    ),
+)
 GET_REWARD_AP = ButtonWrapper(
     name='GET_REWARD_AP',
     jp=Button(

tasks/circle/circle.py

@@ -2,7 +2,7 @@ from enum import Enum
 
 from module.base.timer import Timer
 from module.logger import logger
-from tasks.base.page import page_circle
+from tasks.base.page import CIRCLE_CHECK, MAIN_GO_TO_CIRCLE
 from tasks.base.ui import UI
 from tasks.circle.assets.assets_circle import *
 
@@ -17,6 +17,19 @@ class CircleStatus(Enum):
 
 
 class Circle(UI):
+    def _enter_circle(self):
+        self.ui_goto_main()
+        action_timer = Timer(1, 8)
+        while not self.appear(CIRCLE_CHECK):
+            self.device.screenshot()
+            if not action_timer.reached_and_reset():
+                continue
+            if self.appear(CIRCLE):
+                self.click_with_interval(CIRCLE, 3)
+                continue
+            else:
+                self.device.click(MAIN_GO_TO_CIRCLE)
+
     def _handle_circle(self, status):
         match status:
             case CircleStatus.REWARD:
@@ -31,7 +44,7 @@ class Circle(UI):
         return status
 
     def run(self):
-        self.ui_ensure(page_circle)
+        self._enter_circle()
 
         status = CircleStatus.REWARD
         action_timer = Timer(0.5)

tasks/item/assets/assets_item_data.py

@@ -5,21 +5,35 @@ from module.base.button import Button, ButtonWrapper
 
 OCR_AP = ButtonWrapper(
     name='OCR_AP',
+    jp=Button(
+        file='./assets/jp/item/data/OCR_AP.png',
+        area=(512, 13, 597, 32),
+        search=(492, 0, 617, 52),
+        color=(199, 204, 208),
+        button=(512, 13, 597, 32),
+    ),
     share=Button(
         file='./assets/share/item/data/OCR_AP.png',
-        area=(560, 11, 667, 37),
-        search=(540, 0, 687, 57),
-        color=(211, 216, 219),
-        button=(560, 11, 667, 37),
+        area=(535, 13, 660, 36),
+        search=(515, 0, 680, 56),
+        color=(207, 215, 220),
+        button=(535, 13, 660, 36),
     ),
 )
 OCR_DATA = ButtonWrapper(
     name='OCR_DATA',
+    jp=Button(
+        file='./assets/jp/item/data/OCR_DATA.png',
+        area=(716, 14, 1058, 33),
+        search=(696, 0, 1078, 53),
+        color=(211, 219, 224),
+        button=(716, 14, 1058, 33),
+    ),
     share=Button(
         file='./assets/share/item/data/OCR_DATA.png',
-        area=(768, 12, 1072, 37),
-        search=(748, 0, 1092, 57),
-        color=(212, 220, 224),
-        button=(768, 12, 1072, 37),
+        area=(745, 11, 1069, 39),
+        search=(725, 0, 1089, 59),
+        color=(216, 223, 227),
+        button=(745, 11, 1069, 39),
     ),
 )

tasks/scrimmage/scrimmage.py

@@ -7,6 +7,7 @@ from tasks.base.assets.assets_base_page import BACK
 from tasks.base.page import page_school_exchange
 from tasks.scrimmage.assets.assets_scrimmage import *
 from tasks.scrimmage.ui import ScrimmageUI
+from tasks.stage.ap import AP
 
 
 class ScrimmageStatus(Enum):
@@ -18,15 +19,20 @@ class ScrimmageStatus(Enum):
     FINISH = 5
 
 
-class Scrimmage(ScrimmageUI):
+class Scrimmage(ScrimmageUI, AP):
+    _stage_ap = [10, 15, 15, 15]
+
+    @property
+    def stage_ap(self):
+        return self._stage_ap
+
     @property
     def scrimmage_info(self):
         scrimmage = (SELECT_TRINITY, SELECT_GEHENNA, SELECT_MILLENNIUM)
         check = (CHECK_TRINITY, CHECK_GEHENNA, CHECK_MILLENNIUM)
         stage = (self.config.Trinity_Stage, self.config.Gehenna_Stage, self.config.Millennium_Stage)
         count = (self.config.Trinity_Count, self.config.Gehenna_Count, self.config.Millennium_Count)
-        ap = (10 if stage == 1 else 15 for stage in stage)
-        info = zip(scrimmage, check, stage, count, ap)
+        info = zip(scrimmage, check, stage, count)
         return filter(lambda x: x[3] > 0, info)
 
     @property
@@ -50,10 +56,6 @@ class Scrimmage(ScrimmageUI):
     def is_ticket_enough(self) -> bool:
         return self.current_ticket >= self.current_count
 
-    @property
-    def is_ap_enough(self) -> bool:
-        return self.current_ap >= self.current_task_ap
-
     @property
     def current_scrimmage(self):
         return self.task[0][:2]
@@ -66,25 +68,10 @@ class Scrimmage(ScrimmageUI):
     def current_count(self):
         return self.task[0][3]
 
-    @property
-    def current_task_ap(self):
-        return self.task[0][4] * self.current_count
-
     @property
     def current_ticket(self):
         return self.config.stored.ScrimmageTicket.value
 
-    @property
-    def current_ap(self):
-        return self.config.stored.AP.value
-
-    def update_ap(self):
-        ap = self.config.stored.AP
-        ap_old = ap.value
-        ap_new = ap_old - self.current_task_ap
-        ap.set(ap_new, ap.total)
-        logger.info(f'Set AP: {ap_old} -> {ap_new}')
-
     def handle_scrimmage(self, status):
         match status:
             case ScrimmageStatus.OCR:
@@ -96,19 +83,16 @@ class Scrimmage(ScrimmageUI):
                 if not self.is_ticket_enough:
                     logger.warning('Scrimmage ticket not enough')
                     self.error_handler()
-                if not self.is_ap_enough:
-                    logger.warning('AP not enough')
-                    self.error_handler()
                 if self.select_scrimmage(*self.current_scrimmage):
                     return ScrimmageStatus.ENTER
             case ScrimmageStatus.ENTER:
-                if self.enter_stage(self.current_stage):
+                if self.enter_stage(self.current_stage) and self.is_ap_enough(self.current_count, self.current_stage):
                     return ScrimmageStatus.SWEEP
                 else:
                     self.error_handler()
             case ScrimmageStatus.SWEEP:
                 if self.do_sweep(self.current_count):
-                    self.update_ap()
+                    self.update_ap(self.current_count, self.current_stage)
                     self.task.pop(0)
                     return ScrimmageStatus.END
                 return ScrimmageStatus.ENTER

tasks/scrimmage/ui.py

@@ -3,6 +3,7 @@ from module.logger import logger
 from module.ocr.ocr import DigitCounter
 from tasks.base.ui import UI
 from tasks.scrimmage.assets.assets_scrimmage import *
+from tasks.stage.ap import AP
 from tasks.stage.list import StageList
 from tasks.stage.sweep import StageSweep
 
@@ -10,7 +11,7 @@ SCRIMMAGE_LIST = StageList('ScrimmageList')
 SCRIMMAGE_SWEEP = StageSweep('ScrimmageSweep', 6)
 
 
-class ScrimmageUI(UI):
+class ScrimmageUI(UI, AP):
     def select_scrimmage(self, dest_enter: ButtonWrapper, dest_check: ButtonWrapper):
         timer = Timer(5, 10).start()
         while 1:
@@ -22,6 +23,10 @@ class ScrimmageUI(UI):
                 return False
 
     def enter_stage(self, index: int) -> bool:
+        if not index:
+            index = SCRIMMAGE_LIST.insight_max_sweepable_index(self)
+            # set AP stage
+            self.set_stage(index)
         if SCRIMMAGE_LIST.select_index_enter(self, index, insight=False):
             return True
         return False

tasks/stage/ap.py

@@ -0,0 +1,48 @@
+from module.base.base import ModuleBase
+from module.logger import logger
+
+
+class AP(ModuleBase):
+    _stage = 0
+
+    @property
+    def stage(self) -> int:
+        return self._stage
+
+    @classmethod
+    def set_stage(cls, stage: int):
+        cls._stage = stage
+
+    @property
+    def stage_ap(self) -> int | list:
+        """
+        To be redefined in subclass.
+
+        Returns:
+            Task ap
+        """
+        return 0
+
+    @property
+    def current_ap(self):
+        return self.config.stored.AP.value
+
+    def update_ap(self, count: int, stage: int = None):
+        ap = self.config.stored.AP
+        ap_old = ap.value
+        ap_new = ap_old - self.stage_ap_cost(stage) * count
+        ap.set(ap_new, ap.total)
+        logger.info(f'Set AP: {ap_old} -> {ap_new}')
+
+    def stage_ap_cost(self, stage: int = None) -> int:
+        if isinstance(self.stage_ap, int):
+            return self.stage_ap
+        if isinstance(self.stage_ap, list):
+            if not stage:
+                stage = self.stage if self.stage else len(self.stage_ap)
+            return self.stage_ap[stage - 1]
+
+    def is_ap_enough(self, count: int, stage: int = None) -> bool:
+        cost = self.stage_ap_cost(stage) * count
+        logger.info(f'Check AP: {self.current_ap} / {cost}')
+        return self.current_ap >= cost

tasks/stage/list.py

@@ -1,3 +1,5 @@
+import re
+
 import numpy as np
 
 from module.base.base import ModuleBase
@@ -31,7 +33,7 @@ class StageList:
 
         self.current_index_min = 1
         self.current_index_max = 1
-        self.current_indexes = []
+        self.current_indexes: list[tuple[str, tuple]] = []
 
     def __str__(self):
         return f'StageList({self.name})'
@@ -46,11 +48,14 @@ class StageList:
 
     @property
     def _indexes(self) -> list[int]:
-        return list(map(lambda x: int(x.ocr_text), self.current_indexes))
+        return [int(x[0]) for x in self.current_indexes]
 
     def load_stage_indexes(self, main: ModuleBase):
         self.current_indexes = list(
-            filter(lambda x: x.ocr_text.isdigit(), self.index_ocr.detect_and_ocr(main.device.image))
+            filter(
+                lambda x: re.match(r'^\d{1,2}-?\d?$', x[0]) and x[0] != '00',
+                map(lambda x: (x.ocr_text, x.box), self.index_ocr.detect_and_ocr(main.device.image))
+            )
         )
         if not self.current_indexes:
             logger.warning(f'No valid index in {self.index_ocr.name}')
@@ -126,13 +131,79 @@ class StageList:
                 timeout=Timer(1.5, 5)
             )
 
+    def insight_max_sweepable_index(self, main: ModuleBase, skip_first_screenshot=True) -> int:
+        """
+        Args:
+            main:
+            skip_first_screenshot:
+
+        Returns:
+            Index of max sweepable stage
+        """
+        logger.info('Insight sweepable index')
+        max_sweepable_index = 0
+        last_max_sweepable_index = 0
+
+        while 1:
+            if skip_first_screenshot:
+                skip_first_screenshot = False
+            else:
+                main.device.screenshot()
+
+            self.load_stage_indexes(main=main)
+
+            sweepable_index = next(
+                filter(
+                    lambda x: not self.is_sweepable(main, self.search_box(x[-1][:2])),
+                    self.current_indexes
+                ), None
+            )
+
+            # all sweepable
+            if sweepable_index is None:
+                logger.info('All sweepable')
+                max_sweepable_index = self.current_index_max
+                self.swipe_page(self.swipe_direction, main)
+                if max_sweepable_index == last_max_sweepable_index:
+                    logger.info(f'Max sweepable index: {max_sweepable_index}')
+                    return max_sweepable_index
+                last_max_sweepable_index = max_sweepable_index
+            # all not sweepable
+            elif int(sweepable_index[0]) == self.current_index_min:
+                logger.info('All not sweepable')
+                if int(sweepable_index[0]) == 1:
+                    logger.warning('No sweepable index')
+                    return 0
+                self.swipe_page(self.swipe_direction, main, reverse=True)
+            else:
+                logger.info(f'Sweepable index: {int(sweepable_index[0]) - 1}')
+                return int(sweepable_index[0]) - 1
+
+            main.wait_until_stable(
+                self.stage.button,
+                timer=Timer(0, 0),
+                timeout=Timer(1.5, 5)
+            )
+
+    def is_sweepable(self, main: ModuleBase, search_box) -> bool:
+        self.sweepable.load_search(search_box)
+        return main.appear(self.sweepable, similarity=0.8)
+
+    def search_box(
+            self,
+            index_cord: tuple[int, int],
+            padding: tuple[int, int] = (-20, -15)
+    ) -> tuple[int, int, int, int]:
+        stage_item_box = area_pad((*padding, *area_size(self.stage_item)))
+        return area_offset(stage_item_box, index_cord)
+
     def select_index_enter(
             self,
             main: ModuleBase,
             index: int,
             insight: bool = True,
             sweepable: bool = True,
-            offset: tuple[int, int] = (-20, -15),
+            padding: tuple[int, int] = (-20, -15),
             skip_first_screenshot: bool = True,
             interval: int = 1.5
     ) -> bool:
@@ -150,21 +221,18 @@ class StageList:
                 main.device.screenshot()
 
             # load index if not insight
-            if load_index_interval.reached_and_reset() and not insight:
+            if load_index_interval.reached_and_reset():
                 self.load_stage_indexes(main=main)
 
             # find box of index
-            index_box = next(filter(lambda x: int(x.ocr_text) == index, self.current_indexes), None)
+            index_box = next(filter(lambda x: int(x[0]) == index, self.current_indexes), None)
 
             if index_box is None:
                 logger.warning(f'No index {index} in {self.index_ocr.name}')
                 continue
 
-            stage_item_box = area_pad((*offset, *area_size(self.stage_item)))
-            search_box = area_offset(stage_item_box, index_box.box[:2])
-            self.sweepable.load_search(search_box)
-
-            if sweepable and not main.appear(self.sweepable):
+            search_box = self.search_box(index_box[-1][:2], padding)
+            if sweepable and not self.is_sweepable(main, search_box):
                 logger.warning(f'Index {index} is not sweepable')
                 return False
 

tasks/tactical_challenge/assets/assets_tactical_challenge.py

@@ -133,9 +133,9 @@ PLAYER_SELECT_FIRST = ButtonWrapper(
     ),
     en=Button(
         file='./assets/en/tactical_challenge/PLAYER_SELECT_FIRST.png',
-        area=(470, 293, 503, 322),
-        search=(450, 273, 523, 342),
-        color=(206, 214, 220),
+        area=(468, 296, 493, 315),
+        search=(448, 276, 513, 335),
+        color=(191, 202, 207),
         button=(606, 181, 1100, 256),
     ),
 )
@@ -150,9 +150,9 @@ PLAYER_SELECT_SECOND = ButtonWrapper(
     ),
     en=Button(
         file='./assets/en/tactical_challenge/PLAYER_SELECT_SECOND.png',
-        area=(467, 450, 507, 482),
-        search=(447, 430, 527, 502),
-        color=(210, 219, 225),
+        area=(467, 454, 493, 473),
+        search=(447, 434, 513, 493),
+        color=(191, 202, 207),
         button=(610, 338, 1098, 407),
     ),
 )
@@ -167,9 +167,9 @@ PLAYER_SELECT_THIRD = ButtonWrapper(
     ),
     en=Button(
         file='./assets/en/tactical_challenge/PLAYER_SELECT_THIRD.png',
-        area=(472, 612, 504, 641),
-        search=(452, 592, 524, 661),
-        color=(208, 216, 222),
+        area=(468, 613, 492, 631),
+        search=(448, 593, 512, 651),
+        color=(188, 199, 204),
         button=(609, 500, 1101, 565),
     ),
 )

tasks/tactical_challenge/tactical_challenge.py

@@ -41,6 +41,8 @@ class TacticalChallenge(TacticalChallengeUI):
     def _handle_challenge(self, status):
         match status:
             case TCStatus.REWARD:
+                if self.ui_additional():
+                    return status
                 if self.get_reward():
                     return TCStatus.OCR
             case TCStatus.OCR: