Implement optional race timeout

Author: juho05

events.cge

@@ -12,7 +12,7 @@ config {
 	max_velocity: float,
 	// The amount of checkpoints per game. default = 10
 	checkpoint_count: int,
-	// The time in milliseconds that a game is allowed to last. default = infinite
+	// The time in seconds that a game is allowed to last. default = infinite
 	timeout: int
 }
 
@@ -71,8 +71,8 @@ event finished_players {
 	players: list<finished_player>
 }
 
-// The `game_over` event is sent when all players finished the game or the time runs out.
-event game_over {
+// The `race_over` event is sent when all players finished the game or the time runs out.
+event race_over {
 	// The players that have finished the game before the time ran out.
 	finished_players: list<finished_player>,
 	// The IDs of the players that have not finished the game before the time ran out.

hoverrace/event_definitions.go

@@ -13,7 +13,7 @@ type GameConfig struct {
 	MaxVelocity float64 `json:"max_velocity"`
 	// The amount of checkpoints per game. default = 10
 	CheckpointCount int `json:"checkpoint_count"`
-	// The time in milliseconds that a game is allowed to last. default = infinite
+	// The time in seconds that a game is allowed to last. default = infinite
 	Timeout int `json:"timeout"`
 }
 
@@ -93,10 +93,10 @@ type FinishedPlayersEventData struct {
 	Players []FinishedPlayer `json:"players"`
 }
 
-// The `game_over` event is sent when all players finished the game or the time runs out.
-const GameOverEvent cg.EventName = "game_over"
+// The `race_over` event is sent when all players finished the game or the time runs out.
+const RaceOverEvent cg.EventName = "race_over"
 
-type GameOverEventData struct {
+type RaceOverEventData struct {
 	// The players that have finished the game before the time ran out.
 	FinishedPlayers []FinishedPlayer `json:"finished_players"`
 	// The IDs of the players that have not finished the game before the time ran out.

hoverrace/game.go

@@ -50,10 +50,10 @@ func (g *Game) Run() {
 			g.handleCommand(cmd.Origin, cmd.Cmd)
 		}
 		g.update(deltaTime)
-		time.Sleep(targetFrameTime - time.Now().Sub(frameStart))
+		time.Sleep(targetFrameTime - time.Since(frameStart))
+		deltaTime = time.Since(frameStart)
 
-		deltaTime = time.Now().Sub(frameStart)
-		// waited for countdown
+		// correct time after waiting for countdown
 		if deltaTime >= 5*time.Second {
 			deltaTime = targetFrameTime
 		}
@@ -204,6 +204,10 @@ func (g *Game) update(delta time.Duration) {
 		Hovercrafts: g.hovercrafts,
 		Time:        time.Now().UnixMilli(),
 	})
+
+	if g.running && g.config.Timeout > 0 && time.Since(g.startTime) > time.Duration(g.config.Timeout)*time.Second {
+		g.finish()
+	}
 }
 
 func (g *Game) handleCommand(origin *cg.Player, cmd cg.Command) {
@@ -320,6 +324,17 @@ func (g *Game) positionHovercrafts() {
 }
 
 func (g *Game) finish() {
+	unfinishedPlayers := make([]string, 0)
+	for _, p := range g.players {
+		if !p.finished {
+			unfinishedPlayers = append(unfinishedPlayers, p.id)
+		}
+		p.finished = true
+	}
+	g.cg.Send(RaceOverEvent, RaceOverEventData{
+		FinishedPlayers:   g.finishedPlayers,
+		UnfinishedPlayers: unfinishedPlayers,
+	})
 	g.running = false
 	g.checkpoints = g.checkpoints[:0]
 }