Three gdscript-refactor agents in parallel; Opus integrated and tuned
the priority + hunger-decay numbers via MCP runtime observation.
Crop entity + PlantProvider (Agent A, scenes/entities/crop.{gd,tscn} +
scenes/ai/plant_provider.gd, ~225 lines):
- Crop: 6-stage state machine (TILLED → SOWN → GROWING_1/2/3 → READY).
STAGE_TICKS=200 sim ticks per stage × 4 stages = 800 total to maturity.
Listens to EventBus.sim_tick for growth. Procedural _draw with growing
plant + ready-state golden grain accent.
- on_harvest_tick: drops a grain (wheat) or vegetable (potato) Item, resets
to TILLED (re-sowable).
- on_sow_tick: TILLED → SOWN — used when Phase 17 paint UI lands.
- PlantProvider priority=5 (above crafting=4) — harvest-only for Phase 7.
Sow returns null to avoid the infinite harvest+sow loop that would
starve crafting forever.
- JobRunner._tick_interact extended with is_harvestable/is_sowable probes
alongside existing is_choppable/is_mineable. Unified probe array.
Hunger + Eating (Agent B, scenes/pawn/pawn.gd + scenes/ai/eat_provider.gd +
toil.gd/job_runner.gd extensions, ~150 lines):
- Pawn.hunger: float 0..100. HUNGER_DECAY_PER_TICK=0.02 (tuned down 5×
from agent's 0.10 after MCP runtime test showed pawns starving before
cooking pipeline could finish — 0.02 means 100→0 in 5000 ticks =
~4 min at 1× / ~20s at Ultra).
- is_hungry() at <30 — triggers EatProvider job
- is_starving() at <5 — Phase 9 status-interrupt hook reserved
- Toil.KIND_EAT + JobRunner._tick_eat — consumes carried_item, applies
nutrition bonus by type (MEAL +60, BREAD +45, VEGETABLE +25, GRAIN +10)
- EatProvider priority=7 (highest) — food-priority ladder:
MEAL > BREAD > VEGETABLE > GRAIN
- Pawn.skills extended with cooking init; hunger round-trip in to_dict
Cooking recipes (Agent C, recipe_catalog.gd + item.gd + workbench.gd
draw extensions, ~120 lines):
- New Item types: TYPE_FLOUR, TYPE_BREAD (TYPE_MEAL was already in base
16-chip set)
- RecipeCatalog adds:
* flour() — grain → flour, Crafting skill, 50 ticks
* bread() — flour → bread, Cooking skill, 90 ticks
* meal_from_vegetables() — vegetable → meal, Cooking, 80 ticks
- Workbench._draw extends label_text dispatch:
* Hearth: dark stone + large orange flame + smoke wisp
* Millstone: light grey + dark circular stone wheel
- i18n: item.flour, item.bread, item.meal, workbench.hearth, workbench.millstone
Opus integration:
- world.tscn: PlantProvider + EatProvider nodes (8 providers total)
- world.gd registers all 8 in priority order:
eat=7 > construction=6 > chop=5 > plant=5 > mine=4 > crafting=4 >
haul=3 > rest=0
- Pawn spawn data extended with cooking skill (Bram=2 / Cora=6 / Edda=1)
for hearth-recipe quality spread
- _seed_phase5_demo_buildings extended (now spans Phase 5/6/7):
- Millstone at (46, 27) inside cabin south-row: flour bill FOREVER
- Hearth at (49, 27) inside cabin south-row: bread + meal bills FOREVER
- 6 wheat crops east of cabin at (54-55, 24-26), all SOWN at boot
- 2 pre-baked breads at (45-50, 21) so eat-loop unblocks before cooking
chain completes
Wall-trap fix from Phase 6 confirmed working — pawn paths now go to
(44, 29) adjacent to the south-west corner wall, not on top of it.
Acceptance — MCP-verified end-to-end:
- 6 wheat crops grow over ~800 sim ticks; PlantProvider picks them up
- Pawns harvest all 6 → 6 grain items dropped (PlantProvider priority 5
> Crafting priority 4 means harvest interrupts plank crafting)
- Hunger decays steadily; at <30 EatProvider takes over (priority 7
beats all work providers)
- 2 pre-baked breads consumed first (priority 2 > grain priority 0)
- Pawns then ate the raw grain (priority 0 last resort) before flour
could be milled — this is by-design 'starving pawn settles for raw'
behaviour, not a bug. Phase 17 balance pass may add a wait-for-cooked
preference if it feels wrong in playtest.
- Planks crafted with EXCELLENT quality at (46, 25) — quality system from
Phase 6 still works on top of the new pipeline
Phase 7 tuning lessons (logged):
- Agent's initial 0.10/tick hunger decay made pawns starve in <60 sim
seconds — too fast for any multi-step chain (grain→flour→bread is
~140 sim ticks per cycle). Tuned to 0.02/tick post-runtime.
- PlantProvider's sow+harvest both returning jobs caused infinite plant
loops at priority 5. Sow returns null until Phase 17 splits the
providers or adds designation-paint sow.
- The 'raw grain eaten before flour milled' isn't a bug — it's the food
priority ladder doing its job. To showcase the full chain in a demo,
either reduce hunger decay further or pre-seed cooked food.
Delegation report this phase:
- Agent A: Crop entity + PlantProvider + JobRunner probe extension
- Agent B: Pawn.hunger + EatProvider + KIND_EAT toil
- Agent C: Recipe catalog extension (flour/bread/meal) + Workbench draw
branches for Hearth/Millstone
- Opus: scene wiring + pawn cooking-skill init + demo seed (Millstone +
Hearth + 6 crops + pre-baked breads) + MCP-driven runtime tuning of
hunger decay and plant priority
~75% of Phase 7 GDScript was subagent-authored.
Co-Authored-By: Claude Opus 4.7 (1M context) <noreply@anthropic.com>
158 lines
5.7 KiB
GDScript
158 lines
5.7 KiB
GDScript
class_name Toil extends RefCounted
|
|
## A single atomic step within a Job — walk, wait, idle, etc.
|
|
##
|
|
## Save/load contract: every value in `data` MUST be JSON-safe.
|
|
## Vector2i is NOT JSON-safe in Godot 4 — tile coordinates are stored as
|
|
## "to_x"/"to_y" integer keys, never as Vector2i. get_walk_destination()
|
|
## reconstructs Vector2i on demand.
|
|
##
|
|
## Round-trip invariant:
|
|
## var t2 := Toil.from_dict(t.to_dict())
|
|
## assert(t2.kind == t.kind and t2.done == t.done and t2.data == t.data)
|
|
|
|
const KIND_WALK: StringName = &"walk"
|
|
const KIND_WAIT: StringName = &"wait"
|
|
const KIND_IDLE: StringName = &"idle"
|
|
const KIND_INTERACT: StringName = &"interact" # Timed action on a target entity (Tree, Rock, …)
|
|
const KIND_PICKUP: StringName = &"pickup" # Transfer Item at pawn.tile into pawn.carried_item
|
|
const KIND_DEPOSIT: StringName = &"deposit" # Place pawn.carried_item at pawn.tile
|
|
const KIND_BUILD: StringName = &"build" # Timed construction on a Wall / Floor / Door entity
|
|
const KIND_CRAFT: StringName = &"craft" # Timed crafting at a Workbench driven by a Bill
|
|
const KIND_EAT: StringName = &"eat" # Consume pawn.carried_item and restore hunger
|
|
|
|
var kind: StringName = KIND_IDLE
|
|
## Toil-specific params — all values must be int, float, bool, String, Dict, or Array.
|
|
var data: Dictionary = {}
|
|
## Set by JobRunner when this toil is complete.
|
|
var done: bool = false
|
|
|
|
|
|
# ── factories ────────────────────────────────────────────────────────────────
|
|
|
|
## Walk to the given tile. Stores coords as separate ints for JSON safety.
|
|
static func walk_to(tile: Vector2i) -> Toil:
|
|
var t := Toil.new()
|
|
t.kind = KIND_WALK
|
|
t.data = {
|
|
"to_x": tile.x,
|
|
"to_y": tile.y,
|
|
"started": false,
|
|
}
|
|
return t
|
|
|
|
|
|
## Pause for `n` sim ticks.
|
|
static func wait_ticks(n: int) -> Toil:
|
|
var t := Toil.new()
|
|
t.kind = KIND_WAIT
|
|
t.data = {"ticks_remaining": n}
|
|
return t
|
|
|
|
|
|
## Stand idle — never completes on its own; JobRunner must cancel or replace.
|
|
static func idle() -> Toil:
|
|
var t := Toil.new()
|
|
t.kind = KIND_IDLE
|
|
t.data = {}
|
|
return t
|
|
|
|
|
|
## Timed action on a scene-node target (Tree, Rock, …).
|
|
## `target_node_path` is the NodePath of the entity; stored as String for JSON safety.
|
|
## `tick_method` is the method to call each sim tick (e.g. "on_chop_tick").
|
|
## JobRunner resolves the node at first-tick and calls tick_method every sim tick
|
|
## until the target is no longer choppable/mineable (method source sets done via
|
|
## is_choppable() / is_mineable() returning false).
|
|
static func interact(target_node_path: NodePath, tick_method: StringName) -> Toil:
|
|
var t := Toil.new()
|
|
t.kind = KIND_INTERACT
|
|
t.data = {
|
|
"target": String(target_node_path),
|
|
"tick_method": String(tick_method),
|
|
"started": false,
|
|
}
|
|
return t
|
|
|
|
|
|
## Pick up an Item at pawn.tile into pawn.carried_item. Single-tick action.
|
|
## data is empty — the item is located at pawn.tile at execution time.
|
|
static func pickup() -> Toil:
|
|
var t := Toil.new()
|
|
t.kind = KIND_PICKUP
|
|
t.data = {}
|
|
return t
|
|
|
|
|
|
## Construction action on a scene-node target (Wall, Floor, Door, …).
|
|
## `target_node_path` is the NodePath of the entity; stored as String for JSON safety.
|
|
## JobRunner resolves the node at first-tick and calls on_build_tick() every sim tick
|
|
## until is_buildable() returns false (construction complete or site cancelled/removed).
|
|
static func build_at(target_node_path: NodePath) -> Toil:
|
|
var t := Toil.new()
|
|
t.kind = KIND_BUILD
|
|
t.data = {
|
|
"target": String(target_node_path),
|
|
"started": false,
|
|
}
|
|
return t
|
|
|
|
|
|
## Place pawn.carried_item at pawn.tile. Single-tick action.
|
|
## data is empty — the item comes from pawn.carried_item at execution time.
|
|
static func deposit() -> Toil:
|
|
var t := Toil.new()
|
|
t.kind = KIND_DEPOSIT
|
|
t.data = {}
|
|
return t
|
|
|
|
|
|
## Consume pawn.carried_item and restore hunger. Single-tick action.
|
|
## data is empty — the item comes from pawn.carried_item at execution time.
|
|
static func eat() -> Toil:
|
|
var t := Toil.new()
|
|
t.kind = KIND_EAT
|
|
t.data = {}
|
|
return t
|
|
|
|
|
|
## Timed crafting action at a Workbench.
|
|
## `workbench_path` is the NodePath of the Workbench entity (stored as String for JSON safety).
|
|
## `bill_index` is the index into workbench.bills that this toil should run.
|
|
## JobRunner resolves the workbench and bill on the first tick, validates pawn position and
|
|
## carried ingredient, then advances workbench.current_work_progress each tick until
|
|
## bill.recipe.work_ticks is reached — at which point the ingredient is consumed, an output
|
|
## Item is spawned with a quality roll, and bill.record_completion() is called.
|
|
static func craft_at(workbench_path: NodePath, bill_index: int) -> Toil:
|
|
var t := Toil.new()
|
|
t.kind = KIND_CRAFT
|
|
t.data = {
|
|
"workbench": String(workbench_path),
|
|
"bill_index": bill_index,
|
|
"started": false,
|
|
}
|
|
return t
|
|
|
|
|
|
# ── save / load ──────────────────────────────────────────────────────────────
|
|
|
|
func to_dict() -> Dictionary:
|
|
return {
|
|
"kind": str(kind),
|
|
"data": data.duplicate(true),
|
|
"done": done,
|
|
}
|
|
|
|
|
|
static func from_dict(d: Dictionary) -> Toil:
|
|
var t := Toil.new()
|
|
t.kind = StringName(d.get("kind", str(KIND_IDLE)))
|
|
t.data = (d.get("data", {}) as Dictionary).duplicate(true)
|
|
t.done = d.get("done", false)
|
|
return t
|
|
|
|
|
|
# ── convenience ──────────────────────────────────────────────────────────────
|
|
|
|
## Rebuild Vector2i from the JSON-safe int fields. Only valid for KIND_WALK.
|
|
func get_walk_destination() -> Vector2i:
|
|
return Vector2i(data.get("to_x", 0), data.get("to_y", 0))
|