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-02-18 18:38:24 -07:00
parent 53a5115f01 be8eddaa5c
commit f419834f79
1 changed files with 5 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
src/TaipanShop.java
View File

@@ -15,7 +15,7 @@ public class TaipanShop {
private int silkPrice = 1600; private int silkPrice = 1600;
private int armsPrice = 160; private int armsPrice = 160;
private int generalPrice = 8; private int generalPrice = 8;
private int location = 2; private int location = 1;
private int guns = 0; private int guns = 0;
public void updatePrices(){ public void updatePrices(){
@@ -300,11 +300,11 @@ public class TaipanShop {
} else if (response.equalsIgnoreCase("S")) { } else if (response.equalsIgnoreCase("S")) {
boolean notDone2 = true; boolean notDone2 = true;
System.out.println("What do you wish me to sell, " + name + "? (You have " + opiumHeld + ")"); System.out.println("What do you wish me to sell, " + name + "?");
while (notDone2) { while (notDone2) {
response = input.nextLine(); response = input.nextLine();
if (response.equalsIgnoreCase("O")) { if (response.equalsIgnoreCase("O")) {
System.out.println("\nHow much Opium shall I sell, " + name + "?"); System.out.println("\nHow much Opium shall I sell, " + name + "? (You have " + opiumHeld + ")");
while (notDone2) { while (notDone2) {
int num = input.nextInt(); int num = input.nextInt();
if (num <= opiumHeld && num >= 0) { if (num <= opiumHeld && num >= 0) {
@@ -373,4 +373,5 @@ public class TaipanShop {
TaipanShop shop = new TaipanShop(); TaipanShop shop = new TaipanShop();
shop.shop(); shop.shop();
} }
} }