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

Refactor so Rover's aren't in the atlas

Browse source
This commit is contained in:
Marc Di Luzio 2020-06-25 23:27:07 +01:00
parent ccd9e13c51
commit 5c12fabb63
5 changed files with 51 additions and 43 deletions
Download patch file Download diff file Expand all files Collapse all files

10
pkg/atlas/atlas.go
View file

@ -58,7 +58,7 @@ func (a *Atlas) SpawnRocks() error {
for i := -extent; i < extent; i++ {
for j := -extent; j < extent; j++ {
if rand.Intn(16) == 0 {
if err := a.SetTile(vector.Vector{X: i, Y: j}, TileRock); err != nil {
if err := a.SetTile(vector.Vector{X: i, Y: j}, TileSmallRock); err != nil {
return err
}
}
@ -75,13 +75,13 @@ func (a *Atlas) SpawnWalls() error {
// Surround the atlas in walls
for i := -extent; i < extent; i++ {
if err := a.SetTile(vector.Vector{X: i, Y: extent - 1}, TileWall); err != nil { // N
if err := a.SetTile(vector.Vector{X: i, Y: extent - 1}, TileLargeRock); err != nil { // N
return err
} else if err := a.SetTile(vector.Vector{X: extent - 1, Y: i}, TileWall); err != nil { // E
} else if err := a.SetTile(vector.Vector{X: extent - 1, Y: i}, TileLargeRock); err != nil { // E
return err
} else if err := a.SetTile(vector.Vector{X: i, Y: -extent}, TileWall); err != nil { // S
} else if err := a.SetTile(vector.Vector{X: i, Y: -extent}, TileLargeRock); err != nil { // S
return err
} else if err := a.SetTile(vector.Vector{X: -extent, Y: i}, TileWall); err != nil { // W
} else if err := a.SetTile(vector.Vector{X: -extent, Y: i}, TileLargeRock); err != nil { // W
return err
}
}

8
pkg/atlas/atlas_test.go
View file

@ -146,24 +146,24 @@ func TestAtlas_SpawnWorld(t *testing.T) {
for i := -4; i < 4; i++ {
tile, err := a.GetTile(vector.Vector{X: i, Y: -4})
assert.NoError(t, err)
assert.Equal(t, TileWall, tile)
assert.Equal(t, TileLargeRock, tile)
}
for i := -4; i < 4; i++ {
tile, err := a.GetTile(vector.Vector{X: -4, Y: i})
assert.NoError(t, err)
assert.Equal(t, TileWall, tile)
assert.Equal(t, TileLargeRock, tile)
}
for i := -4; i < 4; i++ {
tile, err := a.GetTile(vector.Vector{X: 3, Y: i})
assert.NoError(t, err)
assert.Equal(t, TileWall, tile)
assert.Equal(t, TileLargeRock, tile)
}
for i := -4; i < 4; i++ {
tile, err := a.GetTile(vector.Vector{X: i, Y: 3})
assert.NoError(t, err)
assert.Equal(t, TileWall, tile)
assert.Equal(t, TileLargeRock, tile)
}
}

24
pkg/atlas/tile.go
View file

@ -1,9 +1,23 @@
package atlas
const (
TileEmpty = byte(0)
TileRover = byte(1)
TileWall = byte(2)
TileRock = byte(3)
TileEmpty = byte(' ')
TileRover = byte('R')
TileSmallRock = byte('o')
TileLargeRock = byte('O')
)
// BlockingTiles describes any tiles that block
var BlockingTiles = [...]byte{
TileLargeRock,
}
// Check if a tile is a blocking tile
func IsBlocking(tile byte) bool {
for _, t := range BlockingTiles {
if tile == t {
return true
}
}
return false
}