From a39fec7c37a0cdeb3b5bd2b70b09a572fc1ed79f Mon Sep 17 00:00:00 2001
From: lhhxxxxx <91231470+lhhxxxxx@users.noreply.github.com>
Date: Fri, 29 Jul 2022 23:01:27 +0800
Subject: [PATCH 1/2] style. fix typo

---
 src/MeoAsstGui/MeoAsstGui.csproj                            | 6 +++---
 ...gsUserControl.xaml => RoguelikeSettingsUserControl.xaml} | 0
 ...Control.xaml.cs => RoguelikeSettingsUserControl.xaml.cs} | 2 +-
 3 files changed, 4 insertions(+), 4 deletions(-)
 rename src/MeoAsstGui/UserControl/{RogueliekSettingsUserControl.xaml => RoguelikeSettingsUserControl.xaml} (100%)
 rename src/MeoAsstGui/UserControl/{RogueliekSettingsUserControl.xaml.cs => RoguelikeSettingsUserControl.xaml.cs} (92%)

diff --git a/src/MeoAsstGui/MeoAsstGui.csproj b/src/MeoAsstGui/MeoAsstGui.csproj
index dda5ccfac8..ac51dc518e 100644
--- a/src/MeoAsstGui/MeoAsstGui.csproj
+++ b/src/MeoAsstGui/MeoAsstGui.csproj
@@ -129,8 +129,8 @@
     <Compile Include="UserControl\ConnectSettingsUserControl.xaml.cs">
       <DependentUpon>ConnectSettingsUserControl.xaml</DependentUpon>
     </Compile>
-    <Compile Include="UserControl\RogueliekSettingsUserControl.xaml.cs">
-      <DependentUpon>RogueliekSettingsUserControl.xaml</DependentUpon>
+    <Compile Include="UserControl\RoguelikeSettingsUserControl.xaml.cs">
+      <DependentUpon>RoguelikeSettingsUserControl.xaml</DependentUpon>
     </Compile>
     <Compile Include="UserControl\MallSettingsUserControl.xaml.cs">
       <DependentUpon>MallSettingsUserControl.xaml</DependentUpon>
@@ -199,7 +199,7 @@
       <SubType>Designer</SubType>
       <Generator>MSBuild:Compile</Generator>
     </Page>
-    <Page Include="UserControl\RogueliekSettingsUserControl.xaml">
+    <Page Include="UserControl\RoguelikeSettingsUserControl.xaml">
       <Generator>MSBuild:Compile</Generator>
       <SubType>Designer</SubType>
     </Page>
diff --git a/src/MeoAsstGui/UserControl/RogueliekSettingsUserControl.xaml b/src/MeoAsstGui/UserControl/RoguelikeSettingsUserControl.xaml
similarity index 100%
rename from src/MeoAsstGui/UserControl/RogueliekSettingsUserControl.xaml
rename to src/MeoAsstGui/UserControl/RoguelikeSettingsUserControl.xaml
diff --git a/src/MeoAsstGui/UserControl/RogueliekSettingsUserControl.xaml.cs b/src/MeoAsstGui/UserControl/RoguelikeSettingsUserControl.xaml.cs
similarity index 92%
rename from src/MeoAsstGui/UserControl/RogueliekSettingsUserControl.xaml.cs
rename to src/MeoAsstGui/UserControl/RoguelikeSettingsUserControl.xaml.cs
index 0c73d0e01b..d5afdf5089 100644
--- a/src/MeoAsstGui/UserControl/RogueliekSettingsUserControl.xaml.cs
+++ b/src/MeoAsstGui/UserControl/RoguelikeSettingsUserControl.xaml.cs
@@ -1,4 +1,4 @@
-// <copyright file="RogueliekSettingsUserControl.xaml.cs" company="MaaAssistantArknights">
+// <copyright file="RoguelikeSettingsUserControl.xaml.cs" company="MaaAssistantArknights">
 // MeoAsstGui - A part of the MeoAssistantArknights project
 // Copyright (C) 2021 MistEO and Contributors
 //

From ba23af15889b2bc4042c846ca9719a87a61f6a9d Mon Sep 17 00:00:00 2001
From: Horror Proton <107091537+horror-proton@users.noreply.github.com>
Date: Sat, 30 Jul 2022 00:08:47 +0800
Subject: [PATCH 2/2] fix: fix post processing for recruit min level

---
 src/MeoAssistant/AutoRecruitTask.cpp | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/src/MeoAssistant/AutoRecruitTask.cpp b/src/MeoAssistant/AutoRecruitTask.cpp
index c5b8c82023..bbd89d7384 100644
--- a/src/MeoAssistant/AutoRecruitTask.cpp
+++ b/src/MeoAssistant/AutoRecruitTask.cpp
@@ -313,7 +313,13 @@ asst::AutoRecruitTask::calc_task_result_type asst::AutoRecruitTask::recruit_calc
 
         // assuming timer would be set to 09:00:00
         for (RecruitCombs& rc : result_vec) {
-            rc.min_level = (std::max)(rc.min_level, 3);
+            if (rc.min_level < 3) {
+                // find another min level backwards (assuming operator list reversely sorted by level)
+                auto sec = std::find_if(
+                        rc.opers.crbegin(), rc.opers.crend(),
+                        [](const RecruitOperInfo& op) -> bool { return op.level >= 3; });
+                if (sec != rc.opers.crend()) { rc.min_level = sec->level; }
+            }
         }
 
         std::sort(