Rename throttle command to control

Author: juho05

events.cge

@@ -2,7 +2,7 @@ name hoverrace
 version 0.4
 
 config {
-	// The speed at which the throttle reacts to user input. default = 1
+	// The speed at which the thrust level reacts to user input. default = 1
 	throttle_speed: float,
 	// The speed at which hovercrafts turn. default = 220
 	turn_speed: float,
@@ -11,18 +11,20 @@ config {
 	// The maximum velocity of hovercrafts. default = 20
 	max_velocity: float,
 	// The amount of checkpoints per game. default = 10
-	checkpoint_count: int
+	checkpoint_count: int,
+	// The time in milliseconds that a game is allowed to last. default = infinite
+	timeout: int
 }
 
 // Send the `ready` command to the server when you think the game should begin.
 command ready {}
 
-// The `throttle` command allows you to change your throttle level and direction.
+// The `control` command allows you to change your throttle level and direction.
 // **NOTE:** These values are targets. The hovercraft needs some time to reach the desired values.
-command throttle {
-	// Throttle level between -1 - 1.
-	level: float,
-	// The angle in degrees the hovercraft should be facing (up = 0°).
+command control {
+	// Thrust level between -1 and 1.
+	thrust: float,
+	// The angle in degrees the hovercraft should be facing (right = 0°).
 	angle: float
 }
 
@@ -69,14 +71,22 @@ 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 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.
+	unfinished_players: list<string>
+}
+
 // A hovercraft is a circle with a diameter of 1 unit.
 type hovercraft {
 	// The position of the center of the hovercraft.
 	pos: vec,
 	// The current velocity of the hovercraft.
 	velocity: vec,
-	// The current throttle of the hovercraft.
-	throttle: float64,
+	// The current thrust level of the hovercraft.
+	thrust: float64,
 	// The angle in degrees the hovercraft is facing (up = 0°).
 	angle: float,
 	// The amount of reached checkpoints.

hoverrace/event_definitions.go

@@ -3,7 +3,7 @@ package hoverrace
 import "github.com/code-game-project/go-server/cg"
 
 type GameConfig struct {
-	// The speed at which the throttle reacts to user input. default = 1
+	// The speed at which the thrust level reacts to user input. default = 1
 	ThrottleSpeed float64 `json:"throttle_speed"`
 	// The speed at which hovercrafts turn. default = 220
 	TurnSpeed float64 `json:"turn_speed"`
@@ -13,34 +13,39 @@ 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
+	Timeout int `json:"timeout"`
 }
 
 // Send the `ready` command to the server when you think the game should begin.
 const ReadyCmd cg.CommandName = "ready"
 
-type ReadyCmdData struct{}
+type ReadyCmdData struct {
+}
 
-// The `throttle` command allows you to change your throttle level and direction.
+// The `control` command allows you to change your throttle level and direction.
 // **NOTE:** These values are targets. The hovercraft needs some time to reach the desired values.
-const ThrottleCmd cg.CommandName = "throttle"
+const ControlCmd cg.CommandName = "control"
 
-type ThrottleCmdData struct {
-	// Throttle level between -1 - 1.
-	Level float64 `json:"level"`
-	// The angle in degrees the hovercraft should be facing (up = 0°).
+type ControlCmdData struct {
+	// Thrust level between -1 and 1.
+	Thrust float64 `json:"thrust"`
+	// The angle in degrees the hovercraft should be facing (right = 0°).
 	Angle float64 `json:"angle"`
 }
 
 // The `start` event is sent when the race begins.
 // The game begins once at least 2 players have joined and all players have sent the `ready` event.
 const StartEvent cg.EventName = "start"
 
-type StartEventData struct{}
+type StartEventData struct {
+}
 
 // The `in_progress` event is sent to sockets which connect to the game while it's running.
 const InProgressEvent cg.EventName = "in_progress"
 
-type InProgressEventData struct{}
+type InProgressEventData struct {
+}
 
 // The `countdown` counts down from 5. When the value reaches 0 a `start` event will be sent instead of the `countdown` event.
 const CountdownEvent cg.EventName = "countdown"
@@ -88,14 +93,24 @@ 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"
+
+type GameOverEventData 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.
+	UnfinishedPlayers []string `json:"unfinished_players"`
+}
+
 // A hovercraft is a circle with a diameter of 1 unit.
 type Hovercraft struct {
 	// The position of the center of the hovercraft.
 	Pos Vec `json:"pos"`
 	// The current velocity of the hovercraft.
 	Velocity Vec `json:"velocity"`
-	// The current throttle of the hovercraft.
-	Throttle float64 `json:"throttle"`
+	// The current thrust level of the hovercraft.
+	Thrust float64 `json:"thrust"`
 	// The angle in degrees the hovercraft is facing (up = 0°).
 	Angle float64 `json:"angle"`
 	// The amount of reached checkpoints.

hoverrace/game.go

@@ -98,6 +98,9 @@ func (g *Game) onPlayerLeft(player *cg.Player) {
 		return
 	}
 
+	delete(g.players, player.Id)
+	delete(g.hovercrafts, player.Id)
+
 	if !g.running {
 		g.positionHovercrafts()
 		for _, p := range g.players {
@@ -207,8 +210,8 @@ func (g *Game) handleCommand(origin *cg.Player, cmd cg.Command) {
 	switch cmd.Name {
 	case ReadyCmd:
 		g.handleReady(origin.Id)
-	case ThrottleCmd:
-		g.handleThrottle(origin.Id, cmd)
+	case ControlCmd:
+		g.handleControl(origin.Id, cmd)
 	default:
 		origin.Log.ErrorData(cmd, fmt.Sprintf("unexpected command: %s", cmd.Name))
 	}
@@ -239,24 +242,24 @@ func (g *Game) handleReady(playerId string) {
 	}
 }
 
-func (g *Game) handleThrottle(playerId string, cmd cg.Command) {
+func (g *Game) handleControl(playerId string, cmd cg.Command) {
 	if !g.running {
 		return
 	}
 
-	var data ThrottleCmdData
+	var data ControlCmdData
 	cmd.UnmarshalData(&data)
 
-	if data.Level > 1 {
-		data.Level = 1
-	} else if data.Level < -1 {
-		data.Level = -1
+	if data.Thrust > 1 {
+		data.Thrust = 1
+	} else if data.Thrust < -1 {
+		data.Thrust = -1
 	}
 
 	data.Angle = NormalizeAngle(data.Angle)
 
 	player := g.players[playerId]
-	player.targetThrottle = data.Level
+	player.targetThrust = data.Thrust
 	player.targetAngle = data.Angle
 }
 
@@ -270,8 +273,8 @@ func (g *Game) start() {
 		player.acc = Vec{}
 		player.angle = 0
 		player.targetAngle = 0
-		player.throttle = 0
-		player.targetThrottle = 0
+		player.thrust = 0
+		player.targetThrust = 0
 
 		player.finished = false
 		player.checkpoints = make([]Vec, len(g.checkpoints))

hoverrace/player.go

@@ -17,8 +17,8 @@ type Player struct {
 
 	checkpoints []Vec
 
-	throttle       float64
-	targetThrottle float64
+	thrust       float64
+	targetThrust float64
 
 	angle       float64
 	targetAngle float64
@@ -43,23 +43,23 @@ func (p *Player) update(delta time.Duration) {
 			Pos:         p.pos,
 			Checkpoints: len(p.checkpoints),
 			Velocity:    p.vel,
-			Throttle:    p.throttle,
+			Thrust:      p.thrust,
 			Angle:       p.angle,
 		}
 	}
 }
 
 func (p *Player) move(delta time.Duration) {
 	if !p.finished && p.game.running {
-		if p.targetThrottle > p.throttle {
-			p.throttle += p.game.config.ThrottleSpeed * delta.Seconds()
-			if p.throttle > p.targetThrottle {
-				p.throttle = p.targetThrottle
+		if p.targetThrust > p.thrust {
+			p.thrust += p.game.config.ThrottleSpeed * delta.Seconds()
+			if p.thrust > p.targetThrust {
+				p.thrust = p.targetThrust
 			}
-		} else if p.targetThrottle < p.throttle {
-			p.throttle -= p.game.config.ThrottleSpeed * delta.Seconds()
-			if p.throttle < p.targetThrottle {
-				p.throttle = p.targetThrottle
+		} else if p.targetThrust < p.thrust {
+			p.thrust -= p.game.config.ThrottleSpeed * delta.Seconds()
+			if p.thrust < p.targetThrust {
+				p.thrust = p.targetThrust
 			}
 		}
 
@@ -75,9 +75,9 @@ func (p *Player) move(delta time.Duration) {
 			}
 		}
 
-		p.acc = VecFromAngle(p.angle).Mul(p.game.config.MaxAcceleration * p.throttle)
+		p.acc = VecFromAngle(p.angle).Mul(p.game.config.MaxAcceleration * p.thrust)
 	} else {
-		p.throttle = 0
+		p.thrust = 0
 
 		if p.vel.MagnitudeSquared() != 0 {
 			velMag := p.vel.Magnitude()