feat: unify authored activity commands

2026-08-13 00:08:30 +02:00
parent e5aecee0de
commit b3b98c6456
36 changed files with 3013 additions and 96 deletions
@@ -336,15 +336,11 @@ static func is_knowable_event(event: EconomicEventRecord) -> bool:
 		)
 	if event_type == SimulationIds.EVENT_TASK_BLOCKED:
 		return (
-			int(event.data["actor_id"]) >= 0
-			and StringName(event.data["source_id"]) == SimulationIds.STORAGE_VILLAGE_WOODPILE
-			and item_id == SimulationIds.RESOURCE_WOOD
-			and (
-				StringName(event.data.get("action_id", &""))
-				in [SimulationIds.ACTION_PATROL, SimulationIds.ACTION_STUDY]
-			)
-			and float(event.data.get("required_amount", 0.0)) > 0.0
+			not ActivityEventValidator.is_legacy_unstructured_blocked(event)
+			and ActivityEventValidator.is_valid_blocked(event)
 		)
+	if ActivityEventValidator.is_candidate(event):
+		return ActivityEventValidator.is_valid(event)
 	if (
 		event_type
 		in [