Automatically break after crossing the finish line

Author: juho05

events.cge

@@ -68,8 +68,9 @@ type hovercraft {
 }
 
 // One unit equals the width of the hovercrafts and checkpoints.
-// The origin is in the bottom left corner.
 type vec {
+	// left to right
 	x: float,
+	// bottom to top
 	y: float
 }

hoverrace/game.go

@@ -113,10 +113,6 @@ func (g *Game) onPlayerSocketConnected(player *cg.Player, socket *cg.Socket) {
 }
 
 func (g *Game) update(delta time.Duration) {
-	if !g.running {
-		return
-	}
-
 	for _, player := range g.players {
 		player.update(delta)
 	}
@@ -151,10 +147,6 @@ func (g *Game) handleReady(playerId string) {
 
 	player.ready = true
 
-	if len(g.players) < 2 {
-		return
-	}
-
 	readyPlayers := make([]string, 0, len(g.players))
 	for _, p := range g.players {
 		if p.ready {
@@ -190,14 +182,23 @@ func (g *Game) start() {
 	g.finishedPlayers = 0
 	g.createCheckpoints()
 
+	x := 0.0
+	i := 0
 	for _, player := range g.players {
+		player.finished = false
 		player.checkpoints = make([]Vec, len(g.checkpoints))
 		copy(player.checkpoints, g.checkpoints)
 
 		player.pos = Vec{
-			X: 10,
-			Y: 1,
+			X: x,
+			Y: 0,
 		}
+		if i%2 != 0 {
+			player.pos.X = -x
+		}
+
+		x += 1.5
+		i++
 	}
 
 	g.cg.Send("server", CheckpointsEvent, CheckpointsEventData{
@@ -220,7 +221,7 @@ func (g *Game) start() {
 
 func (g *Game) finish() {
 	for _, player := range g.players {
-		player.reset()
+		player.ready = false
 	}
 	g.running = false
 }

hoverrace/player.go

@@ -83,10 +83,11 @@ func (p *Player) move(delta time.Duration) {
 
 		if p.vel.MagnitudeSquared() != 0 {
 			velMag := p.vel.Magnitude()
+
 			p.acc = Vec{
 				X: -p.vel.X / velMag,
 				Y: -p.vel.Y / velMag,
-			}.Mul(math.Max(maxAcceleration, math.Abs(velMag)))
+			}.Mul(math.Min(maxAcceleration, math.Abs(velMag)))
 		}
 
 		if p.vel.MagnitudeSquared() < 0.01 {
@@ -101,7 +102,7 @@ func (p *Player) move(delta time.Duration) {
 }
 
 func (p *Player) checkCollisions() {
-	if p.finished {
+	if !p.game.running || p.finished {
 		return
 	}
 
@@ -140,8 +141,3 @@ outer:
 		}
 	}
 }
-
-func (p *Player) reset() {
-	p.ready = false
-	p.finished = false
-}