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

refactor: move resource authority into simulation

Browse Source
This commit is contained in:
Rijad Zuzo
2026-07-05 13:26:19 +02:00
parent f83d2c7704
commit 363620b731
10 changed files with 480 additions and 174 deletions
Download Patch File Download Diff File Expand all files Collapse all files
world/jajce/JajceWorld.tscn
+3 -3
View File
@@ -157,14 +157,14 @@ node_id = &"berry_bush_01"
[node name="BerryBush_02" parent="WorldObjects/ResourceNodes" instance=ExtResource("2_resource")]
position = Vector3(-10, 0, -4)
node_id = &"berry_bush_02"
amount_remaining = 8.0
initial_amount = 8.0
[node name="Tree_01" parent="WorldObjects/ResourceNodes" instance=ExtResource("2_resource")]
position = Vector3(6, 0, -8)
node_id = &"tree_01"
action_id = &"gather_wood"
resource_id = &"wood"
amount_remaining = 15.0
initial_amount = 15.0
yield_per_action = 3.0
[node name="Tree_02" parent="WorldObjects/ResourceNodes" instance=ExtResource("2_resource")]
@@ -172,7 +172,7 @@ position = Vector3(10, 0, -4)
node_id = &"tree_02"
action_id = &"gather_wood"
resource_id = &"wood"
amount_remaining = 12.0
initial_amount = 12.0
yield_per_action = 3.0
[node name="LegacyActivityMarkers" type="Node3D" parent="."]
world/resource_nodes/ResourceNode.gd
+79 -90
View File
@@ -10,129 +10,118 @@ static var _all: Array[ResourceNode] = []
@export var node_id: StringName
@export var action_id: StringName = &"gather_food"
@export var resource_id: StringName = &"food"
@export var amount_remaining: float = 10.0
@export var initial_amount: float = 10.0
@export var yield_per_action: float = 2.0
@export var enabled: bool = true
@export var initial_enabled: bool = true
@export var can_npcs_use: bool = true
@export var can_player_use: bool = true
@export var hide_visual_when_depleted: bool = false
@onready var interaction_point: Marker3D = $InteractionPoint
var reserved_by: int = -1
var state: ResourceStateRecord
func _ready():
func _ready() -> void:
if node_id.is_empty():
push_error("ResourceNode at %s has empty node_id" % get_path())
enabled = false
else:
var existing := get_by_id(node_id)
if existing != null:
push_error("Duplicate ResourceNode node_id '%s' at %s; first registered at %s" % [node_id, get_path(), existing.get_path()])
enabled = false
initial_enabled = false
_update_presentation()
return
var existing := get_by_id(node_id)
if existing != null:
push_error(
"Duplicate ResourceNode node_id '%s' at %s; first registered at %s"
% [node_id, get_path(), existing.get_path()]
)
initial_enabled = false
_update_presentation()
return
_all.append(self)
add_to_group("resource_nodes")
amount_changed.connect(_update_debug_label)
reservation_changed.connect(_update_debug_label)
_update_debug_label()
_try_register_with_simulation()
_update_presentation()
func _exit_tree():
func _exit_tree() -> void:
_all.erase(self)
if state != null and state.changed.is_connected(_on_state_changed):
state.changed.disconnect(_on_state_changed)
if state != null and state.depleted.is_connected(_on_state_depleted):
state.depleted.disconnect(_on_state_depleted)
state = null
func is_depleted() -> bool:
return amount_remaining <= 0.0
func can_extract() -> bool:
return enabled and not is_depleted()
func is_available_for(agent_id: int) -> bool:
return enabled and not is_depleted() and (reserved_by == -1 or reserved_by == agent_id)
func reserve(agent_id: int) -> bool:
if not is_available_for(agent_id):
func bind_state(resource_state: ResourceStateRecord) -> bool:
if resource_state == null or resource_state.get_node_id() != node_id:
return false
reserved_by = agent_id
reservation_changed.emit(node_id, agent_id)
if state != null and state.changed.is_connected(_on_state_changed):
state.changed.disconnect(_on_state_changed)
if state != null and state.depleted.is_connected(_on_state_depleted):
state.depleted.disconnect(_on_state_depleted)
state = resource_state
if not state.changed.is_connected(_on_state_changed):
state.changed.connect(_on_state_changed)
if not state.depleted.is_connected(_on_state_depleted):
state.depleted.connect(_on_state_depleted)
_update_presentation()
return true
func release(agent_id: int) -> void:
if reserved_by == agent_id:
reserved_by = -1
reservation_changed.emit(node_id, -1)
func _try_register_with_simulation() -> void:
var managers := get_tree().get_nodes_in_group("simulation_manager")
if managers.size() != 1:
return
var manager := managers[0]
if manager.has_method("register_resource_node"):
manager.register_resource_node(self)
func extract(requested_amount: float = yield_per_action) -> float:
if not can_extract():
return 0.0
var extracted := minf(requested_amount, amount_remaining)
amount_remaining -= extracted
amount_changed.emit(node_id, amount_remaining)
if is_depleted():
if reserved_by >= 0:
reserved_by = -1
reservation_changed.emit(node_id, -1)
func get_amount_remaining() -> float:
return state.get_amount_remaining() if state != null else initial_amount
func get_reserved_by() -> int:
return state.get_reserved_by() if state != null else -1
func is_enabled() -> bool:
return state.is_enabled() if state != null else initial_enabled
func is_depleted() -> bool:
return state.is_depleted() if state != null else initial_amount <= 0.0
func can_extract() -> bool:
return state.can_extract() if state != null else initial_enabled and not is_depleted()
func _on_state_changed(changed_state: ResourceStateRecord) -> void:
if changed_state != state:
return
amount_changed.emit(node_id, state.get_amount_remaining())
reservation_changed.emit(node_id, state.get_reserved_by())
_update_presentation()
func _on_state_depleted(depleted_state: ResourceStateRecord) -> void:
if depleted_state == state:
depleted.emit(node_id)
if hide_visual_when_depleted and has_node("Visual"):
$Visual.visible = false
return extracted
func restore_persistent_state(
saved_amount: float,
saved_reserved_by: int,
saved_enabled: bool
) -> void:
amount_remaining = maxf(saved_amount, 0.0)
reserved_by = saved_reserved_by if amount_remaining > 0.0 else -1
enabled = saved_enabled
amount_changed.emit(node_id, amount_remaining)
reservation_changed.emit(node_id, reserved_by)
func _update_presentation() -> void:
if has_node("Visual"):
$Visual.visible = not (hide_visual_when_depleted and is_depleted())
_update_debug_label()
func _update_debug_label(_a = null, _b = null) -> void:
if not has_node("DebugLabel"):
return
var label := $DebugLabel as Label3D
var text := "%s\n%s %.1f" % [node_id, resource_id, amount_remaining]
if reserved_by >= 0:
text += "\nheld:%d" % reserved_by
var text := "%s\n%s %.1f" % [
node_id,
resource_id,
get_amount_remaining()
]
if get_reserved_by() >= 0:
text += "\nheld:%d" % get_reserved_by()
if is_depleted():
text += "\nDEPLETED"
if state == null:
text += "\nUNBOUND"
label.text = text
static func get_by_id(node_id: StringName) -> ResourceNode:
static func get_by_id(search_id: StringName) -> ResourceNode:
for node in _all:
if node.node_id == node_id:
if node.node_id == search_id:
return node
return null
static func get_all() -> Array[ResourceNode]:
return _all.duplicate()
static func find_available(action: StringName, agent_id: int, from_position: Vector3) -> ResourceNode:
var best: ResourceNode
var best_dist := INF
for node in _all:
if node.action_id != action:
continue
if not node.can_npcs_use:
continue
if not node.is_available_for(agent_id):
continue
var dist := from_position.distance_squared_to(node.interaction_point.global_position)
if dist < best_dist:
best_dist = dist
best = node
return best
static func find_nearest_for_player(from_position: Vector3, max_distance: float) -> ResourceNode:
var best: ResourceNode
var best_dist := max_distance * max_distance
for node in _all:
if not node.can_player_use:
continue
var dist := from_position.distance_squared_to(node.interaction_point.global_position)
if dist <= best_dist:
best_dist = dist
best = node
return best
world/world_view_manager.gd
+8 -5
View File
@@ -139,15 +139,18 @@ func _try_get_resource_target(npc: SimNPC, task: String) -> Variant:
if visual == null:
return null
var node := ResourceNode.find_available(action_id, npc.id, visual.global_position)
if not simulation_manager.has_method("acquire_resource_target"):
push_error("WorldViewManager: SimulationManager cannot acquire resources")
return null
var node: ResourceNode = simulation_manager.acquire_resource_target(
action_id,
npc.id,
visual.global_position
)
if node == null:
debug_log("No available resource node for %s" % task)
return null
if not node.reserve(npc.id):
debug_log("Failed to reserve %s for %s" % [node.node_id, npc.npc_name])
return null
npc.target_id = node.node_id
debug_log("%s reserved %s for %s" % [npc.npc_name, node.node_id, task])
return node.interaction_point.global_position