From 3dd00e62073bf3ef3caf0a5bda8ae19befa284ad Mon Sep 17 00:00:00 2001
From: BxFS <15606086+BxFS@users.noreply.github.com>
Date: Tue, 25 Feb 2025 22:23:19 +0800
Subject: [PATCH] =?UTF-8?q?fix:=20=E6=9C=88=E5=BA=A6=E5=B0=8F=E9=98=9F/?=
 =?UTF-8?q?=E6=B7=B1=E5=85=A5=E8=B0=83=E6=9F=A5=E6=9C=AA=E5=90=AF=E7=94=A8?=
 =?UTF-8?q?=E8=87=AA=E5=8A=A8=E5=88=87=E6=8D=A2=E4=BC=9A=E4=BB=A5=E5=BD=93?=
 =?UTF-8?q?=E5=89=8D=E6=B8=B8=E6=88=8F=E6=A8=A1=E5=BC=8F=E5=BC=80=E5=A7=8B?=
 =?UTF-8?q?=E6=8E=A2=E7=B4=A2=20(#12032)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

fix: MS/DE now switch to correct tabs even without autoiterate ticked
---
 .../Roguelike/RoguelikeIterateDeepExplorationPlugin.cpp   | 4 ++++
 .../Roguelike/RoguelikeIterateDeepExplorationPlugin.h     | 1 +
 .../Task/Roguelike/RoguelikeIterateMonthlySquadPlugin.cpp | 8 ++++++--
 .../Task/Roguelike/RoguelikeIterateMonthlySquadPlugin.h   | 1 +
 4 files changed, 12 insertions(+), 2 deletions(-)

diff --git a/src/MaaCore/Task/Roguelike/RoguelikeIterateDeepExplorationPlugin.cpp b/src/MaaCore/Task/Roguelike/RoguelikeIterateDeepExplorationPlugin.cpp
index b093cf4412..2069b29a17 100644
--- a/src/MaaCore/Task/Roguelike/RoguelikeIterateDeepExplorationPlugin.cpp
+++ b/src/MaaCore/Task/Roguelike/RoguelikeIterateDeepExplorationPlugin.cpp
@@ -45,6 +45,10 @@ bool asst::RoguelikeIterateDeepExplorationPlugin::_run()
         ProcessTask(*this, { m_config->get_theme() + "@Roguelike@DeepExploration" }).run();
     }
 
+    if (!m_iterateDE) {
+        return true;
+    }
+
     bool ret;
     for (int i = 0; i < deepExplorationCount[m_config->get_theme()]; i++) {
         ret = ProcessTask(*this, { m_config->get_theme() + "@Roguelike@DeepExplorationRewardMiss" }).run();
diff --git a/src/MaaCore/Task/Roguelike/RoguelikeIterateDeepExplorationPlugin.h b/src/MaaCore/Task/Roguelike/RoguelikeIterateDeepExplorationPlugin.h
index 5ff0858f97..bd90aa1fbc 100644
--- a/src/MaaCore/Task/Roguelike/RoguelikeIterateDeepExplorationPlugin.h
+++ b/src/MaaCore/Task/Roguelike/RoguelikeIterateDeepExplorationPlugin.h
@@ -22,5 +22,6 @@ private:
                                                                   { "Sami", 13 },
                                                                   { "Sarkaz", 0 } };
     bool m_completed;
+    bool m_iterateDE;
 };
 }
diff --git a/src/MaaCore/Task/Roguelike/RoguelikeIterateMonthlySquadPlugin.cpp b/src/MaaCore/Task/Roguelike/RoguelikeIterateMonthlySquadPlugin.cpp
index e74582df37..964befba24 100644
--- a/src/MaaCore/Task/Roguelike/RoguelikeIterateMonthlySquadPlugin.cpp
+++ b/src/MaaCore/Task/Roguelike/RoguelikeIterateMonthlySquadPlugin.cpp
@@ -9,8 +9,8 @@ bool asst::RoguelikeIterateMonthlySquadPlugin::load_params([[maybe_unused]] cons
 {
     m_checkComms = params.find<bool>("monthly_squad_check_comms").value_or(false);
 
-    auto iterateMS = params.find<bool>("monthly_squad_auto_iterate");
-    return m_config->get_mode() == RoguelikeMode::Squad && iterateMS.value_or(false);
+    m_iterateMS = params.find<bool>("monthly_squad_auto_iterate").value_or(false);
+    return m_config->get_mode() == RoguelikeMode::Squad;
 }
 
 bool asst::RoguelikeIterateMonthlySquadPlugin::verify(AsstMsg msg, const json::value& details) const
@@ -47,6 +47,10 @@ bool asst::RoguelikeIterateMonthlySquadPlugin::_run()
         ProcessTask(*this, { m_config->get_theme() + "@Roguelike@MonthlySquad" }).run();
     }
 
+    if (!m_iterateMS) {
+        return true;
+    }
+
     for (int i = 0; i < monthlySquadCount[m_config->get_theme()]; i++) {
         if (m_checkComms) {
             ProcessTask(*this, { m_config->get_theme() + "@Roguelike@MonthlySquadComms" }).run();
diff --git a/src/MaaCore/Task/Roguelike/RoguelikeIterateMonthlySquadPlugin.h b/src/MaaCore/Task/Roguelike/RoguelikeIterateMonthlySquadPlugin.h
index 58d904305d..8f5a12210e 100644
--- a/src/MaaCore/Task/Roguelike/RoguelikeIterateMonthlySquadPlugin.h
+++ b/src/MaaCore/Task/Roguelike/RoguelikeIterateMonthlySquadPlugin.h
@@ -23,6 +23,7 @@ private:
                                                                { "Sarkaz", 1 } };
     bool m_checkComms;
     bool m_completed;
+    bool m_iterateMS;
     virtual bool try_task(const char*) const;
 };