Small thing, changed an output of warehouse a bit, shows user its the warehouse they are concerned with.
This commit is contained in:
@@ -50,7 +50,7 @@ public class Warehouse {
|
|||||||
* add followed by the good they would like to add to the warehouse.
|
* add followed by the good they would like to add to the warehouse.
|
||||||
* the method checks if the player has sufficient goods to transfer, and if the player does
|
* the method checks if the player has sufficient goods to transfer, and if the player does
|
||||||
* then the method executes the transfer
|
* then the method executes the transfer
|
||||||
* @exception e ensures the code does not fail due to an invalid input
|
*
|
||||||
*/
|
*/
|
||||||
public void addAmount() {
|
public void addAmount() {
|
||||||
boolean askGood = false;
|
boolean askGood = false;
|
||||||
@@ -135,7 +135,6 @@ public class Warehouse {
|
|||||||
* remove followed by the good they would like to remove from the warehouse.
|
* remove followed by the good they would like to remove from the warehouse.
|
||||||
* the method checks if the player has sufficient goods to transfer, and if the player does
|
* the method checks if the player has sufficient goods to transfer, and if the player does
|
||||||
* then the method executes the transfer
|
* then the method executes the transfer
|
||||||
* @exception e Ensures the code does not fail due to invalid response.
|
|
||||||
*
|
*
|
||||||
*/
|
*/
|
||||||
|
|
||||||
@@ -149,19 +148,26 @@ public class Warehouse {
|
|||||||
amount = keyboard.nextLine();
|
amount = keyboard.nextLine();
|
||||||
//The if statement checks that you have enough resources to make the transfer
|
//The if statement checks that you have enough resources to make the transfer
|
||||||
try {
|
try {
|
||||||
|
//The if statement checks that you have enough resources to make the transfer
|
||||||
if (Integer.parseInt(amount) <= player.getwOpium() || Integer.parseInt(amount) <= player.getwSilk() || Integer.parseInt(amount) <= player.getwGeneral() || Integer.parseInt(amount) <= player.getwArms()) {
|
if (Integer.parseInt(amount) <= player.getwOpium() || Integer.parseInt(amount) <= player.getwSilk() || Integer.parseInt(amount) <= player.getwGeneral() || Integer.parseInt(amount) <= player.getwArms()) {
|
||||||
finalAmount = Integer.parseInt(amount);
|
finalAmount = Integer.parseInt(amount);
|
||||||
askGood = true;
|
askGood = true;
|
||||||
} else {
|
}
|
||||||
|
//Else statement lets the user know that they do not hav enough goods to make the requested transfer
|
||||||
|
else {
|
||||||
System.out.println("Nice try but you don't have any items of that quantity in the warehouse!");
|
System.out.println("Nice try but you don't have any items of that quantity in the warehouse!");
|
||||||
askGood = false;
|
askGood = false;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
//Ensures that goods are only transferred if they have the specified amount
|
||||||
|
//The user is prompted to enter which good they want to transfer
|
||||||
|
|
||||||
if (askGood == true) {
|
if (askGood == true) {
|
||||||
String good;
|
String good;
|
||||||
System.out.println("Please enter a good to transfer O, S, G, A :");
|
System.out.println("Please enter a good to transfer O, S, G, A :");
|
||||||
good = keyboard.nextLine();
|
good = keyboard.nextLine();
|
||||||
int held = 0;
|
int held = 0;
|
||||||
|
//The following set of loops check to see which good the user has selected and makes the transfer and amount > 0
|
||||||
if (Integer.parseInt(amount) > 0) {
|
if (Integer.parseInt(amount) > 0) {
|
||||||
if (good.equalsIgnoreCase("O")) {
|
if (good.equalsIgnoreCase("O")) {
|
||||||
if (player.getwOpium() >= Integer.parseInt(amount)) {
|
if (player.getwOpium() >= Integer.parseInt(amount)) {
|
||||||
@@ -198,16 +204,24 @@ public class Warehouse {
|
|||||||
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
} else {
|
}
|
||||||
|
//Ensures the value entered is positive
|
||||||
|
else {
|
||||||
System.out.println("Sorry this transfer cannot be made");
|
System.out.println("Sorry this transfer cannot be made");
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}catch (Exception e){
|
}
|
||||||
|
//If the program errors out this is the message displayed and the method is re-run, so that the game does not end.
|
||||||
|
catch (Exception e){
|
||||||
System.out.println("Wait, that's not a valid input please try again");
|
System.out.println("Wait, that's not a valid input please try again");
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* This method prints the stock that is in the warehouse currently using the get and set
|
||||||
|
* methods from the player class. This is to allow the user to be able to know how much they have
|
||||||
|
* stored in the warehouse
|
||||||
|
*/
|
||||||
public void showWarehouse() {
|
public void showWarehouse() {
|
||||||
System.out.println("--------------------\nWarehouse\n--------------------");
|
System.out.println("--------------------\nWarehouse\n--------------------");
|
||||||
System.out.println("Opium : " + player.getwOpium());
|
System.out.println("Opium : " + player.getwOpium());
|
||||||
@@ -216,7 +230,11 @@ public class Warehouse {
|
|||||||
System.out.println("Arms : " + player.getwArms());
|
System.out.println("Arms : " + player.getwArms());
|
||||||
}
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* This method combines the add and remove methods and prompts the user to
|
||||||
|
* enter what they would like to do. Add or remove and accordingly invokes
|
||||||
|
* the required methods
|
||||||
|
*/
|
||||||
public void changeWarehouse() {
|
public void changeWarehouse() {
|
||||||
boolean keepGoing = true;
|
boolean keepGoing = true;
|
||||||
while (keepGoing) {
|
while (keepGoing) {
|
||||||
@@ -238,6 +256,7 @@ public class Warehouse {
|
|||||||
}
|
}
|
||||||
|
|
||||||
String check;
|
String check;
|
||||||
|
//Check to see if the player wants to continue in the warehouse or they are done
|
||||||
System.out.println("Would you like to do any other business? Y / N?");
|
System.out.println("Would you like to do any other business? Y / N?");
|
||||||
check = keyboard.nextLine();
|
check = keyboard.nextLine();
|
||||||
check = keyboard.nextLine();
|
check = keyboard.nextLine();
|
||||||
@@ -250,7 +269,4 @@ public class Warehouse {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
public static void main(String[] args) {
|
|
||||||
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
|
|||||||
Reference in New Issue
Block a user