From b7a34aa4dd2f4703851432c3bbf246eea9db8c0e Mon Sep 17 00:00:00 2001 From: zzyyyl Date: Sat, 28 Oct 2023 14:24:32 +0800 Subject: [PATCH] style: format --- src/MaaCore/Config/ResourceLoader.cpp | 2 +- src/MaaCore/Config/Roguelike/RoguelikeFoldartalConfig.h | 8 +++----- src/MaaCore/Task/Interface/RoguelikeTask.cpp | 3 +-- .../Task/Roguelike/RoguelikeFoldartalGainTaskPlugin.cpp | 7 +++---- .../Task/Roguelike/RoguelikeFoldartalUseTaskPlugin.cpp | 6 ++---- .../Task/Roguelike/RoguelikeShoppingTaskPlugin.cpp | 6 +++--- 6 files changed, 13 insertions(+), 19 deletions(-) diff --git a/src/MaaCore/Config/ResourceLoader.cpp b/src/MaaCore/Config/ResourceLoader.cpp index f276cceb71..c1e39ff230 100644 --- a/src/MaaCore/Config/ResourceLoader.cpp +++ b/src/MaaCore/Config/ResourceLoader.cpp @@ -15,8 +15,8 @@ #include "Miscellaneous/StageDropsConfig.h" #include "Miscellaneous/TilePack.h" #include "OnnxSessions.h" -#include "Roguelike/RoguelikeFoldartalConfig.h" #include "Roguelike/RoguelikeCopilotConfig.h" +#include "Roguelike/RoguelikeFoldartalConfig.h" #include "Roguelike/RoguelikeRecruitConfig.h" #include "Roguelike/RoguelikeShoppingConfig.h" #include "Roguelike/RoguelikeStageEncounterConfig.h" diff --git a/src/MaaCore/Config/Roguelike/RoguelikeFoldartalConfig.h b/src/MaaCore/Config/Roguelike/RoguelikeFoldartalConfig.h index 185772d4fa..0bee73a4b4 100644 --- a/src/MaaCore/Config/Roguelike/RoguelikeFoldartalConfig.h +++ b/src/MaaCore/Config/Roguelike/RoguelikeFoldartalConfig.h @@ -16,12 +16,11 @@ namespace asst }; struct RoguelikeFoldartalCombination { - std::string usage; // 适用的节点类型和用法 + std::string usage; // 适用的节点类型和用法 std::vector pairs; // 适用的板子组合 }; - class RoguelikeFoldartalConfig final : public SingletonHolder, - public AbstractConfig + class RoguelikeFoldartalConfig final : public SingletonHolder, public AbstractConfig { public: virtual ~RoguelikeFoldartalConfig() override = default; @@ -34,8 +33,7 @@ namespace asst private: virtual bool parse(const json::value& json) override; - std::unordered_map> - m_foldartal_combination; + std::unordered_map> m_foldartal_combination; }; inline static auto& RoguelikeFoldartal = RoguelikeFoldartalConfig::get_instance(); diff --git a/src/MaaCore/Task/Interface/RoguelikeTask.cpp b/src/MaaCore/Task/Interface/RoguelikeTask.cpp index b97097c4b0..54c8e30c94 100644 --- a/src/MaaCore/Task/Interface/RoguelikeTask.cpp +++ b/src/MaaCore/Task/Interface/RoguelikeTask.cpp @@ -53,8 +53,7 @@ asst::RoguelikeTask::RoguelikeTask(const AsstCallback& callback, Assistant* inst m_difficulty_selection_plugin_ptr = m_roguelike_task_ptr->register_plugin(); m_strategy_change_plugin_ptr = m_roguelike_task_ptr->register_plugin(); - m_foldartal_gain_plugin_ptr = - m_roguelike_task_ptr->register_plugin(); + m_foldartal_gain_plugin_ptr = m_roguelike_task_ptr->register_plugin(); m_foldartal_use_plugin_ptr = m_roguelike_task_ptr->register_plugin(); // 这个任务如果卡住会放弃当前的肉鸽并重新开始，所以多添加一点。先这样凑合用 diff --git a/src/MaaCore/Task/Roguelike/RoguelikeFoldartalGainTaskPlugin.cpp b/src/MaaCore/Task/Roguelike/RoguelikeFoldartalGainTaskPlugin.cpp index 4f390ace4b..2678a162cd 100644 --- a/src/MaaCore/Task/Roguelike/RoguelikeFoldartalGainTaskPlugin.cpp +++ b/src/MaaCore/Task/Roguelike/RoguelikeFoldartalGainTaskPlugin.cpp @@ -75,8 +75,7 @@ bool asst::RoguelikeFoldartalGainTaskPlugin::_run() std::string foldartal_last_floor = (foldartal_floor_array.end() - 2)->to_string(); if (foldartal_last_floor.size() >= 2 && foldartal_last_floor.front() == '"' && foldartal_last_floor.back() == '"') { - foldartal_last_floor = - foldartal_last_floor.substr(1, foldartal_last_floor.size() - 2); + foldartal_last_floor = foldartal_last_floor.substr(1, foldartal_last_floor.size() - 2); } if (foldartal_last_floor != "None") { store_to_status(foldartal_last_floor, Status::RoguelikeFoldartalOverview); @@ -85,8 +84,8 @@ bool asst::RoguelikeFoldartalGainTaskPlugin::_run() return true; }; - std::string task_name = m_ocr_after_combat ? theme + "@Roguelike@FoldartalGainOcrAfterCombat" - : theme + "@Roguelike@FoldartalGainOcr"; + std::string task_name = + m_ocr_after_combat ? theme + "@Roguelike@FoldartalGainOcrAfterCombat" : theme + "@Roguelike@FoldartalGainOcr"; analyzer.set_task_info(task_name); if (!analyzer.analyze()) { diff --git a/src/MaaCore/Task/Roguelike/RoguelikeFoldartalUseTaskPlugin.cpp b/src/MaaCore/Task/Roguelike/RoguelikeFoldartalUseTaskPlugin.cpp index 6ac7373295..75c3bda87b 100644 --- a/src/MaaCore/Task/Roguelike/RoguelikeFoldartalUseTaskPlugin.cpp +++ b/src/MaaCore/Task/Roguelike/RoguelikeFoldartalUseTaskPlugin.cpp @@ -75,8 +75,7 @@ bool asst::RoguelikeFoldartalUseTaskPlugin::_run() std::string theme = m_roguelike_theme; - std::vector combination = - RoguelikeFoldartal.get_combination(m_roguelike_theme); + std::vector combination = RoguelikeFoldartal.get_combination(m_roguelike_theme); std::string overview_str = status()->get_str(Status::RoguelikeFoldartalOverview).value_or(json::value().to_string()); @@ -225,8 +224,7 @@ void asst::RoguelikeFoldartalUseTaskPlugin::swipe_to_top() void asst::RoguelikeFoldartalUseTaskPlugin::slowly_swipe(bool to_up, int swipe_dist) { - std::string swipe_task_name = - to_up ? "RoguelikeFoldartalSlowlySwipeToTheUp" : "RoguelikeFoldartalSwipeToTheDown"; + std::string swipe_task_name = to_up ? "RoguelikeFoldartalSlowlySwipeToTheUp" : "RoguelikeFoldartalSwipeToTheDown"; if (!ControlFeat::support(ctrler()->support_features(), ControlFeat::PRECISE_SWIPE)) { // 不能精准滑动时不使用 swipe_dist 参数 ProcessTask(*this, { swipe_task_name }).run(); diff --git a/src/MaaCore/Task/Roguelike/RoguelikeShoppingTaskPlugin.cpp b/src/MaaCore/Task/Roguelike/RoguelikeShoppingTaskPlugin.cpp index fb4c33948d..9fd2e7fcf9 100644 --- a/src/MaaCore/Task/Roguelike/RoguelikeShoppingTaskPlugin.cpp +++ b/src/MaaCore/Task/Roguelike/RoguelikeShoppingTaskPlugin.cpp @@ -105,9 +105,9 @@ bool asst::RoguelikeShoppingTaskPlugin::_run() bool bought = false; auto& all_goods = RoguelikeShopping.get_goods(m_roguelike_theme); - std::vector all_foldartal = - m_roguelike_theme == "Sami" ? Task.get("Sami@Roguelike@FoldartalGainOcr")->text - : std::vector(); + std::vector all_foldartal = m_roguelike_theme == "Sami" + ? Task.get("Sami@Roguelike@FoldartalGainOcr")->text + : std::vector(); for (const auto& goods : all_goods) { if (need_exit()) { return false;