diff --git a/botserv.go b/botserv.go index 236c28c..724fb82 100644 --- a/botserv.go +++ b/botserv.go @@ -58,12 +58,13 @@ type Robot struct { FireAt *govector.Point2d `json:"-"` Scanners []Scanner `json:"scanners"` LastFired int `json:"-"` - Collision bool `json:"collision"` + Collision *Collision `json:"collision"` Hit bool `json:"hit"` Probe *govector.Point2d `json:"probe"` - ProbeResult *ProbeResult `json:"probe_result"` + ProbeResult *Collision `json:"probe_result"` } -type ProbeResult struct { + +type Collision struct { govector.Point2d Type string `json:"type"` } diff --git a/robot.go b/robot.go index f2fb389..7d456d8 100644 --- a/robot.go +++ b/robot.go @@ -274,10 +274,10 @@ func (r *robot) navigate() { return } } - if r.me.Collision { + if r.me.Collision != nil { // XXX: I am being told I am here ... if *verbose { - log.Printf("%s apparent collision", r.name) + log.Printf("%s apparent collision: %#v", r.name, r.me.Collision) } r.moveto = r.randomDirection() r.speed = 0