@lily-cooperative/custom-farm 0.35.0 → 0.36.0

package/README.md

@@ -25,7 +25,7 @@
 | **农场自定义 → 杂草** | 增删杂草、阶段与天数、出现权重、上下图层、收获物名字/价值/贴图 |
 | **农场自定义 → 浇水特效 / 枯萎** | 浇水帧序列、水花帧序列、帧间隔、枯萎贴图 |
 | **生态自定义** | 一个游戏日多长、离线最多补几天、刷新间隔、每天是否推事件、浇水蒸发/补水/枯萎天数、天气 |
-| **天气** | 增删天气（无风不可删）、持续时间、权重、作物/装饰摇摆方向与幅度、压扁幅度、速度、心情变化 |
+| **天气** | 增删天气（无风不可删）、持续时间、权重、作物/装饰摇摆方向与幅度、压扁幅度、速度倍率（0~20）、心情变化 |
 | **状态自定义** | 数值状态、开关状态、条件规则、消耗行为（例如饥饿时自动吃背包里的东西） |
 | **道具自定义** | 种子/农作物/消耗品/装饰的买价卖价、能不能吃、吃掉后的状态效果、图标、摆放贴图、图层、缩放 |
 | **合成表** | 1~4 个材料合成 1 个产物，桌宠可以用 `farm_craft` 合成 |
@@ -91,7 +91,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 +117,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 | 每天蒸发 / 一次补水 / 干透后枯萎天数 |

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

@@ -56,8 +56,8 @@ const TEXT = {
     ecologyTime: '时间与生长',
     ecologyWater: '浇水',
     timePerDay: '一个游戏日 = 真实分钟',
-    maxStepDays: '单次最多推进（游戏日）',
-    tickMs: '刷新间隔（ms）',
+    maxStepDays: '离线最多补几天（安全上限）',
+    tickMs: '刷新间隔（ms，不影响生长）',
     dailyEvent: '每天推「新的一天」事件',
     saveEcology: '保存生态设置',
     addGround: '添加自定义贴图',
@@ -160,8 +160,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 +2490,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 +2519,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 +2597,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 +2634,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,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@lily-cooperative/custom-farm",
-  "version": "0.35.0",
+  "version": "0.36.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

@@ -1162,7 +1162,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 +1181,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 +1202,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 +1211,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

@@ -7,8 +7,8 @@ import { FARM_TOOL_DECLS, FarmWorld } 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 必填），播种/收割/捡东西都要先站过去。',

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

@@ -83,7 +83,7 @@ export const FARM_TOOL_DECLS = [
   {
     name: 'farm_status',
     tags: ['read', 'snapshot'],
-    description: '查看田地：每棵作物的位置 xPct（屏幕底部百分比）、等级、成熟进度、水分、是否熟了/枯萎了、还能收几次，以及背包里有什么、地上掉了什么、野草有几丛/哪些能收、主人自定义的状态（数值 + 开关）当前是多少。最后一行「最近田里的变化」会列出最近少掉的棵和原因——田空了先看这行，别当成存档被清。想知道情况就查这个，田地不会主动推送生长进度。',
+    description: '查看田地：每棵作物的位置 xPct（屏幕底部百分比）、等级、成熟进度、水分、是否熟了/枯萎了、还能收几次，以及背包里有什么、地上掉了什么、野草有几丛/哪些能收、摆放的装饰物在哪个位置、主人自定义的状态（数值 + 开关）当前是多少。最后一行「最近田里的变化」会列出最近少掉的棵和原因——田空了先看这行，别当成存档被清。想知道情况就查这个，田地不会主动推送生长进度。',
     parameters: { type: 'object', properties: {} },
   },
   {
@@ -625,10 +625,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 +701,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 ? '（生效）' : '（未生效）')
@@ -2490,6 +2513,7 @@ export class FarmWorld {
       }
       this.#state = await this.#loadOrInit();
       this.#pruneRemovedCrops();
+      this.#pruneOrphanItems();
       this.#state.current = null;
       this.#state.standingAt = null;
       // 老存档的 drySince 是按"游戏分钟"存的，换成按"累计游戏日"之后要清一次，免得永远不枯萎