Merge pull request #150 from nitta-lab-2022/Game

Fork: 0

nitta-lab-2022 / IrisServer

Browse code Merge pull request #150 from nitta-lab-2022/Game Game DrawingsRest Game MembersRest RoomsRest Shimokawa fix_setdrawingList_urlLink master o_server ...ok-server
commit 45d3c73e6c70f3e21fd4eed0918610170d0173cb 2 parents f6f0db3 + 0ec1755 Nao Hirase authored on 5 Jul 2022

Patch

Unified Split

Showing 3 changed files

                Ignore Space
               Show notes
              View
            
          
          32 ■■■■■
          src/main/java/com/ntlab/irisserver/entities/Game.java
         String keyword = keywordList.get(dno);
        return keyword;
    }
 
    public Map<Integer, String> getKeywords() {
        return keywordList;
    public List<String> getKeywords() {
        List<String> keywords = new ArrayList<>();
        for(int i=0; i<16; i++){
            keywords.add(keywordList.get(map.get(i)));
        }
        return keywords;
    }
 
    public List<Boolean> getOpens(){
        List<Boolean> opens= new ArrayList<>();
        for(int i=0; i<16; i++){
            Cell cell = cellList.get(i);
            boolean isOpen = cell.getIsOpen();
            opens.add(isOpen);
        }
        return opens;
    }
 
    public Map<Member, List<Integer>> getAssignments(){
        return assignments;
         String keyword = keywordList.get(dno);
         return keyword;
     }
+    public Map<Integer, String> getKeywords() {
+        return keywordList;
+    public List<String> getKeywords() {
+        List<String> keywords = new ArrayList<>();
+        for(int i=0; i<16; i++){
+            keywords.add(keywordList.get(map.get(i)));
+        }
+        return keywords;
+    }
+    public List<Boolean> getOpens(){
+        List<Boolean> opens= new ArrayList<>();
+        for(int i=0; i<16; i++){
+            Cell cell = cellList.get(i);
+            boolean isOpen = cell.getIsOpen();
+            opens.add(isOpen);
+        }
+        return opens;
     }
     public Map<Member, List<Integer>> getAssignments(){
         return assignments;

                Ignore Space
               Show notes
              View
            
          
          12 ■■■■■
          src/main/java/com/ntlab/irisserver/resources/GameRest.java
     public List<String> getKeywords(@PathParam("rid") String rid){
        RoomManager rm = RoomManager.getInstance();
        Room room = rm.getRoom(rid);
        Game game = room.getGame();
        Map<Integer, String> keywordList = game.getKeywords();
        List<Integer> map = game.getMap();
        List<String> keywords = new ArrayList<>();
        for(int i=0; i<16; i++){
            keywords.add(keywordList.get(map.get(i)));
        }
        List<String> keywords = game.getKeywords();
        return keywords;
    }
 
}
     public List<String> getKeywords(@PathParam("rid") String rid){
         RoomManager rm = RoomManager.getInstance();
         Room room = rm.getRoom(rid);
         Game game = room.getGame();
+        Map<Integer, String> keywordList = game.getKeywords();
+        List<Integer> map = game.getMap();
+        List<String> keywords = new ArrayList<>();
+        for(int i=0; i<16; i++){
+            keywords.add(keywordList.get(map.get(i)));
+        }
+        List<String> keywords = game.getKeywords();
         return keywords;
     }
 }

                Ignore Space
               Show notes
              View
            
          
          11 ■■■■■
          src/main/java/com/ntlab/irisserver/resources/GameStateRest.java
     @Path("/{rid}/game/opens")
    @GET
    @Produces(MediaType.APPLICATION_JSON)
    public  List<Boolean> getOpens(@PathParam("rid") String rid){
        List<Boolean> opens= new ArrayList<>();
        RoomManager rm = RoomManager.getInstance();
        Room room = rm.getRoom(rid);
        Game game = room.getGame();
        for(int i=0; i<16; i++){
            Cell cell = game.getCell(i);
            boolean isOpen = cell.getIsOpen();
            opens.add(isOpen);
        }
        List<Boolean> opens = game.getOpens();
        return opens;
    }
 
    @Path("/{rid}/game/turn")
     @Path("/{rid}/game/opens")
     @GET
     @Produces(MediaType.APPLICATION_JSON)
     public  List<Boolean> getOpens(@PathParam("rid") String rid){
-        List<Boolean> opens= new ArrayList<>();
         RoomManager rm = RoomManager.getInstance();
         Room room = rm.getRoom(rid);
         Game game = room.getGame();
+        for(int i=0; i<16; i++){
+            Cell cell = game.getCell(i);
+            boolean isOpen = cell.getIsOpen();
+            opens.add(isOpen);
+        }
+        List<Boolean> opens = game.getOpens();
         return opens;
     }
     @Path("/{rid}/game/turn")

Show line notes below