Commit 39774848 authored by patrick.gustard-sm's avatar patrick.gustard-sm

Update Board.java

parent a4943fa3
...@@ -38,8 +38,8 @@ Cell cell = new Cell(x,y); ...@@ -38,8 +38,8 @@ Cell cell = new Cell(x,y);
cell.setOnMouseClicked(handler); cell.setOnMouseClicked(handler);
row.getChildren().add(cell); row.getChildren().add(cell);
cell.isShot = false; //cell.isShot = false;
cell.isShotEnemy = false; //cell.isShotEnemy = false;
} }
...@@ -60,9 +60,9 @@ public int xAxis; ...@@ -60,9 +60,9 @@ public int xAxis;
public int yAxis; public int yAxis;
public boolean isShotEnemy = false; //public boolean isShotEnemy = false;
public boolean isShot = false; //public boolean isShot = false;
public boolean isShip = false; public boolean isShip = false;
...@@ -92,10 +92,10 @@ if (isShip == true) { ...@@ -92,10 +92,10 @@ if (isShip == true) {
//if cell contains a ship //if cell contains a ship
setFill(Color.ORANGE); setFill(Color.ORANGE);
if (isShot = true) { //if (isShot = true) {
shoot(); // shoot();
} //}
isShot= true; //isShot= true;
Main.HealthEnemy --; Main.HealthEnemy --;
System.out.println("Enemy Health is " + Main.HealthEnemy); System.out.println("Enemy Health is " + Main.HealthEnemy);
if (Main.HealthEnemy < 1) { if (Main.HealthEnemy < 1) {
...@@ -113,11 +113,11 @@ enemyTurn(); ...@@ -113,11 +113,11 @@ enemyTurn();
setFill(Color.BLUE); setFill(Color.BLUE);
//Orange shows a hit, whereas Blue represents a miss //Orange shows a hit, whereas Blue represents a miss
if (isShot = true) { //if (isShot = true) {
shoot(); //shoot();
} //}
isShot = true; // isShot = true;
enemyTurn(); //enemyTurn();
} }
...@@ -312,9 +312,9 @@ enemyTarget = Main.BoardPlayer.getCell(ComputerX, ComputerY); //Sets the compute ...@@ -312,9 +312,9 @@ enemyTarget = Main.BoardPlayer.getCell(ComputerX, ComputerY); //Sets the compute
if (enemyTarget.isShip) { if (enemyTarget.isShip) {
enemyTarget.setFill(Color.ORANGE); enemyTarget.setFill(Color.ORANGE);
if (Cell.isShotEnemy = true) { //if (Cell.isShotEnemy = true) {
enemyTurn(); //enemyTurn();
} //}
Main.HealthPlayer --; Main.HealthPlayer --;
System.out.println("Player Health is " + Main.HealthPlayer); System.out.println("Player Health is " + Main.HealthPlayer);
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment