From d1c3fe0f7e5089bbff1462658853c7d7c3296380 Mon Sep 17 00:00:00 2001
From: Vikram <arshvikram@gmail.com>
Date: Mon, 25 Feb 2019 18:31:54 -0700
Subject: [PATCH] minor changes. Still in progress.

---
 .idea/misc.xml                               |   2 +-
 .idea/workspace.xml                          | 189 ++++++++++++-------
 out/production/TaipanClone/ShipWarfare.class | Bin 7385 -> 0 bytes
 src/Player.java                              |  19 ++
 src/TaipanShop.java                          | 107 +++++++++--
 5 files changed, 230 insertions(+), 87 deletions(-)
 delete mode 100644 out/production/TaipanClone/ShipWarfare.class

diff --git a/.idea/misc.xml b/.idea/misc.xml
index 479cb83..8466a13 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_201" project-jdk-type="JavaSDK">
+  <component name="ProjectRootManager" version="2" languageLevel="JDK_1_8" default="true" project-jdk-name="1.8.0_191" 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 c708ac9..ea1a992 100644
--- a/.idea/workspace.xml
+++ b/.idea/workspace.xml
@@ -1,7 +1,13 @@
 <?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="the comment somehow made it so that I couldn't compile (using the command line i couldn't compile, i could compile file using intellij) Also, you the file extended player, which is not necessary. You also were calling gameOver() and getName() directly, you needed &quot;player.&quot; before all those methods.">
+      <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" />
+      <change beforePath="$PROJECT_DIR$/src/Player.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Player.java" 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" />
@@ -28,8 +34,8 @@
       <file pinned="false" current-in-tab="false">
         <entry file="file://$PROJECT_DIR$/src/main.java">
           <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="342">
-              <caret line="18" column="34" selection-start-line="18" selection-start-column="34" selection-end-line="18" selection-end-column="34" />
+            <state relative-caret-position="95">
+              <caret line="5" column="41" lean-forward="true" selection-start-line="5" selection-start-column="41" selection-end-line="5" selection-end-column="41" />
             </state>
           </provider>
         </entry>
@@ -37,8 +43,8 @@
       <file pinned="false" current-in-tab="false">
         <entry file="file://$PROJECT_DIR$/src/loanShark.java">
           <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="779">
-              <caret line="41" column="5" selection-start-line="41" selection-start-column="5" selection-end-line="41" selection-end-column="5" />
+            <state relative-caret-position="535">
+              <caret line="47" column="5" selection-start-line="47" selection-start-column="5" selection-end-line="47" selection-end-column="5" />
             </state>
           </provider>
         </entry>
@@ -46,11 +52,11 @@
       <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="190">
-              <caret line="10" column="24" selection-start-line="10" selection-start-column="24" selection-end-line="10" selection-end-column="24" />
+            <state relative-caret-position="1102">
+              <caret line="58" column="5" selection-start-line="58" selection-start-column="5" selection-end-line="58" selection-end-column="5" />
               <folding>
-                <element signature="e#857#858#0" expanded="true" />
-                <element signature="e#886#887#0" expanded="true" />
+                <element signature="e#1253#1254#0" expanded="true" />
+                <element signature="e#1286#1287#0" expanded="true" />
               </folding>
             </state>
           </provider>
@@ -59,8 +65,8 @@
       <file pinned="false" current-in-tab="false">
         <entry file="file://$PROJECT_DIR$/src/Warehouse.java">
           <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="855">
-              <caret line="45" column="75" selection-start-line="45" selection-start-column="75" selection-end-line="45" selection-end-column="75" />
+            <state relative-caret-position="475">
+              <caret line="25" selection-start-line="25" selection-end-line="25" />
             </state>
           </provider>
         </entry>
@@ -68,8 +74,18 @@
       <file pinned="false" current-in-tab="true">
         <entry file="file://$PROJECT_DIR$/src/TaipanShop.java">
           <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="269">
-              <caret line="162" column="105" selection-start-line="162" selection-start-column="105" selection-end-line="162" selection-end-column="105" />
+            <state relative-caret-position="1542">
+              <caret line="213" column="65" selection-start-line="213" selection-start-column="65" selection-end-line="213" selection-end-column="65" />
+              <folding>
+                <element signature="e#1266#1267#0" expanded="true" />
+                <element signature="e#1299#1300#0" expanded="true" />
+                <element signature="e#1594#1595#0" expanded="true" />
+                <element signature="e#1626#1627#0" expanded="true" />
+                <element signature="e#1868#1869#0" expanded="true" />
+                <element signature="e#1900#1901#0" expanded="true" />
+                <element signature="e#2066#2067#0" expanded="true" />
+                <element signature="e#2101#2102#0" expanded="true" />
+              </folding>
             </state>
           </provider>
         </entry>
@@ -77,17 +93,29 @@
       <file pinned="false" current-in-tab="false">
         <entry file="file://$PROJECT_DIR$/src/Travel.java">
           <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="2033">
+            <state relative-caret-position="535">
               <caret line="108" column="65" selection-start-line="108" selection-start-column="65" selection-end-line="108" selection-end-column="65" />
             </state>
           </provider>
         </entry>
       </file>
+      <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="114">
+              <caret line="6" column="38" selection-start-line="6" selection-start-column="38" selection-end-line="6" selection-end-column="38" />
+              <folding>
+                <element signature="imports" expanded="true" />
+              </folding>
+            </state>
+          </provider>
+        </entry>
+      </file>
       <file pinned="false" current-in-tab="false">
         <entry file="file://$PROJECT_DIR$/src/Bank.java">
           <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="1235">
-              <caret line="66" column="6" selection-start-line="66" selection-start-column="6" selection-end-line="66" selection-end-column="6" />
+            <state relative-caret-position="535">
+              <caret line="69" column="6" selection-start-line="69" selection-start-column="6" selection-end-line="69" selection-end-column="6" />
               <folding>
                 <element signature="imports" expanded="true" />
               </folding>
@@ -98,7 +126,7 @@
       <file pinned="false" current-in-tab="false">
         <entry file="file://$PROJECT_DIR$/src/Start.java">
           <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="817">
+            <state relative-caret-position="421">
               <caret line="43" column="35" selection-start-line="43" selection-start-column="35" selection-end-line="43" selection-end-column="35" />
             </state>
           </provider>
@@ -115,7 +143,6 @@
   </component>
   <component name="FindInProjectRecents">
     <findStrings>
-      <find>eek</find>
       <find>setg</find>
       <find>guns</find>
       <find>duplic</find>
@@ -145,6 +172,7 @@
       <find>set</find>
       <find>player.</find>
       <find>System.out.println(&quot;\n*** PLACEHOLDER FOR LOAN SHARK ***\n&quot;);</find>
+      <find>cargoSpace</find>
     </findStrings>
     <replaceStrings>
       <replace>player.getName()</replace>
@@ -169,14 +197,14 @@
     <option name="CHANGED_PATHS">
       <list>
         <option value="$PROJECT_DIR$/src/Test.java" />
-        <option value="$PROJECT_DIR$/src/ShipWarfare.java" />
-        <option value="$PROJECT_DIR$/src/Player.java" />
         <option value="$PROJECT_DIR$/src/Warehouse.java" />
-        <option value="$PROJECT_DIR$/src/Start.java" />
         <option value="$PROJECT_DIR$/src/Bank.java" />
         <option value="$PROJECT_DIR$/src/Travel.java" />
         <option value="$PROJECT_DIR$/src/loanShark.java" />
         <option value="$PROJECT_DIR$/src/main.java" />
+        <option value="$PROJECT_DIR$/src/ShipWarfare.java" />
+        <option value="$PROJECT_DIR$/src/Start.java" />
+        <option value="$PROJECT_DIR$/src/Player.java" />
         <option value="$PROJECT_DIR$/src/TaipanShop.java" />
       </list>
     </option>
@@ -192,8 +220,6 @@
       <foldersAlwaysOnTop value="true" />
     </navigator>
     <panes>
-      <pane id="PackagesPane" />
-      <pane id="Scope" />
       <pane id="ProjectPane">
         <subPane>
           <expand>
@@ -210,6 +236,8 @@
           <select />
         </subPane>
       </pane>
+      <pane id="Scope" />
+      <pane id="PackagesPane" />
     </panes>
   </component>
   <component name="PropertiesComponent">
@@ -438,7 +466,14 @@
       <option name="project" value="LOCAL" />
       <updated>1551060234136</updated>
     </task>
-    <option name="localTasksCounter" value="19" />
+    <task id="LOCAL-00019" summary="the comment somehow made it so that I couldn't compile (using the command line i couldn't compile, i could compile file using intellij) Also, you the file extended player, which is not necessary. You also were calling gameOver() and getName() directly, you needed &quot;player.&quot; before all those methods.">
+      <created>1551105597993</created>
+      <option name="number" value="00019" />
+      <option name="presentableId" value="LOCAL-00019" />
+      <option name="project" value="LOCAL" />
+      <updated>1551105597993</updated>
+    </task>
+    <option name="localTasksCounter" value="20" />
     <servers />
   </component>
   <component name="TimeTrackingManager">
@@ -448,7 +483,7 @@
     <frame x="-8" y="-8" width="1936" height="1056" extended-state="6" />
     <editor active="true" />
     <layout>
-      <window_info content_ui="combo" id="Project" order="0" visible="true" weight="0.26066098" />
+      <window_info active="true" content_ui="combo" id="Project" order="0" visible="true" weight="0.26865673" />
       <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" />
@@ -501,7 +536,8 @@
     <MESSAGE value="Added a few comments to ShipWarfare" />
     <MESSAGE value="bunch of revisions, still in progress" />
     <MESSAGE value="linked all the classes together. The project is functional." />
-    <option name="LAST_COMMIT_MESSAGE" value="linked all the classes together. The project is functional." />
+    <MESSAGE value="the comment somehow made it so that I couldn't compile (using the command line i couldn't compile, i could compile file using intellij) Also, you the file extended player, which is not necessary. You also were calling gameOver() and getName() directly, you needed &quot;player.&quot; before all those methods." />
+    <option name="LAST_COMMIT_MESSAGE" value="the comment somehow made it so that I couldn't compile (using the command line i couldn't compile, i could compile file using intellij) Also, you the file extended player, which is not necessary. You also were calling gameOver() and getName() directly, you needed &quot;player.&quot; before all those methods." />
   </component>
   <component name="editorHistoryManager">
     <entry file="file://$PROJECT_DIR$/TaipanClone.iml">
@@ -511,52 +547,20 @@
       <provider selected="true" editor-type-id="text-editor" />
     </entry>
     <entry file="file://$PROJECT_DIR$/src/Test.java" />
-    <entry file="file://$PROJECT_DIR$/src/ShipWarfare.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="-5040">
-          <caret line="18" column="5" lean-forward="true" selection-start-line="18" selection-start-column="5" selection-end-line="18" selection-end-column="5" />
-          <folding>
-            <element signature="imports" expanded="true" />
-          </folding>
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/loanShark.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="779">
-          <caret line="41" column="5" selection-start-line="41" selection-start-column="5" selection-end-line="41" selection-end-column="5" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/Player.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="190">
-          <caret line="10" column="24" selection-start-line="10" selection-start-column="24" selection-end-line="10" selection-end-column="24" />
-          <folding>
-            <element signature="e#860#861#0" expanded="true" />
-            <element signature="e#886#887#0" expanded="true" />
-          </folding>
-        </state>
-      </provider>
-    </entry>
     <entry file="file://$PROJECT_DIR$/src/Warehouse.java">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="855">
-          <caret line="45" column="75" selection-start-line="45" selection-start-column="75" selection-end-line="45" selection-end-column="75" />
+        <state relative-caret-position="475">
+          <caret line="25" selection-start-line="25" selection-end-line="25" />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/Travel.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="2033">
-          <caret line="108" column="65" selection-start-line="108" selection-start-column="65" selection-end-line="108" selection-end-column="65" />
-        </state>
-      </provider>
+    <entry file="file://$USER_HOME$/Desktop/src/main.java">
+      <provider selected="true" editor-type-id="text-editor" />
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/Bank.java">
+    <entry file="file://$PROJECT_DIR$/src/ShipWarfare.java">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="1235">
-          <caret line="66" column="6" selection-start-line="66" selection-start-column="6" selection-end-line="66" selection-end-column="6" />
+        <state relative-caret-position="114">
+          <caret line="6" column="38" selection-start-line="6" selection-start-column="38" selection-end-line="6" selection-end-column="38" />
           <folding>
             <element signature="imports" expanded="true" />
           </folding>
@@ -565,22 +569,67 @@
     </entry>
     <entry file="file://$PROJECT_DIR$/src/Start.java">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="817">
+        <state relative-caret-position="421">
           <caret line="43" column="35" selection-start-line="43" selection-start-column="35" selection-end-line="43" selection-end-column="35" />
         </state>
       </provider>
     </entry>
+    <entry file="file://$PROJECT_DIR$/src/Bank.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="535">
+          <caret line="69" column="6" selection-start-line="69" selection-start-column="6" selection-end-line="69" selection-end-column="6" />
+          <folding>
+            <element signature="imports" expanded="true" />
+          </folding>
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/Travel.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="535">
+          <caret line="108" column="65" selection-start-line="108" selection-start-column="65" selection-end-line="108" selection-end-column="65" />
+        </state>
+      </provider>
+    </entry>
     <entry file="file://$PROJECT_DIR$/src/main.java">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="342">
-          <caret line="18" column="34" selection-start-line="18" selection-start-column="34" selection-end-line="18" selection-end-column="34" />
+        <state relative-caret-position="95">
+          <caret line="5" column="41" lean-forward="true" selection-start-line="5" selection-start-column="41" selection-end-line="5" selection-end-column="41" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/loanShark.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="535">
+          <caret line="47" column="5" selection-start-line="47" selection-start-column="5" selection-end-line="47" selection-end-column="5" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/Player.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="1102">
+          <caret line="58" column="5" selection-start-line="58" selection-start-column="5" selection-end-line="58" selection-end-column="5" />
+          <folding>
+            <element signature="e#1253#1254#0" expanded="true" />
+            <element signature="e#1286#1287#0" expanded="true" />
+          </folding>
         </state>
       </provider>
     </entry>
     <entry file="file://$PROJECT_DIR$/src/TaipanShop.java">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="269">
-          <caret line="162" column="105" selection-start-line="162" selection-start-column="105" selection-end-line="162" selection-end-column="105" />
+        <state relative-caret-position="1542">
+          <caret line="213" column="65" selection-start-line="213" selection-start-column="65" selection-end-line="213" selection-end-column="65" />
+          <folding>
+            <element signature="e#1266#1267#0" expanded="true" />
+            <element signature="e#1299#1300#0" expanded="true" />
+            <element signature="e#1594#1595#0" expanded="true" />
+            <element signature="e#1626#1627#0" expanded="true" />
+            <element signature="e#1868#1869#0" expanded="true" />
+            <element signature="e#1900#1901#0" expanded="true" />
+            <element signature="e#2066#2067#0" expanded="true" />
+            <element signature="e#2101#2102#0" expanded="true" />
+          </folding>
         </state>
       </provider>
     </entry>
diff --git a/out/production/TaipanClone/ShipWarfare.class b/out/production/TaipanClone/ShipWarfare.class
deleted file mode 100644
index 73760e7243e93b87bab6da59e75b285dc0413d2f..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 7385
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

diff --git a/src/Player.java b/src/Player.java
index ee0c02b..8aa5f73 100644
--- a/src/Player.java
+++ b/src/Player.java
@@ -16,6 +16,7 @@ public class Player {
     private int wGeneral = 0;
     private int wArms = 0;
     private boolean retire = false;
+    private int cargoSpace = 60;
 
     public Player(){
 
@@ -39,6 +40,24 @@ public class Player {
 
     }
 
+    /**
+     * getter method for the instance variable cargoSpace.
+     * @return cargoSpace
+     */
+    public int getCargoSpace() {
+        return cargoSpace;
+    }
+
+    /**
+     * setter method for cargoSpace.
+     * @param cargoSpace
+     */
+    public void setCargoSpace(int cargoSpace) {
+        if(cargoSpace > 0){
+            this.cargoSpace = cargoSpace;
+        }
+    }
+
     public boolean getRetire(){
         return retire;
     }
diff --git a/src/TaipanShop.java b/src/TaipanShop.java
index 633f946..002f68c 100644
--- a/src/TaipanShop.java
+++ b/src/TaipanShop.java
@@ -3,107 +3,161 @@ import java.util.Scanner;
 public class TaipanShop {
 
     private Player player;
-    private int cargoSpace = 60;
-    private int currentCargo = 0;
     private int opiumPrice = 16000;
     private int silkPrice = 1600;
     private int armsPrice = 160;
     private int generalPrice = 8;
 
+    /**
+     * This method is evoked if the user is eligible to win, and chooses to end the game (by winning).
+     */
     public void retire(){
         player.setRetire(true);
         System.out.println("You win!");
+        System.exit(0);
     }
 
+    /**
+     * sets the player instance variable equal to a copy of the parameter -- a copy is used for encapsulation purposes.
+     *
+     * @param player is a Player object that will replace the current instance of the player instance variable.
+     */
     public void setPlayer(Player player) {
         Player playerDummy = new Player(player);
         this.player = playerDummy;
     }
 
+    /**
+     * gets the player instance variable. The method returns a copy of the instance variable for encapsulation purposes.
+     *
+     * @return playerDummy -- playerDummy is a copy of the player instance variable.
+     */
     public Player getPlayer(){
         Player playerDummy = new Player(player);
         return playerDummy;
     }
 
+    /**
+     * 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 TaipanShop(Player player){
         Player playerDummy = new Player(player);
         this.player = playerDummy;
     }
 
-    public int getCargoSpace() {
-        return cargoSpace;
-    }
-
-    public void setCargoSpace(int cargoSpace) {
-        if(cargoSpace > 0){
-            this.cargoSpace = cargoSpace;
-        }
-    }
-
+    /**
+     *
+     * @return
+     */
     public int getOpiumPrice() {
         return opiumPrice;
     }
 
+    /**
+     *
+     * @param opiumPrice
+     */
     public void setOpiumPrice(int opiumPrice) {
         if(opiumPrice > 0){
             this.opiumPrice = opiumPrice;
         }
     }
 
+    /**
+     *
+     * @return
+     */
     public int getSilkPrice() {
         return silkPrice;
     }
 
+    /**
+     *
+     * @param silkPrice
+     */
     public void setSilkPrice(int silkPrice) {
         if(silkPrice > 0){
             this.silkPrice = silkPrice;
         }
     }
 
+    /**
+     *
+     * @return
+     */
     public int getArmsPrice() {
         return armsPrice;
     }
 
+    /**
+     *
+     * @param armsPrice
+     */
     public void setArmsPrice(int armsPrice) {
         if(armsPrice > 0){
             this.armsPrice = armsPrice;
         }
     }
 
+    /**
+     *
+     * @return
+     */
     public int getGeneralPrice() {
         return generalPrice;
     }
 
+    /**
+     *
+     * @param generalPrice
+     */
     public void setGeneralPrice(int generalPrice) {
         if(generalPrice > 0){
             this.generalPrice = generalPrice;
         }
     }
 
+    /**
+     *
+     */
     public void travel(){
         Travel travel = new Travel(player);
         travel.travelTo();
         player = travel.getPlayer();
     }
 
+    /**
+     *
+     */
     public void warehouse(){
         Warehouse warehouse = new Warehouse(player);
         warehouse.changeWarehouse();
         player = warehouse.getPlayer();
     }
 
+    /**
+     *
+     */
     public void bank(){
         Bank bank = new Bank(player);
         bank.bank();
         player = bank.getPlayer();
     }
 
+    /**
+     *
+     */
     public void loan(){
         loanShark loan = new loanShark(player);
         loan.loanMoney();
         player = loan.getPlayer();
     }
-    
+
+    /**
+     *
+     */
     private void updatePrices(){
         String s = "\n" + player.getName() + ", the price of ";
         double value = 80*Math.random();
@@ -149,12 +203,15 @@ public class TaipanShop {
         }
     }
 
+    /**
+     *
+     */
     private void printShop(){
-        currentCargo = player.getOpiumHeld()+player.getGuns()*10+player.getSilkHeld()+player.getArmsHeld()+player.getGeneralHeld();
-        if(cargoSpace - currentCargo < 0){
+        int currentCargo = player.getOpiumHeld()+player.getGuns()*10+player.getSilkHeld()+player.getArmsHeld()+player.getGeneralHeld();
+        if(player.getCargoSpace() - currentCargo < 0){
             System.out.println("Hold: Overloaded" + "          Guns: " + player.getGuns() + "          HP: " + player.getHP() +"%");
         }else{
-            System.out.println("Hold: " + (cargoSpace-currentCargo) + "          Guns: " + player.getGuns() + "          HP: " + player.getHP() +"%");
+            System.out.println("Hold: " + (player.getCargoSpace()-currentCargo) + "          Guns: " + player.getGuns() + "          HP: " + player.getHP() +"%");
         }
         System.out.println("-------------------------------------------------------------");
         System.out.println("     Opium: " + player.getOpiumHeld() + "      Silk: " + player.getSilkHeld());
@@ -166,6 +223,11 @@ public class TaipanShop {
         System.out.println("     Arms: " + armsPrice + "       General: " + generalPrice);
     }
 
+    /**
+     *
+     * @param notDone
+     * @param input
+     */
     public void atLocationOne(boolean notDone, Scanner input){
         while(notDone){
             printShop();
@@ -314,6 +376,11 @@ public class TaipanShop {
         }
     }
 
+    /**
+     *
+     * @param notDone
+     * @param input
+     */
     public void notAtLocationOne(boolean notDone, Scanner input){
         while(notDone){
             printShop();
@@ -454,6 +521,11 @@ public class TaipanShop {
         }
     }
 
+    /**
+     *
+     * @param notDone
+     * @param input
+     */
     public void retireAndLocationOne(boolean notDone, Scanner input){
         while(notDone){
             printShop();
@@ -604,6 +676,9 @@ public class TaipanShop {
         }
     }
 
+    /**
+     *
+     */
     public void shop() {
         updatePrices();
         Scanner input = new Scanner(System.in);