Makefile

@@ -18,9 +18,12 @@ gen:
 	protoc --proto_path proto --go_out=plugins=grpc,paths=source_relative:proto/ proto/roveapi/roveapi.proto
 
 test:
-	@echo Run unit and integration tests
+	@echo Unit tests
-	docker-compose -f docker-compose-test.yml up --build --exit-code-from=rove-tests --abort-on-container-exit rove-tests
+	go test -v ./...
-	docker-compose -f docker-compose-test.yml down
+
+	@echo Integration tests
+	docker-compose up --build --exit-code-from=rove-tests --abort-on-container-exit rove-tests
+	docker-compose down
 	go tool cover -html=/tmp/coverage-data/c.out -o /tmp/coverage.html
 	
 	@echo Done, coverage data can be found in /tmp/coverage.html

README.md

@@ -1,8 +1,9 @@
 Rove
 ====
+![Tests](https://github.com/mdiluz/rove/workflows/Tests/badge.svg) ![Docker](https://github.com/mdiluz/rove/workflows/Docker/badge.svg) [![rove](https://snapcraft.io//rove/badge.svg)](https://snapcraft.io/rove)
 
-![Rove](data/icon.svg)
+![Rove](https://github.com/mdiluz/rove/blob/master/data/icon.svg)
 
 Rove is an asynchronous nomadic game about exploring as part of a loose community.
 
-This repository contains the source code for the `rove-server` deployment and the `rove` command line client. See [mdiluz.github.io/rove](https://mdiluz.github.io/rove/) for game details, and [roveapi.proto](proto/roveapi/roveapi.proto) for the current server-client API.
+This repository contains the source code for the `rove-server` deployment and the `rove` command line client. See [mdiluz.github.io/rove](https://mdiluz.github.io/rove/) for game details, and [roveapi.proto](https://github.com/mdiluz/rove/blob/master/proto/roveapi/roveapi.proto) for the current server-client API.

cmd/rove-server/internal/accounts.go

@@ -1,4 +1,4 @@
-package accounts
+package internal
 
 // Accountant decribes something that stores accounts and account values
 type Accountant interface {

cmd/rove-server/internal/accounts_test.go

@@ -1,4 +1,4 @@
-package accounts
+package internal
 
 import (
 	"testing"

cmd/rove-server/internal/routes.go

@@ -34,7 +34,7 @@ func (s *Server) Register(ctx context.Context, req *roveapi.RegisterRequest) (*r
 		return nil, fmt.Errorf("empty account name")
 	}
 
-	if acc, err := s.world.Accountant.RegisterAccount(req.Name); err != nil {
+	if acc, err := s.accountant.RegisterAccount(req.Name); err != nil {
 		return nil, err
 
 	} else if _, err := s.SpawnRoverForAccount(req.Name); err != nil {
@@ -57,13 +57,13 @@ func (s *Server) Register(ctx context.Context, req *roveapi.RegisterRequest) (*r
 func (s *Server) Status(ctx context.Context, req *roveapi.StatusRequest) (response *roveapi.StatusResponse, err error) {
 	log.Printf("Handling status request: %s\n", req.Account.Name)
 
-	if valid, err := s.world.Accountant.VerifySecret(req.Account.Name, req.Account.Secret); err != nil {
+	if valid, err := s.accountant.VerifySecret(req.Account.Name, req.Account.Secret); err != nil {
 		return nil, err
 
 	} else if !valid {
 		return nil, fmt.Errorf("Secret incorrect for account %s", req.Account.Name)
 
-	} else if resp, err := s.world.Accountant.GetValue(req.Account.Name, "rover"); err != nil {
+	} else if resp, err := s.accountant.GetValue(req.Account.Name, "rover"); err != nil {
 		return nil, err
 
 	} else if rover, err := s.world.GetRover(resp); err != nil {
@@ -85,29 +85,23 @@ func (s *Server) Status(ctx context.Context, req *roveapi.StatusRequest) (respon
 		}
 
 		response = &roveapi.StatusResponse{
-			Readings: &roveapi.RoverReadings{
+			Name: rover.Name,
-				Position: &roveapi.Vector{
+			Position: &roveapi.Vector{
-					X: int32(rover.Pos.X),
+				X: int32(rover.Pos.X),
-					Y: int32(rover.Pos.Y),
+				Y: int32(rover.Pos.Y),
-				},
-				Logs: logs,
-				Wind: s.world.Wind,
-			},
-			Spec: &roveapi.RoverSpecifications{
-				Name:             rover.Name,
-				Range:            int32(rover.Range),
-				Capacity:         int32(rover.Capacity),
-				MaximumIntegrity: int32(rover.MaximumIntegrity),
-				MaximumCharge:    int32(rover.MaximumCharge),
-			},
-			Status: &roveapi.RoverStatus{
-				Bearing:        rover.Bearing,
-				Inventory:      inv,
-				Integrity:      int32(rover.Integrity),
-				Charge:         int32(rover.Charge),
-				QueuedCommands: queued,
-				SailPosition:   rover.SailPosition,
 			},
+			Bearing:          rover.Bearing,
+			Range:            int32(rover.Range),
+			Inventory:        inv,
+			Capacity:         int32(rover.Capacity),
+			Integrity:        int32(rover.Integrity),
+			MaximumIntegrity: int32(rover.MaximumIntegrity),
+			Charge:           int32(rover.Charge),
+			MaximumCharge:    int32(rover.MaximumCharge),
+			QueuedCommands:   queued,
+			SailPosition:     rover.SailPosition,
+			Logs:             logs,
+			Wind:             s.world.Wind,
 		}
 	}
 	return response, nil
@@ -117,7 +111,7 @@ func (s *Server) Status(ctx context.Context, req *roveapi.StatusRequest) (respon
 func (s *Server) Radar(ctx context.Context, req *roveapi.RadarRequest) (*roveapi.RadarResponse, error) {
 	log.Printf("Handling radar request: %s\n", req.Account.Name)
 
-	if valid, err := s.world.Accountant.VerifySecret(req.Account.Name, req.Account.Secret); err != nil {
+	if valid, err := s.accountant.VerifySecret(req.Account.Name, req.Account.Secret); err != nil {
 		return nil, err
 
 	} else if !valid {
@@ -126,7 +120,7 @@ func (s *Server) Radar(ctx context.Context, req *roveapi.RadarRequest) (*roveapi
 
 	response := &roveapi.RadarResponse{}
 
-	resp, err := s.world.Accountant.GetValue(req.Account.Name, "rover")
+	resp, err := s.accountant.GetValue(req.Account.Name, "rover")
 	if err != nil {
 		return nil, err
 
@@ -149,14 +143,14 @@ func (s *Server) Radar(ctx context.Context, req *roveapi.RadarRequest) (*roveapi
 func (s *Server) Command(ctx context.Context, req *roveapi.CommandRequest) (*roveapi.CommandResponse, error) {
 	log.Printf("Handling command request: %s and %+v\n", req.Account.Name, req.Commands)
 
-	if valid, err := s.world.Accountant.VerifySecret(req.Account.Name, req.Account.Secret); err != nil {
+	if valid, err := s.accountant.VerifySecret(req.Account.Name, req.Account.Secret); err != nil {
 		return nil, err
 
 	} else if !valid {
 		return nil, fmt.Errorf("Secret incorrect for account %s", req.Account.Name)
 	}
 
-	resp, err := s.world.Accountant.GetValue(req.Account.Name, "rover")
+	resp, err := s.accountant.GetValue(req.Account.Name, "rover")
 	if err != nil {
 		return nil, err
 	}

cmd/rove-server/internal/server.go

@@ -4,8 +4,6 @@ import (
 	"fmt"
 	"log"
 	"net"
-	"os"
-	"path"
 	"sync"
 
 	"github.com/mdiluz/rove/pkg/persistence"
@@ -13,12 +11,8 @@ import (
 	"github.com/mdiluz/rove/proto/roveapi"
 	"github.com/robfig/cron"
 	"google.golang.org/grpc"
-	"google.golang.org/grpc/credentials"
-	"google.golang.org/grpc/reflection"
 )
 
-var cert = os.Getenv("CERT_NAME")
-
 const (
 	// PersistentData will allow the server to load and save it's state
 	PersistentData = iota
@@ -33,6 +27,9 @@ type Server struct {
 	// Internal state
 	world *rove.World
 
+	// Accountant
+	accountant Accountant
+
 	// gRPC server
 	netListener net.Listener
 	grpcServ    *grpc.Server
@@ -83,6 +80,7 @@ func NewServer(opts ...ServerOption) *Server {
 		persistence: EphemeralData,
 		schedule:    cron.New(),
 		world:       rove.NewWorld(32),
+		accountant:  NewSimpleAccountant(),
 	}
 
 	// Apply all options
@@ -109,22 +107,8 @@ func (s *Server) Initialise(fillWorld bool) (err error) {
 	if err != nil {
 		log.Fatalf("failed to listen: %v", err)
 	}
-
+	s.grpcServ = grpc.NewServer()
-	// Load TLS
-	var opts []grpc.ServerOption
-	if len(os.Getenv("NO_TLS")) == 0 {
-		pem := path.Join("/etc/letsencrypt/live/", cert, "fullchain.pem")
-		key := path.Join("/etc/letsencrypt/live/", cert, "privkey.pem")
-		creds, err := credentials.NewServerTLSFromFile(pem, key)
-		if err != nil {
-			log.Fatalf("failed to setup TLS: %v", err)
-		}
-		opts = append(opts, grpc.Creds(creds))
-	}
-
-	s.grpcServ = grpc.NewServer(opts...)
 	roveapi.RegisterRoveServer(s.grpcServ, s)
-	reflection.Register(s.grpcServ)
 
 	return nil
 }
@@ -204,7 +188,7 @@ func (s *Server) SaveWorld() error {
 	if s.persistence == PersistentData {
 		s.world.RLock()
 		defer s.world.RUnlock()
-		if err := persistence.SaveAll("world", s.world); err != nil {
+		if err := persistence.SaveAll("world", s.world, "accounts", s.accountant); err != nil {
 			return fmt.Errorf("failed to save out persistent data: %s", err)
 		}
 	}
@@ -216,7 +200,7 @@ func (s *Server) LoadWorld() error {
 	if s.persistence == PersistentData {
 		s.world.Lock()
 		defer s.world.Unlock()
-		if err := persistence.LoadAll("world", &s.world); err != nil {
+		if err := persistence.LoadAll("world", &s.world, "accounts", &s.accountant); err != nil {
 			return err
 		}
 	}
@@ -225,10 +209,22 @@ func (s *Server) LoadWorld() error {
 
 // SpawnRoverForAccount spawns the rover rover for an account
 func (s *Server) SpawnRoverForAccount(account string) (string, error) {
-	inst, err := s.world.SpawnRover(account)
+	inst, err := s.world.SpawnRover()
 	if err != nil {
 		return "", err
 	}
 
+	err = s.accountant.AssignData(account, "rover", inst)
+	if err != nil {
+		log.Printf("Failed to assign rover to account, %s", err)
+
+		// Try and clear up the rover
+		if err := s.world.DestroyRover(inst); err != nil {
+			log.Printf("Failed to destroy rover after failed rover assign: %s", err)
+		}
+
+		return "", err
+	}
+
 	return inst, nil
 }

cmd/rove-server/internal/server_test.go

@@ -1,7 +1,6 @@
 package internal
 
 import (
-	"os"
 	"testing"
 )
 
@@ -31,7 +30,6 @@ func TestNewServer_OptionPersistentData(t *testing.T) {
 }
 
 func TestServer_Run(t *testing.T) {
-	os.Setenv("NO_TLS", "1")
 	server := NewServer()
 	if server == nil {
 		t.Error("Failed to create server")
@@ -47,7 +45,6 @@ func TestServer_Run(t *testing.T) {
 }
 
 func TestServer_RunPersistentData(t *testing.T) {
-	os.Setenv("NO_TLS", "1")
 	server := NewServer(OptionPersistentData())
 	if server == nil {
 		t.Error("Failed to create server")

cmd/rove-server/internal/simpleAccountant.go

@@ -1,4 +1,4 @@
-package accounts
+package internal
 
 import (
 	"fmt"

cmd/rove/internal/glyph.go

@@ -25,9 +25,6 @@ const (
 	// GlyphRoverDormant represents a dormant rover
 	GlyphRoverDormant = Glyph('r')
 
-	// GlyphRoverParts represents spare rover parts
-	GlyphRoverParts = Glyph('*')
-
 	// GlyphRockSmall is a small stashable rock
 	GlyphRockSmall = Glyph('o')
 
@@ -61,8 +58,6 @@ func ObjectGlyph(o roveapi.Object) Glyph {
 		return GlyphRoverDormant
 	case roveapi.Object_RockLarge:
 		return GlyphRockLarge
-	case roveapi.Object_RoverParts:
-		return GlyphRoverParts
 	}
 
 	log.Fatalf("Unknown object type: %c", o)

cmd/rove/main.go

@@ -1,7 +1,6 @@
 package main
 
 import (
-	"crypto/tls"
 	"encoding/json"
 	"fmt"
 	"io/ioutil"
@@ -9,7 +8,6 @@ import (
 	"os"
 	"path"
 	"path/filepath"
-	"strconv"
 	"time"
 
 	"github.com/mdiluz/rove/cmd/rove/internal"
@@ -17,7 +15,6 @@ import (
 	"github.com/mdiluz/rove/proto/roveapi"
 	"golang.org/x/net/context"
 	"google.golang.org/grpc"
-	"google.golang.org/grpc/credentials"
 )
 
 var home = os.Getenv("HOME")
@@ -25,30 +22,23 @@ var defaultDataPath = path.Join(home, ".local/share/")
 
 // Command usage
 func printUsage() {
-	fmt.Fprintln(os.Stderr, "Usage: rove ARG [OPT...]")
+	fmt.Fprintf(os.Stderr, "Usage: rove COMMAND [ARGS...]\n")
-	fmt.Fprintf(os.Stderr, "\n")
+	fmt.Fprintln(os.Stderr, "\nCommands")
-	fmt.Fprintln(os.Stderr, "Arguments:")
+	fmt.Fprintln(os.Stderr, "\tserver-status              prints the server status")
-	fmt.Fprintln(os.Stderr, "\tversion                       outputs version")
+	fmt.Fprintln(os.Stderr, "\tregister NAME              registers an account and stores it (use with -name)")
-	fmt.Fprintln(os.Stderr, "\thelp                          outputs this usage text")
+	fmt.Fprintln(os.Stderr, "\tcommand COMMAND [VAL...]   issue commands to rover, accepts multiple, see below")
-	fmt.Fprintln(os.Stderr, "\tconfig [HOST]                 outputs the local config, optionally sets host")
+	fmt.Fprintln(os.Stderr, "\tradar                      gathers radar data for the current rover")
-	fmt.Fprintln(os.Stderr, "\tserver-status                 prints the server status")
+	fmt.Fprintln(os.Stderr, "\tstatus                     gets status info for current rover")
-	fmt.Fprintln(os.Stderr, "\tregister NAME                 registers an account and spawns a rover")
+	fmt.Fprintln(os.Stderr, "\tconfig [HOST]              outputs the local config info, optionally sets host")
-	fmt.Fprintln(os.Stderr, "\tradar                         prints radar data in ASCII form")
+	fmt.Fprintln(os.Stderr, "\thelp                       outputs this usage information")
-	fmt.Fprintln(os.Stderr, "\tstatus                        gets rover status")
+	fmt.Fprintln(os.Stderr, "\tversion                    outputs version info")
-	fmt.Fprintln(os.Stderr, "\tcommand CMD [VAL...] [REPEAT] sets the command queue, accepts multiple in sequence")
+	fmt.Fprintln(os.Stderr, "\nRover commands:")
-	fmt.Fprintf(os.Stderr, "\n")
+	fmt.Fprintln(os.Stderr, "\ttoggle                     toggles the sails, either catching the wind, or charging from the sun")
-	fmt.Fprintln(os.Stderr, "Rover commands:")
+	fmt.Fprintln(os.Stderr, "\tstash                      stores the object at the rover location in the inventory")
-	fmt.Fprintln(os.Stderr, "\ttoggle         toggles the current sail mode")
+	fmt.Fprintln(os.Stderr, "\trepair                     uses an inventory object to repair the rover")
-	fmt.Fprintln(os.Stderr, "\tstash          stores the object at the rover location in the inventory")
+	fmt.Fprintln(os.Stderr, "\tbroadcast MSG              broadcast a simple ASCII triplet to nearby rovers")
-	fmt.Fprintln(os.Stderr, "\trepair         repairs the rover using inventory item")
+	fmt.Fprintln(os.Stderr, "\nEnvironment")
-	fmt.Fprintln(os.Stderr, "\tbroadcast MSG  broadcast a simple ASCII triplet to nearby rovers")
+	fmt.Fprintln(os.Stderr, "\tROVE_USER_DATA             path to user data, defaults to "+defaultDataPath)
-	fmt.Fprintln(os.Stderr, "\tsalvage        salvages a dormant rover for parts")
-	fmt.Fprintln(os.Stderr, "\ttransfer       transfer's control into a dormant rover")
-	fmt.Fprintln(os.Stderr, "\tupgrade SPEC   spends rover parts to upgrade one rover spec (capacity, range, integrity, charge")
-	fmt.Fprintln(os.Stderr, "\twait           waits before performing the next command")
-	fmt.Fprintf(os.Stderr, "\n")
-	fmt.Fprintln(os.Stderr, "Environment")
-	fmt.Fprintln(os.Stderr, "\tROVE_USER_DATA        path to user data, defaults to "+defaultDataPath)
 }
 
 const gRPCport = 9090
@@ -188,15 +178,8 @@ func InnerMain(command string, args ...string) error {
 		return fmt.Errorf("no host set in %s, set one with '%s config {HOST}'", ConfigPath(), os.Args[0])
 	}
 
-	var opts []grpc.DialOption
-	if len(os.Getenv("NO_TLS")) == 0 {
-		opts = append(opts, grpc.WithTransportCredentials(credentials.NewTLS(&tls.Config{})))
-	} else {
-		opts = append(opts, grpc.WithInsecure())
-	}
-
 	// Set up the server
-	clientConn, err := grpc.Dial(fmt.Sprintf("%s:%d", config.Host, gRPCport), opts...)
+	clientConn, err := grpc.Dial(fmt.Sprintf("%s:%d", config.Host, gRPCport), grpc.WithInsecure())
 	if err != nil {
 		return err
 	}
@@ -248,8 +231,6 @@ func InnerMain(command string, args ...string) error {
 		// Iterate through each command
 		var commands []*roveapi.Command
 		for i := 0; i < len(args); i++ {
-
-			var cmd *roveapi.Command
 			switch args[i] {
 			case "turn":
 				i++
@@ -260,10 +241,12 @@ func InnerMain(command string, args ...string) error {
 				if b == roveapi.Bearing_BearingUnknown {
 					return fmt.Errorf("turn command must be given a valid bearing %s", args[i])
 				}
-				cmd = &roveapi.Command{
+				commands = append(commands,
-					Command: roveapi.CommandType_turn,
+					&roveapi.Command{
-					Bearing: b,
+						Command:   roveapi.CommandType_broadcast,
-				}
+						Broadcast: []byte(args[i]),
+					},
+				)
 			case "broadcast":
 				i++
 				if len(args) == i {
@@ -271,51 +254,20 @@ func InnerMain(command string, args ...string) error {
 				} else if len(args[i]) > 3 {
 					return fmt.Errorf("broadcast command must be given ASCII triplet of 3 or less: %s", args[i])
 				}
-				cmd = &roveapi.Command{
+				commands = append(commands,
-					Command: roveapi.CommandType_broadcast,
+					&roveapi.Command{
-					Data:    []byte(args[i]),
+						Command:   roveapi.CommandType_broadcast,
-				}
+						Broadcast: []byte(args[i]),
-			case "upgrade":
+					},
-				i++
+				)
-				if len(args) == i {
-					return fmt.Errorf("upgrade command must be passed a spec to upgrade")
-				}
-				var u roveapi.RoverUpgrade
-				switch args[i] {
-				case "capacity":
-					u = roveapi.RoverUpgrade_Capacity
-				case "range":
-					u = roveapi.RoverUpgrade_Range
-				case "integrity":
-					u = roveapi.RoverUpgrade_MaximumIntegrity
-				case "charge":
-					u = roveapi.RoverUpgrade_MaximumCharge
-				default:
-					return fmt.Errorf("upgrade command must be passed a known upgrade spec")
-				}
-				cmd = &roveapi.Command{
-					Command: roveapi.CommandType_upgrade,
-					Upgrade: u,
-				}
 			default:
 				// By default just use the command literally
-				cmd = &roveapi.Command{
+				commands = append(commands,
-					Command: roveapi.CommandType(roveapi.CommandType_value[args[i]]),
+					&roveapi.Command{
-				}
+						Command: roveapi.CommandType(roveapi.CommandType_value[args[i]]),
+					},
+				)
 			}
-
-			// Try and convert the next command to a number
-			number := 0
-			if len(args) > i+1 {
-				num, err := strconv.Atoi(args[i+1])
-				if err == nil {
-					number = num
-					i++
-				}
-			}
-			cmd.Repeat = int32(number)
-
-			commands = append(commands, cmd)
 		}
 
 		_, err := client.Command(ctx, &roveapi.CommandRequest{
@@ -403,15 +355,6 @@ func InnerMain(command string, args ...string) error {
 func main() {
 	// Bail without any args
 	if len(os.Args) == 1 {
-		fmt.Fprintf(os.Stderr, "\n")
-		fmt.Fprintln(os.Stderr, "m mm   mmm   m   m   mmm")
-		fmt.Fprintln(os.Stderr, "#\"  \" #\" \"#  \"m m\"  #\"  #")
-		fmt.Fprintln(os.Stderr, "#     #   #   #m#   #\"\"\"\"")
-		fmt.Fprintln(os.Stderr, "#     \"#m#\"    #    \"#mm\"")
-		fmt.Fprintf(os.Stderr, "\n")
-		fmt.Fprintln(os.Stderr, "Rove is an asychronous nomadic game about exploring a planet as part of a loose community.")
-		fmt.Fprintln(os.Stderr, "Visit https://mdiluz.github.io/rove/ for more information.")
-		fmt.Fprintf(os.Stderr, "\n")
 		printUsage()
 		os.Exit(1)
 	}

cmd/rove/main_test.go

@@ -13,7 +13,6 @@ import (
 )
 
 func Test_InnerMain(t *testing.T) {
-	os.Setenv("NO_TLS", "1")
 
 	// Use temporary local user data
 	tmp, err := ioutil.TempDir(os.TempDir(), "rove-")
@@ -54,14 +53,9 @@ func Test_InnerMain(t *testing.T) {
 	assert.NoError(t, InnerMain("command", "toggle"))
 	assert.NoError(t, InnerMain("command", "stash"))
 	assert.NoError(t, InnerMain("command", "repair"))
-	assert.NoError(t, InnerMain("command", "upgrade", "capacity"))
 	assert.NoError(t, InnerMain("command", "broadcast", "abc"))
-	assert.NoError(t, InnerMain("command", "wait", "10"))
-	assert.NoError(t, InnerMain("command", "wait", "1", "turn", "NW", "toggle", "broadcast", "zyx"))
 
 	// Give it malformed commands
 	assert.Error(t, InnerMain("command", "unknown"))
 	assert.Error(t, InnerMain("command", "broadcast"))
-	assert.Error(t, InnerMain("command", "upgrade"))
-	assert.Error(t, InnerMain("command", "1"))
 }

docker-compose-test.yml

@@ -1,32 +0,0 @@
-version: '3'
-
-services:
-  rove-test-server:
-    build:
-      context: .
-      dockerfile: Dockerfile
-    image: rove:latest
-    ports:
-      - "9090:9090"
-    environment:
-      - PORT=9090
-      - DATA_PATH=/tmp/
-      - WORDS_FILE=data/words_alpha.txt
-      - TICK_RATE=10
-      - NO_TLS=1
-    command: [ "./rove-server"]
-
-  rove-tests:
-    depends_on: [ rove-test-server ]
-    build:
-      context: .
-      dockerfile: Dockerfile
-    image: rove:latest
-    environment:
-      - ROVE_GRPC=rove-test-server
-    command: [ "./script/wait-for-it.sh", "rove-test-server:9090", "--", "go", "test", "-v", "./...", "--tags=integration", "-cover", "-coverprofile=/mnt/coverage-data/c.out", "-count", "1" ]
-    volumes:
-      - /tmp/coverage-data:/mnt/coverage-data:rw
-
-
-  

docker-compose.yml

@@ -16,10 +16,21 @@ services:
       - DATA_PATH=/mnt/rove-server
       - WORDS_FILE=data/words_alpha.txt
       - TICK_RATE=3
-      - CERT_NAME=${CERT_NAME}
     volumes:
       - persistent-data:/mnt/rove-server:rw
-      - /etc/letsencrypt/:/etc/letsencrypt/
     command: [ "./rove-server"]
 
+  rove-tests:
+    depends_on: [ rove-server ]
+    build:
+      context: .
+      dockerfile: Dockerfile
+    image: rove:latest
+    environment:
+      - ROVE_GRPC=rove-server
+    command: [ "./script/wait-for-it.sh", "rove-server:9090", "--", "go", "test", "-v", "./...", "--tags=integration", "-cover", "-coverprofile=/mnt/coverage-data/c.out", "-count", "1" ]
+    volumes:
+      - /tmp/coverage-data:/mnt/coverage-data:rw
+
+
   

pkg/rove/chunkAtlas.go

@@ -2,6 +2,7 @@ package rove
 
 import (
 	"log"
+	"math/rand"
 
 	"github.com/mdiluz/rove/pkg/maths"
 	"github.com/mdiluz/rove/proto/roveapi"
@@ -110,6 +111,15 @@ func (a *chunkBasedAtlas) populate(chunk int) {
 		}
 	}
 
+	// Set up any objects
+	for i := 0; i < len(c.Tiles); i++ {
+		if rand.Intn(16) == 0 {
+			c.Objects[i] = Object{Type: roveapi.Object_RockLarge}
+		} else if rand.Intn(32) == 0 {
+			c.Objects[i] = Object{Type: roveapi.Object_RockSmall}
+		}
+	}
+
 	a.Chunks[chunk] = c
 }
 

pkg/rove/command_test.go

@@ -1,26 +1,15 @@
 package rove
 
 import (
-	"encoding/json"
 	"testing"
 
-	"github.com/mdiluz/rove/pkg/maths"
 	"github.com/mdiluz/rove/proto/roveapi"
 	"github.com/stretchr/testify/assert"
 )
 
-func TestCommand_Invalid(t *testing.T) {
-	w := NewWorld(8)
-	name, err := w.SpawnRover("")
-	assert.NoError(t, err)
-
-	err = w.Enqueue(name, &roveapi.Command{Command: roveapi.CommandType_none})
-	assert.Error(t, err)
-}
-
 func TestCommand_Toggle(t *testing.T) {
 	w := NewWorld(8)
-	a, err := w.SpawnRover("")
+	a, err := w.SpawnRover()
 	assert.NoError(t, err)
 
 	r, err := w.GetRover(a)
@@ -46,10 +35,10 @@ func TestCommand_Toggle(t *testing.T) {
 
 func TestCommand_Turn(t *testing.T) {
 	w := NewWorld(8)
-	a, err := w.SpawnRover("")
+	a, err := w.SpawnRover()
 	assert.NoError(t, err)
 
-	err = w.Enqueue(a, &roveapi.Command{Command: roveapi.CommandType_turn, Bearing: roveapi.Bearing_NorthWest})
+	err = w.Enqueue(a, &roveapi.Command{Command: roveapi.CommandType_turn, Turn: roveapi.Bearing_NorthWest})
 	assert.NoError(t, err)
 	w.Tick()
 
@@ -59,247 +48,17 @@ func TestCommand_Turn(t *testing.T) {
 }
 
 func TestCommand_Stash(t *testing.T) {
-	w := NewWorld(8)
+	// TODO: Test the stash command
-	name, err := w.SpawnRover("")
-	assert.NoError(t, err)
-
-	info, err := w.GetRover(name)
-	assert.NoError(t, err)
-	assert.Empty(t, info.Inventory)
-
-	// Drop a pickup below us
-	w.Atlas.SetObject(info.Pos, Object{Type: roveapi.Object_RockSmall})
-
-	// Try and stash it
-	err = w.Enqueue(name, &roveapi.Command{Command: roveapi.CommandType_stash})
-	assert.NoError(t, err)
-	w.Tick()
-
-	// Check we now have it in the inventory
-	info, err = w.GetRover(name)
-	assert.NoError(t, err)
-	assert.Equal(t, 1, len(info.Inventory))
-	assert.Equal(t, Object{Type: roveapi.Object_RockSmall}, info.Inventory[0])
-
-	// Check it's no longer on the atlas
-	_, obj := w.Atlas.QueryPosition(info.Pos)
-	assert.Equal(t, Object{Type: roveapi.Object_ObjectUnknown}, obj)
 }
 
 func TestCommand_Repair(t *testing.T) {
-	w := NewWorld(8)
+	// TODO: Test the repair command
-	name, err := w.SpawnRover("")
-	assert.NoError(t, err)
-
-	info, err := w.GetRover(name)
-	assert.NoError(t, err)
-	assert.Equal(t, info.MaximumIntegrity, info.Integrity)
-
-	// Put a blocking rock to the north
-	w.Atlas.SetObject(info.Pos.Added(maths.Vector{X: 0, Y: 1}), Object{Type: roveapi.Object_RockLarge})
-
-	// Try and move and make sure we're blocked
-	newpos, err := w.TryMoveRover(name, roveapi.Bearing_North)
-	assert.NoError(t, err)
-	assert.Equal(t, info.Pos, newpos)
-
-	// Check we're damaged
-	info, err = w.GetRover(name)
-	assert.NoError(t, err)
-	assert.Equal(t, info.MaximumIntegrity-1, info.Integrity)
-
-	// Stash a repair object
-	w.Atlas.SetObject(info.Pos, Object{Type: roveapi.Object_RoverParts})
-	obj, err := w.RoverStash(name)
-	assert.NoError(t, err)
-	assert.Equal(t, roveapi.Object_RoverParts, obj)
-
-	// Enqueue the repair and tick
-	err = w.Enqueue(name, &roveapi.Command{Command: roveapi.CommandType_repair})
-	assert.NoError(t, err)
-	w.Tick()
-
-	// Check we're repaired
-	info, err = w.GetRover(name)
-	assert.NoError(t, err)
-	assert.Equal(t, info.MaximumIntegrity, info.Integrity)
-	assert.Equal(t, 0, len(info.Inventory))
 }
 
 func TestCommand_Broadcast(t *testing.T) {
-	w := NewWorld(8)
+	// TODO: Test the stash command
-	name, err := w.SpawnRover("")
-	assert.NoError(t, err)
-
-	// Enqueue the broadcast and tick
-	err = w.Enqueue(name, &roveapi.Command{Command: roveapi.CommandType_broadcast, Data: []byte("ABC")})
-	assert.NoError(t, err)
-	w.Tick()
-
-	info, err := w.GetRover(name)
-	assert.NoError(t, err)
-	assert.Contains(t, info.Logs[len(info.Logs)-1].Text, "ABC")
 }
 
-func TestCommand_Salvage(t *testing.T) {
+func TestCommand_Invalid(t *testing.T) {
-	w := NewWorld(8)
+	// TODO: Test an invalid command
-	name, err := w.SpawnRover("")
-	assert.NoError(t, err)
-
-	info, err := w.GetRover(name)
-	assert.NoError(t, err)
-
-	w.Atlas.SetObject(info.Pos, Object{Type: roveapi.Object_RoverDormant})
-
-	// Enqueue the broadcast and tick
-	err = w.Enqueue(name, &roveapi.Command{Command: roveapi.CommandType_salvage})
-	assert.NoError(t, err)
-	w.Tick()
-
-	// Check we now have some rover parts
-	info, err = w.GetRover(name)
-	assert.NoError(t, err)
-	assert.NotEmpty(t, info.Inventory)
-	for _, i := range info.Inventory {
-		assert.Equal(t, roveapi.Object_RoverParts, i.Type)
-	}
-
-	// Check the dormant rover is gone
-	_, obj := w.Atlas.QueryPosition(info.Pos)
-	assert.Equal(t, roveapi.Object_ObjectUnknown, obj.Type)
-}
-
-func TestCommand_Transfer(t *testing.T) {
-	w := NewWorld(8)
-	acc, err := w.Accountant.RegisterAccount("tmp")
-	assert.NoError(t, err)
-	nameA, err := w.SpawnRover(acc.Name)
-	assert.NoError(t, err)
-
-	infoA, err := w.GetRover(nameA)
-	assert.NoError(t, err)
-
-	// Drop a dormant rover on the current position
-	infoB := DefaultRover()
-	infoB.Name = "abc"
-	infoB.Pos = infoA.Pos
-	data, err := json.Marshal(infoB)
-	assert.NoError(t, err)
-	w.Atlas.SetObject(infoA.Pos, Object{Type: roveapi.Object_RoverDormant, Data: data})
-
-	// Enqueue a transfer as well as a dud command
-	err = w.Enqueue(nameA,
-		&roveapi.Command{Command: roveapi.CommandType_transfer},
-		&roveapi.Command{Command: roveapi.CommandType_broadcast, Data: []byte("xyz")})
-	assert.NoError(t, err)
-	w.Tick()
-
-	// Ensure both command queues are empty
-	assert.Empty(t, w.CommandQueue[nameA])
-	assert.Empty(t, w.CommandQueue[infoB.Name])
-
-	// Verify the account now controls the new rover
-	accountRover, err := w.Accountant.GetValue(acc.Name, "rover")
-	assert.NoError(t, err)
-	assert.Equal(t, infoB.Name, accountRover)
-
-	// Verify the position now has a dormant rover
-	_, obj := w.Atlas.QueryPosition(infoA.Pos)
-	assert.Equal(t, roveapi.Object_RoverDormant, obj.Type)
-
-	// Verify the stored data matches
-	var stored Rover
-	err = json.Unmarshal(obj.Data, &stored)
-	assert.NoError(t, err)
-	assert.Equal(t, infoA.Name, stored.Name)
-
-	// Verify the new rover data matches what we put in
-	infoB2, err := w.GetRover(infoB.Name)
-	assert.NoError(t, err)
-	assert.Equal(t, infoB.Name, infoB2.Name)
-
-}
-
-func TestCommand_Wait(t *testing.T) {
-	w := NewWorld(8)
-	a, err := w.SpawnRover("")
-	assert.NoError(t, err)
-
-	r, err := w.GetRover(a)
-	assert.NoError(t, err)
-	assert.Equal(t, roveapi.SailPosition_SolarCharging, r.SailPosition)
-
-	err = w.Enqueue(a, &roveapi.Command{Command: roveapi.CommandType_wait, Repeat: 4}, &roveapi.Command{Command: roveapi.CommandType_toggle})
-	assert.NoError(t, err)
-
-	// Tick 5 times during the wait (1 normal execute + 4)
-	for i := 0; i < 5; i++ {
-		w.Tick()
-
-		r, err = w.GetRover(a)
-		assert.NoError(t, err)
-		assert.Equal(t, roveapi.SailPosition_SolarCharging, r.SailPosition)
-	}
-
-	// One last tick to do the toggle
-	w.Tick()
-
-	r, err = w.GetRover(a)
-	assert.NoError(t, err)
-	assert.Equal(t, roveapi.SailPosition_CatchingWind, r.SailPosition)
-}
-
-func TestCommand_Upgrade(t *testing.T) {
-	w := NewWorld(8)
-	name, err := w.SpawnRover("")
-	assert.NoError(t, err)
-	rover, ok := w.Rovers[name]
-	assert.True(t, ok)
-
-	// Try an invalid upgrade
-	err = w.Enqueue(name, &roveapi.Command{Command: roveapi.CommandType_upgrade})
-	assert.Error(t, err)
-
-	// Try a valid command but without the parts
-	err = w.Enqueue(name, &roveapi.Command{Command: roveapi.CommandType_upgrade, Upgrade: roveapi.RoverUpgrade_Capacity})
-	assert.NoError(t, err)
-
-	// Ensure nothing changed and we logged the attempt
-	pre := rover.Capacity
-	w.Tick()
-	assert.Equal(t, pre, rover.Capacity)
-	assert.Contains(t, rover.Logs[len(rover.Logs)-1].Text, "tried")
-
-	// One non-part item
-	rover.Inventory = []Object{
-		{
-			Type: roveapi.Object_RoverParts,
-		},
-		{
-			Type: roveapi.Object_RoverParts,
-		},
-		{
-			Type: roveapi.Object_RockSmall,
-		},
-		{
-			Type: roveapi.Object_RoverParts,
-		},
-		{
-			Type: roveapi.Object_RoverParts,
-		},
-		{
-			Type: roveapi.Object_RoverParts,
-		},
-	}
-
-	// Try a valid command again
-	err = w.Enqueue(name, &roveapi.Command{Command: roveapi.CommandType_upgrade, Upgrade: roveapi.RoverUpgrade_Capacity})
-	assert.NoError(t, err)
-
-	// Check that the capacity increases on the tick and all the parts are used
-	pre = rover.Capacity
-	w.Tick()
-	assert.Equal(t, pre+1, rover.Capacity)
-	assert.Equal(t, 1, len(rover.Inventory))
-	assert.Equal(t, roveapi.Object_RockSmall, rover.Inventory[0].Type)
 }

pkg/rove/objects.go

@@ -17,6 +17,7 @@ type Object struct {
 func (o *Object) IsBlocking() bool {
 	var blocking = [...]roveapi.Object{
 		roveapi.Object_RoverLive,
+		roveapi.Object_RoverDormant,
 		roveapi.Object_RockLarge,
 	}
 
@@ -32,7 +33,6 @@ func (o *Object) IsBlocking() bool {
 func (o *Object) IsStashable() bool {
 	var stashable = [...]roveapi.Object{
 		roveapi.Object_RockSmall,
-		roveapi.Object_RoverParts,
 	}
 
 	for _, t := range stashable {

pkg/rove/rover.go

@@ -13,10 +13,6 @@ import (
 	"github.com/mdiluz/rove/proto/roveapi"
 )
 
-const (
-	maxLogEntries = 16
-)
-
 // RoverLogEntry describes a single log entry for the rover
 type RoverLogEntry struct {
 	// Time is the timestamp of the entry
@@ -66,15 +62,12 @@ type Rover struct {
 
 	// Logs Stores log of information
 	Logs []RoverLogEntry
-
-	// The account that owns this rover
-	Owner string
 }
 
 // DefaultRover returns a default rover object with default settings
 func DefaultRover() *Rover {
 	return &Rover{
-		Range:            10,
+		Range:            4,
 		Integrity:        10,
 		MaximumIntegrity: 10,
 		Capacity:         10,
@@ -96,11 +89,6 @@ func (r *Rover) AddLogEntryf(format string, args ...interface{}) {
 			Text: text,
 		},
 	)
-
-	// Limit the number of logs
-	if len(r.Logs) > maxLogEntries {
-		r.Logs = r.Logs[len(r.Logs)-maxLogEntries:]
-	}
 }
 
 var wordsFile = os.Getenv("WORDS_FILE")

pkg/rove/world.go

@@ -1,23 +1,17 @@
 package rove
 
 import (
-	"encoding/json"
 	"fmt"
 	"log"
 	"math/rand"
 	"sync"
 
-	"github.com/mdiluz/rove/pkg/accounts"
 	"github.com/mdiluz/rove/pkg/maths"
 	"github.com/mdiluz/rove/proto/roveapi"
 )
 
 const (
-	// ticksPerNormalMove defines the number of ticks it should take for a "normal" speed move
+	TicksPerNormalMove = 4
-	ticksPerNormalMove = 4
-
-	// upgradeCost is the cost in rover parts needed to upgrade a rover specification
-	upgradeCost = 5
 )
 
 // CommandStream is a list of commands to execute in order
@@ -44,9 +38,6 @@ type World struct {
 	// Commands is the set of currently executing command streams per rover
 	CommandQueue map[string]CommandStream
 
-	// Accountant
-	Accountant accounts.Accountant
-
 	// Mutex to lock around all world operations
 	worldMutex sync.RWMutex
 	// Mutex to lock around command operations
@@ -61,22 +52,17 @@ func NewWorld(chunkSize int) *World {
 		Atlas:        NewChunkAtlas(chunkSize),
 		TicksPerDay:  24,
 		CurrentTicks: 0,
-		Accountant:   accounts.NewSimpleAccountant(),
-		Wind:         roveapi.Bearing_North,
 	}
 }
 
-// SpawnRover adds an rover to the game (without lock)
+// SpawnRover adds an rover to the game
-func (w *World) SpawnRover(account string) (string, error) {
+func (w *World) SpawnRover() (string, error) {
 	w.worldMutex.Lock()
 	defer w.worldMutex.Unlock()
 
 	// Initialise the rover
 	rover := DefaultRover()
 
-	// Assign the owner
-	rover.Owner = account
-
 	// Spawn in a random place near the origin
 	rover.Pos = maths.Vector{
 		X: 10 - rand.Intn(20),
@@ -101,13 +87,7 @@ func (w *World) SpawnRover(account string) (string, error) {
 	// Append the rover to the list
 	w.Rovers[rover.Name] = rover
 
-	var err error
+	return rover.Name, nil
-	// Only assign if we've been given an account
-	if len(account) > 0 {
-		err = w.Accountant.AssignData(account, "rover", rover.Name)
-	}
-
-	return rover.Name, err
 }
 
 // GetRover gets a specific rover by name
@@ -184,26 +164,12 @@ func (w *World) DestroyRover(rover string) error {
 	w.worldMutex.Lock()
 	defer w.worldMutex.Unlock()
 
-	r, ok := w.Rovers[rover]
+	_, ok := w.Rovers[rover]
 	if !ok {
 		return fmt.Errorf("no rover matching id")
 	}
 
-	// Remove this rover from tracked rovers
 	delete(w.Rovers, rover)
-
-	r.Owner = ""
-	r.AddLogEntryf("rover destroyed")
-
-	// Marshal the rover data
-	data, err := json.Marshal(r)
-	if err != nil {
-		return err
-	}
-
-	// Place the dormant rover down
-	w.Atlas.SetObject(r.Pos, Object{Type: roveapi.Object_RoverDormant, Data: data})
-
 	return nil
 }
 
@@ -293,6 +259,9 @@ func (w *World) TryMoveRover(rover string, b roveapi.Bearing) (maths.Vector, err
 		i.AddLogEntryf("tried to move %s to %+v", b.String(), newPos)
 		i.Integrity = i.Integrity - 1
 		i.AddLogEntryf("had a collision, new integrity %d", i.Integrity)
+		// TODO: The rover needs to be left dormant with the player
+		//if i.Integrity == 0 {
+		//}
 	}
 
 	return i.Pos, nil
@@ -310,13 +279,11 @@ func (w *World) RoverStash(rover string) (roveapi.Object, error) {
 
 	// Can't pick up when full
 	if len(r.Inventory) >= r.Capacity {
-		r.AddLogEntryf("tried to stash object but inventory was full")
 		return roveapi.Object_ObjectUnknown, nil
 	}
 
 	// Ensure the rover has energy
 	if r.Charge <= 0 {
-		r.AddLogEntryf("tried to stash object but had no charge")
 		return roveapi.Object_ObjectUnknown, nil
 	}
 	r.Charge--
@@ -332,99 +299,6 @@ func (w *World) RoverStash(rover string) (roveapi.Object, error) {
 	return obj.Type, nil
 }
 
-// RoverSalvage will salvage a rover for parts
-func (w *World) RoverSalvage(rover string) (roveapi.Object, error) {
-	w.worldMutex.Lock()
-	defer w.worldMutex.Unlock()
-
-	r, ok := w.Rovers[rover]
-	if !ok {
-		return roveapi.Object_ObjectUnknown, fmt.Errorf("no rover matching id")
-	}
-
-	// Can't pick up when full
-	if len(r.Inventory) >= r.Capacity {
-		r.AddLogEntryf("tried to salvage dormant rover but inventory was full")
-		return roveapi.Object_ObjectUnknown, nil
-	}
-
-	// Ensure the rover has energy
-	if r.Charge <= 0 {
-		r.AddLogEntryf("tried to salvage dormant rover but had no charge")
-		return roveapi.Object_ObjectUnknown, nil
-	}
-	r.Charge--
-
-	_, obj := w.Atlas.QueryPosition(r.Pos)
-	if obj.Type != roveapi.Object_RoverDormant {
-		r.AddLogEntryf("tried to salvage dormant rover but found no rover to salvage")
-		return roveapi.Object_ObjectUnknown, nil
-	}
-
-	r.AddLogEntryf("salvaged dormant rover")
-	for i := 0; i < 5; i++ {
-		if len(r.Inventory) == r.Capacity {
-			break
-		}
-		r.Inventory = append(r.Inventory, Object{Type: roveapi.Object_RoverParts})
-	}
-	w.Atlas.SetObject(r.Pos, Object{Type: roveapi.Object_ObjectUnknown})
-	return obj.Type, nil
-}
-
-// RoverTransfer will transfer rover control to dormant rover
-func (w *World) RoverTransfer(rover string) (string, error) {
-	w.worldMutex.Lock()
-	defer w.worldMutex.Unlock()
-
-	oldRover, ok := w.Rovers[rover]
-	if !ok {
-		return "", fmt.Errorf("no rover matching id")
-	}
-
-	_, obj := w.Atlas.QueryPosition(oldRover.Pos)
-	if obj.Type != roveapi.Object_RoverDormant {
-		oldRover.AddLogEntryf("tried to transfer to dormant rover but found no rover")
-		return "", nil
-	}
-
-	// Unmarshal the dormant rover
-	var newRover Rover
-	err := json.Unmarshal(obj.Data, &newRover)
-	if err != nil {
-		return "", err
-	}
-
-	// Add logs
-	oldRover.AddLogEntryf("transferring to dormant rover %s", newRover.Name)
-	newRover.AddLogEntryf("transferred from rover %s", oldRover.Name)
-
-	// Transfer the ownership
-	err = w.Accountant.AssignData(oldRover.Owner, "rover", newRover.Name)
-	if err != nil {
-		return "", err
-	}
-	newRover.Owner = oldRover.Owner
-	oldRover.Owner = ""
-
-	// Place the old rover in the world
-	oldRoverData, err := json.Marshal(oldRover)
-	if err != nil {
-		return "", err
-	}
-	w.Atlas.SetObject(oldRover.Pos, Object{Type: roveapi.Object_RoverDormant, Data: oldRoverData})
-
-	// Swap the rovers in the tracking
-	w.Rovers[newRover.Name] = &newRover
-	delete(w.Rovers, oldRover.Name)
-
-	// Clear the command queues for both rovers
-	delete(w.CommandQueue, oldRover.Name)
-	delete(w.CommandQueue, newRover.Name)
-
-	return newRover.Name, nil
-}
-
 // RoverToggle will toggle the sail position
 func (w *World) RoverToggle(rover string) (roveapi.SailPosition, error) {
 	w.worldMutex.Lock()
@@ -449,65 +323,6 @@ func (w *World) RoverToggle(rover string) (roveapi.SailPosition, error) {
 	return r.SailPosition, nil
 }
 
-// RoverUpgrade will try to upgrade the rover
-func (w *World) RoverUpgrade(rover string, upgrade roveapi.RoverUpgrade) (int, error) {
-	w.worldMutex.Lock()
-	defer w.worldMutex.Unlock()
-
-	r, ok := w.Rovers[rover]
-	if !ok {
-		return 0, fmt.Errorf("no rover matching id")
-	}
-
-	cost := upgradeCost
-	num := 0
-	for i := range r.Inventory {
-		if r.Inventory[i].Type == roveapi.Object_RoverParts {
-			num++
-		}
-	}
-
-	if num < cost {
-		r.AddLogEntryf("tried to upgrade but lacked rover parts")
-		return 0, nil
-	}
-
-	// Apply the upgrade
-	var ret int
-	switch upgrade {
-	case roveapi.RoverUpgrade_Capacity:
-		r.Capacity++
-		ret = r.Capacity
-	case roveapi.RoverUpgrade_Range:
-		r.Range++
-		ret = r.Range
-	case roveapi.RoverUpgrade_MaximumCharge:
-		r.MaximumCharge++
-		ret = r.MaximumCharge
-	case roveapi.RoverUpgrade_MaximumIntegrity:
-		r.MaximumIntegrity++
-		ret = r.MaximumIntegrity
-	default:
-		return 0, fmt.Errorf("unknown upgrade: %s", upgrade)
-	}
-
-	// Remove the cost in rover parts
-	var n []Object
-	for _, o := range r.Inventory {
-		if o.Type == roveapi.Object_RoverParts && cost > 0 {
-			cost--
-		} else {
-			n = append(n, o)
-		}
-	}
-	// Assign back the inventory
-	r.Inventory = n
-
-	r.AddLogEntryf("upgraded %s to %d", upgrade, ret)
-
-	return ret, nil
-}
-
 // RoverTurn will turn the rover
 func (w *World) RoverTurn(rover string, bearing roveapi.Bearing) (roveapi.Bearing, error) {
 	w.worldMutex.Lock()
@@ -536,24 +351,11 @@ func (w *World) RoverRepair(rover string) (int, error) {
 		return 0, fmt.Errorf("no rover matching id")
 	}
 
-	// Can't repair past max
+	// Consume an inventory item to repair if possible
-	if r.Integrity >= r.MaximumIntegrity {
+	if len(r.Inventory) > 0 && r.Integrity < r.MaximumIntegrity {
-		return r.Integrity, nil
+		r.Inventory = r.Inventory[:len(r.Inventory)-1]
-	}
+		r.Integrity = r.Integrity + 1
-
+		r.AddLogEntryf("repaired self to %d", r.Integrity)
-	// Find rover parts in inventory
-	for i, o := range r.Inventory {
-		if o.Type == roveapi.Object_RoverParts {
-
-			// Copy-erase from slice
-			r.Inventory[i] = r.Inventory[len(r.Inventory)-1]
-			r.Inventory = r.Inventory[:len(r.Inventory)-1]
-
-			// Repair
-			r.Integrity = r.Integrity + 1
-			r.AddLogEntryf("repaired self to %d", r.Integrity)
-			break
-		}
 	}
 
 	return r.Integrity, nil
@@ -632,28 +434,21 @@ func (w *World) Enqueue(rover string, commands ...*roveapi.Command) error {
 	for _, c := range commands {
 		switch c.Command {
 		case roveapi.CommandType_broadcast:
-			if len(c.GetData()) > 3 {
+			if len(c.GetBroadcast()) > 3 {
-				return fmt.Errorf("too many characters in message (limit 3): %d", len(c.GetData()))
+				return fmt.Errorf("too many characters in message (limit 3): %d", len(c.GetBroadcast()))
 			}
-			for _, b := range c.GetData() {
+			for _, b := range c.GetBroadcast() {
 				if b < 37 || b > 126 {
 					return fmt.Errorf("invalid message character: %c", b)
 				}
 			}
 		case roveapi.CommandType_turn:
-			if c.GetBearing() == roveapi.Bearing_BearingUnknown {
+			if c.GetTurn() == roveapi.Bearing_BearingUnknown {
 				return fmt.Errorf("turn command given unknown bearing")
 			}
-		case roveapi.CommandType_upgrade:
-			if c.GetUpgrade() == roveapi.RoverUpgrade_RoverUpgradeUnknown {
-				return fmt.Errorf("upgrade command given unknown upgrade")
-			}
-		case roveapi.CommandType_wait:
 		case roveapi.CommandType_toggle:
 		case roveapi.CommandType_stash:
 		case roveapi.CommandType_repair:
-		case roveapi.CommandType_salvage:
-		case roveapi.CommandType_transfer:
 			// Nothing to verify
 		default:
 			return fmt.Errorf("unknown command: %s", c.Command)
@@ -679,24 +474,25 @@ func (w *World) Tick() {
 		if len(cmds) != 0 {
 
 			// Execute the command
-			if done, err := w.ExecuteCommand(cmds[0], rover); err != nil {
+			if err := w.ExecuteCommand(cmds[0], rover); err != nil {
 				log.Println(err)
 				// TODO: Report this error somehow
-
-			} else if done {
-				// Extract the first command in the queue
-				// Only if the command queue still has entries (the command may have modified this queue)
-				if _, ok := w.CommandQueue[rover]; ok {
-					w.CommandQueue[rover] = cmds[1:]
-				}
 			}
 
+			// Extract the first command in the queue
+			w.CommandQueue[rover] = cmds[1:]
+
 		} else {
 			// Clean out the empty entry
 			delete(w.CommandQueue, rover)
 		}
 	}
 
+	// Change the wind every day
+	if (w.CurrentTicks % w.TicksPerDay) == 0 {
+		w.Wind = roveapi.Bearing((rand.Int() % 8) + 1) // Random cardinal bearing
+	}
+
 	// Move all the rovers based on current wind and sails
 	for n, r := range w.Rovers {
 		// Skip if we're not catching the wind
@@ -719,16 +515,16 @@ func (w *World) Tick() {
 		switch diff {
 		case 0:
 			// Going with the wind, travel at base speed of once every 4 ticks
-			ticksToMove = ticksPerNormalMove
+			ticksToMove = TicksPerNormalMove
 		case 1:
 			// At a slight angle, we can go a little faster
-			ticksToMove = ticksPerNormalMove / 2
+			ticksToMove = TicksPerNormalMove / 2
 		case 2:
 			// Perpendicular to wind, max speed
 			ticksToMove = 1
 		case 3:
 			// Heading at 45 degrees into the wind, back to min speed
-			ticksToMove = ticksPerNormalMove
+			ticksToMove = TicksPerNormalMove
 		case 4:
 			// Heading durectly into the wind, no movement at all
 		default:
@@ -746,66 +542,48 @@ func (w *World) Tick() {
 			// Reset the move ticks
 			r.MoveTicks = 0
 		}
-	}
 
-	// Check all rover integrities
+		log.Print(ticksToMove)
-	for _, r := range w.Rovers {
-		if r.Integrity <= 0 {
-			// The rover has died destroy it
-			err := w.DestroyRover(r.Name)
-			if err != nil {
-				log.Println(err)
-				// TODO: Report this error somehow
-			}
-
-			// Spawn a new one for this account
-			_, err = w.SpawnRover(r.Owner)
-			if err != nil {
-				log.Println(err)
-				// TODO: Report this error somehow
-			}
-		}
 	}
 
 	// Increment the current tick count
 	w.CurrentTicks++
-
-	// Change the wind every day
-	if (w.CurrentTicks % w.TicksPerDay) == 0 {
-		w.Wind = roveapi.Bearing((rand.Int() % 8) + 1) // Random cardinal bearing
-	}
 }
 
 // ExecuteCommand will execute a single command
-func (w *World) ExecuteCommand(c *roveapi.Command, rover string) (done bool, err error) {
+func (w *World) ExecuteCommand(c *roveapi.Command, rover string) (err error) {
 	log.Printf("Executing command: %+v for %s\n", c.Command, rover)
 
 	switch c.Command {
 	case roveapi.CommandType_toggle:
-		_, err = w.RoverToggle(rover)
+		if _, err := w.RoverToggle(rover); err != nil {
+			return err
+		}
 	case roveapi.CommandType_stash:
-		_, err = w.RoverStash(rover)
+		if _, err := w.RoverStash(rover); err != nil {
+			return err
+		}
+
 	case roveapi.CommandType_repair:
-		_, err = w.RoverRepair(rover)
+		if _, err := w.RoverRepair(rover); err != nil {
+			return err
+		}
+
 	case roveapi.CommandType_broadcast:
-		err = w.RoverBroadcast(rover, c.GetData())
+		if err := w.RoverBroadcast(rover, c.GetBroadcast()); err != nil {
+			return err
+		}
+
 	case roveapi.CommandType_turn:
-		_, err = w.RoverTurn(rover, c.GetBearing())
+		if _, err := w.RoverTurn(rover, c.GetTurn()); err != nil {
-	case roveapi.CommandType_salvage:
+			return err
-		_, err = w.RoverSalvage(rover)
+		}
-	case roveapi.CommandType_transfer:
+
-		_, err = w.RoverTransfer(rover)
-	case roveapi.CommandType_upgrade:
-		_, err = w.RoverUpgrade(rover, c.GetUpgrade())
-	case roveapi.CommandType_wait:
-		// Nothing to do
 	default:
-		return true, fmt.Errorf("unknown command: %s", c.Command)
+		return fmt.Errorf("unknown command: %s", c.Command)
 	}
 
-	// Decrement the repeat number
+	return
-	c.Repeat--
-	return c.Repeat < 0, err
 }
 
 // Daytime returns if it's currently daytime

pkg/rove/world_test.go

@@ -18,9 +18,9 @@ func TestNewWorld(t *testing.T) {
 
 func TestWorld_CreateRover(t *testing.T) {
 	world := NewWorld(8)
-	a, err := world.SpawnRover("")
+	a, err := world.SpawnRover()
 	assert.NoError(t, err)
-	b, err := world.SpawnRover("")
+	b, err := world.SpawnRover()
 	assert.NoError(t, err)
 
 	// Basic duplicate check
@@ -33,7 +33,7 @@ func TestWorld_CreateRover(t *testing.T) {
 
 func TestWorld_GetRover(t *testing.T) {
 	world := NewWorld(4)
-	a, err := world.SpawnRover("")
+	a, err := world.SpawnRover()
 	assert.NoError(t, err)
 
 	rover, err := world.GetRover(a)
@@ -44,9 +44,9 @@ func TestWorld_GetRover(t *testing.T) {
 
 func TestWorld_DestroyRover(t *testing.T) {
 	world := NewWorld(1)
-	a, err := world.SpawnRover("")
+	a, err := world.SpawnRover()
 	assert.NoError(t, err)
-	b, err := world.SpawnRover("")
+	b, err := world.SpawnRover()
 	assert.NoError(t, err)
 
 	err = world.DestroyRover(a)
@@ -62,7 +62,7 @@ func TestWorld_DestroyRover(t *testing.T) {
 
 func TestWorld_GetSetMovePosition(t *testing.T) {
 	world := NewWorld(4)
-	a, err := world.SpawnRover("")
+	a, err := world.SpawnRover()
 	assert.NoError(t, err)
 
 	pos := maths.Vector{
@@ -97,9 +97,9 @@ func TestWorld_GetSetMovePosition(t *testing.T) {
 func TestWorld_RadarFromRover(t *testing.T) {
 	// Create world that should have visible walls on the radar
 	world := NewWorld(2)
-	a, err := world.SpawnRover("")
+	a, err := world.SpawnRover()
 	assert.NoError(t, err)
-	b, err := world.SpawnRover("")
+	b, err := world.SpawnRover()
 	assert.NoError(t, err)
 
 	// Warp the rovers into position
@@ -109,16 +109,15 @@ func TestWorld_RadarFromRover(t *testing.T) {
 	world.Atlas.SetObject(maths.Vector{X: 0, Y: 0}, Object{Type: roveapi.Object_ObjectUnknown})
 	assert.NoError(t, world.WarpRover(a, maths.Vector{X: 0, Y: 0}), "Failed to warp rover")
 
-	r, err := world.GetRover(a)
-	assert.NoError(t, err)
-
 	radar, objs, err := world.RadarFromRover(a)
 	assert.NoError(t, err, "Failed to get radar from rover")
-	fullRange := r.Range + r.Range + 1
+	fullRange := 4 + 4 + 1
 	assert.Equal(t, fullRange*fullRange, len(radar), "Radar returned wrong length")
 	assert.Equal(t, fullRange*fullRange, len(objs), "Radar returned wrong length")
 
-	// TODO: Verify the other rover is on the radar
+	// Test the expected values
+	assert.Equal(t, roveapi.Object_RoverLive, objs[1+fullRange])
+	assert.Equal(t, roveapi.Object_RoverLive, objs[4+4*fullRange])
 
 	// Check the radar results are stable
 	radar1, objs1, err := world.RadarFromRover(a)
@@ -129,11 +128,9 @@ func TestWorld_RadarFromRover(t *testing.T) {
 	assert.Equal(t, objs1, objs2)
 }
 
-func TestWorld_RoverDamage(t *testing.T) {
+func TestWorld_RoverStash(t *testing.T) {
 	world := NewWorld(2)
-	acc, err := world.Accountant.RegisterAccount("tmp")
+	a, err := world.SpawnRover()
-	assert.NoError(t, err)
-	a, err := world.SpawnRover(acc.Name)
 	assert.NoError(t, err)
 
 	pos := maths.Vector{
@@ -145,6 +142,78 @@ func TestWorld_RoverDamage(t *testing.T) {
 	err = world.WarpRover(a, pos)
 	assert.NoError(t, err, "Failed to set position for rover")
 
+	rover, err := world.GetRover(a)
+	assert.NoError(t, err, "Failed to get rover")
+
+	for i := 0; i < rover.Capacity; i++ {
+		// Place an object
+		world.Atlas.SetObject(pos, Object{Type: roveapi.Object_RockSmall})
+
+		// Pick it up
+		o, err := world.RoverStash(a)
+		assert.NoError(t, err, "Failed to stash")
+		assert.Equal(t, roveapi.Object_RockSmall, o, "Failed to get correct object")
+
+		// Check it's gone
+		_, obj := world.Atlas.QueryPosition(pos)
+		assert.Equal(t, roveapi.Object_ObjectUnknown, obj.Type, "Stash failed to remove object from atlas")
+
+		// Check we have it
+		inv, err := world.RoverInventory(a)
+		assert.NoError(t, err, "Failed to get inventory")
+		assert.Equal(t, i+1, len(inv))
+		assert.Equal(t, Object{Type: roveapi.Object_RockSmall}, inv[i])
+
+		// Check that this did reduce the charge
+		info, err := world.GetRover(a)
+		assert.NoError(t, err, "Failed to get rover")
+		assert.Equal(t, info.MaximumCharge-(i+1), info.Charge, "Rover lost charge for stash")
+		assert.Contains(t, info.Logs[len(info.Logs)-1].Text, "stashed", "Rover logs should contain the move")
+	}
+
+	// Recharge the rover
+	for i := 0; i < rover.MaximumCharge; i++ {
+		_, err = world.RoverRecharge(a)
+		assert.NoError(t, err)
+
+	}
+
+	// Place an object
+	world.Atlas.SetObject(pos, Object{Type: roveapi.Object_RockSmall})
+
+	// Try to pick it up
+	o, err := world.RoverStash(a)
+	assert.NoError(t, err, "Failed to stash")
+	assert.Equal(t, roveapi.Object_ObjectUnknown, o, "Failed to get correct object")
+
+	// Check it's still there
+	_, obj := world.Atlas.QueryPosition(pos)
+	assert.Equal(t, roveapi.Object_RockSmall, obj.Type, "Stash failed to remove object from atlas")
+
+	// Check we don't have it
+	inv, err := world.RoverInventory(a)
+	assert.NoError(t, err, "Failed to get inventory")
+	assert.Equal(t, rover.Capacity, len(inv))
+
+	// Check that this didn't reduce the charge
+	info, err := world.GetRover(a)
+	assert.NoError(t, err, "Failed to get rover")
+	assert.Equal(t, info.MaximumCharge, info.Charge, "Rover lost charge for non-stash")
+}
+
+func TestWorld_RoverDamage(t *testing.T) {
+	world := NewWorld(2)
+	a, err := world.SpawnRover()
+	assert.NoError(t, err)
+
+	pos := maths.Vector{
+		X: 0.0,
+		Y: 0.0,
+	}
+
+	err = world.WarpRover(a, pos)
+	assert.NoError(t, err, "Failed to set position for rover")
+
 	info, err := world.GetRover(a)
 	assert.NoError(t, err, "couldn't get rover info")
 
@@ -158,29 +227,69 @@ func TestWorld_RoverDamage(t *testing.T) {
 	assert.NoError(t, err, "couldn't get rover info")
 	assert.Equal(t, info.Integrity-1, newinfo.Integrity, "rover should have lost integrity")
 	assert.Contains(t, newinfo.Logs[len(newinfo.Logs)-1].Text, "collision", "Rover logs should contain the collision")
+}
 
-	// Keep moving to damage the rover
+func TestWorld_RoverRepair(t *testing.T) {
-	for i := 0; i < info.Integrity-1; i++ {
+	world := NewWorld(2)
-		vec, err := world.TryMoveRover(a, roveapi.Bearing_North)
+	a, err := world.SpawnRover()
-		assert.NoError(t, err, "Failed to move rover")
+	assert.NoError(t, err)
-		assert.Equal(t, pos, vec, "Rover managed to move into large rock")
+
+	pos := maths.Vector{
+		X: 0.0,
+		Y: 0.0,
 	}
 
-	// Tick the world to check for rover deaths
+	world.Atlas.SetObject(pos, Object{Type: roveapi.Object_ObjectUnknown})
-	world.Tick()
 
-	// Rover should have been destroyed now
+	err = world.WarpRover(a, pos)
-	_, err = world.GetRover(a)
+	assert.NoError(t, err, "Failed to set position for rover")
-	assert.Error(t, err)
 
-	_, obj := world.Atlas.QueryPosition(info.Pos)
+	originalInfo, err := world.GetRover(a)
-	assert.Equal(t, roveapi.Object_RoverDormant, obj.Type)
+	assert.NoError(t, err, "couldn't get rover info")
+
+	// Pick up something to repair with
+	world.Atlas.SetObject(pos, Object{Type: roveapi.Object_RockSmall})
+	o, err := world.RoverStash(a)
+	assert.NoError(t, err, "Failed to stash")
+	assert.Equal(t, roveapi.Object_RockSmall, o, "Failed to get correct object")
+
+	world.Atlas.SetObject(maths.Vector{X: 0.0, Y: 1.0}, Object{Type: roveapi.Object_RockLarge})
+
+	// Try and bump into the rock
+	vec, err := world.TryMoveRover(a, roveapi.Bearing_North)
+	assert.NoError(t, err, "Failed to move rover")
+	assert.Equal(t, pos, vec, "Rover managed to move into large rock")
+
+	newinfo, err := world.GetRover(a)
+	assert.NoError(t, err, "couldn't get rover info")
+	assert.Equal(t, originalInfo.Integrity-1, newinfo.Integrity, "rover should have lost integrity")
+
+	err = world.ExecuteCommand(&roveapi.Command{Command: roveapi.CommandType_repair}, a)
+	assert.NoError(t, err, "Failed to repair rover")
+
+	newinfo, err = world.GetRover(a)
+	assert.NoError(t, err, "couldn't get rover info")
+	assert.Equal(t, originalInfo.Integrity, newinfo.Integrity, "rover should have gained integrity")
+	assert.Contains(t, newinfo.Logs[len(newinfo.Logs)-1].Text, "repair", "Rover logs should contain the repair")
+
+	// Check again that it can't repair past the max
+	world.Atlas.SetObject(pos, Object{Type: roveapi.Object_RockSmall})
+	o, err = world.RoverStash(a)
+	assert.NoError(t, err, "Failed to stash")
+	assert.Equal(t, roveapi.Object_RockSmall, o, "Failed to get correct object")
+
+	err = world.ExecuteCommand(&roveapi.Command{Command: roveapi.CommandType_repair}, a)
+	assert.NoError(t, err, "Failed to repair rover")
+
+	newinfo, err = world.GetRover(a)
+	assert.NoError(t, err, "couldn't get rover info")
+	assert.Equal(t, originalInfo.Integrity, newinfo.Integrity, "rover should have kept the same integrity")
 }
 
 func TestWorld_Daytime(t *testing.T) {
 	world := NewWorld(1)
 
-	a, err := world.SpawnRover("")
+	a, err := world.SpawnRover()
 	assert.NoError(t, err)
 
 	// Remove rover charge
@@ -219,10 +328,10 @@ func TestWorld_Daytime(t *testing.T) {
 func TestWorld_Broadcast(t *testing.T) {
 	world := NewWorld(8)
 
-	a, err := world.SpawnRover("")
+	a, err := world.SpawnRover()
 	assert.NoError(t, err)
 
-	b, err := world.SpawnRover("")
+	b, err := world.SpawnRover()
 	assert.NoError(t, err)
 
 	// Warp rovers near to eachother
@@ -285,7 +394,7 @@ func TestWorld_Sailing(t *testing.T) {
 	world.Tick()                       // One initial tick to set the wind direction the first time
 	world.Wind = roveapi.Bearing_North // Set the wind direction to north
 
-	name, err := world.SpawnRover("")
+	name, err := world.SpawnRover()
 	assert.NoError(t, err)
 
 	// Warp the rover to 0,0 after clearing it
@@ -310,7 +419,7 @@ func TestWorld_Sailing(t *testing.T) {
 	assert.Equal(t, maths.Vector{Y: 0}, info.Pos)
 
 	// Loop a few more times
-	for i := 0; i < ticksPerNormalMove-2; i++ {
+	for i := 0; i < TicksPerNormalMove-2; i++ {
 		world.Tick()
 		info, err := world.GetRover(name)
 		assert.NoError(t, err)
@@ -332,7 +441,7 @@ func TestWorld_Sailing(t *testing.T) {
 	assert.Equal(t, roveapi.Bearing_South, b)
 
 	// Tick a bunch, we should never move
-	for i := 0; i < ticksPerNormalMove*2; i++ {
+	for i := 0; i < TicksPerNormalMove*2; i++ {
 		world.Tick()
 		info, err := world.GetRover(name)
 		assert.NoError(t, err)

pkg/rove/worldgen.go

@@ -1,6 +1,9 @@
 package rove
 
 import (
+	"encoding/json"
+	"log"
+
 	"github.com/mdiluz/rove/pkg/maths"
 	"github.com/mdiluz/rove/proto/roveapi"
 	"github.com/ojrac/opensimplex-go"
@@ -29,9 +32,8 @@ func NewNoiseWorldGen(seed int64) WorldGen {
 }
 
 const (
-	terrainNoiseScale = 15
+	terrainNoiseScale = 6
 	rockNoiseScale    = 3
-	partsNoiseScale   = 2
 )
 
 // GetTile returns the chosen tile at a location
@@ -49,22 +51,43 @@ func (g *NoiseWorldGen) GetTile(v maths.Vector) roveapi.Tile {
 
 // GetObject returns the chosen object at a location
 func (g *NoiseWorldGen) GetObject(v maths.Vector) (obj Object) {
-	r := g.noise.Eval2(float64(v.X)/rockNoiseScale, float64(v.Y)/rockNoiseScale)
+	o := g.noise.Eval2(float64(v.X)/rockNoiseScale, float64(v.Y)/rockNoiseScale)
 	switch {
-	// Prioritise rocks
+	case o > 0.6:
-	case r > 0.6:
 		obj.Type = roveapi.Object_RockLarge
-	case r > 0.5:
+	case o > 0.5:
 		obj.Type = roveapi.Object_RockSmall
+	}
 
-	default:
+	// Very rarely spawn a dormant rover
-		// Otherwise, try some rover parts
+	if obj.Type == roveapi.Object_ObjectUnknown {
-		p := g.noise.Eval2(float64(v.X)/partsNoiseScale, float64(v.Y)/partsNoiseScale)
+		// TODO: Make this better, ideally with noise
-		switch {
+		if v.X%25 == 0 && v.Y%25 == 0 && v.X != 0 && v.Y != 0 {
-		case p > 0.7:
+			obj.Type = roveapi.Object_RoverDormant
-			obj.Type = roveapi.Object_RoverParts
 		}
 	}
 
+	// Post process any spawned objects
+	switch obj.Type {
+	case roveapi.Object_RoverDormant:
+		// Create the rover
+		r := DefaultRover()
+
+		// Set the rover variables
+		r.Pos = v
+
+		// For now, mark the log as corrupted
+		r.AddLogEntryf("log corrupted")
+
+		// Marshal the rover data into the object data
+		b, err := json.Marshal(r)
+		if err != nil {
+			log.Fatalf("couldn't marshal rover, should never fail: %s", err)
+		}
+
+		// Store the bytes
+		obj.Data = b
+	}
+
 	return obj
 }

proto/roveapi/roveapi.proto

@@ -89,24 +89,16 @@ message RegisterResponse {
 // CommandType defines the type of a command to give to the rover
 enum CommandType {
   none = 0;
-  // Waits before performing the next command
-  wait = 1;
   // Toggles the sails, either catching the wind, or charging from the sun
-  toggle = 2;
+  toggle = 1;
-  // Turns the rover in the specified bearing (requires bearing)
+  // Turns the rover in the specified bearing, requires data
-  turn = 3;
+  turn = 2;
   // Stashes item at current location in rover inventory
-  stash = 4;
+  stash = 3;
   // Repairs the rover using an inventory object
-  repair = 5;
+  repair = 4;
-  // Broadcasts a message to nearby rovers (requires data)
+  // Broadcasts a message to nearby rovers, requires data
-  broadcast = 6;
+  broadcast = 5;
-  // Salvages a neighboring dormant rover for parts
-  salvage = 7;
-  // Transfers remote control into dormant rover
-  transfer = 8;
-  // Upgrades a chosen rover specification using 5 rover parts
-  upgrade = 9;
 }
 
 // Bearing represents a compass direction
@@ -123,32 +115,17 @@ enum Bearing {
   NorthWest = 8;
 }
 
-// Describes the type of upgrade
-enum RoverUpgrade {
-  RoverUpgradeUnknown = 0;
-  Range = 1;
-  Capacity = 2;
-  MaximumIntegrity = 3;
-  MaximumCharge = 4;
-}
-
 // Command is a single command for a rover
 message Command {
   // The command type
   CommandType command = 1;
 
-  // The number of times to repeat the command after the first
+  // A simple message, must be composed of printable ASCII glyphs (32-126)
-  int32 repeat = 2;
+  // maximum of three characters
+  bytes broadcast = 2;
 
-  // broadcast - a simple message, must be composed of up to 3 printable ASCII
+  // The bearing for the rover to turn to
-  // glyphs (32-126)
+  Bearing turn = 3;
-  bytes data = 3;
-
-  // move - the bearing for the rover to turn to
-  Bearing bearing = 4;
-
-  // upgrade - the upgrade to apply to the rover
-  RoverUpgrade upgrade = 5;
 }
 
 // CommandRequest describes a set of commands to be requested for the rover
@@ -183,10 +160,6 @@ enum Object {
 
   // RockLarge is a large blocking rock
   RockLarge = 4;
-
-  // RoverParts is one unit of rover parts, used for repairing and fixing the
-  // rover
-  RoverParts = 5;
 }
 
 enum Tile {
@@ -258,65 +231,47 @@ enum SailPosition {
   SolarCharging = 2;
 }
 
-message RoverSpecifications {
+// StatusResponse is the response given to a status request
-
+message StatusResponse {
   // The name of the rover
   string name = 1;
 
-  // The range of this rover's radar and broadcasting
+  // Position of the rover in world coordinates
-  int32 range = 2;
+  Vector position = 2;
-
-  // The capacity of the inventory
-  int32 capacity = 3;
-
-  // The maximum health of the rover
-  int32 maximumIntegrity = 4;
-
-  // The max energy the rover can store
-  int32 maximumCharge = 5;
-}
-
-message RoverStatus {
 
   // The current direction of the rover
-  Bearing bearing = 1;
+  Bearing bearing = 3;
 
-  // The current position of the sails
+  // The range of this rover's radar and broadcasting
-  SailPosition sailPosition = 2;
+  int32 range = 4;
 
   // The items in the rover inventory
-  bytes inventory = 3;
+  bytes inventory = 5;
+
+  // The capacity of the inventory
+  int32 capacity = 6;
 
   // The current health of the rover
-  int32 integrity = 4;
+  int32 integrity = 7;
+
+  // The maximum health of the rover
+  int32 maximumIntegrity = 8;
 
   // The energy stored in the rover
-  int32 charge = 5;
+  int32 charge = 9;
+
+  // The max energy the rover can store
+  int32 maximumCharge = 10;
+
+  // The current position of the sails
+  SailPosition sailPosition = 11;
 
   // The set of currently queued commands
-  repeated Command queuedCommands = 6;
+  repeated Command queuedCommands = 12;
-}
-
-message RoverReadings {
-  // Position of the rover in world coordinates
-  Vector position = 1;
-
-  // The current wind direction
-  Bearing wind = 2;
 
   // The most recent logs
-  repeated Log logs = 3;
+  repeated Log logs = 13;
-}
+
-
+  // The current wind direction
-// StatusResponse is the response given to a status request
+  Bearing wind = 14;
-message StatusResponse {
-
-  // The static rover information
-  RoverSpecifications spec = 1;
-
-  // Current rover status
-  RoverStatus status = 2;
-
-  // Current rover readings
-  RoverReadings readings = 3;
 }