From ccaf1bd892bf10924bac0d7645adf8ca5266416b Mon Sep 17 00:00:00 2001 From: Jamis Date: Wed, 15 Apr 2026 00:57:51 +1000 Subject: [PATCH] guide users to use Linnea correctly (#3129) --- repo/js/AbundantOre/README.md | 1 + repo/js/AbundantOre/main.js | 10 +++++++--- 2 files changed, 8 insertions(+), 3 deletions(-) diff --git a/repo/js/AbundantOre/README.md b/repo/js/AbundantOre/README.md index a3d1bdec7..a5219f4b9 100644 --- a/repo/js/AbundantOre/README.md +++ b/repo/js/AbundantOre/README.md @@ -26,6 +26,7 @@ - 如果有多个游戏帐号，可在最后一个输入框内为每个游戏帐号填写一个唯一的字符串以使他们的刷新时间分开保存，互不干扰。这个唯一的字符串并不必须是帐号的UID，只要互不相同就可以了。 - 对于因没有完成地图探索任务而无法正常完成某些路线的玩家，如果不想跳过整个区域，可以将脚本文件名称填入`local/disabled_paths.txt`文件中以跳过这些地图追踪脚本，语法请参考`assets/disabled_paths.conf`。 - 如果一定要使用其他角色挖矿，请在自定义挖矿动作中填写相应的角色和挖矿动作，例如`迪希雅 attack(2.0)`。也可填写`默认`或`default`来使用全局设置中的挖矿动作。使用此选项可能导致产量下降或其他问题，对此我们不做任何保证，亦不能提供技术支持。 +- 脚本会自动检验队伍角色，如果希望使用莉奈娅挖矿请**不要**填写自定义挖矿动作。 ## ChangeLog diff --git a/repo/js/AbundantOre/main.js b/repo/js/AbundantOre/main.js index 1d6edda15..68e654894 100644 --- a/repo/js/AbundantOre/main.js +++ b/repo/js/AbundantOre/main.js @@ -18,6 +18,8 @@ function forge_pathing_end_log(name, elapsed_time) { log.debug(c); } +const use_global_mining_action = settings.custom_mining_action === "默认" || settings.custom_mining_action === "default"; + const linnea_chs_name = "莉奈娅"; const country_name_tag_map = { @@ -496,8 +498,6 @@ async function run_pathing_script(name, path_state_change, current_states) { path_state_change.add ||= []; path_state_change.sustain ||= []; - const use_global_mining_action = settings.custom_mining_action === "默认" || settings.custom_mining_action === "default"; - for (const s of path_state_change.require) { if (!current_states.has(s)) { log.debug("Trying to get {s}", s); @@ -599,8 +599,12 @@ async function main() { log.debug("Exclude tags: {a}", get_exclude_tags()); log.debug("Underwater only: {a}", underwater_only()); const preapproved_mining_characters = [linnea_chs_name, "诺艾尔"]; + const characters = Array.from(getAvatars()); + if (characters.includes(linnea_chs_name) && (use_global_mining_action || settings.custom_mining_action.includes(linnea_chs_name))) { + log.error("{l}挖矿请{no}填写自定义挖矿动作", linnea_chs_name, "勿"); + return; + } if (!underwater_only() && !settings.custom_mining_action) { - const characters = Array.from(getAvatars()); for (const i of preapproved_mining_characters) { if (characters.includes(i)) { mining_character = i;