From 7353abd4e2be517d1597359efe4d1aa649933d64 Mon Sep 17 00:00:00 2001
From: MistEO <mistereo@hotmail.com>
Date: Sun, 8 Jan 2023 22:07:04 +0800
Subject: [PATCH] =?UTF-8?q?feat:=20=E7=AE=80=E5=8D=95=E6=94=AF=E6=8C=81?=
 =?UTF-8?q?=E4=BA=86=E4=B8=8B=E4=BF=9D=E5=85=A8=E5=BC=80=E5=B1=80=E8=B7=B3?=
 =?UTF-8?q?=E8=BF=87=E6=8D=A2=E4=BA=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 resource/tasks.json                            |   9 +++++++++
 resource/template/SSSFightDirectly.png         | Bin 0 -> 3022 bytes
 src/MaaCore/Task/BattleHelper.h                |   2 +-
 .../Miscellaneous/SSSBattleProcessTask.cpp     |  17 ++++++++++++++---
 .../Task/Miscellaneous/SSSBattleProcessTask.h  |   3 ++-
 5 files changed, 26 insertions(+), 5 deletions(-)
 create mode 100644 resource/template/SSSFightDirectly.png

diff --git a/resource/tasks.json b/resource/tasks.json
index 7357d756bc..95ee67c1d0 100644
--- a/resource/tasks.json
+++ b/resource/tasks.json
@@ -9529,6 +9529,15 @@
             144
         ]
     },
+    "SSSFightDirectly": {
+        "action": "ClickSelf",
+        "roi": [
+            1052,
+            360,
+            154,
+            144
+        ]
+    },
     "SSSDrawCard": {
         "action": "ClickSelf",
         "roi": [
diff --git a/resource/template/SSSFightDirectly.png b/resource/template/SSSFightDirectly.png
new file mode 100644
index 0000000000000000000000000000000000000000..eb9bd13bd0c993714e5d63adaffc01e98d939469
GIT binary patch
literal 3022
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

literal 0
HcmV?d00001

diff --git a/src/MaaCore/Task/BattleHelper.h b/src/MaaCore/Task/BattleHelper.h
index 9ce41741a5..715c93d2fc 100644
--- a/src/MaaCore/Task/BattleHelper.h
+++ b/src/MaaCore/Task/BattleHelper.h
@@ -49,7 +49,7 @@ namespace asst
         bool use_skill(const std::string& name, bool keep_waiting = true);
         bool use_skill(const Point& loc, bool keep_waiting = true);
         bool check_pause_button();
-        bool wait_until_start();
+        virtual bool wait_until_start();
         bool wait_until_end();
         bool use_all_ready_skill(const cv::Mat& reusable = cv::Mat());
         bool check_and_use_skill(const std::string& name, const cv::Mat& reusable = cv::Mat());
diff --git a/src/MaaCore/Task/Miscellaneous/SSSBattleProcessTask.cpp b/src/MaaCore/Task/Miscellaneous/SSSBattleProcessTask.cpp
index 833bcc1651..5a196a70d0 100644
--- a/src/MaaCore/Task/Miscellaneous/SSSBattleProcessTask.cpp
+++ b/src/MaaCore/Task/Miscellaneous/SSSBattleProcessTask.cpp
@@ -39,7 +39,7 @@ bool asst::SSSBattleProcessTask::do_derived_action(size_t action_index)
 
     switch (action.type) {
     case battle::copilot::ActionType::DrawCard:
-        return draw_card();
+        return draw_card(true);
     case battle::copilot::ActionType::CheckIfStartOver:
         return check_if_start_over(action);
     default:
@@ -112,6 +112,13 @@ bool asst::SSSBattleProcessTask::do_strategic_action(const cv::Mat& reusable)
     return true;
 }
 
+bool asst::SSSBattleProcessTask::wait_until_start()
+{
+    LogTraceFunction;
+
+    return ProcessTask(*this, { "SSSFightDirectly" }).set_retry_times(300).run();
+}
+
 bool asst::SSSBattleProcessTask::check_if_start_over(const battle::copilot::Action& action)
 {
     LogTraceFunction;
@@ -143,7 +150,11 @@ bool asst::SSSBattleProcessTask::check_if_start_over(const battle::copilot::Acti
     return true;
 }
 
-bool asst::SSSBattleProcessTask::draw_card()
+bool asst::SSSBattleProcessTask::draw_card(bool with_retry)
 {
-    return ProcessTask(*this, { "SSSDrawCard" }).run();
+    ProcessTask task(*this, { "SSSDrawCard" });
+    if (!with_retry) {
+        task.set_retry_times(0);
+    }
+    return task.run();
 }
diff --git a/src/MaaCore/Task/Miscellaneous/SSSBattleProcessTask.h b/src/MaaCore/Task/Miscellaneous/SSSBattleProcessTask.h
index ad37399796..ee990c6419 100644
--- a/src/MaaCore/Task/Miscellaneous/SSSBattleProcessTask.h
+++ b/src/MaaCore/Task/Miscellaneous/SSSBattleProcessTask.h
@@ -17,9 +17,10 @@ namespace asst
         virtual battle::copilot::CombatData& get_combat_data() { return m_sss_combat_data; }
         virtual const std::string oper_name_ocr_task_name() const noexcept { return "SSSBattleOperName"; }
         virtual bool need_to_wait_until_end() const { return true; }
+        virtual bool wait_until_start() override;
 
         bool check_if_start_over(const battle::copilot::Action& action);
-        bool draw_card();
+        bool draw_card(bool with_retry = true);
 
         battle::sss::CombatData m_sss_combat_data;
         std::unordered_set<std::string> m_all_cores;