diff --git a/game.py b/game.py
index 6f1326f..cccb1c9 100644
--- a/game.py
+++ b/game.py
@@ -247,16 +247,40 @@ CLOTH_PIECES = [("hood", "helmet", "hood", 2, 2, "๐งข"), ("legs", "legs", "legg
("body", "body", "robe", 4, 11, "๐")]
# raw (id, name, icon, value), cooked (id, name, icon, value, heal, food), fishing level, fish action, verb
+# A cooked fish is worth what mining pays for the time it takes to catch and cook it.
FISH = [
(("raw_shrimp", "Raw shrimp", "๐ฆ", 1), ("cooked_shrimp", "Cooked shrimp", "๐ค", 4, 10, 1), 1, "fish_shrimp", "Net shrimp"),
(("raw_trout", "Raw trout", "๐", 3), ("cooked_trout", "Grilled trout", "๐ข", 8, 18, 1), 15, "fish_trout", "Fly-fish trout"),
- (("raw_salmon", "Raw salmon", "๐ ", 6), ("cooked_salmon", "Baked salmon", "๐ฃ", 14, 28, 2), 30, "fish_salmon", "Catch salmon"),
- (("raw_eel", "Raw eel", "๐", 10), ("smoked_eel", "Smoked eel", "๐ฅ", 22, 40, 2), 45, "fish_eel", "Trap eels"),
- (("raw_lobster", "Raw lobster", "๐ฆ", 18), ("cooked_lobster", "Cooked lobster", "๐", 35, 55, 3), 60, "fish_lobster", "Pot lobsters"),
- (("raw_swordfish", "Raw swordfish", "๐ฌ", 30), ("cooked_swordfish", "Grilled swordfish", "๐ฑ", 55, 70, 3), 75, "fish_swordfish", "Harpoon swordfish"),
+ (("raw_salmon", "Raw salmon", "๐ ", 6), ("cooked_salmon", "Baked salmon", "๐ฃ", 16, 28, 2), 30, "fish_salmon", "Catch salmon"),
+ (("raw_eel", "Raw eel", "๐", 10), ("smoked_eel", "Smoked eel", "๐ฅ", 36, 40, 2), 45, "fish_eel", "Trap eels"),
+ (("raw_lobster", "Raw lobster", "๐ฆ", 18), ("cooked_lobster", "Cooked lobster", "๐", 61, 55, 3), 60, "fish_lobster", "Pot lobsters"),
+ (("raw_swordfish", "Raw swordfish", "๐ฌ", 30), ("cooked_swordfish", "Grilled swordfish", "๐ฑ", 102, 70, 3), 75, "fish_swordfish", "Harpoon swordfish"),
]
COOK_IDS = {"raw_shrimp": "cook_shrimp", "raw_trout": "cook_trout", "raw_salmon": "cook_salmon", "raw_eel": "cook_eel",
"raw_lobster": "cook_lobster", "raw_swordfish": "cook_swordfish"}
+# Tiers II to VI of the larder: each tier's crop and hunt meat, and what the kitchen makes of them,
+# as bread, cooked meat and stew are for tier I: a crop dish (2 crops), a meat dish (1 meat) and a
+# stew of both (1 meat and 2 crops, makes 2). A hunt's meat adds about what plain meat did to its worth.
+# crop (id, name, icon, value), meat (id, name, value), hunt, then each dish (id, name, icon, value, heal, food)
+LARDER = [
+ (("potatoes", "Potatoes", "๐ฅ", 3), ("raw_pork", "Raw pork", 2), "hunt_boar",
+ ("baked_potatoes", "Baked potatoes", "๐ฅ", 9, 14, 1), ("roast_pork", "Roast pork", "๐", 6, 20, 1),
+ ("pork_hotpot", "Pork hotpot", "๐ฒ", 12, 30, 2)),
+ (("leeks", "Leeks", "๐ฅฌ", 6), ("bear_meat", "Bear meat", 3), "hunt_bear",
+ ("leek_pie", "Leek pie", "๐ฅง", 18, 22, 2), ("bear_steak", "Bear steak", "๐ฅฉ", 8, 30, 2),
+ ("bear_stew", "Bear stew", "๐ฒ", 14, 42, 3)),
+ (("pumpkins", "Pumpkins", "๐", 10), ("elk_meat", "Elk meat", 3), "hunt_elk",
+ ("pumpkin_soup", "Pumpkin soup", "๐ฅฃ", 30, 32, 2), ("elk_roast", "Elk roast", "๐", 10, 42, 2),
+ ("elk_pie", "Elk pie", "๐ฅง", 18, 58, 3)),
+ (("frostberries", "Frostberries", "๐ซ", 18), ("sabrecat_meat", "Sabrecat meat", 4), "hunt_sabrecat",
+ ("frostberry_tart", "Frostberry tart", "๐ฐ", 54, 44, 3), ("sabrecat_steak", "Sabrecat steak", "๐ฅฉ", 13, 57, 3),
+ ("glazed_sabrecat", "Glazed sabrecat", "๐ข", 30, 76, 4)),
+ (("fire_peppers", "Fire peppers", "๐ถ๏ธ", 30), ("mammoth_meat", "Mammoth meat", 5), "hunt_mammoth",
+ ("roast_peppers", "Roast peppers", "๐ถ๏ธ", 90, 58, 3), ("mammoth_roast", "Mammoth roast", "๐", 16, 72, 3),
+ ("mammoth_chili", "Mammoth chili", "๐ฒ", 49, 95, 4)),
+]
+CROPS = ("wheat", "vegetables", *(crop[0] for crop, *_rest in LARDER))
+HUNT_MEAT = {hunt: meat[0] for _crop, meat, hunt, *_dishes in LARDER}
ITEMS["coal"] = {"name": "Coal", "icon": "๐", "value": 8}
for _tier, (_key, _name, _ore, _coal, _bar_icon, _bar_value, _smithy, _wood) in enumerate(METALS):
@@ -424,6 +448,11 @@ for _tier, (_fibre, _level, _time, _xp, _cloth, _prefix, _label) in enumerate(CL
for _raw, _cooked, _level, _action_id, _verb in FISH:
ITEMS[_raw[0]] = {"name": _raw[1], "icon": _raw[2], "value": _raw[3]}
ITEMS[_cooked[0]] = {"name": _cooked[1], "icon": _cooked[2], "value": _cooked[3], "heal": _cooked[4], "food": _cooked[5]}
+for _crop, _meat, _hunt, *_dishes in LARDER:
+ ITEMS[_crop[0]] = {"name": _crop[1], "plural": _crop[1], "icon": _crop[2], "value": _crop[3]}
+ ITEMS[_meat[0]] = {"name": _meat[1], "plural": _meat[1], "icon": "๐ฅฉ", "value": _meat[2]}
+ for _id, _name, _icon, _value, _heal, _food in _dishes:
+ ITEMS[_id] = {"name": _name, "icon": _icon, "value": _value, "heal": _heal, "food": _food}
# --- herblore -------------------------------------------------------------------
# Herbs from Farming, brewed with a secondary into potions with charges. One
@@ -722,6 +751,17 @@ def _tiered_actions() -> list[dict]:
actions.append(_action(COOK_IDS[raw[0]], "cooking", cooked[1], level, [20, 30, 35, 40, 45, 50][tier],
[6, 15, 27, 42, 58, 80][tier], _fuelled({raw[0]: 1}, tier), {cooked[0]: 1}, group="Fish",
fire="kitchen", fuel=tier))
+ for tier, (crop, meat, _hunt, crop_dish, meat_dish, stew) in enumerate(LARDER, 1):
+ level, seconds, xp = TIER_LEVELS[tier], [20, 30, 35, 40, 45, 50][tier], [6, 15, 27, 42, 58, 80][tier]
+ actions.append(_action(f"farm_{crop[0]}", "farming", f"Grow {crop[1].lower()}", level, CLOTHS[tier][2],
+ CLOTHS[tier][3], outputs={crop[0]: 2}, group="Crops"))
+ kitchen = {"group": "Meals", "fire": "kitchen", "fuel": tier}
+ actions.append(_action(f"cook_{crop_dish[0]}", "cooking", crop_dish[1], level, seconds, xp,
+ _fuelled({crop[0]: 2}, tier), {crop_dish[0]: 1}, **kitchen))
+ actions.append(_action(f"cook_{meat_dish[0]}", "cooking", meat_dish[1], level, seconds, xp,
+ _fuelled({meat[0]: 1}, tier), {meat_dish[0]: 1}, **kitchen))
+ actions.append(_action(f"cook_{stew[0]}", "cooking", stew[1], level + 10, seconds + 15, round(2.2 * xp),
+ _fuelled({meat[0]: 1, crop[0]: 2}, tier), {stew[0]: 2}, **kitchen))
return actions
@@ -1359,11 +1399,12 @@ ACTIONS = [
for tier, (potion, name, level, herb, fish, _heal) in enumerate(HEALTH_POTIONS)],
_action("hunt_birds", "hunting", "Snare birds", 1, 25, 6, outputs={"feathers": 3}),
_action("hunt_deer", "hunting", "Hunt deer", 1, 25, 6, outputs={"raw_meat": 2, "hide": 1}),
- _action("hunt_boar", "hunting", "Hunt boar", 15, 35, 15, outputs={"raw_meat": 2, "boar_hide": 1}),
- _action("hunt_bear", "hunting", "Hunt bears", 30, 45, 28, outputs={"raw_meat": 3, "bear_pelt": 1}),
- _action("hunt_elk", "hunting", "Hunt elk", 45, 55, 45, outputs={"raw_meat": 3, "elk_hide": 1}),
- _action("hunt_sabrecat", "hunting", "Track sabrecats", 60, 65, 62, outputs={"raw_meat": 3, "sabrecat_pelt": 1}),
- _action("hunt_mammoth", "hunting", "Hunt mammoths", 75, 80, 85, outputs={"raw_meat": 5, "mammoth_hide": 1}),
+ _action("hunt_boar", "hunting", "Hunt boar", 15, 35, 15, outputs={HUNT_MEAT["hunt_boar"]: 2, "boar_hide": 1}),
+ _action("hunt_bear", "hunting", "Hunt bears", 30, 45, 28, outputs={HUNT_MEAT["hunt_bear"]: 2, "bear_pelt": 1}),
+ _action("hunt_elk", "hunting", "Hunt elk", 45, 55, 45, outputs={HUNT_MEAT["hunt_elk"]: 2, "elk_hide": 1}),
+ _action("hunt_sabrecat", "hunting", "Track sabrecats", 60, 65, 62,
+ outputs={HUNT_MEAT["hunt_sabrecat"]: 2, "sabrecat_pelt": 1}),
+ _action("hunt_mammoth", "hunting", "Hunt mammoths", 75, 80, 85, outputs={HUNT_MEAT["hunt_mammoth"]: 2, "mammoth_hide": 1}),
*_tiered_actions(),
_action("smith_arrows", "smithing", "Arrows", 5, 30, 10,
{"copper_bar": 1, "logs": 1, "feathers": 2}, {"arrows": 15}, group="Hardware"),
@@ -5670,7 +5711,7 @@ def _damage_building(world: dict, now: float, rng: random.Random) -> str | None:
def _food_items(stock: dict) -> list[str]:
- return [item for item in stock if "food" in ITEMS[item] or item in ("wheat", "vegetables")]
+ return [item for item in stock if "food" in ITEMS[item] or item in CROPS]
def _hardship(world: dict, now: float, rng: random.Random, kind: str | None = None) -> None:
@@ -6578,6 +6619,17 @@ GLYPHS = {
"cooked_shrimp": ("shrimp", "#f0b07a"), "cooked_trout": ("fish-cooked", "#d9a060"),
"cooked_salmon": ("fish-cooked", "#f09a6a"), "smoked_eel": ("eel", "#b07a4a"),
"cooked_lobster": ("crab", "#f07a4a"), "cooked_swordfish": ("fish-cooked", "#c8a070"),
+ "potatoes": ("potato", "#c8a060"), "leeks": ("leek", "#8fc06a"), "pumpkins": ("pumpkin", "#f08a2a"),
+ "frostberries": ("raspberry", "#7fb8f0"), "fire_peppers": ("chili-pepper", "#e04a2a"),
+ "raw_pork": ("meat", "#f0a0a0"), "bear_meat": ("meat", "#b04a3a"), "elk_meat": ("meat", "#c86a50"),
+ "sabrecat_meat": ("meat", "#e08a5a"), "mammoth_meat": ("meat", "#a03a2a"),
+ "baked_potatoes": ("potato", "#deb064"), "roast_pork": ("ham-shank", "#e0a070"), "pork_hotpot": ("hot-meal", "#d0a060"),
+ "leek_pie": ("pie-slice", "#c8c060"), "bear_steak": ("steak", "#a0583a"), "bear_stew": ("hot-meal", "#a06a40"),
+ "pumpkin_soup": ("meal", "#f0a040"), "elk_roast": ("ham-shank", "#c07a50"), "elk_pie": ("pie-slice", "#c8884a"),
+ "frostberry_tart": ("cake-slice", "#8fb8f0"), "sabrecat_steak": ("steak", "#d08050"),
+ "glazed_sabrecat": ("kebab-spit", "#e0a050"),
+ "roast_peppers": ("chili-pepper", "#c0602a"), "mammoth_roast": ("ham-shank", "#a05a3a"),
+ "mammoth_chili": ("hot-meal", "#d0402a"),
}
SKILL_GLYPHS = {
"mining": ("mining", "#b8b2aa"), "woodcutting": ("wood-axe", "#c98a4a"), "farming": ("wheat", "#e3c060"),
@@ -6795,6 +6847,10 @@ PATCH_NOTES = [
("balance", "Ore worth: mithril 15 โ 21, adamantite 30 โ 36, runite 55 โ 63. Bars: mithril 47 โ 32, adamant 74 โ 54, rune 114 โ 95."),
("new", "Construction: frames for every wood, Lv 12 / 26 / 41 / 56 / 71 / 86. 4 planks + hardware."),
("balance", "Building levels 3+ take frames instead of planks: 1 frame per 5 planks. Funded planks became frames, odd ones went to the stockpile."),
+ ("new", "Hunting: boar, bear, elk, sabrecat and mammoth drop their own meat, 2 per hunt (was 2 / 3 / 3 / 3 / 5)."),
+ ("new", "Farming: 5 crops, Lv 15 / 30 / 45 / 60 / 75."),
+ ("new", "Cooking: 15 meals. Each tier: crop dish, meat dish, stew (makes 2, heals up to 95)."),
+ ("balance", "Cooked fish worth: salmon 14 โ 16, eel 22 โ 36, lobster 35 โ 61, swordfish 55 โ 102."),
]},
{"date": "2026-10-28", "title": "Queue", "notes": [
("fix", "The page no longer redraws itself when an action finishes or a poll lands: scroll, hovers and tooltips stay put."),
diff --git a/static/icons.svg b/static/icons.svg
index 94ad489..519bce9 100644
--- a/static/icons.svg
+++ b/static/icons.svg
@@ -37,6 +37,7 @@
+
@@ -47,6 +48,7 @@
+
@@ -141,6 +143,7 @@
+
@@ -148,6 +151,7 @@
+
@@ -158,6 +162,7 @@
+
@@ -174,6 +179,7 @@
+
@@ -182,12 +188,15 @@
+
+
+
@@ -240,6 +249,7 @@
+