@lily-cooperative/custom-farm 0.35.0 → 0.37.0

package/README.md

@@ -25,7 +25,7 @@
 | **农场自定义 → 杂草** | 增删杂草、阶段与天数、出现权重、上下图层、收获物名字/价值/贴图 |
 | **农场自定义 → 浇水特效 / 枯萎** | 浇水帧序列、水花帧序列、帧间隔、枯萎贴图 |
 | **生态自定义** | 一个游戏日多长、离线最多补几天、刷新间隔、每天是否推事件、浇水蒸发/补水/枯萎天数、天气 |
-| **天气** | 增删天气（无风不可删）、持续时间、权重、作物/装饰摇摆方向与幅度、压扁幅度、速度、心情变化 |
+| **天气** | 增删天气（无风不可删）、持续时间、权重、作物/装饰摇摆方向与幅度、压扁幅度、速度倍率（0~20）、心情变化 |
 | **状态自定义** | 数值状态、开关状态、条件规则、消耗行为（例如饥饿时自动吃背包里的东西） |
 | **道具自定义** | 种子/农作物/消耗品/装饰的买价卖价、能不能吃、吃掉后的状态效果、图标、摆放贴图、图层、缩放 |
 | **合成表** | 1~4 个材料合成 1 个产物，桌宠可以用 `farm_craft` 合成 |
@@ -71,7 +71,9 @@ powershell -NoProfile -ExecutionPolicy Bypass -File .\scripts\install.ps1
 Invoke-RestMethod -Method Post http://127.0.0.1:17788/api/run/restart
 ```
 
-## 安装路径
+## 游戏配置
+
+### 安装路径
 
 在 Coopanion 的 **游戏配置 → 安装** 里可以直接看到和修改安装路径：
 
@@ -80,6 +82,23 @@ Invoke-RestMethod -Method Post http://127.0.0.1:17788/api/run/restart
 - 存档和自定义配置仍在 `data\home\companion\data\farm\`，不会被搬走
 - 安装目录里的 `overlay\runtime\` 是运行痕迹，可以清；`assets\sprites\cust_*.png` 是你上传的贴图
 
+### 显示器
+
+**游戏配置 → 显示器** 可以选择图层放在哪块屏幕：
+
+- 「自动」使用主屏
+- 下拉里会列出当前所有显示器，改完约 1 秒内移动到目标屏幕
+- 这个设置作用于 Electron 图层；WPF 回退仍跟随桌宠所在屏幕
+
+### 备份与重置
+
+**游戏配置** 页底部有「存档与重置」：
+
+- **备份存档**：把 `state.json` 和 `custom.json` 复制到 `data\farm\backups\backup-时间\`
+- **重置一切**：先自动备份，再清空 `state.json` 和 `custom.json`，World 自动重启并生成默认目录；安装路径和已上传的 PNG 文件不会被删除
+
+也可以从「存档与重置」页签操作同样的按钮。
+
 ## 桌面图层
 
 - **Windows 10/11**：默认 Electron/HTML 图层；Electron 不可用时回退 WPF。
@@ -91,7 +110,7 @@ Invoke-RestMethod -Method Post http://127.0.0.1:17788/api/run/restart
 
 | 工具 | 用途 |
 |---|---|
-| `farm_status` | 看每棵作物的位置、等级、进度、水分、是否可收/枯萎，背包、掉落物和最近田里的变化 |
+| `farm_status` | 看每棵作物的位置、等级、进度、水分、是否可收/枯萎，背包、掉落物、摆放的装饰物位置和最近田里的变化 |
 | `farm_stand` | 站到某个位置，`at` 必填 |
 | `farm_plant` | 在脚下种一棵，消耗 1 包种子 |
 | `farm_water` | 浇脚下一片 |
@@ -117,8 +136,8 @@ Invoke-RestMethod -Method Post http://127.0.0.1:17788/api/run/restart
 | `cropScale` / `dropScale` | 1.5 / 0.6 | 作物 / 掉落物大小 |
 | `groundHeight` / `stripHeight` | 5 / 320 | 地表高度 / 图层纵向覆盖 |
 | `realMinutesPerDay` | 60 | 1 游戏日 = 多少真实分钟 |
-| `maxStepDays` | 1 | 一次最多补几个游戏日 |
-| `tickIntervalMs` | 5000 | 刷新间隔 |
+| `maxStepDays` | 1 | 离线回来最多补几个游戏日（安全上限，防止关机一夜跳几十天） |
+| `tickIntervalMs` | 5000 | 刷新间隔；只影响状态/事件更新频率，不改变生长速度 |
 | `startCoins` | 120 | 新开局金币 |
 | `moodIntervalMin` | 10 | 心情按真实分钟结算的间隔 |
 | 浇水 | 0.15 / 1 / 2.2 | 每天蒸发 / 一次补水 / 干透后枯萎天数 |
@@ -151,6 +170,7 @@ Invoke-RestMethod -Method Post http://127.0.0.1:17788/api/run/restart
 - Coopanion `>= 0.2.13`，World API `6`
 - Node.js `>= 22`（Coopanion 自带）
 - Electron `^45.1.0`（桌面图层依赖）
+- Windows 10/11 已实机测试；macOS / Linux 未实机测试
 
 ## 许可
 

package/describe.json

@@ -2,7 +2,7 @@
   "tools": [
     {
       "name": "farm_status",
-      "description": "查看田地：每棵作物的位置 xPct（屏幕底部百分比）、等级、成熟进度、水分、是否熟了/枯萎了、还能收几次，以及背包里有什么、地上掉了什么、野草有几丛/哪些能收、主人自定义的状态（数值 + 开关）当前是多少。最后一行「最近田里的变化」会列出最近少掉的棵和原因——田空了先看这行，别当成存档被清。想知道情况就查这个，田地不会主动推送生长进度。",
+      "description": "查看田地：每棵作物的位置 xPct（屏幕底部百分比）、等级、成熟进度、水分、是否熟了/枯萎了、还能收几次，以及背包里有什么、地上掉了什么、野草有几丛/哪些能收、摆放的装饰物在哪个位置、主人自定义的状态（数值 + 开关）当前是多少。最后一行「最近田里的变化」会列出最近少掉的棵和原因——田空了先看这行，别当成存档被清。想知道情况就查这个，田地不会主动推送生长进度。",
       "parameters": {
         "type": "object",
         "properties": {}
@@ -12,8 +12,8 @@
         "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)."
+        "zh": "看田：每棵作物的位置、等级、进度、水分、是否可收/枯萎，外加背包、地上的掉落物、摆放的装饰物位置和最近田里的变化（少了哪棵、为什么）。",
+        "en": "Show every plant (position, level, progress, moisture, ripe/wilted) plus the bag, the drops, placed decorations and recent field changes (which plant is gone and why)."
       }
     },
     {

package/dist/webui.js

@@ -22,14 +22,99 @@ function renameFarmConfigTab() {
 if (typeof document !== 'undefined') {
   const start = () => {
     renameFarmConfigTab();
-    new MutationObserver(renameFarmConfigTab).observe(document.body, { childList: true, subtree: true, characterData: true });
-    window.addEventListener('hashchange', renameFarmConfigTab);
-    setInterval(renameFarmConfigTab, 1000);
+    injectFarmConfigActions();
+    new MutationObserver(() => { renameFarmConfigTab(); injectFarmConfigActions(); }).observe(document.body, { childList: true, subtree: true, characterData: true });
+    window.addEventListener('hashchange', () => { renameFarmConfigTab(); injectFarmConfigActions(); });
+    setInterval(() => { renameFarmConfigTab(); injectFarmConfigActions(); }, 1000);
   };
   if (document.body) start();
   else document.addEventListener('DOMContentLoaded', start, { once: true });
 }
 
+/** 调 World 的 manage 面板：备份 / 重置。 */
+async function farmManageCall(method) {
+  const res = await fetch('/api/webui/providers/' + encodeURIComponent('world:farm') + '/panels/manage/' + method, {
+    method: 'POST',
+    headers: { 'content-type': 'application/json' },
+    body: JSON.stringify({ args: [] }),
+  });
+  const data = await res.json().catch(() => ({}));
+  if (!res.ok) throw new Error(data.error || ('HTTP ' + res.status));
+  return data;
+}
+
+/** 往宿主的「游戏配置」页里塞「存档与重置」按钮。 */
+function injectFarmConfigActions() {
+  try {
+    const hash = String(location.hash || '');
+    if (!hash.includes('world%3Afarm') && !hash.includes('world:farm')) return;
+    const view = document.querySelector('.configview');
+    if (!view || view.querySelector('[data-farm-manage]')) return;
+
+    const section = document.createElement('div');
+    section.className = 'tsection';
+    section.dataset.farmManage = '1';
+    section.textContent = '存档与重置';
+
+    const desc = document.createElement('div');
+    desc.className = 'tsecdesc';
+    desc.textContent = '备份会复制 state.json 和 custom.json 到 data/farm/backups；重置会先备份，再清空存档和全部自定义设置，World 随后重启。';
+
+    const row = document.createElement('div');
+    row.className = 'trow';
+    const label = document.createElement('span');
+    label.className = 'tlabel';
+    label.textContent = '操作';
+    const field = document.createElement('div');
+    field.className = 'tfield';
+    field.style.display = 'flex';
+    field.style.gap = '8px';
+    field.style.flexWrap = 'wrap';
+    const status = document.createElement('span');
+    status.className = 'tdesc';
+    status.setAttribute('role', 'status');
+
+    const button = (text, primary) => {
+      const b = document.createElement('button');
+      b.type = 'button';
+      b.className = 'btn sm' + (primary ? ' primary' : '');
+      b.textContent = text;
+      return b;
+    };
+    const backup = button('备份存档', true);
+    const reset = button('重置一切', false);
+
+    backup.addEventListener('click', async () => {
+      backup.disabled = true;
+      status.textContent = '正在备份…';
+      try {
+        const r = await farmManageCall('backup');
+        status.textContent = r.text || '已备份';
+      } catch (err) {
+        status.textContent = '备份失败：' + ((err && err.message) || err);
+      } finally { backup.disabled = false; }
+    });
+
+    reset.addEventListener('click', async () => {
+      if (!window.confirm('确定重置一切？会清空存档和全部自定义设置（会先自动备份）。')) return;
+      reset.disabled = true;
+      status.textContent = '正在重置…';
+      try {
+        const r = await farmManageCall('reset');
+        status.textContent = r.text || '已重置，World 正在重启…';
+        setTimeout(() => { try { location.reload(); } catch { /* ignore */ } }, 3000);
+      } catch (err) {
+        status.textContent = '重置失败：' + ((err && err.message) || err);
+        reset.disabled = false;
+      }
+    });
+
+    field.append(backup, reset, status);
+    row.append(label, field);
+    view.append(section, desc, row);
+  } catch { /* 不是宿主的配置页就算了 */ }
+}
+
 const TEXT = {
   zh: {
     title: '农场',
@@ -56,8 +141,8 @@ const TEXT = {
     ecologyTime: '时间与生长',
     ecologyWater: '浇水',
     timePerDay: '一个游戏日 = 真实分钟',
-    maxStepDays: '单次最多推进（游戏日）',
-    tickMs: '刷新间隔（ms）',
+    maxStepDays: '离线最多补几天（安全上限）',
+    tickMs: '刷新间隔（ms，不影响生长）',
     dailyEvent: '每天推「新的一天」事件',
     saveEcology: '保存生态设置',
     addGround: '添加自定义贴图',
@@ -160,8 +245,8 @@ const TEXT = {
     ecologyTime: 'Time & growth',
     ecologyWater: 'Watering',
     timePerDay: 'Real minutes per game day',
-    maxStepDays: 'Max game days per step',
-    tickMs: 'Refresh interval (ms)',
+    maxStepDays: 'Max offline days (safety cap)',
+    tickMs: 'Refresh interval (ms, does not affect growth)',
     dailyEvent: 'Push a "new day" event daily',
     saveEcology: 'Save ecology settings',
     addGround: 'Add custom tile',
@@ -2490,7 +2575,7 @@ function ecologyPanel(ctx) {
       decorAmp: Math.max(0, Math.min(40, Number(w.decorAmp ?? w.swayAmp) || 0)),
       squash: Math.max(0, Math.min(0.6, Number(w.squash) || 0)),
       mood: Math.max(-100, Math.min(100, Number(w.mood) || 0)),
-      speed: Math.max(0.2, Math.min(4, Number(w.speed) || 1)),
+      speed: Math.max(0, Math.min(20, Number(w.speed) || 1)),
     }));
     if (!out.some((w) => w.id === 'calm')) out.unshift({ ...DEFAULT_WEATHERS[0] });
     if (!out.some((w) => w.id !== 'calm')) out.push(...DEFAULT_WEATHERS.slice(1).map((w) => ({ ...w })));
@@ -2519,9 +2604,10 @@ function ecologyPanel(ctx) {
     if (!draft) draft = cloneSettings(snapshot?.settings);
     return draft;
   };
-  const num = (value, onChange, step = '1', min = '0') => {
+  const num = (value, onChange, step = '1', min = '0', max = '') => {
     const input = ui.input({ type: 'number', value: String(value ?? '') });
     input.step = step; input.min = min;
+    if (max !== '') input.max = max;
     input.addEventListener('input', () => { const n = Number(input.value); if (Number.isFinite(n)) onChange(n); }, { signal: ctx.signal });
     return input;
   };
@@ -2596,7 +2682,7 @@ function ecologyPanel(ctx) {
     row1.append(
       ui.field(zh ? '持续（秒）' : 'Duration (s)', num(w.duration, (v) => { w.duration = v; }, '1', '1')),
       ui.field(zh ? '触发概率（权重）' : 'Probability (weight)', num(w.weight, (v) => { w.weight = v; }, '1', '0')),
-      ui.field(zh ? '速度（倍率）' : 'Speed (x)', num(w.speed, (v) => { w.speed = v; }, '0.1', '0.2')),
+      ui.field(zh ? '速度（倍率）' : 'Speed (x)', num(w.speed, (v) => { w.speed = v; }, '0.1', '0', '20')),
       ui.field(zh ? '心情变化/结算' : 'Mood per settlement', num(w.mood, (v) => { w.mood = v; }, '1', '-100')),
     );
     const crop = ui.h('div', 'cf-row');
@@ -2633,13 +2719,15 @@ function ecologyPanel(ctx) {
     const d = getDraft();
     const sheet = ui.sheet({
       title: zh ? '生态自定义' : 'Ecology',
-      desc: zh ? '生长条件与天气。天气按持续时间切换，触发概率按权重计算。' : 'Growth conditions and weather. Weather changes by duration and weighted probability.',
+      desc: zh
+        ? '1 游戏日 = 现实分钟决定生长速度；离线最多补几天是防止关机回来一次跳太多天；刷新间隔只影响状态/事件更新，不影响生长速度。天气按持续时间切换，触发概率按权重计算。'
+        : 'Real minutes per game day sets growth speed; max offline days caps how many game days a long shutdown can catch up; the refresh interval only affects state/event updates, not growth speed. Weather changes by duration and weighted probability.',
     });
     const time = ui.h('div', 'cf-row');
     time.append(
       ui.field(zh ? '1 游戏日 = 现实分钟' : 'Real minutes per game day', num(d.realMinutesPerDay, (v) => { d.realMinutesPerDay = v; }, '0.5', '0.5')),
-      ui.field(zh ? '单次最多补几天' : 'Max offline days', num(d.maxStepDays, (v) => { d.maxStepDays = v; }, '0.1', '0.01')),
-      ui.field(zh ? '刷新间隔（毫秒）' : 'Tick interval (ms)', num(d.tickIntervalMs, (v) => { d.tickIntervalMs = v; }, '100', '1000')),
+      ui.field(zh ? '离线最多补几天（安全上限）' : 'Max offline days (safety cap)', num(d.maxStepDays, (v) => { d.maxStepDays = v; }, '0.1', '0.01')),
+      ui.field(zh ? '刷新间隔（毫秒，不影响生长）' : 'Refresh interval (ms, does not affect growth)', num(d.tickIntervalMs, (v) => { d.tickIntervalMs = v; }, '100', '1000')),
     );
     const daily = ui.checkbox(zh ? '每天推送 farm.day' : 'Emit farm.day', {
       checked: d.dailyEvent,
@@ -2697,8 +2785,52 @@ function ecologyPanel(ctx) {
   reload();
 }
 
+function managePanel(ctx) {
+  const { ui } = ctx;
+  const root = ui.h('div', 'cf-root');
+  ctx.root.appendChild(root);
+  const sheet = ui.sheet({
+    title: '存档与重置',
+    desc: '备份会复制 state.json 和 custom.json 到 data/farm/backups；重置会先备份，再清空存档和全部自定义设置，World 随后重启。',
+  });
+  const bar = ui.rowbar();
+  const status = ui.h('p', 'cf-note', '');
+  const backup = ui.button('备份存档', {
+    variant: 'primary',
+    onClick: async () => {
+      backup.disabled = true;
+      status.textContent = '正在备份…';
+      try {
+        const r = await ctx.invoke('backup');
+        status.textContent = r.text || '已备份';
+      } catch (err) {
+        status.textContent = '备份失败：' + ((err && err.message) || err);
+      } finally { backup.disabled = false; }
+    },
+  });
+  const reset = ui.button('重置一切', {
+    onClick: async () => {
+      if (!window.confirm('确定重置一切？会清空存档和全部自定义设置（会先自动备份）。')) return;
+      reset.disabled = true;
+      status.textContent = '正在重置…';
+      try {
+        const r = await ctx.invoke('reset');
+        status.textContent = r.text || '已重置，World 正在重启…';
+        setTimeout(() => { try { location.reload(); } catch { /* ignore */ } }, 3000);
+      } catch (err) {
+        status.textContent = '重置失败：' + ((err && err.message) || err);
+        reset.disabled = false;
+      }
+    },
+  });
+  bar.append(backup, reset);
+  sheet.body.append(bar, status);
+  root.appendChild(sheet.el);
+}
+
 export default {
   panels: {
+    manage: { mount: managePanel },
     bag: { mount: bagPanel },
     shop: { mount: shopPanel },
     customize: { mount: panel },

package/overlay-electron/main.js

@@ -9,6 +9,7 @@ function arg(name, fallback = '') {
 }
 
 const statePath = path.resolve(arg('state-path', path.join(__dirname, '..', 'overlay', 'runtime', 'state.json')));
+const screensPath = path.join(path.dirname(statePath), 'screens.json');
 const assetsDir = path.resolve(arg('assets-dir', path.join(__dirname, '..', 'assets', 'sprites')));
 const logPath = arg('log', '');
 const pidPath = arg('pid', '');
@@ -46,10 +47,34 @@ function checkLease() {
 }
 
 
+function listScreens() {
+  const primary = screen.getPrimaryDisplay();
+  return screen.getAllDisplays().map((d, i) => ({
+    id: String(d.id),
+    label: d.label || ('Display ' + (i + 1)),
+    primary: d.id === primary.id,
+    width: Math.round(d.bounds.width),
+    height: Math.round(d.bounds.height),
+  }));
+}
+
+function writeScreens() {
+  try {
+    fs.mkdirSync(path.dirname(screensPath), { recursive: true });
+    fs.writeFileSync(screensPath, JSON.stringify(listScreens(), null, 2), 'utf8');
+  } catch (e) { log('screens.json failed: ' + e.message); }
+}
+
+function displayFor(st) {
+  const all = screen.getAllDisplays();
+  const id = String(st?.screen ?? '');
+  return all.find((d) => String(d.id) === id) || screen.getPrimaryDisplay();
+}
+
 function bounds() {
   const st = readState() || {};
   const h = Math.min(800, Math.max(120, Number(st.stripHeight) || 320));
-  const wa = screen.getPrimaryDisplay().workArea;
+  const wa = displayFor(st).workArea;
   return { x: Math.round(wa.x), y: Math.round(wa.y + wa.height - h), width: Math.round(wa.width), height: h };
 }
 
@@ -103,21 +128,22 @@ if (!app.requestSingleInstanceLock()) {
   app.on('second-instance', () => { if (win) win.showInactive(); });
   app.whenReady().then(() => {
     writePid();
+    writeScreens();
     createWindow();
-    screen.on('display-metrics-changed', () => {
+    const fit = () => {
       if (!win) return;
       const b = bounds();
-      win.setBounds(b);
-      win.webContents.send('resize');
-    });
+      const cur = win.getBounds();
+      if (cur.x !== b.x || cur.y !== b.y || cur.width !== b.width || cur.height !== b.height) {
+        win.setBounds(b);
+        win.webContents.send('resize');
+      }
+    };
+    for (const event of ['display-added', 'display-removed', 'display-metrics-changed']) {
+      screen.on(event, fit);
+    }
     setInterval(checkLease, 5000);
-    setInterval(() => {
-      if (!win) return;
-      const st = readState() || {};
-      const h = Math.min(800, Math.max(120, Number(st.stripHeight) || 320));
-      const b = bounds();
-      if (win.getBounds().height !== h) { win.setBounds(b); win.webContents.send('resize'); }
-    }, 1000);
+    setInterval(fit, 1000);
   });
 }
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@lily-cooperative/custom-farm",
-  "version": "0.35.0",
+  "version": "0.37.0",
   "type": "module",
   "private": false,
   "publishConfig": {

package/src/catalog.js

@@ -387,6 +387,8 @@ export class FarmCatalog {
       recipes: [],
       settings: {},
       seededDecor: false,
+    seededCabin: false,
+    seededDecorSet: false,
     seededFreeCrops: false,
     seededFood: false,
     seededMood: false,
@@ -472,18 +474,31 @@ export class FarmCatalog {
     this.persist();
   }
 
-  /** 旧存档切到免费素材作物集：补全新作物，删掉没有替代的小麦/卷心菜/葡萄。 */
+  /** 旧存档切到免费素材作物集：补全新作物，删掉没有替代的小麦/卷心菜/葡萄。只迁移一次，之后保留用户改动。 */
   ensureFreeCrops() {
     if (!this.store) return;
+    const removed = new Set(['wheat', 'chinese_cabbage', 'grape']);
+    const filterConsume = () => {
+      let changed = false;
+      for (const action of this.store.consume ?? []) {
+        const before = (action.items ?? []).length;
+        action.items = (action.items ?? []).filter((id) => !removed.has(id) && !removed.has(String(id).replace(/^seed_/, '')));
+        if ((action.items ?? []).length !== before) changed = true;
+      }
+      return changed;
+    };
+    if (this.store.seededFreeCrops) {
+      const before = this.store.crops.length;
+      this.store.crops = this.store.crops.filter((c) => !removed.has(c.key));
+      if (filterConsume() || this.store.crops.length !== before) this.persist();
+      return;
+    }
     const defs = new Map(this.builtinCrops().map((c) => [c.key, c]));
-    const removed = new Set(["wheat", "chinese_cabbage", "grape"]);
     const order = Object.keys(CROPS);
     // 旧档没有 builtin 标记，但 wheat/chinese_cabbage/grape 一定是旧内置作物；删掉。
     const custom = this.store.crops.filter((c) => !c.builtin && !removed.has(c.key));
     this.store.crops = order.map((key) => defs.get(key)).filter(Boolean).concat(custom);
-    for (const action of this.store.consume ?? []) {
-      action.items = (action.items ?? []).filter((id) => !removed.has(id) && !removed.has(String(id).replace(/^seed_/, "")));
-    }
+    filterConsume();
     this.store.seededFreeCrops = true;
     this.persist();
   }
@@ -519,20 +534,25 @@ export class FarmCatalog {
       !(r.inputs ?? []).some((x) => removed.has(x.item)));
     if ((this.store.items?.length ?? 0) !== beforeItems || (this.store.recipes?.length ?? 0) !== beforeRecipes) this.persist();
   }
-  /** 稻草堆下架：删掉目录道具、背包和已摆放的旧实例。 */
-  /** 小木屋是后加的内置装饰；旧存档也补上。 */
+  /** 小木屋是后加的内置装饰；只在迁移时补一次，用户删掉后不再回来。 */
   ensureCabin() {
-    if (!this.store) return;
-    if ((this.store.items ?? []).some((it) => it.id === 'deco_cabin')) return;
-    const def = this.builtinDecorItems().find((it) => it.id === 'deco_cabin');
-    if (!def) return;
-    const item = this.normalizeItem(def, this.store.items.length, this.store.states ?? []);
-    if (item) { this.store.items.push(item); this.persist(); }
+    if (!this.store || this.store.seededCabin) return;
+    const list = this.store.items ?? (this.store.items = []);
+    if (!list.some((it) => it.id === 'deco_cabin')) {
+      const def = this.builtinDecorItems().find((it) => it.id === 'deco_cabin');
+      if (def) {
+        const item = this.normalizeItem(def, list.length, this.store.states ?? []);
+        if (item) list.push(item);
+      }
+    }
+    this.store.seededCabin = true;
+    this.persist();
   }
 
   ensureDecorSet() {
-    if (!this.store) return;
+    if (!this.store || this.store.seededDecorSet) return;
     this.store.items = (this.store.items ?? []).filter((it) => it.id !== 'deco_haystack');
+    this.store.seededDecorSet = true;
     this.persist();
   }
   /** 老存档补一次内置装饰；只补一次，之后用户删了也不会自动回来。 */
@@ -620,6 +640,8 @@ export class FarmCatalog {
       recipes,
       settings: this.normalizeSettings(raw.settings),
       seededDecor: Boolean(raw.seededDecor),
+    seededCabin: Boolean(raw.seededCabin),
+    seededDecorSet: Boolean(raw.seededDecorSet),
     seededFreeCrops: Boolean(raw.seededFreeCrops),
     seededFood: Boolean(raw.seededFood),
     seededMood: Boolean(raw.seededMood),

package/src/farm.js

@@ -49,6 +49,8 @@ export const REACH = 0.05;
 export const DEFAULTS = {
   /** 安装目录：overlay / overlay-electron / assets 放在这里；空 = <dataDir>/custom-farm */
   installPath: '',
+  /** 选中的显示器 id；空 = 自动（主屏）。 */
+  screen: '',
   /** 最多同时种几棵（屏幕上不重叠地放得下的上限） */
   maxPlants: 12,
   /** 屏幕逻辑宽度，用来把"像素宽"换算成 x 间距 */
@@ -1074,6 +1076,7 @@ export function overlayView(state) {
     weatherFx: state.weatherFx ?? weatherFxOf(normalizeWeathers(DEFAULT_WEATHERS)[0]),
     current: state.current ?? null,
     currentAt: Number.isFinite(state.standingAt) ? Number(state.standingAt) : null,
+    screen: state.screen ?? '',
     farm: { min: fb.min, max: fb.max, cells: fb.cells, cropScale: fb.cropScale, cropZoom: Number(state.cropScale) || 1 },
     ground: { tile: groundTile },
     waterFx: live.status ? {
@@ -1162,7 +1165,8 @@ export function overlayView(state) {
 
 /** 给工具看的摘要。 */
 export function summary(state, cfg = DEFAULTS) {
-  const total = Object.values(state.inventory).reduce((a, b) => a + b, 0);
+  const inventory = Object.fromEntries(Object.entries(state.inventory ?? {}).filter(([id]) => Boolean(live.items?.[id])));
+  const total = Object.values(inventory).reduce((a, b) => a + b, 0);
   const weedList = (state.weeds ?? []).map((w) => {
     const t = weedTypeOf(w);
     const lv = Number(w.level ?? 0);
@@ -1180,6 +1184,17 @@ export function summary(state, cfg = DEFAULTS) {
     };
   });
   const ripeWeeds = weedList.filter((w) => w.ready);
+  const decorations = (state.furniture ?? [])
+    .filter((f) => f.x !== null && f.x !== undefined)
+    .map((f) => ({
+      uid: f.uid,
+      id: f.id,
+      name: live.names?.[f.id] ?? f.id,
+      x: round2(Number(f.x)),
+      xPct: Math.round(Number(f.x) * 100),
+      layer: live.items?.[f.id]?.layer ?? f.layer ?? 'bottom',
+    }))
+    .sort((a, b) => a.x - b.x);
   return {
     day: state.day,
     clock: clockText(state.minute),
@@ -1190,7 +1205,7 @@ export function summary(state, cfg = DEFAULTS) {
     standingAt: Number.isFinite(state.standingAt) ? Number(state.standingAt) : null,
     realMinutesPerDay: Number(cfg.realMinutesPerDay),
     bagTotal: total,
-    bag: { ...state.inventory },
+    bag: inventory,
     drops: state.drops.length,
     planted: state.plots.length,
     max: cfg.maxPlants,
@@ -1199,6 +1214,7 @@ export function summary(state, cfg = DEFAULTS) {
     weeds: weedList.length,
     weedRipe: ripeWeeds.length,
     weedList: ripeWeeds,
+    decorations,
     states: (Array.isArray(cfg.stateDefs) ? cfg.stateDefs : []).map((d) => {
       const value = state.states?.[d.id] ?? {};
       const flag = d.kind === 'flag';

package/src/index.js

@@ -3,12 +3,12 @@
  */
 import { CROPS, ROTATION } from './crops.js';
 import { DEFAULTS, overlayView, summary } from './farm.js';
-import { FARM_TOOL_DECLS, FarmWorld } from './world.js';
+import { FARM_TOOL_DECLS, FarmWorld, screenOptions } from './world.js';
 
 const TOOL_SUMMARIES = {
   farm_status: {
-    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).',
+    zh: '看田：每棵作物的位置、等级、进度、水分、是否可收/枯萎，外加背包、地上的掉落物、摆放的装饰物位置和最近田里的变化（少了哪棵、为什么）。',
+    en: 'Show every plant (position, level, progress, moisture, ripe/wilted) plus the bag, the drops, placed decorations and recent field changes (which plant is gone and why).',
   },
   farm_stand: {
     zh: '站到某个位置（at 必填），播种/收割/捡东西都要先站过去。',
@@ -64,7 +64,9 @@ export const farmDefinition = {
     botDir: ctx.botDir,
     packageDir: ctx.packageDir,
     persist: (patch) => ctx.persist(patch),
+    restart: () => ctx.restart(),
   }),
+  configOptions: (kind, language) => (kind === 'farm-screens' ? screenOptions(language) : []),
   describe: {
     tools: describeTools(FARM_TOOL_DECLS),
     events: [

package/src/weather.js

@@ -36,7 +36,7 @@ export function normalizeWeathers(input) {
       decorAmp: clamp(row.decorAmp ?? row.swayAmp, 0, 40, 3),
       squash: clamp(row.squash, 0, 0.6, 0),
       mood: clamp(row.mood ?? { calm: 2, breeze: 1, gale: -6, egg: 4 }[id], -100, 100, 0),
-      speed: clamp(row.speed, 0.2, 4, 1),
+      speed: clamp(row.speed, 0, 20, 1),
     });
   }
   if (!out.some((w) => w.id === 'calm')) out.unshift({ ...DEFAULT_WEATHERS[0] });

package/src/world.js

@@ -18,7 +18,7 @@
 import { spawn } from 'node:child_process';
 import { cpSync, existsSync, mkdirSync, readFileSync, renameSync, rmSync, symlinkSync, unlinkSync, writeFileSync } from 'node:fs';
 import { execFileSync } from 'node:child_process';
-import { mkdir, readFile, readdir, rename, unlink, writeFile } from 'node:fs/promises';
+import { mkdir, copyFile, readFile, readdir, rename, unlink, writeFile } from 'node:fs/promises';
 import { dirname, join, resolve, sep } from 'node:path';
 import { fileURLToPath } from 'node:url';
 
@@ -73,6 +73,17 @@ import {
 } from './farm.js';
 
 const ENV_PROMPT = fileURLToPath(new URL('./ENV_PROMPT.md', import.meta.url));
+/** Electron 图层写出的显示器列表；配置页的「显示器」下拉用它。 */
+let screenChoices = [];
+
+export function screenOptions(language = 'zh') {
+  const zh = String(language).toLowerCase().startsWith('zh');
+  const out = [{ value: '', label: zh ? '自动（主屏）' : 'Auto (primary)' }];
+  for (const [i, d] of screenChoices.entries()) {
+    out.push({ value: String(d.id), label: String(d.label || (zh ? '显示器 ' : 'Display ') + (i + 1)) + (d.primary ? (zh ? '（主屏）' : ' (primary)') : '') });
+  }
+  return out;
+}
 const msg = (err) => (err instanceof Error ? err.message : String(err));
 
 const pct = (x) => (x === null || x === undefined ? '?' : Math.round(Number(x) * 100));
@@ -83,7 +94,7 @@ export const FARM_TOOL_DECLS = [
   {
     name: 'farm_status',
     tags: ['read', 'snapshot'],
-    description: '查看田地：每棵作物的位置 xPct（屏幕底部百分比）、等级、成熟进度、水分、是否熟了/枯萎了、还能收几次，以及背包里有什么、地上掉了什么、野草有几丛/哪些能收、主人自定义的状态（数值 + 开关）当前是多少。最后一行「最近田里的变化」会列出最近少掉的棵和原因——田空了先看这行，别当成存档被清。想知道情况就查这个，田地不会主动推送生长进度。',
+    description: '查看田地：每棵作物的位置 xPct（屏幕底部百分比）、等级、成熟进度、水分、是否熟了/枯萎了、还能收几次，以及背包里有什么、地上掉了什么、野草有几丛/哪些能收、摆放的装饰物在哪个位置、主人自定义的状态（数值 + 开关）当前是多少。最后一行「最近田里的变化」会列出最近少掉的棵和原因——田空了先看这行，别当成存档被清。想知道情况就查这个，田地不会主动推送生长进度。',
     parameters: { type: 'object', properties: {} },
   },
   {
@@ -297,6 +308,13 @@ function farmConfigGroups(language = 'zh', defaultHomePath = '') {
         description: t('影响之后的操作；startCoins 主要影响新开局。', 'Affects subsequent actions; startCoins mainly affects a fresh game.'),
         properties: {
           'worlds.farm.startCoins': int(t('新开局初始金币', 'Starting coins'), t('默认 120，只影响新开档。', 'Default 120; only affects a new save.'), 0, 100000),
+          'worlds.farm.screen': {
+            type: 'string',
+            title: t('显示器', 'Display'),
+            description: t('图层放在哪块屏幕；「自动」跟随主屏。', 'Which display hosts the overlay; Auto uses the primary display.'),
+            'x-options': 'farm-screens',
+            'x-hot': true,
+          },
           'worlds.farm.overlayEnabled': bool(t('写桌面图层的 state.json', 'Write the overlay state.json'), t('默认开。关掉后桌面农场停止更新。', 'On by default. Off stops the desktop farm from updating.')),
           'worlds.farm.hideFarm': bool(t('隐藏农场', 'Hide farm'), t('勾选后停止桌面图层；农场仍在后台生长，取消勾选恢复。', 'Stop the desktop overlay; the farm keeps growing. Uncheck to show it again.')),
         },
@@ -331,6 +349,7 @@ export class FarmWorld {
     this.botDir = opts.botDir ?? process.cwd();
     this.packageDir = opts.packageDir ?? process.cwd();
     this.persistConfig = typeof opts.persist === 'function' ? opts.persist : null;
+    this.restartWorld = typeof opts.restart === 'function' ? opts.restart : null;
     // 是否由这个 World 管桌面图层的启停（单元测试里传 false，避免碰到真实图层）
     this.manageLayers = opts.manageLayers !== false;
     this.language = 'zh';
@@ -372,6 +391,7 @@ export class FarmWorld {
     const water = this.#catalog?.status?.water ?? null;
     return {
       ...DEFAULTS,
+      screen: String(this.cfg?.screen ?? ''),
       maxPlants: this.#num('maxPlants', 1, 24),
       screenWidth,
       zoom: this.#num('zoom', 1, 8),
@@ -543,6 +563,67 @@ export class FarmWorld {
     this.#ensureLayers('安装路径变更');
   }
 
+  /** 备份存档：把 state.json 和 custom.json 复制到 data/farm/backups/backup-时间/。 */
+  async #backupNow() {
+    const d = new Date();
+    const p2 = (n) => String(n).padStart(2, '0');
+    const stamp = d.getFullYear() + p2(d.getMonth() + 1) + p2(d.getDate()) + '-' + p2(d.getHours()) + p2(d.getMinutes()) + p2(d.getSeconds());
+    const dir = join(this.dataDir, 'farm', 'backups', 'backup-' + stamp);
+    await mkdir(dir, { recursive: true });
+    const files = [];
+    for (const [name, src] of [
+      ['state.json', this.stateFile()],
+      ['custom.json', join(this.dataDir, 'farm', 'custom.json')],
+    ]) {
+      try {
+        if (!existsSync(src)) continue;
+        await copyFile(src, join(dir, name));
+        files.push(name);
+      } catch (err) {
+        this.#host?.log?.warn?.('自定义农场：备份文件失败', { file: src, err: msg(err) });
+      }
+    }
+    this.#host?.log?.info?.('自定义农场：已备份存档', { dir, files });
+    return {
+      ok: true,
+      path: dir,
+      files,
+      text: files.length ? '已备份到 ' + dir : '没有可备份的存档文件；已创建空备份目录 ' + dir,
+    };
+  }
+
+  /** 重置一切：先备份，再删 state.json / custom.json，最后重启 World 重新生成默认目录。 */
+  async #resetAll() {
+    const backup = await this.#backupNow().catch(() => null);
+    // 先断开内存里的 state，World 重启/停止时就不会把旧状态写回去。
+    this.#state = null;
+    for (const file of [this.stateFile(), join(this.dataDir, 'farm', 'custom.json')]) {
+      try { await unlink(file); } catch { /* 文件本来就不存在 */ }
+    }
+    this.#host?.log?.warn?.('自定义农场：已重置全部存档与设置', { backup: backup?.path ?? null });
+    if (this.restartWorld) this.setTimeoutImpl(() => { void this.restartWorld(); }, 300);
+    return {
+      ok: true,
+      backup: backup?.path ?? null,
+      text: '已重置存档和自定义设置' + (backup?.path ? '；备份在 ' + backup.path : '') + '。World 正在重启。',
+    };
+  }
+
+  /** 读取 Electron 图层写出的显示器列表，供游戏配置的「显示器」下拉使用。 */
+  #refreshScreens() {
+    try {
+      const file = join(dirname(this.overlayFile()), 'screens.json');
+      const list = JSON.parse(readFileSync(file, 'utf8'));
+      if (Array.isArray(list) && list.length) {
+        screenChoices = list.map((d) => ({
+          id: String(d.id ?? ''),
+          label: String(d.label ?? ''),
+          primary: Boolean(d.primary),
+        })).filter((d) => d.id);
+      }
+    } catch { /* 图层还没起来，保留上次的列表 */ }
+  }
+
   /** 自定义目录：custom.json + 安装目录下的 assets\sprites。 */
   #createCatalog() {
     const home = this.#homePath();
@@ -625,10 +706,30 @@ export class FarmWorld {
       delete this.#state.inventory?.['seed_' + key];
     }
     delete this.#state.inventory?.seed_wheat;
-    for (const key of ['wheat', 'flour', 'pasta']) delete this.#state.inventory?.[key];
+    for (const key of ['wheat', 'flour']) delete this.#state.inventory?.[key];
     this.#state.furniture = (this.#state.furniture ?? []).filter((f) => f.id !== 'deco_haystack');
     delete this.#state.inventory?.deco_haystack;
-    this.#catalog?.removeRecipesUsing(['chinese_cabbage', 'seed_chinese_cabbage', 'grape', 'seed_grape', 'wheat', 'flour', 'pasta']);
+    this.#catalog?.removeRecipesUsing(['chinese_cabbage', 'seed_chinese_cabbage', 'grape', 'seed_grape', 'wheat', 'flour']);
+  }
+
+  /** 清掉旧版本留在背包/田里的孤儿 id（比如旧家具 deco_16）：当前目录里没有这个道具就删。 */
+  #pruneOrphanItems() {
+    if (!this.#state) return;
+    const known = new Set(Object.keys(live.items ?? {}));
+    if (!known.size) return;
+    let changed = false;
+    for (const id of Object.keys(this.#state.inventory ?? {})) {
+      if (known.has(id)) continue;
+      delete this.#state.inventory[id];
+      changed = true;
+    }
+    const beforeFurniture = (this.#state.furniture ?? []).length;
+    this.#state.furniture = (this.#state.furniture ?? []).filter((f) => known.has(f.id));
+    if (this.#state.furniture.length !== beforeFurniture) changed = true;
+    const beforeDrops = (this.#state.drops ?? []).length;
+    this.#state.drops = (this.#state.drops ?? []).filter((d) => known.has(d.item));
+    if (this.#state.drops.length !== beforeDrops) changed = true;
+    if (changed) this.#host?.log?.info?.('自定义农场：清掉旧存档里已经不存在的道具');
   }
   #ensureStarted() {
     if (!this.#started || !this.#state) throw new Error('自定义农场 World 还没启动；等它启用后再试。');
@@ -681,6 +782,9 @@ export class FarmWorld {
         lines.push('野草 ' + s.weeds + ' 丛（都还没长成；种东西时会把脚下的铲掉）。');
       }
     }
+    if (s.decorations.length) {
+      lines.push('摆放的装饰：' + s.decorations.map((d) => d.name + '（' + d.xPct + '%，' + (d.layer === 'top' ? '上层' : '下层') + '）').join('、') + '。');
+    }
     if (s.states.length) {
       lines.push('状态：' + s.states.map((st) => (st.kind === 'flag'
         ? st.name + (st.active ? '（生效）' : '（未生效）')
@@ -1259,7 +1363,9 @@ export class FarmWorld {
         this.#state.dropScale = cfg.dropScale;
         this.#state.groundHeight = cfg.groundHeight;
         this.#state.stripHeight = cfg.stripHeight;
+        this.#state.screen = cfg.screen;
       }
+      this.#refreshScreens();
       await writeJsonAtomic(this.overlayFile(), overlayView(this.#state));
     } catch (err) {
       this.#host?.log?.debug?.('自定义农场：图层状态没写出去', { file: this.overlayFile(), err: msg(err) });
@@ -1459,6 +1565,11 @@ export class FarmWorld {
         { label: '天数', value: started ? '第 ' + s.day + ' 天' : '—', tone: 'plain' },
       ],
       panels: [{
+        id: 'manage',
+        title: '存档与重置',
+        description: '备份存档，或把存档和全部自定义设置重置为默认。',
+        getMethods: ['state'],
+      }, {
         id: 'bag',
         title: '背包',
         description: '背包、农场预览、摆放道具与手动合成；装饰在这里输入坐标放置。',
@@ -1505,6 +1616,12 @@ export class FarmWorld {
   async invoke(panel, method, args = []) {
     return this.#serial(async () => {
       const cfg = this.#cfgAll();
+      if (panel === 'manage') {
+        if (method === 'backup') return this.#backupNow();
+        if (method === 'reset') return this.#resetAll();
+        if (method === 'state') return { ok: true };
+        throw new Error('不认识的存档操作：' + method);
+      }
       if (panel === 'status') return this.#statusInvoke(method, args, cfg);
       if (panel === 'bag') return this.#bagInvoke(method, args);
       if (panel === 'shop') return this.#shopInvoke(method, args);
@@ -2490,6 +2607,7 @@ export class FarmWorld {
       }
       this.#state = await this.#loadOrInit();
       this.#pruneRemovedCrops();
+      this.#pruneOrphanItems();
       this.#state.current = null;
       this.#state.standingAt = null;
       // 老存档的 drySince 是按"游戏分钟"存的，换成按"累计游戏日"之后要清一次，免得永远不枯萎