Merge pull request #40 from GoSuji/texture-fix

Texture fix
vapour101 · Oct 29, 2017 · 74310b2 · 74310b2
2 parents 0dd138f + c184b5b
commit 74310b2
Show file tree

Hide file tree

Showing 15 changed files with 4 additions and 4 deletions.
diff --git a/src/main/java/logic/gametree/ComplexTree.java b/src/main/java/logic/gametree/ComplexTree.java
@@ -54,7 +54,7 @@ public boolean isRoot() {
 
 	@Override
 	public GameTreeIterator getRoot() {
-		return current;
+		return new ComplexTreeIterator(root);
 	}
 
 	@Override

diff --git a/src/main/java/ui/controller/BoardController.java b/src/main/java/ui/controller/BoardController.java
@@ -98,7 +98,7 @@ Drawer buildGameDrawer() {
 
 		gameDrawer.setStoneDrawer(buildStoneDrawer());
 
-		Image wood = new Image("/images/wood.jpg", false);
+		Image wood = new Image("/images/kaya.jpg", false);
 		Image lines = new Image("/images/grid.png", false);
 
 		BoardDrawer boardDrawer = new TexturedBoardDrawer(boardCanvas, wood, lines);
@@ -110,8 +110,8 @@ Drawer buildGameDrawer() {
 	}
 
 	StoneDrawer buildStoneDrawer() {
-		Image blackStone = new Image("/images/black.png", false);
-		Image whiteStone = new Image("/images/white.png", false);
+		Image blackStone = new Image("/images/black1.png", false);
+		Image whiteStone = new Image("/images/img_hanajirushi.png", false);
 		return new TexturedStoneDrawer(boardCanvas, blackStone, whiteStone);
 	}
 

diff --git a/src/main/resources/Sound/sound6.mp3 b/src/main/resources/Sound/sound6.mp3
diff --git a/src/main/resources/images/MSS01-black_slate_full_circle_hearth.jpg b/src/main/resources/images/MSS01-black_slate_full_circle_hearth.jpg
diff --git a/src/main/resources/images/black1.JPG b/src/main/resources/images/black1.JPG
diff --git a/src/main/resources/images/black1.jpg b/src/main/resources/images/black1.jpg
diff --git a/src/main/resources/images/black1.png b/src/main/resources/images/black1.png
diff --git a/src/main/resources/images/black2.jpg b/src/main/resources/images/black2.jpg
diff --git a/src/main/resources/images/black3.jpg b/src/main/resources/images/black3.jpg
diff --git a/src/main/resources/images/img_hanajirushi.png b/src/main/resources/images/img_hanajirushi.png
diff --git a/src/main/resources/images/img_yukijirushi.png b/src/main/resources/images/img_yukijirushi.png
diff --git a/src/main/resources/images/kaya.jpg b/src/main/resources/images/kaya.jpg
diff --git a/src/main/resources/images/kaya_background.jpg b/src/main/resources/images/kaya_background.jpg
diff --git a/src/main/resources/images/white1.jpg b/src/main/resources/images/white1.jpg
diff --git a/src/main/resources/images/white2.png b/src/main/resources/images/white2.png