From be55fac195196a63d1edd92d13f4f46e946800d8 Mon Sep 17 00:00:00 2001
From: Horror Proton <107091537+horror-proton@users.noreply.github.com>
Date: Sat, 7 Jan 2023 20:30:27 +0800
Subject: [PATCH] chore: fix typos

---
 src/MaaCore/Task/BattleHelper.cpp                    | 12 ++++++------
 src/MaaCore/Task/BattleHelper.h                      |  6 +++---
 src/MaaCore/Task/Miscellaneous/BattleProcessTask.cpp |  2 +-
 .../Task/Roguelike/RoguelikeRecruitTaskPlugin.cpp    |  4 ++--
 4 files changed, 12 insertions(+), 12 deletions(-)

diff --git a/src/MaaCore/Task/BattleHelper.cpp b/src/MaaCore/Task/BattleHelper.cpp
index db57492eb6..40b050c7ff 100644
--- a/src/MaaCore/Task/BattleHelper.cpp
+++ b/src/MaaCore/Task/BattleHelper.cpp
@@ -363,7 +363,7 @@ bool asst::BattleHelper::retreat_oper(const Point& loc, bool manually)
 {
     LogTraceFunction;
 
-    if (!click_oper_on_battlefiled(loc) || !click_retreat()) {
+    if (!click_oper_on_battlefield(loc) || !click_retreat()) {
         return false;
     }
 
@@ -391,7 +391,7 @@ bool asst::BattleHelper::use_skill(const Point& loc, bool keep_waiting)
 {
     LogTraceFunction;
 
-    return click_oper_on_battlefiled(loc) && click_skill(keep_waiting);
+    return click_oper_on_battlefield(loc) && click_skill(keep_waiting);
 }
 
 bool asst::BattleHelper::check_pause_button()
@@ -513,7 +513,7 @@ bool asst::BattleHelper::click_oper_on_deployment(const Rect& rect)
     return true;
 }
 
-bool asst::BattleHelper::click_oper_on_battlefiled(const std::string& name)
+bool asst::BattleHelper::click_oper_on_battlefield(const std::string& name)
 {
     LogTraceFunction;
 
@@ -522,10 +522,10 @@ bool asst::BattleHelper::click_oper_on_battlefiled(const std::string& name)
         Log.error("No oper", name);
         return false;
     }
-    return click_oper_on_battlefiled(oper_iter->second);
+    return click_oper_on_battlefield(oper_iter->second);
 }
 
-bool asst::BattleHelper::click_oper_on_battlefiled(const Point& loc)
+bool asst::BattleHelper::click_oper_on_battlefield(const Point& loc)
 {
     LogTraceFunction;
 
@@ -575,7 +575,7 @@ bool asst::BattleHelper::cancel_oper_selection()
     return ProcessTask(this_task(), { "BattleCancelSelection" }).run();
 }
 
-bool asst::BattleHelper::is_name_invaild(const std::string& name)
+bool asst::BattleHelper::is_name_invalid(const std::string& name)
 {
     return BattleData.get_location_type(name) == battle::LocationType::Invalid;
 }
diff --git a/src/MaaCore/Task/BattleHelper.h b/src/MaaCore/Task/BattleHelper.h
index d22b1a1d61..512a4ba093 100644
--- a/src/MaaCore/Task/BattleHelper.h
+++ b/src/MaaCore/Task/BattleHelper.h
@@ -55,13 +55,13 @@ namespace asst
 
         bool click_oper_on_deployment(const std::string& name);
         bool click_oper_on_deployment(const Rect& rect);
-        bool click_oper_on_battlefiled(const std::string& name);
-        bool click_oper_on_battlefiled(const Point& loc);
+        bool click_oper_on_battlefield(const std::string& name);
+        bool click_oper_on_battlefield(const Point& loc);
         bool click_retreat();                       // 这个是不带识别的，直接点
         bool click_skill(bool keep_waiting = true); // 这个是带识别的，转好了才点
         bool cancel_oper_selection();
 
-        bool is_name_invaild(const std::string& name);
+        bool is_name_invalid(const std::string& name);
 
         std::optional<Rect> get_oper_rect_on_deployment(const std::string& name) const;
 
diff --git a/src/MaaCore/Task/Miscellaneous/BattleProcessTask.cpp b/src/MaaCore/Task/Miscellaneous/BattleProcessTask.cpp
index 1018cf59c0..70c701e6a5 100644
--- a/src/MaaCore/Task/Miscellaneous/BattleProcessTask.cpp
+++ b/src/MaaCore/Task/Miscellaneous/BattleProcessTask.cpp
@@ -322,7 +322,7 @@ bool asst::BattleProcessTask::enter_bullet_time_for_next_action(size_t next_inde
 
     case ActionType::UseSkill:
     case ActionType::Retreat:
-        ret = location.empty() ? click_oper_on_battlefiled(name) : click_oper_on_battlefiled(location);
+        ret = location.empty() ? click_oper_on_battlefield(name) : click_oper_on_battlefield(location);
         break;
 
     default:
diff --git a/src/MaaCore/Task/Roguelike/RoguelikeRecruitTaskPlugin.cpp b/src/MaaCore/Task/Roguelike/RoguelikeRecruitTaskPlugin.cpp
index c3da84b04c..dad41785ec 100644
--- a/src/MaaCore/Task/Roguelike/RoguelikeRecruitTaskPlugin.cpp
+++ b/src/MaaCore/Task/Roguelike/RoguelikeRecruitTaskPlugin.cpp
@@ -427,11 +427,11 @@ bool asst::RoguelikeRecruitTaskPlugin::check_support_char(const std::string& nam
                 auto& chars_page = analyzer_char.get_result_char();
 
                 bool use_nonfriend_support = get_status_bool(Status::RoguelikeUseNonfriendSupport);
-                auto check_satisfiy = [&use_nonfriend_support](const RecruitSupportCharInfo& chara) {
+                auto check_satisfy = [&use_nonfriend_support](const RecruitSupportCharInfo& chara) {
                     return chara.is_friend || use_nonfriend_support;
                 };
                 std::copy_if(chars_page.begin(), chars_page.end(),
-                             std::inserter(satisfied_chars, std::begin(satisfied_chars)), check_satisfiy);
+                             std::inserter(satisfied_chars, std::begin(satisfied_chars)), check_satisfy);
 
                 if (satisfied_chars.size()) break;
             }