From eaeaab7b180c2bbd28615cc18d46f2d219f9e83b Mon Sep 17 00:00:00 2001 From: status102 <102887808+status102@users.noreply.github.com> Date: Sun, 27 Oct 2024 19:23:43 +0800 Subject: [PATCH] =?UTF-8?q?fix:=20MaaCore=20RoguelikeTask=20=E8=A1=A5?= =?UTF-8?q?=E5=85=85=E6=9C=AA=E9=80=89=E6=8B=A9=E5=88=B7=E5=BC=80=E5=B1=80?= =?UTF-8?q?=E6=A8=A1=E5=BC=8F=E4=B8=8B=E5=90=AF=E7=94=A8=E5=87=B9=E7=B2=BE?= =?UTF-8?q?=E4=BA=8C=E7=9A=84=E7=A6=81=E7=94=A8=E5=88=A4=E5=AE=9A?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/MaaCore/Task/Roguelike/RoguelikeConfig.cpp | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/src/MaaCore/Task/Roguelike/RoguelikeConfig.cpp b/src/MaaCore/Task/Roguelike/RoguelikeConfig.cpp index 49d75be906..03b2497fa8 100644 --- a/src/MaaCore/Task/Roguelike/RoguelikeConfig.cpp +++ b/src/MaaCore/Task/Roguelike/RoguelikeConfig.cpp @@ -26,6 +26,11 @@ bool asst::RoguelikeConfig::verify_and_load_params(const json::value& params) m_start_with_elite_two = params.get("start_with_elite_two", false); m_only_start_with_elite_two = params.get("only_start_with_elite_two", false); + if (mode != RoguelikeMode::Collectible && (m_start_with_elite_two||m_only_start_with_elite_two)) { + Log.error(__FUNCTION__, "| Invalid mode for start_with_elite_two", static_cast(mode)); + return false; + } + // 设置层数选点策略，相关逻辑在 RoguelikeStrategyChangeTaskPlugin { Task.set_task_base(m_theme + "@Roguelike@Stages", m_theme + "@Roguelike@Stages_default"); @@ -76,8 +81,7 @@ bool asst::RoguelikeConfig::verify_and_load_params(const json::value& params) m_invest_with_more_score = (investment_with_more_score); } - // =========================== 萨米主题专用参数 =========================== - + // ------------------ 萨米主题专用参数 ------------------ if (m_theme == RoguelikeTheme::Sami) { // 是否凹开局远见密文板 m_first_floor_foldartal = params.contains("first_floor_foldartal");