Merge pull request 'Two-handed players' (#236) from two-handed into master

Reviewed-on: https://codeberg.org/hurrycurry/hurrycurry/pulls/236

1 files changed, 9 insertions, 2 deletions

diff --git a/server/protocol/src/helpers.rs b/server/protocol/src/helpers.rs
index 924d0886..b85c2f84 100644
--- a/server/protocol/src/helpers.rs
+++ b/server/protocol/src/helpers.rs
@@ -1,7 +1,8 @@
 use std::fmt::Display;
 
 use crate::{
-    DocumentElement, Gamedata, ItemIndex, ItemLocation, PlayerID, Recipe, RecipeIndex, TileIndex,
+    DocumentElement, Gamedata, Hand, ItemIndex, ItemLocation, PlayerID, Recipe, RecipeIndex,
+    TileIndex,
 };
 
 impl Gamedata {
@@ -98,11 +99,17 @@ impl Display for ItemLocation {
     fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result {
         match self {
             ItemLocation::Tile(pos) => write!(f, "tile({pos})"),
-            ItemLocation::Player(PlayerID(id)) => write!(f, "player({id})"),
+            ItemLocation::Player(PlayerID(id), hand) => write!(f, "player({id}_{hand})"),
         }
     }
 }
 
+impl Display for Hand {
+    fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result {
+        write!(f, "h{}", self.0)
+    }
+}
+
 impl Default for DocumentElement {
     fn default() -> Self {
         Self::Document { es: vec![] }