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.

src/HSchool.Server/mods/core/defs/rooms/academic.jsonc

@@ -4,6 +4,7 @@
     "slots": [
       { "key": "board", "thing": "Blackboard" },
       { "key": "teacherDesk", "thing": "Desk" },
+      { "key": "teacherChair", "thing": "Chair" },
       { "key": "studentDesks", "thing": "StudentDesk", "count": 16 },
     ],
     "positions": ["Teacher"],
@@ -22,6 +23,7 @@
     "defName": "ComputerLab",
     "slots": [
       { "key": "teacherDesk", "thing": "Desk" },
+      { "key": "teacherChair", "thing": "Chair" },
       { "key": "computers", "thing": "Computer", "count": 12 },
     ],
     "positions": ["Teacher"],

src/HSchool.Server/mods/core/defs/things/furniture.jsonc

@@ -1,10 +1,10 @@
 [
   { "defName": "Blackboard" },
-  { "defName": "StudentDesk", "parent": "Desk", "actions": ["Sit"] },
+  { "defName": "StudentDesk", "parent": "Desk", "actions": ["Sit"], "pupilSlots": 1 },
   { "defName": "Bookshelf" },
   { "defName": "DiningTable" },
   { "defName": "Bench", "actions": ["Sit"] },
-  { "defName": "Computer" },
+  { "defName": "Computer", "pupilSlots": 1 },
   { "defName": "MedicalCouch" },
   { "defName": "Locker" },
 ]

src/HSchool.Server/mods/core/maps/default.jsonc

@@ -23,7 +23,7 @@
       "slots": [
         { "key": "directorChair", "thing": "DirectorsChair" },
         { "key": "desk", "thing": "Desk" },
-        { "key": "guestChair", "thing": "Chair" },
+        { "key": "guestChair", "thing": "Chair", "count": 2 },
       ],
     },
     {
@@ -43,7 +43,7 @@
       "floor": "floor-1",
       "slots": [
         { "key": "table", "thing": "DiningTable" },
-        { "key": "chairs", "thing": "Chair" },
+        { "key": "chairs", "thing": "Chair", "count": 6 },
       ],
     },
     {
@@ -55,7 +55,8 @@
       "slots": [
         { "key": "board", "thing": "Blackboard" },
         { "key": "teacherDesk", "thing": "Desk" },
-        { "key": "studentDesks", "thing": "StudentDesk" },
+        { "key": "teacherChair", "thing": "Chair" },
+        { "key": "studentDesks", "thing": "StudentDesk", "count": 16 },
       ],
     },
     {
@@ -67,7 +68,8 @@
       "slots": [
         { "key": "board", "thing": "Blackboard" },
         { "key": "teacherDesk", "thing": "Desk" },
-        { "key": "studentDesks", "thing": "StudentDesk" },
+        { "key": "teacherChair", "thing": "Chair" },
+        { "key": "studentDesks", "thing": "StudentDesk", "count": 16 },
       ],
     },
     {
@@ -77,7 +79,7 @@
       "floor": "floor-1",
       "slots": [
         { "key": "counter", "thing": "DiningTable" },
-        { "key": "seats", "thing": "Chair" },
+        { "key": "seats", "thing": "Chair", "count": 8 },
       ],
     },
     { "id": "restroom-1", "def": "Restroom", "building": "main", "floor": "floor-1", "label": "1" },
@@ -102,7 +104,8 @@
       "slots": [
         { "key": "board", "thing": "Blackboard" },
         { "key": "teacherDesk", "thing": "Desk" },
-        { "key": "studentDesks", "thing": "StudentDesk" },
+        { "key": "teacherChair", "thing": "Chair" },
+        { "key": "studentDesks", "thing": "StudentDesk", "count": 16 },
       ],
     },
     {
@@ -114,7 +117,8 @@
       "slots": [
         { "key": "board", "thing": "Blackboard" },
         { "key": "teacherDesk", "thing": "Desk" },
-        { "key": "studentDesks", "thing": "StudentDesk" },
+        { "key": "teacherChair", "thing": "Chair" },
+        { "key": "studentDesks", "thing": "StudentDesk", "count": 16 },
       ],
     },
     {
@@ -124,7 +128,7 @@
       "floor": "floor-2",
       "slots": [
         { "key": "desk", "thing": "Desk" },
-        { "key": "shelves", "thing": "Bookshelf" },
+        { "key": "shelves", "thing": "Bookshelf", "count": 4 },
       ],
     },
     {
@@ -134,7 +138,8 @@
       "floor": "floor-2",
       "slots": [
         { "key": "teacherDesk", "thing": "Desk" },
-        { "key": "computers", "thing": "Computer" },
+        { "key": "teacherChair", "thing": "Chair" },
+        { "key": "computers", "thing": "Computer", "count": 12 },
       ],
     },
     { "id": "restroom-2", "def": "Restroom", "building": "main", "floor": "floor-2", "label": "2" },
@@ -144,7 +149,7 @@
       "building": "gym",
       "floor": "gym-floor",
       "slots": [
-        { "key": "benches", "thing": "Bench" },
+        { "key": "benches", "thing": "Bench", "count": 4 },
       ],
     },
     {
@@ -153,7 +158,7 @@
       "building": "gym",
       "floor": "gym-floor",
       "slots": [
-        { "key": "lockers", "thing": "Locker" },
+        { "key": "lockers", "thing": "Locker", "count": 12 },
       ],
     },
   ],