feat: 增加钻石回复体力 (#221)

Author: ZJChe

bot/base/task.py

@@ -34,6 +34,7 @@ class EndTaskReason(Enum):
     CANCELLED_DUE_TO_STOP_AT_SKILL_LEARN = "因其它任务等待学习技能而取消"
     SYSTEM_ERROR = "系统异常"
     SCENARIO_NOT_FOUND = "找不到育成剧本"
+    UMAMUSUME_HALL_FULL = "名人堂优俊少女已满"
 
 
 class Task(metaclass=ABCMeta):

module/umamusume/asset/point.py

@@ -102,6 +102,9 @@
 
 TO_RECOVER_TP = ClickPoint(ClickPointType.CLICK_POINT_TYPE_COORDINATE, None, Coordinate(520, 830), "回复训练值", None)
 USE_TP_DRINK = ClickPoint(ClickPointType.CLICK_POINT_TYPE_COORDINATE, None, Coordinate(610, 320), "使用tp饮料", None)
+USE_DIAMOND_RECOVER_TP = ClickPoint(ClickPointType.CLICK_POINT_TYPE_COORDINATE, None, Coordinate(610, 180), "使用钻石回复tp", None)
+USE_DIAMOND_RECOVER_TP_ADD = ClickPoint(ClickPointType.CLICK_POINT_TYPE_COORDINATE, None, Coordinate(520, 670), "", None)
 USE_TP_DRINK_CONFIRM = ClickPoint(ClickPointType.CLICK_POINT_TYPE_COORDINATE, None, Coordinate(525, 920), "使用tp饮料-确认", None)
+USE_DIAMOND_RECOVER_CONFIRM = ClickPoint(ClickPointType.CLICK_POINT_TYPE_COORDINATE, None, Coordinate(525, 920), "使用钻石回复tp-确认", None)
 USE_TP_DRINK_RESULT_CLOSE = ClickPoint(ClickPointType.CLICK_POINT_TYPE_COORDINATE, None, Coordinate(360, 835), "回复完成-关闭", None)
 

module/umamusume/asset/template.py

@@ -145,10 +145,14 @@
 
 REF_RECOVER_TP_1 = Template("RECOVER_TP_1", UMAMUSUME_REF_TEMPLATE_PATH)
 REF_RECOVER_TP_2 = Template("RECOVER_TP_2", UMAMUSUME_REF_TEMPLATE_PATH)
+REF_RECOVER_TP_2_DIAMOND = Template("RECOVER_TP_2_DIAMOND", UMAMUSUME_REF_TEMPLATE_PATH)
 REF_RECOVER_TP_3 = Template("RECOVER_TP_3", UMAMUSUME_REF_TEMPLATE_PATH)
+REF_RECOVER_TP_3_DIAMOND = Template("RECOVER_TP_3_DIAMOND", UMAMUSUME_REF_TEMPLATE_PATH)
 
 REF_FACTOR_DETECT_LABEL = Template("FACTOR_DETECT_LABEL", UMAMUSUME_REF_TEMPLATE_PATH)
 
+REF_TP_RECOVER_DRINK = Template("TP_RECOVER_DRINK", UMAMUSUME_REF_TEMPLATE_PATH)
+
 URA_DATE_1 = Template("URA_DATE_1", UMAMUSUME_REF_TEMPLATE_PATH)
 URA_DATE_2 = Template("URA_DATE_2", UMAMUSUME_REF_TEMPLATE_PATH)
 

module/umamusume/context.py

@@ -27,7 +27,7 @@ class CultivateContextDetail:
     learn_skill_only_user_provided: bool
     learn_skill_before_race: bool
     learn_skill_cooldown: int
-    allow_recover_tp: bool
+    allow_recover_tp: int
     parse_factor_done: bool
     extra_weight: list
 

module/umamusume/script/cultivate_task/info.py

@@ -51,6 +51,8 @@
     # 青春杯
     "自动编成",
     "对战确认",
+    # TODO: 重新修改编号方便添加新的title
+    "名人堂优俊少女上限",
 ]
 
 
@@ -139,16 +141,32 @@ def script_info(ctx: UmamusumeContext):
         if title_text == TITLE[25]:
             ctx.ctrl.click_by_point(ACTIVITY_STORY_UNLOCK_CONFIRM)
         if title_text == TITLE[26]:
-            if not ctx.cultivate_detail.allow_recover_tp:
+            if ctx.cultivate_detail.allow_recover_tp == 0: # 不允许用体力药或者钻石
                 ctx.task.end_task(TaskStatus.TASK_STATUS_FAILED, UEndTaskReason.TP_NOT_ENOUGH)
             else:
                 ctx.ctrl.click_by_point(TO_RECOVER_TP)
         if title_text == TITLE[27]:
-            if image_match(ctx.ctrl.get_screen(to_gray=True), REF_RECOVER_TP_1).find_match:
-                ctx.ctrl.click_by_point(USE_TP_DRINK)
-            elif image_match(ctx.ctrl.get_screen(to_gray=True), REF_RECOVER_TP_2).find_match:
+            # 到这里时, 一定已经允许恢复体力了
+            screen = ctx.ctrl.get_screen(to_gray=True)
+            if image_match(screen, REF_RECOVER_TP_1).find_match:
+                if image_match(screen, REF_TP_RECOVER_DRINK).find_match: # 如果还有tp饮料, 就直接喝饮料
+                    ctx.ctrl.click_by_point(USE_TP_DRINK)
+                else:
+                    # TODO: 没有考虑钻石也没了的情况
+                    if ctx.cultivate_detail.allow_recover_tp == 2: # 允许用钻石回复TP
+                        ctx.ctrl.click_by_point(USE_DIAMOND_RECOVER_TP)
+                    else: # 只允许用体力药
+                        # 直接结束任务
+                        ctx.task.end_task(TaskStatus.TASK_STATUS_FAILED, UEndTaskReason.TP_DRINK_NOT_ENOUGH)
+                    
+            elif image_match(screen, REF_RECOVER_TP_2).find_match:
                 ctx.ctrl.click_by_point(USE_TP_DRINK_CONFIRM)
-            elif image_match(ctx.ctrl.get_screen(to_gray=True), REF_RECOVER_TP_3).find_match:
+            elif image_match(screen, REF_RECOVER_TP_2_DIAMOND).find_match:
+                ctx.ctrl.click_by_point(USE_DIAMOND_RECOVER_TP_ADD)
+                time.sleep(2)
+                ctx.ctrl.click_by_point(USE_DIAMOND_RECOVER_CONFIRM)
+            elif image_match(screen, REF_RECOVER_TP_3).find_match or\
+                 image_match(screen, REF_RECOVER_TP_3_DIAMOND).find_match:
                 ctx.ctrl.click_by_point(USE_TP_DRINK_RESULT_CLOSE)
         if title_text == TITLE[28]:
             # 限时: 富士奇石的表演秀
@@ -190,5 +208,7 @@ def script_info(ctx: UmamusumeContext):
         if title_text == TITLE[32]:
             # 确认青春杯对手
             ctx.ctrl.click(520, 920, "确认对战")
+        if title_text == TITLE[33]:
+            ctx.task.end_task(TaskStatus.TASK_STATUS_FAILED, EndTaskReason.UMAMUSUME_HALL_FULL)
         time.sleep(1)
 

module/umamusume/task.py

@@ -17,7 +17,7 @@ class TaskDetail:
     learn_skill_threshold: int
     learn_skill_only_user_provided: bool
     stop_at_skill_learn: bool
-    allow_recover_tp: bool
+    allow_recover_tp: int # 0=仅使用TP(不自动恢复), 1=使用体力药, 2=体力药+钻石
     cultivate_progress_info: dict
     extra_weight: list
     # 剧本相关配置
@@ -29,6 +29,7 @@ class TaskDetail:
 
 class EndTaskReason(Enum):
     TP_NOT_ENOUGH = "训练值不足"
+    TP_DRINK_NOT_ENOUGH = "体力药不足"
     DIFFICULTY_LOCKED = "难度未解锁"
 
 
@@ -65,7 +66,7 @@ def build_task(task_execute_mode: TaskExecuteMode, task_type: int,
     td.learn_skill_threshold = attachment_data['learn_skill_threshold']
     td.learn_skill_only_user_provided = attachment_data['learn_skill_only_user_provided']
     td.stop_at_skill_learn = attachment_data['stop_at_skill_learn']
-    td.allow_recover_tp = attachment_data['allow_recover_tp']
+    td.allow_recover_tp = int(attachment_data['allow_recover_tp'])
     td.extra_weight = attachment_data['extra_weight']
     td.cultivate_result = {}
     # 剧本相关设置

public/assets/index.3757966e.css renamed to public/assets/index.67b15802.css

@@ -8,8 +8,8 @@
     <meta charset="utf-8">
     <meta http-equiv="X-UA-Compatible" content="IE=edge">
     <meta name="viewport" content="width=device-width,initial-scale=1.0">
-    <script type="module" crossorigin src="./assets/index.e7e7ff2c.js"></script>
-    <link rel="stylesheet" href="./assets/index.3757966e.css">
+    <script type="module" crossorigin src="./assets/index.fa80c008.js"></script>
+    <link rel="stylesheet" href="./assets/index.67b15802.css">
   </head>
   <body>
     <div id="app"></div>