hackerbots/server
1
0
Fork 0
Code Issues 2 Pull Requests Activity

Renamed obstacle -> obstacle count

Browse Source
This commit is contained in:
Stephen McQuay 2014-04-26 08:56:40 -07:00
parent 2a9c178ebb
commit db28bfea11
3 changed files with 26 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

44
config.go
View File

@ -15,24 +15,24 @@ import (
// ways (json POSTed to server, config file, constants) and are typically owned // ways (json POSTed to server, config file, constants) and are typically owned
// by a Controller. // by a Controller.
type Config struct { type Config struct {
Tick int `json:"tick"` // ms Tick int `json:"tick"` // ms
Timescale float32 `json:"timescale"` Timescale float32 `json:"timescale"`
Delta float32 `json:"delta"` Delta float32 `json:"delta"`
Width int `json:"width"` Width int `json:"width"`
Height int `json:"height"` Height int `json:"height"`
Obstacles int `json:"obstacles"` ObstacleCount int `json:"obstacle_count"`
MaxPoints int `json:"max_points"` MaxPoints int `json:"max_points"`
Mode string `json:"mode"` Mode string `json:"mode"`
} }
const ( const (
TICK = 60 // ms, this is how often physics is updated TICK = 60 // ms, this is how often physics is updated
TIMESCALE = 1.0 // this tweaks the temporal duration of a TICK TIMESCALE = 1.0 // this tweaks the temporal duration of a TICK
WIDTH = 800 WIDTH = 800
HEIGHT = 550 HEIGHT = 550
OBSTACLES = 10 OBSTACLE_COUNT = 5
MAX_POINTS = 500 // allowing for 50 pts in every category MAX_POINTS = 500 // allowing for 50 pts in every category
DEFAULT_MODE = "deathmatch" DEFAULT_MODE = "deathmatch"
) )
// LoadConfig takes the location of a json file that contains values desired to // LoadConfig takes the location of a json file that contains values desired to
@ -41,13 +41,13 @@ const (
// followed by constants defined above. // followed by constants defined above.
func LoadConfig(filename string) (Config, error) { func LoadConfig(filename string) (Config, error) {
c := Config{ c := Config{
Tick: TICK, Tick: TICK,
Timescale: TIMESCALE, Timescale: TIMESCALE,
Width: WIDTH, Width: WIDTH,
Height: HEIGHT, Height: HEIGHT,
Obstacles: OBSTACLES, ObstacleCount: OBSTACLE_COUNT,
MaxPoints: MAX_POINTS, MaxPoints: MAX_POINTS,
Mode: DEFAULT_MODE, Mode: DEFAULT_MODE,
} }
u, err := user.Current() u, err := user.Current()
if err != nil { if err != nil {

6
control.go
View File

@ -63,7 +63,7 @@ func (c *Controller) StartGame(w http.ResponseWriter, req *http.Request) {
requested_game_name := c.Idg.Hash() requested_game_name := c.Idg.Hash()
width, height := float32(c.Conf.Width), float32(c.Conf.Height) width, height := float32(c.Conf.Width), float32(c.Conf.Height)
obstacles := 0 obstacleCount := 0
maxPoints := c.Conf.MaxPoints maxPoints := c.Conf.MaxPoints
mode := "deathmatch" mode := "deathmatch"
@ -89,7 +89,7 @@ func (c *Controller) StartGame(w http.ResponseWriter, req *http.Request) {
requested_game_name = cfg.Name requested_game_name = cfg.Name
width = float32(cfg.Width) width = float32(cfg.Width)
height = float32(cfg.Height) height = float32(cfg.Height)
obstacles = cfg.Obstacles obstacleCount = cfg.ObstacleCount
maxPoints = cfg.MaxPoints maxPoints = cfg.MaxPoints
mode = cfg.Mode mode = cfg.Mode
} }
@ -98,7 +98,7 @@ func (c *Controller) StartGame(w http.ResponseWriter, req *http.Request) {
if g == nil { if g == nil {
log.Printf("Game '%s' non-existant; making it now", requested_game_name) log.Printf("Game '%s' non-existant; making it now", requested_game_name)
var err error var err error
g, err = NewGame(requested_game_name, width, height, obstacles, c.Conf.Tick, maxPoints, mode) g, err = NewGame(requested_game_name, width, height, obstacleCount, c.Conf.Tick, maxPoints, mode)
if err != nil { if err != nil {
log.Printf("problem creating game: %s: %s", requested_game_name, err) log.Printf("problem creating game: %s: %s", requested_game_name, err)
b, _ := json.Marshal(NewFailure("game creation failure")) b, _ := json.Marshal(NewFailure("game creation failure"))

2
protocol.go
View File

@ -177,7 +177,7 @@ func (c *Controller) AddPlayer(ws *websocket.Conn) {
gid.Id, gid.Id,
float32(c.Conf.Width), float32(c.Conf.Width),
float32(c.Conf.Height), float32(c.Conf.Height),
c.Conf.Obstacles, c.Conf.ObstacleCount,
c.Conf.Tick, c.Conf.Tick,
c.Conf.MaxPoints, c.Conf.MaxPoints,
"", "",