diff --git a/src/main/java/com/ntlab/irisserver/entities/Game.java b/src/main/java/com/ntlab/irisserver/entities/Game.java index 2f3365b..16ce049 100644 --- a/src/main/java/com/ntlab/irisserver/entities/Game.java +++ b/src/main/java/com/ntlab/irisserver/entities/Game.java @@ -13,7 +13,6 @@ private List map = new ArrayList<>();//cno順にdnoを管理 private List color = new ArrayList<>();//cno順にr,g,b,dを管理 - private List opens = new ArrayList<>();//cno順にカードの開閉状態を管理 private List turnList = new ArrayList<>(); private Turn nowTurn = null;//現在のターン @@ -23,6 +22,8 @@ public Game(Room room, String[] keywords) { room.setGame(this); + this.settings = room.getSettings(); + drawingController = new DrawingController(room, room.getMembers(), this); List memberList = room.getMembers(); int num = 16/memberList.size();//一人あたりが確実に採用されるイラスト枚数 @@ -55,9 +56,6 @@ color.add("d"); Collections.shuffle(color);//r,b,g,dをランダムにマップに割り振る - this.settings = room.getSettings(); - drawingController = new DrawingController(room, room.getMembers(), this); - //Cellのインスタンス作成 for(int i=0; i<16; i++){ Cell c = new Cell(); @@ -108,15 +106,6 @@ return color; } - public String getTeam(){ - String team = nowTurn.getTeam(); - return team; - } - - public List getOpens(){ - return opens; - } - public Settings getSettings(){ return this.settings; } @@ -138,4 +127,8 @@ public Integer getNowTurn(){//現在何ターン目か取得 return turnList.size()-1; } + + public Cell getCell(Integer cno){ + return cellList.get(cno); + } }