feat: unify authored activity commands

This commit is contained in:
Rijad Zuzo
2026-08-13 00:08:30 +02:00
parent e5aecee0de
commit b3b98c6456
36 changed files with 3013 additions and 96 deletions
+163 -2
View File
@@ -126,11 +126,172 @@ func _run() -> void:
main_scene.get_node("JajceWorld/WorldObjects/ActivitySites/GuardPost") as ActivitySite
)
player.global_position = guard_site.get_interaction_position()
var adapter := main_scene.get_node("ActiveWorldAdapter") as ActiveWorldAdapter
var adapter_identity := adapter.get_context_identity()
_check(
adapter.configure_context_identity(
StringName(adapter_identity["context_id"]),
StringName(adapter_identity["world_id"]),
StringName(adapter_identity["location_id"])
),
"Activity registry ABA setup should create a clean first registry"
)
var guard_context := player.get_interaction_context() as PlayerInteractionResult
var stale_safety: float = simulation_manager.village.safety
var stale_woodpile := simulation_manager.get_woodpile() as StorageStateRecord
var stale_wood: float = stale_woodpile.get_amount(SimulationIds.RESOURCE_WOOD)
var stale_event_count: int = simulation_manager.economic_events.size()
_check(
(
guard_context != null
and adapter.configure_context_identity(
StringName(adapter_identity["context_id"]),
StringName(adapter_identity["world_id"]),
StringName(adapter_identity["location_id"])
)
and adapter.get_target_handle(guard_site.site_id) != null
and (
adapter.get_target_handle(guard_site.site_id).get_generation()
== guard_context.target_generation
)
),
"Activity registry replacement should recreate the same visible target generation"
)
simulation_manager.update_player_combatant(player.global_position)
var stale_result: ActionResult = simulation_manager.execute_player_activity_action(
guard_context.action_id,
guard_context.target_id,
guard_context.expected_state_revision,
guard_context.target_generation,
guard_context.target_context_id,
guard_context.target_registry_instance_id
)
var incomplete_result: ActionResult = simulation_manager.execute_player_activity_action(
guard_context.action_id, guard_context.target_id
)
_check(
(
stale_result != null
and not stale_result.did_succeed()
and stale_result.get_reason_code() == ActivityActionCommandService.REASON_STALE_TARGET
and is_equal_approx(simulation_manager.village.safety, stale_safety)
and is_equal_approx(stale_woodpile.get_amount(SimulationIds.RESOURCE_WOOD), stale_wood)
and simulation_manager.economic_events.size() == stale_event_count
and incomplete_result != null
and not incomplete_result.did_succeed()
and (
incomplete_result.get_reason_code()
== ActivityActionCommandService.REASON_STALE_TARGET
)
),
(
"A replaced registry and an incomplete direct call must reject without mutating "
+ "authority"
)
)
guard_context = player.get_interaction_context() as PlayerInteractionResult
var safety_before: float = simulation_manager.village.safety
var woodpile := simulation_manager.get_woodpile() as StorageStateRecord
var wood_before := woodpile.get_amount(SimulationIds.RESOURCE_WOOD)
var event_count_before: int = simulation_manager.economic_events.size()
player.try_interact()
var activity_event := simulation_manager.economic_events.back() as EconomicEventRecord
_check(
(
guard_context != null
and guard_context.kind == PlayerInteractionResult.KIND_ACTIVITY
and guard_context.action_id == SimulationIds.ACTION_PATROL
and guard_context.target_id == guard_site.site_id
and guard_context.expected_state_revision == event_count_before
and simulation_manager.village.safety > safety_before
and is_equal_approx(woodpile.get_amount(SimulationIds.RESOURCE_WOOD), wood_before - 1.0)
and simulation_manager.economic_events.size() == event_count_before + 1
and (
StringName(activity_event.data["event_type"])
== SimulationIds.EVENT_ACTIVITY_COMPLETED
)
and int(activity_event.data["actor_id"]) == SimulationIds.PLAYER_ACTOR_ID
and StringName(activity_event.data["source_id"]) == guard_site.site_id
and StringName(activity_event.data["action_id"]) == SimulationIds.ACTION_PATROL
and StringName(activity_event.data["metric_id"]) == &"safety"
and is_equal_approx(float(activity_event.data["metric_delta"]), 3.0)
and StringName(activity_event.data["cost_item_id"]) == SimulationIds.RESOURCE_WOOD
and is_equal_approx(float(activity_event.data["cost_amount"]), 1.0)
and StringName(activity_event.data["world_id"]) == SimulationIds.REGIONAL_WORLD_BOSNIA
and (
StringName(activity_event.data["location_id"])
== SimulationIds.REGIONAL_LOCATION_JAJCE
)
and simulation_manager.event_knowledge_system.knows_event(
SimulationIds.PLAYER_ACTOR_ID, int(activity_event.data["event_id"])
)
),
(
"Player activity should use the same revisioned command, cost, metric, fact, and "
+ "knowledge path as NPC work"
)
)
var activity_checksum: String = simulation_manager.get_state_checksum()
var activity_snapshot: String = simulation_manager.serialize_state()
_check(
(
simulation_manager.restore_state_from_json(activity_snapshot)
and simulation_manager.get_state_checksum() == activity_checksum
and simulation_manager.event_knowledge_system.knows_event(
SimulationIds.PLAYER_ACTOR_ID, int(activity_event.data["event_id"])
)
),
"Player activity facts and performed knowledge should survive exact save/restore"
)
woodpile = simulation_manager.get_woodpile()
woodpile.withdraw(SimulationIds.RESOURCE_WOOD, woodpile.get_amount(SimulationIds.RESOURCE_WOOD))
simulation_manager.economy.sync_resource(SimulationIds.RESOURCE_WOOD)
var blocked_guard_context := player.get_interaction_context() as PlayerInteractionResult
var blocked_guard_safety: float = simulation_manager.village.safety
var blocked_guard_events: int = simulation_manager.economic_events.size()
player.try_interact()
_check(
simulation_manager.village.safety > safety_before,
"Player should help guard from the typed GuardPost ActivitySite"
(
blocked_guard_context != null
and blocked_guard_context.kind == PlayerInteractionResult.KIND_ACTIVITY
and blocked_guard_context.target_id == guard_site.site_id
and not blocked_guard_context.is_available()
and "wood" in blocked_guard_context.blocked_reason.to_lower()
and is_equal_approx(simulation_manager.village.safety, blocked_guard_safety)
and simulation_manager.economic_events.size() == blocked_guard_events
),
"An unfunded authored activity offer should explain the cost without mutating authority"
)
woodpile.deposit(SimulationIds.RESOURCE_WOOD, 1.0)
simulation_manager.economy.sync_resource(SimulationIds.RESOURCE_WOOD)
var downed_context := player.get_interaction_context() as PlayerInteractionResult
var downed_wood := woodpile.get_amount(SimulationIds.RESOURCE_WOOD)
var downed_safety: float = simulation_manager.village.safety
var downed_event_count: int = simulation_manager.economic_events.size()
simulation_manager.get_player_state().take_damage(
simulation_manager.get_player_state().get_max_health()
)
var downed_result: ActionResult
if downed_context != null:
downed_result = simulation_manager.execute_player_activity_action(
downed_context.action_id,
downed_context.target_id,
downed_context.expected_state_revision,
downed_context.target_generation,
downed_context.target_context_id,
downed_context.target_registry_instance_id
)
_check(
(
downed_context != null
and downed_context.kind == PlayerInteractionResult.KIND_ACTIVITY
and downed_result != null
and not downed_result.did_succeed()
and is_equal_approx(woodpile.get_amount(SimulationIds.RESOURCE_WOOD), downed_wood)
and is_equal_approx(simulation_manager.village.safety, downed_safety)
and simulation_manager.economic_events.size() == downed_event_count
),
"A downed player must not work, consume cost, mutate metrics, or record a fact"
)
if failures.is_empty():