generalize protocol

1 files changed, 14 insertions, 15 deletions

diff --git a/server/src/protocol.rs b/server/src/protocol.rs
index 176eb31b..54992feb 100644
--- a/server/src/protocol.rs
+++ b/server/src/protocol.rs
@@ -99,24 +99,16 @@ pub enum PacketC {
         pos: Vec2,
         rot: f32,
     },
-    TakeItem {
-        tile: IVec2,
-        player: PlayerID,
-    },
-    PutItem {
-        player: PlayerID,
-        tile: IVec2,
-    },
-    SetTileItem {
-        tile: IVec2,
-        item: Option<ItemIndex>,
+    MoveItem {
+        from: ItemLocation,
+        to: ItemLocation,
     },
-    SetPlayerItem {
-        player: PlayerID,
+    SetItem {
+        location: ItemLocation,
         item: Option<ItemIndex>,
     },
-    SetActive {
-        tile: IVec2,
+    SetProgress {
+        item: ItemLocation,
         progress: Option<f32>,
         warn: bool,
     },
@@ -150,3 +142,10 @@ pub enum PacketC {
         message: String,
     },
 }
+
+#[derive(Debug, Clone, Serialize, Deserialize)]
+#[serde(rename_all = "snake_case")]
+pub enum ItemLocation {
+    Tile(IVec2),
+    Player(PlayerID),
+}