From 914a97745d18271be1de0f54b5f0341e14bc84a0 Mon Sep 17 00:00:00 2001
From: dragapsy <elghaoutiayman20@gmail.com>
Date: Fri, 18 Nov 2022 23:29:47 +0100
Subject: [PATCH] =?UTF-8?q?Tache=208=20(1ere=20partie=20jou=C3=A9):?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../main/java/controller/GameController.java | 36 ++++++++-----------
app/src/main/java/model/Flooder.java | 4 +--
2 files changed, 17 insertions(+), 23 deletions(-)
diff --git a/app/src/main/java/controller/GameController.java b/app/src/main/java/controller/GameController.java
index f886ba7..2cac2e5 100644
--- a/app/src/main/java/controller/GameController.java
+++ b/app/src/main/java/controller/GameController.java
@@ -88,24 +88,20 @@ public class GameController {
}
private void playComputerTurn(){
- // TODO
- // uncomment
- // if (!game.hasEnded() && !game.isHumanTurn()){
- // ComputerPlayer player = ((ComputerPlayer) game.getPlayer());
- // Flooder.flood(player.getStartCell(), player.play());
- // setScoreLabelTextProperty();
- // pause.play();
- // }
+ if (!game.hasEnded() && !game.isHumanTurn()){
+ //ComputerPlayer player = ((ComputerPlayer) game.getPlayer());
+ // Flooder.flood(player.getStartCell(), player.play());
+ setScoreLabelTextProperty();
+ pause.play();
+ }
}
public void playHumanTurn(Color color){
- // TODO
- // uncomment
- // if(!game.hasEnded() && game.isHumanTurn()){
- // Flooder.flood(game.getPlayer().getStartCell(), color);
- // setScoreLabelTextProperty();
- // game.incrementTurn();
- //}
+ if(!game.hasEnded() && game.isHumanTurn()){
+ Flooder.flood(game.getPlayer().getStartCell(), color);
+ setScoreLabelTextProperty();
+ game.incrementTurn();
+ }
}
private void setPauseAnimation(){
@@ -117,10 +113,9 @@ public class GameController {
}
private void setScoreLabelTextProperty() {
- // TODO
- // uncomment
- // Player player = game.getPlayer();
- // scoreLabel.textProperty().setValue(Integer.toString(game.getPlayerScore(player)));
+
+ Player player = game.getPlayer();
+ scoreLabel.textProperty().setValue(Integer.toString(game.getPlayerScore(player)));
}
@@ -140,8 +135,7 @@ public class GameController {
@FXML
public void setPlayerHuman(){
- // TODO
- // game.setPlayer(new HumanPlayer("human", getGridStartCell()));
+ game.setPlayer(new HumanPlayer("human", getGridStartCell()));
}
@FXML
diff --git a/app/src/main/java/model/Flooder.java b/app/src/main/java/model/Flooder.java
index 19c268e..83d9892 100644
--- a/app/src/main/java/model/Flooder.java
+++ b/app/src/main/java/model/Flooder.java
@@ -4,7 +4,7 @@ import javafx.scene.paint.Color;
public class Flooder {
- static void flood(Cell startCell, Color floodingColor){
+ public static void flood(Cell startCell, Color floodingColor){
ColoredCellIterator myCell = new ColoredCellIterator(startCell);
while (myCell.hasNext()) {
@@ -12,7 +12,7 @@ public class Flooder {
}
}
- static int coloredArea(Cell startCell){
+ public static int coloredArea(Cell startCell){
ColoredCellIterator cell = new ColoredCellIterator(startCell);
int numberOfCellColored = 0;
--
GitLab