also send whether inventory item is equipped

3 files changed, 3 insertions, 4 deletions

diff --git a/src/systems/view.rs b/src/systems/view.rs
index f1641bd..5ea7ed8 100644
--- a/src/systems/view.rs
+++ b/src/systems/view.rs
@@ -59,7 +59,7 @@ impl <'a> System<'a> for View {
 				updates.change = Some(changes.clone());
 			}
 			if let Some(inventory) = inventories.get(ent){
-				updates.inventory = Some(inventory.items.iter().map(|entry| entry.item.name.clone()).collect());
+				updates.inventory = Some(inventory.items.iter().map(|entry| (entry.item.name.clone(), entry.is_equipped)).collect());
 			}
 			if let Some(health) = healths.get(ent){
 				updates.health = Some((health.health, health.maxhealth));
diff --git a/src/worldmessages.rs b/src/worldmessages.rs
index 0ca72fa..676ef00 100644
--- a/src/worldmessages.rs
+++ b/src/worldmessages.rs
@@ -57,7 +57,7 @@ worldmessages!(
 	field, FieldMessage, "field", true;
 	pos, Pos, "playerpos", true;
 	change, ChangeMessage, "changecells", true;
-	inventory, InventoryMessage, "inventory", true;
+	inventory, InventoryMessage, "inv", true;
 	health, HealthMessage, "health", true;
 	ground, GroundMessage, "ground", true;
 	sounds, SoundMessage, "messages", false;
@@ -66,7 +66,7 @@ worldmessages!(
 
 pub type ChangeMessage = Vec<(Pos, Vec<Sprite>)>;
 pub type HealthMessage = (i64, i64);
-pub type InventoryMessage = Vec<String>;
+pub type InventoryMessage = Vec<(String, bool)>;
 pub type GroundMessage = Vec<String>;
 pub type SoundMessage = Vec<(Option<String>, String)>;
 
diff --git a/todo.md b/todo.md
index cba5cef..952c214 100644
--- a/todo.md
+++ b/todo.md
@@ -3,7 +3,6 @@
 
 - make readme
 - more tests
-- trader
 - visitors
 - improved tutorial
 - port over rooms/saves