feat: 新增 Combat Custom Action

MaaXYZ · Oct 8, 2023 · af8e2ec · af8e2ec
1 parent 9d954f0
commit af8e2ec
Show file tree

Hide file tree

Showing 8 changed files with 434 additions and 1 deletion.
diff --git a/assets/resource/image/Combat/StopCombat.png b/assets/resource/image/Combat/StopCombat.png
diff --git a/source/cli/CMakeLists.txt b/source/cli/CMakeLists.txt
@@ -8,7 +8,7 @@ endif ()
 set(CMAKE_BUILD_TYPE "Release")
 set(CMAKE_CONFIGURATION_TYPES "Release")
 
-add_executable(MAABH3_CLI main.cpp main.h)
+add_executable(MAABH3_CLI main.cpp main.h Combat.h Combat.cpp RegisterCustomAciton.h RegisterCustomAction.cpp)
 target_link_libraries(MAABH3_CLI PRIVATE MaaFramework MaaToolKit)
 
 add_dependencies(MAABH3_CLI AssetsResource)

diff --git a/source/cli/Combat.cpp b/source/cli/Combat.cpp
@@ -0,0 +1,289 @@
+#include "Combat.h"
+
+MaaBool combat_forward(MaaSyncContextHandle sync_context, MaaStringView task_name, MaaStringView custom_action_param,
+                       MaaRectHandle cur_box, MaaStringView cur_rec_detail, MaaTransparentArg arg)
+{
+    task_name;           // silence unreferenced warning
+    custom_action_param; // silence unreferenced warning
+    cur_box;             // silence unreferenced warning
+    cur_rec_detail;      // silence unreferenced warning
+    arg;                 // silence unreferenced warning
+
+    MaaSyncContextRunTask(sync_context, "CombatForward", MaaTaskParam_Empty);
+    return true;
+}
+
+MaaBool combat_backward(MaaSyncContextHandle sync_context, MaaStringView task_name, MaaStringView custom_action_param,
+                        MaaRectHandle cur_box, MaaStringView cur_rec_detail, MaaTransparentArg arg)
+{
+    task_name;           // silence unreferenced warning
+    custom_action_param; // silence unreferenced warning
+    cur_box;             // silence unreferenced warning
+    cur_rec_detail;      // silence unreferenced warning
+    arg;                 // silence unreferenced warning
+
+    MaaSyncContextRunTask(sync_context, "CombatBackward", MaaTaskParam_Empty);
+    return true;
+}
+
+MaaBool combat_left(MaaSyncContextHandle sync_context, MaaStringView task_name, MaaStringView custom_action_param,
+                    MaaRectHandle cur_box, MaaStringView cur_rec_detail, MaaTransparentArg arg)
+{
+    task_name;           // silence unreferenced warning
+    custom_action_param; // silence unreferenced warning
+    cur_box;             // silence unreferenced warning
+    cur_rec_detail;      // silence unreferenced warning
+    arg;                 // silence unreferenced warning
+
+    MaaSyncContextRunTask(sync_context, "CombatLeft", MaaTaskParam_Empty);
+    return true;
+}
+
+MaaBool combat_right(MaaSyncContextHandle sync_context, MaaStringView task_name, MaaStringView custom_action_param,
+                     MaaRectHandle cur_box, MaaStringView cur_rec_detail, MaaTransparentArg arg)
+{
+    task_name;           // silence unreferenced warning
+    custom_action_param; // silence unreferenced warning
+    cur_box;             // silence unreferenced warning
+    cur_rec_detail;      // silence unreferenced warning
+    arg;                 // silence unreferenced warning
+
+    MaaSyncContextRunTask(sync_context, "CombatRight", MaaTaskParam_Empty);
+    return true;
+}
+
+MaaBool combat_left_forward(MaaSyncContextHandle sync_context, MaaStringView task_name,
+                            MaaStringView custom_action_param, MaaRectHandle cur_box, MaaStringView cur_rec_detail,
+                            MaaTransparentArg arg)
+{
+    task_name;           // silence unreferenced warning
+    custom_action_param; // silence unreferenced warning
+    cur_box;             // silence unreferenced warning
+    cur_rec_detail;      // silence unreferenced warning
+    arg;                 // silence unreferenced warning
+
+    MaaSyncContextRunTask(sync_context, "CombatLeftForward", MaaTaskParam_Empty);
+    return true;
+}
+
+MaaBool combat_right_forward(MaaSyncContextHandle sync_context, MaaStringView task_name,
+                             MaaStringView custom_action_param, MaaRectHandle cur_box, MaaStringView cur_rec_detail,
+                             MaaTransparentArg arg)
+{
+    task_name;           // silence unreferenced warning
+    custom_action_param; // silence unreferenced warning
+    cur_box;             // silence unreferenced warning
+    cur_rec_detail;      // silence unreferenced warning
+    arg;                 // silence unreferenced warning
+
+    MaaSyncContextRunTask(sync_context, "CombatRightForward", MaaTaskParam_Empty);
+    return true;
+}
+
+MaaBool combat_left_backward(MaaSyncContextHandle sync_context, MaaStringView task_name,
+                             MaaStringView custom_action_param, MaaRectHandle cur_box, MaaStringView cur_rec_detail,
+                             MaaTransparentArg arg)
+{
+    task_name;           // silence unreferenced warning
+    custom_action_param; // silence unreferenced warning
+    cur_box;             // silence unreferenced warning
+    cur_rec_detail;      // silence unreferenced warning
+    arg;                 // silence unreferenced warning
+
+    MaaSyncContextRunTask(sync_context, "CombatLeftBackward", MaaTaskParam_Empty);
+    return true;
+}
+
+MaaBool combat_right_backward(MaaSyncContextHandle sync_context, MaaStringView task_name,
+                              MaaStringView custom_action_param, MaaRectHandle cur_box, MaaStringView cur_rec_detail,
+                              MaaTransparentArg arg)
+{
+    task_name;           // silence unreferenced warning
+    custom_action_param; // silence unreferenced warning
+    cur_box;             // silence unreferenced warning
+    cur_rec_detail;      // silence unreferenced warning
+    arg;                 // silence unreferenced warning
+
+    MaaSyncContextRunTask(sync_context, "CombatRightBackward", MaaTaskParam_Empty);
+    return true;
+}
+
+MaaBool combat_basic_ATK(MaaSyncContextHandle sync_context, MaaStringView task_name, MaaStringView custom_action_param,
+                         MaaRectHandle cur_box, MaaStringView cur_rec_detail, MaaTransparentArg arg)
+{
+    task_name;           // silence unreferenced warning
+    custom_action_param; // silence unreferenced warning
+    cur_box;             // silence unreferenced warning
+    cur_rec_detail;      // silence unreferenced warning
+    arg;                 // silence unreferenced warning
+
+    MaaSyncContextRunTask(sync_context, "CombatBasicATK", MaaTaskParam_Empty);
+    return true;
+}
+
+MaaBool combat_basic_ATK_charge_base(MaaSyncContextHandle sync_context, MaaStringView task_name,
+                                MaaStringView custom_action_param, MaaRectHandle cur_box, MaaStringView cur_rec_detail,
+                                MaaTransparentArg arg)
+{
+    task_name;           // silence unreferenced warning
+    custom_action_param; // silence unreferenced warning
+    cur_box;             // silence unreferenced warning
+    cur_rec_detail;      // silence unreferenced warning
+    arg;                 // silence unreferenced warning
+
+    std::random_device rd;
+    std::mt19937 rng(rd());
+    std::uniform_int_distribution<int32_t> unix(1146, 1228);
+    std::uniform_int_distribution<int32_t> uniy(606, 670);
+    int32_t x = unix(rng);
+    int32_t y = uniy(rng);
+
+    MaaSyncContextTouchDown(sync_context, 0, x, y, 0);
+    std::this_thread::sleep_for(std::chrono::milliseconds(1000));
+    MaaSyncContextTouchUp(sync_context, 0);
+    return true;
+}
+
+MaaBool combat_basic_ATK_charge(MaaSyncContextHandle sync_context, MaaStringView task_name,
+                                     MaaStringView custom_action_param, MaaRectHandle cur_box,
+                                     MaaStringView cur_rec_detail, MaaTransparentArg arg)
+{
+    task_name;           // silence unreferenced warning
+    custom_action_param; // silence unreferenced warning
+    cur_box;             // silence unreferenced warning
+    cur_rec_detail;      // silence unreferenced warning
+    arg;                 // silence unreferenced warning
+
+    MaaSyncContextRunTask(sync_context, "CombatBasicATKCharge", MaaTaskParam_Empty);
+    return true;
+}
+
+MaaBool combat_evade(MaaSyncContextHandle sync_context, MaaStringView task_name, MaaStringView custom_action_param,
+                     MaaRectHandle cur_box, MaaStringView cur_rec_detail, MaaTransparentArg arg)
+{
+    task_name;           // silence unreferenced warning
+    custom_action_param; // silence unreferenced warning
+    cur_box;             // silence unreferenced warning
+    cur_rec_detail;      // silence unreferenced warning
+    arg;                 // silence unreferenced warning
+
+    MaaSyncContextRunTask(sync_context, "CombatEvade", MaaTaskParam_Empty);
+    return true;
+}
+
+MaaBool combat_ultimate(MaaSyncContextHandle sync_context, MaaStringView task_name, MaaStringView custom_action_param,
+                        MaaRectHandle cur_box, MaaStringView cur_rec_detail, MaaTransparentArg arg)
+{
+    task_name;           // silence unreferenced warning
+    custom_action_param; // silence unreferenced warning
+    cur_box;             // silence unreferenced warning
+    cur_rec_detail;      // silence unreferenced warning
+    arg;                 // silence unreferenced warning
+
+    MaaSyncContextRunTask(sync_context, "CombatUltimate", MaaTaskParam_Empty);
+    return true;
+}
+
+MaaBool combat_ultimate_charge_base(MaaSyncContextHandle sync_context, MaaStringView task_name,
+                                    MaaStringView custom_action_param, MaaRectHandle cur_box,
+                                    MaaStringView cur_rec_detail, MaaTransparentArg arg)
+{
+    task_name;           // silence unreferenced warning
+    custom_action_param; // silence unreferenced warning
+    cur_box;             // silence unreferenced warning
+    cur_rec_detail;      // silence unreferenced warning
+    arg;                 // silence unreferenced warning
+
+    std::random_device rd;
+    std::mt19937 rng(rd());
+    std::uniform_int_distribution<int32_t> unix(1145, 1227);
+    std::uniform_int_distribution<int32_t> uniy(424, 498);
+    int32_t x = unix(rng);
+    int32_t y = uniy(rng);
+
+    MaaSyncContextTouchDown(sync_context, 0, x, y, 0);
+    std::this_thread::sleep_for(std::chrono::milliseconds(1000));
+    MaaSyncContextTouchUp(sync_context, 0);
+    return true;
+}
+
+MaaBool combat_ultimate_charge(MaaSyncContextHandle sync_context, MaaStringView task_name,
+                               MaaStringView custom_action_param, MaaRectHandle cur_box, MaaStringView cur_rec_detail,
+                               MaaTransparentArg arg)
+{
+    task_name;           // silence unreferenced warning
+    custom_action_param; // silence unreferenced warning
+    cur_box;             // silence unreferenced warning
+    cur_rec_detail;      // silence unreferenced warning
+    arg;                 // silence unreferenced warning
+
+    MaaSyncContextRunTask(sync_context, "CombatUltimateCharge", MaaTaskParam_Empty);
+    return true;
+}
+
+MaaBool combat_weapon_skill(MaaSyncContextHandle sync_context, MaaStringView task_name,
+                            MaaStringView custom_action_param, MaaRectHandle cur_box, MaaStringView cur_rec_detail,
+                            MaaTransparentArg arg)
+{
+    task_name;           // silence unreferenced warning
+    custom_action_param; // silence unreferenced warning
+    cur_box;             // silence unreferenced warning
+    cur_rec_detail;      // silence unreferenced warning
+    arg;                 // silence unreferenced warning
+
+    MaaSyncContextRunTask(sync_context, "CombatWeaponSkill", MaaTaskParam_Empty);
+    return true;
+}
+
+MaaBool combat_ELF_skill(MaaSyncContextHandle sync_context, MaaStringView task_name, MaaStringView custom_action_param,
+                         MaaRectHandle cur_box, MaaStringView cur_rec_detail, MaaTransparentArg arg)
+{
+    task_name;           // silence unreferenced warning
+    custom_action_param; // silence unreferenced warning
+    cur_box;             // silence unreferenced warning
+    cur_rec_detail;      // silence unreferenced warning
+    arg;                 // silence unreferenced warning
+
+    MaaSyncContextRunTask(sync_context, "CombatELFSkill", MaaTaskParam_Empty);
+    return true;
+}
+
+MaaBool combat_extra_skill(MaaSyncContextHandle sync_context, MaaStringView task_name,
+                           MaaStringView custom_action_param, MaaRectHandle cur_box, MaaStringView cur_rec_detail,
+                           MaaTransparentArg arg)
+{
+    task_name;           // silence unreferenced warning
+    custom_action_param; // silence unreferenced warning
+    cur_box;             // silence unreferenced warning
+    cur_rec_detail;      // silence unreferenced warning
+    arg;                 // silence unreferenced warning
+
+    MaaSyncContextRunTask(sync_context, "CombatExtraSkill", MaaTaskParam_Empty);
+    return true;
+}
+
+MaaBool combat_QTE1(MaaSyncContextHandle sync_context, MaaStringView task_name, MaaStringView custom_action_param,
+                    MaaRectHandle cur_box, MaaStringView cur_rec_detail, MaaTransparentArg arg)
+{
+    task_name;           // silence unreferenced warning
+    custom_action_param; // silence unreferenced warning
+    cur_box;             // silence unreferenced warning
+    cur_rec_detail;      // silence unreferenced warning
+    arg;                 // silence unreferenced warning
+
+    MaaSyncContextRunTask(sync_context, "CombatQTE1", MaaTaskParam_Empty);
+    return true;
+}
+
+MaaBool combat_QTE2(MaaSyncContextHandle sync_context, MaaStringView task_name, MaaStringView custom_action_param,
+                    MaaRectHandle cur_box, MaaStringView cur_rec_detail, MaaTransparentArg arg)
+{
+    task_name;           // silence unreferenced warning
+    custom_action_param; // silence unreferenced warning
+    cur_box;             // silence unreferenced warning
+    cur_rec_detail;      // silence unreferenced warning
+    arg;                 // silence unreferenced warning
+
+    MaaSyncContextRunTask(sync_context, "CombatQTE2", MaaTaskParam_Empty);
+    return true;
+}
diff --git a/source/cli/Combat.h b/source/cli/Combat.h
@@ -0,0 +1,59 @@
+#pragma once
+
+#include <chrono>
+#include <random>
+#include <thread>
+
+#include "MaaFramework/Task/MaaSyncContext.h"
+
+MaaBool combat_forward(MaaSyncContextHandle sync_context, MaaStringView task_name, MaaStringView custom_action_param,
+                       MaaRectHandle cur_box, MaaStringView cur_rec_detail, MaaTransparentArg arg);
+MaaBool combat_backward(MaaSyncContextHandle sync_context, MaaStringView task_name, MaaStringView custom_action_param,
+                        MaaRectHandle cur_box, MaaStringView cur_rec_detail, MaaTransparentArg arg);
+MaaBool combat_left(MaaSyncContextHandle sync_context, MaaStringView task_name, MaaStringView custom_action_param,
+                    MaaRectHandle cur_box, MaaStringView cur_rec_detail, MaaTransparentArg arg);
+MaaBool combat_right(MaaSyncContextHandle sync_context, MaaStringView task_name, MaaStringView custom_action_param,
+                     MaaRectHandle cur_box, MaaStringView cur_rec_detail, MaaTransparentArg arg);
+MaaBool combat_left_forward(MaaSyncContextHandle sync_context, MaaStringView task_name,
+                            MaaStringView custom_action_param, MaaRectHandle cur_box, MaaStringView cur_rec_detail,
+                            MaaTransparentArg arg);
+MaaBool combat_right_forward(MaaSyncContextHandle sync_context, MaaStringView task_name,
+                             MaaStringView custom_action_param, MaaRectHandle cur_box, MaaStringView cur_rec_detail,
+                             MaaTransparentArg arg);
+MaaBool combat_left_backward(MaaSyncContextHandle sync_context, MaaStringView task_name,
+                             MaaStringView custom_action_param, MaaRectHandle cur_box, MaaStringView cur_rec_detail,
+                             MaaTransparentArg arg);
+MaaBool combat_right_backward(MaaSyncContextHandle sync_context, MaaStringView task_name,
+                              MaaStringView custom_action_param, MaaRectHandle cur_box, MaaStringView cur_rec_detail,
+                              MaaTransparentArg arg);
+
+MaaBool combat_basic_ATK(MaaSyncContextHandle sync_context, MaaStringView task_name, MaaStringView custom_action_param,
+                         MaaRectHandle cur_box, MaaStringView cur_rec_detail, MaaTransparentArg arg);
+MaaBool combat_basic_ATK_charge_base(MaaSyncContextHandle sync_context, MaaStringView task_name,
+                                     MaaStringView custom_action_param, MaaRectHandle cur_box,
+                                     MaaStringView cur_rec_detail, MaaTransparentArg arg);
+MaaBool combat_basic_ATK_charge(MaaSyncContextHandle sync_context, MaaStringView task_name,
+                                MaaStringView custom_action_param, MaaRectHandle cur_box, MaaStringView cur_rec_detail,
+                                MaaTransparentArg arg);
+MaaBool combat_evade(MaaSyncContextHandle sync_context, MaaStringView task_name, MaaStringView custom_action_param,
+                     MaaRectHandle cur_box, MaaStringView cur_rec_detail, MaaTransparentArg arg);
+MaaBool combat_ultimate(MaaSyncContextHandle sync_context, MaaStringView task_name, MaaStringView custom_action_param,
+                        MaaRectHandle cur_box, MaaStringView cur_rec_detail, MaaTransparentArg arg);
+MaaBool combat_ultimate_charge_base(MaaSyncContextHandle sync_context, MaaStringView task_name,
+                                    MaaStringView custom_action_param, MaaRectHandle cur_box,
+                                    MaaStringView cur_rec_detail, MaaTransparentArg arg);
+MaaBool combat_ultimate_charge(MaaSyncContextHandle sync_context, MaaStringView task_name,
+                               MaaStringView custom_action_param, MaaRectHandle cur_box, MaaStringView cur_rec_detail,
+                               MaaTransparentArg arg);
+MaaBool combat_weapon_skill(MaaSyncContextHandle sync_context, MaaStringView task_name,
+                            MaaStringView custom_action_param, MaaRectHandle cur_box, MaaStringView cur_rec_detail,
+                            MaaTransparentArg arg);
+MaaBool combat_ELF_skill(MaaSyncContextHandle sync_context, MaaStringView task_name, MaaStringView custom_action_param,
+                         MaaRectHandle cur_box, MaaStringView cur_rec_detail, MaaTransparentArg arg);
+MaaBool combat_extra_skill(MaaSyncContextHandle sync_context, MaaStringView task_name,
+                           MaaStringView custom_action_param, MaaRectHandle cur_box, MaaStringView cur_rec_detail,
+                           MaaTransparentArg arg);
+MaaBool combat_QTE1(MaaSyncContextHandle sync_context, MaaStringView task_name, MaaStringView custom_action_param,
+                    MaaRectHandle cur_box, MaaStringView cur_rec_detail, MaaTransparentArg arg);
+MaaBool combat_QTE2(MaaSyncContextHandle sync_context, MaaStringView task_name, MaaStringView custom_action_param,
+                    MaaRectHandle cur_box, MaaStringView cur_rec_detail, MaaTransparentArg arg);
diff --git a/source/cli/RegisterCustomAciton.h b/source/cli/RegisterCustomAciton.h
@@ -0,0 +1,9 @@
+#pragma once
+
+#include "MaaFramework/Instance/MaaInstance.h"
+#include "MaaFramework/Task/MaaCustomAction.h"
+#include "Combat.h"
+
+void custom_action_init();
+
+void register_custom_action(MaaInstanceHandle maa_handle);