diff --git a/src/main/java/com/ntlab/irisserver/entities/Game.java b/src/main/java/com/ntlab/irisserver/entities/Game.java index 85d392b..aaa6c38 100644 --- a/src/main/java/com/ntlab/irisserver/entities/Game.java +++ b/src/main/java/com/ntlab/irisserver/entities/Game.java @@ -84,14 +84,8 @@ //1ターン目の作成 nowTurn = new Turn(); + nowTurn.setTeam("r"); this.turnList.add(nowTurn); - if(turnList.size()%2==0){//偶数ターンなら青い色,奇数ターンは赤色 - nowTurn.setTeam("b"); - }else{ - nowTurn.setTeam("r"); - } - this.turnList.add(nowTurn); - } public DrawingController getDrawingController() { @@ -153,11 +147,10 @@ public void createTurn(){ nowTurn = new Turn(); - this.turnList.add(nowTurn); - if(turnList.size()%2==0){//偶数ターンなら青い色,奇数ターンは赤色 - nowTurn.setTeam("b"); - }else{ + if(turnList.size()%2==0){//偶数ターンなら青色,奇数ターンは赤色 nowTurn.setTeam("r"); + }else{ + nowTurn.setTeam("b"); } this.turnList.add(nowTurn); } diff --git a/src/main/java/com/ntlab/irisserver/resources/TurnsRest.java b/src/main/java/com/ntlab/irisserver/resources/TurnsRest.java index e0a540b..8d52d39 100644 --- a/src/main/java/com/ntlab/irisserver/resources/TurnsRest.java +++ b/src/main/java/com/ntlab/irisserver/resources/TurnsRest.java @@ -199,6 +199,22 @@ } + //------------------------------------------------------------------------ + // rooms/{rid}/game/turns/{tno}/turnstate: + + @GET + @Path("/{rid}/game/turns/{tno}/turnstate") + @Produces(MediaType.APPLICATION_JSON) + public Integer getTurnstate(@PathParam("rid") String rid, @PathParam("tno") int tno){ + + RoomManager rm = RoomManager.getInstance(); + Room room = rm.getRoom(rid); + Game game = room.getGame(); + Turn t = game.getTurn(tno); + + return t.getTurnstate(); + } + @PUT //Turnstateを1に変更 @Path("/{rid}/game/turns/{tno}/turnstate") public void setTurnstate(@PathParam("rid") String rid, @PathParam("tno") int tno){ @@ -211,6 +227,22 @@ } + //------------------------------------------------------------------------ + // rooms/{rid}/game/turns/{tno}/endstate: + + @GET + @Path("/{rid}/game/turns/{tno}/endstate") + @Produces(MediaType.APPLICATION_JSON) + public Integer getEndstate(@PathParam("rid") String rid, @PathParam("tno") int tno){ + + RoomManager rm = RoomManager.getInstance(); + Room room = rm.getRoom(rid); + Game game = room.getGame(); + Turn t = game.getTurn(tno); + + return t.getEndstate(); + } + @PUT //Endstateを1に変更 @Path("/{rid}/game/turns/{tno}/endstate") public void setEndstate(@PathParam("rid") String rid, @PathParam("tno") int tno){