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

Merge remote-tracking branch 'origin/master'

Browse Source
This commit is contained in:
Solargale
2019-03-25 12:29:56 -06:00
parent 290dce81db 6e43912b2e
commit 5a43adf7ad
3 changed files with 17 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
src/ShipWarfareGUI.java
View File

@@ -16,6 +16,7 @@ import javafx.stage.Stage;
import javafx.util.Duration; import javafx.util.Duration;
import java.io.FileInputStream; import java.io.FileInputStream;
import java.util.Random; import java.util.Random;
import java.util.concurrent.ExecutionException;
/** /**
* 2019-03-10 (Edited on 2019-03-23) * 2019-03-10 (Edited on 2019-03-23)
@@ -445,8 +446,17 @@ public class ShipWarfareGUI extends Player {
centeringUserShipPane.setPrefHeight(200.0); centeringUserShipPane.setPrefHeight(200.0);
centeringUserShipPane.setPrefWidth(200.0); centeringUserShipPane.setPrefWidth(200.0);
Image ourShip = new Image(new FileInputStream("src/images/ourShip.png")); Image ourShip;
Image enemyShip = new Image(new FileInputStream("src/images/enemyShip.png")); 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 //Setting the image view

2
src/TaipanShopGUI.java
View File

@@ -690,6 +690,8 @@ public class TaipanShopGUI extends Player{
locationText.setFont(size14); locationText.setFont(size14);
inventoryText.setAlignment(Pos.CENTER); inventoryText.setAlignment(Pos.CENTER);
inventoryText.setPrefWidth(100.0);
inventoryText.setPrefHeight(108.0);
inventoryText.setFont(size14); inventoryText.setFont(size14);
inventoryHeldText.setAlignment(Pos.CENTER); inventoryHeldText.setAlignment(Pos.CENTER);

4
src/TravelGUI.java
View File

@@ -280,6 +280,8 @@ public class TravelGUI extends Player{
locationText.setFont(size14); locationText.setFont(size14);
inventoryText.setAlignment(Pos.CENTER); inventoryText.setAlignment(Pos.CENTER);
inventoryText.setPrefWidth(100.0);
inventoryText.setPrefHeight(108.0);
inventoryText.setFont(size14); inventoryText.setFont(size14);
inventoryHeldText.setAlignment(Pos.CENTER); 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())); 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())); 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())); cashText.setText(String.format(" Cash: $%,d", getMoney()));
bankText.setText(String.format("Bank: %d", getBank())); bankText.setText(String.format("Bank: $%,d", getBank()));
} }
} }