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

Finished cleaning up the code. Ready for Demo 2

Browse Source
This commit is contained in:
Solargale
2019-03-11 02:05:26 -06:00
parent 076ba12ef1
commit 11b16b4e40
10 changed files with 615 additions and 567 deletions
Download Patch File Download Diff File Expand all files Collapse all files

38
src/GameEndGUI.java
View File

@@ -1,4 +1,3 @@
import javafx.geometry.Insets; import javafx.geometry.Insets;
import javafx.scene.Scene; import javafx.scene.Scene;
import javafx.scene.control.Label; import javafx.scene.control.Label;
@@ -22,19 +21,15 @@ public class GameEndGUI {
this.player = playerDummy; this.player = playerDummy;
} }
public void setPlayer(Player player) { /**
Player playerDummy = new Player(player); * Sets up the graphical part of GameEndGUI and includes all logic for the class
this.player = playerDummy; *
} * @param stage sets the stage to which we will execute the scene of the GameEndGUI class
* @return stage so that another class can switch to the stage
public Player getPlayer(){ */
Player playerDummy = new Player(player);
return playerDummy;
}
public Stage initializeGameEndGUI(Stage stage) { public Stage initializeGameEndGUI(Stage stage) {
//Creating all the nodes
title = new Label(); title = new Label();
vBox = new VBox(); vBox = new VBox();
firmName = new Label(); firmName = new Label();
@@ -46,6 +41,7 @@ public class GameEndGUI {
borderPane.setPrefHeight(480.0); borderPane.setPrefHeight(480.0);
borderPane.setPrefWidth(600.0); borderPane.setPrefWidth(600.0);
//Setting positions and names of all the nodes
BorderPane.setAlignment(title, javafx.geometry.Pos.CENTER); BorderPane.setAlignment(title, javafx.geometry.Pos.CENTER);
title.setText("Game Over!"); title.setText("Game Over!");
title.setFont(new Font(43.0)); title.setFont(new Font(43.0));
@@ -69,21 +65,29 @@ public class GameEndGUI {
borderPane.setCenter(vBox); borderPane.setCenter(vBox);
//Adding the labels to the character's stats to the VBox which will show up on the screen
vBox.getChildren().add(firmName); vBox.getChildren().add(firmName);
vBox.getChildren().add(gunsHeld); vBox.getChildren().add(gunsHeld);
vBox.getChildren().add(netWorth); vBox.getChildren().add(netWorth);
/**
* If health is below or equal to 0 then the game will either show the gameOver screen or the win screen
* */
if (player.getHP() <= 0) { if (player.getHP() <= 0) {
title.setText("Game Over!"); title.setText("Game Over!");
} } else {
else{
title.setText("Congratulations!"); title.setText("Congratulations!");
} }
/**
* Calculates the networth of the player by the end of the game
* */
netWorthInt = player.getMoney() + (player.getOpiumHeld() * 16000) + (player.getSilkHeld() * 160) + (player.getArmsHeld() * 160) + (player.getGeneralHeld() * 8); netWorthInt = player.getMoney() + (player.getOpiumHeld() * 16000) + (player.getSilkHeld() * 160) + (player.getArmsHeld() * 160) + (player.getGeneralHeld() * 8);
netWorthInt += (player.getwOpium() * 16000) + (player.getwSilk() * 160) + (player.getwArms() * 160) + (player.getwGeneral() * 8); netWorthInt += (player.getwOpium() * 16000) + (player.getwSilk() * 160) + (player.getwArms() * 160) + (player.getwGeneral() * 8);
netWorthInt -= player.getDebt(); netWorthInt -= player.getDebt();
//Updating the endgame stats of the player
firmName.setText("Firm Name: " + player.getName()); firmName.setText("Firm Name: " + player.getName());
gunsHeld.setText("Guns Held: " + player.getGuns()); gunsHeld.setText("Guns Held: " + player.getGuns());
netWorth.setText("Net Worth: " + netWorthInt); netWorth.setText("Net Worth: " + netWorthInt);
@@ -97,7 +101,11 @@ public class GameEndGUI {
return stage; return stage;
} }
/**
* sets scene and runs stage
*
* @param primaryStage the stage in which the scene may be run and switched to
*/
public void start(Stage primaryStage) { public void start(Stage primaryStage) {
GameEndGUI gameEndGUI = new GameEndGUI(player); GameEndGUI gameEndGUI = new GameEndGUI(player);
gameEndGUI.initializeGameEndGUI(primaryStage); gameEndGUI.initializeGameEndGUI(primaryStage);

2
src/MainGUI.java
View File

@@ -1,4 +1,3 @@
import javafx.application.Application; import javafx.application.Application;
import javafx.stage.Stage; import javafx.stage.Stage;
@@ -31,6 +30,7 @@ public class MainGUI extends Application {
/** /**
* Updates main class with player data and starts the game. * Updates main class with player data and starts the game.
* The game will only run as long as the player has not retired or has been destroyed. * The game will only run as long as the player has not retired or has been destroyed.
*
* @param args Just the console for the player to look at. * @param args Just the console for the player to look at.
*/ */
public static void main(String[] args) { public static void main(String[] args) {

1
src/Player.java
View File

@@ -437,7 +437,6 @@ public class Player {
/** /**
* Method to indicate that you have lost the game. If the player has lost, console will be cleared and will only * Method to indicate that you have lost the game. If the player has lost, console will be cleared and will only
* show the statement "Game Over". After showing the message the game closes. * show the statement "Game Over". After showing the message the game closes.
*
**/ **/
public void gameOver() { public void gameOver() {

2
src/ShipWarfareGUI.java
View File

@@ -357,7 +357,7 @@ public class ShipWarfareGUI {
BorderPane.setBottom(hBox); BorderPane.setBottom(hBox);
runButton.setText("Run"); runButton.setText("Run");
BorderPane.setAlignment(vBox, javafx.geometry.Pos.CENTER); javafx.scene.layout.BorderPane.setAlignment(vBox, javafx.geometry.Pos.CENTER);
vBox.setAlignment(javafx.geometry.Pos.TOP_CENTER); vBox.setAlignment(javafx.geometry.Pos.TOP_CENTER);
vBox.setPrefHeight(200.0); vBox.setPrefHeight(200.0);
vBox.setPrefWidth(100.0); vBox.setPrefWidth(100.0);

8
src/StartGUI.java
View File

@@ -52,8 +52,7 @@ public class StartGUI {
public void setFirm(String name) { public void setFirm(String name) {
if (name.length() <= 22) { if (name.length() <= 22) {
player.setName(name); player.setName(name);
} } else {
else{
player.setName("Taipan"); player.setName("Taipan");
} }
} }
@@ -63,8 +62,7 @@ public class StartGUI {
* Copy constructor. * Copy constructor.
* @param player object of the class Player * @param player object of the class Player
*/ */
public StartGUI(Player player) public StartGUI(Player player) {
{
Player playerTemp = new Player(player); Player playerTemp = new Player(player);
this.player = playerTemp; this.player = playerTemp;
} }
@@ -81,7 +79,7 @@ public class StartGUI {
* Creates an HBox at the center of the borderpane with a width of 200, height of 100 and spacing of 10. * Creates an HBox at the center of the borderpane with a width of 200, height of 100 and spacing of 10.
* *
*/ */
borderPane.setAlignment(hBox, javafx.geometry.Pos.CENTER); BorderPane.setAlignment(hBox, javafx.geometry.Pos.CENTER);
hBox.setAlignment(javafx.geometry.Pos.CENTER); hBox.setAlignment(javafx.geometry.Pos.CENTER);
hBox.setPrefHeight(100.0); hBox.setPrefHeight(100.0);
hBox.setPrefWidth(200.0); hBox.setPrefWidth(200.0);

87
src/TaipanShopGUI.java
View File

@@ -1,17 +1,18 @@
import javafx.event.ActionEvent; import javafx.event.ActionEvent;
import javafx.event.EventHandler; import javafx.event.EventHandler;
import javafx.geometry.Insets;
import javafx.geometry.Pos; import javafx.geometry.Pos;
import javafx.scene.Scene; import javafx.scene.Scene;
import javafx.scene.control.Button; import javafx.scene.control.Button;
import javafx.scene.control.Label;
import javafx.scene.control.TextField; import javafx.scene.control.TextField;
import javafx.scene.input.KeyCode; import javafx.scene.input.KeyCode;
import javafx.scene.input.KeyEvent; import javafx.scene.input.KeyEvent;
import javafx.scene.layout.*; import javafx.scene.layout.*;
import javafx.stage.Stage;
import javafx.geometry.Insets;
import javafx.scene.control.Label;
import javafx.scene.shape.Rectangle; import javafx.scene.shape.Rectangle;
import javafx.scene.text.Font; import javafx.scene.text.Font;
import javafx.stage.Stage;
import java.util.Random; import java.util.Random;
public class TaipanShopGUI { public class TaipanShopGUI {
@@ -796,14 +797,30 @@ public class TaipanShopGUI {
public String getStringLocation() { public String getStringLocation() {
String location; String location;
switch (player.getLocation()) { switch (player.getLocation()) {
case 1: location = "Hong Kong"; break; case 1:
case 2: location = "Shanghai"; break; location = "Hong Kong";
case 3: location = "Nagasaki"; break; break;
case 4: location = "Saigon"; break; case 2:
case 5: location = "Manila"; break; location = "Shanghai";
case 6: location = "Singapore"; break; break;
case 7: location = "Batavia"; break; case 3:
default: location = "Error"; break; location = "Nagasaki";
break;
case 4:
location = "Saigon";
break;
case 5:
location = "Manila";
break;
case 6:
location = "Singapore";
break;
case 7:
location = "Batavia";
break;
default:
location = "Error";
break;
} }
return location; return location;
} }
@@ -816,18 +833,42 @@ public class TaipanShopGUI {
public String shipStatusString() { public String shipStatusString() {
String shipStatus; String shipStatus;
switch (player.getHP() / 10) { switch (player.getHP() / 10) {
case 10: shipStatus = "Mint Condition"; break; case 10:
case 9: shipStatus = "Near Perfect"; break; shipStatus = "Mint Condition";
case 8: shipStatus = "Great"; break; break;
case 7: shipStatus = "Good"; break; case 9:
case 6: shipStatus = "Acceptable"; break; shipStatus = "Near Perfect";
case 5: shipStatus = "Tolerable"; break; break;
case 4: shipStatus = "Needs Repair"; break; case 8:
case 3: shipStatus = "Damaged"; break; shipStatus = "Great";
case 2: shipStatus = "Indangered"; break; break;
case 1: shipStatus = "Near Sinking"; break; case 7:
case 0: shipStatus = "Sinking"; break; shipStatus = "Good";
default: shipStatus = "Invincible"; break; break;
case 6:
shipStatus = "Acceptable";
break;
case 5:
shipStatus = "Tolerable";
break;
case 4:
shipStatus = "Needs Repair";
break;
case 3:
shipStatus = "Damaged";
break;
case 2:
shipStatus = "Indangered";
break;
case 1:
shipStatus = "Near Sinking";
break;
case 0:
shipStatus = "Sinking";
break;
default:
shipStatus = "Invincible";
break;
} }
return shipStatus; return shipStatus;
} }

59
src/TravelGUI.java
View File

@@ -1,19 +1,14 @@
import com.sun.org.apache.xpath.internal.operations.Bool; import javafx.geometry.Insets;
import javafx.application.Application;
import javafx.event.ActionEvent;
import javafx.event.EventHandler;
import javafx.geometry.Pos; import javafx.geometry.Pos;
import javafx.scene.Scene; import javafx.scene.Scene;
import javafx.scene.control.Button; import javafx.scene.control.Button;
import javafx.scene.control.Label;
import javafx.scene.control.TextField; import javafx.scene.control.TextField;
import javafx.scene.input.KeyCode; import javafx.scene.input.KeyCode;
import javafx.scene.input.KeyEvent;
import javafx.scene.layout.*; import javafx.scene.layout.*;
import javafx.stage.Stage;
import javafx.geometry.Insets;
import javafx.scene.control.Label;
import javafx.scene.shape.Rectangle; import javafx.scene.shape.Rectangle;
import javafx.scene.text.Font; import javafx.scene.text.Font;
import javafx.stage.Stage;
import java.util.Random; import java.util.Random;
@@ -41,22 +36,24 @@ public class TravelGUI{
private Boolean stormScene = false; private Boolean stormScene = false;
/**
* constructor; only runs when a Player object is provided. The constructor is fully encapsulated.
*
* @param player is a Player object that will be copied and the player instance variable is set to the copy.
*/
public TravelGUI(Player player) { public TravelGUI(Player player) {
Player playerDummy = new Player(player); Player playerDummy = new Player(player);
this.player = playerDummy; this.player = playerDummy;
} }
public void setPlayer(Player player) { /**
Player playerDummy = new Player(player); * Sets up the graphical part of TravelGUI and includes all logic for the class
this.player = playerDummy; *
} * @param stage sets the stage to which we will execute the scene of the TravelGUI class
* @return stage so that another class can switch to the stage
public Player getPlayer(){ */
Player playerDummy = new Player(player);
return playerDummy;
}
public Stage initializeTravel(Stage stage){ public Stage initializeTravel(Stage stage){
//Updates the stage for the first-time you read it
updateStage(); updateStage();
Font size14 = new Font(14.0); Font size14 = new Font(14.0);
@@ -148,6 +145,7 @@ public class TravelGUI{
flowPane.setPrefHeight(200.0); flowPane.setPrefHeight(200.0);
flowPane.setPrefWidth(200.0); flowPane.setPrefWidth(200.0);
//Creating the continue and quit buttons
quitButton.setPrefHeight(25.0); quitButton.setPrefHeight(25.0);
quitButton.setMnemonicParsing(false); quitButton.setMnemonicParsing(false);
quitButton.setPrefWidth(90.0); quitButton.setPrefWidth(90.0);
@@ -180,7 +178,7 @@ public class TravelGUI{
} }
}); });
//Text input for where the player needs to go. //Text input for where the player needs to go inside of the game world
numberInput.setAlignment(javafx.geometry.Pos.CENTER_RIGHT); numberInput.setAlignment(javafx.geometry.Pos.CENTER_RIGHT);
numberInput.setText("Enter preferred location."); numberInput.setText("Enter preferred location.");
numberInput.setOnKeyPressed(event -> { numberInput.setOnKeyPressed(event -> {
@@ -217,9 +215,6 @@ public class TravelGUI{
quitButton.setVisible(false); quitButton.setVisible(false);
numberInput.setVisible(false); numberInput.setVisible(false);
shopScene = true; shopScene = true;
//TaipanShopGUI taipanShopGUI = new TaipanShopGUI(player);
//taipanShopGUI.initializeShop(stage);
//stage.show();
} }
} }
} }
@@ -295,6 +290,7 @@ public class TravelGUI{
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'"); 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'");
textOut.setFont(size14); textOut.setFont(size14);
//Added all the nodes into a single scene
anchorPane.getChildren().addAll(dialogueRectangle, inventoryRectangle, warehouseRectangle); anchorPane.getChildren().addAll(dialogueRectangle, inventoryRectangle, warehouseRectangle);
hBox.getChildren().addAll(warehouseText, wItemsText, wItemSpaceText, locationText); hBox.getChildren().addAll(warehouseText, wItemsText, wItemSpaceText, locationText);
@@ -410,6 +406,11 @@ public class TravelGUI{
} }
} }
/**
* converts the user's location (an integer) to a String, and returns it.
*
* @return location -- the user's location as a string; the actual name of the location.
*/
public String getStringLocation(){ public String getStringLocation(){
String location; String location;
switch(player.getLocation()){ switch(player.getLocation()){
@@ -425,6 +426,11 @@ public class TravelGUI{
return location; return location;
} }
/**
* returns the user's condition based upon their current HP.
*
* @return shipStatus -- a representation of their ship's health in words.
*/
public String shipStatusString(){ public String shipStatusString(){
String shipStatus; String shipStatus;
switch(player.getHP()/10){ switch(player.getHP()/10){
@@ -444,6 +450,9 @@ public class TravelGUI{
return shipStatus; return shipStatus;
} }
/**
* updates the text associated with the user's inventory.
*/
public void updateStage(){ public void updateStage(){
firm.setText(String.format("Firm: %s, %s", player.getName(), getStringLocation())); firm.setText(String.format("Firm: %s, %s", player.getName(), getStringLocation()));
wItemsText.setText(String.format("\n %d\n %d\n %d\n %d", player.getwOpium(), player.getwSilk(), player.getwArms(), player.getwGeneral())); wItemsText.setText(String.format("\n %d\n %d\n %d\n %d", player.getwOpium(), player.getwSilk(), player.getwArms(), player.getwGeneral()));
@@ -462,10 +471,4 @@ public class TravelGUI{
cashText.setText(String.format(" Cash: $%,d", player.getMoney())); cashText.setText(String.format(" Cash: $%,d", player.getMoney()));
bankText.setText(String.format("Bank: %d", player.getBank())); bankText.setText(String.format("Bank: %d", player.getBank()));
} }
public void start(Stage primaryStage) {
primaryStage = initializeTravel(primaryStage);
updateStage();
primaryStage.show();
}
} }

16
src/WarehouseGUI.java
View File

@@ -1,5 +1,3 @@
import javafx.application.Application;
import javafx.event.ActionEvent; import javafx.event.ActionEvent;
import javafx.event.EventHandler; import javafx.event.EventHandler;
import javafx.scene.Scene; import javafx.scene.Scene;
@@ -13,7 +11,6 @@ import javafx.stage.Stage;
/** /**
* A class that makes the GUI for the Warehouse class. * A class that makes the GUI for the Warehouse class.
*
*/ */
public class WarehouseGUI { public class WarehouseGUI {
@@ -48,6 +45,7 @@ public class WarehouseGUI {
private CheckMenuItem arms; private CheckMenuItem arms;
private CheckMenuItem silk; private CheckMenuItem silk;
private CheckMenuItem opium; private CheckMenuItem opium;
/** /**
* A constructor that takes an object of type Player as an argument * A constructor that takes an object of type Player as an argument
* *
@@ -129,7 +127,7 @@ public class WarehouseGUI {
* Creates a label "Hong Kong Warehouse: at the top of the borderpane. * Creates a label "Hong Kong Warehouse: at the top of the borderpane.
* *
*/ */
borderPane.setAlignment(title, javafx.geometry.Pos.CENTER); BorderPane.setAlignment(title, javafx.geometry.Pos.CENTER);
title.setStrokeType(javafx.scene.shape.StrokeType.OUTSIDE); title.setStrokeType(javafx.scene.shape.StrokeType.OUTSIDE);
title.setStrokeWidth(0.0); title.setStrokeWidth(0.0);
@@ -154,7 +152,7 @@ public class WarehouseGUI {
* creates an HBox at the center of the borderpane with a width of 200 and height of 100. * creates an HBox at the center of the borderpane with a width of 200 and height of 100.
* *
*/ */
borderPane.setAlignment(hBox, javafx.geometry.Pos.CENTER); BorderPane.setAlignment(hBox, javafx.geometry.Pos.CENTER);
hBox.setAlignment(javafx.geometry.Pos.CENTER); hBox.setAlignment(javafx.geometry.Pos.CENTER);
hBox.setPrefHeight(100.0); hBox.setPrefHeight(100.0);
hBox.setPrefWidth(200.0); hBox.setPrefWidth(200.0);
@@ -406,7 +404,7 @@ public class WarehouseGUI {
borderPane.setRight(vBox1); borderPane.setRight(vBox1);
borderPane.setTop(title); borderPane.setTop(title);
borderPane.setAlignment(hBox, javafx.geometry.Pos.CENTER); BorderPane.setAlignment(hBox, javafx.geometry.Pos.CENTER);
hBox.setAlignment(javafx.geometry.Pos.CENTER); hBox.setAlignment(javafx.geometry.Pos.CENTER);
hBox.setPrefHeight(100.0); hBox.setPrefHeight(100.0);
hBox.setPrefWidth(200.0); hBox.setPrefWidth(200.0);
@@ -435,7 +433,7 @@ public class WarehouseGUI {
opium.setText("Opium"); opium.setText("Opium");
borderPane.setBottom(hBox); borderPane.setBottom(hBox);
borderPane.setAlignment(vBox, javafx.geometry.Pos.CENTER_LEFT); BorderPane.setAlignment(vBox, javafx.geometry.Pos.CENTER_LEFT);
vBox.setPrefHeight(156.0); vBox.setPrefHeight(156.0);
vBox.setPrefWidth(106.0); vBox.setPrefWidth(106.0);
@@ -476,7 +474,7 @@ public class WarehouseGUI {
generalPlayer.setFont(new Font(18.0)); generalPlayer.setFont(new Font(18.0));
borderPane.setLeft(vBox); borderPane.setLeft(vBox);
borderPane.setAlignment(vBox0, javafx.geometry.Pos.TOP_LEFT); BorderPane.setAlignment(vBox0, javafx.geometry.Pos.TOP_LEFT);
vBox0.setAlignment(javafx.geometry.Pos.CENTER); vBox0.setAlignment(javafx.geometry.Pos.CENTER);
vBox0.setPrefHeight(343.0); vBox0.setPrefHeight(343.0);
vBox0.setPrefWidth(261.0); vBox0.setPrefWidth(261.0);
@@ -551,7 +549,7 @@ public class WarehouseGUI {
* Creates a VBox at the center of the borderpane with a width of 152 and a height of 48. * Creates a VBox at the center of the borderpane with a width of 152 and a height of 48.
* *
*/ */
borderPane.setAlignment(vBox1, javafx.geometry.Pos.CENTER); BorderPane.setAlignment(vBox1, javafx.geometry.Pos.CENTER);
vBox1.setPrefHeight(48.0); vBox1.setPrefHeight(48.0);
vBox1.setPrefWidth(152.0); vBox1.setPrefWidth(152.0);

20
src/bankGUI.java
View File

@@ -1,4 +1,3 @@
import javafx.application.Application;
import javafx.event.ActionEvent; import javafx.event.ActionEvent;
import javafx.event.EventHandler; import javafx.event.EventHandler;
import javafx.geometry.Pos; import javafx.geometry.Pos;
@@ -13,6 +12,7 @@ import javafx.stage.Stage;
public class bankGUI { public class bankGUI {
private Player player; private Player player;
/** /**
* setter method that takes in a Player object as an argument. * setter method that takes in a Player object as an argument.
* *
@@ -22,6 +22,7 @@ public class bankGUI{
Player playerDummy = new Player(player); Player playerDummy = new Player(player);
this.player = playerDummy; this.player = playerDummy;
} }
/** /**
* getter method for obtaining a player object. * getter method for obtaining a player object.
* *
@@ -31,10 +32,11 @@ public class bankGUI{
Player playerDummy = new Player(player); Player playerDummy = new Player(player);
return playerDummy; return playerDummy;
} }
/** /**
* Class Constructor that takes in a type player as a parameter * Class Constructor that takes in a type player as a parameter
* * <p>
//* @param player object of the class Player * //* @param player object of the class Player
*/ */
public bankGUI(Player player) { public bankGUI(Player player) {
Player playerDummy = new Player(player); Player playerDummy = new Player(player);
@@ -113,8 +115,7 @@ public class bankGUI{
if (withdraw <= player.getBank()) { if (withdraw <= player.getBank()) {
player.setMoney(withdraw + player.getMoney()); player.setMoney(withdraw + player.getMoney());
player.setBank(player.getBank() - withdraw); player.setBank(player.getBank() - withdraw);
} } else {
else {
l5.setText("Sorry you cannot withdraw that much"); l5.setText("Sorry you cannot withdraw that much");
} }
l2.setText("Current Balance: " + player.getBank()); l2.setText("Current Balance: " + player.getBank());
@@ -135,8 +136,7 @@ public class bankGUI{
if (deposit <= player.getMoney()) { if (deposit <= player.getMoney()) {
player.setBank(deposit + player.getBank()); player.setBank(deposit + player.getBank());
player.setMoney(player.getMoney() - deposit); player.setMoney(player.getMoney() - deposit);
} } else {
else{
l5.setText("Sorry you cannot deposit that much"); l5.setText("Sorry you cannot deposit that much");
} }
l2.setText("Current Balance: " + player.getBank()); l2.setText("Current Balance: " + player.getBank());
@@ -167,10 +167,14 @@ public class bankGUI{
*/ */
Scene scene = new Scene(brdr1, 600, 480); Scene scene = new Scene(brdr1, 600, 480);
primaryStage.setScene(scene); primaryStage.setScene(scene);
//primaryStage.show();
return primaryStage; return primaryStage;
} }
/**
* sets scene and runs stage
*
* @param primaryStage the stage in which the scene may be run and switched to
*/
public void start(Stage primaryStage) { public void start(Stage primaryStage) {
bankGUI bank = new bankGUI(player); bankGUI bank = new bankGUI(player);
bank.initializeBank(primaryStage); bank.initializeBank(primaryStage);

19
src/loanSharkGUI.java
View File

@@ -1,4 +1,3 @@
import javafx.application.Application;
import javafx.event.ActionEvent; import javafx.event.ActionEvent;
import javafx.event.EventHandler; import javafx.event.EventHandler;
import javafx.geometry.Pos; import javafx.geometry.Pos;
@@ -13,6 +12,7 @@ import javafx.stage.Stage;
public class loanSharkGUI { public class loanSharkGUI {
private Player player; private Player player;
/** /**
* setter method that takes in a Player object as an argument. * setter method that takes in a Player object as an argument.
* *
@@ -22,6 +22,7 @@ public class loanSharkGUI{
Player playerDummy = new Player(player); Player playerDummy = new Player(player);
this.player = playerDummy; this.player = playerDummy;
} }
/** /**
* getter method for obtaining a player object. * getter method for obtaining a player object.
* *
@@ -31,10 +32,11 @@ public class loanSharkGUI{
Player playerDummy = new Player(player); Player playerDummy = new Player(player);
return playerDummy; return playerDummy;
} }
/** /**
* Class Constructor that takes in a type player as a parameter * Class Constructor that takes in a type player as a parameter
* * <p>
//* @param player object of the class Player * //* @param player object of the class Player
*/ */
public loanSharkGUI(Player player) { public loanSharkGUI(Player player) {
Player playerDummy = new Player(player); Player playerDummy = new Player(player);
@@ -97,8 +99,7 @@ public class loanSharkGUI{
player.setDebt(player.getDebt() + loanAsk); player.setDebt(player.getDebt() + loanAsk);
player.setMoney(player.getMoney() + loanAsk); player.setMoney(player.getMoney() + loanAsk);
l4.setText("Current cash: " + player.getMoney()); l4.setText("Current cash: " + player.getMoney());
} } else {
else {
l5.setText("Sorry you cannot be loaned that much"); l5.setText("Sorry you cannot be loaned that much");
} }
@@ -117,12 +118,9 @@ public class loanSharkGUI{
player.setDebt(player.getDebt() - returnAsk); player.setDebt(player.getDebt() - returnAsk);
player.setMoney(player.getMoney() - returnAsk); player.setMoney(player.getMoney() - returnAsk);
l4.setText("Current cash: " + player.getMoney()); l4.setText("Current cash: " + player.getMoney());
} } else if (returnAsk > player.getDebt()) {
else if(returnAsk > player.getDebt()){
l5.setText("Sorry you cannot be loaned that much"); l5.setText("Sorry you cannot be loaned that much");
} } else {
else{
l5.setText("Sorry you cannot return a negative amount"); l5.setText("Sorry you cannot return a negative amount");
} }
l2.setText("Debt: " + player.getDebt()); l2.setText("Debt: " + player.getDebt());
@@ -141,7 +139,6 @@ public class loanSharkGUI{
); );
//Setting the Scene and displaying it //Setting the Scene and displaying it
Scene scene = new Scene(brdr1, 600, 480); Scene scene = new Scene(brdr1, 600, 480);
primaryStage.setScene(scene); primaryStage.setScene(scene);