From 2d1864bb871931c0e69a264237ea776f0a07941a Mon Sep 17 00:00:00 2001 From: Solargale Date: Mon, 25 Feb 2019 23:31:39 -0700 Subject: [PATCH] Fixed the commenting on a lot of the code. Also added some stuff to Travel, fixed some bugs. --- out/production/TaipanClone/ShipWarfare.class | Bin 7592 -> 4807 bytes src/Player.java | 7 +- src/Start.java | 8 +- src/TaipanShop.java | 4 +- src/Travel.java | 113 +++++++++++++++---- src/main.java | 2 - 6 files changed, 99 insertions(+), 35 deletions(-) diff --git a/out/production/TaipanClone/ShipWarfare.class b/out/production/TaipanClone/ShipWarfare.class index ed2afdeb7d4665cb5a98f0f2a32055cb54ce7299..26c4c4cf4f1e7cd2bdc0cb9f3339088556823886 100644 GIT binary patch literal 4807 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 literal 7592 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 (player.getOpiumHeld()+ (player.getGuns()*10)+player.getSilkHeld() + player.getArmsHeld() + player.getGeneralHeld())){ + while (true) { + System.out.println("\n" + player.getName() + ", do you wish to go to:\n"); + System.out.println("1) Hong Kong, 2) Shanghai, 3) Nagasaki,\n4) Saigon, 5) Manila, 6) Singapore, or 7) Batavia?"); - response = keyboard.nextLine(); - try { - tempInt = Integer.parseInt(response); - System.out.println(tempInt + " " + player.getLocation()); - if (tempInt != player.getLocation()) { - randomEventSea(tempInt); - seaAtlas(tempInt); - hasTraveled = true; - player.setBank((int)(player.getBank() * 1.01)); - player.setDebt((int)(player.getDebt() * 1.01)); - } else System.out.println("\nYou're already here " + player.getName() + "."); - } catch (Exception e) { - System.out.print("\nSorry, " + player.getName() + " could you say that again?"); - } - if (hasTraveled) { - break; + response = keyboard.nextLine(); + //Just in case the player types something that was not intended. It will refresh the question and ask it again + try { + tempInt = Integer.parseInt(response); + //Makes sure you can't travel to your own location. + if (tempInt != player.getLocation()) { + randomEventSea(tempInt); + seaAtlas(tempInt); + hasTraveled = true; + player.setBank((int) (player.getBank() * 1.01)); + player.setDebt((int) (player.getDebt() * 1.01)); + } else System.out.println("\nYou're already here " + player.getName() + "."); + } catch (Exception e) { + System.out.print("\nSorry, " + player.getName() + " could you say that again?"); + } + if (hasTraveled) { + break; + } } } + else{ + System.out.println(player.getName() + " the cargo is too heavy! We can't set sail!"); + } } } diff --git a/src/main.java b/src/main.java index f45a119..e297598 100644 --- a/src/main.java +++ b/src/main.java @@ -40,9 +40,7 @@ public class main { /** * 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. - * */ - public static void main(String[] args) { main main = new main(); TaipanShop littyShop = new TaipanShop(main.getPlayer());