Add game config

Author: juho05

events.cge

@@ -1,6 +1,19 @@
 name hoverrace
 version 0.4
 
+config {
+	// The speed at which the throttle reacts to user input. default = 1
+	throttle_speed: float,
+	// The speed at which hovercrafts turn. default = 220
+	turn_speed: float,
+	// The maximum acceleration of hovercrafts. default = 5
+	max_acceleration: float,
+	// The maximum velocity of hovercrafts. default = 20
+	max_velocity: float,
+	// The amount of checkpoints per game. default = 10
+	checkpoint_count: int
+}
+
 // Send the `ready` command to the server when you think the game should begin.
 command ready {}
 

hoverrace/event_definitions.go

@@ -2,6 +2,19 @@ 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
+	ThrottleSpeed float64 `json:"throttle_speed"`
+	// The speed at which hovercrafts turn. default = 220
+	TurnSpeed float64 `json:"turn_speed"`
+	// The maximum acceleration of hovercrafts. default = 5
+	MaxAcceleration float64 `json:"max_acceleration"`
+	// The maximum velocity of hovercrafts. default = 20
+	MaxVelocity float64 `json:"max_velocity"`
+	// The amount of checkpoints per game. default = 10
+	CheckpointCount int `json:"checkpoint_count"`
+}
+
 // Send the `ready` command to the server when you think the game should begin.
 const ReadyCmd cg.CommandName = "ready"
 
@@ -106,5 +119,3 @@ type Vec struct {
 	// bottom to top
 	Y float64 `json:"y"`
 }
-
-type GameConfig struct{}

hoverrace/game.go

@@ -29,7 +29,7 @@ func NewGame(cgGame *cg.Game, config GameConfig) *Game {
 		players:         make(map[string]*Player),
 		hovercrafts:     make(map[string]Hovercraft),
 		finishedPlayers: make([]FinishedPlayer, 0),
-		checkpoints:     make([]Vec, 0, 10),
+		checkpoints:     make([]Vec, 0, config.CheckpointCount),
 	}
 	game.cg.OnPlayerJoined = game.onPlayerJoined
 	game.cg.OnPlayerLeft = game.onPlayerLeft

hoverrace/player.go

@@ -7,13 +7,6 @@ import (
 	"github.com/code-game-project/go-server/cg"
 )
 
-const (
-	throttleSpeed   = 1
-	turnSpeed       = 220
-	maxAcceleration = 5
-	maxVelocity     = 20
-)
-
 type Player struct {
 	id       string
 	username string
@@ -59,30 +52,30 @@ func (p *Player) update(delta time.Duration) {
 func (p *Player) move(delta time.Duration) {
 	if !p.finished && p.game.running {
 		if p.targetThrottle > p.throttle {
-			p.throttle += throttleSpeed * delta.Seconds()
+			p.throttle += p.game.config.ThrottleSpeed * delta.Seconds()
 			if p.throttle > p.targetThrottle {
 				p.throttle = p.targetThrottle
 			}
 		} else if p.targetThrottle < p.throttle {
-			p.throttle -= throttleSpeed * delta.Seconds()
+			p.throttle -= p.game.config.ThrottleSpeed * delta.Seconds()
 			if p.throttle < p.targetThrottle {
 				p.throttle = p.targetThrottle
 			}
 		}
 
 		if p.targetAngle > p.angle {
-			p.angle += turnSpeed * delta.Seconds()
+			p.angle += p.game.config.TurnSpeed * delta.Seconds()
 			if p.angle > p.targetAngle {
 				p.angle = p.targetAngle
 			}
 		} else if p.targetAngle < p.angle {
-			p.angle -= turnSpeed * delta.Seconds()
+			p.angle -= p.game.config.TurnSpeed * delta.Seconds()
 			if p.angle < p.targetAngle {
 				p.angle = p.targetAngle
 			}
 		}
 
-		p.acc = VecFromAngle(p.angle).Mul(maxAcceleration * p.throttle)
+		p.acc = VecFromAngle(p.angle).Mul(p.game.config.MaxAcceleration * p.throttle)
 	} else {
 		p.throttle = 0
 
@@ -92,7 +85,7 @@ func (p *Player) move(delta time.Duration) {
 			p.acc = Vec{
 				X: -p.vel.X / velMag,
 				Y: -p.vel.Y / velMag,
-			}.Mul(math.Min(maxAcceleration, math.Abs(velMag)))
+			}.Mul(math.Min(p.game.config.MaxAcceleration, math.Abs(velMag)))
 		}
 
 		if p.vel.MagnitudeSquared() < 0.01 {
@@ -136,7 +129,7 @@ outer:
 		p.game.finishedPlayers = append(p.game.finishedPlayers, FinishedPlayer{
 			Id:       p.id,
 			Place:    len(p.game.finishedPlayers) + 1,
-			Duration: time.Now().Sub(p.game.startTime).Milliseconds(),
+			Duration: time.Since(p.game.startTime).Milliseconds(),
 		})
 		p.game.cg.Send(FinishedPlayersEvent, FinishedPlayersEventData{
 			Players: p.game.finishedPlayers,

main.go

@@ -44,11 +44,25 @@ func main() {
 	server.Run(func(cgGame *cg.Game, config json.RawMessage) {
 		var gameConfig hoverrace.GameConfig
 		err := json.Unmarshal(config, &gameConfig)
-		if err == nil {
-			cgGame.SetConfig(gameConfig)
-		} else {
+		if err != nil {
 			cgGame.Log.Error("Failed to unmarshal game config: %s", err)
 		}
+		if gameConfig.ThrottleSpeed <= 0 {
+			gameConfig.ThrottleSpeed = 1
+		}
+		if gameConfig.TurnSpeed <= 0 {
+			gameConfig.TurnSpeed = 220
+		}
+		if gameConfig.MaxAcceleration <= 0 {
+			gameConfig.MaxAcceleration = 5
+		}
+		if gameConfig.MaxVelocity <= 0 {
+			gameConfig.MaxVelocity = 20
+		}
+		if gameConfig.CheckpointCount <= 0 {
+			gameConfig.CheckpointCount = 10
+		}
+		cgGame.SetConfig(gameConfig)
 
 		hoverrace.NewGame(cgGame, gameConfig).Run()
 	})