diff --git a/client/tests/fixtures/msgpack/snapshot_boundary_tick_0.msgpack b/client/tests/fixtures/msgpack/snapshot_boundary_tick_0.msgpack index 8c15d84d3..0a0876c58 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 daeb75e4a..6aafb8c2c 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 4563da7b2..7d6d91200 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 b5b87baf9..cd39ea41f 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 a6919aa34..a195fdf6b 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 8c15d84d3..0a0876c58 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 719c62e74..a332c6c50 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 e3dc4f11b..0093a3ac1 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 400dd2959..e919024ce 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 6d489fd8b..b7d86d7de 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/tests/bridge_ipc.rs b/server/tests/bridge_ipc.rs index efec87058..886224372 100644 --- a/server/tests/bridge_ipc.rs +++ b/server/tests/bridge_ipc.rs @@ -53,6 +53,7 @@ fn snapshot_roundtrip_over_unix_socket() { visibility: VisibilitySector::Forward, relationship: RelationshipState::Unknown, observation: EntityVisibility::Visible, + tell_state: None, }], visible_tiles: vec![], nearby_interactions: vec![], @@ -64,6 +65,7 @@ fn snapshot_roundtrip_over_unix_socket() { sound_events: vec![], conversation_events: vec![], conversation_ended: vec![], + follow_state: None, rng_seed: None, }; diff --git a/server/tests/bridge_tcp.rs b/server/tests/bridge_tcp.rs index b75058c1f..0e949d56b 100644 --- a/server/tests/bridge_tcp.rs +++ b/server/tests/bridge_tcp.rs @@ -39,6 +39,7 @@ fn snapshot_roundtrip_over_tcp() { visibility: VisibilitySector::Forward, relationship: RelationshipState::Unknown, observation: EntityVisibility::Visible, + tell_state: None, }], visible_tiles: vec![], nearby_interactions: vec![], @@ -50,6 +51,7 @@ fn snapshot_roundtrip_over_tcp() { sound_events: vec![], conversation_events: vec![], conversation_ended: vec![], + follow_state: None, rng_seed: None, }; diff --git a/server/tests/gen_fixtures.rs b/server/tests/gen_fixtures.rs index 5ff8fec22..51d1f03c5 100644 --- a/server/tests/gen_fixtures.rs +++ b/server/tests/gen_fixtures.rs @@ -40,6 +40,7 @@ fn fixture_snapshot(tick: u64, entities: Vec) -> ObserverSnapshot sound_events: vec![], conversation_events: vec![], conversation_ended: vec![], + follow_state: None, rng_seed: None, } } @@ -59,6 +60,7 @@ fn generate_msgpack_fixtures() { visibility: VisibilitySector::Forward, relationship: RelationshipState::Unknown, observation: EntityVisibility::Visible, + tell_state: None, }], ); write_fixture( @@ -102,6 +104,7 @@ fn generate_msgpack_fixtures() { visibility: VisibilitySector::Forward, relationship: RelationshipState::Unknown, observation: EntityVisibility::Visible, + tell_state: None, }], ); write_fixture( @@ -122,6 +125,7 @@ fn generate_msgpack_fixtures() { visibility: VisibilitySector::Forward, relationship: RelationshipState::Known, observation: EntityVisibility::Visible, + tell_state: None, }, VisibleEntity { entity_id: 2, @@ -132,6 +136,7 @@ fn generate_msgpack_fixtures() { visibility: VisibilitySector::Peripheral, relationship: RelationshipState::Unknown, observation: EntityVisibility::Visible, + tell_state: None, }, VisibleEntity { entity_id: 3, @@ -142,6 +147,7 @@ fn generate_msgpack_fixtures() { visibility: VisibilitySector::Forward, relationship: RelationshipState::Unknown, observation: EntityVisibility::Visible, + tell_state: None, }, VisibleEntity { entity_id: 4, @@ -152,6 +158,7 @@ fn generate_msgpack_fixtures() { visibility: VisibilitySector::Forward, relationship: RelationshipState::Unknown, observation: EntityVisibility::Visible, + tell_state: None, }, ], ); @@ -182,6 +189,7 @@ fn generate_msgpack_fixtures() { visibility: VisibilitySector::Forward, relationship: RelationshipState::Unknown, observation: EntityVisibility::Visible, + tell_state: None, }], visible_tiles: vec![ VisibleTile { @@ -218,6 +226,7 @@ fn generate_msgpack_fixtures() { sound_events: vec![], conversation_events: vec![], conversation_ended: vec![], + follow_state: 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 700eaff99..1f4f346c8 100644 --- a/server/tests/golden/proof_room_tick_10.json +++ b/server/tests/golden/proof_room_tick_10.json @@ -38,6 +38,7 @@ "z": 0 } ], + "follow_state": null, "game_time": { "day": 0, "day_phase": "Morning", @@ -48,7 +49,7 @@ "pending_recognitions": [ { "entity_id": 1, - "remaining_ticks": 2, + "remaining_ticks": 1, "total_delay_ticks": 6, "x": 16.5, "y": 13.5, @@ -70,7 +71,7 @@ "scan_events": [], "sound_events": [], "tick": 8, - "version": 12, + "version": 13, "visible_tiles": [ { "tile_kind": "Wall", diff --git a/server/tests/serialization.rs b/server/tests/serialization.rs index 804f9e42d..f1b508086 100644 --- a/server/tests/serialization.rs +++ b/server/tests/serialization.rs @@ -29,6 +29,7 @@ fn test_snapshot(tick: u64, entities: Vec) -> ObserverSnapshot { sound_events: vec![], conversation_events: vec![], conversation_ended: vec![], + follow_state: None, rng_seed: None, } } @@ -46,6 +47,7 @@ fn observer_snapshot_roundtrip() { visibility: VisibilitySector::Forward, relationship: RelationshipState::Unknown, observation: EntityVisibility::Visible, + tell_state: None, }], ); @@ -199,6 +201,7 @@ fn all_entity_kind_variants_roundtrip() { visibility: VisibilitySector::Forward, relationship: RelationshipState::Unknown, observation: EntityVisibility::Visible, + tell_state: None, }; let snapshot = test_snapshot(0, vec![entity]); let bytes = rmp_serde::to_vec_named(&snapshot).expect("serialize"); @@ -235,6 +238,7 @@ fn snapshot_v2_fields_roundtrip() { visibility: VisibilitySector::Forward, relationship: RelationshipState::Unknown, observation: EntityVisibility::Visible, + tell_state: None, }], visible_tiles: vec![ VisibleTile { @@ -263,6 +267,7 @@ fn snapshot_v2_fields_roundtrip() { sound_events: vec![], conversation_events: vec![], conversation_ended: vec![], + follow_state: None, rng_seed: None, }; @@ -318,7 +323,7 @@ fn protocol_version_constant_matches_snapshot() { let snapshot = test_snapshot(0, vec![]); assert_eq!(snapshot.version, PROTOCOL_VERSION); assert_eq!( - PROTOCOL_VERSION, 12, + PROTOCOL_VERSION, 13, "bump this assertion when protocol version changes" ); } @@ -361,6 +366,7 @@ fn all_facing_direction_variants_roundtrip() { sound_events: vec![], conversation_events: vec![], conversation_ended: vec![], + follow_state: None, rng_seed: None, }; let bytes = rmp_serde::to_vec_named(&snapshot).expect("serialize"); @@ -839,6 +845,7 @@ fn boundary_value_in_entity_id() { visibility: VisibilitySector::Forward, relationship: RelationshipState::Unknown, observation: EntityVisibility::Visible, + tell_state: None, }], ); let bytes = rmp_serde::to_vec_named(&snapshot)