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

Stop movement into non-empty tiles

Browse source
This commit is contained in:
Marc Di Luzio 2020-06-07 19:03:16 +01:00
parent 3781a4d10d
commit fc54775df9
2 changed files with 17 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

15
pkg/game/world.go
View file

@ -124,13 +124,18 @@ func (w *World) MoveRover(id uuid.UUID, bearing Direction) (RoverAttributes, err
// Calculate the full movement based on the bearing
move := bearing.Vector().Multiplied(distance)
// TODO: Verify there's nothing blocking this movement
// Try the new move position
newPos := i.Attributes.Pos.Added(move)
// Increment the position by the movement
i.Attributes.Pos.Add(move)
// Get the tile and verify it's empty
if tile, err := w.Atlas.GetTile(newPos); err != nil {
return i.Attributes, fmt.Errorf("couldn't get tile for new position")
} else if tile == TileEmpty {
// Perform the move
i.Attributes.Pos = newPos
w.Rovers[id] = i
}
// Set the rover values to the new ones
w.Rovers[id] = i
return i.Attributes, nil
} else {
return RoverAttributes{}, fmt.Errorf("no rover matching id")