RecentRunner/TaipanClone
1
0
Fork 0
Code Issues 9 Pull Requests Actions Packages Projects Releases 11 Wiki Activity

Fixed issue with Shipwarfare not loading up

Browse Source
This commit is contained in:
Solargale
2019-04-06 15:44:10 -06:00
parent 92cd1db4f5
commit 05c25c01e0
1 changed files with 19 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

36
src/ShipWarfareGUI.java
View File

@@ -28,7 +28,6 @@ import java.util.concurrent.ExecutionException;
public class ShipWarfareGUI extends Player { public class ShipWarfareGUI extends Player {
private ShipWarfareGUI ship;
private ShipWarfareGUILogic logic; private ShipWarfareGUILogic logic;
private Circle cannon; private Circle cannon;
private VBox buttonBox; private VBox buttonBox;
@@ -206,23 +205,6 @@ public class ShipWarfareGUI extends Player {
* @throws Exception in case of interruptions withing the graphical interface * @throws Exception in case of interruptions withing the graphical interface
*/ */
public void initializeShip(Stage primaryStage) throws Exception { public void initializeShip(Stage primaryStage) throws Exception {
cannon.setLayoutX(beginningX);
cannon.setLayoutY(beginningY);
logic.setNumOfLittyShips(logic.numOfShips());
Pane root = new Pane();
HBox usAgainstEnemyDivisor;
BorderPane centeringUserShipPane = new BorderPane();
Circle cannon;
BorderPane centeringLittyShipPane = new BorderPane();
BorderPane encompassingPane = new BorderPane();
usAgainstEnemyDivisor = new HBox();
cannon = new Circle();
this.cannon = cannon;
cannon.setVisible(false);
buttonBox = new VBox(); buttonBox = new VBox();
fightRunBox = new HBox(); fightRunBox = new HBox();
fightButton = new Button(); fightButton = new Button();
@@ -235,6 +217,24 @@ public class ShipWarfareGUI extends Player {
runAwayOrLeft = new Label(); runAwayOrLeft = new Label();
shipsRemaining = new Label(); shipsRemaining = new Label();
report = new Label(); report = new Label();
Pane root = new Pane();
BorderPane centeringUserShipPane = new BorderPane();
BorderPane centeringLittyShipPane = new BorderPane();
BorderPane encompassingPane = new BorderPane();
HBox usAgainstEnemyDivisor = new HBox();
Circle cannon = new Circle();
logic = new ShipWarfareGUILogic(getPlayer());
cannon.setLayoutX(beginningX);
cannon.setLayoutY(beginningY);
logic.setNumOfLittyShips(logic.numOfShips());
this.cannon = cannon;
cannon.setVisible(false);
title.setText(String.format("%d ships from Liu Yuen's Fleet are attacking, Would you like to fight or run?", logic.getNumOfLittyShips())); title.setText(String.format("%d ships from Liu Yuen's Fleet are attacking, Would you like to fight or run?", logic.getNumOfLittyShips()));