feat: add deterministic simulation foundation
Replace implicit randomness with seeded per-NPC RandomNumberGenerator streams so the same seed always produces the same scenario outcome. - Add SimulationClock (RefCounted): explicit fixed-step clock that converts frame delta into simulation ticks while preserving sub-tick remainder; replaces raw _process tick_timer accumulation - Add simulation_seed export (int=1337) to SimulationManager; drive per-NPC RNG streams via seed + npc_id + stream_id derivation (stream 0=init, stream 1=wander) - Add get_wander_offset(npc_id) to SimulationManager so wander targets are deterministic per seed; WorldViewManager calls it instead of local randf_range() - Add get_state_snapshot() and get_state_checksum() to SimulationManager for headless verification and future save/load - Convert SimNPC/SimVillage const DEBUG_LOGS to instance var debug_logs so headless tests can silence output without recompilation - Pass RandomNumberGenerator through SimNPC._init() instead of using global randf_range() for hunger/energy/position/scoring noise - Remove obsolete farm_zone and forest_zone exports from WorldViewManager and their marker/tree scene children from main.tscn; NPC gather tasks use ResourceNode exclusively - Rename TaskZone container to ActivityMarkers in main.tscn and update all scene paths (player, WVM, tests) to match - Add headless deterministic_simulation_test.gd: verifies clock accuracy, same-seed equality, different-seed divergence, and 24-tick scenario checksum without loading main.tscn
This commit is contained in:
@@ -5,9 +5,7 @@
|
||||
[ext_resource type="Script" uid="uid://dbb25ttlyogqr" path="res://simulation/SimulationManager.gd" id="3_lquwl"]
|
||||
[ext_resource type="Script" uid="uid://c1f3b26n4yntf" path="res://world/world_view_manager.gd" id="4_1bvp3"]
|
||||
[ext_resource type="PackedScene" uid="uid://dhxxyprqflotq" path="res://player/npc/NpcVisual.tscn" id="5_lquwl"]
|
||||
[ext_resource type="PackedScene" uid="uid://q0w3en4bfk42" path="res://assets/foliage/tree.glb" id="6_5vw27"]
|
||||
[ext_resource type="Script" uid="uid://cjvbgqx8rao0t" path="res://world/ui/ui.gd" id="6_7mycd"]
|
||||
[ext_resource type="PackedScene" uid="uid://dyu3r0cl0judq" path="res://assets/foliage/tree-high.glb" id="7_kek77"]
|
||||
[ext_resource type="PackedScene" uid="uid://dvd3qjpjor4sq" path="res://world/resource_nodes/ResourceNode.tscn" id="8_r3s0u"]
|
||||
|
||||
[sub_resource type="NavigationMesh" id="NavigationMesh_lquwl"]
|
||||
@@ -37,12 +35,6 @@ ambient_light_source = 2
|
||||
ambient_light_color = Color(1, 1, 1, 1)
|
||||
ambient_light_energy = 0.5
|
||||
|
||||
[sub_resource type="StandardMaterial3D" id="StandardMaterial3D_5vw27"]
|
||||
albedo_color = Color(0.5328383, 0.4215183, 0.18649894, 1)
|
||||
|
||||
[sub_resource type="BoxMesh" id="BoxMesh_5vw27"]
|
||||
material = SubResource("StandardMaterial3D_5vw27")
|
||||
|
||||
[sub_resource type="CylinderMesh" id="CylinderMesh_5vw27"]
|
||||
top_radius = 1.129
|
||||
height = 5.774
|
||||
@@ -82,9 +74,9 @@ transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0, 0.05, 0)
|
||||
script = ExtResource("1_h2yge")
|
||||
camera_rig = NodePath("../CameraRig")
|
||||
simulation_manager = NodePath("../SimulationManager")
|
||||
food_zone = NodePath("../TaskZone/FoodZone")
|
||||
guard_zone = NodePath("../TaskZone/GuardZone")
|
||||
study_zone = NodePath("../TaskZone/StudyZone")
|
||||
food_zone = NodePath("../ActivityMarkers/FoodZone")
|
||||
guard_zone = NodePath("../ActivityMarkers/GuardZone")
|
||||
study_zone = NodePath("../ActivityMarkers/StudyZone")
|
||||
stomach_capacity_for_food = 10
|
||||
|
||||
[node name="CollisionShape3D" type="CollisionShape3D" parent="Player" unique_id=1249497228]
|
||||
@@ -114,17 +106,15 @@ fov = 65.0
|
||||
[node name="SimulationManager" type="Node" parent="." unique_id=1099676814]
|
||||
script = ExtResource("3_lquwl")
|
||||
|
||||
[node name="WorldViewManager" type="Node" parent="." unique_id=763982891 node_paths=PackedStringArray("simulation_manager", "active_npcs_parent", "farm_zone", "forest_zone", "guard_zone", "study_zone", "rest_zone", "food_zone")]
|
||||
[node name="WorldViewManager" type="Node" parent="." unique_id=763982891 node_paths=PackedStringArray("simulation_manager", "active_npcs_parent", "guard_zone", "study_zone", "rest_zone", "food_zone")]
|
||||
script = ExtResource("4_1bvp3")
|
||||
npc_visual_scene = ExtResource("5_lquwl")
|
||||
simulation_manager = NodePath("../SimulationManager")
|
||||
active_npcs_parent = NodePath("../ActiveNPCs")
|
||||
farm_zone = NodePath("../TaskZone/FarmZone")
|
||||
forest_zone = NodePath("../TaskZone/ForestZone")
|
||||
guard_zone = NodePath("../TaskZone/GuardZone")
|
||||
study_zone = NodePath("../TaskZone/StudyZone")
|
||||
rest_zone = NodePath("../TaskZone/RestZone")
|
||||
food_zone = NodePath("../TaskZone/FoodZone")
|
||||
guard_zone = NodePath("../ActivityMarkers/GuardZone")
|
||||
study_zone = NodePath("../ActivityMarkers/StudyZone")
|
||||
rest_zone = NodePath("../ActivityMarkers/RestZone")
|
||||
food_zone = NodePath("../ActivityMarkers/FoodZone")
|
||||
|
||||
[node name="EventBus" type="Node" parent="." unique_id=1149294963]
|
||||
|
||||
@@ -133,60 +123,38 @@ environment = SubResource("Environment_o5qli")
|
||||
|
||||
[node name="ActiveNPCs" type="Node3D" parent="." unique_id=88374680]
|
||||
|
||||
[node name="TaskZone" type="Node3D" parent="." unique_id=1700020332]
|
||||
[node name="ActivityMarkers" type="Node3D" parent="." unique_id=1700020332]
|
||||
|
||||
[node name="FarmZone" type="Marker3D" parent="TaskZone" unique_id=786703634]
|
||||
transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, -8, 0, -6)
|
||||
|
||||
[node name="MeshInstance3D" type="MeshInstance3D" parent="TaskZone/FarmZone" unique_id=35196509]
|
||||
transform = Transform3D(2.0639582, 0, 0, 0, 0.2, 0, 0, 0, 2.211021, -0.47271156, 0.47702956, -0.02484417)
|
||||
mesh = SubResource("BoxMesh_5vw27")
|
||||
|
||||
[node name="ForestZone" type="Marker3D" parent="TaskZone" unique_id=1194368101]
|
||||
transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 8, 0, -6)
|
||||
|
||||
[node name="smallTree" parent="TaskZone/ForestZone" unique_id=1125781625 instance=ExtResource("6_5vw27")]
|
||||
transform = Transform3D(3, 0, 0, 0, 3, 0, 0, 0, 3, 1.891, 0, -0.22)
|
||||
|
||||
[node name="smallTree2" parent="TaskZone/ForestZone" unique_id=1145526891 instance=ExtResource("6_5vw27")]
|
||||
transform = Transform3D(2, 0, 0, 0, 2, 0, 0, 0, 2, -0.043, 0, -1.767)
|
||||
|
||||
[node name="smallTree3" parent="TaskZone/ForestZone" unique_id=759036058 instance=ExtResource("6_5vw27")]
|
||||
transform = Transform3D(3, 0, 0, 0, 3, 0, 0, 0, 3, 0.13, 0, 0.614)
|
||||
|
||||
[node name="highTree" parent="TaskZone/ForestZone" unique_id=1321501180 instance=ExtResource("7_kek77")]
|
||||
transform = Transform3D(3, 0, 0, 0, 3, 0, 0, 0, 3, -1.539, 0, 0.171)
|
||||
|
||||
[node name="GuardZone" type="Marker3D" parent="TaskZone" unique_id=1391821683]
|
||||
[node name="GuardZone" type="Marker3D" parent="ActivityMarkers" unique_id=1391821683]
|
||||
transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0, 0, 8)
|
||||
|
||||
[node name="MeshInstance3D" type="MeshInstance3D" parent="TaskZone/GuardZone" unique_id=2044200724]
|
||||
[node name="MeshInstance3D" type="MeshInstance3D" parent="ActivityMarkers/GuardZone" unique_id=2044200724]
|
||||
transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0, 1.354011, 0)
|
||||
mesh = SubResource("CylinderMesh_5vw27")
|
||||
|
||||
[node name="StudyZone" type="Marker3D" parent="TaskZone" unique_id=1061191663]
|
||||
[node name="StudyZone" type="Marker3D" parent="ActivityMarkers" unique_id=1061191663]
|
||||
transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, -6, 0, 6)
|
||||
|
||||
[node name="MeshInstance3D" type="MeshInstance3D" parent="TaskZone/StudyZone" unique_id=338918224]
|
||||
[node name="MeshInstance3D" type="MeshInstance3D" parent="ActivityMarkers/StudyZone" unique_id=338918224]
|
||||
transform = Transform3D(3.279775, 0, 0, 0, 5.511466, 0, 0, 0, 1, 0, 2.8180213, 0)
|
||||
mesh = SubResource("BoxMesh_kek77")
|
||||
metadata/_edit_group_ = true
|
||||
|
||||
[node name="RestZone" type="Marker3D" parent="TaskZone" unique_id=1187838016]
|
||||
[node name="RestZone" type="Marker3D" parent="ActivityMarkers" unique_id=1187838016]
|
||||
transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 4, 0, 5)
|
||||
|
||||
[node name="MeshInstance3D" type="MeshInstance3D" parent="TaskZone/RestZone" unique_id=299533907]
|
||||
[node name="MeshInstance3D" type="MeshInstance3D" parent="ActivityMarkers/RestZone" unique_id=299533907]
|
||||
transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0, 2.4911091, 0)
|
||||
mesh = SubResource("PrismMesh_5vw27")
|
||||
|
||||
[node name="MeshInstance3D2" type="MeshInstance3D" parent="TaskZone/RestZone" unique_id=943692640]
|
||||
[node name="MeshInstance3D2" type="MeshInstance3D" parent="ActivityMarkers/RestZone" unique_id=943692640]
|
||||
transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 1.3897309, 1.399735, 1.0352364)
|
||||
mesh = SubResource("PrismMesh_5vw27")
|
||||
|
||||
[node name="FoodZone" type="Marker3D" parent="TaskZone" unique_id=780921054]
|
||||
[node name="FoodZone" type="Marker3D" parent="ActivityMarkers" unique_id=780921054]
|
||||
transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0, 0, -8)
|
||||
|
||||
[node name="MeshInstance3D" type="MeshInstance3D" parent="TaskZone/FoodZone" unique_id=357423915]
|
||||
[node name="MeshInstance3D" type="MeshInstance3D" parent="ActivityMarkers/FoodZone" unique_id=357423915]
|
||||
transform = Transform3D(4, 0, 0, 0, 3, 0, 0, 0, 4, 0, 1.5, 0)
|
||||
mesh = SubResource("BoxMesh_4c57u")
|
||||
|
||||
|
||||
Reference in New Issue
Block a user