@lily-cooperative/custom-farm 0.33.6 → 0.34.1

package/README.md

@@ -1,13 +1,15 @@
 # 自定义农场 · custom-farm
 
-桌宠在**任务栏上沿**种地：18 种作物、任意多棵（不能重叠）、浇水会干、太久不浇会枯萎、
+给 Coopanion 桌宠的种田扩展：18 种作物只是起点。**农作物、杂草、装饰物、天气、状态、道具、合成表和贴图都能在面板里完全自定义**——想种什么、长什么样、吃什么补什么，全由你决定。
+
+桌宠在**任务栏上沿**种地：任意多棵（不能重叠）、浇水会干、太久不浇会枯萎、
 有的作物能反复收；收下来的东西**掉在地上**，桌宠要走过去捡，捡起来才进背包。
 
 ## 版本与依赖
 
 | 项目 | 要求 |
 |---|---|
-| 当前扩展版本 | `0.33.6` |
+| 当前扩展版本 | `0.34.1` |
 | Coopanion | `>= 0.2.13`，World API `6` |
 | Node.js | `>= 22` |
 | Electron | `^45.1.0`（overlay 依赖） |
@@ -140,7 +142,7 @@ farm_collect               → 捡进背包（图层会播"吸到身上"）
 | `src/index.js` | WorldDefinition + describe |
 | `src/ENV_PROMPT.md` | 给桌宠的环境提示词（自主行动、三事件、省 token） |
 | `dist/webui.js` / `.css` | 「农场自定义」面板（纯 ESM，无构建步骤） |
-| `tools/selftest.mjs` | 165 项断言（不装 Coopanion 也能跑） |
+| `tools/selftest.mjs` | 166 项断言（不装 Coopanion 也能跑） |
 | `tools/reset-farm.ps1` | 重开局 |
 
 ## 4. 调参（`worlds.farm`）
@@ -162,7 +164,7 @@ farm_collect               → 捡进背包（图层会播"吸到身上"）
 ## 5. 验证
 
 ```powershell
-node tools/selftest.mjs     # 165 项
+node tools/selftest.mjs     # 166 项
 node tools/gen-describe.mjs # 改了工具/事件后
 ```
 
@@ -240,7 +242,7 @@ node tools/gen-describe.mjs # 改了工具/事件后
 | **开关状态** | 只有「初始生效」；作为条件的目标（比如「饥饿」） |
 | **条件** | 当 `[数值状态] [< <= > >= == !=] [阈值]` 成立时，让 `[目标开关]` 生效；多条规则指向同一个开关时按「或」处理 |
 | **消耗行为** | 触发状态生效（开关生效 / 数值 > 0）且冷却到了，就从选中的道具里吃掉 `count` 个，并把 `变化量` 加到指定数值状态（例如 `饥饿 → 吃番茄×1 → 饱食度 +25`）；关掉「自动消耗」就只推事件提醒桌宠 |
-| **添加示例** | 一键加「饱食度」0~100、初始 100、每天 -5，「饥饿」，条件 `饱食度 < 30 → 饥饿`，以及消耗行为 `饥饿 → 吃番茄等作物 ×1 → 饱食度 +25`（0.5 天冷却，自动） |
+| **添加示例** | 一键补齐「饱食度」0~100、初始 100、每天 -5，「饥饿」，条件 `饱食度 < 30 → 饥饿`，消耗行为 `饥饿 → 吃作物/米饭/意面 ×1 → 饱食度 +25`（0.5 天冷却，自动），并给所有食物补默认效果。默认配置已经带这些；删掉后想恢复就点它（幂等，不会重复加） |
 
 - 定义存在 `custom.json` 的 `states` / `rules` / `consume`；当前值存在存档 `state.states`，冷却进度存在 `state.stateActions`，重启/离线都保留。
 - 每次 tick 按游戏日漂移、重算条件，然后跑消耗行为；自动消耗成功会推 `farm.state` 事件（「饥饿生效：吃掉了番茄×1，饱食度 +25」）。
@@ -270,12 +272,42 @@ node tools/gen-describe.mjs # 改了工具/事件后
 | `meat` 鲜肉 | 22 | 6 | 商店食材 |
 | `egg_fried_rice` 蛋炒饭 | — | 35 | **不能购买**，只能合成 |
 | `item_15` 番茄炒蛋 | — | 30 | **不能购买**，只能合成（旧道具改图标） |
+| `pasta` 意大利面 | — | 55 | **不能购买**，肉 + 番茄合成（图标 `icon_item_pasta`） |
 
 合成表：
 
 - 稻穗 ×1 → 大米 ×1
 - 鸡蛋 ×1 + 大米 ×1 → 蛋炒饭 ×1
 - 鸡蛋 ×1 + 番茄 ×1 → 番茄炒蛋 ×1
+- 鲜肉 ×1 + 番茄 ×1 → 意大利面 ×1
+
+### 默认饱食度 / 心情
+
+新开局会自动带一套状态（旧存档第一次加载时补上，之后不会覆盖你改过的值）：
+
+- **饱食度** 0~100，初始 100，每游戏日 -5；**低于 30 → 饥饿**
+- **心情** 0~100，初始 60；`>= 70` 开心，`< 30` 无聊
+- **饥饿**生效时自动吃掉背包里的作物/食物（0.5 游戏日冷却），吃完按道具效果回饱食度
+- 每一种内置作物、米饭和意面都默认同时加饱食度和心情；道具自己的效果优先于「消耗行为」上的 `effectDelta`
+
+| 道具 | +饱食度 | +心情 | 道具 | +饱食度 | +心情 |
+|---|---:|---:|---|---:|---:|
+| 土豆 `potato` | 24 | 2 | 胡萝卜 `carrot` | 16 | 2 |
+| 番茄 `tomato` | 14 | 4 | 草莓 `strawberry` | 12 | 7 |
+| 玉米 `corn` | 22 | 3 | 南瓜 `pumpkin` | 28 | 4 |
+| 甜菜根 `beetroot` | 16 | 2 | 蓝莓 `blueberry` | 10 | 7 |
+| 小白菜 `bok_choy` | 14 | 2 | 花椰菜 `cauliflower` | 16 | 2 |
+| 黄瓜 `cucumber` | 12 | 3 | 茄子 `eggplant` | 15 | 2 |
+| 大蒜 `garlic` | 6 | 1 | 菠萝 `pineapple` | 18 | 8 |
+| 小萝卜 `radish` | 10 | 2 | 红辣椒 `red_chili` | 5 | 3 |
+| 红洋葱 `red_onion` | 8 | 1 | 西瓜 `watermelon` | 24 | 7 |
+| 稻穗 `rice_ear` | 8 | 1 | 大米 `rice` | 30 | 3 |
+| 鸡蛋 `egg` | 10 | 2 | 鲜肉 `meat` | 20 | 2 |
+| 蛋炒饭 `egg_fried_rice` | 48 | 10 | 番茄炒蛋 `item_15` | 38 | 8 |
+| 意大利面 `pasta` | 42 | 9 | | | |
+
+> 自定义作物默认没有食物效果；在「道具自定义 → 农作物道具」里给它加状态效果即可。
+
 > 删除道具、作物或杂草时，会一并清理：**背包里的该道具、农场里已摆放的该装饰、地上的掉落物、引用它的合成表**，以及这个条目上传的 cust_* 贴图。内置共享贴图（例如所有装饰共用的图标文件）不会被删，避免误删别的条目。
 
 - 价格/效果/图标存在 `custom.json` 的 `items`；种子/农作物条目跟作物自动同步，价格和效果不会被覆盖。

package/describe.json

@@ -0,0 +1,356 @@
+{
+  "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_bag",
+      "description": "打开（或唤到前面）背包面板。背包里是收下来的作物，可以看每种有多少；面板本身只读，东西还是靠种/收/捡进出。",
+      "parameters": {
+        "type": "object",
+        "properties": {}
+      },
+      "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.js

@@ -798,7 +798,7 @@ function panel(ctx) {
     return {
       farmCells: Number(src.farmCells ?? 48),
       groundHeight: Number(src.groundHeight ?? 5),
-      stripHeight: Number(src.stripHeight ?? 320),
+      stripHeight: Number(src.stripHeight ?? 320),
       moodIntervalMin: Number(src.moodIntervalMin ?? 10),
       maxPlants: Number(src.maxPlants ?? 12),
       cropGapScale: Number(src.cropGapScale ?? 0.8),
@@ -1023,8 +1023,8 @@ const ST = {
     addNumber: '添加数值状态',
     addFlag: '添加开关状态',
     addRule: '添加条件',
-    addExample: '添加示例：饱食度 → 饥饿',
-    exampleDone: '示例已添加',
+    addExample: '补齐示例：饱食度 / 饥饿 / 食物效果',
+    exampleDone: '示例已补齐',
     name: '名字',
     kind: '类型',
     number: '数值',
@@ -1090,8 +1090,8 @@ const ST = {
     addNumber: 'Add number state',
     addFlag: 'Add flag state',
     addRule: 'Add rule',
-    addExample: 'Add example: satiety → hunger',
-    exampleDone: 'Example added',
+    addExample: 'Fill in example: satiety / hunger / food effects',
+    exampleDone: 'Example filled in',
     name: 'Name',
     kind: 'Kind',
     number: 'Number',
@@ -2468,11 +2468,11 @@ function ecologyPanel(ctx) {
   ctx.root.appendChild(root);
   let snapshot = null;
 
-  const DEFAULT_WEATHERS = [
-    { id: 'calm', name: '无风', builtin: true, deletable: false, duration: 300, weight: 30, cropSway: 'both', cropAmp: 4, decorSway: 'none', decorAmp: 1, squash: 0, mood: 2, speed: 1 },
-    { id: 'breeze', name: '微风', builtin: true, deletable: true, duration: 250, weight: 40, cropSway: 'left', cropAmp: 5, decorSway: 'none', decorAmp: 3, squash: 0, mood: 1, speed: 1.2 },
-    { id: 'gale', name: '大风', builtin: true, deletable: true, duration: 100, weight: 20, cropSway: 'right', cropAmp: 13, decorSway: 'none', decorAmp: 9, squash: 0, mood: -6, speed: 2.4 },
-    { id: 'egg', name: '彩蛋', builtin: true, deletable: true, duration: 300, weight: 10, cropSway: 'none', cropAmp: 0, decorSway: 'none', decorAmp: 0, squash: 0.45, mood: 4, speed: 3 },
+  const DEFAULT_WEATHERS = [
+    { id: 'calm', name: '无风', builtin: true, deletable: false, duration: 300, weight: 30, cropSway: 'both', cropAmp: 4, decorSway: 'none', decorAmp: 1, squash: 0, mood: 2, speed: 1 },
+    { id: 'breeze', name: '微风', builtin: true, deletable: true, duration: 250, weight: 40, cropSway: 'left', cropAmp: 5, decorSway: 'none', decorAmp: 3, squash: 0, mood: 1, speed: 1.2 },
+    { id: 'gale', name: '大风', builtin: true, deletable: true, duration: 100, weight: 20, cropSway: 'right', cropAmp: 13, decorSway: 'none', decorAmp: 9, squash: 0, mood: -6, speed: 2.4 },
+    { id: 'egg', name: '彩蛋', builtin: true, deletable: true, duration: 300, weight: 10, cropSway: 'none', cropAmp: 0, decorSway: 'none', decorAmp: 0, squash: 0.45, mood: 4, speed: 3 },
   ];
 
   function normalizeWeathers(list) {
@@ -2546,7 +2546,7 @@ function ecologyPanel(ctx) {
         tickIntervalMs: d.tickIntervalMs,
         dailyEvent: d.dailyEvent,
         water: { ...d.water },
-        moodIntervalMin: d.moodIntervalMin,
+        moodIntervalMin: d.moodIntervalMin,
         weathers: normalizeWeathers(d.weathers),
       }]);
       ui.toast(zh ? '已保存' : 'Saved');
@@ -2596,7 +2596,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.2')),
       ui.field(zh ? '心情变化/结算' : 'Mood per settlement', num(w.mood, (v) => { w.mood = v; }, '1', '-100')),
     );
     const crop = ui.h('div', 'cf-row');
@@ -2651,8 +2651,8 @@ function ecologyPanel(ctx) {
       ui.field(zh ? '一次浇水补水' : 'Water gain', num(d.water.waterGain, (v) => { d.water.waterGain = v; }, '0.05', '0')),
       ui.field(zh ? '干透后枯萎天数' : 'Wilt days', num(d.water.wiltDays, (v) => { d.water.wiltDays = v; }, '0.1', '0.01')),
     );
-    const moodRow = ui.h('div', 'cf-row');
-    moodRow.append(ui.field(zh ? '心情结算间隔（真实分钟）' : 'Mood interval (real min)', num(d.moodIntervalMin, (v) => { d.moodIntervalMin = v; }, '1', '1')));
+    const moodRow = ui.h('div', 'cf-row');
+    moodRow.append(ui.field(zh ? '心情结算间隔（真实分钟）' : 'Mood interval (real min)', num(d.moodIntervalMin, (v) => { d.moodIntervalMin = v; }, '1', '1')));
     const weatherBox = ui.h('div', 'cf-list');
     d.weathers.forEach((w, i) => weatherBox.append(weatherCard(w, i)));
     const add = ui.button(zh ? '添加天气' : 'Add weather', {

package/package.json

@@ -1,17 +1,19 @@
 {
   "name": "@lily-cooperative/custom-farm",
-  "version": "0.33.6",
+  "version": "0.34.1",
   "type": "module",
   "private": false,
   "publishConfig": {
     "access": "public"
   },
-  "description": "自定义农场（Custom Farm）—— 给 Coopanion 桌宠的种田扩展：18 种作物、浇水/生长/收割/卖钱，确定性 tick（纯代码，不唤模型），并把渲染用的 state.json 写给桌面图层。",
+  "description": "自定义农场（Custom Farm）—— 给 Coopanion 桌宠的种田扩展：18 种作物只是起点。农作物、杂草、装饰物、天气、状态、道具、合成表和贴图都能在面板里完全自定义；种、浇、收、吃、买卖全部本地确定性运行，不唤模型。",
   "keywords": [
     "cortico-world",
+    "coopanion",
     "farm",
     "种田",
-    "自定义农场"
+    "自定义农场",
+    "customizable"
   ],
   "license": "MIT",
   "author": {
@@ -42,6 +44,8 @@
     "overlay-electron",
     "bag",
     "assets",
+    "icon.png",
+    "describe.json",
     "README.md",
     "LICENSE"
   ],
@@ -53,6 +57,16 @@
     "kind": "world",
     "api": 6,
     "displayName": "自定义农场",
+    "locales": {
+      "zh": {
+        "displayName": "自定义农场",
+        "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."
+      }
+    },
     "tags": [
       "game",
       "companion",
@@ -60,7 +74,7 @@
       "experimental"
     ],
     "describe": "describe.json",
-    "icon": "assets/icon.png",
+    "icon": "icon.png",
     "webUiClient": "dist/webui.js",
     "webUiStyle": "dist/webui.css"
   },

package/src/ENV_PROMPT.md

@@ -62,14 +62,15 @@
 ## 状态与吃饭
 
 - 状态定义、初始值、每天变化、阈值在「状态自定义」；这一页只写你看到状态后怎么做。
-- 饥饿/数值偏低时直接吃；没有食物再提醒主人。
-- 不要自己改状态数值，也不要吃被设成不可消耗的东西。
+- 默认带饱食度（0~100，初始 100，每天 -5；低于 30 → 饥饿）和心情（0~100，初始 60；>=70 开心，<30 无聊）。
+- 饥饿/数值偏低时直接吃；每一种作物、米饭和意面默认都会加饱食度和心情，优先吃背包里有的。
+- 没有食物再提醒主人；不要自己改状态数值，也不要吃被设成不可消耗的东西。
 
 ## 心情
 
 - 数值状态 mood 是心情（0~100，初始 60）；happy 在 >=70 生效，bored 在 <30 生效。
 - 天气按「生态自定义」里的结算间隔改变心情：大风扣 6，无风 +2，微风 +1，彩蛋 +4；具体以设置页为准。
-- 每吃一个消耗品额外 +8 心情（和道具自身效果叠加）。
+- 吃东西按道具自己的效果加心情（默认作物 +1~8、意面 +9）；道具没配心情效果时才退回消耗行为的 +8。
 - bored 生效时：优先自己吃一个能吃的道具；没有食物就提醒主人，或者主动说一句。
 - happy 生效时：主动和主人说一句，不要在这时提要求或扫兴。
 - 收到 farm.state 且 meta 里有 moodState 时，按上面的规则说话/吃东西；不要自己改心情数值。

package/src/catalog.js

@@ -30,6 +30,50 @@ const ORIGINAL_PRICES = structuredClone(CROP_PRICES);
 
 const RULE_OPS = ['<', '<=', '>', '>=', '==', '!='];
 
+/** 默认心情/饱食度状态 id；用户改过 id 时由 dietStateIds() 解析实际值。 */
+const SATIETY_ID = 'st_satiety';
+const HUNGRY_ID = 'st_hungry';
+const MOOD_ID = 'mood';
+
+/**
+ * 每种可吃道具默认加多少饱食度 / 心情。
+ * 主食（土豆、玉米、南瓜、米饭、意面）饱食度高；水果心情高；辣椒、大蒜这类只当调味。
+ */
+const DEFAULT_FOOD_EFFECTS = {
+  potato: { satiety: 24, mood: 2 },
+  carrot: { satiety: 16, mood: 2 },
+  tomato: { satiety: 14, mood: 4 },
+  strawberry: { satiety: 12, mood: 7 },
+  corn: { satiety: 22, mood: 3 },
+  pumpkin: { satiety: 28, mood: 4 },
+  beetroot: { satiety: 16, mood: 2 },
+  blueberry: { satiety: 10, mood: 7 },
+  bok_choy: { satiety: 14, mood: 2 },
+  cauliflower: { satiety: 16, mood: 2 },
+  cucumber: { satiety: 12, mood: 3 },
+  eggplant: { satiety: 15, mood: 2 },
+  garlic: { satiety: 6, mood: 1 },
+  pineapple: { satiety: 18, mood: 8 },
+  radish: { satiety: 10, mood: 2 },
+  red_chili: { satiety: 5, mood: 3 },
+  red_onion: { satiety: 8, mood: 1 },
+  watermelon: { satiety: 24, mood: 7 },
+  rice_ear: { satiety: 8, mood: 1 },
+  rice: { satiety: 30, mood: 3 },
+  egg: { satiety: 10, mood: 2 },
+  meat: { satiety: 20, mood: 2 },
+  egg_fried_rice: { satiety: 48, mood: 10 },
+  item_15: { satiety: 38, mood: 8 },
+  pasta: { satiety: 42, mood: 9 },
+};
+
+/** 默认状态定义（只在缺少时补，不会覆盖用户改过的同名状态）。 */
+const DEFAULT_SATIETY_STATE = { id: SATIETY_ID, name: '饱食度', kind: 'number', min: 0, max: 100, initial: 100, driftPerDay: -5, unit: '' };
+const DEFAULT_HUNGRY_STATE = { id: HUNGRY_ID, name: '饥饿', kind: 'flag', initialActive: false };
+
+/** 饥饿/无聊时优先吃的道具顺序：作物在前，主食在后补满。 */
+const DEFAULT_EDIBLE_ITEMS = ['tomato', 'potato', 'rice', 'pasta', 'egg_fried_rice', 'item_15', 'carrot', 'strawberry', 'corn', 'pumpkin', 'beetroot', 'bok_choy', 'cauliflower', 'cucumber', 'eggplant', 'garlic', 'pineapple', 'radish', 'red_chili', 'red_onion', 'watermelon'];
+
 /** 内置杂草：游戏里现成的三种野草/花，每个都有逐阶段贴图。 */
 const BUILTIN_WEEDS = [
   { key: 'weed', name: '野草', stages: 4, days: [0.45, 0.45, 0.45], weight: 55, prefix: 'sprite_resource_weeds', frames: 4, itemName: '', value: 0 },
@@ -116,12 +160,13 @@ export class FarmCatalog {
   /** Grok 画的食物/食材图标。菜品 buy=0（只在合成表里出）。 */
   builtinFoodItems() {
     return [
-      { id: 'rice_ear', name: '稻穗', buy: 8, sell: 2, icon: 'icon_item_rice_ear' },
-      { id: 'rice', name: '大米', buy: 15, sell: 4, icon: 'icon_item_rice' },
-      { id: 'egg', name: '鸡蛋', buy: 6, sell: 2, icon: 'icon_item_egg' },
-      { id: 'meat', name: '鲜肉', buy: 22, sell: 6, icon: 'icon_item_meat' },
-      { id: 'egg_fried_rice', name: '蛋炒饭', buy: 0, sell: 35, icon: 'icon_item_egg_fried_rice' },
-      { id: 'item_15', name: '番茄炒蛋', buy: 0, sell: 30, icon: 'icon_item_tomato_egg' },
+      { id: 'rice_ear', name: '稻穗', buy: 8, sell: 2, icon: 'icon_item_rice_ear', effects: this.defaultItemEffects('rice_ear') },
+      { id: 'rice', name: '大米', buy: 15, sell: 4, icon: 'icon_item_rice', effects: this.defaultItemEffects('rice') },
+      { id: 'egg', name: '鸡蛋', buy: 6, sell: 2, icon: 'icon_item_egg', effects: this.defaultItemEffects('egg') },
+      { id: 'meat', name: '鲜肉', buy: 22, sell: 6, icon: 'icon_item_meat', effects: this.defaultItemEffects('meat') },
+      { id: 'egg_fried_rice', name: '蛋炒饭', buy: 0, sell: 35, icon: 'icon_item_egg_fried_rice', effects: this.defaultItemEffects('egg_fried_rice') },
+      { id: 'item_15', name: '番茄炒蛋', buy: 0, sell: 30, icon: 'icon_item_tomato_egg', effects: this.defaultItemEffects('item_15') },
+      { id: 'pasta', name: '意大利面', buy: 0, sell: 55, icon: 'icon_item_pasta', effects: this.defaultItemEffects('pasta') },
     ];
   }
 
@@ -130,9 +175,130 @@ export class FarmCatalog {
       { id: 'recipe_rice', inputs: [{ item: 'rice_ear', count: 1 }], output: { item: 'rice', count: 1 } },
       { id: 'recipe_egg_fried_rice', inputs: [{ item: 'egg', count: 1 }, { item: 'rice', count: 1 }], output: { item: 'egg_fried_rice', count: 1 } },
       { id: 'recipe_tomato_egg', inputs: [{ item: 'egg', count: 1 }, { item: 'tomato', count: 1 }], output: { item: 'item_15', count: 1 } },
+      { id: 'recipe_pasta', inputs: [{ item: 'meat', count: 1 }, { item: 'tomato', count: 1 }], output: { item: 'pasta', count: 1 } },
+    ];
+  }
+
+  /** 用当前自定义状态 id 生成某道具的默认效果；状态还没建好时先写内置 id。 */
+  defaultItemEffects(id) {
+    const spec = DEFAULT_FOOD_EFFECTS[id];
+    if (!spec) return [];
+    const ids = this.dietStateIds();
+    return [
+      { state: ids.satietyId ?? SATIETY_ID, delta: spec.satiety },
+      { state: ids.moodId ?? MOOD_ID, delta: spec.mood },
     ];
   }
 
+  /** 找到当前存档里「饱食度 / 饥饿 / 心情」的实际 id；用户改过 id 或换过名字时也能接上。 */
+  dietStateIds() {
+    const states = this.store?.states ?? [];
+    const satiety = states.find((s) => s.kind === 'number' && (s.id === SATIETY_ID || s.name === '饱食度'));
+    const hungry = states.find((s) => s.kind === 'flag' && (s.id === HUNGRY_ID || s.name === '饥饿'));
+    const mood = states.find((s) => s.kind === 'number' && (s.id === MOOD_ID || s.name === '心情'));
+    return { satietyId: satiety?.id ?? null, hungryId: hungry?.id ?? null, moodId: mood?.id ?? null };
+  }
+
+  /** 默认饱食度/饥饿/条件/消耗行为；已有同名状态时只补缺的部分。 */
+  ensureSatiety(force = false) {
+    if (!this.store) return { satiety: null, hungry: null };
+    if (this.store.seededSatiety && !force) {
+      const ids = this.dietStateIds();
+      return { satiety: ids.satietyId, hungry: ids.hungryId };
+    }
+    const states = this.store.states ?? (this.store.states = []);
+    let changed = false;
+    let satiety = states.find((s) => s.kind === 'number' && (s.id === SATIETY_ID || s.name === '饱食度'));
+    if (!satiety) {
+      satiety = this.normalizeState(DEFAULT_SATIETY_STATE, states.length);
+      if (satiety) { states.push(satiety); changed = true; }
+    }
+    let hungry = states.find((s) => s.kind === 'flag' && (s.id === HUNGRY_ID || s.name === '饥饿'));
+    if (!hungry) {
+      hungry = this.normalizeState(DEFAULT_HUNGRY_STATE, states.length);
+      if (hungry) { states.push(hungry); changed = true; }
+    }
+    if (satiety && hungry) {
+      const rules = this.store.rules ?? (this.store.rules = []);
+      if (!rules.some((r) => r.source === satiety.id && r.target === hungry.id)) {
+        const rule = this.normalizeRule({ id: 'r_hungry', source: satiety.id, op: '<', value: 30, target: hungry.id }, rules.length, states);
+        if (rule) { rules.push(rule); changed = true; }
+      }
+      const actions = this.store.consume ?? (this.store.consume = []);
+      if (!actions.some((c) => c.trigger === hungry.id && (c.items ?? []).includes('tomato'))) {
+        const action = this.normalizeConsume({ id: 'c_hungry', trigger: hungry.id, items: DEFAULT_EDIBLE_ITEMS, count: 1, effectState: satiety.id, effectDelta: 25, cooldownDays: 0.5, auto: true, enabled: true }, actions.length, states);
+        if (action) { actions.push(action); changed = true; }
+      }
+    }
+    this.store.seededSatiety = true;
+    if (changed) this.persist();
+    return { satiety: satiety?.id ?? null, hungry: hungry?.id ?? null };
+  }
+
+  /** 旧档的饥饿消耗行为只列了几种作物；补上米饭/意面等新食物一次。 */
+  ensureEdibleItems() {
+    if (!this.store || this.store.seededEdibleItems) return;
+    const { hungryId } = this.dietStateIds();
+    let changed = false;
+    if (hungryId) {
+      for (const action of this.store.consume ?? []) {
+        if (action.trigger !== hungryId || !Array.isArray(action.items)) continue;
+        if (action.items.includes('pasta')) continue;
+        action.items = [...new Set([...action.items, ...DEFAULT_EDIBLE_ITEMS])].slice(0, 24);
+        changed = true;
+      }
+    }
+    this.store.seededEdibleItems = true;
+    if (changed) this.persist();
+  }
+
+  /** 给每种作物和食物补默认的 +饱食度 / +心情；只填空效果，不覆盖用户自己配的。 */
+  ensureDietEffects(force = false) {
+    if (!this.store) return;
+    if (this.store.seededDietEffects && !force) return;
+    const { satietyId, moodId } = this.dietStateIds();
+    if (!satietyId || !moodId) return;
+    let changed = false;
+    const list = this.store.items ?? (this.store.items = []);
+    const builtinFoods = new Map(this.builtinFoodItems().map((it) => [it.id, it]));
+    for (const [id, spec] of Object.entries(DEFAULT_FOOD_EFFECTS)) {
+      let item = list.find((it) => it.id === id);
+      if (!item) {
+        const def = builtinFoods.get(id);
+        const crop = this.store.crops.find((c) => c.key === id && c.enabled !== false);
+        if (def) {
+          item = this.normalizeItem({ ...def, kind: 'consumable', consumable: true, effects: [] }, list.length, this.store.states);
+        } else if (crop) {
+          item = this.normalizeItem({
+            id, kind: 'crop', crop: id, name: crop.name,
+            icon: crop.itemSprite ?? 'icon_item_soil', buy: 0, sell: crop.value,
+            consumable: true, effects: [],
+          }, list.length, this.store.states);
+        }
+        if (!item) continue; // 作物已被用户删掉：不强行加回来
+        list.push(item);
+        changed = true;
+      }
+      if (!Array.isArray(item.effects) || item.effects.length === 0) {
+        item.effects = [
+          { state: satietyId, delta: spec.satiety },
+          { state: moodId, delta: spec.mood },
+        ];
+        changed = true;
+      }
+    }
+    // 旧存档里被清理掉的意面补回来：道具 + 用现有食材（肉 + 番茄）合成。
+    const pasta = list.find((it) => it.id === 'pasta');
+    if (pasta && !pasta.icon) { pasta.icon = 'icon_item_pasta'; changed = true; }
+    const recipes = this.store.recipes ?? (this.store.recipes = []);
+    if (!recipes.some((r) => r.id === 'recipe_pasta')) {
+      const recipe = this.normalizeRecipe(this.builtinFoodRecipes().find((r) => r.id === 'recipe_pasta'), recipes.length);
+      if (recipe) { recipes.push(recipe); changed = true; }
+    }
+    this.store.seededDietEffects = true;
+    if (changed) this.persist();
+  }
+
   /** 老存档补一次食物/配方；只补一次。 */
   ensureFood() {
     if (!this.store || this.store.seededFood) return;
@@ -140,13 +306,13 @@ export class FarmCatalog {
     for (const def of this.builtinFoodItems()) {
       const idx = list.findIndex((it) => it.id === def.id);
       if (idx < 0) {
-        const item = this.normalizeItem({ ...def, kind: 'consumable', consumable: true, effects: [] }, list.length, this.store.states ?? []);
+        const item = this.normalizeItem({ ...def, kind: 'consumable', consumable: true, effects: def.effects ?? [] }, list.length, this.store.states ?? []);
         if (item) list.push(item);
       } else if (def.id === 'item_15') {
-        // 旧番茄炒蛋道具改成 Grok 图标
+        // 旧番茄炒蛋道具改成 Grok 图标；效果不清空，后面 ensureDietEffects 会补默认值。
         list[idx] = this.normalizeItem({
           ...list[idx], name: def.name, icon: def.icon, buy: def.buy, sell: def.sell,
-          kind: 'consumable', consumable: true, effects: [],
+          kind: 'consumable', consumable: true,
         }, idx, this.store.states ?? []) ?? list[idx];
       }
     }
@@ -224,6 +390,9 @@ export class FarmCatalog {
     seededFreeCrops: false,
     seededFood: false,
     seededMood: false,
+    seededSatiety: false,
+    seededDietEffects: false,
+    seededEdibleItems: false,
     };
   }
 
@@ -263,10 +432,13 @@ export class FarmCatalog {
     } catch { raw = null; }
     this.store = this.normalizeStore(raw);
     this.ensureFreeCrops();
-    this.ensureFood();
     this.ensureMood();
+    this.ensureSatiety();
+    this.ensureFood();
     this.ensureRiceEar();
     this.ensureRemovedFood();
+    this.ensureDietEffects();
+    this.ensureEdibleItems();
     this.ensureBuiltinDecor();
     this.ensureCabin();
     this.ensureDecorSet();
@@ -292,7 +464,7 @@ export class FarmCatalog {
     addRule({ id: 'r_bored', source: 'mood', op: '<', value: 30, target: 'bored' });
     const actions = this.store.consume ?? (this.store.consume = []);
     if (!actions.some((c) => c.id === 'c_bored_eat')) {
-      const items = ['tomato', 'egg_fried_rice', 'rice', 'egg', 'carrot', 'potato', 'strawberry', 'corn', 'pumpkin', 'beetroot', 'bok_choy', 'cauliflower', 'cucumber', 'eggplant', 'garlic', 'pineapple', 'radish', 'red_chili', 'red_onion', 'watermelon'];
+      const items = ['tomato', 'egg_fried_rice', 'rice', 'pasta', 'egg', 'carrot', 'potato', 'strawberry', 'corn', 'pumpkin', 'beetroot', 'bok_choy', 'cauliflower', 'cucumber', 'eggplant', 'garlic', 'pineapple', 'radish', 'red_chili', 'red_onion', 'watermelon'];
       const action = this.normalizeConsume({ id: 'c_bored_eat', trigger: 'bored', items, count: 1, effectState: 'mood', effectDelta: 8, cooldownDays: 0.15, auto: true, enabled: true }, actions.length, states);
       if (action) actions.push(action);
     }
@@ -316,7 +488,7 @@ export class FarmCatalog {
     this.persist();
   }
 
-  /** 小麦/面粉/意面没有免费图标，整条链下架；旧存档里的道具和配方一起清掉。 */
+  /** 小麦/面粉没有免费图标，整条链下架；意面改用肉 + 番茄的配方保留。 */
   /** 稻穗容易被误删；它是稻米链的入口，始终保留一个默认道具。 */
   ensureRiceEar() {
     if (!this.store) return;
@@ -324,7 +496,7 @@ export class FarmCatalog {
     if (list.some((it) => it.id === 'rice_ear')) return;
     const def = this.builtinFoodItems().find((it) => it.id === 'rice_ear');
     if (!def) return;
-    const item = this.normalizeItem({ ...def, kind: 'consumable', consumable: true, effects: [] }, list.length, this.store.states ?? []);
+    const item = this.normalizeItem({ ...def, kind: 'consumable', consumable: true, effects: def.effects ?? [] }, list.length, this.store.states ?? []);
     if (item) {
       list.push(item);
       if (!(this.store.recipes ?? []).some((r) => r.id === 'recipe_rice')) {
@@ -337,7 +509,7 @@ export class FarmCatalog {
 
   ensureRemovedFood() {
     if (!this.store) return;
-    const removed = new Set(['wheat', 'flour', 'pasta', 'recipe_flour', 'recipe_pasta']);
+    const removed = new Set(['wheat', 'flour', 'recipe_flour']);
     const beforeItems = this.store.items?.length ?? 0;
     const beforeRecipes = this.store.recipes?.length ?? 0;
     this.store.items = (this.store.items ?? []).filter((it) => !removed.has(it.id));
@@ -451,6 +623,9 @@ export class FarmCatalog {
     seededFreeCrops: Boolean(raw.seededFreeCrops),
     seededFood: Boolean(raw.seededFood),
     seededMood: Boolean(raw.seededMood),
+    seededSatiety: Boolean(raw.seededSatiety),
+    seededDietEffects: Boolean(raw.seededDietEffects),
+    seededEdibleItems: Boolean(raw.seededEdibleItems),
     };
   }
 
@@ -1437,38 +1612,13 @@ export class FarmCatalog {
     this.apply();
   }
 
-  /** 一键加示例：饱食度 0~100、每天 -5；低于 30 → 饥饿生效。 */
+  /** 一键补齐示例：饱食度 0~100、每天 -5；低于 30 → 饥饿；并给所有食物补默认效果。 */
   addExample() {
-    if (this.store.states.some((s) => s.name === '饱食度' || s.name === '饥饿')) {
-      throw new Error('已经有「饱食度」或「饥饿」了。');
-    }
-    let sid = 'st_satiety';
-    while (this.store.states.some((s) => s.id === sid)) sid += '_2';
-    let hid = 'st_hungry';
-    while (this.store.states.some((s) => s.id === hid)) hid += '_2';
-    this.store.states.push(
-      { id: sid, name: '饱食度', kind: 'number', min: 0, max: 100, initial: 100, driftPerDay: -5, unit: '' },
-      { id: hid, name: '饥饿', kind: 'flag', initialActive: false },
-    );
-    let rid = 'r_hungry';
-    while (this.store.rules.some((r) => r.id === rid)) rid += '_2';
-    this.store.rules.push({ id: rid, source: sid, op: '<', value: 30, target: hid });
-    let cid = 'c_hungry';
-    while (this.store.consume.some((c) => c.id === cid)) cid += '_2';
-    this.store.consume.push({
-      id: cid,
-      trigger: hid,
-      items: ['tomato', 'potato', 'carrot', 'corn', 'pumpkin', 'strawberry'],
-      count: 1,
-      effectState: sid,
-      effectDelta: 25,
-      cooldownDays: 0.5,
-      auto: true,
-      enabled: true,
-    });
+    const ids = this.ensureSatiety(true);
+    this.ensureDietEffects(true);
     this.persist();
     this.apply();
-    return { satiety: sid, hungry: hid };
+    return { satiety: ids.satiety, hungry: ids.hungry };
   }
 
   groundTile() {