diff --git a/client/tests/fixtures/msgpack/snapshot_boundary_tick_0.msgpack b/client/tests/fixtures/msgpack/snapshot_boundary_tick_0.msgpack index 3700cbd9c..9095db5dd 100644 Binary files a/client/tests/fixtures/msgpack/snapshot_boundary_tick_0.msgpack and b/client/tests/fixtures/msgpack/snapshot_boundary_tick_0.msgpack differ diff --git a/client/tests/fixtures/msgpack/snapshot_boundary_tick_127.msgpack b/client/tests/fixtures/msgpack/snapshot_boundary_tick_127.msgpack index 8f350a950..0c1f3fe03 100644 Binary files a/client/tests/fixtures/msgpack/snapshot_boundary_tick_127.msgpack and b/client/tests/fixtures/msgpack/snapshot_boundary_tick_127.msgpack differ diff --git a/client/tests/fixtures/msgpack/snapshot_boundary_tick_2b31m1.msgpack b/client/tests/fixtures/msgpack/snapshot_boundary_tick_2b31m1.msgpack index 829fc4dab..a5351b64b 100644 Binary files a/client/tests/fixtures/msgpack/snapshot_boundary_tick_2b31m1.msgpack and b/client/tests/fixtures/msgpack/snapshot_boundary_tick_2b31m1.msgpack differ diff --git a/client/tests/fixtures/msgpack/snapshot_boundary_tick_2b32.msgpack b/client/tests/fixtures/msgpack/snapshot_boundary_tick_2b32.msgpack index 8723189c6..605b81dd1 100644 Binary files a/client/tests/fixtures/msgpack/snapshot_boundary_tick_2b32.msgpack and b/client/tests/fixtures/msgpack/snapshot_boundary_tick_2b32.msgpack differ diff --git a/client/tests/fixtures/msgpack/snapshot_boundary_tick_32767.msgpack b/client/tests/fixtures/msgpack/snapshot_boundary_tick_32767.msgpack index 25a2615af..2f71b1cc1 100644 Binary files a/client/tests/fixtures/msgpack/snapshot_boundary_tick_32767.msgpack and b/client/tests/fixtures/msgpack/snapshot_boundary_tick_32767.msgpack differ diff --git a/client/tests/fixtures/msgpack/snapshot_empty.msgpack b/client/tests/fixtures/msgpack/snapshot_empty.msgpack index 3700cbd9c..9095db5dd 100644 Binary files a/client/tests/fixtures/msgpack/snapshot_empty.msgpack and b/client/tests/fixtures/msgpack/snapshot_empty.msgpack differ diff --git a/client/tests/fixtures/msgpack/snapshot_multi_entity.msgpack b/client/tests/fixtures/msgpack/snapshot_multi_entity.msgpack index c17c62118..4046cbbb7 100644 Binary files a/client/tests/fixtures/msgpack/snapshot_multi_entity.msgpack and b/client/tests/fixtures/msgpack/snapshot_multi_entity.msgpack differ diff --git a/client/tests/fixtures/msgpack/snapshot_one_npc.msgpack b/client/tests/fixtures/msgpack/snapshot_one_npc.msgpack index 89d928558..9c19045e1 100644 Binary files a/client/tests/fixtures/msgpack/snapshot_one_npc.msgpack and b/client/tests/fixtures/msgpack/snapshot_one_npc.msgpack differ diff --git a/client/tests/fixtures/msgpack/snapshot_player.msgpack b/client/tests/fixtures/msgpack/snapshot_player.msgpack index 29bb08964..32489d545 100644 Binary files a/client/tests/fixtures/msgpack/snapshot_player.msgpack and b/client/tests/fixtures/msgpack/snapshot_player.msgpack differ diff --git a/client/tests/fixtures/msgpack/snapshot_v2_full.msgpack b/client/tests/fixtures/msgpack/snapshot_v2_full.msgpack index dea8f77dd..cc84d8ae4 100644 Binary files a/client/tests/fixtures/msgpack/snapshot_v2_full.msgpack and b/client/tests/fixtures/msgpack/snapshot_v2_full.msgpack differ diff --git a/server/src/perception/observer/mod.rs b/server/src/perception/observer/mod.rs index 1b196310d..55c9d7bf8 100644 --- a/server/src/perception/observer/mod.rs +++ b/server/src/perception/observer/mod.rs @@ -52,7 +52,7 @@ pub fn compute_visibility_geometry( /// /// System ordering: after compute_visibility_geometry + compute_nearby_interactions, /// before advance_tick. -#[allow(clippy::type_complexity)] +#[allow(clippy::type_complexity, clippy::too_many_arguments)] pub fn compute_observer_snapshot( time: Res, geometry: Res, diff --git a/server/tests/bridge_ipc.rs b/server/tests/bridge_ipc.rs index d913aa905..9f6f08738 100644 --- a/server/tests/bridge_ipc.rs +++ b/server/tests/bridge_ipc.rs @@ -61,6 +61,7 @@ fn snapshot_roundtrip_over_unix_socket() { dialogue_response: None, blocked_entities: vec![], scan_events: vec![], + rng_seed: None, }; bridge diff --git a/server/tests/bridge_tcp.rs b/server/tests/bridge_tcp.rs index 676589b86..e6f12c5aa 100644 --- a/server/tests/bridge_tcp.rs +++ b/server/tests/bridge_tcp.rs @@ -47,6 +47,7 @@ fn snapshot_roundtrip_over_tcp() { dialogue_response: None, blocked_entities: vec![], scan_events: vec![], + rng_seed: None, }; bridge diff --git a/server/tests/gen_fixtures.rs b/server/tests/gen_fixtures.rs index 2c8bc879c..9d81eeae9 100644 --- a/server/tests/gen_fixtures.rs +++ b/server/tests/gen_fixtures.rs @@ -37,6 +37,7 @@ fn fixture_snapshot(tick: u64, entities: Vec) -> ObserverSnapshot dialogue_response: None, blocked_entities: vec![], scan_events: vec![], + rng_seed: None, } } @@ -208,6 +209,7 @@ fn generate_msgpack_fixtures() { dialogue_response: None, blocked_entities: vec![], scan_events: vec![], + rng_seed: None, }; write_fixture( "snapshot_v2_full", diff --git a/server/tests/golden/proof_room_tick_10.json b/server/tests/golden/proof_room_tick_10.json index ac0bd2d5d..5bdf56161 100644 --- a/server/tests/golden/proof_room_tick_10.json +++ b/server/tests/golden/proof_room_tick_10.json @@ -64,9 +64,10 @@ "player_facing": "North", "player_inventory": [], "player_stance": "Sprint", + "rng_seed": 42, "scan_events": [], "tick": 8, - "version": 9, + "version": 10, "visible_tiles": [ { "tile_kind": "Wall", diff --git a/server/tests/serialization.rs b/server/tests/serialization.rs index 6bc7e0d3e..7addfa2e7 100644 --- a/server/tests/serialization.rs +++ b/server/tests/serialization.rs @@ -26,6 +26,7 @@ fn test_snapshot(tick: u64, entities: Vec) -> ObserverSnapshot { dialogue_response: None, blocked_entities: vec![], scan_events: vec![], + rng_seed: None, } } @@ -254,6 +255,7 @@ fn snapshot_v2_fields_roundtrip() { dialogue_response: None, blocked_entities: vec![], scan_events: vec![], + rng_seed: None, }; let bytes = rmp_serde::to_vec_named(&snapshot).expect("serialize"); @@ -308,7 +310,7 @@ fn protocol_version_constant_matches_snapshot() { let snapshot = test_snapshot(0, vec![]); assert_eq!(snapshot.version, PROTOCOL_VERSION); assert_eq!( - PROTOCOL_VERSION, 9, + PROTOCOL_VERSION, 10, "bump this assertion when protocol version changes" ); } @@ -348,6 +350,7 @@ fn all_facing_direction_variants_roundtrip() { dialogue_response: None, blocked_entities: vec![], scan_events: vec![], + rng_seed: None, }; let bytes = rmp_serde::to_vec_named(&snapshot).expect("serialize"); let decoded: ObserverSnapshot = rmp_serde::from_slice(&bytes).expect("deserialize");