服务器排行榜
@@ -165,6 +176,13 @@ const cropNames = {
corn: "玉米", pumpkin: "南瓜", strawberry: "草莓"
};
+function goodsName(key) {
+ const g = ((catalog && catalog.goods) || []).find((x) => x.key === key);
+ if (g) return g.name;
+ if (key.indexOf("animal:") === 0) return key.slice(7);
+ return cropNames[key] || key;
+}
+
function toast(text) {
const el = $("toast");
el.textContent = text;
@@ -277,8 +295,12 @@ function render() {
if (!state) return;
const s = state;
$("stats").innerHTML = [
- ["第几天", s.day], ["金币", s.gold], ["等级", "Lv." + s.level + " (" + s.exp + "/" + s.exp_needed + ")"],
- ["行动点", s.ap + "/" + s.max_ap], ["饲料", s.feed], ["净资产", Math.round(s.net_worth)],
+ ["第几天", s.day],
+ ["天气", (s.weather_name || "—") + " → " + (s.forecast_name || "?")],
+ ["金币", s.gold], ["等级", "Lv." + s.level + " (" + s.exp + "/" + s.exp_needed + ")"],
+ ["行动点", s.ap + "/" + s.max_ap], ["饲料", s.feed],
+ ["仓储", (s.storage_used || 0) + "/" + (s.granary_capacity || 0)],
+ ["净资产", Math.round(s.net_worth)],
["在线", s.online !== undefined ? s.online : "—"],
["下一天", fmtLeft(s.seconds_to_tick)]
].map((p) => '
' + p[0] + '' + p[1] + '
').join("");
@@ -314,18 +336,48 @@ function render() {
(a.pending > 0 ? '
' : '') + ''
).join("") : '
牧场空空的，先买一只吧';
- /* 市场 */
- const rows = Object.entries(s.market).filter((kv) => kv[0].indexOf("animal:") !== 0);
- const base = { wheat: 14, carrot: 26, tomato: 52, corn: 95, pumpkin: 180, strawberry: 320 };
- $("market").innerHTML = '
| 作物 | 现价 | 基准 |
|---|
' +
- rows.sort((a, b) => b[1] - a[1]).map((kv) => {
- const b = base[kv[0]] || kv[1];
+ /* 市场：基准价直接用 catalog.goods，别再在 JS 里抄一份常量表 */
+ const gmap = {};
+ ((catalog && catalog.goods) || []).forEach((g) => { gmap[g.key] = g; });
+ $("market").innerHTML = '
| 货物 | 现价 | 基准 |
|---|
' +
+ Object.entries(s.market).sort((a, b) => b[1] - a[1]).map((kv) => {
+ const g = gmap[kv[0]] || {};
+ const b = g.base_price || kv[1];
const cls = kv[1] > b * 1.03 ? "up" : (kv[1] < b * 0.97 ? "down" : "flat");
const arrow = cls === "up" ? "↑" : (cls === "down" ? "↓" : "→");
- return '
| ' + (cropNames[kv[0]] || kv[0]) + ' | ' +
- kv[1].toFixed(0) + " " + arrow + ' | ' + b + ' |
';
+ return '
| ' + goodsName(kv[0]) + ' | ' +
+ kv[1].toFixed(0) + " " + arrow + ' | ' + b.toFixed(0) + ' |
';
}).join("");
+ /* 谷仓：卖货是唯一把存货变成金币的出口，所以每个存项都直接给一个卖出按钮 */
+ const inv = Object.entries(s.inventory || {}).filter((kv) => kv[1] > 0);
+ $("granaryhint").textContent =
+ "仓容 " + (s.storage_used || 0) + "/" + (s.granary_capacity || 0);
+ $("granary").innerHTML =
+ '
| 货物 | 存量 | 现价 | ' +
+ '基准 | |
|---|
' +
+ (inv.length ? inv.sort((a, b) => b[1] - a[1]).map((kv) => {
+ const g = gmap[kv[0]] || {};
+ const price = g.price !== undefined ? g.price : ((s.market || {})[kv[0]] || 0);
+ const b = g.base_price || 0;
+ const cls = b && price > b * 1.03 ? "up" : (b && price < b * 0.97 ? "down" : "flat");
+ return '
| ' + goodsName(kv[0]) + ' | ' + kv[1] +
+ ' | ' + price.toFixed(0) + ' | ' +
+ '' + (b ? b.toFixed(0) : "—") + ' | ' +
+ ' |
';
+ }).join("")
+ : '
| 空仓：收获与收取的产出会自动入库 |
');
+
+ /* 建筑 */
+ const builds = (catalog && catalog.buildings) || [];
+ $("buildings").innerHTML = builds.length ? builds.map((b) => {
+ const disabled = b.locked || b.maxed || s.gold < b.next_cost;
+ const label = b.name + " " + (b.maxed ? "已满" : b.next_cost + " 金") +
+ "（" + b.owned + "/" + b.max_level + "）";
+ return '
';
+ }).join("") : '
目录加载中…';
+
renderLog(null);
renderBoard();
}
@@ -383,6 +435,8 @@ document.addEventListener("click", (ev) => {
}
else if (t.dataset.f) act("feed", { animal_id: +t.dataset.f });
else if (t.dataset.c) act("collect", { animal_id: +t.dataset.c });
+ else if (t.dataset.s) act("sell", { key: t.dataset.s });
+ else if (t.dataset.b) act("build", { key: t.dataset.b });
else if (t.dataset.act === "buy_animal") act("buy_animal", { kind: $("buyanimal").value });
else if (t.dataset.act === "buy_feed") act("buy_feed", { quantity: 10 });
else if (t.dataset.act === "reset") { if (confirm("确定重置牧场？所有进度都会清空")) act("reset"); }
@@ -443,7 +497,7 @@ def dashboard_text(host: str, port: int) -> str:
'POST /api/actions {"action":"...","params":{...}} 通用入口\n'
'POST /api/batch {"actions":[{...},{...}]} 批量\n'
"POST /api/plant|water|harvest|harvest_all|buy_animal|feed|\n"
- " collect|buy_feed|buy_plot|pause|save|reset 便捷入口\n"
+ " collect|buy_feed|buy_plot|sell|build|pause|save|reset 便捷入口\n"
'POST /api/farms {"farm":"名字"} 创建/进入牧场\n'
"POST /api/admin/save 全部存档\n"
"POST /api/admin/shutdown 优雅停机\n"
diff --git a/farm/storage.py b/farm/storage.py
index 261bc93..b6b04e0 100644
--- a/farm/storage.py
+++ b/farm/storage.py
@@ -13,7 +13,10 @@ from typing import Any
from .models import GameState
-SAVE_VERSION = 1
+SAVE_VERSION = 2 # v2 起：谷仓存货 / 建筑 / 天气
+# 还能读回来的最老版本。存档读取是「宽容向后」的：老档缺的新字段
+# 一律走默认值，所以没必要因为升了一版就把玩家手里的档作废。
+MIN_SAVE_VERSION = 1
def default_save_path() -> str:
@@ -49,11 +52,15 @@ def _raw_state(state: GameState) -> dict[str, Any]:
"""导出可完整还原的原始字段（与 to_dict 的展示字段不同）。"""
return {
"day": state.day,
+ "weather": state.weather,
+ "forecast": state.forecast,
"gold": state.gold,
"level": state.level,
"exp": state.exp,
"ap": state.ap,
"feed": state.feed,
+ "inventory": dict(state.inventory),
+ "buildings": dict(state.buildings),
"plots": [
{
"index": p.index,
@@ -105,8 +112,10 @@ def load_state(path: str | None = None) -> tuple[GameState | None, str]:
return None, "存档格式错误：根节点不是对象"
version = payload.get("version", 0)
- if version != SAVE_VERSION:
- return None, f"存档版本不兼容（文件 v{version}，当前 v{SAVE_VERSION}）"
+ if not isinstance(version, int) or not (MIN_SAVE_VERSION <= version <= SAVE_VERSION):
+ return None, (
+ f"存档版本不兼容（文件 v{version}，当前支持 v{MIN_SAVE_VERSION}~v{SAVE_VERSION}）"
+ )
raw = payload.get("state")
if not isinstance(raw, dict):
diff --git a/farm/tui.py b/farm/tui.py
index e478680..714a25b 100644
--- a/farm/tui.py
+++ b/farm/tui.py
@@ -48,6 +48,9 @@ CELL_INNER = CELL_WIDTH - 2
SIDE_WIDTH = 36 # 右侧栏宽度
MIN_TERM_WIDTH = 76
MAX_VISIBLE_ANIMALS = 5 # 侧栏同时最多展示的牲畜数量
+MAX_VISIBLE_GOODS = 4 # 侧栏谷仓同时展示的货物种类
+# 有菜单界面的模式；这几处判断原本各写了一遍模式列表
+MENU_MODES = ("select_crop", "select_animal", "select_goods", "select_build")
def strip_ansi(text: str) -> str:
@@ -276,7 +279,7 @@ class TuiApp:
self._flash("已取消重置", C_GRAY)
self.mode = "main"
return
- if self.mode in ("select_crop", "select_animal"):
+ if self.mode in MENU_MODES:
self._handle_menu_key(key)
return
@@ -299,6 +302,8 @@ class TuiApp:
"c": self._collect,
"l": lambda: self._act(self.engine.buy_plot),
"k": lambda: self._act(self.engine.buy_feed, config.FEED_BULK),
+ "m": self._open_goods_menu,
+ "g": self._open_build_menu,
"s": self._save,
"r": self._ask_reset,
keys.SPACE: self._toggle_pause,
@@ -338,16 +343,19 @@ class TuiApp:
if not targets:
self._flash("暂时没有成熟的作物", C_GRAY)
return
- total = 0
+ total = 0.0
count = 0
for number in targets:
try:
result = engine.harvest(number)
- total += result["earned"]
- count += result["quantity"]
+ total += float(result.get("value", 0))
+ count += int(result.get("quantity", 0))
except GameError:
continue
- self._flash(f"收获 {count} 份作物，共 +{total} 金币", C_GREEN)
+ if not count:
+ self._flash("一块都没收进来——多半是谷仓满了，按 M 卖点存货", C_RED)
+ return
+ self._flash(f"收获 {count} 份作物入谷仓（约值 {total:.0f} 金币，按 M 卖出）", C_GREEN)
# ---------------------------------------------------------- 菜单交互
def _open_crop_menu(self) -> None:
@@ -408,6 +416,85 @@ class TuiApp:
self.menu_title = "选择要购买的动物"
self.mode = "select_animal"
+ def _open_goods_menu(self) -> None:
+ """卖货菜单：每种存货一行，按仓量从多到少排。
+
+ "全部卖光"也做成一个正常选项而不是单独的快捷键——它和逐个卖是
+ 同一件事，只是数量取满，放进同一个菜单里玩家更容易发现。
+ """
+ inventory = {k: v for k, v in self.engine.state.inventory.items() if v > 0}
+ if not inventory:
+ self._flash("谷仓是空的：收获与收取的产出会自动入库", C_GRAY)
+ return
+ market = self.engine.state.market
+ items: list[dict[str, Any]] = []
+ for key, count in sorted(inventory.items(), key=lambda kv: -kv[1]):
+ price = float(market.get(key, 0.0))
+ base = config.base_price(key)
+ ratio = (price / base - 1) * 100 if base else 0.0
+ items.append(
+ {
+ "key": key,
+ "label": config.goods_name(key),
+ "cost": 0,
+ "detail": (
+ f"存{count:>3} 现价{price:>6.0f} 基准{base:>5.0f} "
+ f"{ratio:+.0f}% 共值{price * count:>7.0f}"
+ ),
+ "locked": False,
+ "lock_hint": "",
+ "affordable": True,
+ }
+ )
+ items.append(
+ {
+ "key": None,
+ "label": "全部卖光",
+ "cost": 0,
+ "detail": "一键清仓（价格不好时慎用）",
+ "locked": False,
+ "lock_hint": "",
+ "affordable": True,
+ }
+ )
+ self.menu = items
+ self.menu_title = "卖出谷仓里的货物"
+ self.mode = "select_goods"
+
+ def _open_build_menu(self) -> None:
+ """建造菜单。报价走服务器给的 catalog，拿不到时退回本地配置表。"""
+ catalog = {b.get("key"): b for b in (self.engine.catalog().get("buildings") or [])}
+ state = self.engine.state
+ items: list[dict[str, Any]] = []
+ for key, info in config.BUILDINGS.items():
+ entry = catalog.get(key, {})
+ name = info["name"]
+ effect = info["effect"]
+ level_req = info["level_req"]
+ max_level = info["max_level"]
+ owned = entry.get("owned", state.buildings.get(key, 0))
+ next_cost = entry.get("next_cost", config.build_price(key, owned))
+ maxed = entry.get("maxed", owned >= max_level)
+ locked = entry.get("locked", state.level < level_req)
+ if maxed:
+ detail = f"已建满 {max_level} 座 {effect}"
+ else:
+ detail = f"{next_cost:>5}金币 {owned}/{max_level} 座 {effect}"
+ items.append(
+ {
+ "key": key,
+ "label": name,
+ "cost": next_cost,
+ "detail": detail,
+ "locked": locked,
+ "lock_hint": f"需 Lv.{level_req}",
+ "affordable": not maxed and state.gold >= next_cost,
+ }
+ )
+ self.menu = items
+ self.menu_title = "建造（同类建筑越造越贵）"
+ self.mode = "select_build"
+
def _handle_menu_key(self, key: str) -> None:
if key in (keys.ESC, "q"):
self.mode = "main"
@@ -427,8 +514,12 @@ class TuiApp:
if self.mode == "select_crop":
self._act(self.engine.plant, self.plot_cursor + 1, item["key"])
- else:
+ elif self.mode == "select_animal":
self._act(self.engine.buy_animal, item["key"])
+ elif self.mode == "select_goods":
+ self._act(self.engine.sell, item["key"])
+ else:
+ self._act(self.engine.build, item["key"])
self.mode = "main"
def _feed(self) -> None:
@@ -510,6 +601,13 @@ class TuiApp:
tag = color(f"👥{online} ", C_ORANGE, self.use_color)
else:
tag = ""
+ # 天气放在最显眼的位置：它是每天唯一会变的"环境参数"，
+ # 而且"今→明"里的第二个字就是预报，浇水决策要靠它。
+ weather_name = snap.get("weather_name")
+ if weather_name:
+ tag += color(
+ f"{weather_name}→{snap.get('forecast_name') or '?'} ", C_PURPLE, self.use_color
+ )
if snap["paused"]:
right = tag + color("⏸ 已暂停 ", C_ORANGE, self.use_color)
@@ -720,17 +818,52 @@ class TuiApp:
market_rows.append(
color(f" 饲料 {config.FEED_UNIT_PRICE} 金币/份（按 K 购买）", C_DIM, self.use_color)
)
- market = draw_box(
+ market_box = draw_box(
"市场行情", market_rows, side_width, accent=C_CYAN, use_color=self.use_color
)
- return pasture + market
+ # ---- 谷仓：有存货才占地方，空仓只留一行说明
+ inventory = {k: v for k, v in (snap.get("inventory") or {}).items() if v > 0}
+ granary_rows: list[str] = []
+ market = snap.get("market") or {}
+ for key, count in sorted(inventory.items(), key=lambda kv: -kv[1])[:MAX_VISIBLE_GOODS]:
+ price = float(market.get(key, 0.0))
+ base = config.base_price(key)
+ ratio = price / base if base else 1.0
+ if ratio > 1.06:
+ tone = C_RED
+ elif ratio < 0.94:
+ tone = C_GREEN
+ else:
+ tone = C_GRAY
+ label = color(f" {config.goods_name(key)}", C_WHITE, self.use_color)
+ value = color(f"{count:>3} ×{price:>5.0f}", tone, self.use_color)
+ spacer = max(1, side_width - 4 - display_width(label) - display_width(value))
+ granary_rows.append(label + " " * spacer + value)
+ if not granary_rows:
+ granary_rows.append(color(" 空仓：收获会自动入库", C_DIM, self.use_color))
+ elif len(inventory) > MAX_VISIBLE_GOODS:
+ granary_rows.append(
+ color(f" …还有 {len(inventory) - MAX_VISIBLE_GOODS} 种存货", C_DIM, self.use_color)
+ )
+ used = int(snap.get("storage_used") or 0)
+ capacity = int(snap.get("granary_capacity") or 0)
+ granary_rows.append(
+ color(f" 仓容 {used}/{capacity} ", C_GRAY, self.use_color)
+ + color(bar(used, max(1, capacity), 8), C_RED if used >= capacity else C_GOLD)
+ )
+ granary_rows.append(color(" 按 M 卖出存货", C_DIM, self.use_color))
+ granary = draw_box(
+ "谷仓", granary_rows, side_width, accent=C_GOLD, use_color=self.use_color
+ )
+
+ return pasture + market_box + granary
# ---------------------------------------------------------- 底部
def _render_bottom(self, snap: dict[str, Any], width: int) -> list[str]:
if self.mode == "help":
return self._render_help(width)
- if self.mode in ("select_crop", "select_animal"):
+ if self.mode in MENU_MODES:
return self._render_menu(width)
rows: list[str] = []
@@ -757,11 +890,15 @@ class TuiApp:
hint = [
color(" [↑↓←→]选地 [P]播种 [W]浇水 [H]收获 [E]全部收获", C_GRAY, self.use_color),
color(
- " [F]喂食 [C]收取 [Tab]换牲畜 [B]买动物 [L]买地 [K]买饲料",
+ " [F]喂食 [C]收取 [Tab]换牲畜 [M]卖货 [G]建造 [B]买动物",
+ C_GRAY,
+ self.use_color,
+ ),
+ color(
+ " [L]买地 [K]买饲料 [空格]暂停 [S]存档 [R]重置 [Q]退出",
C_GRAY,
self.use_color,
),
- color(" [空格]暂停 [S]存档 [R]重置 [Q]退出", C_GRAY, self.use_color),
]
if self.show_keyboard_notice and not self.reader.available:
# 读不到键盘时把原因摆在最显眼处，别让玩家对着界面干等
@@ -804,9 +941,17 @@ class TuiApp:
C_GRAY,
self.use_color,
),
+ color(" 天气", C_BOLD + C_GOLD, self.use_color)
+ + color(
+ " 每天换一种：晴/多云/雨/干旱/暴风雨。作物按天气蒸发 0~2 点水分，"
+ "雨天自动补满，暴风雨还可能毁苗。",
+ C_GRAY,
+ self.use_color,
+ ),
color(" 水分", C_BOLD + C_GOLD, self.use_color)
+ color(
- " 作物每天消耗 1 点水分，水为 0 就停止生长。按 W 浇水恢复到 3 点。",
+ f" 水为 0 就停止生长，按 W 浇满（{config.WATER_CAPACITY} 点）。"
+ "顶部「今→明」的第二个字就是明天的天气预报。",
C_GRAY,
self.use_color,
),
@@ -818,8 +963,24 @@ class TuiApp:
+ color(
" 必须每天喂食才会产出；连续 3 天没吃东西会离开农场。", C_GRAY, self.use_color
),
+ color(" 谷仓", C_BOLD + C_GOLD, self.use_color)
+ + color(
+ " 收获与收取的产出先进谷仓、不直接换钱；按 M 卖出，装满了就收不进来。",
+ C_GRAY,
+ self.use_color,
+ ),
+ color(" 建筑", C_BOLD + C_GOLD, self.use_color)
+ + color(
+ " 按 G 建造：谷仓加容量、水井自动浇水、喂食器自动喂食、温室免疫天气。",
+ C_GRAY,
+ self.use_color,
+ ),
color(" 市场", C_BOLD + C_GOLD, self.use_color)
- + color(" 作物和畜产品价格每天波动 ±18%，高点卖出更赚。", C_GRAY, self.use_color),
+ + color(
+ " 货价每天在基准价 ±18% 内波动。囤到高位再卖才赚——这就是谷仓存在的意义。",
+ C_GRAY,
+ self.use_color,
+ ),
"",
color(" 快捷键", C_BOLD + C_GOLD, self.use_color)
+ color(
@@ -829,10 +990,12 @@ class TuiApp:
),
color(" ", C_GRAY, self.use_color)
+ color(
- " B 买动物 / L 开垦土地 / K 买饲料 / 空格 暂停 / S 存档 / R 重置",
+ " M 卖货 / G 建造 / B 买动物 / L 开垦土地 / K 买饲料",
C_GRAY,
self.use_color,
),
+ color(" ", C_GRAY, self.use_color)
+ + color(" 空格 暂停 / S 存档 / R 重置 / Q 退出", C_GRAY, self.use_color),
"",
color(" AI 接入", C_BOLD + C_GOLD, self.use_color)
+ color(
diff --git a/main.py b/main.py
index c1dd8f8..5c70bce 100644
--- a/main.py
+++ b/main.py
@@ -515,9 +515,32 @@ def cmd_state(args) -> int:
f"金币 {snap.get('gold')} 等级 Lv.{snap.get('level')} "
f"({snap.get('exp')}/{snap.get('exp_needed')})"
)
+ day_weather = snap.get("weather_name")
+ if day_weather:
+ desc = snap.get("weather_desc")
+ tomorrow = snap.get("forecast_name")
+ print(f"天气 {day_weather}（{desc}）· 明日 {tomorrow}")
print(f"行动点 {snap.get('ap')}/{snap.get('max_ap')} 饲料 {snap.get('feed')}")
print(f"净资产 {snap.get('net_worth')}")
print(f"土地 {snap.get('plot_count')}/{snap.get('max_plots')} 块")
+
+ used = snap.get("storage_used") or 0
+ capacity = snap.get("granary_capacity") or 0
+ tail = " ← 已满，先 sell 卖点存货" if (snap.get("granary_free") or 0) <= 0 else ""
+ print(f"谷仓 {used}/{capacity} 格{tail}")
+ market = snap.get("market") or {}
+ for key, count in sorted((snap.get("inventory") or {}).items()):
+ price = float(market.get(key, 0.0))
+ base = config.base_price(key)
+ ratio = (price / base - 1) * 100 if base else 0.0
+ print(
+ f" {config.goods_name(key):<6} x{count:<4} 现价 {price:>7.1f}"
+ f"（基准 {base:>6.1f}，{ratio:+.0f}%）"
+ )
+ built = {k: v for k, v in (snap.get("buildings") or {}).items() if v}
+ if built:
+ names = {k: v["name"] for k, v in config.BUILDINGS.items()}
+ print("建筑 " + " ".join(f"{names[k]}×{v}" for k, v in built.items()))
for plot in snap.get("plots", []):
if plot["is_empty"]:
continue
@@ -558,10 +581,14 @@ def cmd_watch(args) -> int:
last_seq = max(last_seq, int(entry.get("seq", 0)))
print(f"[D{entry['day']:>3}] {entry['text']}")
online = snap.get("online")
+ day_no = snap.get("day")
+ weather = snap.get("weather_name") or "—"
+ used = snap.get("storage_used") or 0
+ capacity = snap.get("granary_capacity") or 0
head = (
- f"第 {snap.get('day')} 天 | 金币 {snap.get('gold')} | "
+ f"第 {day_no} 天 {weather} | 金币 {snap.get('gold')} | "
f"Lv.{snap.get('level')} | 行动点 {snap.get('ap')}/{snap.get('max_ap')} | "
- f"净资产 {snap.get('net_worth')}"
+ f"仓储 {used}/{capacity} | 净资产 {snap.get('net_worth')}"
)
if online is not None:
head += f" | 在线 {online}"
@@ -635,6 +662,8 @@ QUICKSTART = """
uv run main.py actions # 我当前能做什么
uv run main.py do harvest '{"plot":1}'
+ uv run main.py do sell '{"key":"wheat"}' # 卖货才换得到金币
+ uv run main.py do build '{"key":"well"}' # 造建筑换自动化
uv run main.py state --json # 机器可读的完整状态
uv run main.py watch # 实时看别人/机器人玩
diff --git a/tests/test_actions.py b/tests/test_actions.py
index e21f27d..fb8ee45 100644
--- a/tests/test_actions.py
+++ b/tests/test_actions.py
@@ -30,6 +30,8 @@ EXPECTED_ACTIONS = {
"collect",
"buy_feed",
"buy_plot",
+ "sell",
+ "build",
"pause",
}
@@ -292,9 +294,7 @@ class HarvestAllTestCase(unittest.TestCase):
result = run_action(self.engine, "harvest_all", {})
self.assertEqual(result["plots"], [1, 2])
- self.assertEqual(
- result["quantity"], result["earned"] // config.CROPS["wheat"]["base_price"]
- )
+ self.assertEqual(result["quantity"], result["value"] // config.CROPS["wheat"]["base_price"])
self.assertEqual(result["errors"], [])
self.assertFalse(self.engine.state.plots[2].is_empty, "没熟的 3 号地要保持原样")
diff --git a/tests/test_bot.py b/tests/test_bot.py
index d811254..4af1443 100644
--- a/tests/test_bot.py
+++ b/tests/test_bot.py
@@ -291,15 +291,31 @@ class RunTestCase(unittest.TestCase):
self.assertEqual(set(summary) >= {"name", "days", "actions", "failures", "net_worth"}, True)
def test_no_action_points_means_clocking_out(self):
+ # AP 用完时，服务端的 available_actions 只会剩下 0 消耗的动作
+ # （卖货/建造/收获/收取），这里模拟"连这些都没有"的极端情况：
+ # 机器人应当直接收工，而不是空转或乱发请求。
client = FakeClient(
- actions=[{"action": "harvest", "params": {"plot": 1}}],
+ actions=[],
state={**BASE_STATE, "ap": 0},
catalog=CATALOG,
)
bot = make_bot(client)
summary = bot.run(rounds=5)
self.assertEqual(summary["actions"], 0)
- self.assertEqual(client.calls, [], "没行动点就不该发动作请求")
+ self.assertEqual(client.calls, [], "没得做就不该发动作请求")
+
+ def test_free_actions_still_run_without_action_points(self):
+ # 新设计：收获不再直接给钱，得靠 sell 把谷仓里的货变现；而 sell/build
+ # 是 0 消耗动作，AP=0 时也必须能执行，否则一整天只能干等着。
+ client = FakeClient(
+ actions=[{"action": "sell", "params": {}}],
+ state={**BASE_STATE, "ap": 0},
+ catalog=CATALOG,
+ )
+ bot = make_bot(client)
+ summary = bot.run(rounds=1)
+ self.assertEqual(summary["actions"], 1)
+ self.assertEqual(client.calls, [("sell", {})])
def test_idle_limit_triggers_the_waiting_path(self):
client = FakeClient(actions=[], state=BASE_STATE)
diff --git a/tests/test_engine.py b/tests/test_engine.py
index 6948af7..74dd34d 100644
--- a/tests/test_engine.py
+++ b/tests/test_engine.py
@@ -370,15 +370,17 @@ class ActionTestCase(unittest.TestCase):
self.assert_code("already_watered", self.engine.water, 2)
# ------------------------------------------------------------------ 收获
- def test_harvest_pays_the_market_price(self):
+ def test_harvest_lands_in_the_granary_at_market_price(self):
self.engine.plant(1, "wheat")
self.engine.state.plots[0].growth = config.CROPS["wheat"]["grow_days"]
gold = self.engine.state.gold
with mock.patch("farm.engine.random.random", return_value=0.99):
result = self.engine.harvest(1)
self.assertEqual(result["quantity"], 1)
- self.assertEqual(result["earned"], config.CROPS["wheat"]["base_price"])
- self.assertEqual(self.engine.state.gold, gold + result["earned"])
+ self.assertEqual(result["price"], self.engine.market_price("wheat"))
+ self.assertEqual(result["value"], result["price"] * result["quantity"])
+ self.assertEqual(self.engine.state.inventory["wheat"], 1, "收成先进谷仓")
+ self.assertEqual(self.engine.state.gold, gold, "收获本身不给钱，卖了才给")
self.assertTrue(self.engine.state.plots[0].is_empty)
def test_lucky_harvest_doubles_the_yield(self):
@@ -387,7 +389,7 @@ class ActionTestCase(unittest.TestCase):
with mock.patch("farm.engine.random.random", return_value=0.0):
result = self.engine.harvest(1)
self.assertEqual(result["quantity"], 2)
- self.assertEqual(result["earned"], config.CROPS["wheat"]["base_price"] * 2)
+ self.assertEqual(self.engine.state.inventory["wheat"], 2)
def test_harvest_before_ripe_is_refused(self):
self.engine.plant(1, "carrot")
@@ -458,15 +460,17 @@ class ActionTestCase(unittest.TestCase):
self.assert_code("bad_param", self.engine.feed, aid, 0)
self.assert_code("bad_param", self.engine.feed, aid, "many")
- def test_collect_pays_for_every_pending_product(self):
+ def test_collect_lands_every_pending_product_in_the_granary(self):
self.engine.buy_animal("chicken")
animal = self.engine.state.animals[0]
animal.pending = 3
gold = self.engine.state.gold
result = self.engine.collect(animal.aid)
self.assertEqual(result["quantity"], 3)
- self.assertEqual(result["earned"], config.ANIMALS["chicken"]["base_price"] * 3)
- self.assertEqual(self.engine.state.gold, gold + result["earned"])
+ self.assertEqual(result["price"], self.engine.market_price("animal:chicken"))
+ self.assertEqual(result["value"], result["price"] * 3)
+ self.assertEqual(self.engine.state.inventory["animal:chicken"], 3, "产物先入库")
+ self.assertEqual(self.engine.state.gold, gold, "收取本身不给钱，卖了才给")
self.assertEqual(animal.pending, 0)
def test_collect_without_output_is_refused(self):
@@ -563,25 +567,26 @@ class GrowthTestCase(unittest.TestCase):
self.engine.plant(1, "carrot") # 3 天，刚好够观察缺水停摆
self.assertEqual(self.engine.state.plots[0].moisture, config.PLANT_INITIAL_MOISTURE)
- self.engine.advance_day()
+ # 天气按天随机，这里钉死成晴天（每天蒸发 1 点），才观察得到"断水停摆"。
+ self.engine.advance_day(weather="sunny")
self.assertEqual(self.engine.state.plots[0].growth, 1)
- self.engine.advance_day()
+ self.engine.advance_day(weather="sunny")
self.assertEqual(self.engine.state.plots[0].moisture, 0)
self.assertEqual(self.engine.state.plots[0].growth, 2)
- events = self.engine.advance_day()
+ events = self.engine.advance_day(weather="sunny")
self.assertEqual(self.engine.state.plots[0].growth, 2, "没水就不该再长")
self.assertTrue(any("缺水" in text for text in events))
def test_watering_resumes_growth(self):
self.engine.plant(1, "carrot")
- self.engine.advance_day()
- self.engine.advance_day()
- self.engine.advance_day() # 此刻缺水停摆
+ self.engine.advance_day(weather="sunny")
+ self.engine.advance_day(weather="sunny")
+ self.engine.advance_day(weather="sunny") # 此刻缺水停摆
self.assertEqual(self.engine.state.plots[0].growth, 2, "断水期间不该生长")
self.engine.water(1) # 浇到 3 点水
- self.engine.advance_day()
+ self.engine.advance_day(weather="sunny")
self.assertEqual(self.engine.state.plots[0].growth, 3, "浇水后又开始长了")
self.assertTrue(self.engine.state.plots[0].is_ripe)
diff --git a/tests/test_server.py b/tests/test_server.py
index bb9853f..9e59776 100644
--- a/tests/test_server.py
+++ b/tests/test_server.py
@@ -24,7 +24,7 @@ import urllib.request
from farm import config, net
from farm.engine import GameError
-from farm.server.daemon import DaemonManager, pid_alive, port_busy
+from farm.server.daemon import DaemonManager, ensure_parent_dir, pid_alive, port_busy
from farm.server.hub import (
CLOSE_MESSAGE,
Client,
@@ -657,11 +657,16 @@ class BriefAndRulesTestCase(unittest.TestCase):
self.hub = ConnectionHub()
self.session = self.manager.get("alice")
- def test_brief_keys_exist_in_the_snapshot(self):
- """回归：snapshot 改字段名时，brief 必须跟着改，否则动作回执直接 500。"""
- snap = self.session.snapshot()
+ def test_brief_keys_exist_in_the_brief_payload(self):
+ """回归：brief_source 改字段名时，BRIEF_KEYS 必须跟着改，否则动作回执直接 500。
+
+ BRIEF_KEYS 的数据源是 ``FarmEngine.brief_source()``（精简状态），
+ **不是**完整快照 ``session.snapshot()``——后者包含 market/plots 等大块数据，
+ 拿它来断言会把"brief 只读精简字段"这个设计意图测丢。
+ """
+ data = brief(self.session, self.hub)
for key in BRIEF_KEYS:
- self.assertIn(key, snap, f"快照里没有 {key}")
+ self.assertIn(key, data, f"回执里没有 {key}")
def test_brief_exposes_the_to_do_lists(self):
self.session.engine.plant(1, "wheat")
@@ -805,6 +810,31 @@ class DaemonTestCase(unittest.TestCase):
self.assertEqual(len(lines), 5)
self.assertEqual(lines[-1], "第49行")
+ def test_ensure_parent_dir_tolerates_a_bare_file_name(self):
+ """回归：路径没有目录部分时 dirname 返回空串，makedirs("") 直接崩。"""
+ ensure_parent_dir("server.pid") # 不该抛
+ ensure_parent_dir(os.path.join(self.dir, "a", "b", "server.pid"))
+ self.assertTrue(os.path.isdir(os.path.join(self.dir, "a", "b")))
+
+ def test_pid_file_without_a_directory_still_works(self):
+ """``--pid-file server.pid`` 这种只给文件名的用法必须能起来。"""
+ manager = DaemonManager(
+ host="127.0.0.1",
+ port=free_port(),
+ save_dir=self.dir,
+ pid_file="server.pid",
+ log_file="server.log",
+ )
+ cwd = os.getcwd()
+ os.chdir(self.dir)
+ try:
+ manager.write_pid(4321)
+ self.assertEqual(manager.read_pid(), 4321)
+ manager.clear_pid()
+ self.assertIsNone(manager.read_pid())
+ finally:
+ os.chdir(cwd)
+
@unittest.skipUnless(HAS_TESTCLIENT, "未安装 httpx（TestClient 依赖它）")
class RestApiTestCase(unittest.TestCase):
diff --git a/tests/test_tui_keys.py b/tests/test_tui_keys.py
index 1955089..b51fb78 100644
--- a/tests/test_tui_keys.py
+++ b/tests/test_tui_keys.py
@@ -455,9 +455,9 @@ class TuiLetterKeyBehaviourTestCase(unittest.TestCase):
self.assertEqual(self.engine.state.plots[0].moisture, config.WATER_CAPACITY)
self.engine.state.plots[0].growth = config.CROPS["wheat"]["grow_days"]
- gold = self.engine.state.gold
+ before = self.engine.state.inventory.get("wheat", 0)
self.app._handle_key("h")
- self.assertGreater(self.engine.state.gold, gold)
+ self.assertGreater(self.engine.state.inventory.get("wheat", 0), before, "收获进谷仓")
def test_e_harvests_everything_ripe(self):
for number in (1, 2, 3):
@@ -481,9 +481,11 @@ class TuiLetterKeyBehaviourTestCase(unittest.TestCase):
def test_c_collects_the_focused_animal(self):
self.engine.buy_animal("chicken")
self.engine.state.animals[0].pending = 2
- gold = self.engine.state.gold
+ before = self.engine.state.inventory.get("animal:chicken", 0)
self.app._handle_key("c")
- self.assertGreater(self.engine.state.gold, gold)
+ self.assertGreater(
+ self.engine.state.inventory.get("animal:chicken", 0), before, "产物进谷仓"
+ )
def test_l_buys_land_and_k_buys_feed(self):
self.engine.state.level = 2