diff --git a/client/tests/fixtures/msgpack/snapshot_boundary_tick_0.msgpack b/client/tests/fixtures/msgpack/snapshot_boundary_tick_0.msgpack index 0a0876c58..148ce3bcd 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 6aafb8c2c..53c6b6750 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 7d6d91200..91f76e316 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 cd39ea41f..3c851d4c8 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 a195fdf6b..304069bcb 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 0a0876c58..148ce3bcd 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 a332c6c50..7b28637f4 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 0093a3ac1..a139d15d6 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 e919024ce..5cd49a1bb 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 b7d86d7de..1ff2140fd 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/test_world/mod.rs b/server/src/test_world/mod.rs index aad81a8c9..363344845 100644 --- a/server/src/test_world/mod.rs +++ b/server/src/test_world/mod.rs @@ -183,6 +183,7 @@ pub fn setup_gauntlet(app: &mut App) { profile, profile.initial_stance(), PlayerMoveCooldown::default(), + crate::simulation::pressure::CharacterPressure::default(), )) .id(); registry.register(player); diff --git a/server/tests/bridge_ipc.rs b/server/tests/bridge_ipc.rs index 886224372..e6032404c 100644 --- a/server/tests/bridge_ipc.rs +++ b/server/tests/bridge_ipc.rs @@ -66,6 +66,8 @@ fn snapshot_roundtrip_over_unix_socket() { conversation_events: vec![], conversation_ended: vec![], follow_state: None, + examine_result: None, + character_pressure: None, rng_seed: None, }; diff --git a/server/tests/bridge_tcp.rs b/server/tests/bridge_tcp.rs index 0e949d56b..e823976e6 100644 --- a/server/tests/bridge_tcp.rs +++ b/server/tests/bridge_tcp.rs @@ -52,6 +52,8 @@ fn snapshot_roundtrip_over_tcp() { conversation_events: vec![], conversation_ended: vec![], follow_state: None, + examine_result: None, + character_pressure: None, rng_seed: None, }; diff --git a/server/tests/gen_fixtures.rs b/server/tests/gen_fixtures.rs index 86a7346a9..3816b0d01 100644 --- a/server/tests/gen_fixtures.rs +++ b/server/tests/gen_fixtures.rs @@ -41,6 +41,8 @@ fn fixture_snapshot(tick: u64, entities: Vec) -> ObserverSnapshot conversation_events: vec![], conversation_ended: vec![], follow_state: None, + examine_result: None, + character_pressure: None, rng_seed: None, } } @@ -227,6 +229,8 @@ fn generate_msgpack_fixtures() { conversation_events: vec![], conversation_ended: vec![], follow_state: None, + examine_result: None, + character_pressure: None, rng_seed: None, }; write_fixture( diff --git a/server/tests/golden/proof_room_tick_10.json b/server/tests/golden/proof_room_tick_10.json index 1f4f346c8..68037d998 100644 --- a/server/tests/golden/proof_room_tick_10.json +++ b/server/tests/golden/proof_room_tick_10.json @@ -2,6 +2,7 @@ "blocked_entities": [ 2 ], + "character_pressure": null, "conversation_ended": [], "conversation_events": [], "current_monologue": null, @@ -38,6 +39,7 @@ "z": 0 } ], + "examine_result": null, "follow_state": null, "game_time": { "day": 0, @@ -71,7 +73,7 @@ "scan_events": [], "sound_events": [], "tick": 8, - "version": 13, + "version": 14, "visible_tiles": [ { "tile_kind": "Wall", diff --git a/server/tests/serialization.rs b/server/tests/serialization.rs index 48af4ebdb..56151925f 100644 --- a/server/tests/serialization.rs +++ b/server/tests/serialization.rs @@ -30,6 +30,8 @@ fn test_snapshot(tick: u64, entities: Vec) -> ObserverSnapshot { conversation_events: vec![], conversation_ended: vec![], follow_state: None, + examine_result: None, + character_pressure: None, rng_seed: None, } } @@ -275,6 +277,8 @@ fn snapshot_v2_fields_roundtrip() { conversation_events: vec![], conversation_ended: vec![], follow_state: None, + examine_result: None, + character_pressure: None, rng_seed: None, }; @@ -330,7 +334,7 @@ fn protocol_version_constant_matches_snapshot() { let snapshot = test_snapshot(0, vec![]); assert_eq!(snapshot.version, PROTOCOL_VERSION); assert_eq!( - PROTOCOL_VERSION, 13, + PROTOCOL_VERSION, 14, "bump this assertion when protocol version changes" ); } @@ -374,6 +378,8 @@ fn all_facing_direction_variants_roundtrip() { conversation_events: vec![], conversation_ended: vec![], follow_state: None, + examine_result: None, + character_pressure: None, rng_seed: None, }; let bytes = rmp_serde::to_vec_named(&snapshot).expect("serialize"); @@ -1379,7 +1385,7 @@ fn serde_default_fields_fill_in_when_missing_from_wire() { // `tell_state`, `follow_state`, `rng_seed`, `zone_id`, `object_type`, etc. // are all `#[serde(default)]` — they must default to None/empty when absent. let minimal_json = serde_json::json!({ - "version": 13, + "version": 14, "tick": 42, "game_time": { "day": 0,