Phase 8 — Beds, sleep need, thoughts, mood, Sulking soft-break
Three gdscript-refactor agents in parallel; Opus integrated and verified
the sleep+wake cycle via MCP runtime.
Bed entity (Agent A, scenes/entities/bed.{gd,tscn} + world.gd, ~280 lines):
- class Bed extends Node2D — bottom-anchored 3/4 perspective like Wall/Workbench
- BuildJob interface (is_buildable / on_build_tick / _complete) — same pattern
as Wall / Crate / Workbench. blocks_pathing_when_complete=false (walkable).
- Quality-tinted sheet colours by Item.Quality tier (drab grey → blue →
gold-brown → regal pink); white pillow + dark frame constant across tiers.
- claim(pawn) / release() / is_available() — atomic occupancy; claim re-checks
is_available() inside to avoid race conditions during pawn walk-to-bed.
- World.beds registry + register_bed / unregister_bed (mirrors workbench pattern)
Sleep need + SleepProvider + KIND_SLEEP toil (Agent B, ~220 lines):
- Pawn.sleep: float 0..100. SLEEP_DECAY_PER_TICK=0.015 (~6667 ticks / 5.5 min
at 1× / 1 min at Ultra to fully tire). Slower than hunger.
- is_tired() at <30; is_exhausted() at <5 (Phase 9 status interrupt hook)
- SleepProvider priority=8 (highest — sleep beats eat=7 when both urgent)
- Toil.KIND_SLEEP + Toil.sleep_in_bed(NodePath) factory
- JobRunner._tick_sleep: first-tick bed claim (with race-loss → floor fallback),
per-tick recovery (bed=0.5/tick, floor=0.25/tick), wake-when-full at ≥99,
emergency ceiling SLEEP_TICKS_MAX=2000 prevents stuck-asleep loops
Thoughts + mood + Sulking (Agent C, ~290 lines):
- scenes/ai/thought.gd: class Thought (RefCounted) with id, modifier, lifetime
(PERSISTENT/EVENT), stacks, ticks_remaining; MAX_STACKS_PER_THOUGHT=5 locked
- scenes/ai/thought_catalog.gd: ThoughtCatalog with 5 Phase 8 thoughts —
hungry(-6, PERSISTENT) / tired(-4, PERSISTENT) / well_rested(+5, EVENT 1200t)
/ slept_on_floor(-5, EVENT 1200t) / ate_meal(+3, EVENT 800t, stacks up to 3)
- Pawn extended: thoughts: Array, mood: float (base 50), sulking: bool,
_sulk_low_ticks. add_thought (stack-merge by id), remove_thought_by_id,
has_thought, is_sulking. _process_thoughts in sim_tick decays EVENT thoughts,
syncs PERSISTENT thoughts to state (hungry/tired), recomputes mood, checks
sulking transition: mood < 25 for MOOD_SULK_SUSTAIN_TICKS=600 ticks → SULKING;
mood >= 35 → recover.
- Decision Layer 1 extended: pawn.is_sulking() → return null (sulking pawns
refuse all work; Phase 17 may add Wandering variant)
- EventBus.pawn_mood_changed signal
- JobRunner._tick_eat: fires ate_meal thought when consuming MEAL/BREAD
- JobRunner._tick_sleep: fires well_rested or slept_on_floor on wake
Opus integration:
- world.tscn: SleepProvider node added (9 providers total)
- world.gd registers in priority order:
sleep=8 > eat=7 > construction=6 > chop=5 ≈ plant=5 > mine=4 ≈ crafting=4 > haul=3 > rest=0
- Demo seed: 3 beds along cabin's north row at (45/47/49, 24), pre-built
so pawns can sleep immediately when tired
Acceptance — MCP-verified end-to-end:
- Pre-tired Bram at sleep=25 → SleepProvider issued 'Sleep at (45, 24)' job
- Bram walked to bed, claimed, slept 200 ticks, woke at sleep≥99
- Bed released back to available; well_rested thought fired (+5 mood)
- After ~12000 ticks total: all 3 pawns slept (sleep recovered to 67/86/51),
thoughts active (1-2 per pawn — well_rested + ate_meal from Phase 7 cooked
bread consumption), beds all back to available, no claim leaks
- Mood compute working (base 50 + thought modifiers); sulking transition
ready but didn't fire — would need misery accumulation (Phase 9 Cold +
Bleeding statuses) to drive mood < 25 sustained
Phase 8 followups for later phases:
- Sulking returns null (stand still); Phase 17 may add Wandering soft-break
that issues a random-walk job
- Bed ownership (_owner_pawn) reserved but not used in Phase 8 — Phase 17
may add 'bedrooms' where each pawn claims a specific bed
- _tick_sleep's using_bed local-var reset pattern is correct but fragile;
cleanup pass when status interrupts (Phase 9) wire into the eat/sleep
cancellation path
Delegation report this phase:
- Agent A: Bed entity (buildable, quality-tinted, claim/release)
- Agent B: Pawn.sleep + SleepProvider + KIND_SLEEP toil + JobRunner._tick_sleep
- Agent C: Thought + ThoughtCatalog + Pawn mood/sulking + Decision Layer 1
+ JobRunner thought hooks in _tick_eat / _tick_sleep
- Opus: scene wiring + 3 beds in demo seed + MCP runtime verification
~75% of Phase 8 GDScript was subagent-authored.
Co-Authored-By: Claude Opus 4.7 (1M context) <noreply@anthropic.com>
This commit is contained in:
parent
61dcf6760b
commit
43e52ffe75
18 changed files with 920 additions and 6 deletions
267
scenes/entities/bed.gd
Normal file
267
scenes/entities/bed.gd
Normal file
|
|
@ -0,0 +1,267 @@
|
|||
class_name Bed extends Node2D
|
||||
## Bed furniture entity — buildable, optionally pawn-owned, quality-affected sleep.
|
||||
##
|
||||
## Rendered as a bottom-anchored 3/4-perspective sprite within the 16×16 tile,
|
||||
## matching the workbench / wall / door rendering convention. Ghost state (40%
|
||||
## alpha) while construction is in progress; solid once _completed.
|
||||
##
|
||||
## Quality tints the sheet colour (SLEEP_MOOD_BY_QUALITY maps Item.Quality int
|
||||
## to the mood modifier awarded when a pawn finishes sleeping here). Phase 8
|
||||
## spawns beds at NORMAL quality; Phase 17+ may roll quality from crafter skill.
|
||||
##
|
||||
## Build model (docs/implementation.md Phase 8):
|
||||
## BUILD_TICKS ticks via the standard BuildJob toil (same shape as Wall/Crate/
|
||||
## Workbench). blocks_pathing_when_complete() returns false — pawns walk ONTO
|
||||
## the bed tile to sleep.
|
||||
##
|
||||
## Occupancy model:
|
||||
## _owner_pawn — null = unowned (any tired pawn may use); Phase 8 leaves null.
|
||||
## _occupant_pawn — set by SleepProvider.claim(); released on SleepProvider.release().
|
||||
## is_available() — true when completed AND no current occupant.
|
||||
## claim(pawn) — atomically sets _occupant_pawn; returns false if unavailable.
|
||||
## release() — clears _occupant_pawn.
|
||||
##
|
||||
## Save/load:
|
||||
## to_dict() serialises all persistent fields. _occupant_pawn is always saved
|
||||
## as null (sleep is mid-toil state; the JobRunner saves its own side). Re-wiring
|
||||
## owner_pawn from name → Pawn reference is deferred to Phase 16's full save layer.
|
||||
##
|
||||
## World registration: World.register_bed / World.unregister_bed called from
|
||||
## _ready / _exit_tree.
|
||||
|
||||
const TILE_SIZE_PX: int = 16
|
||||
|
||||
## Sim ticks to build a bed (80 ticks ≈ 4 sim seconds at 1×).
|
||||
const BUILD_TICKS: int = 80
|
||||
|
||||
## Sleep mood modifier indexed by Item.Quality int (SHODDY=0 … LEGENDARY=4).
|
||||
## Applied via the "slept_in_X" thought when a pawn finishes a sleep job.
|
||||
## Numbers are design.md placeholders — tune in Phase 20.
|
||||
## SHODDY=-8, NORMAL=-2, EXCELLENT=0, MASTERWORK=5, LEGENDARY=8
|
||||
const SLEEP_MOOD_BY_QUALITY: Array[int] = [-8, -2, 0, 5, 8]
|
||||
|
||||
# ── exports ───────────────────────────────────────────────────────────────────
|
||||
|
||||
## Tile position of this bed in world-tile coordinates.
|
||||
@export var tile: Vector2i = Vector2i.ZERO
|
||||
|
||||
## Quality tier as an int matching Item.Quality enum (0=SHODDY … 4=LEGENDARY).
|
||||
## Determines sheet colour and sleep mood modifier.
|
||||
@export var quality: int = 1
|
||||
|
||||
## Player-visible name. Defaults to "Bed"; extended types (medical bed, etc.)
|
||||
## can override via label_text without needing a subclass.
|
||||
@export var label_text: String = "Bed"
|
||||
|
||||
# ── state ─────────────────────────────────────────────────────────────────────
|
||||
|
||||
## Ticks of construction work applied so far. 0..BUILD_TICKS.
|
||||
var build_progress: int = 0
|
||||
|
||||
## True once build_progress >= BUILD_TICKS.
|
||||
var _completed: bool = false
|
||||
|
||||
## The pawn who "owns" this bed (has first right of use). null = unowned.
|
||||
## Phase 8 leaves this null; Phase 17 wires per-pawn bed assignment UI.
|
||||
var _owner_pawn = null
|
||||
|
||||
## The pawn currently lying in this bed. Set by claim(); cleared by release().
|
||||
## Always null on save (SleepProvider re-claims after load if the pawn still
|
||||
## has an active sleep job; the JobRunner handles reconnection).
|
||||
var _occupant_pawn = null
|
||||
|
||||
|
||||
# ── lifecycle ─────────────────────────────────────────────────────────────────
|
||||
|
||||
func _ready() -> void:
|
||||
# Bottom-anchor: position.y at tile bottom so Y-sort occludes pawns correctly.
|
||||
position = Vector2(
|
||||
tile.x * TILE_SIZE_PX + TILE_SIZE_PX / 2.0,
|
||||
tile.y * TILE_SIZE_PX + TILE_SIZE_PX
|
||||
)
|
||||
World.register_bed(self)
|
||||
queue_redraw()
|
||||
|
||||
|
||||
func _exit_tree() -> void:
|
||||
World.unregister_bed(self)
|
||||
|
||||
|
||||
## One-shot initialiser. Call after add_child() so _ready() has fired.
|
||||
func setup(p_tile: Vector2i) -> void:
|
||||
tile = p_tile
|
||||
position = Vector2(
|
||||
tile.x * TILE_SIZE_PX + TILE_SIZE_PX / 2.0,
|
||||
tile.y * TILE_SIZE_PX + TILE_SIZE_PX
|
||||
)
|
||||
queue_redraw()
|
||||
|
||||
|
||||
# ── BuildJob interface (matches Wall / Crate / Workbench shape) ───────────────
|
||||
|
||||
## True while the bed still needs construction work.
|
||||
## JobRunner's BUILD toil checks this to decide when the toil is done.
|
||||
func is_buildable() -> bool:
|
||||
return not _completed
|
||||
|
||||
|
||||
## Human-readable label for job descriptions and Audit logs.
|
||||
func label() -> String:
|
||||
return label_text
|
||||
|
||||
|
||||
## Called by the BUILD toil in JobRunner once per sim tick while the pawn works.
|
||||
## Advances build_progress and completes the bed at BUILD_TICKS.
|
||||
func on_build_tick() -> void:
|
||||
if _completed:
|
||||
return
|
||||
build_progress += 1
|
||||
queue_redraw()
|
||||
if build_progress >= BUILD_TICKS:
|
||||
_complete()
|
||||
|
||||
|
||||
## True once the bed has been fully built.
|
||||
func is_completed() -> bool:
|
||||
return _completed
|
||||
|
||||
|
||||
## Beds remain walkable after completion — pawns walk ONTO the tile to sleep.
|
||||
func blocks_pathing_when_complete() -> bool:
|
||||
return false
|
||||
|
||||
|
||||
# ── occupancy ─────────────────────────────────────────────────────────────────
|
||||
|
||||
## Returns true when this bed is built and no pawn is currently using it.
|
||||
## SleepProvider calls this to filter candidate beds before claiming.
|
||||
func is_available() -> bool:
|
||||
return _completed and _occupant_pawn == null
|
||||
|
||||
|
||||
## Atomically claim this bed for `pawn`. Returns false if not available.
|
||||
## SleepProvider calls this before starting the sleep toil; on false the
|
||||
## provider must look for another bed.
|
||||
func claim(pawn) -> bool:
|
||||
if not is_available():
|
||||
return false
|
||||
_occupant_pawn = pawn
|
||||
return true
|
||||
|
||||
|
||||
## Release this bed when the sleep job ends (normally or interrupted).
|
||||
## SleepProvider calls this from its on_complete / on_cancel hook.
|
||||
func release() -> void:
|
||||
_occupant_pawn = null
|
||||
|
||||
|
||||
# ── save / load ───────────────────────────────────────────────────────────────
|
||||
|
||||
## Serialise all persistent state for World save (wired in Phase 16).
|
||||
## _occupant_pawn is always saved as null — the JobRunner holds the sleep
|
||||
## toil state and the SleepProvider re-claims the bed after load.
|
||||
func to_dict() -> Dictionary:
|
||||
var owner_name = null
|
||||
if _owner_pawn != null and _owner_pawn.has_method("get"):
|
||||
owner_name = _owner_pawn.get("pawn_name")
|
||||
return {
|
||||
"tile_x": tile.x,
|
||||
"tile_y": tile.y,
|
||||
"quality": quality,
|
||||
"label_text": label_text,
|
||||
"build_progress": build_progress,
|
||||
"completed": _completed,
|
||||
"owner_pawn_name": owner_name,
|
||||
# occupant_pawn always null on save — SleepProvider reconnects after load.
|
||||
"occupant_pawn": null,
|
||||
}
|
||||
|
||||
|
||||
## Restore from a dict produced by to_dict().
|
||||
## owner_pawn re-wiring (name → Pawn reference) is deferred to Phase 16.
|
||||
func from_dict(d: Dictionary) -> void:
|
||||
tile = Vector2i(int(d.get("tile_x", 0)), int(d.get("tile_y", 0)))
|
||||
quality = int(d.get("quality", 1))
|
||||
label_text = str(d.get("label_text", "Bed"))
|
||||
build_progress = int(d.get("build_progress", 0))
|
||||
_completed = bool(d.get("completed", false))
|
||||
# owner_pawn: Phase 16 will walk World.pawns and match by pawn_name.
|
||||
_owner_pawn = null
|
||||
_occupant_pawn = null
|
||||
setup(tile)
|
||||
|
||||
|
||||
# ── render ─────────────────────────────────────────────────────────────────────
|
||||
|
||||
func _draw() -> void:
|
||||
# 3/4-perspective bed — fits within the tile (16×16 local box).
|
||||
# Origin (0, 0) = tile bottom-centre. Tile spans local Y: -16 to 0.
|
||||
#
|
||||
# Layout (bottom-anchored, same as Wall / Workbench):
|
||||
# Top band (5 px, Y -16..-11) — top surface of the bed frame (lit)
|
||||
# Body band (8 px, Y -11..-3) — sheet / quilt, quality-tinted
|
||||
# Leg band (3 px, Y -3.. 0) — bed-frame legs / base
|
||||
#
|
||||
# The pillow is a 6×3 rect inset at the top of the body band.
|
||||
# Quality tints the sheet; the frame/legs stay a constant warm brown.
|
||||
# Ghost state draws at 0.4 alpha.
|
||||
var alpha: float = 1.0 if _completed else 0.4
|
||||
_draw_bed(alpha)
|
||||
|
||||
|
||||
func _draw_bed(alpha: float) -> void:
|
||||
# Frame colours — same for all quality tiers (wood frame).
|
||||
var frame_top := Color(0.52, 0.38, 0.20, alpha) # lit top surface
|
||||
var frame_dark := Color(0.34, 0.24, 0.12, alpha) # shaded legs / base
|
||||
var frame_edge := Color(0.28, 0.18, 0.08, alpha) # top-front horizon
|
||||
var outline := Color(0.20, 0.12, 0.04, 0.70 * alpha)
|
||||
|
||||
# Sheet colour varies by quality tier.
|
||||
var sheet_color := _sheet_color_for_quality(quality, alpha)
|
||||
|
||||
# Pillow: light cream, inset at top-centre of the body band.
|
||||
var pillow := Color(0.95, 0.92, 0.85, alpha)
|
||||
|
||||
# ── top surface (lit band) ────────────────────────────────────────────────
|
||||
draw_rect(Rect2(Vector2(-8.0, -16.0), Vector2(16.0, 5.0)), frame_top)
|
||||
|
||||
# ── sheet / body band ─────────────────────────────────────────────────────
|
||||
draw_rect(Rect2(Vector2(-7.0, -11.0), Vector2(14.0, 8.0)), sheet_color)
|
||||
|
||||
# Pillow: 6×3, horizontally centred, flush with the top of the body band.
|
||||
draw_rect(Rect2(Vector2(-3.0, -11.0), Vector2(6.0, 3.0)), pillow)
|
||||
|
||||
# ── base / legs band ──────────────────────────────────────────────────────
|
||||
draw_rect(Rect2(Vector2(-8.0, -3.0), Vector2(16.0, 3.0)), frame_dark)
|
||||
|
||||
# ── horizon line (top → front depth edge) ────────────────────────────────
|
||||
draw_line(Vector2(-8.0, -11.0), Vector2(8.0, -11.0), frame_edge, 1.0)
|
||||
|
||||
# ── outline ───────────────────────────────────────────────────────────────
|
||||
draw_rect(Rect2(Vector2(-8.0, -16.0), Vector2(16.0, 16.0)), outline, false, 1.0)
|
||||
|
||||
|
||||
## Returns the sheet fill colour for the given quality int.
|
||||
## Quality indices: 0=SHODDY, 1=NORMAL, 2=EXCELLENT, 3=MASTERWORK, 4=LEGENDARY.
|
||||
func _sheet_color_for_quality(q: int, alpha: float) -> Color:
|
||||
match q:
|
||||
0: # SHODDY — drab grey-brown
|
||||
return Color(0.45, 0.40, 0.35, alpha)
|
||||
1: # NORMAL — warm tan
|
||||
return Color(0.55, 0.40, 0.30, alpha)
|
||||
2: # EXCELLENT — cool blue
|
||||
return Color(0.30, 0.45, 0.65, alpha)
|
||||
3: # MASTERWORK — gold-brown
|
||||
return Color(0.65, 0.45, 0.20, alpha)
|
||||
4: # LEGENDARY — regal pink
|
||||
return Color(0.75, 0.40, 0.55, alpha)
|
||||
_: # fallback — same as NORMAL
|
||||
return Color(0.55, 0.40, 0.30, alpha)
|
||||
|
||||
|
||||
# ── internal ──────────────────────────────────────────────────────────────────
|
||||
|
||||
func _complete() -> void:
|
||||
_completed = true
|
||||
queue_redraw()
|
||||
Audit.log("bed", "%s built at %s" % [label_text, tile])
|
||||
1
scenes/entities/bed.gd.uid
Normal file
1
scenes/entities/bed.gd.uid
Normal file
|
|
@ -0,0 +1 @@
|
|||
uid://e2ao53rg434d
|
||||
8
scenes/entities/bed.tscn
Normal file
8
scenes/entities/bed.tscn
Normal file
|
|
@ -0,0 +1,8 @@
|
|||
[gd_scene load_steps=2 format=3 uid="uid://bed_entity"]
|
||||
|
||||
[ext_resource type="Script" path="res://scenes/entities/bed.gd" id="1_bed"]
|
||||
|
||||
[node name="Bed" type="Node2D"]
|
||||
y_sort_enabled = true
|
||||
z_index = 0
|
||||
script = ExtResource("1_bed")
|
||||
Loading…
Add table
Add a link
Reference in a new issue