Update wire protocol to version 5, introducing pupil slots and item counts in map snapshots. Enhance UI components to display pupil slots and item counts in game screens and map editors. Revise localization strings for improved user guidance. Update tests to validate new functionalities and ensure robustness in handling room and item data.
ci / server (push) Failing after 3m37s
ci / client (push) Successful in 28s

This commit is contained in:
Leonid Pershin
2026-08-18 17:21:16 +03:00
parent f000b128f6
commit 38afbcad36
26 changed files with 349 additions and 64 deletions
@@ -137,8 +137,15 @@ public class ProtocolCodecTests
public void MapSnapshot_RoundTripsAndWritesHeaderOffsets()
{
var message = new ServerMapSnapshotMessage(7, [
new MapSnapshotNode(0, "yard", "", "Двор", [], []),
new MapSnapshotNode(3, "office", "floor-1", "Кабинет директора", ["Стул"], ["Директор"]),
new MapSnapshotNode(0, "yard", "", "Двор", 0, [], []),
new MapSnapshotNode(
3,
"office",
"floor-1",
"Кабинет директора",
0,
[new MapSnapshotItem("Стул", 2)],
["Директор"]),
]);
var buffer = new byte[ProtocolConstants.MaxMessageSize];
@@ -154,17 +161,47 @@ public class ProtocolCodecTests
Assert.Equal("yard", read.Nodes[0].Id);
Assert.Equal("", read.Nodes[0].ParentId);
Assert.Equal("Двор", read.Nodes[0].Name);
Assert.Equal(["Стул"], read.Nodes[1].Items);
Assert.Equal(0, read.Nodes[0].PupilSlots);
Assert.Equal([new MapSnapshotItem("Стул", 2)], read.Nodes[1].Items);
Assert.Equal(["Директор"], read.Nodes[1].Positions);
}
[Fact]
public void MapSnapshot_WritesPupilSlotsAndStackedItemCount()
{
var message = new ServerMapSnapshotMessage(1, [
new MapSnapshotNode(
3,
"classroom-1a",
"floor-1",
"Класс 1A",
16,
[new MapSnapshotItem("Парта", 16)],
[]),
]);
var buffer = new byte[ProtocolCodec.MapSnapshotSize(message)];
var length = ProtocolCodec.WriteMapSnapshot(buffer, message);
var read = ProtocolCodec.ReadMapSnapshot(buffer.AsSpan(0, length));
Assert.Equal(16, read.Nodes[0].PupilSlots);
Assert.Equal([new MapSnapshotItem("Парта", 16)], read.Nodes[0].Items);
}
[Fact]
public void MapSnapshotSize_IsExactlyWhatTheWriterProduces()
{
var message = new ServerMapSnapshotMessage(7, [
new MapSnapshotNode(0, "yard", "", "Двор", [], []),
new MapSnapshotNode(2, "floor-1", "main", "Этаж 1", [], []),
new MapSnapshotNode(3, "office", "floor-1", "Кабинет директора", ["Стол", "Стул"], ["Директор"]),
new MapSnapshotNode(0, "yard", "", "Двор", 0, [], []),
new MapSnapshotNode(2, "floor-1", "main", "Этаж 1", 0, [], []),
new MapSnapshotNode(
3,
"office",
"floor-1",
"Кабинет директора",
0,
[new MapSnapshotItem("Стол", 1), new MapSnapshotItem("Стул", 2)],
["Директор"]),
]);
var size = ProtocolCodec.MapSnapshotSize(message);
@@ -179,7 +216,7 @@ public class ProtocolCodecTests
// A player who keeps clicking "Add room" in the create editor gets past 8 KiB somewhere
// around sixty furnished rooms. Sizing the buffer from the message is what keeps that
// school openable instead of killing its worker thread on the first snapshot.
var nodes = new List<MapSnapshotNode> { new(0, "yard", "", "Двор", [], []) };
var nodes = new List<MapSnapshotNode> { new(0, "yard", "", "Двор", 0, [], []) };
for (var i = 1; i <= 200; i++)
{
nodes.Add(new MapSnapshotNode(
@@ -187,7 +224,8 @@ public class ProtocolCodecTests
$"principals-office-{i}",
"floor-1",
"Кабинет директора",
["Кресло директора", "Стол", "Стул"],
0,
[new MapSnapshotItem("Кресло директора", 1), new MapSnapshotItem("Стол", 1), new MapSnapshotItem("Стул", 2)],
["Директор"]));
}
@@ -201,7 +239,9 @@ public class ProtocolCodecTests
Assert.Equal(nodes.Count, read.Nodes.Count);
Assert.Equal("principals-office-200", read.Nodes[^1].Id);
Assert.Equal(["Кресло директора", "Стол", "Стул"], read.Nodes[^1].Items);
Assert.Equal(
[new MapSnapshotItem("Кресло директора", 1), new MapSnapshotItem("Стол", 1), new MapSnapshotItem("Стул", 2)],
read.Nodes[^1].Items);
}
[Fact]