feat: add missing wood opportunities

2026-07-16 01:50:19 +02:00
parent f82d9683de
commit 79dd503343
26 changed files with 1054 additions and 175 deletions
@@ -1,11 +1,13 @@
 class_name OpportunityStateRecord
 extends RefCounted

-const SCHEMA_VERSION := 1
+const SCHEMA_VERSION := 2
+const LEGACY_SCHEMA_VERSION := 1
 const NO_EVENT_ID := -1
 const DEFAULT_TARGET_AMOUNT := 1.0
 const STATUS_OPEN := SimulationIds.OPPORTUNITY_STATUS_OPEN
 const STATUS_RESOLVED := SimulationIds.OPPORTUNITY_STATUS_RESOLVED
+const STATUS_INVALIDATED := SimulationIds.OPPORTUNITY_STATUS_INVALIDATED

 var data: Dictionary

@@ -19,7 +21,10 @@ static func create(
 	created_tick: int,
 	trigger_event_id: int,
 	interested_npc_id: int,
-	target_amount: float = DEFAULT_TARGET_AMOUNT
+	target_amount: float = DEFAULT_TARGET_AMOUNT,
+	opportunity_type: StringName = SimulationIds.OPPORTUNITY_RESTOCK_EMPTY_PANTRY,
+	target_id: StringName = SimulationIds.STORAGE_VILLAGE_PANTRY,
+	resource_id: StringName = SimulationIds.RESOURCE_FOOD
 ) -> OpportunityStateRecord:
 	return (
 		OpportunityStateRecord
@@ -27,26 +32,34 @@ static func create(
 			{
 				"schema_version": SCHEMA_VERSION,
 				"opportunity_id": opportunity_id,
-				"opportunity_type": String(SimulationIds.OPPORTUNITY_RESTOCK_EMPTY_PANTRY),
+				"opportunity_type": String(opportunity_type),
 				"status": String(STATUS_OPEN),
 				"created_tick": created_tick,
 				"trigger_event_id": trigger_event_id,
 				"interested_npc_id": interested_npc_id,
-				"target_id": String(SimulationIds.STORAGE_VILLAGE_PANTRY),
-				"resource_id": String(SimulationIds.RESOURCE_FOOD),
+				"target_id": String(target_id),
+				"resource_id": String(resource_id),
 				"target_amount": target_amount,
 				"resolution_event_id": NO_EVENT_ID,
 				"resolved_tick": -1,
+				"closed_tick": -1,
+				"invalidation_reason": "",
 			}
 		)
 	)


 static func from_dictionary(record_data: Dictionary) -> OpportunityStateRecord:
-	if int(record_data.get("schema_version", -1)) != SCHEMA_VERSION:
+	var version := int(record_data.get("schema_version", -1))
+	if version not in [LEGACY_SCHEMA_VERSION, SCHEMA_VERSION]:
 		return null
+	var normalized := record_data.duplicate(true)
+	if version == LEGACY_SCHEMA_VERSION:
+		normalized["schema_version"] = SCHEMA_VERSION
+		normalized["closed_tick"] = int(record_data.get("resolved_tick", -1))
+		normalized["invalidation_reason"] = ""
 	if not (
-		record_data
+		normalized
 		. has_all(
 			[
 				"opportunity_id",
@@ -60,45 +73,91 @@ static func from_dictionary(record_data: Dictionary) -> OpportunityStateRecord:
 				"target_amount",
 				"resolution_event_id",
 				"resolved_tick",
+				"closed_tick",
+				"invalidation_reason",
 			]
 		)
 	):
 		return null
-	var opportunity_id := int(record_data["opportunity_id"])
-	var opportunity_type := StringName(record_data["opportunity_type"])
-	var status := StringName(record_data["status"])
-	var created_tick := int(record_data["created_tick"])
-	var trigger_event_id := int(record_data["trigger_event_id"])
-	var interested_npc_id := int(record_data["interested_npc_id"])
-	var target_id := StringName(record_data["target_id"])
-	var resource_id := StringName(record_data["resource_id"])
-	var target_amount := float(record_data["target_amount"])
-	var resolution_event_id := int(record_data["resolution_event_id"])
-	var resolved_tick := int(record_data["resolved_tick"])
+	var opportunity_id := int(normalized["opportunity_id"])
+	var opportunity_type := StringName(normalized["opportunity_type"])
+	var status := StringName(normalized["status"])
+	var created_tick := int(normalized["created_tick"])
+	var trigger_event_id := int(normalized["trigger_event_id"])
+	var interested_npc_id := int(normalized["interested_npc_id"])
+	var target_id := StringName(normalized["target_id"])
+	var resource_id := StringName(normalized["resource_id"])
+	var target_amount := float(normalized["target_amount"])
+	var resolution_event_id := int(normalized["resolution_event_id"])
+	var resolved_tick := int(normalized["resolved_tick"])
+	var closed_tick := int(normalized["closed_tick"])
+	var invalidation_reason := StringName(normalized["invalidation_reason"])
 	if opportunity_id < 0 or created_tick < 0 or trigger_event_id < 0 or interested_npc_id < 0:
 		return null
-	if opportunity_type != SimulationIds.OPPORTUNITY_RESTOCK_EMPTY_PANTRY:
-		return null
-	if target_id != SimulationIds.STORAGE_VILLAGE_PANTRY:
-		return null
-	if resource_id != SimulationIds.RESOURCE_FOOD:
-		return null
+	match opportunity_type:
+		SimulationIds.OPPORTUNITY_RESTOCK_EMPTY_PANTRY:
+			if (
+				target_id != SimulationIds.STORAGE_VILLAGE_PANTRY
+				or resource_id != SimulationIds.RESOURCE_FOOD
+			):
+				return null
+		SimulationIds.OPPORTUNITY_SUPPLY_MISSING_WOOD:
+			if (
+				target_id != SimulationIds.STORAGE_VILLAGE_WOODPILE
+				or resource_id != SimulationIds.RESOURCE_WOOD
+			):
+				return null
+		_:
+			return null
 	if not is_finite(target_amount) or not is_equal_approx(target_amount, DEFAULT_TARGET_AMOUNT):
 		return null
 	match status:
 		STATUS_OPEN:
-			if resolution_event_id != NO_EVENT_ID or resolved_tick != -1:
+			if (
+				resolution_event_id != NO_EVENT_ID
+				or resolved_tick != -1
+				or closed_tick != -1
+				or not invalidation_reason.is_empty()
+			):
 				return null
 		STATUS_RESOLVED:
-			if resolution_event_id <= trigger_event_id or resolved_tick < created_tick:
+			if (
+				resolution_event_id <= trigger_event_id
+				or resolved_tick < created_tick
+				or closed_tick != resolved_tick
+				or not invalidation_reason.is_empty()
+			):
+				return null
+		STATUS_INVALIDATED:
+			if (
+				resolution_event_id != NO_EVENT_ID
+				or resolved_tick != -1
+				or closed_tick < created_tick
+				or (
+					invalidation_reason
+					not in [
+						SimulationIds.OPPORTUNITY_INVALIDATED_INTERESTED_DIED,
+						SimulationIds.OPPORTUNITY_INVALIDATED_EVIDENCE_STALE,
+					]
+				)
+			):
 				return null
 		_:
 			return null
 	var record := create(
-		opportunity_id, created_tick, trigger_event_id, interested_npc_id, target_amount
+		opportunity_id,
+		created_tick,
+		trigger_event_id,
+		interested_npc_id,
+		target_amount,
+		opportunity_type,
+		target_id,
+		resource_id
 	)
 	if status == STATUS_RESOLVED:
 		record.resolve(resolution_event_id, resolved_tick)
+	elif status == STATUS_INVALIDATED:
+		record.invalidate(invalidation_reason, closed_tick)
 	return record


@@ -112,6 +171,26 @@ func resolve(resolution_event_id: int, resolved_tick: int) -> bool:
 	data["status"] = String(STATUS_RESOLVED)
 	data["resolution_event_id"] = resolution_event_id
 	data["resolved_tick"] = resolved_tick
+	data["closed_tick"] = resolved_tick
+	return true
+
+
+func invalidate(reason: StringName, closed_tick: int) -> bool:
+	if (
+		not is_open()
+		or closed_tick < get_created_tick()
+		or (
+			reason
+			not in [
+				SimulationIds.OPPORTUNITY_INVALIDATED_INTERESTED_DIED,
+				SimulationIds.OPPORTUNITY_INVALIDATED_EVIDENCE_STALE,
+			]
+		)
+	):
+		return false
+	data["status"] = String(STATUS_INVALIDATED)
+	data["closed_tick"] = closed_tick
+	data["invalidation_reason"] = String(reason)
 	return true


@@ -159,6 +238,14 @@ func get_resolved_tick() -> int:
 	return int(data["resolved_tick"])


+func get_closed_tick() -> int:
+	return int(data["closed_tick"])
+
+
+func get_invalidation_reason() -> StringName:
+	return StringName(data["invalidation_reason"])
+
+
 func is_open() -> bool:
 	return get_status() == STATUS_OPEN