Phase 17: Touch UX (PawnDetail+BuildDrawer+WorkMatrix+AlertsLog+Settings)
Three-agent fan-out shipping the major touch UI surfaces. Opus pre-wrote 6 EventBus signals (pawn_selected/deselected, pawn_priority_changed, alert_added, request_wolf_spawn, day_ended) + Pawn.work_priorities Dictionary stub before dispatch. Pattern proven across Phases 12-17. Pawn detail + Settings (Agent A): - scenes/ui/pawn_detail_panel.gd — right-side CanvasLayer (layer 18), ~360px wide, opens on EventBus.pawn_selected. Renders portrait, HP/Hunger/Sleep bars with threshold colors, current job, mood + sulking, statuses, top 5 mood thoughts, full skill table, read-only work-priorities row. Live-refreshes each sim tick. - scenes/ui/settings_menu.gd — modal CanvasLayer (layer 26), opened via Settings button. Auto-pause toggles (Threat/Wanderer/Pawn-Down/ Modal), audio sliders (stubs for Phase 18), accessibility checkboxes. Persists via GameState.apply_settings. - scenes/world/selection.gd — extended to emit pawn_selected/deselected through EventBus on tap. Build drawer + 12 new Designation tools (Agent B): - scenes/ui/build_drawer.gd — bottom-sheet CanvasLayer (layer 16) with 4 tabs (Designate/Build/Stockpile/Cancel) + FAB ⊕ open button. Each tab has HFlowContainer of 80×80 buttons with procedural colored icons + label. Tap → Designation.set_active_tool + alert + auto-close. - Designation: added TOOL_CHOP, TOOL_MINE, TOOL_BUILD_CRATE, TOOL_BUILD_BED, TOOL_BUILD_TORCH, 5× TOOL_BUILD_WORKBENCH_* variants, TOOL_PAINT_STOCKPILE. Plus tool_material override for wall/floor. - World._on_designation_added: extended dispatch for all 12 new tools; added _spawn_workbench() helper for the 5 bench kinds. Work matrix + Alerts log + Decision refactor + Wolf signal (Agent C): - scenes/ai/decision.gd: Layer 4 now filters by pawn.work_priorities (0=OFF skip, sort by level ascending with provider.priority tiebreak). NEEDS_CATEGORIES (rest/eat/sleep) bypass the filter — a pawn can never starve from misconfiguration. Audit log prefixes work decisions with (pri=N). - scenes/ui/work_priority_matrix.gd — CanvasLayer (layer 17) bottom-sheet grid: rows=pawns × cols=8 work categories. Each cell tap-cycles 1→2→3→4→0→1, color-coded (red/orange/yellow/blue/gray). Writes back to pawn.work_priorities + emits pawn_priority_changed. - scenes/ui/alerts_log.gd — CanvasLayer (layer 19) ring buffer 50 entries. Newest first, severity icon (info/warn/danger), Day HH:MM timestamp, Go-there camera pan. Listens to alert_added + storyteller_event_fired + day_ended. - EventBus.request_wolf_spawn wired end-to-end: EventCatalog _spawn_wolves emits; WolfSpawner._on_request_wolf_spawn force-spawns bypassing the darkness/cooldown gates. - Clock emits EventBus.day_ended(summary) at dusk→night transition. Top bar buttons added in order: ‖ / 1× / 5× / 12× / Save / Load / Settings / Build / Work / Log[N]. Plus the ⊕ FAB at bottom-right. MCP runtime verified all 4 surfaces via screenshot: - PawnDetailPanel: Bram shows Crafting=8 / Cooking=2 / Manual=0 matching seed; bars green; Mood: 50; work-priorities readout - BuildDrawer: 4 tabs visible, Designate tab shows Chop/Mine/Dig grave/ No roof buttons with procedural icons - WorkPriorityMatrix: 3 pawns × 8 categories, all '3' (NORMAL default) cells in yellow, tap-to-cycle ready - AlertsLog: 4 entries — red 'Wolf pack approaching!' danger, blue 'Bram is at the cabin' info, yellow 'Test alert' warn, blue 'Spring Awakens' from boot storyteller roll. Go-there button per entry. Mouse drag-paint works as-is (user noted). Existing Selection/Designation _unhandled_input handles drag. Deferred to Phase 17.5 polish: - Per-pawn/per-job view layers on the matrix - Stockpile 4×4 chip filter UI (paint creates 1×1 zones today) - Bill UI for workbenches (programmatic only today) - 'No stockpile accepts X' / 'Bill blocked' alert emit wiring - DaySummaryCard visual (signal emits today, no card UI) - Wanderer recruit UI, resource buff system Delegation: 3× gdscript-refactor (Sonnet) agents in parallel; integration + MCP verify on Opus. Co-Authored-By: Claude Opus 4.7 (1M context) <noreply@anthropic.com>
This commit is contained in:
parent
19d28ca9f8
commit
b9093dd24b
25 changed files with 2138 additions and 44 deletions
|
|
@ -13,10 +13,18 @@ extends Node2D
|
|||
## instantiated here. LoadMenu ref is injected into TopBar so the Load button
|
||||
## can call open() without a get_node("/root/…") call.
|
||||
|
||||
const STORYTELLER_BANNER_SCRIPT: Script = preload("res://scenes/ui/storyteller_banner.gd")
|
||||
const STORYTELLER_MODAL_SCRIPT: Script = preload("res://scenes/ui/storyteller_modal.gd")
|
||||
const LOAD_MENU_SCRIPT: Script = preload("res://scenes/ui/load_menu.gd")
|
||||
const RESUME_TOAST_SCRIPT: Script = preload("res://scenes/ui/resume_toast.gd")
|
||||
const STORYTELLER_BANNER_SCRIPT: Script = preload("res://scenes/ui/storyteller_banner.gd")
|
||||
const STORYTELLER_MODAL_SCRIPT: Script = preload("res://scenes/ui/storyteller_modal.gd")
|
||||
const LOAD_MENU_SCRIPT: Script = preload("res://scenes/ui/load_menu.gd")
|
||||
const RESUME_TOAST_SCRIPT: Script = preload("res://scenes/ui/resume_toast.gd")
|
||||
# Phase 17 — PawnDetailPanel (layer 18) and SettingsMenu (layer 26).
|
||||
const PAWN_DETAIL_PANEL_SCRIPT: Script = preload("res://scenes/ui/pawn_detail_panel.gd")
|
||||
const SETTINGS_MENU_SCRIPT: Script = preload("res://scenes/ui/settings_menu.gd")
|
||||
# Phase 17 (Agent B) — BuildDrawer bottom-sheet (layer 16).
|
||||
const BUILD_DRAWER_SCRIPT: Script = preload("res://scenes/ui/build_drawer.gd")
|
||||
# Phase 17 (Agent C) — WorkPriorityMatrix (layer 17) and AlertsLog (layer 19).
|
||||
const WORK_PRIORITY_MATRIX_SCRIPT: Script = preload("res://scenes/ui/work_priority_matrix.gd")
|
||||
const ALERTS_LOG_SCRIPT: Script = preload("res://scenes/ui/alerts_log.gd")
|
||||
|
||||
|
||||
func _ready() -> void:
|
||||
|
|
@ -60,9 +68,75 @@ func _ready() -> void:
|
|||
# Inject LoadMenu ref into TopBar so the Load button can call open()
|
||||
# without reaching into the scene tree by path.
|
||||
var top_bar = get_node_or_null("TopBar")
|
||||
if top_bar != null and top_bar.has_method("_ready"):
|
||||
top_bar.load_menu = load_menu
|
||||
elif top_bar != null:
|
||||
if top_bar != null:
|
||||
top_bar.load_menu = load_menu
|
||||
|
||||
Audit.log("main", "Phase 16 — LoadMenu + ResumeToast mounted.")
|
||||
|
||||
# Phase 17 — PawnDetailPanel (layer 18) and SettingsMenu (layer 26).
|
||||
var pawn_detail_panel := CanvasLayer.new()
|
||||
pawn_detail_panel.set_script(PAWN_DETAIL_PANEL_SCRIPT)
|
||||
pawn_detail_panel.name = "PawnDetailPanel"
|
||||
add_child(pawn_detail_panel)
|
||||
|
||||
var settings_menu := CanvasLayer.new()
|
||||
settings_menu.set_script(SETTINGS_MENU_SCRIPT)
|
||||
settings_menu.name = "SettingsMenu"
|
||||
add_child(settings_menu)
|
||||
|
||||
# Inject SettingsMenu ref into TopBar so the Settings button can call open()
|
||||
# without reaching into the scene tree by path.
|
||||
if top_bar != null:
|
||||
top_bar.settings_menu = settings_menu
|
||||
if top_bar.has_method("_add_settings_btn"):
|
||||
top_bar._add_settings_btn()
|
||||
|
||||
Audit.log("main", "Phase 17 — PawnDetailPanel + SettingsMenu mounted.")
|
||||
|
||||
# Phase 17 (Agent B) — BuildDrawer bottom-sheet (layer 16).
|
||||
# Must mount AFTER the World node is ready (World._ready seeds designation_ctl).
|
||||
# Resolve the Designation controller from the World child so BuildDrawer can
|
||||
# call set_active_tool() without a get_node("/root/…") call.
|
||||
var build_drawer := CanvasLayer.new()
|
||||
build_drawer.set_script(BUILD_DRAWER_SCRIPT)
|
||||
build_drawer.name = "BuildDrawer"
|
||||
add_child(build_drawer)
|
||||
|
||||
# Inject Designation ref (World child node) into the drawer.
|
||||
var world_node = get_node_or_null("World")
|
||||
if world_node != null:
|
||||
var desig = world_node.get_node_or_null("DesignationCtl")
|
||||
if desig != null:
|
||||
build_drawer.designation = desig
|
||||
else:
|
||||
Audit.log("main", "BuildDrawer: DesignationCtl not found on World — tool paint disabled")
|
||||
else:
|
||||
Audit.log("main", "BuildDrawer: World node not found — tool paint disabled")
|
||||
|
||||
# Inject BuildDrawer ref into TopBar and add the Build button.
|
||||
if top_bar != null:
|
||||
top_bar.build_drawer = build_drawer
|
||||
if top_bar.has_method("_add_build_btn"):
|
||||
top_bar._add_build_btn()
|
||||
|
||||
Audit.log("main", "Phase 17 (Agent B) — BuildDrawer mounted.")
|
||||
|
||||
# Phase 17 (Agent C) — WorkPriorityMatrix (layer 17) and AlertsLog (layer 19).
|
||||
var work_matrix := CanvasLayer.new()
|
||||
work_matrix.set_script(WORK_PRIORITY_MATRIX_SCRIPT)
|
||||
work_matrix.name = "WorkPriorityMatrix"
|
||||
add_child(work_matrix)
|
||||
|
||||
var alerts_log := CanvasLayer.new()
|
||||
alerts_log.set_script(ALERTS_LOG_SCRIPT)
|
||||
alerts_log.name = "AlertsLog"
|
||||
add_child(alerts_log)
|
||||
|
||||
# Inject refs into TopBar and add Work + Log buttons to ButtonRow.
|
||||
if top_bar != null:
|
||||
top_bar.work_priority_matrix = work_matrix
|
||||
top_bar.alerts_log_panel = alerts_log
|
||||
if top_bar.has_method("_add_work_log_btns"):
|
||||
top_bar._add_work_log_btns()
|
||||
|
||||
Audit.log("main", "Phase 17 (Agent C) — WorkPriorityMatrix + AlertsLog mounted.")
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue