two-handed server

1 files changed, 28 insertions, 2 deletions

diff --git a/server/protocol/src/helpers.rs b/server/protocol/src/helpers.rs
index 924d0886..21835101 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,7 +99,32 @@ 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 {
+        f.write_str(match self {
+            Hand::Left => "left",
+            Hand::Right => "right",
+        })
+    }
+}
+
+impl Hand {
+    pub fn index(&self) -> usize {
+        match self {
+            Hand::Left => 0,
+            Hand::Right => 1,
+        }
+    }
+    pub fn from_index(i: usize) -> Self {
+        match i {
+            0 => Hand::Left,
+            1 => Hand::Right,
+            _ => Hand::Left,
         }
     }
 }