diff --git a/src/ShipWarfareGUI.java b/src/ShipWarfareGUI.java index f1839fa..a322700 100644 --- a/src/ShipWarfareGUI.java +++ b/src/ShipWarfareGUI.java @@ -16,6 +16,7 @@ import javafx.stage.Stage; import javafx.util.Duration; import java.io.FileInputStream; import java.util.Random; +import java.util.concurrent.ExecutionException; /** * 2019-03-10 (Edited on 2019-03-23) @@ -445,8 +446,17 @@ public class ShipWarfareGUI extends Player { centeringUserShipPane.setPrefHeight(200.0); centeringUserShipPane.setPrefWidth(200.0); - Image ourShip = new Image(new FileInputStream("src/images/ourShip.png")); - Image enemyShip = new Image(new FileInputStream("src/images/enemyShip.png")); + Image ourShip; + Image enemyShip; + + try { + ourShip = new Image(new FileInputStream("src/images/ourShip.png")); + enemyShip = new Image(new FileInputStream("src/images/enemyShip.png")); + + }catch(Exception e){ + ourShip = new Image(new FileInputStream("images/ourShip.png")); + enemyShip = new Image(new FileInputStream("images/enemyShip.png")); + } //Setting the image view diff --git a/src/TaipanShopGUI.java b/src/TaipanShopGUI.java index 74017f5..9f05891 100644 --- a/src/TaipanShopGUI.java +++ b/src/TaipanShopGUI.java @@ -690,6 +690,8 @@ public class TaipanShopGUI extends Player{ locationText.setFont(size14); inventoryText.setAlignment(Pos.CENTER); + inventoryText.setPrefWidth(100.0); + inventoryText.setPrefHeight(108.0); inventoryText.setFont(size14); inventoryHeldText.setAlignment(Pos.CENTER); diff --git a/src/TravelGUI.java b/src/TravelGUI.java index da78eeb..8588a14 100644 --- a/src/TravelGUI.java +++ b/src/TravelGUI.java @@ -280,6 +280,8 @@ public class TravelGUI extends Player{ locationText.setFont(size14); inventoryText.setAlignment(Pos.CENTER); + inventoryText.setPrefWidth(100.0); + inventoryText.setPrefHeight(108.0); inventoryText.setFont(size14); inventoryHeldText.setAlignment(Pos.CENTER); @@ -499,6 +501,6 @@ public class TravelGUI extends Player{ inventoryHeldText.setText(String.format("\n %d\n %d\n %d\n %d", getOpiumHeld(), getSilkHeld(), getArmsHeld(), getGeneralHeld())); shipStatusText.setText(String.format("\tDebt\n\t%d\n\n\tShip status\n\t%s: %d", getDebt(), shipStatusString(), getHP())); cashText.setText(String.format(" Cash: $%,d", getMoney())); - bankText.setText(String.format("Bank: %d", getBank())); + bankText.setText(String.format("Bank: $%,d", getBank())); } }