diff --git a/src/MaaCore/Task/Roguelike/Sami/RoguelikeCollapsalParadigmTaskPlugin.cpp b/src/MaaCore/Task/Roguelike/Sami/RoguelikeCollapsalParadigmTaskPlugin.cpp index 793249798a..5faa41d260 100644 --- a/src/MaaCore/Task/Roguelike/Sami/RoguelikeCollapsalParadigmTaskPlugin.cpp +++ b/src/MaaCore/Task/Roguelike/Sami/RoguelikeCollapsalParadigmTaskPlugin.cpp @@ -50,7 +50,7 @@ bool asst::RoguelikeCollapsalParadigmTaskPlugin::verify( return false; } - if (m_config->get_theme() != RoguelikeTheme::Sami || !m_config->get_check_clp_pds()) { + if (m_config->get_theme() != RoguelikeTheme::Sami) { return false; } diff --git a/src/MaaCore/Task/Roguelike/Sami/RoguelikeFoldartalGainTaskPlugin.cpp b/src/MaaCore/Task/Roguelike/Sami/RoguelikeFoldartalGainTaskPlugin.cpp index fb51d12e42..7c4a555909 100644 --- a/src/MaaCore/Task/Roguelike/Sami/RoguelikeFoldartalGainTaskPlugin.cpp +++ b/src/MaaCore/Task/Roguelike/Sami/RoguelikeFoldartalGainTaskPlugin.cpp @@ -13,8 +13,10 @@ bool asst::RoguelikeFoldartalGainTaskPlugin::verify(AsstMsg msg, const json::val } if (m_config->get_theme() != RoguelikeTheme::Sami) { + m_enable = false; return false; } + const std::string roguelike_name = m_config->get_theme() + "@"; const std::string& task = details.get("details", "task", ""); std::string_view task_view = task; diff --git a/src/MaaCore/Task/Roguelike/Sami/RoguelikeFoldartalStartTaskPlugin.cpp b/src/MaaCore/Task/Roguelike/Sami/RoguelikeFoldartalStartTaskPlugin.cpp index c7d5f2ca80..a0e9a8101f 100644 --- a/src/MaaCore/Task/Roguelike/Sami/RoguelikeFoldartalStartTaskPlugin.cpp +++ b/src/MaaCore/Task/Roguelike/Sami/RoguelikeFoldartalStartTaskPlugin.cpp @@ -11,7 +11,12 @@ bool asst::RoguelikeFoldartalStartTaskPlugin::verify(AsstMsg msg, const json::va return false; } - if (m_config->get_theme() != RoguelikeTheme::Sami || m_config->get_difficulty() != INT_MAX || !m_start_foldartal) { + if (m_config->get_theme() != RoguelikeTheme::Sami) { + m_enable = false; + return false; + } + + if (m_config->get_difficulty() != INT_MAX || !m_start_foldartal) { return false; } const std::string roguelike_name = m_config->get_theme() + "@"; diff --git a/src/MaaCore/Task/Roguelike/Sami/RoguelikeFoldartalUseTaskPlugin.cpp b/src/MaaCore/Task/Roguelike/Sami/RoguelikeFoldartalUseTaskPlugin.cpp index 4f36a47a9e..729161d465 100644 --- a/src/MaaCore/Task/Roguelike/Sami/RoguelikeFoldartalUseTaskPlugin.cpp +++ b/src/MaaCore/Task/Roguelike/Sami/RoguelikeFoldartalUseTaskPlugin.cpp @@ -16,7 +16,12 @@ bool asst::RoguelikeFoldartalUseTaskPlugin::verify(const AsstMsg msg, const json return false; } - if (m_config->get_theme() != RoguelikeTheme::Sami || !m_use_foldartal) { + if (m_config->get_theme() != RoguelikeTheme::Sami) { + m_enable = false; + return false; + } + + if (!m_use_foldartal) { return false; }