diff --git a/api.go b/api.go index c7fec7e..725d61a 100644 --- a/api.go +++ b/api.go @@ -49,7 +49,7 @@ func (a *API) NewGame(res http.ResponseWriter, req *http.Request) { } } log.Printf("creating new game %v", a.nextInt) - a.games[a.nextInt] = NewSession() + a.games[a.nextInt] = NewSession(8) a.games[a.nextInt].redPlayer.Ready = true respondWithJSON(res, http.StatusOK, newGameResp{a.nextInt, "red"}) a.nextInt = a.nextInt + 1 @@ -81,18 +81,16 @@ func (a *API) GetGame(res http.ResponseWriter, req *http.Request) { } log.Println("sending game state") - rotatedBoard := s.getBoard(p) + board := s.getBoard(p) rotate := req.Header.Get("Rotate") if rotate == "true" { - i := 0 - temp := rotatedBoard[0] - for ; i < len(rotatedBoard)-1; i++ { - rotatedBoard[i] = rotatedBoard[i+1] - } + log.Println("rotating output") + //rotateBoard(board) + //rotateBoard(board) + //rotateBoard(board) - rotatedBoard[i] = temp } - respondWithJSON(res, http.StatusOK, gameResp{rotatedBoard}) + respondWithJSON(res, http.StatusOK, gameResp{board}) return } diff --git a/api_test.go b/api_test.go index 5b85cda..74264cb 100644 --- a/api_test.go +++ b/api_test.go @@ -23,7 +23,7 @@ func TestNewAPI(t *testing.T) { func dummyGame(a *API) int { i := a.nextInt - a.games[i] = NewSession() + a.games[i] = NewSession(8) a.games[i].redPlayer.Ready = true a.games[i].bluePlayer.Ready = true a.games[i].simulator.Setup() @@ -107,7 +107,7 @@ func TestGetGame(t *testing.T) { } for j := range respStruct.GameBoard { for i, vt := range respStruct.GameBoard[j] { - curr, err := a.games[gid].simulator.Board.GetPiece(j, i) + curr, err := a.games[gid].simulator.Board.GetPiece(i, j) if err != nil { t.Fatalf("Strange board position: %v", err) } diff --git a/api_types.go b/api_types.go index a6f586d..2b15801 100644 --- a/api_types.go +++ b/api_types.go @@ -10,7 +10,7 @@ type newGameResp struct { } type gameResp struct { - GameBoard [8][8]*ViewTile `json:"board"` + GameBoard [][]*ViewTile `json:"board"` } type gameStatusResp struct { diff --git a/session.go b/session.go index 5474124..87e5376 100644 --- a/session.go +++ b/session.go @@ -15,6 +15,7 @@ type Session struct { bluePlayer *Player moveNum int moveList []freego.ParsedCommand + boardSize int } //Player is a player in a match @@ -34,7 +35,7 @@ func (p *Player) Colour() freego.Colour { } //NewSession creates a new game session -func NewSession() *Session { +func NewSession(size int) *Session { sim := freego.NewGame() return &Session{ simulator: sim, @@ -42,6 +43,7 @@ func NewSession() *Session { bluePlayer: &Player{false, freego.Blue}, moveNum: 1, moveList: make([]freego.ParsedCommand, 20), + boardSize: size, } } @@ -78,10 +80,13 @@ func (s *Session) getMove(p *Player, num int) (string, error) { return fmt.Sprintf("%v %v", num, s.moveList[num].String()), nil } -func (s *Session) getBoard(p *Player) [8][8]*ViewTile { - var res [8][8]*ViewTile - for i := 0; i < 8; i++ { - for j := 0; j < 8; j++ { +func (s *Session) getBoard(p *Player) [][]*ViewTile { + res := make([][]*ViewTile, s.boardSize) + for i := range res { + res[i] = make([]*ViewTile, s.boardSize) + } + for i := 0; i < s.boardSize; i++ { + for j := 0; j < s.boardSize; j++ { cur := NewViewTile() terrain, err := s.simulator.Board.IsTerrain(i, j) if err != nil { @@ -109,7 +114,7 @@ func (s *Session) getBoard(p *Player) [8][8]*ViewTile { cur.Empty = true } } - res[i][j] = cur + res[j][i] = cur } } return res diff --git a/util.go b/util.go index 78a0023..0ca7909 100644 --- a/util.go +++ b/util.go @@ -21,6 +21,16 @@ func respondWithJSON(res http.ResponseWriter, code int, payload interface{}) { res.Write(response) } +func rotateBoard(board [][]*ViewTile) { + i := 0 + temp := board[0] + for ; i < len(board)-1; i++ { + board[i] = board[i+1] + } + + board[i] = temp +} + //TODO remove this when you can actually setup a game func initDummy(g *freego.Game) { //Setup terrain diff --git a/view_tile.go b/view_tile.go index a038653..e2767d3 100644 --- a/view_tile.go +++ b/view_tile.go @@ -12,3 +12,16 @@ type ViewTile struct { func NewViewTile() *ViewTile { return &ViewTile{} } + +func (vt *ViewTile) String() string { + if vt.Piece != "" { + return vt.Piece + } + if vt.Hidden { + return "?" + } + if vt.Terrain { + return "X" + } + return " " +}