mdiluz/rove
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

More de-scope - remove duration on move command

Browse source 
This isn't even needed, as commands can just be queued up
This commit is contained in:
Marc Di Luzio 2020-06-26 22:26:27 +01:00
parent 383e834cef
commit 2f6465987d
10 changed files with 97 additions and 134 deletions
Download patch file Download diff file Expand all files Collapse all files

33
pkg/game/world.go
View file

@ -396,19 +396,14 @@ func (w *World) ExecuteCommandQueues() {
if len(cmds) != 0 {
// Extract the first command in the queue
c := cmds[0]
w.CommandQueue[rover] = cmds[1:]
// Execute the command and clear up if requested
if done, err := w.ExecuteCommand(&c, rover); err != nil {
w.CommandQueue[rover] = cmds[1:]
// Execute the command
if err := w.ExecuteCommand(&c, rover); err != nil {
log.Println(err)
} else if done {
w.CommandQueue[rover] = cmds[1:]
} else {
w.CommandQueue[rover][0] = c
// TODO: Report this error somehow
}
// If there was an error
} else {
// Clean out the empty entry
delete(w.CommandQueue, rover)
@ -420,36 +415,26 @@ func (w *World) ExecuteCommandQueues() {
}
// ExecuteCommand will execute a single command
func (w *World) ExecuteCommand(c *Command, rover uuid.UUID) (finished bool, err error) {
func (w *World) ExecuteCommand(c *Command, rover uuid.UUID) (err error) {
log.Printf("Executing command: %+v\n", *c)
switch c.Command {
case CommandMove:
if dir, err := bearing.FromString(c.Bearing); err != nil {
return true, err
return err
} else if _, err := w.MoveRover(rover, dir); err != nil {
return true, err
return err
} else {
// If we've successfully moved, reduce the duration by 1
c.Duration -= 1
// If we've used up the full duration, remove it, otherwise update
if c.Duration == 0 {
finished = true
}
}
case CommandStash:
if _, err := w.RoverStash(rover); err != nil {
return true, err
} else {
return true, nil
return err
}
default:
return true, fmt.Errorf("unknown command: %s", c.Command)
return fmt.Errorf("unknown command: %s", c.Command)
}
return