From c8913c563e64538f5a3340f805b1d2f395450d35 Mon Sep 17 00:00:00 2001 From: Fraser Graham Date: Tue, 5 Nov 2013 23:21:41 -0800 Subject: [PATCH] I may have fixed some collision issues (badly) --- player.go | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/player.go b/player.go index 5bf93f9..6f434af 100644 --- a/player.go +++ b/player.go @@ -145,9 +145,10 @@ func (p *player) Tick(g *game) { hit_player.Robot.Speed = (hit_player.Robot.Speed * 0.1) hit_player.Robot.Heading = p.Robot.Heading } - move_by := intersection_point.Sub(p.Robot.Position).Scale(0.9) + move_by := intersection_point.Sub(p.Robot.Position) + move_dist := move_by.Scale(float32(math.Floor(float64(move_by.Mag()-3.0))) / move_by.Mag()) - p.Robot.Position = p.Robot.Position.Add(move_by) + p.Robot.Position = p.Robot.Position.Add(move_dist) p.Robot.Health -= int(p.Robot.Speed / 10.0) p.Robot.MoveTo = &p.Robot.Position p.Robot.Speed = (p.Robot.Speed * 0.1)