Support new ingredient rye (#1885)

repo/js/OCR购买食材/assets/Pathing/挪德卡莱杂货铺采若.json

@@ -0,0 +1,44 @@
+{
+  "info": {
+    "authors": [],
+    "bgi_version": "0.50.0",
+    "description": "",
+    "enable_monster_loot_split": false,
+    "last_modified_time": 1757733962848,
+    "map_match_method": "",
+    "map_name": "Teyvat",
+    "name": "挪德卡莱杂货铺采若",
+    "tags": [],
+    "type": "collect",
+    "version": "1.0"
+  },
+  "positions": [
+    {
+      "action": "",
+      "action_params": "",
+      "id": 1,
+      "move_mode": "walk",
+      "type": "teleport",
+      "x": 9458.03515625,
+      "y": 1660.6650390625
+    },
+    {
+      "action": "",
+      "action_params": "",
+      "id": 2,
+      "move_mode": "dash",
+      "type": "path",
+      "x": 9453.361328125,
+      "y": 1639.97607421875
+    },
+    {
+      "action": "",
+      "action_params": "",
+      "id": 3,
+      "move_mode": "walk",
+      "type": "target",
+      "x": 9449.888671875,
+      "y": 1637.666015625
+    }
+  ]
+}

repo/js/OCR购买食材/main.js

@@ -21,7 +21,7 @@ let FermentRo = RecognitionObject.TemplateMatch(file.ReadImageMatSync("assets/Pi
 
 // 定义所有可能的食材，注意料理名字长度可能超过识图范围
 const ingredients = [
-    "枫达", "盐", "胡椒", "洋葱", "牛奶", "番茄", "香辛料", "卷心菜", "土豆", "小麦", "稻米", "豆腐", "杏仁", "鱼肉", "螃蟹", "虾仁", "咖啡豆", "秃秃豆", "发酵果实汁"
+    "枫达", "盐", "胡椒", "洋葱", "牛奶", "番茄", "香辛料", "卷心菜", "土豆", "小麦", "稻米", "豆腐", "杏仁", "鱼肉", "螃蟹", "虾仁", "咖啡豆", "秃秃豆", "发酵果实汁", "黑麦"
 ];
 
 // 定义所有食材及其对应的路径文件和 NPC
@@ -38,17 +38,18 @@ const sumiGroceryFilePath = `assets/Pathing/须弥杂货铺哈马维.json`;
 const omosPortFishPath = `assets/Pathing/须弥奥摩斯港鱼贩布特罗斯.json`;
 const azaleVillMerPath = `assets/Pathing/须弥阿如村商人阿扎莱.json`;
 const natlanGroceryFilePath = `assets/Pathing/纳塔杂货铺布纳马.json`;
+const nodKraiGroceryFilePath = `assets/Pathing/挪德卡莱杂货铺采若.json`;
 
 const ingredientPaths = {
     "枫达": [fengdanGroceryFilePath, cafeLuzheFilePath],
-    "盐": [mondstadtGroceryFilePath, liyueGroceryFilePath, groceryFilePath, sumiGroceryFilePath, fengdanGroceryFilePath, natlanGroceryFilePath],
-    "洋葱": [mondstadtGroceryFilePath, liyueGroceryFilePath, groceryFilePath, sumiGroceryFilePath, fengdanGroceryFilePath, natlanGroceryFilePath],
-    "牛奶": [mondstadtGroceryFilePath, liyueGroceryFilePath, groceryFilePath, sumiGroceryFilePath, fengdanGroceryFilePath, natlanGroceryFilePath],
-    "番茄": [mondstadtGroceryFilePath, liyueGroceryFilePath, groceryFilePath, sumiGroceryFilePath, fengdanGroceryFilePath, natlanGroceryFilePath],
-    "卷心菜": [mondstadtGroceryFilePath, liyueGroceryFilePath, groceryFilePath, sumiGroceryFilePath, fengdanGroceryFilePath, natlanGroceryFilePath],
-    "土豆": [mondstadtGroceryFilePath, liyueGroceryFilePath, groceryFilePath, sumiGroceryFilePath, fengdanGroceryFilePath, natlanGroceryFilePath],
-    "小麦": [mondstadtGroceryFilePath, liyueGroceryFilePath, groceryFilePath, sumiGroceryFilePath, fengdanGroceryFilePath, natlanGroceryFilePath],
-    "胡椒": [mondstadtGroceryFilePath, liyueGroceryFilePath, groceryFilePath, sumiGroceryFilePath, fengdanGroceryFilePath, natlanGroceryFilePath],
+    "盐": [mondstadtGroceryFilePath, liyueGroceryFilePath, groceryFilePath, sumiGroceryFilePath, fengdanGroceryFilePath, natlanGroceryFilePath, nodKraiGroceryFilePath],
+    "洋葱": [mondstadtGroceryFilePath, liyueGroceryFilePath, groceryFilePath, sumiGroceryFilePath, fengdanGroceryFilePath, natlanGroceryFilePath, nodKraiGroceryFilePath],
+    "牛奶": [mondstadtGroceryFilePath, liyueGroceryFilePath, groceryFilePath, sumiGroceryFilePath, fengdanGroceryFilePath, natlanGroceryFilePath, nodKraiGroceryFilePath],
+    "番茄": [mondstadtGroceryFilePath, liyueGroceryFilePath, groceryFilePath, sumiGroceryFilePath, fengdanGroceryFilePath, natlanGroceryFilePath, nodKraiGroceryFilePath],
+    "卷心菜": [mondstadtGroceryFilePath, liyueGroceryFilePath, groceryFilePath, sumiGroceryFilePath, fengdanGroceryFilePath, natlanGroceryFilePath, nodKraiGroceryFilePath],
+    "土豆": [mondstadtGroceryFilePath, liyueGroceryFilePath, groceryFilePath, sumiGroceryFilePath, fengdanGroceryFilePath, natlanGroceryFilePath, nodKraiGroceryFilePath],
+    "小麦": [mondstadtGroceryFilePath, liyueGroceryFilePath, groceryFilePath, sumiGroceryFilePath, fengdanGroceryFilePath, natlanGroceryFilePath, nodKraiGroceryFilePath],
+    "胡椒": [mondstadtGroceryFilePath, liyueGroceryFilePath, groceryFilePath, sumiGroceryFilePath, fengdanGroceryFilePath, natlanGroceryFilePath, nodKraiGroceryFilePath],
     "稻米": [liyueGroceryFilePath, groceryFilePath, sumiGroceryFilePath],//
     "虾仁": [liyueGroceryFilePath, groceryFilePath, sumiGroceryFilePath, sumiCityFishPath, omosPortFishPath],
     "豆腐": [liyueGroceryFilePath, groceryFilePath, sumiGroceryFilePath],
@@ -58,7 +59,8 @@ const ingredientPaths = {
     "秃秃豆": [fengdanGroceryFilePath, azaleVillMerPath, natlanGroceryFilePath],
     "咖啡豆": [sumiCitycafeFilePath, cafeLuzheFilePath],
     "香辛料": [azaleVillMerPath],
-    "发酵果实汁": [fengdanGroceryFilePath]
+    "发酵果实汁": [fengdanGroceryFilePath],
+    "黑麦": [nodKraiGroceryFilePath],
 };
 
 // 定义食材名称和图片文件名的映射表
@@ -105,6 +107,7 @@ const npcNames = {
     [azaleVillMerPath]: ["阿扎莱"],
     [sumiGroceryFilePath]: ["哈马维"],
     [natlanGroceryFilePath]: ["布纳马"],
+    [nodKraiGroceryFilePath]: ["采若"],
 };
 
 // 筛选出用户选择的食材及其对应的路径文件和 NPC
@@ -305,6 +308,11 @@ async function clickSelectedIngredients(selectedIngredients, filePath, npcNames)
             await click(1300, 580); await sleep(1000);
             await click(1300, 580); await sleep(1000);
             await click(1300, 580); await sleep(1000);
+        } else if (filePath === nodKraiGroceryFilePath) {
+            log.info("执行挪德卡莱杂货商等的点击操作");
+            await click(1300, 430); await sleep(1000);
+            await click(1300, 430); await sleep(1000);
+            await click(1300, 430); await sleep(1000);
         } else {
             log.info("执行其他路径文件的点击操作");
             await click(1300, 580); await sleep(500);

repo/js/OCR购买食材/manifest.json

@@ -1,7 +1,7 @@
 {
   "manifest_version": 1,
   "name": "选择购买食材OCR",
-  "version": "1.30514",
+  "version": "1.30515",
   "description": "至少需要0.48版本bgi，对NPC和材料进行文字、图像识别。\n一般食材杂货在蒙德、璃月、稻妻、枫丹杂货商购买。\n10鱼肉、10螃蟹在卯师傅、珀姆、布特罗斯、阿扎莱和志村勘兵卫购买。\n咖啡豆在须弥、枫丹咖啡馆购买。\n增加对话F图像识别，增加个别字识别容错；增加香辛料，在阿扎莱处购买。\nv1.30513修复循环套叠，优化F未识别后的尝试方案。",
   "authors": [
     {

repo/js/OCR购买食材/settings.json

@@ -93,5 +93,10 @@
         "name": "胡椒",
         "type": "checkbox",
         "label": "-----------------\n胡椒"
+    },
+    {
+        "name": "黑麦",
+        "type": "checkbox",
+        "label": "-----------------\n黑麦"
     }
 ]