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

Fix up the concept of "None" tiles and objects

Browse source 
Replace with "Unknown" which is effectively an invalid value
This commit is contained in:
Marc Di Luzio 2020-07-19 12:33:11 +01:00
parent 305f64ec38
commit 7bdfa44fb6
10 changed files with 72 additions and 87 deletions
Download patch file Download diff file Expand all files Collapse all files

4
pkg/atlas/atlas.go
View file

@ -10,8 +10,6 @@ import (
// TileGlyph returns the glyph for this tile type
func TileGlyph(t roveapi.Tile) Glyph {
switch t {
case roveapi.Tile_TileNone:
return GlyphNone
case roveapi.Tile_Rock:
return GlyphGroundRock
case roveapi.Tile_Gravel:
@ -21,7 +19,7 @@ func TileGlyph(t roveapi.Tile) Glyph {
}
log.Fatalf("Unknown tile type: %c", t)
return GlyphNone
return 0
}
// Atlas represents a 2D world atlas of tiles and objects

6
pkg/atlas/atlas_test.go
View file

@ -260,12 +260,10 @@ func TestAtlas_WorldGen(t *testing.T) {
for j := num - 1; j >= 0; j-- {
for i := 0; i < num; i++ {
t, o := a.QueryPosition(maths.Vector{X: i, Y: j})
if o.Type != roveapi.Object_ObjectNone {
if o.Type != roveapi.Object_ObjectUnknown {
fmt.Printf("%c", ObjectGlyph(o.Type))
} else if t != roveapi.Tile_TileNone {
fmt.Printf("%c", TileGlyph(t))
} else {
fmt.Printf(" ")
fmt.Printf("%c", TileGlyph(t))
}
}

6
pkg/atlas/chunkAtlas.go
View file

@ -121,14 +121,14 @@ func (a *chunkBasedAtlas) populate(chunk int) {
// Get the object noise value for this location
o := a.objectNoise.Eval2(float64(origin.X+i)/objectNoiseScale, float64(origin.Y+j)/objectNoiseScale)
var obj = roveapi.Object_ObjectNone
var obj = roveapi.Object_ObjectUnknown
switch {
case o > 0.6:
obj = roveapi.Object_RockLarge
case o > 0.5:
obj = roveapi.Object_RockSmall
}
if obj != roveapi.Object_ObjectNone {
if obj != roveapi.Object_ObjectUnknown {
c.Objects[j*a.ChunkSize+i] = Object{Type: roveapi.Object(obj)}
}
}
@ -160,7 +160,7 @@ func (a *chunkBasedAtlas) setObject(chunk int, local maths.Vector, object Object
c := a.Chunks[chunk]
i := a.chunkTileIndex(local)
if object.Type != roveapi.Object_ObjectNone {
if object.Type != roveapi.Object_ObjectUnknown {
c.Objects[i] = object
} else {
delete(c.Objects, i)

3
pkg/atlas/glyph.go
View file

@ -4,9 +4,6 @@ package atlas
type Glyph byte
const (
// GlyphNone is a keyword for nothing
GlyphNone = Glyph(0)
// GlyphGroundRock is solid rock ground
GlyphGroundRock = Glyph('-')

4
pkg/atlas/objects.go
View file

@ -9,8 +9,6 @@ import (
// ObjectGlyph returns the glyph for this object type
func ObjectGlyph(o roveapi.Object) Glyph {
switch o {
case roveapi.Object_ObjectNone:
return GlyphNone
case roveapi.Object_RoverLive:
return GlyphRoverLive
case roveapi.Object_RockSmall:
@ -20,7 +18,7 @@ func ObjectGlyph(o roveapi.Object) Glyph {
}
log.Fatalf("Unknown object type: %c", o)
return GlyphNone
return 0
}
// Object represents an object in the world

10
pkg/rove/world.go
View file

@ -324,29 +324,29 @@ func (w *World) RoverStash(rover string) (roveapi.Object, error) {
r, ok := w.Rovers[rover]
if !ok {
return roveapi.Object_ObjectNone, fmt.Errorf("no rover matching id")
return roveapi.Object_ObjectUnknown, fmt.Errorf("no rover matching id")
}
// Can't pick up when full
if len(r.Inventory) >= r.Capacity {
return roveapi.Object_ObjectNone, nil
return roveapi.Object_ObjectUnknown, nil
}
// Ensure the rover has energy
if r.Charge <= 0 {
return roveapi.Object_ObjectNone, nil
return roveapi.Object_ObjectUnknown, nil
}
r.Charge--
_, obj := w.Atlas.QueryPosition(r.Pos)
if !obj.IsStashable() {
return roveapi.Object_ObjectNone, nil
return roveapi.Object_ObjectUnknown, nil
}
r.AddLogEntryf("stashed %c", obj.Type)
r.Inventory = append(r.Inventory, obj)
w.Rovers[rover] = r
w.Atlas.SetObject(r.Pos, atlas.Object{Type: roveapi.Object_ObjectNone})
w.Atlas.SetObject(r.Pos, atlas.Object{Type: roveapi.Object_ObjectUnknown})
return obj.Type, nil
}

18
pkg/rove/world_test.go
View file

@ -142,13 +142,10 @@ func TestWorld_RoverStash(t *testing.T) {
Y: 0.0,
}
world.Atlas.SetObject(pos, atlas.Object{Type: roveapi.Object_ObjectNone})
world.Atlas.SetObject(pos, atlas.Object{Type: roveapi.Object_ObjectUnknown})
err = world.WarpRover(a, pos)
assert.NoError(t, err, "Failed to set position for rover")
// Set to a traversible tile
world.Atlas.SetTile(pos, roveapi.Tile_TileNone)
rover, err := world.GetRover(a)
assert.NoError(t, err, "Failed to get rover")
@ -163,7 +160,7 @@ func TestWorld_RoverStash(t *testing.T) {
// Check it's gone
_, obj := world.Atlas.QueryPosition(pos)
assert.Equal(t, roveapi.Object_ObjectNone, obj.Type, "Stash failed to remove object from atlas")
assert.Equal(t, roveapi.Object_ObjectUnknown, obj.Type, "Stash failed to remove object from atlas")
// Check we have it
inv, err := world.RoverInventory(a)
@ -191,7 +188,7 @@ func TestWorld_RoverStash(t *testing.T) {
// Try to pick it up
o, err := world.RoverStash(a)
assert.NoError(t, err, "Failed to stash")
assert.Equal(t, roveapi.Object_ObjectNone, o, "Failed to get correct object")
assert.Equal(t, roveapi.Object_ObjectUnknown, o, "Failed to get correct object")
// Check it's still there
_, obj := world.Atlas.QueryPosition(pos)
@ -246,8 +243,7 @@ func TestWorld_RoverRepair(t *testing.T) {
Y: 0.0,
}
world.Atlas.SetTile(pos, roveapi.Tile_TileNone)
world.Atlas.SetObject(pos, atlas.Object{Type: roveapi.Object_ObjectNone})
world.Atlas.SetObject(pos, atlas.Object{Type: roveapi.Object_ObjectUnknown})
err = world.WarpRover(a, pos)
assert.NoError(t, err, "Failed to set position for rover")
@ -312,7 +308,7 @@ func TestWorld_Charge(t *testing.T) {
// Ensure the path ahead is empty
world.Atlas.SetTile(initialPos.Added(maths.North.Vector()), roveapi.Tile_Rock)
world.Atlas.SetObject(initialPos.Added(maths.North.Vector()), atlas.Object{Type: roveapi.Object_ObjectNone})
world.Atlas.SetObject(initialPos.Added(maths.North.Vector()), atlas.Object{Type: roveapi.Object_ObjectUnknown})
// Try and move north (along unblocked path)
newPos, err := world.MoveRover(a, maths.North)
@ -394,7 +390,7 @@ func TestWorld_Broadcast(t *testing.T) {
assert.Contains(t, rb.Logs[len(rb.Logs)-1].Text, "ABC", "Rover A should have logged it's broadcast")
// Warp B outside of the range of A
world.Atlas.SetObject(maths.Vector{X: ra.Range, Y: 0}, atlas.Object{Type: roveapi.Object_ObjectNone})
world.Atlas.SetObject(maths.Vector{X: ra.Range, Y: 0}, atlas.Object{Type: roveapi.Object_ObjectUnknown})
assert.NoError(t, world.WarpRover(b, maths.Vector{X: ra.Range, Y: 0}))
// Broadcast from a again
@ -411,7 +407,7 @@ func TestWorld_Broadcast(t *testing.T) {
assert.Contains(t, rb.Logs[len(rb.Logs)-1].Text, "XYZ", "Rover A should have logged it's broadcast")
// Warp B outside of the range of A
world.Atlas.SetObject(maths.Vector{X: ra.Range + 1, Y: 0}, atlas.Object{Type: roveapi.Object_ObjectNone})
world.Atlas.SetObject(maths.Vector{X: ra.Range + 1, Y: 0}, atlas.Object{Type: roveapi.Object_ObjectUnknown})
assert.NoError(t, world.WarpRover(b, maths.Vector{X: ra.Range + 1, Y: 0}))
// Broadcast from a again