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

Fixed duplication between Shop and Travel

Browse Source
This commit is contained in:
Solargale
2019-04-07 12:35:20 -06:00
parent 7f1e8a4be8
commit ca778137a5
2 changed files with 17 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
src/TaipanShopGUI.java
View File

@@ -45,6 +45,7 @@ public class TaipanShopGUI extends Player{
private Button generalButton = new Button(); private Button generalButton = new Button();
private TextField numberInput = new TextField(); private TextField numberInput = new TextField();
/** /**
* constructor; only runs when a Player object is provided. The constructor is fully encapsulated. * constructor; only runs when a Player object is provided. The constructor is fully encapsulated.
* *
@@ -240,7 +241,7 @@ public class TaipanShopGUI extends Player{
public void initializeShop(Stage stage) { public void initializeShop(Stage stage) {
FileSaving saving = new FileSaving(); FileSaving saving = new FileSaving();
saving.saveFile(getPlayer()); saving.saveFile(getPlayer());
FlowPane flowPane = new FlowPane();
buyButton.setMnemonicParsing(false); buyButton.setMnemonicParsing(false);
buyButton.setPrefHeight(25.0); buyButton.setPrefHeight(25.0);
@@ -526,8 +527,10 @@ public class TaipanShopGUI extends Player{
stage.setTitle("Shop"); stage.setTitle("Shop");
stage.setResizable(false); stage.setResizable(false);
Scene root = new Scene(declareStage(), 600, 480); flowPane.getChildren().addAll(buyButton, sellButton, bankButton, cargoButton, loanButton, quitButton, retireButton, opiumButton, silkButton, armsButton, generalButton, numberInput);
Scene root = new Scene(declareStage(flowPane,firm,wItemsText,wItemSpaceText,locationText,gunsText,inventoryText,inventoryHeldText,shipStatusText,cashText,bankText,textOut), 600, 480);
stage.setScene(root); stage.setScene(root);
root.getStylesheets().add("styleguide.css");
// general updates to the buttons, user stats/inventory, and text. // general updates to the buttons, user stats/inventory, and text.
buttonSetup("reset"); buttonSetup("reset");
@@ -538,11 +541,12 @@ public class TaipanShopGUI extends Player{
defaultTextOut(); defaultTextOut();
textOut.setText(temp + textOut.getText()); textOut.setText(temp + textOut.getText());
} }
//defaultTextOut(); defaultTextOut();
updateStage(firm,wItemsText,wItemSpaceText,locationText,gunsText,inventoryText,inventoryHeldText,shipStatusText,cashText,bankText); updateStage(firm,wItemsText,wItemSpaceText,locationText,gunsText,inventoryText,inventoryHeldText,shipStatusText,cashText,bankText);
} }
public AnchorPane declareStage() {
public AnchorPane declareStage(FlowPane flowPane,Label firm, Label wItemsText, Label wItemSpaceText, Label locationText, Label gunsText, Label inventoryText, Label inventoryHeldText, Label shipStatusText, Label cashText, Label bankText, Label textOut) {
//Declaring all the elements required for the information on screen //Declaring all the elements required for the information on screen
Rectangle dialogueRectangle = new Rectangle(); Rectangle dialogueRectangle = new Rectangle();
Rectangle inventoryRectangle = new Rectangle(); Rectangle inventoryRectangle = new Rectangle();
@@ -558,7 +562,6 @@ public class TaipanShopGUI extends Player{
RowConstraints rowConstraints4 = new RowConstraints(); RowConstraints rowConstraints4 = new RowConstraints();
HBox hBox = new HBox(); HBox hBox = new HBox();
HBox hBox0 = new HBox(); HBox hBox0 = new HBox();
FlowPane flowPane = new FlowPane();
Font size14 = new Font(14.0); Font size14 = new Font(14.0);
Label warehouseText = new Label(); Label warehouseText = new Label();
@@ -707,8 +710,6 @@ public class TaipanShopGUI extends Player{
hBox0.getChildren().addAll(inventoryText, inventoryHeldText, gunsText, shipStatusText); hBox0.getChildren().addAll(inventoryText, inventoryHeldText, gunsText, shipStatusText);
//flowPane.getChildren().addAll(buyButton, sellButton, bankButton, cargoButton, loanButton, quitButton, retireButton, opiumButton, silkButton, armsButton, generalButton, numberInput);
gridPane.getColumnConstraints().add(columnConstraints); gridPane.getColumnConstraints().add(columnConstraints);
gridPane.getRowConstraints().addAll(rowConstraints, rowConstraints0, rowConstraints1, rowConstraints2, rowConstraints3, rowConstraints4); gridPane.getRowConstraints().addAll(rowConstraints, rowConstraints0, rowConstraints1, rowConstraints2, rowConstraints3, rowConstraints4);
gridPane.getChildren().addAll(firm, hBox, hBox0, cashText, bankText, textOut, flowPane); gridPane.getChildren().addAll(firm, hBox, hBox0, cashText, bankText, textOut, flowPane);
@@ -722,7 +723,7 @@ public class TaipanShopGUI extends Player{
* updates the text associated with the user's inventory. * updates the text associated with the user's inventory.
*/ */
public void updateStage(Label firm, Label wItemsText, Label wItemSpaceText, Label locationText, Label gunsText, Label inventoryText, Label inventoryHeldText, Label shipStatusText, Label cashText, Label bankText) { public void updateStage(Label firm, Label wItemsText, Label wItemSpaceText, Label locationText, Label gunsText, Label inventoryText, Label inventoryHeldText, Label shipStatusText, Label cashText, Label bankText) {
TaipanShopLogic logic = new TaipanShopLogic(getPlayer()); TaipanShopLogic logic = new TaipanShopLogic(super.getPlayer());
firm.setText(String.format("Firm: %s, %s", getName(), logic.getStringLocation())); firm.setText(String.format("Firm: %s, %s", getName(), logic.getStringLocation()));
wItemsText.setText(String.format("\n %d\n %d\n %d\n %d", getwOpium(), getwSilk(), getwArms(), getwGeneral())); wItemsText.setText(String.format("\n %d\n %d\n %d\n %d", getwOpium(), getwSilk(), getwArms(), getwGeneral()));
int itemsInWarehouse = getwOpium() + getwGeneral() + getwArms() + getwSilk(); int itemsInWarehouse = getwOpium() + getwGeneral() + getwArms() + getwSilk();

14
src/TravelGUI.java
View File

@@ -34,6 +34,7 @@ public class TravelGUI extends Player{
private Label cashText = new Label(); private Label cashText = new Label();
private Label bankText = new Label(); private Label bankText = new Label();
private Label textOut = new Label(); private Label textOut = new Label();
private FlowPane flowPane = new FlowPane();
private Button quitButton = new Button(); private Button quitButton = new Button();
private Button continueButton = new Button(); private Button continueButton = new Button();
@@ -62,10 +63,7 @@ public class TravelGUI extends Player{
* @return stage so that another class can switch to the stage * @return stage so that another class can switch to the stage
*/ */
public Stage initializeTravel(Stage stage) { public Stage initializeTravel(Stage stage) {
//Updates the stage for the first-time you read it
shop.updateStage(firm,wItemsText,wItemSpaceText,locationText,gunsText,inventoryText,inventoryHeldText,shipStatusText,cashText,bankText);
shop.declareStage();
//Creating the continue and quit buttons //Creating the continue and quit buttons
quitButton.setPrefHeight(25.0); quitButton.setPrefHeight(25.0);
@@ -171,9 +169,13 @@ public class TravelGUI extends Player{
firm.setPrefHeight(27.0); firm.setPrefHeight(27.0);
firm.setPrefWidth(632.0); firm.setPrefWidth(632.0);
firm.setFont(new Font(18.0)); firm.setFont(new Font(18.0));
flowPane.getChildren().addAll(numberInput, quitButton, continueButton);
Scene root = new Scene(shop.declareStage(), 600, 480); TaipanShopGUI shop = new TaipanShopGUI(super.getPlayer());
Scene root = new Scene(shop.declareStage(flowPane,firm,wItemsText,wItemSpaceText,locationText,gunsText,inventoryText,inventoryHeldText,shipStatusText,cashText,bankText,textOut), 600, 480);
root.getStylesheets().add("styleguide.css");
//Updates the stage for the first-time you read it
shop.updateStage(firm,wItemsText,wItemSpaceText,locationText,gunsText,inventoryText,inventoryHeldText,shipStatusText,cashText,bankText);
textOut.setText(" Taipan, do you wish to go to:\n\n 1) Hong Kong, 2) Shanghai, 3) Nagasaki, 4) Saigon,\n 5) Manila, 6) Singapore, or 7) Batavia?\n After typing the number you want to go to press 'Enter' or 'Z'");
stage.setTitle("Travel"); stage.setTitle("Travel");
stage.setResizable(false); stage.setResizable(false);
stage.setScene(root); stage.setScene(root);