@lily-cooperative/custom-farm 0.34.0 → 0.35.0

package/describe.json

@@ -0,0 +1,345 @@
+{
+  "tools": [
+    {
+      "name": "farm_status",
+      "description": "查看田地：每棵作物的位置 xPct（屏幕底部百分比）、等级、成熟进度、水分、是否熟了/枯萎了、还能收几次，以及背包里有什么、地上掉了什么、野草有几丛/哪些能收、主人自定义的状态（数值 + 开关）当前是多少。最后一行「最近田里的变化」会列出最近少掉的棵和原因——田空了先看这行，别当成存档被清。想知道情况就查这个，田地不会主动推送生长进度。",
+      "parameters": {
+        "type": "object",
+        "properties": {}
+      },
+      "tags": [
+        "read",
+        "snapshot"
+      ],
+      "summary": {
+        "zh": "看田：每棵作物的位置、等级、进度、水分、是否可收/枯萎，外加背包、地上的掉落物和最近田里的变化（少了哪棵、为什么）。",
+        "en": "Show every plant (position, level, progress, moisture, ripe/wilted) plus the bag, the drops, and recent field changes (which plant is gone and why)."
+      }
+    },
+    {
+      "name": "farm_stand",
+      "description": "站到某个位置。at 必填：先用桌宠自己的 pet_move_to 走过去，再把到达的位置（回执里那个百分比除以 100）填进 at。给了 plot 还会顺便校验你有没有真的站到那棵旁边。播种、收割、捡东西都要靠它放行。",
+      "parameters": {
+        "type": "object",
+        "properties": {
+          "at": {
+            "type": "number",
+            "minimum": 0,
+            "maximum": 1,
+            "description": "你现在的位置（0~1），pet_move_to 回执里那个百分比除以 100。必填。"
+          },
+          "plot": {
+            "type": "integer",
+            "description": "可选：顺便声明你站在几号地旁边。"
+          }
+        },
+        "required": [
+          "at"
+        ],
+        "additionalProperties": false
+      },
+      "tags": [
+        "write"
+      ],
+      "summary": {
+        "zh": "站到某个位置（at 必填），播种/收割/捡东西都要先站过去。",
+        "en": "Stand at a position (at is required); planting, harvesting and collecting all need it."
+      }
+    },
+    {
+      "name": "farm_plant",
+      "description": "在脚下种一棵。必须先用 pet_move_to 走过去并 farm_stand 报好位置。种一棵要消耗 1 包对应种子（背包里的 seed_tomato 这种）；没有种子就自己补 1~2 包（farm_shop 看价、farm_buy 买），不用问主人。crop 可以填作物名（番茄/南瓜/玉米/土豆/草莓/小白菜等），不填就按轮作自动选；x 不填就种在脚下，也可以自己指定 0~1，但必须在当前农田范围内（农田始终以屏幕中心为中线，宽度可调）。默认允许轻微重叠，太挤会被拒绝并告诉你已经种在哪些百分比。",
+      "parameters": {
+        "type": "object",
+        "properties": {
+          "crop": {
+            "type": "string",
+            "description": "作物名或者 key；不填自动轮作。"
+          },
+          "x": {
+            "type": "number",
+            "minimum": 0,
+            "maximum": 1,
+            "description": "种在屏幕底部哪个位置；不填就种在脚下。"
+          }
+        },
+        "additionalProperties": false
+      },
+      "tags": [
+        "write"
+      ],
+      "summary": {
+        "zh": "在脚下种一棵：要消耗 1 包对应种子（种子在背包里，没有就自己补 1~2 包），位置可自己挑，两棵不能重叠。",
+        "en": "Plant one at your feet; consumes one seed pack from the bag (restock 1–2 packs yourself if empty), position optional, no overlap."
+      }
+    },
+    {
+      "name": "farm_water",
+      "description": "浇水：走到一棵旁边（先 pet_move_to + farm_stand），一次把够得着的这一片全浇透（含旁边几棵，不用一株一株浇）。给 plot 就以那棵为中心，省略就以你站的位置为中心。已经浇透的会跳过。太久不浇会枯萎，枯了浇不活，要拔掉重种。",
+      "parameters": {
+        "type": "object",
+        "properties": {
+          "plot": {
+            "type": "integer",
+            "description": "可选：以这棵为中心浇它和旁边够得着的；省略则浇你脚下够得着的全部。"
+          }
+        },
+        "additionalProperties": false
+      },
+      "tags": [
+        "write"
+      ],
+      "summary": {
+        "zh": "浇水：一次浇透脚下够得着的一片（含旁边几棵），已经浇透的会跳过。",
+        "en": "Water the whole reachable patch in one call (neighbours included); already-full plants are skipped."
+      }
+    },
+    {
+      "name": "farm_harvest",
+      "description": "收割脚下这棵熟的作物，或者一丛长成、带收获物的杂草。产物会掉在地上，不会直接进背包——收完再 farm_collect 才拿到手。必须站过去。番茄能收 4 次、草莓 5 次，收完退回中间等级继续长；小麦/土豆/卷心菜/玉米/南瓜只能收 1 次，收完就拔掉（所以收一次地里就少一棵，不是 bug）。杂草要长到最高阶段才收得动；没配收获物的杂草只能靠 farm_plant 铲掉。",
+      "parameters": {
+        "type": "object",
+        "properties": {
+          "plot": {
+            "type": "integer",
+            "description": "收哪一棵；省略则收脚下这棵。"
+          }
+        },
+        "additionalProperties": false
+      },
+      "tags": [
+        "write"
+      ],
+      "summary": {
+        "zh": "收脚下这棵熟的，产物掉在地上，要用 farm_collect 捡。",
+        "en": "Harvest the ripe plant at your feet; the produce drops on the ground and must be collected."
+      }
+    },
+    {
+      "name": "farm_pull",
+      "description": "拔掉一棵枯萎的作物（要站在它跟前）。枯萎的作物浇不活，只能拔掉重种；拔的时候会冒一团烟。",
+      "parameters": {
+        "type": "object",
+        "properties": {
+          "plot": {
+            "type": "integer",
+            "description": "拔哪一棵；省略则拔脚下这棵。"
+          }
+        },
+        "additionalProperties": false
+      },
+      "tags": [
+        "write"
+      ]
+    },
+    {
+      "name": "farm_sell",
+      "description": "把背包里有出售价的道具卖掉换金币（作物/种子/消耗品/装饰）。没在「道具自定义」里设出售价的不能卖。不给 count 就全卖。",
+      "parameters": {
+        "type": "object",
+        "properties": {
+          "item": {
+            "type": "string",
+            "description": "背包里的 item id 或名字，比如 tomato / 番茄 / seed_tomato。"
+          },
+          "count": {
+            "type": "integer",
+            "description": "卖几个；省略=全卖。"
+          }
+        },
+        "required": [
+          "item"
+        ],
+        "additionalProperties": false
+      },
+      "tags": [
+        "write"
+      ]
+    },
+    {
+      "name": "farm_shop",
+      "description": "看商店：列出所有设了购买价的种子/消耗品/装饰（买价、卖价）。没设购买价的不在商店；没设出售价的不能卖。",
+      "parameters": {
+        "type": "object",
+        "properties": {
+          "kind": {
+            "type": "string",
+            "enum": [
+              "seed",
+              "consumable",
+              "decor",
+              "furniture",
+              "all"
+            ],
+            "description": "看哪一类；默认 all。"
+          }
+        },
+        "additionalProperties": false
+      },
+      "tags": [
+        "read"
+      ]
+    },
+    {
+      "name": "farm_buy",
+      "description": "买设了购买价的道具（种子/消耗品/装饰）：id 是道具 id（seed_tomato），count 一次买几个；也可以 items:[{id,count}] 一次买多种。买来先进背包；装饰要再用 farm_place 摆。种子不够可以自己补 1~2 包，不用问；买装饰/大件先问主人。",
+      "parameters": {
+        "type": "object",
+        "properties": {
+          "id": {
+            "type": "string",
+            "description": "道具 id（seed_tomato / coffee / scarecrow）"
+          },
+          "count": {
+            "type": "integer",
+            "description": "买几个（默认 1，最多 99）"
+          },
+          "items": {
+            "type": "array",
+            "description": "一次买多种（推荐，省 token）：[{id:\"seed_tomato\",count:1},{id:\"coffee\",count:2}]",
+            "items": {
+              "type": "object",
+              "properties": {
+                "id": {
+                  "type": "string"
+                },
+                "count": {
+                  "type": "integer"
+                }
+              },
+              "required": [
+                "id"
+              ],
+              "additionalProperties": false
+            }
+          }
+        },
+        "additionalProperties": false
+      },
+      "tags": [
+        "write"
+      ]
+    },
+    {
+      "name": "farm_place",
+      "description": "把背包里的装饰道具放到农场地面上（消耗 1 个）。「上」层装饰和杂草同层，会清掉落点杂草；「下」层在作物后方、不清草。x 不填就放在你当前站的位置。必须先买/合成到背包里，且道具在「道具自定义」里配了摆放贴图。",
+      "parameters": {
+        "type": "object",
+        "properties": {
+          "item": {
+            "type": "string",
+            "description": "装饰道具 id 或名字（比如 scarecrow / 稻草人）"
+          },
+          "x": {
+            "type": "number",
+            "description": "放到屏宽的百分之几（0~1）；省略=你站的位置"
+          }
+        },
+        "required": [
+          "item"
+        ],
+        "additionalProperties": false
+      },
+      "tags": [
+        "write"
+      ]
+    },
+    {
+      "name": "farm_collect",
+      "description": "把脚下够得着的掉落物收进背包。必须站过去（先 farm_stand 报位置）。地上没有就报错并告诉你掉落物在哪些百分比。",
+      "parameters": {
+        "type": "object",
+        "properties": {}
+      },
+      "tags": [
+        "write"
+      ],
+      "summary": {
+        "zh": "把脚下的掉落物收进背包。",
+        "en": "Pick up the drops around your feet into the bag."
+      }
+    },
+    {
+      "name": "farm_consume",
+      "description": "吃掉背包里的作物 / 杂草收获物，用来缓解「饥饿」这类状态。需要主人先在「状态自定义」里配好消耗行为（触发状态 + 可消耗道具 + 状态效果）。item 不填就自动挑背包里第一种可吃的；count 默认 1。吃掉后会按配置加减状态值（通常是饱食度）。",
+      "parameters": {
+        "type": "object",
+        "properties": {
+          "item": {
+            "type": "string",
+            "description": "可选：产物 id 或名字（比如 tomato / 番茄）。不填自动挑。"
+          },
+          "count": {
+            "type": "integer",
+            "minimum": 1,
+            "maximum": 99,
+            "description": "吃几个，默认 1。"
+          }
+        },
+        "additionalProperties": false
+      },
+      "tags": [
+        "write"
+      ],
+      "summary": {
+        "zh": "吃掉背包里的作物/杂草收获物，缓解「饥饿」这类状态（要主人在状态自定义里配好消耗行为）。",
+        "en": "Eat a crop/weed produce to relieve states like hunger (configured in the status page)."
+      }
+    },
+    {
+      "name": "farm_craft",
+      "description": "按「道具合成表」消耗背包里的材料合成道具。recipe 填合成表 id；不填就列出所有合成表和材料。材料不够会报缺什么。",
+      "parameters": {
+        "type": "object",
+        "properties": {
+          "recipe": {
+            "type": "string",
+            "description": "合成表 id（不填=列出所有合成表）"
+          }
+        },
+        "additionalProperties": false
+      },
+      "tags": [
+        "write"
+      ],
+      "summary": {
+        "zh": "按「道具合成表」消耗背包材料合成道具；不填 recipe 就列出所有表。",
+        "en": "Craft from the configured recipes; without recipe it lists all recipes."
+      }
+    }
+  ],
+  "events": [
+    {
+      "type": "farm.ripe",
+      "description": {
+        "zh": "有作物成熟了；正文写明哪几棵、在屏幕底部百分之几，并提示走过去收、收完再捡。",
+        "en": "Some plants ripened; the text names them and their position, and says to walk over, harvest, then collect."
+      },
+      "trigger": "debounce"
+    },
+    {
+      "type": "farm.dry",
+      "description": {
+        "zh": "有作物土太干了；正文列出哪几棵、在屏幕底部百分之几，提示走过去浇水。",
+        "en": "Some plants are running dry; the text names them and their position and says to water them."
+      },
+      "trigger": "debounce"
+    },
+    {
+      "type": "farm.day",
+      "description": {
+        "zh": "翻到新的一天；正文带上天气、可收数量、地上的掉落物、土干的数量和背包件数。",
+        "en": "A new day started: weather, ripe count, drops on the ground, dry plants and bag size."
+      },
+      "trigger": "debounce"
+    },
+    {
+      "type": "farm.state",
+      "description": {
+        "zh": "自定义状态触发消耗行为：比如「饥饿」生效时自动吃掉一个作物（正文写明吃了什么、状态变化），或者提醒桌宠用 farm_consume 去吃；背包里没有可吃道具时也会提醒。",
+        "en": "A custom state triggered a consume action: e.g. hunger ate a crop (the text says what and the state change), or asks the pet to use farm_consume; also fires when nothing edible is in the bag."
+      },
+      "trigger": "debounce"
+    }
+  ]
+}

package/dist/webui.css

@@ -138,7 +138,7 @@
 .cf-frame .cf-x { top: -6px; right: -6px; }
 
 
-/* 背包 / 商店页：和 WPF 背包一样的 4 列图标格 */
+/* 背包 / 商店页：4 列图标格 */
 .bg-grid { display: grid; grid-template-columns: repeat(4, minmax(0, 1fr)); gap: 10px; }
 .bg-card {
   display: flex;

package/package.json

@@ -1,12 +1,12 @@
 {
   "name": "@lily-cooperative/custom-farm",
-  "version": "0.34.0",
+  "version": "0.35.0",
   "type": "module",
   "private": false,
   "publishConfig": {
     "access": "public"
   },
-  "description": "自定义农场（Custom Farm）—— 给 Coopanion 桌宠的种田扩展：18 种作物只是起点。农作物、杂草、装饰物、天气、状态、道具、合成表和贴图都能在面板里完全自定义；种、浇、收、吃、买卖全部本地确定性运行，不唤模型。",
+  "description": "自定义农场（Custom Farm）—— 给 Coopanion 桌宠的种田扩展：18 种作物只是起点。农作物、杂草、装饰物、天气、状态、道具、合成表和贴图都能在面板里完全自定义；种、浇、收、吃、买卖都由你决定。",
   "keywords": [
     "cortico-world",
     "coopanion",
@@ -42,9 +42,9 @@
     "dist",
     "overlay",
     "overlay-electron",
-    "bag",
     "assets",
     "icon.png",
+    "describe.json",
     "README.md",
     "LICENSE"
   ],
@@ -59,11 +59,11 @@
     "locales": {
       "zh": {
         "displayName": "自定义农场",
-        "description": "18 种作物只是起点：农作物、杂草、装饰物、天气、状态、道具、合成表和贴图都能在面板里完全自定义，想种什么、长什么样、吃什么补什么，全由你决定。种、浇、收、吃、买卖全部本地确定性运行，不唤模型。"
+        "description": "18 种作物只是起点：农作物、杂草、装饰物、天气、状态、道具、合成表和贴图都能在面板里完全自定义，想种什么、长什么样、吃什么补什么，全由你决定。"
       },
       "en": {
         "displayName": "Custom Farm",
-        "description": "18 crops are just the beginning: crops, weeds, decorations, weather, states, items, recipes and sprites are all fully customizable in the panel. Plant, water, harvest, eat and trade locally with deterministic ticks — no model calls."
+        "description": "18 crops are just the beginning: crops, weeds, decorations, weather, states, items, recipes and sprites are all fully customizable in the panel. Plant, water, harvest, eat and trade the way you like."
       }
     },
     "tags": [

package/src/farm.js

@@ -47,6 +47,8 @@ export function farmPatch(cfg = DEFAULTS) {
 export const REACH = 0.05;
 
 export const DEFAULTS = {
+  /** 安装目录：overlay / overlay-electron / assets 放在这里；空 = <dataDir>/custom-farm */
+  installPath: '',
   /** 最多同时种几棵（屏幕上不重叠地放得下的上限） */
   maxPlants: 12,
   /** 屏幕逻辑宽度，用来把"像素宽"换算成 x 间距 */

package/src/index.js

@@ -63,6 +63,7 @@ export const farmDefinition = {
     dataDir: ctx.dataDir,
     botDir: ctx.botDir,
     packageDir: ctx.packageDir,
+    persist: (patch) => ctx.persist(patch),
   }),
   describe: {
     tools: describeTools(FARM_TOOL_DECLS),

package/src/paths.js

@@ -1,50 +1,47 @@
-/**
- * 路径解析：所有东西都从扩展自己的位置推出来，不写死本机绝对路径。
- *
- *   <Pet>\custom-farm\src\paths.js   ← 本文件
- *   <Pet>\overlay\overlay.ps1
- *   <Pet>\bag\bag.ps1
- *   <Pet>\assets\sprites\
- *
- * 所以「整个 Pet 文件夹」拷到另一台机器（或换个盘）都能直接用。
- * 扩展被复制进 Coopanion 的 extensions 目录（而不是 link）时，用环境变量
- * PET_HOME 或 World 配置里的 petRoot 指定 <Pet> 在哪。
- */
-import { existsSync } from 'node:fs';
-import { dirname, join, resolve } from 'node:path';
-import { fileURLToPath } from 'node:url';
-
-const SRC_DIR = dirname(fileURLToPath(import.meta.url));
-export const EXTENSION_DIR = resolve(SRC_DIR, '..');
-
-const looksLikePetHome = (dir) => Boolean(dir) && (
-  existsSync(join(dir, 'overlay', 'overlay.ps1')) ||
-  (existsSync(join(dir, 'overlay-electron', 'main.js')) && existsSync(join(dir, 'assets', 'sprites')))
-);
-
-/** 找到 <Pet> 根目录；找不到就返回 null（图层和背包会被自动关掉，不影响农场本身）。 */
-export function resolvePetHome(cfgRoot) {
-  const candidates = [];
-  if (typeof cfgRoot === 'string' && cfgRoot.trim()) candidates.push(resolve(cfgRoot.trim()));
-  const env = process.env.PET_HOME;
-  if (env && env.trim()) candidates.push(resolve(env.trim()));
-  candidates.push(EXTENSION_DIR);
-  candidates.push(resolve(EXTENSION_DIR, '..'));
-  for (const dir of candidates) {
-    if (looksLikePetHome(dir)) return dir;
-  }
-  return null;
-}
-
-export function makePaths(petHome) {
-  const home = petHome ?? resolve(EXTENSION_DIR, '..');
-  return {
-    home,
-    overlayDir: join(home, 'overlay'),
-    overlayScript: join(home, 'overlay', 'overlay.ps1'),
-    overlayState: join(home, 'overlay', 'runtime', 'state.json'),
-    electronDir: join(home, 'overlay-electron'),
-    bagScript: join(home, 'bag', 'bag.ps1'),
-    assetsDir: join(home, 'assets', 'sprites'),
-  };
-}
+/**
+ * 路径解析：home 目录里放 overlay / overlay-electron / assets。
+ *
+ * 默认 home 是 <dataDir>/custom-farm；扩展从 npm 安装时，包内也自带这三个目录，
+ * 首次启动会把它们复制过去。之后在「游戏配置 → 安装」里改路径，World 会把 home
+ * 搬到新位置并重启桌面图层。
+ */
+import { existsSync } from 'node:fs';
+import { dirname, join, resolve } from 'node:path';
+import { fileURLToPath } from 'node:url';
+
+const SRC_DIR = dirname(fileURLToPath(import.meta.url));
+export const EXTENSION_DIR = resolve(SRC_DIR, '..');
+
+export const HOME_NAME = 'custom-farm';
+
+/** 一个目录是否已经有可用的桌面图层和素材。 */
+export function looksLikeHome(dir) {
+  if (!dir) return false;
+  return existsSync(join(dir, 'overlay', 'overlay.ps1'))
+    || (existsSync(join(dir, 'overlay-electron', 'main.js')) && existsSync(join(dir, 'assets', 'sprites')));
+}
+
+/** 默认 home：Coopanion 数据目录下的 custom-farm。 */
+export function defaultHome(dataDir) {
+  return join(dataDir, HOME_NAME);
+}
+
+/** 扩展包自带或开发目录里的 overlay / assets 源。 */
+export function bundleHome(packageDir) {
+  const candidates = [packageDir, resolve(packageDir, '..'), EXTENSION_DIR, resolve(EXTENSION_DIR, '..')];
+  for (const dir of candidates) {
+    if (looksLikeHome(dir)) return dir;
+  }
+  return packageDir;
+}
+
+export function makePaths(home) {
+  return {
+    home,
+    overlayDir: join(home, 'overlay'),
+    overlayScript: join(home, 'overlay', 'overlay.ps1'),
+    overlayState: join(home, 'overlay', 'runtime', 'state.json'),
+    electronDir: join(home, 'overlay-electron'),
+    assetsDir: join(home, 'assets', 'sprites'),
+  };
+}

package/src/shop.js

@@ -101,7 +101,7 @@ export function buyPriceOf(itemId) {
 /**
  * 家具总开关：2026-10-27 起暂时下架（摆放方案还没定）。
  * false = 商店不列、farm_buy 不卖家具、farm_place 报错；存档里已经有的家具保留不删。
- * 恢复：改回 true，并把 bag\bag.ps1 里的 $ShowFurniture 改成 $true。
+ * 恢复：改回 true。
  */
 export const FURNITURE_ENABLED = false;