admin/gamedev-the-steward
1
0
Fork 0
Code Issues 1 Pull Requests Actions Packages Projects 1 Releases Wiki Activity

feat: add structured economic events

Browse Source
This commit is contained in:
Rijad Zuzo
2026-07-05 18:04:11 +02:00
parent ebf70a711a
commit f9601a67d1
11 changed files with 358 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files
simulation/SimulationManager.gd
+97 -1
View File
@@ -9,6 +9,8 @@ signal village_changed(village: SimVillage)
signal npc_died(npc: SimNPC)
signal npc_target_requested(npc: SimNPC)
signal npc_travel_requested(npc: SimNPC, target_position: Vector3)
signal npc_inventory_changed(npc: SimNPC, item_id: StringName, amount: float)
signal economic_event_recorded(event: EconomicEventRecord)
var village := SimVillage.new()
@@ -23,6 +25,8 @@ var tick_count := 0
var wander_random_sources := {}
var resource_states: Dictionary = {}
var storage_states: Dictionary = {}
var economic_events: Array[EconomicEventRecord] = []
var next_event_id := 0
var action_selector := ActionSelectionSystem.new()
var action_executor := ActionExecutionSystem.new()
var target_resolver := ActionTargetResolver.new()
@@ -162,11 +166,28 @@ func simulate_tick() -> void:
SimulationIds.RESOURCE_FOOD,
extracted
)
npc_inventory_changed.emit(
npc,
SimulationIds.RESOURCE_FOOD,
npc.get_inventory_amount(
SimulationIds.RESOURCE_FOOD
)
)
else:
village.apply_resource_delta(
resource_state.get_resource_id(),
extracted
)
_record_economic_event(
SimulationIds.EVENT_RESOURCE_EXTRACTED,
npc.id,
resource_state.get_node_id(),
_npc_inventory_id(npc.id)
if resource_state.get_resource_id() == SimulationIds.RESOURCE_FOOD
else &"village",
resource_state.get_resource_id(),
extracted
)
if debug_logs:
print(
"[SimulationManager] ",
@@ -355,6 +376,33 @@ func synchronize_npc_position(npc_id: int, active_position: Vector3) -> bool:
return true
return false
func _npc_inventory_id(npc_id: int) -> StringName:
return StringName("npc_%d_inventory" % npc_id)
func _record_economic_event(
event_type: StringName,
actor_id: int,
source_id: StringName,
destination_id: StringName,
item_id: StringName,
amount: float
) -> void:
if amount <= 0.0:
return
var event := EconomicEventRecord.create(
next_event_id,
event_type,
tick_count,
actor_id,
source_id,
destination_id,
item_id,
amount
)
next_event_id += 1
economic_events.append(event)
economic_event_recorded.emit(event)
func _initialize_storage() -> void:
if storage_states.has(SimulationIds.STORAGE_VILLAGE_PANTRY):
_sync_village_food()
@@ -384,6 +432,16 @@ func deposit_npc_inventory(npc: SimNPC, item_id: StringName) -> float:
var deposited := get_pantry().deposit(item_id, available)
npc.remove_inventory(item_id, deposited)
_sync_village_food()
if deposited > 0.0:
npc_inventory_changed.emit(npc, item_id, npc.get_inventory_amount(item_id))
_record_economic_event(
SimulationIds.EVENT_STORAGE_DEPOSITED,
npc.id,
_npc_inventory_id(npc.id),
SimulationIds.STORAGE_VILLAGE_PANTRY,
item_id,
deposited
)
return deposited
func withdraw_to_npc(
@@ -394,6 +452,16 @@ func withdraw_to_npc(
var withdrawn := get_pantry().withdraw(item_id, amount)
npc.add_inventory(item_id, withdrawn)
_sync_village_food()
if withdrawn > 0.0:
npc_inventory_changed.emit(npc, item_id, npc.get_inventory_amount(item_id))
_record_economic_event(
SimulationIds.EVENT_STORAGE_WITHDRAWN,
npc.id,
SimulationIds.STORAGE_VILLAGE_PANTRY,
_npc_inventory_id(npc.id),
item_id,
withdrawn
)
return withdrawn
func consume_npc_food(npc: SimNPC) -> bool:
@@ -404,6 +472,19 @@ func consume_npc_food(npc: SimNPC) -> bool:
npc.hunger = maxf(npc.hunger - 55.0, 0.0)
npc.starvation_ticks = 0
npc.is_starving = npc.hunger >= 90.0
npc_inventory_changed.emit(
npc,
SimulationIds.RESOURCE_FOOD,
npc.get_inventory_amount(SimulationIds.RESOURCE_FOOD)
)
_record_economic_event(
SimulationIds.EVENT_ITEM_CONSUMED,
npc.id,
_npc_inventory_id(npc.id),
&"consumed",
SimulationIds.RESOURCE_FOOD,
1.0
)
return true
func register_loaded_resource_nodes() -> void:
@@ -484,6 +565,16 @@ func harvest_resource_node(node: ResourceNode) -> float:
_sync_village_food()
else:
village.apply_resource_delta(resource_state.get_resource_id(), extracted)
_record_economic_event(
SimulationIds.EVENT_RESOURCE_EXTRACTED,
-1,
resource_state.get_node_id(),
SimulationIds.STORAGE_VILLAGE_PANTRY
if resource_state.get_resource_id() == SimulationIds.RESOURCE_FOOD
else &"village",
resource_state.get_resource_id(),
extracted
)
village_changed.emit(village)
if debug_logs:
@@ -591,7 +682,8 @@ func create_state_record() -> SimulationStateRecord:
"tick_count": tick_count,
"clock_accumulator": clock.accumulator,
"clock_elapsed_ticks": clock.elapsed_ticks,
"wander_random_streams": wander_streams
"wander_random_streams": wander_streams,
"next_event_id": next_event_id
}
record.village = VillageStateRecord.capture(village)
for npc in npcs:
@@ -607,6 +699,8 @@ func create_state_record() -> SimulationStateRecord:
for storage_id in sorted_storage_ids:
var storage_state: StorageStateRecord = storage_states[storage_id]
record.storages.append(storage_state)
for event in economic_events:
record.economic_events.append(event)
return record
func serialize_state() -> String:
@@ -626,6 +720,7 @@ func restore_state(record: SimulationStateRecord) -> bool:
simulation_seed = int(record.simulation["seed"])
tick_interval = float(record.simulation["tick_interval"])
tick_count = int(record.simulation["tick_count"])
next_event_id = int(record.simulation["next_event_id"])
clock = SimulationClock.new(tick_interval)
clock.accumulator = float(record.simulation["clock_accumulator"])
clock.elapsed_ticks = int(record.simulation["clock_elapsed_ticks"])
@@ -634,6 +729,7 @@ func restore_state(record: SimulationStateRecord) -> bool:
for storage_record in record.storages:
storage_states[storage_record.get_storage_id()] = storage_record
_sync_village_food()
economic_events = record.economic_events.duplicate()
npcs.clear()
for npc_record in record.npcs:
simulation/definitions/SimulationIds.gd
+5
View File
@@ -27,3 +27,8 @@ const RESOURCE_FOOD := &"food"
const RESOURCE_WOOD := &"wood"
const STORAGE_VILLAGE_PANTRY := &"village_pantry"
const EVENT_RESOURCE_EXTRACTED := &"resource_extracted"
const EVENT_STORAGE_DEPOSITED := &"storage_deposited"
const EVENT_STORAGE_WITHDRAWN := &"storage_withdrawn"
const EVENT_ITEM_CONSUMED := &"item_consumed"
simulation/state/EconomicEventRecord.gd
+64
View File
@@ -0,0 +1,64 @@
class_name EconomicEventRecord
extends RefCounted
const SCHEMA_VERSION := 1
var data: Dictionary
func _init(record_data: Dictionary = {}) -> void:
data = record_data.duplicate(true)
static func create(
event_id: int,
event_type: StringName,
tick: int,
actor_id: int,
source_id: StringName,
destination_id: StringName,
item_id: StringName,
amount: float
) -> 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": String(destination_id),
"item_id": String(item_id),
"amount": amount
})
static func from_dictionary(record_data: Dictionary) -> EconomicEventRecord:
if int(record_data.get("schema_version", -1)) != SCHEMA_VERSION:
return null
if not record_data.has_all([
"event_id", "event_type", "tick", "actor_id", "source_id",
"destination_id", "item_id", "amount"
]):
return null
var normalized := record_data.duplicate(true)
normalized["schema_version"] = SCHEMA_VERSION
normalized["event_id"] = int(record_data["event_id"])
normalized["event_type"] = String(record_data["event_type"])
normalized["tick"] = int(record_data["tick"])
normalized["actor_id"] = int(record_data["actor_id"])
normalized["source_id"] = String(record_data["source_id"])
normalized["destination_id"] = String(record_data["destination_id"])
normalized["item_id"] = String(record_data["item_id"])
normalized["amount"] = float(record_data["amount"])
if (
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)
func to_dictionary() -> Dictionary:
return data.duplicate(true)
simulation/state/EconomicEventRecord.gd.uid
+1
View File
@@ -0,0 +1 @@
uid://cbj70dfuif0uw
simulation/state/SimulationStateRecord.gd
+49 -15
View File
@@ -2,14 +2,16 @@ class_name SimulationStateRecord
extends RefCounted
const SCHEMA_NAME := "the_steward.simulation"
const SCHEMA_VERSION := 2
const SCHEMA_VERSION := 3
const LEGACY_SCHEMA_VERSION := 1
const PREVIOUS_SCHEMA_VERSION := 2
var simulation: Dictionary
var village: VillageStateRecord
var npcs: Array[NPCStateRecord] = []
var resources: Array[ResourceStateRecord] = []
var storages: Array[StorageStateRecord] = []
var economic_events: Array[EconomicEventRecord] = []
func to_dictionary() -> Dictionary:
var npc_data: Array[Dictionary] = []
@@ -22,6 +24,9 @@ func to_dictionary() -> Dictionary:
var storage_data: Array[Dictionary] = []
for storage_record in storages:
storage_data.append(storage_record.to_dictionary())
var event_data: Array[Dictionary] = []
for event_record in economic_events:
event_data.append(event_record.to_dictionary())
return {
"schema": SCHEMA_NAME,
@@ -30,7 +35,8 @@ func to_dictionary() -> Dictionary:
"village": village.to_dictionary(),
"npcs": npc_data,
"resources": resource_data,
"storages": storage_data
"storages": storage_data,
"economic_events": event_data
}
func to_json() -> String:
@@ -46,12 +52,13 @@ static func from_dictionary(record_data: Dictionary) -> SimulationStateRecord:
if record_data.get("schema", "") != SCHEMA_NAME:
return null
var version := int(record_data.get("schema_version", -1))
if version == LEGACY_SCHEMA_VERSION:
record_data = _migrate_v1(record_data)
if version in [LEGACY_SCHEMA_VERSION, PREVIOUS_SCHEMA_VERSION]:
record_data = _migrate_legacy(record_data, version)
elif version != SCHEMA_VERSION:
return null
if not record_data.has_all([
"simulation", "village", "npcs", "resources", "storages"
"simulation", "village", "npcs", "resources", "storages",
"economic_events"
]):
return null
@@ -60,7 +67,7 @@ static func from_dictionary(record_data: Dictionary) -> SimulationStateRecord:
return null
if not simulation_data.has_all([
"seed", "tick_interval", "tick_count", "clock_accumulator",
"clock_elapsed_ticks", "wander_random_streams"
"clock_elapsed_ticks", "wander_random_streams", "next_event_id"
]):
return null
var wander_streams = simulation_data["wander_random_streams"]
@@ -82,10 +89,12 @@ static func from_dictionary(record_data: Dictionary) -> SimulationStateRecord:
var npc_data = record_data["npcs"]
var resource_data = record_data["resources"]
var storage_data = record_data["storages"]
var event_data = record_data["economic_events"]
if (
not npc_data is Array
or not resource_data is Array
or not storage_data is Array
or not event_data is Array
):
return null
@@ -132,17 +141,42 @@ static func from_dictionary(record_data: Dictionary) -> SimulationStateRecord:
storage_ids[storage_id] = true
record.storages.append(storage_record)
var event_ids := {}
var highest_event_id := -1
for item in event_data:
if not item is Dictionary:
return null
var event_record := EconomicEventRecord.from_dictionary(item)
if event_record == null:
return null
var event_id := int(event_record.data["event_id"])
if event_ids.has(event_id):
return null
event_ids[event_id] = true
highest_event_id = maxi(highest_event_id, event_id)
record.economic_events.append(event_record)
if int(record.simulation["next_event_id"]) <= highest_event_id:
return null
return record
static func _migrate_v1(legacy_data: Dictionary) -> Dictionary:
static func _migrate_legacy(
legacy_data: Dictionary,
version: int
) -> Dictionary:
var migrated := legacy_data.duplicate(true)
migrated["schema_version"] = SCHEMA_VERSION
var village_data: Dictionary = legacy_data.get("village", {})
var initial_food := float(village_data.get("food", 0.0))
migrated["storages"] = [
StorageStateRecord.create(
SimulationIds.STORAGE_VILLAGE_PANTRY,
{String(SimulationIds.RESOURCE_FOOD): initial_food}
).to_dictionary()
]
if version == LEGACY_SCHEMA_VERSION:
var village_data: Dictionary = legacy_data.get("village", {})
var initial_food := float(village_data.get("food", 0.0))
migrated["storages"] = [
StorageStateRecord.create(
SimulationIds.STORAGE_VILLAGE_PANTRY,
{String(SimulationIds.RESOURCE_FOOD): initial_food}
).to_dictionary()
]
migrated["economic_events"] = []
var simulation_data: Dictionary = migrated.get("simulation", {})
simulation_data["next_event_id"] = 0
migrated["simulation"] = simulation_data
return migrated