From e1bff92a566b3b7ee225831f15a5ab515232ae5b Mon Sep 17 00:00:00 2001
From: Marc Di Luzio <marc.diluzio@gmail.com>
Date: Fri, 26 Jun 2020 23:41:36 +0100
Subject: [PATCH] Remove Item type in favor of just byte

---
 pkg/game/items.go      | 6 ------
 pkg/game/rover.go      | 2 +-
 pkg/game/world.go      | 4 ++--
 pkg/game/world_test.go | 2 +-
 4 files changed, 4 insertions(+), 10 deletions(-)
 delete mode 100644 pkg/game/items.go

diff --git a/pkg/game/items.go b/pkg/game/items.go
deleted file mode 100644
index 4d3c918..0000000
--- a/pkg/game/items.go
+++ /dev/null
@@ -1,6 +0,0 @@
-package game
-
-// Item describes an item that can be held
-type Item struct {
-	Type byte `json:"type"`
-}
diff --git a/pkg/game/rover.go b/pkg/game/rover.go
index 0b21647..9c50ab8 100644
--- a/pkg/game/rover.go
+++ b/pkg/game/rover.go
@@ -26,5 +26,5 @@ type Rover struct {
 	Attributes RoverAttributes `json:"attributes"`
 
 	// Inventory represents any items the rover is carrying
-	Inventory []Item `json:"inventory"`
+	Inventory []byte `json:"inventory"`
 }
diff --git a/pkg/game/world.go b/pkg/game/world.go
index b75515c..406c66f 100644
--- a/pkg/game/world.go
+++ b/pkg/game/world.go
@@ -199,7 +199,7 @@ func (w *World) SetRoverAttributes(id uuid.UUID, attributes RoverAttributes) err
 }
 
 // RoverInventory returns the inventory of a requested rover
-func (w *World) RoverInventory(id uuid.UUID) ([]Item, error) {
+func (w *World) RoverInventory(id uuid.UUID) ([]byte, error) {
 	w.worldMutex.RLock()
 	defer w.worldMutex.RUnlock()
 
@@ -270,7 +270,7 @@ func (w *World) RoverStash(id uuid.UUID) (byte, error) {
 			return objects.Empty, err
 		} else {
 			if objects.IsStashable(tile) {
-				r.Inventory = append(r.Inventory, Item{Type: tile})
+				r.Inventory = append(r.Inventory, tile)
 				w.Rovers[id] = r
 				if err := w.Atlas.SetTile(r.Pos, objects.Empty); err != nil {
 					return objects.Empty, err
diff --git a/pkg/game/world_test.go b/pkg/game/world_test.go
index 2fefeca..27d2943 100644
--- a/pkg/game/world_test.go
+++ b/pkg/game/world_test.go
@@ -167,6 +167,6 @@ func TestWorld_RoverStash(t *testing.T) {
 
 	inv, err := world.RoverInventory(a)
 	assert.NoError(t, err, "Failed to get inventory")
-	assert.Equal(t, Item{Type: objects.SmallRock}, inv[0])
+	assert.Equal(t, objects.SmallRock, inv[0])
 
 }