diff --git a/repo/js/AbundantOre/README.md b/repo/js/AbundantOre/README.md index a5219f4b9..865ba8d0d 100644 --- a/repo/js/AbundantOre/README.md +++ b/repo/js/AbundantOre/README.md @@ -30,6 +30,10 @@ ## ChangeLog +### 0.30 + +- 修复若干bug + ### 0.29 - 稍微优化了莉奈娅挖矿的逻辑 diff --git a/repo/js/AbundantOre/main.js b/repo/js/AbundantOre/main.js index 68e654894..ef44f38b8 100644 --- a/repo/js/AbundantOre/main.js +++ b/repo/js/AbundantOre/main.js @@ -492,7 +492,7 @@ async function modify_script_for_linnea(json_content, override_config) { return json_content; } -async function run_pathing_script(name, path_state_change, current_states) { +async function run_pathing_script(name, tags, path_state_change, current_states) { path_state_change ||= {}; path_state_change.require ||= []; path_state_change.add ||= []; @@ -504,7 +504,7 @@ async function run_pathing_script(name, path_state_change, current_states) { for (const [name, data] of Object.entries(statistics)) { const add_states = data.state_change?.add || []; if (add_states.includes(s)) { - await run_pathing_script(name, data.state_change, current_states); + await run_pathing_script(name, data.tags, data.state_change, current_states); break; } } @@ -512,7 +512,7 @@ async function run_pathing_script(name, path_state_change, current_states) { } log.info("运行 {name}", name); let json_content = await file.readText(filename_to_path_map[name]); - if (use_global_mining_action) { + if (use_global_mining_action || tags.includes("fontaine underwater") || tags.includes("sea of bygone eras underwater")) { // nop } else if (settings.custom_mining_action || mining_character === "诺艾尔") { json_content = modify_script_for_claymores(json_content); @@ -600,7 +600,7 @@ async function main() { 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))) { + 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; } @@ -703,7 +703,7 @@ async function main() { for (const [name, data] of tasks) { cached_inventory_data = null; try { - await run_pathing_script(name, data.state_change, current_states); + await run_pathing_script(name, data.tags, data.state_change, current_states); } catch (e) { finished = true; break; diff --git a/repo/js/AbundantOre/manifest.json b/repo/js/AbundantOre/manifest.json index 31937b20f..a39e7ef80 100644 --- a/repo/js/AbundantOre/manifest.json +++ b/repo/js/AbundantOre/manifest.json @@ -2,7 +2,7 @@ "bgi_version": "0.60.0", "manifest_version": 1, "name": "矿产资源批发", - "version": "0.29", + "version": "0.30", "description": "自动记录矿石刷新时间,优先选择效率最高的路线,支持按区域、种类、数量自动规划挖矿路线", "authors": [ {