feat: structured narrative event feed with per-NPC inspector timeline
Add narrative event types (task_started, npc_slept, npc_died, resource_depleted) alongside economic transfers. EconomicEventRecord gains create_narrative factory and human-readable description method. SimulationManager records task-start and sleep/death events, exposes get_npc_events() for per-NPC history queries. Inspector now shows a Recent timeline of the last 5 events for the selected NPC, plus displays carried wood count. Relax EconomicEventRecord validation to accept non-economic events. Update roadmap with completed milestones.
This commit is contained in:
@@ -126,6 +126,13 @@ func simulate_tick() -> void:
|
||||
latest_decisions[npc.id] = selection
|
||||
npc_decision_recorded.emit(npc, selection)
|
||||
npc.set_task(selection.action_id, selection.duration_override)
|
||||
var action_def := SimulationDefinitions.get_action(selection.action_id)
|
||||
var action_display := String(selection.action_id)
|
||||
if action_def != null:
|
||||
action_display = action_def.display_name
|
||||
record_narrative_event(
|
||||
SimulationIds.EVENT_TASK_STARTED, npc.id, &"", action_display
|
||||
)
|
||||
|
||||
if old_task != npc.current_task and old_target != &"":
|
||||
release_npc_reservation(npc.id)
|
||||
@@ -135,6 +142,7 @@ func simulate_tick() -> void:
|
||||
release_npc_reservation(npc.id)
|
||||
npc_died.emit(npc)
|
||||
npc_task_changed.emit(npc, old_task, npc.current_task)
|
||||
record_narrative_event(SimulationIds.EVENT_NPC_DIED, npc.id)
|
||||
|
||||
if debug_logs:
|
||||
print("[SimulationManager] NPC died: ", npc.npc_name)
|
||||
@@ -218,6 +226,7 @@ func simulate_tick() -> void:
|
||||
elif completed_task == SimulationIds.ACTION_SLEEP:
|
||||
npc.energy = minf(npc.energy + 40.0, 100.0)
|
||||
npc.position = npc.home_position
|
||||
record_narrative_event(SimulationIds.EVENT_NPC_SLEPT, npc.id)
|
||||
if debug_logs:
|
||||
print("[SimulationManager] ", npc.npc_name, " completed sleep at home")
|
||||
elif (
|
||||
@@ -460,6 +469,32 @@ func _record_economic_event(
|
||||
economic_event_recorded.emit(event)
|
||||
|
||||
|
||||
func record_narrative_event(
|
||||
event_type: StringName,
|
||||
actor_id: int,
|
||||
source_id: StringName = &"",
|
||||
action_display: String = ""
|
||||
) -> void:
|
||||
var event := EconomicEventRecord.create_narrative(
|
||||
next_event_id, event_type, tick_count, actor_id, source_id, action_display
|
||||
)
|
||||
next_event_id += 1
|
||||
economic_events.append(event)
|
||||
economic_event_recorded.emit(event)
|
||||
|
||||
|
||||
func get_npc_events(npc_id: int, max_count: int = 8) -> Array[EconomicEventRecord]:
|
||||
var results: Array[EconomicEventRecord] = []
|
||||
for i in range(economic_events.size() - 1, -1, -1):
|
||||
var event: EconomicEventRecord = economic_events[i]
|
||||
if event.data["actor_id"] == npc_id:
|
||||
results.append(event)
|
||||
if results.size() >= max_count:
|
||||
break
|
||||
results.reverse()
|
||||
return results
|
||||
|
||||
|
||||
func _initialize_storage() -> void:
|
||||
if not storage_states.has(SimulationIds.STORAGE_VILLAGE_PANTRY):
|
||||
storage_states[SimulationIds.STORAGE_VILLAGE_PANTRY] = (StorageStateRecord.create(
|
||||
|
||||
@@ -35,3 +35,7 @@ const EVENT_RESOURCE_EXTRACTED := &"resource_extracted"
|
||||
const EVENT_STORAGE_DEPOSITED := &"storage_deposited"
|
||||
const EVENT_STORAGE_WITHDRAWN := &"storage_withdrawn"
|
||||
const EVENT_ITEM_CONSUMED := &"item_consumed"
|
||||
const EVENT_NPC_SLEPT := &"npc_slept"
|
||||
const EVENT_NPC_DIED := &"npc_died"
|
||||
const EVENT_TASK_STARTED := &"task_started"
|
||||
const EVENT_RESOURCE_DEPLETED := &"resource_depleted"
|
||||
|
||||
@@ -35,6 +35,30 @@ static func create(
|
||||
)
|
||||
|
||||
|
||||
static func create_narrative(
|
||||
event_id: int,
|
||||
event_type: StringName,
|
||||
tick: int,
|
||||
actor_id: int,
|
||||
source_id: StringName,
|
||||
action_display: String = ""
|
||||
) -> EconomicEventRecord:
|
||||
return EconomicEventRecord.new(
|
||||
{
|
||||
"schema_version": SCHEMA_VERSION,
|
||||
"event_id": event_id,
|
||||
"event_type": String(event_type),
|
||||
"tick": tick,
|
||||
"actor_id": actor_id,
|
||||
"source_id": String(source_id),
|
||||
"destination_id": "",
|
||||
"item_id": "",
|
||||
"amount": 0.0,
|
||||
"action_name": action_display
|
||||
}
|
||||
)
|
||||
|
||||
|
||||
static func from_dictionary(record_data: Dictionary) -> EconomicEventRecord:
|
||||
if int(record_data.get("schema_version", -1)) != SCHEMA_VERSION:
|
||||
return null
|
||||
@@ -65,10 +89,6 @@ static func from_dictionary(record_data: Dictionary) -> EconomicEventRecord:
|
||||
normalized["event_id"] < 0
|
||||
or normalized["tick"] < 0
|
||||
or normalized["event_type"].is_empty()
|
||||
or normalized["source_id"].is_empty()
|
||||
or normalized["destination_id"].is_empty()
|
||||
or normalized["item_id"].is_empty()
|
||||
or normalized["amount"] <= 0.0
|
||||
):
|
||||
return null
|
||||
return EconomicEventRecord.new(normalized)
|
||||
@@ -76,3 +96,32 @@ static func from_dictionary(record_data: Dictionary) -> EconomicEventRecord:
|
||||
|
||||
func to_dictionary() -> Dictionary:
|
||||
return data.duplicate(true)
|
||||
|
||||
|
||||
func description(npc_names: Dictionary = {}) -> String:
|
||||
var actor_name: String = npc_names.get(int(data["actor_id"]), "Someone")
|
||||
var item: String = str(data["item_id"])
|
||||
var amount: float = float(data["amount"])
|
||||
var event_type: String = str(data["event_type"])
|
||||
var source: String = str(data["source_id"])
|
||||
var destination: String = str(data["destination_id"])
|
||||
var action_name: String = str(data.get("action_name", ""))
|
||||
match event_type:
|
||||
"resource_extracted":
|
||||
return "%s gathered %.0f %s from %s" % [actor_name, amount, item, source]
|
||||
"storage_deposited":
|
||||
return "%s deposited %.0f %s into %s" % [actor_name, amount, item, destination]
|
||||
"storage_withdrawn":
|
||||
return "%s withdrew %.0f %s from %s" % [actor_name, amount, item, source]
|
||||
"item_consumed":
|
||||
return "%s consumed %.0f %s" % [actor_name, amount, item]
|
||||
"npc_slept":
|
||||
return "%s slept and recovered energy" % actor_name
|
||||
"npc_died":
|
||||
return "%s died from starvation" % actor_name
|
||||
"task_started":
|
||||
return "%s began %s" % [actor_name, action_name if not action_name.is_empty() else item]
|
||||
"resource_depleted":
|
||||
return "%s was depleted" % source
|
||||
_:
|
||||
return "tick %d: %s" % [int(data["tick"]), event_type]
|
||||
|
||||
Reference in New Issue
Block a user