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

Fix tests after rover change

Browse source
This commit is contained in:
Marc Di Luzio 2020-06-25 23:51:31 +01:00
parent f0f5a6b2e0
commit 93b99b7989
4 changed files with 23 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

9
pkg/game/world.go
View file

@ -110,7 +110,7 @@ func (w *World) SpawnRover() (uuid.UUID, error) {
if tile, err := w.Atlas.GetTile(rover.Attributes.Pos); err != nil {
return uuid.Nil, err
} else {
if tile == atlas.TileEmpty {
if !atlas.IsBlocking(tile) {
break
} else {
// Try and spawn to the east of the blockage
@ -278,7 +278,10 @@ func (w *World) RadarFromRover(id uuid.UUID) ([]byte, error) {
// Add all rovers to the radar
for _, r := range w.Rovers {
// If the rover is in range
if r.Attributes.Pos.Distance(roverPos) < float64(radarSpan) {
dist := r.Attributes.Pos.Added(roverPos.Negated())
dist = dist.Abs()
if dist.X <= r.Attributes.Range && dist.Y <= r.Attributes.Range {
relative := r.Attributes.Pos.Added(radarMin.Negated())
index := relative.X + relative.Y*radarSpan
radar[index] = atlas.TileRover
@ -400,7 +403,7 @@ func PrintTiles(tiles []byte) {
num := int(math.Sqrt(float64(len(tiles))))
for j := num - 1; j >= 0; j-- {
for i := 0; i < num; i++ {
fmt.Printf("%d", tiles[i+num*j])
fmt.Printf("%c", tiles[i+num*j])
}
fmt.Print("\n")
}