diff --git a/client/tests/fixtures/msgpack/snapshot_boundary_tick_0.msgpack b/client/tests/fixtures/msgpack/snapshot_boundary_tick_0.msgpack index 1615131dc..ac38bc05a 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 2d4321df5..f1662c717 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 4a8702760..08d570faa 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 a1c311896..fab1ca162 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 47762a0df..c57e8bab3 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 1615131dc..ac38bc05a 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_full.msgpack b/client/tests/fixtures/msgpack/snapshot_full.msgpack index d2f5bbd60..d9685c443 100644 Binary files a/client/tests/fixtures/msgpack/snapshot_full.msgpack and b/client/tests/fixtures/msgpack/snapshot_full.msgpack differ diff --git a/client/tests/fixtures/msgpack/snapshot_minimal.msgpack b/client/tests/fixtures/msgpack/snapshot_minimal.msgpack index fba288bb8..51ec3a8d0 100644 Binary files a/client/tests/fixtures/msgpack/snapshot_minimal.msgpack and b/client/tests/fixtures/msgpack/snapshot_minimal.msgpack differ diff --git a/client/tests/fixtures/msgpack/snapshot_multi_entity.msgpack b/client/tests/fixtures/msgpack/snapshot_multi_entity.msgpack index dc2acf96a..1c4e1bed3 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 107389317..759b09da2 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 8166124b0..21707cd91 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 f83ad4838..6c932af3d 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/Cargo.lock b/server/Cargo.lock index d469ae4e2..e6cdd0d5b 100644 --- a/server/Cargo.lock +++ b/server/Cargo.lock @@ -1092,7 +1092,7 @@ dependencies = [ [[package]] name = "settled-reach-server" -version = "0.1.20" +version = "0.1.22" dependencies = [ "bevy_app", "bevy_ecs", diff --git a/server/tests/bridge_ipc.rs b/server/tests/bridge_ipc.rs index 55275814c..ce61862c2 100644 --- a/server/tests/bridge_ipc.rs +++ b/server/tests/bridge_ipc.rs @@ -74,6 +74,7 @@ fn snapshot_roundtrip_over_unix_socket() { save_result: None, triangle_crisis_events: vec![], state_hash: None, + debug_response: None, sim_errors: vec![], }; diff --git a/server/tests/bridge_tcp.rs b/server/tests/bridge_tcp.rs index 75ad29a3d..a07fe204b 100644 --- a/server/tests/bridge_tcp.rs +++ b/server/tests/bridge_tcp.rs @@ -60,6 +60,7 @@ fn snapshot_roundtrip_over_tcp() { save_result: None, triangle_crisis_events: vec![], state_hash: None, + debug_response: None, sim_errors: vec![], }; diff --git a/server/tests/error_handling.rs b/server/tests/error_handling.rs index 78ec5bc07..a6ec3f409 100644 --- a/server/tests/error_handling.rs +++ b/server/tests/error_handling.rs @@ -295,6 +295,7 @@ fn snapshot_with_sim_errors_roundtrips() { save_result: None, triangle_crisis_events: vec![], state_hash: Some(0xDEADBEEF), + debug_response: None, sim_errors: vec![ SimError { kind: SimErrorKind::ProtocolError, diff --git a/server/tests/gen_fixtures.rs b/server/tests/gen_fixtures.rs index 3582b4398..765409f1d 100644 --- a/server/tests/gen_fixtures.rs +++ b/server/tests/gen_fixtures.rs @@ -50,6 +50,7 @@ fn fixture_snapshot(tick: u64, entities: Vec) -> ObserverSnapshot save_result: None, triangle_crisis_events: vec![], state_hash: None, + debug_response: None, sim_errors: vec![], } } @@ -244,6 +245,7 @@ fn generate_msgpack_fixtures() { save_result: None, triangle_crisis_events: vec![], state_hash: None, + debug_response: None, sim_errors: vec![], }; write_fixture( @@ -408,6 +410,7 @@ fn generate_msgpack_fixtures() { }), triangle_crisis_events: vec![], state_hash: None, + debug_response: None, sim_errors: vec![], }; write_fixture( diff --git a/server/tests/golden/proof_room_tick_10.json b/server/tests/golden/proof_room_tick_10.json index 8d0803fd8..a11e8c138 100644 --- a/server/tests/golden/proof_room_tick_10.json +++ b/server/tests/golden/proof_room_tick_10.json @@ -40,38 +40,255 @@ "state_hash": 14452262397297540338, "tick": 8, "triangle_crisis_events": [], - "version": 17, + "version": 18, "visible_tiles": [ { - "tile_kind": "Wall", + "tile_kind": "Floor", + "visibility": "Forward", + "x": -3, + "y": -7, + "z": 0 + }, + { + "tile_kind": "Floor", + "visibility": "Forward", + "x": -3, + "y": -6, + "z": 0 + }, + { + "tile_kind": "Floor", + "visibility": "Forward", + "x": -3, + "y": -5, + "z": 0 + }, + { + "tile_kind": "Floor", + "visibility": "Forward", + "x": -3, + "y": -4, + "z": 0 + }, + { + "tile_kind": "Floor", + "visibility": "Forward", + "x": -3, + "y": -3, + "z": 0 + }, + { + "tile_kind": "Floor", + "visibility": "Forward", + "x": -3, + "y": -2, + "z": 0 + }, + { + "tile_kind": "Floor", + "visibility": "Forward", + "x": -3, + "y": -1, + "z": 0 + }, + { + "tile_kind": "Floor", + "visibility": "Forward", + "x": -3, + "y": 0, + "z": 0 + }, + { + "tile_kind": "Floor", + "visibility": "Forward", + "x": -3, + "y": 1, + "z": 0 + }, + { + "tile_kind": "Floor", + "visibility": "Forward", + "x": -2, + "y": -7, + "z": 0 + }, + { + "tile_kind": "Floor", + "visibility": "Forward", + "x": -2, + "y": -6, + "z": 0 + }, + { + "tile_kind": "Floor", + "visibility": "Forward", + "x": -2, + "y": -5, + "z": 0 + }, + { + "tile_kind": "Floor", + "visibility": "Forward", + "x": -2, + "y": -4, + "z": 0 + }, + { + "tile_kind": "Floor", + "visibility": "Forward", + "x": -2, + "y": -3, + "z": 0 + }, + { + "tile_kind": "Floor", + "visibility": "Forward", + "x": -2, + "y": -2, + "z": 0 + }, + { + "tile_kind": "Floor", + "visibility": "Forward", + "x": -2, + "y": -1, + "z": 0 + }, + { + "tile_kind": "Floor", + "visibility": "Forward", + "x": -2, + "y": 0, + "z": 0 + }, + { + "tile_kind": "Floor", + "visibility": "Forward", + "x": -2, + "y": 1, + "z": 0 + }, + { + "tile_kind": "Floor", + "visibility": "Forward", + "x": -2, + "y": 2, + "z": 0 + }, + { + "tile_kind": "Floor", + "visibility": "Forward", + "x": -1, + "y": -7, + "z": 0 + }, + { + "tile_kind": "Floor", + "visibility": "Forward", + "x": -1, + "y": -6, + "z": 0 + }, + { + "tile_kind": "Floor", + "visibility": "Forward", + "x": -1, + "y": -5, + "z": 0 + }, + { + "tile_kind": "Floor", + "visibility": "Forward", + "x": -1, + "y": -4, + "z": 0 + }, + { + "tile_kind": "Floor", + "visibility": "Forward", + "x": -1, + "y": -3, + "z": 0 + }, + { + "tile_kind": "Floor", + "visibility": "Forward", + "x": -1, + "y": -2, + "z": 0 + }, + { + "tile_kind": "Floor", "visibility": "Forward", "x": -1, "y": -1, "z": 0 }, { - "tile_kind": "Wall", + "tile_kind": "Floor", "visibility": "Forward", "x": -1, "y": 0, "z": 0 }, { - "tile_kind": "Wall", + "tile_kind": "Floor", "visibility": "Forward", "x": -1, "y": 1, "z": 0 }, { - "tile_kind": "Wall", + "tile_kind": "Floor", "visibility": "Forward", "x": -1, "y": 2, "z": 0 }, { - "tile_kind": "Wall", + "tile_kind": "Floor", + "visibility": "Forward", + "x": 0, + "y": -7, + "z": 0 + }, + { + "tile_kind": "Floor", + "visibility": "Forward", + "x": 0, + "y": -6, + "z": 0 + }, + { + "tile_kind": "Floor", + "visibility": "Forward", + "x": 0, + "y": -5, + "z": 0 + }, + { + "tile_kind": "Floor", + "visibility": "Forward", + "x": 0, + "y": -4, + "z": 0 + }, + { + "tile_kind": "Floor", + "visibility": "Forward", + "x": 0, + "y": -3, + "z": 0 + }, + { + "tile_kind": "Floor", + "visibility": "Forward", + "x": 0, + "y": -2, + "z": 0 + }, + { + "tile_kind": "Floor", "visibility": "Forward", "x": 0, "y": -1, @@ -106,7 +323,49 @@ "z": 0 }, { - "tile_kind": "Wall", + "tile_kind": "Floor", + "visibility": "Forward", + "x": 1, + "y": -7, + "z": 0 + }, + { + "tile_kind": "Floor", + "visibility": "Forward", + "x": 1, + "y": -6, + "z": 0 + }, + { + "tile_kind": "Floor", + "visibility": "Forward", + "x": 1, + "y": -5, + "z": 0 + }, + { + "tile_kind": "Floor", + "visibility": "Forward", + "x": 1, + "y": -4, + "z": 0 + }, + { + "tile_kind": "Floor", + "visibility": "Forward", + "x": 1, + "y": -3, + "z": 0 + }, + { + "tile_kind": "Floor", + "visibility": "Forward", + "x": 1, + "y": -2, + "z": 0 + }, + { + "tile_kind": "Floor", "visibility": "Forward", "x": 1, "y": -1, @@ -141,7 +400,49 @@ "z": 0 }, { - "tile_kind": "Wall", + "tile_kind": "Floor", + "visibility": "Forward", + "x": 2, + "y": -7, + "z": 0 + }, + { + "tile_kind": "Floor", + "visibility": "Forward", + "x": 2, + "y": -6, + "z": 0 + }, + { + "tile_kind": "Floor", + "visibility": "Forward", + "x": 2, + "y": -5, + "z": 0 + }, + { + "tile_kind": "Floor", + "visibility": "Forward", + "x": 2, + "y": -4, + "z": 0 + }, + { + "tile_kind": "Floor", + "visibility": "Forward", + "x": 2, + "y": -3, + "z": 0 + }, + { + "tile_kind": "Floor", + "visibility": "Forward", + "x": 2, + "y": -2, + "z": 0 + }, + { + "tile_kind": "Floor", "visibility": "Forward", "x": 2, "y": -1, @@ -183,7 +484,49 @@ "z": 0 }, { - "tile_kind": "Wall", + "tile_kind": "Floor", + "visibility": "Forward", + "x": 3, + "y": -7, + "z": 0 + }, + { + "tile_kind": "Floor", + "visibility": "Forward", + "x": 3, + "y": -6, + "z": 0 + }, + { + "tile_kind": "Floor", + "visibility": "Forward", + "x": 3, + "y": -5, + "z": 0 + }, + { + "tile_kind": "Floor", + "visibility": "Forward", + "x": 3, + "y": -4, + "z": 0 + }, + { + "tile_kind": "Floor", + "visibility": "Forward", + "x": 3, + "y": -3, + "z": 0 + }, + { + "tile_kind": "Floor", + "visibility": "Forward", + "x": 3, + "y": -2, + "z": 0 + }, + { + "tile_kind": "Floor", "visibility": "Forward", "x": 3, "y": -1, @@ -225,7 +568,49 @@ "z": 0 }, { - "tile_kind": "Wall", + "tile_kind": "Floor", + "visibility": "Forward", + "x": 4, + "y": -7, + "z": 0 + }, + { + "tile_kind": "Floor", + "visibility": "Forward", + "x": 4, + "y": -6, + "z": 0 + }, + { + "tile_kind": "Floor", + "visibility": "Forward", + "x": 4, + "y": -5, + "z": 0 + }, + { + "tile_kind": "Floor", + "visibility": "Forward", + "x": 4, + "y": -4, + "z": 0 + }, + { + "tile_kind": "Floor", + "visibility": "Forward", + "x": 4, + "y": -3, + "z": 0 + }, + { + "tile_kind": "Floor", + "visibility": "Forward", + "x": 4, + "y": -2, + "z": 0 + }, + { + "tile_kind": "Floor", "visibility": "Forward", "x": 4, "y": -1, @@ -274,7 +659,49 @@ "z": 0 }, { - "tile_kind": "Wall", + "tile_kind": "Floor", + "visibility": "Forward", + "x": 5, + "y": -7, + "z": 0 + }, + { + "tile_kind": "Floor", + "visibility": "Forward", + "x": 5, + "y": -6, + "z": 0 + }, + { + "tile_kind": "Floor", + "visibility": "Forward", + "x": 5, + "y": -5, + "z": 0 + }, + { + "tile_kind": "Floor", + "visibility": "Forward", + "x": 5, + "y": -4, + "z": 0 + }, + { + "tile_kind": "Floor", + "visibility": "Forward", + "x": 5, + "y": -3, + "z": 0 + }, + { + "tile_kind": "Floor", + "visibility": "Forward", + "x": 5, + "y": -2, + "z": 0 + }, + { + "tile_kind": "Floor", "visibility": "Forward", "x": 5, "y": -1, @@ -330,7 +757,49 @@ "z": 0 }, { - "tile_kind": "Wall", + "tile_kind": "Floor", + "visibility": "Forward", + "x": 6, + "y": -7, + "z": 0 + }, + { + "tile_kind": "Floor", + "visibility": "Forward", + "x": 6, + "y": -6, + "z": 0 + }, + { + "tile_kind": "Floor", + "visibility": "Forward", + "x": 6, + "y": -5, + "z": 0 + }, + { + "tile_kind": "Floor", + "visibility": "Forward", + "x": 6, + "y": -4, + "z": 0 + }, + { + "tile_kind": "Floor", + "visibility": "Forward", + "x": 6, + "y": -3, + "z": 0 + }, + { + "tile_kind": "Floor", + "visibility": "Forward", + "x": 6, + "y": -2, + "z": 0 + }, + { + "tile_kind": "Floor", "visibility": "Forward", "x": 6, "y": -1, @@ -386,7 +855,49 @@ "z": 0 }, { - "tile_kind": "Wall", + "tile_kind": "Floor", + "visibility": "Forward", + "x": 7, + "y": -7, + "z": 0 + }, + { + "tile_kind": "Floor", + "visibility": "Forward", + "x": 7, + "y": -6, + "z": 0 + }, + { + "tile_kind": "Floor", + "visibility": "Forward", + "x": 7, + "y": -5, + "z": 0 + }, + { + "tile_kind": "Floor", + "visibility": "Forward", + "x": 7, + "y": -4, + "z": 0 + }, + { + "tile_kind": "Floor", + "visibility": "Forward", + "x": 7, + "y": -3, + "z": 0 + }, + { + "tile_kind": "Floor", + "visibility": "Forward", + "x": 7, + "y": -2, + "z": 0 + }, + { + "tile_kind": "Floor", "visibility": "Forward", "x": 7, "y": -1, @@ -449,7 +960,49 @@ "z": 0 }, { - "tile_kind": "Wall", + "tile_kind": "Floor", + "visibility": "Forward", + "x": 8, + "y": -7, + "z": 0 + }, + { + "tile_kind": "Floor", + "visibility": "Forward", + "x": 8, + "y": -6, + "z": 0 + }, + { + "tile_kind": "Floor", + "visibility": "Forward", + "x": 8, + "y": -5, + "z": 0 + }, + { + "tile_kind": "Floor", + "visibility": "Forward", + "x": 8, + "y": -4, + "z": 0 + }, + { + "tile_kind": "Floor", + "visibility": "Forward", + "x": 8, + "y": -3, + "z": 0 + }, + { + "tile_kind": "Floor", + "visibility": "Forward", + "x": 8, + "y": -2, + "z": 0 + }, + { + "tile_kind": "Floor", "visibility": "Forward", "x": 8, "y": -1, @@ -512,7 +1065,49 @@ "z": 0 }, { - "tile_kind": "Wall", + "tile_kind": "Floor", + "visibility": "Forward", + "x": 9, + "y": -7, + "z": 0 + }, + { + "tile_kind": "Floor", + "visibility": "Forward", + "x": 9, + "y": -6, + "z": 0 + }, + { + "tile_kind": "Floor", + "visibility": "Forward", + "x": 9, + "y": -5, + "z": 0 + }, + { + "tile_kind": "Floor", + "visibility": "Forward", + "x": 9, + "y": -4, + "z": 0 + }, + { + "tile_kind": "Floor", + "visibility": "Forward", + "x": 9, + "y": -3, + "z": 0 + }, + { + "tile_kind": "Floor", + "visibility": "Forward", + "x": 9, + "y": -2, + "z": 0 + }, + { + "tile_kind": "Floor", "visibility": "Forward", "x": 9, "y": -1, @@ -582,7 +1177,49 @@ "z": 0 }, { - "tile_kind": "Wall", + "tile_kind": "Floor", + "visibility": "Forward", + "x": 10, + "y": -7, + "z": 0 + }, + { + "tile_kind": "Floor", + "visibility": "Forward", + "x": 10, + "y": -6, + "z": 0 + }, + { + "tile_kind": "Floor", + "visibility": "Forward", + "x": 10, + "y": -5, + "z": 0 + }, + { + "tile_kind": "Floor", + "visibility": "Forward", + "x": 10, + "y": -4, + "z": 0 + }, + { + "tile_kind": "Floor", + "visibility": "Forward", + "x": 10, + "y": -3, + "z": 0 + }, + { + "tile_kind": "Floor", + "visibility": "Forward", + "x": 10, + "y": -2, + "z": 0 + }, + { + "tile_kind": "Floor", "visibility": "Forward", "x": 10, "y": -1, @@ -652,7 +1289,49 @@ "z": 0 }, { - "tile_kind": "Wall", + "tile_kind": "Floor", + "visibility": "Forward", + "x": 11, + "y": -7, + "z": 0 + }, + { + "tile_kind": "Floor", + "visibility": "Forward", + "x": 11, + "y": -6, + "z": 0 + }, + { + "tile_kind": "Floor", + "visibility": "Forward", + "x": 11, + "y": -5, + "z": 0 + }, + { + "tile_kind": "Floor", + "visibility": "Forward", + "x": 11, + "y": -4, + "z": 0 + }, + { + "tile_kind": "Floor", + "visibility": "Forward", + "x": 11, + "y": -3, + "z": 0 + }, + { + "tile_kind": "Floor", + "visibility": "Forward", + "x": 11, + "y": -2, + "z": 0 + }, + { + "tile_kind": "Floor", "visibility": "Forward", "x": 11, "y": -1, @@ -729,7 +1408,49 @@ "z": 0 }, { - "tile_kind": "Wall", + "tile_kind": "Floor", + "visibility": "Forward", + "x": 12, + "y": -7, + "z": 0 + }, + { + "tile_kind": "Floor", + "visibility": "Forward", + "x": 12, + "y": -6, + "z": 0 + }, + { + "tile_kind": "Floor", + "visibility": "Forward", + "x": 12, + "y": -5, + "z": 0 + }, + { + "tile_kind": "Floor", + "visibility": "Forward", + "x": 12, + "y": -4, + "z": 0 + }, + { + "tile_kind": "Floor", + "visibility": "Forward", + "x": 12, + "y": -3, + "z": 0 + }, + { + "tile_kind": "Floor", + "visibility": "Forward", + "x": 12, + "y": -2, + "z": 0 + }, + { + "tile_kind": "Floor", "visibility": "Forward", "x": 12, "y": -1, @@ -813,7 +1534,49 @@ "z": 0 }, { - "tile_kind": "Wall", + "tile_kind": "Floor", + "visibility": "Forward", + "x": 13, + "y": -7, + "z": 0 + }, + { + "tile_kind": "Floor", + "visibility": "Forward", + "x": 13, + "y": -6, + "z": 0 + }, + { + "tile_kind": "Floor", + "visibility": "Forward", + "x": 13, + "y": -5, + "z": 0 + }, + { + "tile_kind": "Floor", + "visibility": "Forward", + "x": 13, + "y": -4, + "z": 0 + }, + { + "tile_kind": "Floor", + "visibility": "Forward", + "x": 13, + "y": -3, + "z": 0 + }, + { + "tile_kind": "Floor", + "visibility": "Forward", + "x": 13, + "y": -2, + "z": 0 + }, + { + "tile_kind": "Floor", "visibility": "Forward", "x": 13, "y": -1, @@ -897,7 +1660,49 @@ "z": 0 }, { - "tile_kind": "Wall", + "tile_kind": "Floor", + "visibility": "Forward", + "x": 14, + "y": -7, + "z": 0 + }, + { + "tile_kind": "Floor", + "visibility": "Forward", + "x": 14, + "y": -6, + "z": 0 + }, + { + "tile_kind": "Floor", + "visibility": "Forward", + "x": 14, + "y": -5, + "z": 0 + }, + { + "tile_kind": "Floor", + "visibility": "Forward", + "x": 14, + "y": -4, + "z": 0 + }, + { + "tile_kind": "Floor", + "visibility": "Forward", + "x": 14, + "y": -3, + "z": 0 + }, + { + "tile_kind": "Floor", + "visibility": "Forward", + "x": 14, + "y": -2, + "z": 0 + }, + { + "tile_kind": "Floor", "visibility": "Forward", "x": 14, "y": -1, @@ -988,7 +1793,49 @@ "z": 0 }, { - "tile_kind": "Wall", + "tile_kind": "Floor", + "visibility": "Forward", + "x": 15, + "y": -7, + "z": 0 + }, + { + "tile_kind": "Floor", + "visibility": "Forward", + "x": 15, + "y": -6, + "z": 0 + }, + { + "tile_kind": "Floor", + "visibility": "Forward", + "x": 15, + "y": -5, + "z": 0 + }, + { + "tile_kind": "Floor", + "visibility": "Forward", + "x": 15, + "y": -4, + "z": 0 + }, + { + "tile_kind": "Floor", + "visibility": "Forward", + "x": 15, + "y": -3, + "z": 0 + }, + { + "tile_kind": "Floor", + "visibility": "Forward", + "x": 15, + "y": -2, + "z": 0 + }, + { + "tile_kind": "Floor", "visibility": "Forward", "x": 15, "y": -1, @@ -1079,7 +1926,49 @@ "z": 0 }, { - "tile_kind": "Wall", + "tile_kind": "Floor", + "visibility": "Forward", + "x": 16, + "y": -7, + "z": 0 + }, + { + "tile_kind": "Floor", + "visibility": "Forward", + "x": 16, + "y": -6, + "z": 0 + }, + { + "tile_kind": "Floor", + "visibility": "Forward", + "x": 16, + "y": -5, + "z": 0 + }, + { + "tile_kind": "Floor", + "visibility": "Forward", + "x": 16, + "y": -4, + "z": 0 + }, + { + "tile_kind": "Floor", + "visibility": "Forward", + "x": 16, + "y": -3, + "z": 0 + }, + { + "tile_kind": "Floor", + "visibility": "Forward", + "x": 16, + "y": -2, + "z": 0 + }, + { + "tile_kind": "Floor", "visibility": "Forward", "x": 16, "y": -1, @@ -1177,7 +2066,49 @@ "z": 0 }, { - "tile_kind": "Wall", + "tile_kind": "Floor", + "visibility": "Forward", + "x": 17, + "y": -7, + "z": 0 + }, + { + "tile_kind": "Floor", + "visibility": "Forward", + "x": 17, + "y": -6, + "z": 0 + }, + { + "tile_kind": "Floor", + "visibility": "Forward", + "x": 17, + "y": -5, + "z": 0 + }, + { + "tile_kind": "Floor", + "visibility": "Forward", + "x": 17, + "y": -4, + "z": 0 + }, + { + "tile_kind": "Floor", + "visibility": "Forward", + "x": 17, + "y": -3, + "z": 0 + }, + { + "tile_kind": "Floor", + "visibility": "Forward", + "x": 17, + "y": -2, + "z": 0 + }, + { + "tile_kind": "Floor", "visibility": "Forward", "x": 17, "y": -1, @@ -1282,7 +2213,49 @@ "z": 0 }, { - "tile_kind": "Wall", + "tile_kind": "Floor", + "visibility": "Forward", + "x": 18, + "y": -7, + "z": 0 + }, + { + "tile_kind": "Floor", + "visibility": "Forward", + "x": 18, + "y": -6, + "z": 0 + }, + { + "tile_kind": "Floor", + "visibility": "Forward", + "x": 18, + "y": -5, + "z": 0 + }, + { + "tile_kind": "Floor", + "visibility": "Forward", + "x": 18, + "y": -4, + "z": 0 + }, + { + "tile_kind": "Floor", + "visibility": "Forward", + "x": 18, + "y": -3, + "z": 0 + }, + { + "tile_kind": "Floor", + "visibility": "Forward", + "x": 18, + "y": -2, + "z": 0 + }, + { + "tile_kind": "Floor", "visibility": "Forward", "x": 18, "y": -1, @@ -1380,7 +2353,49 @@ "z": 0 }, { - "tile_kind": "Wall", + "tile_kind": "Floor", + "visibility": "Forward", + "x": 19, + "y": -7, + "z": 0 + }, + { + "tile_kind": "Floor", + "visibility": "Forward", + "x": 19, + "y": -6, + "z": 0 + }, + { + "tile_kind": "Floor", + "visibility": "Forward", + "x": 19, + "y": -5, + "z": 0 + }, + { + "tile_kind": "Floor", + "visibility": "Forward", + "x": 19, + "y": -4, + "z": 0 + }, + { + "tile_kind": "Floor", + "visibility": "Forward", + "x": 19, + "y": -3, + "z": 0 + }, + { + "tile_kind": "Floor", + "visibility": "Forward", + "x": 19, + "y": -2, + "z": 0 + }, + { + "tile_kind": "Floor", "visibility": "Forward", "x": 19, "y": -1, @@ -1471,7 +2486,49 @@ "z": 0 }, { - "tile_kind": "Wall", + "tile_kind": "Floor", + "visibility": "Forward", + "x": 20, + "y": -7, + "z": 0 + }, + { + "tile_kind": "Floor", + "visibility": "Forward", + "x": 20, + "y": -6, + "z": 0 + }, + { + "tile_kind": "Floor", + "visibility": "Forward", + "x": 20, + "y": -5, + "z": 0 + }, + { + "tile_kind": "Floor", + "visibility": "Forward", + "x": 20, + "y": -4, + "z": 0 + }, + { + "tile_kind": "Floor", + "visibility": "Forward", + "x": 20, + "y": -3, + "z": 0 + }, + { + "tile_kind": "Floor", + "visibility": "Forward", + "x": 20, + "y": -2, + "z": 0 + }, + { + "tile_kind": "Floor", "visibility": "Forward", "x": 20, "y": -1, @@ -1562,7 +2619,49 @@ "z": 0 }, { - "tile_kind": "Wall", + "tile_kind": "Floor", + "visibility": "Forward", + "x": 21, + "y": -7, + "z": 0 + }, + { + "tile_kind": "Floor", + "visibility": "Forward", + "x": 21, + "y": -6, + "z": 0 + }, + { + "tile_kind": "Floor", + "visibility": "Forward", + "x": 21, + "y": -5, + "z": 0 + }, + { + "tile_kind": "Floor", + "visibility": "Forward", + "x": 21, + "y": -4, + "z": 0 + }, + { + "tile_kind": "Floor", + "visibility": "Forward", + "x": 21, + "y": -3, + "z": 0 + }, + { + "tile_kind": "Floor", + "visibility": "Forward", + "x": 21, + "y": -2, + "z": 0 + }, + { + "tile_kind": "Floor", "visibility": "Forward", "x": 21, "y": -1, @@ -1646,7 +2745,49 @@ "z": 0 }, { - "tile_kind": "Wall", + "tile_kind": "Floor", + "visibility": "Forward", + "x": 22, + "y": -7, + "z": 0 + }, + { + "tile_kind": "Floor", + "visibility": "Forward", + "x": 22, + "y": -6, + "z": 0 + }, + { + "tile_kind": "Floor", + "visibility": "Forward", + "x": 22, + "y": -5, + "z": 0 + }, + { + "tile_kind": "Floor", + "visibility": "Forward", + "x": 22, + "y": -4, + "z": 0 + }, + { + "tile_kind": "Floor", + "visibility": "Forward", + "x": 22, + "y": -3, + "z": 0 + }, + { + "tile_kind": "Floor", + "visibility": "Forward", + "x": 22, + "y": -2, + "z": 0 + }, + { + "tile_kind": "Floor", "visibility": "Forward", "x": 22, "y": -1, @@ -1730,7 +2871,49 @@ "z": 0 }, { - "tile_kind": "Wall", + "tile_kind": "Floor", + "visibility": "Forward", + "x": 23, + "y": -7, + "z": 0 + }, + { + "tile_kind": "Floor", + "visibility": "Forward", + "x": 23, + "y": -6, + "z": 0 + }, + { + "tile_kind": "Floor", + "visibility": "Forward", + "x": 23, + "y": -5, + "z": 0 + }, + { + "tile_kind": "Floor", + "visibility": "Forward", + "x": 23, + "y": -4, + "z": 0 + }, + { + "tile_kind": "Floor", + "visibility": "Forward", + "x": 23, + "y": -3, + "z": 0 + }, + { + "tile_kind": "Floor", + "visibility": "Forward", + "x": 23, + "y": -2, + "z": 0 + }, + { + "tile_kind": "Floor", "visibility": "Forward", "x": 23, "y": -1, @@ -1807,7 +2990,49 @@ "z": 0 }, { - "tile_kind": "Wall", + "tile_kind": "Floor", + "visibility": "Forward", + "x": 24, + "y": -7, + "z": 0 + }, + { + "tile_kind": "Floor", + "visibility": "Forward", + "x": 24, + "y": -6, + "z": 0 + }, + { + "tile_kind": "Floor", + "visibility": "Forward", + "x": 24, + "y": -5, + "z": 0 + }, + { + "tile_kind": "Floor", + "visibility": "Forward", + "x": 24, + "y": -4, + "z": 0 + }, + { + "tile_kind": "Floor", + "visibility": "Forward", + "x": 24, + "y": -3, + "z": 0 + }, + { + "tile_kind": "Floor", + "visibility": "Forward", + "x": 24, + "y": -2, + "z": 0 + }, + { + "tile_kind": "Floor", "visibility": "Forward", "x": 24, "y": -1, @@ -1877,7 +3102,49 @@ "z": 0 }, { - "tile_kind": "Wall", + "tile_kind": "Floor", + "visibility": "Forward", + "x": 25, + "y": -7, + "z": 0 + }, + { + "tile_kind": "Floor", + "visibility": "Forward", + "x": 25, + "y": -6, + "z": 0 + }, + { + "tile_kind": "Floor", + "visibility": "Forward", + "x": 25, + "y": -5, + "z": 0 + }, + { + "tile_kind": "Floor", + "visibility": "Forward", + "x": 25, + "y": -4, + "z": 0 + }, + { + "tile_kind": "Floor", + "visibility": "Forward", + "x": 25, + "y": -3, + "z": 0 + }, + { + "tile_kind": "Floor", + "visibility": "Forward", + "x": 25, + "y": -2, + "z": 0 + }, + { + "tile_kind": "Floor", "visibility": "Forward", "x": 25, "y": -1, @@ -1947,7 +3214,49 @@ "z": 0 }, { - "tile_kind": "Wall", + "tile_kind": "Floor", + "visibility": "Forward", + "x": 26, + "y": -7, + "z": 0 + }, + { + "tile_kind": "Floor", + "visibility": "Forward", + "x": 26, + "y": -6, + "z": 0 + }, + { + "tile_kind": "Floor", + "visibility": "Forward", + "x": 26, + "y": -5, + "z": 0 + }, + { + "tile_kind": "Floor", + "visibility": "Forward", + "x": 26, + "y": -4, + "z": 0 + }, + { + "tile_kind": "Floor", + "visibility": "Forward", + "x": 26, + "y": -3, + "z": 0 + }, + { + "tile_kind": "Floor", + "visibility": "Forward", + "x": 26, + "y": -2, + "z": 0 + }, + { + "tile_kind": "Floor", "visibility": "Forward", "x": 26, "y": -1, @@ -2010,7 +3319,49 @@ "z": 0 }, { - "tile_kind": "Wall", + "tile_kind": "Floor", + "visibility": "Forward", + "x": 27, + "y": -7, + "z": 0 + }, + { + "tile_kind": "Floor", + "visibility": "Forward", + "x": 27, + "y": -6, + "z": 0 + }, + { + "tile_kind": "Floor", + "visibility": "Forward", + "x": 27, + "y": -5, + "z": 0 + }, + { + "tile_kind": "Floor", + "visibility": "Forward", + "x": 27, + "y": -4, + "z": 0 + }, + { + "tile_kind": "Floor", + "visibility": "Forward", + "x": 27, + "y": -3, + "z": 0 + }, + { + "tile_kind": "Floor", + "visibility": "Forward", + "x": 27, + "y": -2, + "z": 0 + }, + { + "tile_kind": "Floor", "visibility": "Forward", "x": 27, "y": -1, @@ -2073,7 +3424,49 @@ "z": 0 }, { - "tile_kind": "Wall", + "tile_kind": "Floor", + "visibility": "Forward", + "x": 28, + "y": -7, + "z": 0 + }, + { + "tile_kind": "Floor", + "visibility": "Forward", + "x": 28, + "y": -6, + "z": 0 + }, + { + "tile_kind": "Floor", + "visibility": "Forward", + "x": 28, + "y": -5, + "z": 0 + }, + { + "tile_kind": "Floor", + "visibility": "Forward", + "x": 28, + "y": -4, + "z": 0 + }, + { + "tile_kind": "Floor", + "visibility": "Forward", + "x": 28, + "y": -3, + "z": 0 + }, + { + "tile_kind": "Floor", + "visibility": "Forward", + "x": 28, + "y": -2, + "z": 0 + }, + { + "tile_kind": "Floor", "visibility": "Forward", "x": 28, "y": -1, @@ -2129,7 +3522,49 @@ "z": 0 }, { - "tile_kind": "Wall", + "tile_kind": "Floor", + "visibility": "Forward", + "x": 29, + "y": -7, + "z": 0 + }, + { + "tile_kind": "Floor", + "visibility": "Forward", + "x": 29, + "y": -6, + "z": 0 + }, + { + "tile_kind": "Floor", + "visibility": "Forward", + "x": 29, + "y": -5, + "z": 0 + }, + { + "tile_kind": "Floor", + "visibility": "Forward", + "x": 29, + "y": -4, + "z": 0 + }, + { + "tile_kind": "Floor", + "visibility": "Forward", + "x": 29, + "y": -3, + "z": 0 + }, + { + "tile_kind": "Floor", + "visibility": "Forward", + "x": 29, + "y": -2, + "z": 0 + }, + { + "tile_kind": "Floor", "visibility": "Forward", "x": 29, "y": -1, @@ -2185,7 +3620,49 @@ "z": 0 }, { - "tile_kind": "Wall", + "tile_kind": "Floor", + "visibility": "Forward", + "x": 30, + "y": -7, + "z": 0 + }, + { + "tile_kind": "Floor", + "visibility": "Forward", + "x": 30, + "y": -6, + "z": 0 + }, + { + "tile_kind": "Floor", + "visibility": "Forward", + "x": 30, + "y": -5, + "z": 0 + }, + { + "tile_kind": "Floor", + "visibility": "Forward", + "x": 30, + "y": -4, + "z": 0 + }, + { + "tile_kind": "Floor", + "visibility": "Forward", + "x": 30, + "y": -3, + "z": 0 + }, + { + "tile_kind": "Floor", + "visibility": "Forward", + "x": 30, + "y": -2, + "z": 0 + }, + { + "tile_kind": "Floor", "visibility": "Forward", "x": 30, "y": -1, @@ -2234,7 +3711,49 @@ "z": 0 }, { - "tile_kind": "Wall", + "tile_kind": "Floor", + "visibility": "Forward", + "x": 31, + "y": -7, + "z": 0 + }, + { + "tile_kind": "Floor", + "visibility": "Forward", + "x": 31, + "y": -6, + "z": 0 + }, + { + "tile_kind": "Floor", + "visibility": "Forward", + "x": 31, + "y": -5, + "z": 0 + }, + { + "tile_kind": "Floor", + "visibility": "Forward", + "x": 31, + "y": -4, + "z": 0 + }, + { + "tile_kind": "Floor", + "visibility": "Forward", + "x": 31, + "y": -3, + "z": 0 + }, + { + "tile_kind": "Floor", + "visibility": "Forward", + "x": 31, + "y": -2, + "z": 0 + }, + { + "tile_kind": "Floor", "visibility": "Forward", "x": 31, "y": -1, @@ -2276,46 +3795,445 @@ "z": 0 }, { - "tile_kind": "Wall", + "tile_kind": "Floor", + "visibility": "Forward", + "x": 32, + "y": -7, + "z": 0 + }, + { + "tile_kind": "Floor", + "visibility": "Forward", + "x": 32, + "y": -6, + "z": 0 + }, + { + "tile_kind": "Floor", + "visibility": "Forward", + "x": 32, + "y": -5, + "z": 0 + }, + { + "tile_kind": "Floor", + "visibility": "Forward", + "x": 32, + "y": -4, + "z": 0 + }, + { + "tile_kind": "Floor", + "visibility": "Forward", + "x": 32, + "y": -3, + "z": 0 + }, + { + "tile_kind": "Floor", + "visibility": "Forward", + "x": 32, + "y": -2, + "z": 0 + }, + { + "tile_kind": "Floor", "visibility": "Forward", "x": 32, "y": -1, "z": 0 }, { - "tile_kind": "Wall", + "tile_kind": "Floor", "visibility": "Forward", "x": 32, "y": 0, "z": 0 }, { - "tile_kind": "Wall", + "tile_kind": "Floor", "visibility": "Forward", "x": 32, "y": 1, "z": 0 }, { - "tile_kind": "Wall", + "tile_kind": "Floor", "visibility": "Forward", "x": 32, "y": 2, "z": 0 }, { - "tile_kind": "Wall", + "tile_kind": "Floor", "visibility": "Forward", "x": 32, "y": 3, "z": 0 }, { - "tile_kind": "Wall", + "tile_kind": "Floor", "visibility": "Forward", "x": 32, "y": 4, "z": 0 + }, + { + "tile_kind": "Floor", + "visibility": "Forward", + "x": 33, + "y": -7, + "z": 0 + }, + { + "tile_kind": "Floor", + "visibility": "Forward", + "x": 33, + "y": -6, + "z": 0 + }, + { + "tile_kind": "Floor", + "visibility": "Forward", + "x": 33, + "y": -5, + "z": 0 + }, + { + "tile_kind": "Floor", + "visibility": "Forward", + "x": 33, + "y": -4, + "z": 0 + }, + { + "tile_kind": "Floor", + "visibility": "Forward", + "x": 33, + "y": -3, + "z": 0 + }, + { + "tile_kind": "Floor", + "visibility": "Forward", + "x": 33, + "y": -2, + "z": 0 + }, + { + "tile_kind": "Floor", + "visibility": "Forward", + "x": 33, + "y": -1, + "z": 0 + }, + { + "tile_kind": "Floor", + "visibility": "Forward", + "x": 33, + "y": 0, + "z": 0 + }, + { + "tile_kind": "Floor", + "visibility": "Forward", + "x": 33, + "y": 1, + "z": 0 + }, + { + "tile_kind": "Floor", + "visibility": "Forward", + "x": 33, + "y": 2, + "z": 0 + }, + { + "tile_kind": "Floor", + "visibility": "Forward", + "x": 33, + "y": 3, + "z": 0 + }, + { + "tile_kind": "Floor", + "visibility": "Forward", + "x": 34, + "y": -7, + "z": 0 + }, + { + "tile_kind": "Floor", + "visibility": "Forward", + "x": 34, + "y": -6, + "z": 0 + }, + { + "tile_kind": "Floor", + "visibility": "Forward", + "x": 34, + "y": -5, + "z": 0 + }, + { + "tile_kind": "Floor", + "visibility": "Forward", + "x": 34, + "y": -4, + "z": 0 + }, + { + "tile_kind": "Floor", + "visibility": "Forward", + "x": 34, + "y": -3, + "z": 0 + }, + { + "tile_kind": "Floor", + "visibility": "Forward", + "x": 34, + "y": -2, + "z": 0 + }, + { + "tile_kind": "Floor", + "visibility": "Forward", + "x": 34, + "y": -1, + "z": 0 + }, + { + "tile_kind": "Floor", + "visibility": "Forward", + "x": 34, + "y": 0, + "z": 0 + }, + { + "tile_kind": "Floor", + "visibility": "Forward", + "x": 34, + "y": 1, + "z": 0 + }, + { + "tile_kind": "Floor", + "visibility": "Forward", + "x": 34, + "y": 2, + "z": 0 + }, + { + "tile_kind": "Floor", + "visibility": "Forward", + "x": 34, + "y": 3, + "z": 0 + }, + { + "tile_kind": "Floor", + "visibility": "Forward", + "x": 35, + "y": -7, + "z": 0 + }, + { + "tile_kind": "Floor", + "visibility": "Forward", + "x": 35, + "y": -6, + "z": 0 + }, + { + "tile_kind": "Floor", + "visibility": "Forward", + "x": 35, + "y": -5, + "z": 0 + }, + { + "tile_kind": "Floor", + "visibility": "Forward", + "x": 35, + "y": -4, + "z": 0 + }, + { + "tile_kind": "Floor", + "visibility": "Forward", + "x": 35, + "y": -3, + "z": 0 + }, + { + "tile_kind": "Floor", + "visibility": "Forward", + "x": 35, + "y": -2, + "z": 0 + }, + { + "tile_kind": "Floor", + "visibility": "Forward", + "x": 35, + "y": -1, + "z": 0 + }, + { + "tile_kind": "Floor", + "visibility": "Forward", + "x": 35, + "y": 0, + "z": 0 + }, + { + "tile_kind": "Floor", + "visibility": "Forward", + "x": 35, + "y": 1, + "z": 0 + }, + { + "tile_kind": "Floor", + "visibility": "Forward", + "x": 35, + "y": 2, + "z": 0 + }, + { + "tile_kind": "Floor", + "visibility": "Forward", + "x": 36, + "y": -7, + "z": 0 + }, + { + "tile_kind": "Floor", + "visibility": "Forward", + "x": 36, + "y": -6, + "z": 0 + }, + { + "tile_kind": "Floor", + "visibility": "Forward", + "x": 36, + "y": -5, + "z": 0 + }, + { + "tile_kind": "Floor", + "visibility": "Forward", + "x": 36, + "y": -4, + "z": 0 + }, + { + "tile_kind": "Floor", + "visibility": "Forward", + "x": 36, + "y": -3, + "z": 0 + }, + { + "tile_kind": "Floor", + "visibility": "Forward", + "x": 36, + "y": -2, + "z": 0 + }, + { + "tile_kind": "Floor", + "visibility": "Forward", + "x": 36, + "y": -1, + "z": 0 + }, + { + "tile_kind": "Floor", + "visibility": "Forward", + "x": 36, + "y": 0, + "z": 0 + }, + { + "tile_kind": "Floor", + "visibility": "Forward", + "x": 36, + "y": 1, + "z": 0 + }, + { + "tile_kind": "Floor", + "visibility": "Forward", + "x": 36, + "y": 2, + "z": 0 + }, + { + "tile_kind": "Floor", + "visibility": "Forward", + "x": 37, + "y": -7, + "z": 0 + }, + { + "tile_kind": "Floor", + "visibility": "Forward", + "x": 37, + "y": -6, + "z": 0 + }, + { + "tile_kind": "Floor", + "visibility": "Forward", + "x": 37, + "y": -5, + "z": 0 + }, + { + "tile_kind": "Floor", + "visibility": "Forward", + "x": 37, + "y": -4, + "z": 0 + }, + { + "tile_kind": "Floor", + "visibility": "Forward", + "x": 37, + "y": -3, + "z": 0 + }, + { + "tile_kind": "Floor", + "visibility": "Forward", + "x": 37, + "y": -2, + "z": 0 + }, + { + "tile_kind": "Floor", + "visibility": "Forward", + "x": 37, + "y": -1, + "z": 0 + }, + { + "tile_kind": "Floor", + "visibility": "Forward", + "x": 37, + "y": 0, + "z": 0 + }, + { + "tile_kind": "Floor", + "visibility": "Forward", + "x": 37, + "y": 1, + "z": 0 } ] } diff --git a/server/tests/serialization.rs b/server/tests/serialization.rs index 959f93d57..5ac7d2c57 100644 --- a/server/tests/serialization.rs +++ b/server/tests/serialization.rs @@ -38,6 +38,7 @@ fn test_snapshot(tick: u64, entities: Vec) -> ObserverSnapshot { save_result: None, triangle_crisis_events: vec![], state_hash: None, + debug_response: None, sim_errors: vec![], } } @@ -299,6 +300,7 @@ fn snapshot_v2_fields_roundtrip() { save_result: None, triangle_crisis_events: vec![], state_hash: None, + debug_response: None, sim_errors: vec![], }; @@ -354,7 +356,7 @@ fn protocol_version_constant_matches_snapshot() { let snapshot = test_snapshot(0, vec![]); assert_eq!(snapshot.version, PROTOCOL_VERSION); assert_eq!( - PROTOCOL_VERSION, 17, + PROTOCOL_VERSION, 18, "bump this assertion when protocol version changes" ); } @@ -406,6 +408,7 @@ fn all_facing_direction_variants_roundtrip() { save_result: None, triangle_crisis_events: vec![], state_hash: None, + debug_response: None, sim_errors: vec![], }; let bytes = rmp_serde::to_vec_named(&snapshot).expect("serialize");