From fe03244b6c83c04c362fa7c1788481729f32fd19 Mon Sep 17 00:00:00 2001
From: KahootChampion <p.harismuhammadkhan@gmail.com>
Date: Mon, 18 Feb 2019 22:35:29 -0700
Subject: [PATCH 1/3] Vikram, these are the types of changes Harkey and I meant
 for you to establish.

---
 .idea/misc.xml                               |   2 +-
 .idea/workspace.xml                          | 135 +++++++---
 out/production/TaipanClone/ShipWarfare.class | Bin 4146 -> 4146 bytes
 src/TaipanShop.java                          | 270 +++++++++++--------
 4 files changed, 254 insertions(+), 153 deletions(-)

diff --git a/.idea/misc.xml b/.idea/misc.xml
index 8466a13..479cb83 100644
--- a/.idea/misc.xml
+++ b/.idea/misc.xml
@@ -3,7 +3,7 @@
   <component name="ProjectKey">
     <option name="state" value="project://63537948-39a4-48a0-9c97-34259a0fa913" />
   </component>
-  <component name="ProjectRootManager" version="2" languageLevel="JDK_1_8" default="true" project-jdk-name="1.8.0_191" project-jdk-type="JavaSDK">
+  <component name="ProjectRootManager" version="2" languageLevel="JDK_1_8" default="true" project-jdk-name="1.8.0_201" project-jdk-type="JavaSDK">
     <output url="file://$PROJECT_DIR$/out" />
   </component>
   <component name="SvnBranchConfigurationManager">
diff --git a/.idea/workspace.xml b/.idea/workspace.xml
index ae040a0..0e191d0 100644
--- a/.idea/workspace.xml
+++ b/.idea/workspace.xml
@@ -1,7 +1,12 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <project version="4">
   <component name="ChangeListManager">
-    <list default="true" id="3114a2b9-4919-4fdf-8fd9-d03b60109ce4" name="Default Changelist" comment="" />
+    <list default="true" id="3114a2b9-4919-4fdf-8fd9-d03b60109ce4" name="Default Changelist" comment="">
+      <change beforePath="$PROJECT_DIR$/.idea/misc.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/misc.xml" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/out/production/TaipanClone/ShipWarfare.class" beforeDir="false" afterPath="$PROJECT_DIR$/out/production/TaipanClone/ShipWarfare.class" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/TaipanShop.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/TaipanShop.java" afterDir="false" />
+    </list>
     <ignored path="$PROJECT_DIR$/out/" />
     <option name="EXCLUDED_CONVERTED_TO_IGNORED" value="true" />
     <option name="SHOW_DIALOG" value="false" />
@@ -14,8 +19,8 @@
       <file pinned="false" current-in-tab="false">
         <entry file="file://$PROJECT_DIR$/src/ShipWarfare.java">
           <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="209">
-              <caret line="11" column="36" lean-forward="true" selection-start-line="11" selection-start-column="36" selection-end-line="11" selection-end-column="36" />
+            <state relative-caret-position="-673">
+              <caret line="9" column="55" selection-start-line="9" selection-start-column="55" selection-end-line="9" selection-end-column="55" />
               <folding>
                 <element signature="imports" expanded="true" />
                 <element signature="e#1150#1151#0" expanded="true" />
@@ -27,23 +32,46 @@
           </provider>
         </entry>
       </file>
-      <file pinned="false" current-in-tab="true">
-        <entry file="file://$PROJECT_DIR$/src/TaipanShop.java">
+      <file pinned="false" current-in-tab="false">
+        <entry file="file://$PROJECT_DIR$/src/Player.java">
           <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="380">
-              <caret line="20" column="22" lean-forward="true" selection-start-line="20" selection-start-column="22" selection-end-line="20" selection-end-column="22" />
+            <state relative-caret-position="30">
+              <caret line="2" column="35" lean-forward="true" selection-start-line="2" selection-start-column="35" selection-end-line="2" selection-end-column="35" />
               <folding>
-                <element signature="imports" expanded="true" />
+                <element signature="e#350#351#0" expanded="true" />
+                <element signature="e#377#378#0" expanded="true" />
+                <element signature="e#417#418#0" expanded="true" />
+                <element signature="e#449#450#0" expanded="true" />
+                <element signature="e#475#476#0" expanded="true" />
+                <element signature="e#500#501#0" expanded="true" />
               </folding>
             </state>
           </provider>
         </entry>
       </file>
-      <file pinned="false" current-in-tab="false">
-        <entry file="file://$PROJECT_DIR$/src/Player.java">
+      <file pinned="false" current-in-tab="true">
+        <entry file="file://$PROJECT_DIR$/src/TaipanShop.java">
           <provider selected="true" editor-type-id="text-editor">
-            <state>
-              <caret column="13" selection-start-column="13" selection-end-column="13" />
+            <state relative-caret-position="810">
+              <caret line="55" column="30" lean-forward="true" selection-start-line="55" selection-start-column="30" selection-end-line="55" selection-end-column="30" />
+              <folding>
+                <element signature="e#371#372#0" expanded="true" />
+                <element signature="e#404#405#0" expanded="true" />
+                <element signature="e#453#454#0" expanded="true" />
+                <element signature="e#497#498#0" expanded="true" />
+                <element signature="e#530#531#0" expanded="true" />
+                <element signature="e#562#563#0" expanded="true" />
+                <element signature="e#609#610#0" expanded="true" />
+                <element signature="e#651#652#0" expanded="true" />
+                <element signature="e#684#685#0" expanded="true" />
+                <element signature="e#716#717#0" expanded="true" />
+                <element signature="e#763#764#0" expanded="true" />
+                <element signature="e#805#806#0" expanded="true" />
+                <element signature="e#841#842#0" expanded="true" />
+                <element signature="e#876#877#0" expanded="true" />
+                <element signature="e#929#930#0" expanded="true" />
+                <element signature="e#977#978#0" expanded="true" />
+              </folding>
             </state>
           </provider>
         </entry>
@@ -66,6 +94,8 @@
       <find>bank</find>
       <find>player.getMoney() += num *</find>
       <find>opiumHeld</find>
+      <find>hp</find>
+      <find>player.</find>
     </findStrings>
     <replaceStrings>
       <replace>player.getName()</replace>
@@ -75,6 +105,7 @@
     </replaceStrings>
   </component>
   <component name="Git.Settings">
+    <option name="UPDATE_TYPE" value="MERGE" />
     <option name="RECENT_GIT_ROOT_PATH" value="$PROJECT_DIR$" />
   </component>
   <component name="IdeDocumentHistory">
@@ -96,8 +127,8 @@
       <foldersAlwaysOnTop value="true" />
     </navigator>
     <panes>
-      <pane id="PackagesPane" />
       <pane id="Scope" />
+      <pane id="PackagesPane" />
       <pane id="ProjectPane">
         <subPane>
           <expand>
@@ -119,12 +150,12 @@
   <component name="PropertiesComponent">
     <property name="WebServerToolWindowFactoryState" value="false" />
     <property name="aspect.path.notification.shown" value="true" />
-    <property name="com.android.tools.idea.instantapp.provision.ProvisionBeforeRunTaskProvider.myTimeStamp" value="1550544519995" />
+    <property name="com.android.tools.idea.instantapp.provision.ProvisionBeforeRunTaskProvider.myTimeStamp" value="1550552776844" />
     <property name="last_opened_file_path" value="$PROJECT_DIR$" />
-    <property name="project.structure.last.edited" value="SDKs" />
-    <property name="project.structure.proportion" value="0.0" />
+    <property name="project.structure.last.edited" value="Project" />
+    <property name="project.structure.proportion" value="0.15" />
     <property name="project.structure.side.proportion" value="0.2" />
-    <property name="settings.editor.selected.configurable" value="project.propVCSSupport.Mappings" />
+    <property name="settings.editor.selected.configurable" value="preferences.keymap" />
   </component>
   <component name="RunDashboard">
     <option name="ruleStates">
@@ -138,7 +169,7 @@
       </list>
     </option>
   </component>
-  <component name="RunManager" selected="Application.TaipanShop">
+  <component name="RunManager" selected="Application.ShipWarfare">
     <configuration name="Main" type="Application" factoryName="Application" temporary="true">
       <option name="MAIN_CLASS_NAME" value="Main" />
       <module name="TaipanClone" />
@@ -170,8 +201,8 @@
     </list>
     <recent_temporary>
       <list>
-        <item itemvalue="Application.TaipanShop" />
         <item itemvalue="Application.ShipWarfare" />
+        <item itemvalue="Application.TaipanShop" />
         <item itemvalue="Application.Main" />
       </list>
     </recent_temporary>
@@ -188,6 +219,9 @@
       <option name="presentableId" value="Default" />
       <updated>1550454898506</updated>
       <workItem from="1550454902781" duration="459000" />
+      <workItem from="1550550806467" duration="577000" />
+      <workItem from="1550552635138" duration="118000" />
+      <workItem from="1550553016386" duration="1451000" />
     </task>
     <task id="LOCAL-00001" summary="Added troll comments">
       <created>1550458807806</created>
@@ -214,12 +248,12 @@
     <servers />
   </component>
   <component name="TimeTrackingManager">
-    <option name="totallyTimeSpent" value="459000" />
+    <option name="totallyTimeSpent" value="2605000" />
   </component>
   <component name="ToolWindowManager">
-    <frame x="-8" y="-8" width="1936" height="1056" extended-state="6" />
+    <frame x="0" y="23" width="1280" height="709" extended-state="6" />
     <layout>
-      <window_info content_ui="combo" id="Project" order="0" visible="true" weight="0.1705757" />
+      <window_info active="true" content_ui="combo" id="Project" order="0" visible="true" weight="0.27786753" />
       <window_info id="Structure" order="1" side_tool="true" weight="0.25" />
       <window_info id="Image Layers" order="2" />
       <window_info id="Designer" order="3" />
@@ -228,17 +262,17 @@
       <window_info id="Favorites" order="6" side_tool="true" />
       <window_info anchor="bottom" id="Message" order="0" />
       <window_info anchor="bottom" id="Find" order="1" />
-      <window_info anchor="bottom" id="Run" order="2" weight="0.32827735" />
+      <window_info anchor="bottom" id="Run" order="2" weight="0.3273906" />
       <window_info anchor="bottom" id="Debug" order="3" weight="0.4" />
       <window_info anchor="bottom" id="Cvs" order="4" weight="0.25" />
       <window_info anchor="bottom" id="Inspection" order="5" weight="0.4" />
       <window_info anchor="bottom" id="TODO" order="6" />
       <window_info anchor="bottom" id="Docker" order="7" show_stripe_button="false" />
-      <window_info anchor="bottom" id="Version Control" order="8" sideWeight="0.49946696" visible="true" weight="0.32936078" />
+      <window_info anchor="bottom" id="Version Control" order="8" sideWeight="0.49946696" weight="0.32936078" />
       <window_info anchor="bottom" id="Database Changes" order="9" />
       <window_info anchor="bottom" id="Terminal" order="10" weight="0.32936078" />
-      <window_info anchor="bottom" id="Event Log" order="11" sideWeight="0.50053304" side_tool="true" weight="0.32936078" />
-      <window_info anchor="bottom" id="Messages" order="12" weight="0.32827735" />
+      <window_info anchor="bottom" id="Event Log" order="11" sideWeight="0.50053304" side_tool="true" weight="0.32901135" />
+      <window_info anchor="bottom" id="Messages" order="12" weight="0.60777956" />
       <window_info anchor="right" id="Commander" internal_type="SLIDING" order="0" type="SLIDING" weight="0.4" />
       <window_info anchor="right" id="Ant Build" order="1" weight="0.25" />
       <window_info anchor="right" content_ui="combo" id="Hierarchy" order="2" weight="0.25" />
@@ -266,17 +300,35 @@
     <entry file="file://$PROJECT_DIR$/TaipanClone.iml">
       <provider selected="true" editor-type-id="text-editor" />
     </entry>
+    <entry file="file://$PROJECT_DIR$/.idea/misc.xml">
+      <provider selected="true" editor-type-id="text-editor" />
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/Travel.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="30">
+          <caret line="2" lean-forward="true" selection-start-line="2" selection-end-line="2" />
+        </state>
+      </provider>
+    </entry>
     <entry file="file://$PROJECT_DIR$/src/Player.java">
       <provider selected="true" editor-type-id="text-editor">
-        <state>
-          <caret column="13" selection-start-column="13" selection-end-column="13" />
+        <state relative-caret-position="30">
+          <caret line="2" column="35" lean-forward="true" selection-start-line="2" selection-start-column="35" selection-end-line="2" selection-end-column="35" />
+          <folding>
+            <element signature="e#350#351#0" expanded="true" />
+            <element signature="e#377#378#0" expanded="true" />
+            <element signature="e#417#418#0" expanded="true" />
+            <element signature="e#449#450#0" expanded="true" />
+            <element signature="e#475#476#0" expanded="true" />
+            <element signature="e#500#501#0" expanded="true" />
+          </folding>
         </state>
       </provider>
     </entry>
     <entry file="file://$PROJECT_DIR$/src/ShipWarfare.java">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="209">
-          <caret line="11" column="36" lean-forward="true" selection-start-line="11" selection-start-column="36" selection-end-line="11" selection-end-column="36" />
+        <state relative-caret-position="-673">
+          <caret line="9" column="55" selection-start-line="9" selection-start-column="55" selection-end-line="9" selection-end-column="55" />
           <folding>
             <element signature="imports" expanded="true" />
             <element signature="e#1150#1151#0" expanded="true" />
@@ -289,10 +341,25 @@
     </entry>
     <entry file="file://$PROJECT_DIR$/src/TaipanShop.java">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="380">
-          <caret line="20" column="22" lean-forward="true" selection-start-line="20" selection-start-column="22" selection-end-line="20" selection-end-column="22" />
+        <state relative-caret-position="810">
+          <caret line="55" column="30" lean-forward="true" selection-start-line="55" selection-start-column="30" selection-end-line="55" selection-end-column="30" />
           <folding>
-            <element signature="imports" expanded="true" />
+            <element signature="e#371#372#0" expanded="true" />
+            <element signature="e#404#405#0" expanded="true" />
+            <element signature="e#453#454#0" expanded="true" />
+            <element signature="e#497#498#0" expanded="true" />
+            <element signature="e#530#531#0" expanded="true" />
+            <element signature="e#562#563#0" expanded="true" />
+            <element signature="e#609#610#0" expanded="true" />
+            <element signature="e#651#652#0" expanded="true" />
+            <element signature="e#684#685#0" expanded="true" />
+            <element signature="e#716#717#0" expanded="true" />
+            <element signature="e#763#764#0" expanded="true" />
+            <element signature="e#805#806#0" expanded="true" />
+            <element signature="e#841#842#0" expanded="true" />
+            <element signature="e#876#877#0" expanded="true" />
+            <element signature="e#929#930#0" expanded="true" />
+            <element signature="e#977#978#0" expanded="true" />
           </folding>
         </state>
       </provider>
@@ -337,7 +404,7 @@
       </state>
       <state key="JdkListConfigurable.UI">
         <settings>
-          <last-edited>1.8</last-edited>
+          <last-edited>1.8.0_201</last-edited>
           <splitter-proportions>
             <option name="proportions">
               <list>
diff --git a/out/production/TaipanClone/ShipWarfare.class b/out/production/TaipanClone/ShipWarfare.class
index b063c03aaf791a54832dbd62cec4ea530a0a0789..92592b5335928261234811258e25d8aaf74030be 100644
GIT binary patch
delta 376
zcmWO1$t#3$7{KxGL&MBFgDD|p8Ik2cOyOXO2xF<S?@JiF2+3B6u_Rls9FU#nXbA^W
zO8yDOQ4Y>74t_nCr%zAcdTwktwyR;I$tf5{U1LSg+ezb-NP?cGWf>ANkfcv&4nqpQ
z*!4HfX-dV1H2g`|Bh9-B8F-P2MmB-u5J@ia<dI6gk^)L7qzVVkl<FU5cX&BQDzH*X
zkn#|!38RJ>YKf)(cFyuBv(1=kQL$EnX(N<&BIqO<7m0LXr(1=4RJNBg`f$>(A_LSh
zNFzgZFsyV$%_!sQc7`eDnPyRK%gl1X9Op_rEbyT888<I1@yZJCtnyjI8egpQ!v?=>
z^2e5Vvn?9B_^~5aToTNlM6fSW97-HVlFhN?a3TeqN-<|r%DGf<Aq`wg6CP>dTDJy#
Po9@*2_gHw)y{yUq>K0G?

delta 376
zcmWO1=_`bB5Ww;8(6amNVoOM2SL8?vMIlFWAGOK3j&kO<jvOUN$PtOh^+J@JypT<D
zq?G&<ikI@jYj3>pYigRQna?yg_8a@P%V=^5hM~6MLYI5o_#_gir)U|5L<}V9V_K0R
z8E;bbH_c&6#fvn2N!M-W?bs|l$VMXve{!*rM+^ldQ%EMol&Gknj0PO~hj~7<5+hYu
zsV0CLf~X|~Cy~?<MT2|V@+ebHm}yp63xTu}Ogmw85J4yLbdf~2f_v17Ud8s|pr1-y
z3L8+!klGqnQzHyAs&Y3IOfth1b4;_qEPJXtW}b7^-Lc3sOT4hmD=WOS%4Zd8e6h|C
z8~md4$EJ9)B^o>8!>(BAltA_+i~|YhP@*}KOpYa+6UpaPiaC=~&ZV3SadIj3TuCFh
Ty4CO7bg#aDz`~>MVNLi4D7sOJ

diff --git a/src/TaipanShop.java b/src/TaipanShop.java
index bc4cb9e..15ba226 100644
--- a/src/TaipanShop.java
+++ b/src/TaipanShop.java
@@ -2,7 +2,6 @@ import java.util.Random;
 import java.util.Scanner;
 public class TaipanShop extends Player {
 
-    private Player player = new Player();
     private int cargoSpace = 60;
     private int currentCargo = 0;
     private int opiumPrice = 16000;
@@ -10,23 +9,58 @@ public class TaipanShop extends Player {
     private int armsPrice = 160;
     private int generalPrice = 8;
 
+    public int getOpiumPrice() {
+        return opiumPrice;
+    }
+
+    public void setOpiumPrice(int opiumPrice) {
+        this.opiumPrice = opiumPrice;
+    }
+
+    public int getSilkPrice() {
+        return silkPrice;
+    }
+
+    public void setSilkPrice(int silkPrice) {
+        this.silkPrice = silkPrice;
+    }
+
+    public int getArmsPrice() {
+        return armsPrice;
+    }
+
+    public void setArmsPrice(int armsPrice) {
+        this.armsPrice = armsPrice;
+    }
+
+    public int getGeneralPrice() {
+        return generalPrice;
+    }
+
+    public void setGeneralPrice(int generalPrice) {
+        this.generalPrice = generalPrice;
+    }
+
     private void updatePrices(){
-        String s = "\n" + player.getName() + ", the price of ";
+        String s = "\n" + getName() + ", the price of ";
         double value = 80*Math.random();
         Random rand = new Random();
-        opiumPrice = (rand.nextInt(201) + 60)*100;
-        silkPrice = (rand.nextInt(201) + 60)*10;
-        armsPrice = (rand.nextInt(21) + 6)*10;
-        generalPrice = rand.nextInt(17) + 4;
+
+        setOpiumPrice((rand.nextInt(201) + 60)*100);
+        setSilkPrice((rand.nextInt(201) + 60)*10);
+        setArmsPrice((rand.nextInt(21) + 6)*10);
+        setGeneralPrice(rand.nextInt(17) + 4);
+
         if(value < 8){
             if(value < 2){
                 if(value < 1){
-                    opiumPrice /= 5;
-                    System.out.println(s + "Opium has dropped to " + opiumPrice +"!!!\n");
+                    setOpiumPrice(getOpiumPrice()/5);
+                    System.out.println(s + "Opium has dropped to " + getOpiumPrice() +"!!!\n");
                 }else{
-                    opiumPrice *= 5;
-                    System.out.println(s + "Opium has risen to " + opiumPrice +"!!!\n");
+                    setOpiumPrice(getOpiumPrice()*5);
+                    System.out.println(s + "Opium has risen to " + getOpiumPrice() +"!!!\n");
                 }
+
             }else if(value < 4){
                 if(value < 3){
                     silkPrice /= 5;
@@ -56,18 +90,18 @@ public class TaipanShop extends Player {
     }
 
     private void printShop(){
-        currentCargo = player.getOpiumHeld()+player.getGuns()*10+player.getSilkHeld()+player.getArmsHeld()+player.getGeneralHeld();
+        currentCargo = getOpiumHeld()+getGuns()*10+getSilkHeld()+getArmsHeld()+getGeneralHeld();
         if(cargoSpace - currentCargo < 0){
-            System.out.println("Hold: Overloaded" + "          Guns: " + player.getGuns());
+            System.out.println("Hold: Overloaded" + "          Guns: " + getGuns());
         }else{
-            System.out.println("Hold: " + (cargoSpace-currentCargo) + "          Guns: " + player.getGuns());
+            System.out.println("Hold: " + (cargoSpace-currentCargo) + "          Guns: " + getGuns());
         }
         System.out.println("-------------------------------------------------------------");
-        System.out.println("     Opium: " + player.getOpiumHeld() + "      Silk: " + player.getSilkHeld());
-        System.out.println("     Arms: " + player.getArmsHeld() + "       General: " + player.getGeneralHeld());
+        System.out.println("     Opium: " + getOpiumHeld() + "      Silk: " + getSilkHeld());
+        System.out.println("     Arms: " + getArmsHeld() + "       General: " + getGeneralHeld());
         System.out.println("-------------------------------------------------------------");
-        System.out.println("Cash: " + player.getMoney() + "           Bank: " + player.getBank()+"\n");
-        System.out.println(player.getName() + ", present prices per unit here are:");
+        System.out.println("Cash: " + getMoney() + "           Bank: " + getBank()+"\n");
+        System.out.println(getName() + ", present prices per unit here are:");
         System.out.println("     Opium: " + opiumPrice + "    Silk: " + silkPrice);
         System.out.println("     Arms: " + armsPrice + "       General: " + generalPrice);
     }
@@ -76,70 +110,70 @@ public class TaipanShop extends Player {
         updatePrices();
         Scanner input = new Scanner(System.in);
         boolean notDone = true;
-        if (player.getLocation() == 1) {
+        if (getLocation() == 1) {
             while (notDone) {
                 printShop();
                 System.out.println("\nShall I Buy, Sell, Visit Bank, Transfer Cargo, or Quit Trading?");
                 String response = input.next();
                 if (response.equalsIgnoreCase("B")) {
                     boolean notDone2 = true;
-                    System.out.println("What do you wish me to buy, " + player.getName() + "?");
+                    System.out.println("What do you wish me to buy, " + getName() + "?");
                     while (notDone2) {
                         response = input.nextLine();
                         if (response.equalsIgnoreCase("O")) {
-                            System.out.println("\nHow much Opium shall I buy, " + player.getName() + "? (You can afford " + player.getMoney() / opiumPrice + ")");
+                            System.out.println("\nHow much Opium shall I buy, " + getName() + "? (You can afford " + getMoney() / opiumPrice + ")");
                             while (notDone2) {
                                 int num = input.nextInt();
-                                if (num <= player.getMoney() / opiumPrice && num >= 0) {
-                                    player.setOpiumHeld(player.getOpiumHeld()+num);
-                                    player.setMoney(player.getMoney()-num * opiumPrice);
+                                if (num <= getMoney() / opiumPrice && num >= 0) {
+                                    setOpiumHeld(getOpiumHeld()+num);
+                                    setMoney(getMoney()-num * opiumPrice);
                                     notDone2 = false;
                                 } else if (num >= 0) {
-                                    System.out.println(player.getName() + ", you can't afford that!");
+                                    System.out.println(getName() + ", you can't afford that!");
                                 } else {
-                                    System.out.println(player.getName() + ", how am I supposed to buy " + "'" + num + "'" + " Opium?");
+                                    System.out.println(getName() + ", how am I supposed to buy " + "'" + num + "'" + " Opium?");
                                 }
                             }
                         } else if (response.equalsIgnoreCase("S")) {
-                            System.out.println("\nHow much Silk shall I buy, " + player.getName() + "? (You can afford " + player.getMoney() / silkPrice + ")");
+                            System.out.println("\nHow much Silk shall I buy, " + getName() + "? (You can afford " + getMoney() / silkPrice + ")");
                             while (notDone2) {
                                 int num = input.nextInt();
-                                if (num <= player.getMoney() / silkPrice && num >= 0) {
-                                    player.setSilkHeld(player.getSilkHeld()+num);
-                                    player.setMoney(player.getMoney()-num * silkPrice);
+                                if (num <= getMoney() / silkPrice && num >= 0) {
+                                    setSilkHeld(getSilkHeld()+num);
+                                    setMoney(getMoney()-num * silkPrice);
                                     notDone2 = false;
                                 } else if (num >= 0) {
-                                    System.out.println(player.getName() + ", you can't afford that!");
+                                    System.out.println(getName() + ", you can't afford that!");
                                 } else {
-                                    System.out.println(player.getName() + ", how am I supposed to buy " + "'" + num + "'" + " Silk?");
+                                    System.out.println(getName() + ", how am I supposed to buy " + "'" + num + "'" + " Silk?");
                                 }
                             }
                         } else if (response.equalsIgnoreCase("A")) {
-                            System.out.println("\nHow many Arms shall I buy, " + player.getName() + "? (You can afford " + player.getMoney() / armsPrice + ")");
+                            System.out.println("\nHow many Arms shall I buy, " + getName() + "? (You can afford " + getMoney() / armsPrice + ")");
                             while (notDone2) {
                                 int num = input.nextInt();
-                                if (num <= player.getMoney() / armsPrice && num >= 0) {
-                                    player.setArmsHeld(player.getArmsHeld()+num);
-                                    player.setMoney(player.getMoney() - num*armsPrice);
+                                if (num <= getMoney() / armsPrice && num >= 0) {
+                                    setArmsHeld(getArmsHeld()+num);
+                                    setMoney(getMoney() - num*armsPrice);
                                     notDone2 = false;
                                 } else if (num >= 0) {
-                                    System.out.println(player.getName() + ", you can't afford that!");
+                                    System.out.println(getName() + ", you can't afford that!");
                                 } else {
-                                    System.out.println(player.getName() + ", how am I supposed to buy " + "'" + num + "'" + " Arms?");
+                                    System.out.println(getName() + ", how am I supposed to buy " + "'" + num + "'" + " Arms?");
                                 }
                             }
                         } else if (response.equalsIgnoreCase("G")) {
-                            System.out.println("\nHow much General Cargo shall I buy, " + player.getName() + "? (You can afford " + player.getMoney() / generalPrice + ")");
+                            System.out.println("\nHow much General Cargo shall I buy, " + getName() + "? (You can afford " + getMoney() / generalPrice + ")");
                             while (notDone2) {
                                 int num = input.nextInt();
-                                if (num <= player.getMoney() / generalPrice && num >= 0) {
-                                    player.setGeneralHeld(player.getGeneralHeld()+num);
-                                    player.setMoney(player.getMoney() - num*generalPrice);
+                                if (num <= getMoney() / generalPrice && num >= 0) {
+                                    setGeneralHeld(getGeneralHeld()+num);
+                                    setMoney(getMoney() - num*generalPrice);
                                     notDone2 = false;
                                 } else if (num >= 0) {
-                                    System.out.println(player.getName() + ", you can't afford that!");
+                                    System.out.println(getName() + ", you can't afford that!");
                                 } else {
-                                    System.out.println(player.getName() + ", how am I supposed to buy " + "'" + num + "'" + " General Cargo?");
+                                    System.out.println(getName() + ", how am I supposed to buy " + "'" + num + "'" + " General Cargo?");
                                 }
                             }
                         }
@@ -148,63 +182,63 @@ public class TaipanShop extends Player {
 
                 } else if (response.equalsIgnoreCase("S")) {
                     boolean notDone2 = true;
-                    System.out.println("What do you wish me to sell, " + player.getName() + "?");
+                    System.out.println("What do you wish me to sell, " + getName() + "?");
                     while (notDone2) {
                         response = input.nextLine();
                         if (response.equalsIgnoreCase("O")) {
-                            System.out.println("\nHow much Opium shall I sell, " + player.getName() + "? (You have " + player.getOpiumHeld() + ")");
+                            System.out.println("\nHow much Opium shall I sell, " + getName() + "? (You have " + getOpiumHeld() + ")");
                             while (notDone2) {
                                 int num = input.nextInt();
-                                if (num <= player.getOpiumHeld() && num >= 0) {
-                                    player.setOpiumHeld(player.getOpiumHeld()-num);
-                                    player.setMoney(player.getMoney() + num*opiumPrice);
+                                if (num <= getOpiumHeld() && num >= 0) {
+                                    setOpiumHeld(getOpiumHeld()-num);
+                                    setMoney(getMoney() + num*opiumPrice);
                                     notDone2 = false;
                                 } else if (num >= 0) {
-                                    System.out.println(player.getName() + ", you don't have that many to sell!");
+                                    System.out.println(getName() + ", you don't have that many to sell!");
                                 } else {
-                                    System.out.println(player.getName() + ", how am I supposed to sell " + "'" + num + "'" + " Opium?");
+                                    System.out.println(getName() + ", how am I supposed to sell " + "'" + num + "'" + " Opium?");
                                 }
                             }
                         } else if (response.equalsIgnoreCase("S")) {
-                            System.out.println("\nHow much Silk shall I sell, " + player.getName() + "? (You have " + player.getSilkHeld() + ")");
+                            System.out.println("\nHow much Silk shall I sell, " + getName() + "? (You have " + getSilkHeld() + ")");
                             while (notDone2) {
                                 int num = input.nextInt();
-                                if (num <= player.getSilkHeld() && num >= 0) {
-                                    player.setSilkHeld(player.getSilkHeld()-num);
-                                    player.setMoney(player.getMoney() + num*silkPrice);
+                                if (num <= getSilkHeld() && num >= 0) {
+                                    setSilkHeld(getSilkHeld()-num);
+                                    setMoney(getMoney() + num*silkPrice);
                                     notDone2 = false;
                                 } else if (num >= 0) {
-                                    System.out.println(player.getName() + ", you don't have that many to sell!");
+                                    System.out.println(getName() + ", you don't have that many to sell!");
                                 } else {
-                                    System.out.println(player.getName() + ", how am I supposed to sell " + "'" + num + "'" + " Silk?");
+                                    System.out.println(getName() + ", how am I supposed to sell " + "'" + num + "'" + " Silk?");
                                 }
                             }
                         } else if (response.equalsIgnoreCase("A")) {
-                            System.out.println("\nHow many Arms shall I sell, " + player.getName() + "? (You have " + player.getArmsHeld() + ")");
+                            System.out.println("\nHow many Arms shall I sell, " + getName() + "? (You have " + getArmsHeld() + ")");
                             while (notDone2) {
                                 int num = input.nextInt();
-                                if (num <= player.getArmsHeld() && num >= 0) {
-                                    player.setArmsHeld(player.getArmsHeld()-num);
-                                    player.setMoney(player.getMoney() + num*armsPrice);
+                                if (num <= getArmsHeld() && num >= 0) {
+                                    setArmsHeld(getArmsHeld()-num);
+                                    setMoney(getMoney() + num*armsPrice);
                                     notDone2 = false;
                                 } else if (num >= 0) {
-                                    System.out.println(player.getName() + ", you don't have that many to sell!");
+                                    System.out.println(getName() + ", you don't have that many to sell!");
                                 } else {
-                                    System.out.println(player.getName() + ", how am I supposed to sell " + "'" + num + "'" + " Arms?");
+                                    System.out.println(getName() + ", how am I supposed to sell " + "'" + num + "'" + " Arms?");
                                 }
                             }
                         } else if (response.equalsIgnoreCase("G")) {
-                            System.out.println("\nHow much General Cargo shall I sell, " + player.getName() + "? (You have " + player.getGeneralHeld() + ")");
+                            System.out.println("\nHow much General Cargo shall I sell, " + getName() + "? (You have " + getGeneralHeld() + ")");
                             while (notDone2) {
                                 int num = input.nextInt();
-                                if (num <= player.getGeneralHeld() && num >= 0) {
-                                    player.setGeneralHeld(player.getGeneralHeld()-num);
-                                    player.setMoney(player.getMoney() + num*generalPrice);
+                                if (num <= getGeneralHeld() && num >= 0) {
+                                    setGeneralHeld(getGeneralHeld()-num);
+                                    setMoney(getMoney() + num*generalPrice);
                                     notDone2 = false;
                                 } else if (num >= 0) {
-                                    System.out.println(player.getName() + ", you don't have that many to sell!");
+                                    System.out.println(getName() + ", you don't have that many to sell!");
                                 } else {
-                                    System.out.println(player.getName() + ", how am I supposed to sell " + "'" + num + "'" + " General Cargo?");
+                                    System.out.println(getName() + ", how am I supposed to sell " + "'" + num + "'" + " General Cargo?");
                                 }
                             }
                         }
@@ -227,63 +261,63 @@ public class TaipanShop extends Player {
                 String response = input.next();
                 if (response.equalsIgnoreCase("B")) {
                     boolean notDone2 = true;
-                    System.out.println("What do you wish me to buy, " + player.getName() + "?");
+                    System.out.println("What do you wish me to buy, " + getName() + "?");
                     while (notDone2) {
                         response = input.nextLine();
                         if (response.equalsIgnoreCase("O")) {
-                            System.out.println("\nHow much Opium shall I buy, " + player.getName() + "? (You can afford " + player.getMoney() / opiumPrice + ")");
+                            System.out.println("\nHow much Opium shall I buy, " + getName() + "? (You can afford " + getMoney() / opiumPrice + ")");
                             while (notDone2) {
                                 int num = input.nextInt();
-                                if (num <= player.getMoney() / opiumPrice && num >= 0) {
-                                    player.setOpiumHeld(player.getOpiumHeld()+num);
-                                    player.setMoney(player.getMoney() - num*opiumPrice);
+                                if (num <= getMoney() / opiumPrice && num >= 0) {
+                                    setOpiumHeld(getOpiumHeld()+num);
+                                    setMoney(getMoney() - num*opiumPrice);
                                     notDone2 = false;
                                 } else if (num >= 0) {
-                                    System.out.println(player.getName() + ", you can't afford that!");
+                                    System.out.println(getName() + ", you can't afford that!");
                                 } else {
-                                    System.out.println(player.getName() + ", how am I supposed to buy " + "'" + num + "'" + " Opium?");
+                                    System.out.println(getName() + ", how am I supposed to buy " + "'" + num + "'" + " Opium?");
                                 }
                             }
                         } else if (response.equalsIgnoreCase("S")) {
-                            System.out.println("\nHow much Silk shall I buy, " + player.getName() + "? (You can afford " + player.getMoney() / silkPrice + ")");
+                            System.out.println("\nHow much Silk shall I buy, " + getName() + "? (You can afford " + getMoney() / silkPrice + ")");
                             while (notDone2) {
                                 int num = input.nextInt();
-                                if (num <= player.getMoney() / silkPrice && num >= 0) {
-                                    player.setSilkHeld(player.getSilkHeld()+num);
-                                    player.setMoney(player.getMoney() - num*silkPrice);
+                                if (num <= getMoney() / silkPrice && num >= 0) {
+                                    setSilkHeld(getSilkHeld()+num);
+                                    setMoney(getMoney() - num*silkPrice);
                                     notDone2 = false;
                                 } else if (num >= 0) {
-                                    System.out.println(player.getName() + ", you can't afford that!");
+                                    System.out.println(getName() + ", you can't afford that!");
                                 } else {
-                                    System.out.println(player.getName() + ", how am I supposed to buy " + "'" + num + "'" + " Silk?");
+                                    System.out.println(getName() + ", how am I supposed to buy " + "'" + num + "'" + " Silk?");
                                 }
                             }
                         } else if (response.equalsIgnoreCase("A")) {
-                            System.out.println("\nHow many Arms shall I buy, " + player.getName() + "? (You can afford " + player.getMoney() / armsPrice + ")");
+                            System.out.println("\nHow many Arms shall I buy, " + getName() + "? (You can afford " + getMoney() / armsPrice + ")");
                             while (notDone2) {
                                 int num = input.nextInt();
-                                if (num <= player.getMoney() / armsPrice && num >= 0) {
-                                    player.setArmsHeld(player.getArmsHeld()+num);
-                                    player.setMoney(player.getMoney() - num*armsPrice);
+                                if (num <= getMoney() / armsPrice && num >= 0) {
+                                    setArmsHeld(getArmsHeld()+num);
+                                    setMoney(getMoney() - num*armsPrice);
                                     notDone2 = false;
                                 } else if (num >= 0) {
-                                    System.out.println(player.getName() + ", you can't afford that!");
+                                    System.out.println(getName() + ", you can't afford that!");
                                 } else {
-                                    System.out.println(player.getName() + ", how am I supposed to buy " + "'" + num + "'" + " Arms?");
+                                    System.out.println(getName() + ", how am I supposed to buy " + "'" + num + "'" + " Arms?");
                                 }
                             }
                         } else if (response.equalsIgnoreCase("G")) {
-                            System.out.println("\nHow much General Cargo shall I buy, " + player.getName() + "? (You can afford " + player.getMoney() / generalPrice + ")");
+                            System.out.println("\nHow much General Cargo shall I buy, " + getName() + "? (You can afford " + getMoney() / generalPrice + ")");
                             while (notDone2) {
                                 int num = input.nextInt();
-                                if (num <= player.getMoney() / generalPrice && num >= 0) {
-                                    player.setGeneralHeld(player.getGeneralHeld()+num);
-                                    player.setMoney(player.getMoney() - num*generalPrice);
+                                if (num <= getMoney() / generalPrice && num >= 0) {
+                                    setGeneralHeld(getGeneralHeld()+num);
+                                    setMoney(getMoney() - num*generalPrice);
                                     notDone2 = false;
                                 } else if (num >= 0) {
-                                    System.out.println(player.getName() + ", you can't afford that!");
+                                    System.out.println(getName() + ", you can't afford that!");
                                 } else {
-                                    System.out.println(player.getName() + ", how am I supposed to buy " + "'" + num + "'" + " General Cargo?");
+                                    System.out.println(getName() + ", how am I supposed to buy " + "'" + num + "'" + " General Cargo?");
                                 }
                             }
                         }
@@ -292,63 +326,63 @@ public class TaipanShop extends Player {
 
                 } else if (response.equalsIgnoreCase("S")) {
                     boolean notDone2 = true;
-                    System.out.println("What do you wish me to sell, " + player.getName() + "?");
+                    System.out.println("What do you wish me to sell, " + getName() + "?");
                     while (notDone2) {
                         response = input.nextLine();
                         if (response.equalsIgnoreCase("O")) {
-                            System.out.println("\nHow much Opium shall I sell, " + player.getName() + "? (You have " + player.getOpiumHeld() + ")");
+                            System.out.println("\nHow much Opium shall I sell, " + getName() + "? (You have " + getOpiumHeld() + ")");
                             while (notDone2) {
                                 int num = input.nextInt();
-                                if (num <= player.getOpiumHeld() && num >= 0) {
-                                    player.setOpiumHeld(player.getOpiumHeld()-num);
-                                    player.setMoney(player.getMoney() + num*opiumPrice);
+                                if (num <= getOpiumHeld() && num >= 0) {
+                                    setOpiumHeld(getOpiumHeld()-num);
+                                    setMoney(getMoney() + num*opiumPrice);
                                     notDone2 = false;
                                 } else if (num >= 0) {
-                                    System.out.println(player.getName() + ", you don't have that many to sell!");
+                                    System.out.println(getName() + ", you don't have that many to sell!");
                                 } else {
-                                    System.out.println(player.getName() + ", how am I supposed to sell " + "'" + num + "'" + " Opium?");
+                                    System.out.println(getName() + ", how am I supposed to sell " + "'" + num + "'" + " Opium?");
                                 }
                             }
                         } else if (response.equalsIgnoreCase("S")) {
-                            System.out.println("\nHow much Silk shall I sell, " + player.getName() + "? (You have " + player.getSilkHeld() + ")");
+                            System.out.println("\nHow much Silk shall I sell, " + getName() + "? (You have " + getSilkHeld() + ")");
                             while (notDone2) {
                                 int num = input.nextInt();
-                                if (num <= player.getSilkHeld() && num >= 0) {
-                                    player.setSilkHeld(player.getSilkHeld()-num);
-                                    player.setMoney(player.getMoney() + num*silkPrice);
+                                if (num <= getSilkHeld() && num >= 0) {
+                                    setSilkHeld(getSilkHeld()-num);
+                                    setMoney(getMoney() + num*silkPrice);
                                     notDone2 = false;
                                 } else if (num >= 0) {
-                                    System.out.println(player.getName() + ", you don't have that many to sell!");
+                                    System.out.println(getName() + ", you don't have that many to sell!");
                                 } else {
-                                    System.out.println(player.getName() + ", how am I supposed to sell " + "'" + num + "'" + " Silk?");
+                                    System.out.println(getName() + ", how am I supposed to sell " + "'" + num + "'" + " Silk?");
                                 }
                             }
                         } else if (response.equalsIgnoreCase("A")) {
-                            System.out.println("\nHow many Arms shall I sell, " + player.getName() + "? (You have " + player.getArmsHeld() + ")");
+                            System.out.println("\nHow many Arms shall I sell, " + getName() + "? (You have " + getArmsHeld() + ")");
                             while (notDone2) {
                                 int num = input.nextInt();
-                                if (num <= player.getArmsHeld() && num >= 0) {
-                                    player.setArmsHeld(player.getArmsHeld()-num);
-                                    player.setMoney(player.getMoney() + num*armsPrice);
+                                if (num <= getArmsHeld() && num >= 0) {
+                                    setArmsHeld(getArmsHeld()-num);
+                                    setMoney(getMoney() + num*armsPrice);
                                     notDone2 = false;
                                 } else if (num >= 0) {
-                                    System.out.println(player.getName() + ", you don't have that many to sell!");
+                                    System.out.println(getName() + ", you don't have that many to sell!");
                                 } else {
-                                    System.out.println(player.getName() + ", how am I supposed to sell " + "'" + num + "'" + " Arms?");
+                                    System.out.println(getName() + ", how am I supposed to sell " + "'" + num + "'" + " Arms?");
                                 }
                             }
                         } else if (response.equalsIgnoreCase("G")) {
-                            System.out.println("\nHow much General Cargo shall I sell, " + player.getName() + "? (You have " + player.getGeneralHeld() + ")");
+                            System.out.println("\nHow much General Cargo shall I sell, " + getName() + "? (You have " + getGeneralHeld() + ")");
                             while (notDone2) {
                                 int num = input.nextInt();
-                                if (num <= player.getGeneralHeld() && num >= 0) {
-                                    player.setGeneralHeld(player.getGeneralHeld()-num);
-                                    player.setMoney(player.getMoney() + num*generalPrice);
+                                if (num <= getGeneralHeld() && num >= 0) {
+                                    setGeneralHeld(getGeneralHeld()-num);
+                                    setMoney(getMoney() + num*generalPrice);
                                     notDone2 = false;
                                 } else if (num >= 0) {
-                                    System.out.println(player.getName() + ", you don't have that many to sell!");
+                                    System.out.println(getName() + ", you don't have that many to sell!");
                                 } else {
-                                    System.out.println(player.getName() + ", how am I supposed to sell " + "'" + num + "'" + " General Cargo?");
+                                    System.out.println(getName() + ", how am I supposed to sell " + "'" + num + "'" + " General Cargo?");
                                 }
                             }
                         }

From 6c36073e8793efcd5625c9746b5ea0b1417a58e7 Mon Sep 17 00:00:00 2001
From: KahootChampion <p.harismuhammadkhan@gmail.com>
Date: Mon, 18 Feb 2019 22:50:24 -0700
Subject: [PATCH 2/3] Added GameOver() Method to Player class, btw
 System.out.flush just straight up Thanos's the terminal at the time (clears
 it).

---
 src/Player.java      | 5 +++++
 src/ShipWarfare.java | 4 ----
 2 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/src/Player.java b/src/Player.java
index 26e1417..c09d4e3 100644
--- a/src/Player.java
+++ b/src/Player.java
@@ -108,4 +108,9 @@ public class Player {
             this.guns = guns;
         }
     }
+
+    public void gameOver() {
+        System.out.flush();
+        System.out.println("Game over");
+    }
 }
diff --git a/src/ShipWarfare.java b/src/ShipWarfare.java
index c5c2235..428ea84 100644
--- a/src/ShipWarfare.java
+++ b/src/ShipWarfare.java
@@ -49,10 +49,6 @@ public class ShipWarfare extends Player {
         TimeUnit.SECONDS.sleep(1);
     }
 
-    public void gameOver() {
-        System.out.flush();
-        System.out.println("Game over");
-    }
 
     public int numOfShips() {
 

From c40fd5e7131801f23762dba8941d8c869a2914b7 Mon Sep 17 00:00:00 2001
From: Solargale <harkamalsr@gmail.com>
Date: Tue, 19 Feb 2019 04:25:12 -0700
Subject: [PATCH 3/3] Added some stuff for the Travel Class

---
 src/Travel.java | 99 ++++++++++++++++++++++++++++++++++++++++++++++++-
 1 file changed, 98 insertions(+), 1 deletion(-)

diff --git a/src/Travel.java b/src/Travel.java
index 60ce9c8..0a4ca30 100644
--- a/src/Travel.java
+++ b/src/Travel.java
@@ -1,2 +1,99 @@
-public class Travel {
+import java.util.Random;
+import java.util.Scanner;
+
+public class Travel extends Player {
+
+    public void travelTo(){
+        Scanner keyboard = new Scanner(System.in);
+        String response;
+        int tempInt;
+        boolean hasTraveled = false;
+
+        while (true) {
+            System.out.println("\n" + 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);
+                if(tempInt != getLocation()){
+                    switch (tempInt) {
+                        case 1:
+                            randomEventSea();
+                            System.out.println("\nArriving at Hong Kong");
+                            setLocation(1);
+                            hasTraveled = true;
+                            break;
+                        case 2:
+                            randomEventSea();
+                            System.out.println("\nArriving at Shanghai");
+                            setLocation(2);
+                            hasTraveled = true;
+                            break;
+                        case 3:
+                            randomEventSea();
+                            System.out.println("\nArriving at Nagasaki");
+                            setLocation(3);
+                            hasTraveled = true;
+                            break;
+                        case 4:
+                            randomEventSea();
+                            System.out.println("\nArriving at Saigon");
+                            setLocation(4);
+                            hasTraveled = true;
+                            break;
+                        case 5:
+                            randomEventSea();
+                            System.out.println("\nArriving at Manila");
+                            setLocation(5);
+                            hasTraveled = true;
+                            break;
+                        case 6:
+                            randomEventSea();
+                            System.out.println("\nArriving at Singapore");
+                            setLocation(6);
+                            hasTraveled = true;
+                            break;
+                        case 7:
+                            randomEventSea();
+                            System.out.println("\nArriving at Batavia");
+                            setLocation(7);
+                            hasTraveled = true;
+                            break;
+                    }
+                }
+                else System.out.println("\nYou're already here Taipan.");
+            }
+            catch (Exception e){
+                System.out.print("\nSorry, Taipan could you say that again?");
+            }
+            if(hasTraveled){break;}
+        }
+    }
+
+    private void randomEventSea() throws Exception {
+        ShipWarfare attackShip = new ShipWarfare();
+        Random rand = new Random();
+        int randGenNum = rand.nextInt(2) + 1;
+        System.out.println("\n");
+
+        if(randGenNum == 1){
+            attackShip.peasantFleetAttack();
+            System.out.println("We made it " + getName());
+        }
+        else if(randGenNum == 2){
+            disaster();
+            System.out.println("We made it " + getName());
+        }
+    }
+
+    private void disaster(){
+        System.out.println("Storm Taipan!");
+
+    }
+
+    public static void main(String[] args){
+        Travel ship = new Travel();
+        ship.travelTo();
+    }
 }