From 89f9e479215510608f58b8799f0e9e433ea4e97b Mon Sep 17 00:00:00 2001
From: Vikram <arshvikram@gmail.com>
Date: Sun, 10 Mar 2019 22:42:40 -0600
Subject: [PATCH 1/4] some changes...

---
 .idea/workspace.xml    | 177 ++++++++++++++++++-----------------------
 src/Player.java        |   1 +
 src/StartGUI.java      |   6 +-
 src/TaipanShopGUI.java |  33 +++++---
 4 files changed, 101 insertions(+), 116 deletions(-)

diff --git a/.idea/workspace.xml b/.idea/workspace.xml
index ccfdf14..9b8e6b8 100644
--- a/.idea/workspace.xml
+++ b/.idea/workspace.xml
@@ -2,13 +2,10 @@
 <project version="4">
   <component name="ChangeListManager">
     <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$/src/Player.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Player.java" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/src/StartGUI.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/StartGUI.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/TaipanShop.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/TaipanShop.java" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/src/TaipanShopGUI.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/TaipanShopGUI.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/TravelGUI.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/TravelGUI.java" afterDir="false" />
     </list>
     <ignored path="$PROJECT_DIR$/out/" />
     <ignored path="C:\Users\Harkamal Randhawa\IdeaProjects\TaipanClone\.idea\shelf/" />
@@ -21,24 +18,6 @@
   </component>
   <component name="FileEditorManager">
     <leaf SIDE_TABS_SIZE_LIMIT_KEY="300">
-      <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="546">
-              <caret line="26" selection-start-line="26" selection-end-line="26" />
-            </state>
-          </provider>
-        </entry>
-      </file>
-      <file pinned="false" current-in-tab="false">
-        <entry file="file://$PROJECT_DIR$/src/TaipanShop.java">
-          <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="399">
-              <caret line="62" selection-start-line="62" selection-end-line="62" />
-            </state>
-          </provider>
-        </entry>
-      </file>
       <file pinned="false" current-in-tab="false">
         <entry file="file://$PROJECT_DIR$/src/MainGUI.java">
           <provider selected="true" editor-type-id="text-editor">
@@ -48,11 +27,20 @@
           </provider>
         </entry>
       </file>
-      <file pinned="false" current-in-tab="true">
+      <file pinned="false" current-in-tab="false">
         <entry file="file://$PROJECT_DIR$/src/StartGUI.java">
           <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="1497">
-              <caret line="145" column="36" selection-start-line="145" selection-start-column="36" selection-end-line="145" selection-end-column="36" />
+            <state relative-caret-position="2856">
+              <caret line="145" column="40" lean-forward="true" selection-start-line="145" selection-start-column="40" selection-end-line="145" selection-end-column="40" />
+            </state>
+          </provider>
+        </entry>
+      </file>
+      <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="525">
+              <caret line="61" column="44" selection-start-line="61" selection-start-column="44" selection-end-line="61" selection-end-column="44" />
             </state>
           </provider>
         </entry>
@@ -61,16 +49,20 @@
         <entry file="file://$PROJECT_DIR$/src/TravelGUI.java">
           <provider selected="true" editor-type-id="text-editor">
             <state relative-caret-position="19">
-              <caret line="436" column="33" lean-forward="true" selection-start-line="436" selection-start-column="33" selection-end-line="436" selection-end-column="33" />
+              <caret line="436" column="33" selection-start-line="436" selection-start-column="33" selection-end-line="436" selection-end-column="33" />
             </state>
           </provider>
         </entry>
       </file>
-      <file pinned="false" current-in-tab="false">
+      <file pinned="false" current-in-tab="true">
         <entry file="file://$PROJECT_DIR$/src/TaipanShopGUI.java">
           <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="124">
-              <caret line="779" column="4" lean-forward="true" selection-start-line="779" selection-start-column="4" selection-end-line="796" selection-end-column="5" />
+            <state relative-caret-position="399">
+              <caret line="312" column="7" selection-start-line="312" selection-start-column="7" selection-end-line="312" selection-end-column="7" />
+              <folding>
+                <element signature="e#24130#24131#0" expanded="true" />
+                <element signature="e#24170#24171#0" expanded="true" />
+              </folding>
             </state>
           </provider>
         </entry>
@@ -84,36 +76,6 @@
           </provider>
         </entry>
       </file>
-      <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="774">
-              <caret line="157" column="43" selection-start-line="157" selection-start-column="43" selection-end-line="157" selection-end-column="43" />
-            </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="-13">
-              <caret line="303" column="24" lean-forward="true" selection-start-line="303" selection-start-column="24" selection-end-line="303" selection-end-column="24" />
-              <folding>
-                <element signature="imports" expanded="true" />
-              </folding>
-            </state>
-          </provider>
-        </entry>
-      </file>
-      <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="438">
-              <caret line="25" column="7" lean-forward="true" selection-start-line="25" selection-start-column="7" selection-end-line="25" selection-end-column="7" />
-            </state>
-          </provider>
-        </entry>
-      </file>
     </leaf>
   </component>
   <component name="FileTemplateManagerImpl">
@@ -125,7 +87,6 @@
   </component>
   <component name="FindInProjectRecents">
     <findStrings>
-      <find>destroyPeasa</find>
       <find>destr</find>
       <find>destro</find>
       <find>hitco</find>
@@ -155,6 +116,7 @@
       <find>too</find>
       <find>shipstatusstr</find>
       <find>shipstatus</find>
+      <find>itemsInInventory</find>
     </findStrings>
     <replaceStrings>
       <replace>HP</replace>
@@ -166,7 +128,7 @@
     </replaceStrings>
   </component>
   <component name="Git.Settings">
-    <option name="UPDATE_TYPE" value="REBASE" />
+    <option name="UPDATE_TYPE" value="MERGE" />
     <option name="RECENT_GIT_ROOT_PATH" value="$PROJECT_DIR$" />
   </component>
   <component name="IdeDocumentHistory">
@@ -178,12 +140,12 @@
         <option value="$PROJECT_DIR$/src/TaipanShop.java" />
         <option value="$PROJECT_DIR$/src/main.java" />
         <option value="$PROJECT_DIR$/src/Travel.java" />
-        <option value="$PROJECT_DIR$/src/Player.java" />
         <option value="$PROJECT_DIR$/src/ShipWarfare.java" />
         <option value="$PROJECT_DIR$/src/ShipWarfareGUI.java" />
+        <option value="$PROJECT_DIR$/src/TravelGUI.java" />
+        <option value="$PROJECT_DIR$/src/Player.java" />
         <option value="$PROJECT_DIR$/src/StartGUI.java" />
         <option value="$PROJECT_DIR$/src/TaipanShopGUI.java" />
-        <option value="$PROJECT_DIR$/src/TravelGUI.java" />
       </list>
     </option>
   </component>
@@ -223,7 +185,7 @@
     <property name="ChangesTree.GroupingKeys" value="" />
     <property name="WebServerToolWindowFactoryState" value="false" />
     <property name="aspect.path.notification.shown" value="true" />
-    <property name="com.android.tools.idea.instantapp.provision.ProvisionBeforeRunTaskProvider.myTimeStamp" value="1552275701838" />
+    <property name="com.android.tools.idea.instantapp.provision.ProvisionBeforeRunTaskProvider.myTimeStamp" value="1552279279341" />
     <property name="extract.method.default.visibility" value="private" />
     <property name="last_opened_file_path" value="$PROJECT_DIR$/../GitHub/Cpsc233" />
     <property name="project.structure.last.edited" value="Project" />
@@ -563,11 +525,18 @@
       <option name="project" value="LOCAL" />
       <updated>1552269681200</updated>
     </task>
-    <option name="localTasksCounter" value="33" />
+    <task id="LOCAL-00033" summary="some changes...">
+      <created>1552276190903</created>
+      <option name="number" value="00033" />
+      <option name="presentableId" value="LOCAL-00033" />
+      <option name="project" value="LOCAL" />
+      <updated>1552276190903</updated>
+    </task>
+    <option name="localTasksCounter" value="34" />
     <servers />
   </component>
   <component name="TimeTrackingManager">
-    <option name="totallyTimeSpent" value="75291000" />
+    <option name="totallyTimeSpent" value="78373000" />
   </component>
   <component name="ToolWindowManager">
     <frame x="-8" y="-8" width="1936" height="1056" extended-state="6" />
@@ -670,7 +639,6 @@
     <ignored-roots>
       <path value="$PROJECT_DIR$" />
     </ignored-roots>
-    <MESSAGE value="Brought back Vikram's changes" />
     <MESSAGE value="Fixed the commenting on a lot of the code. Also added some stuff to Travel, fixed some bugs." />
     <MESSAGE value="Added time stuff to Shipwarfare GUI" />
     <MESSAGE value="Nitified of getting attacked" />
@@ -695,7 +663,8 @@
     <MESSAGE value="A lot of errors but easily fixable SHipwarfareGUI" />
     <MESSAGE value="Completed SHipWarfareGUI" />
     <MESSAGE value="Completed ShipWarfareGUI" />
-    <option name="LAST_COMMIT_MESSAGE" value="Completed ShipWarfareGUI" />
+    <MESSAGE value="some changes..." />
+    <option name="LAST_COMMIT_MESSAGE" value="some changes..." />
   </component>
   <component name="editorHistoryManager">
     <entry file="uml://JAVA/ShipWarfare">
@@ -753,9 +722,6 @@
     </entry>
     <entry file="jar:///Library/Java/JavaVirtualMachines/jdk1.8.0_201.jdk/Contents/Home/javafx-src.zip!/com/sun/glass/ui/InvokeLaterDispatcher.java" />
     <entry file="file://$PROJECT_DIR$/src/ShopGUI" />
-    <entry file="file://$PROJECT_DIR$/src/Player.java">
-      <provider selected="true" editor-type-id="text-editor" />
-    </entry>
     <entry file="file://$PROJECT_DIR$/src/main.java">
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="546">
@@ -780,20 +746,6 @@
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/Start.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="438">
-          <caret line="25" column="7" lean-forward="true" selection-start-line="25" selection-start-column="7" selection-end-line="25" selection-end-column="7" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/Travel.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="774">
-          <caret line="157" column="43" selection-start-line="157" selection-start-column="43" selection-end-line="157" selection-end-column="43" />
-        </state>
-      </provider>
-    </entry>
     <entry file="file://$PROJECT_DIR$/src/ShopGUI.java">
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="693">
@@ -804,10 +756,17 @@
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/loanSharkGUI.java">
+    <entry file="file://$PROJECT_DIR$/src/TaipanShop.java">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="-273">
-          <caret line="13" column="13" selection-start-line="13" selection-start-column="13" selection-end-line="13" selection-end-column="13" />
+        <state relative-caret-position="399">
+          <caret line="62" selection-start-line="62" selection-end-line="62" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/Start.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="438">
+          <caret line="25" column="7" lean-forward="true" selection-start-line="25" selection-start-column="7" selection-end-line="25" selection-end-column="7" />
         </state>
       </provider>
     </entry>
@@ -821,6 +780,20 @@
         </state>
       </provider>
     </entry>
+    <entry file="file://$PROJECT_DIR$/src/Travel.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="774">
+          <caret line="157" column="43" selection-start-line="157" selection-start-column="43" selection-end-line="157" selection-end-column="43" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/loanSharkGUI.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="-273">
+          <caret line="13" column="13" selection-start-line="13" selection-start-column="13" selection-end-line="13" selection-end-column="13" />
+        </state>
+      </provider>
+    </entry>
     <entry file="file://$PROJECT_DIR$/src/MainGUI.java">
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="483">
@@ -828,31 +801,35 @@
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/TaipanShopGUI.java">
+    <entry file="file://$PROJECT_DIR$/src/Player.java">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="124">
-          <caret line="779" column="4" lean-forward="true" selection-start-line="779" selection-start-column="4" selection-end-line="796" selection-end-column="5" />
+        <state relative-caret-position="525">
+          <caret line="61" column="44" selection-start-line="61" selection-start-column="44" selection-end-line="61" selection-end-column="44" />
         </state>
       </provider>
     </entry>
     <entry file="file://$PROJECT_DIR$/src/TravelGUI.java">
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="19">
-          <caret line="436" column="33" lean-forward="true" selection-start-line="436" selection-start-column="33" selection-end-line="436" selection-end-column="33" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/TaipanShop.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="399">
-          <caret line="62" selection-start-line="62" selection-end-line="62" />
+          <caret line="436" column="33" selection-start-line="436" selection-start-column="33" selection-end-line="436" selection-end-column="33" />
         </state>
       </provider>
     </entry>
     <entry file="file://$PROJECT_DIR$/src/StartGUI.java">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="1497">
-          <caret line="145" column="36" selection-start-line="145" selection-start-column="36" selection-end-line="145" selection-end-column="36" />
+        <state relative-caret-position="2856">
+          <caret line="145" column="40" lean-forward="true" selection-start-line="145" selection-start-column="40" selection-end-line="145" selection-end-column="40" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/TaipanShopGUI.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="399">
+          <caret line="312" column="7" selection-start-line="312" selection-start-column="7" selection-end-line="312" selection-end-column="7" />
+          <folding>
+            <element signature="e#24130#24131#0" expanded="true" />
+            <element signature="e#24170#24171#0" expanded="true" />
+          </folding>
         </state>
       </provider>
     </entry>
diff --git a/src/Player.java b/src/Player.java
index 02ad4ec..5582a9f 100644
--- a/src/Player.java
+++ b/src/Player.java
@@ -59,6 +59,7 @@ public class Player {
         this.wSilk = player.wSilk;
         this.wGeneral = player.wGeneral;
         this.wArms = player.wArms;
+        this.cargoSpace = player.cargoSpace;
     }
 
     /**
diff --git a/src/StartGUI.java b/src/StartGUI.java
index efb2229..9f8ca2b 100644
--- a/src/StartGUI.java
+++ b/src/StartGUI.java
@@ -143,9 +143,9 @@ public class StartGUI {
                 if (response.equalsIgnoreCase("Vikram")) {
                     player.setMoney(999999999);
                     player.setBank(999999999);
-                    player.setGuns(0);
-                    player.setHP(99999999);
-                    player.setCargoSpace(Integer.MAX_VALUE);
+                    player.setGuns(999);
+                    player.setHP(999999999);
+                    player.setCargoSpace(999999999);
                 }
                 setFirm(response);
 
diff --git a/src/TaipanShopGUI.java b/src/TaipanShopGUI.java
index 0a2beee..94a74eb 100644
--- a/src/TaipanShopGUI.java
+++ b/src/TaipanShopGUI.java
@@ -55,13 +55,6 @@ public class TaipanShopGUI {
         this.player = playerDummy;
     }
 
-    public void startTaipanShop(Stage stage){
-        stage = initializeShop(stage);
-        updateStage();
-        updatePrices();
-        stage.show();
-    }
-
     /**
      * This method is evoked if the user is eligible to win, and chooses to end the game (by winning).
      */
@@ -221,11 +214,23 @@ public class TaipanShopGUI {
         }
     }
 
+    /**
+     * Sets the default dialogue of simply stating the prices of the items.
+     */
     public void defaultTextOut(){
         textOut.setText(String.format("\t%s, present prices per unit here are:\n\n\t\tOpium: %d\t\t\tSilk: %d\n\t\tArms: %d\t\t\tGeneral: %d", player.getName(), getOpiumPrice(), getSilkPrice(), getArmsPrice(), getGeneralPrice()));
 
     }
 
+    /**
+     * Sets up buttons according to which "state" is inputted. When used in "shop", only the item buttons are visible.
+     * When used in "reset", all the item buttons are invisible; if the user is at location one and is eligible to win,
+     * then all utilities and the retire button are visible. If the user is not at location one, then the user can only
+     * buy, sell, or exit. If the user is at location one and is not eligible to win, then all utilities are visible but
+     * the retire button is not. When used in "input" everything near the bottom is invisible except for the text area.
+     *
+     * @param state -- the state determines which buttons are visible and which are not.
+     */
     public void buttonSetup(String state) {
         if (state.equals("shop")) {
             buyButton.setVisible(false);
@@ -247,7 +252,7 @@ public class TaipanShopGUI {
             silkButton.setText("Silk");
             armsButton.setText("Arms");
             generalButton.setText("General");
-            if (player.getLocation() != 1 && player.getBank() + player.getMoney() - player.getDebt() < 1000000) {
+            if (player.getLocation() != 1) {
                 buyButton.setVisible(true);
                 sellButton.setVisible(true);
                 bankButton.setVisible(false);
@@ -260,7 +265,8 @@ public class TaipanShopGUI {
                 numberInput.setVisible(false);
                 generalButton.setVisible(false);
                 retireButton.setVisible(false);
-            }else if(player.getBank() + player.getMoney() - player.getDebt() < 1000000){
+            }
+            if(player.getBank() + player.getMoney() - player.getDebt() < 1000000 && player.getLocation() == 1){
                 buyButton.setVisible(true);
                 sellButton.setVisible(true);
                 bankButton.setVisible(true);
@@ -273,7 +279,7 @@ public class TaipanShopGUI {
                 generalButton.setVisible(false);
                 armsButton.setVisible(false);
                 retireButton.setVisible(false);
-            }else{
+            }else if(player.getLocation() == 1){
                 buyButton.setVisible(true);
                 sellButton.setVisible(true);
                 bankButton.setVisible(true);
@@ -303,6 +309,9 @@ public class TaipanShopGUI {
         }
     }
 
+    /**
+     *
+     */
     public void shop(){
         String originalDialogue = textOut.getText();
         int num = Integer.parseInt(numberInput.getText().replace(" ", ""));
@@ -369,7 +378,7 @@ public class TaipanShopGUI {
         }
     }
 
-    public Stage initializeShop(Stage stage){
+    public void initializeShop(Stage stage){
         Font size14 = new Font(14.0);
         Rectangle dialogueRectangle = new Rectangle();
         dialogueRectangle.setFill(javafx.scene.paint.Color.WHITE);
@@ -758,8 +767,6 @@ public class TaipanShopGUI {
         updatePrices();
         defaultTextOut();
         updateStage();
-
-        return stage;
     }
     
     public String getStringLocation(){

From c6df980f8eff9fc52e27fa9c09d4c7e1defc49dc Mon Sep 17 00:00:00 2001
From: KahootChampion <p.harismuhammadkhan@gmail.com>
Date: Sun, 10 Mar 2019 22:43:25 -0600
Subject: [PATCH 2/4] Fixed ShipWarfare bug about one-shotting.

---
 .idea/misc.xml          |   2 +-
 .idea/workspace.xml     | 279 ++++++++++++++++------------------------
 TaipanClone.iml         |   5 +-
 src/ShipWarfareGUI.java |  11 +-
 4 files changed, 125 insertions(+), 172 deletions(-)

diff --git a/.idea/misc.xml b/.idea/misc.xml
index fa20b13..c496ad9 100644
--- a/.idea/misc.xml
+++ b/.idea/misc.xml
@@ -9,7 +9,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" 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 9b8e6b8..1055077 100644
--- a/.idea/workspace.xml
+++ b/.idea/workspace.xml
@@ -1,11 +1,11 @@
 <?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="Probably should upload">
       <change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/TaipanClone.iml" beforeDir="false" afterPath="$PROJECT_DIR$/TaipanClone.iml" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/src/Player.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Player.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/StartGUI.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/StartGUI.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/TaipanShopGUI.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/TaipanShopGUI.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/ShipWarfareGUI.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/ShipWarfareGUI.java" afterDir="false" />
     </list>
     <ignored path="$PROJECT_DIR$/out/" />
     <ignored path="C:\Users\Harkamal Randhawa\IdeaProjects\TaipanClone\.idea\shelf/" />
@@ -19,28 +19,40 @@
   <component name="FileEditorManager">
     <leaf SIDE_TABS_SIZE_LIMIT_KEY="300">
       <file pinned="false" current-in-tab="false">
-        <entry file="file://$PROJECT_DIR$/src/MainGUI.java">
+        <entry file="file://$PROJECT_DIR$/src/ShipWarfareGUI.java">
           <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="483">
-              <caret line="45" column="39" selection-start-line="45" selection-start-column="39" selection-end-line="45" selection-end-column="39" />
+            <state relative-caret-position="203">
+              <caret line="254" selection-start-line="254" selection-end-line="254" />
+              <folding>
+                <element signature="imports" expanded="true" />
+              </folding>
             </state>
           </provider>
         </entry>
       </file>
-      <file pinned="false" current-in-tab="false">
-        <entry file="file://$PROJECT_DIR$/src/StartGUI.java">
-          <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="2856">
-              <caret line="145" column="40" lean-forward="true" selection-start-line="145" selection-start-column="40" selection-end-line="145" selection-end-column="40" />
-            </state>
-          </provider>
-        </entry>
-      </file>
-      <file pinned="false" current-in-tab="false">
+      <file pinned="false" current-in-tab="true">
         <entry file="file://$PROJECT_DIR$/src/Player.java">
           <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="525">
-              <caret line="61" column="44" selection-start-line="61" selection-start-column="44" selection-end-line="61" selection-end-column="44" />
+            <state relative-caret-position="330">
+              <caret line="22" column="22" lean-forward="true" selection-start-line="22" selection-start-column="22" selection-end-line="22" selection-end-column="22" />
+            </state>
+          </provider>
+        </entry>
+      </file>
+      <file pinned="false" current-in-tab="false">
+        <entry file="file://$PROJECT_DIR$/src/TaipanShopGUI.java">
+          <provider selected="true" editor-type-id="text-editor">
+            <state relative-caret-position="915">
+              <caret line="76" column="16" selection-start-line="76" selection-start-column="16" selection-end-line="76" selection-end-column="16" />
+            </state>
+          </provider>
+        </entry>
+      </file>
+      <file pinned="false" current-in-tab="false">
+        <entry file="file://$PROJECT_DIR$/src/MainGUI.java">
+          <provider selected="true" editor-type-id="text-editor">
+            <state relative-caret-position="780">
+              <caret line="55" column="28" selection-start-line="53" selection-start-column="7" selection-end-line="55" selection-end-column="28" />
             </state>
           </provider>
         </entry>
@@ -48,30 +60,8 @@
       <file pinned="false" current-in-tab="false">
         <entry file="file://$PROJECT_DIR$/src/TravelGUI.java">
           <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="19">
-              <caret line="436" column="33" selection-start-line="436" selection-start-column="33" selection-end-line="436" selection-end-column="33" />
-            </state>
-          </provider>
-        </entry>
-      </file>
-      <file pinned="false" current-in-tab="true">
-        <entry file="file://$PROJECT_DIR$/src/TaipanShopGUI.java">
-          <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="399">
-              <caret line="312" column="7" selection-start-line="312" selection-start-column="7" selection-end-line="312" selection-end-column="7" />
-              <folding>
-                <element signature="e#24130#24131#0" expanded="true" />
-                <element signature="e#24170#24171#0" expanded="true" />
-              </folding>
-            </state>
-          </provider>
-        </entry>
-      </file>
-      <file pinned="false" current-in-tab="false">
-        <entry file="file://$PROJECT_DIR$/src/loanSharkGUI.java">
-          <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="-273">
-              <caret line="13" column="13" selection-start-line="13" selection-start-column="13" selection-end-line="13" selection-end-column="13" />
+            <state relative-caret-position="6615">
+              <caret line="465" column="42" selection-start-line="465" selection-start-column="42" selection-end-line="465" selection-end-column="42" />
             </state>
           </provider>
         </entry>
@@ -87,6 +77,11 @@
   </component>
   <component name="FindInProjectRecents">
     <findStrings>
+      <find>numOfLittyShips</find>
+      <find>delay</find>
+      <find>Hp</find>
+      <find>shipwarfare</find>
+      <find>destroyPeasa</find>
       <find>destr</find>
       <find>destro</find>
       <find>hitco</find>
@@ -112,11 +107,6 @@
       <find>continue</find>
       <find>cashTex</find>
       <find>cashTe</find>
-      <find>10000</find>
-      <find>too</find>
-      <find>shipstatusstr</find>
-      <find>shipstatus</find>
-      <find>itemsInInventory</find>
     </findStrings>
     <replaceStrings>
       <replace>HP</replace>
@@ -128,7 +118,7 @@
     </replaceStrings>
   </component>
   <component name="Git.Settings">
-    <option name="UPDATE_TYPE" value="MERGE" />
+    <option name="UPDATE_TYPE" value="REBASE" />
     <option name="RECENT_GIT_ROOT_PATH" value="$PROJECT_DIR$" />
   </component>
   <component name="IdeDocumentHistory">
@@ -141,19 +131,18 @@
         <option value="$PROJECT_DIR$/src/main.java" />
         <option value="$PROJECT_DIR$/src/Travel.java" />
         <option value="$PROJECT_DIR$/src/ShipWarfare.java" />
-        <option value="$PROJECT_DIR$/src/ShipWarfareGUI.java" />
-        <option value="$PROJECT_DIR$/src/TravelGUI.java" />
-        <option value="$PROJECT_DIR$/src/Player.java" />
-        <option value="$PROJECT_DIR$/src/StartGUI.java" />
         <option value="$PROJECT_DIR$/src/TaipanShopGUI.java" />
+        <option value="$PROJECT_DIR$/src/TravelGUI.java" />
+        <option value="$PROJECT_DIR$/src/ShipWarfareGUI.java" />
+        <option value="$PROJECT_DIR$/src/Player.java" />
       </list>
     </option>
   </component>
-  <component name="ProjectFrameBounds" extendedState="6">
-    <option name="x" value="167" />
-    <option name="y" value="-11" />
-    <option name="width" value="1696" />
-    <option name="height" value="1026" />
+  <component name="ProjectFrameBounds">
+    <option name="x" value="6" />
+    <option name="y" value="26" />
+    <option name="width" value="1189" />
+    <option name="height" value="652" />
   </component>
   <component name="ProjectLevelVcsManager" settingsEditedManually="true" />
   <component name="ProjectView">
@@ -161,7 +150,6 @@
       <foldersAlwaysOnTop value="true" />
     </navigator>
     <panes>
-      <pane id="PackagesPane" />
       <pane id="ProjectPane">
         <subPane>
           <expand>
@@ -179,16 +167,17 @@
         </subPane>
       </pane>
       <pane id="Scope" />
+      <pane id="PackagesPane" />
     </panes>
   </component>
   <component name="PropertiesComponent">
     <property name="ChangesTree.GroupingKeys" value="" />
     <property name="WebServerToolWindowFactoryState" value="false" />
     <property name="aspect.path.notification.shown" value="true" />
-    <property name="com.android.tools.idea.instantapp.provision.ProvisionBeforeRunTaskProvider.myTimeStamp" value="1552279279341" />
+    <property name="com.android.tools.idea.instantapp.provision.ProvisionBeforeRunTaskProvider.myTimeStamp" value="1552279380815" />
     <property name="extract.method.default.visibility" value="private" />
     <property name="last_opened_file_path" value="$PROJECT_DIR$/../GitHub/Cpsc233" />
-    <property name="project.structure.last.edited" value="Project" />
+    <property name="project.structure.last.edited" value="Modules" />
     <property name="project.structure.proportion" value="0.15" />
     <property name="project.structure.side.proportion" value="0.2" />
     <property name="settings.editor.selected.configurable" value="editing.templates" />
@@ -299,7 +288,8 @@
       <workItem from="1552238757321" duration="742000" />
       <workItem from="1552240770629" duration="40000" />
       <workItem from="1552241394045" duration="178000" />
-      <workItem from="1552254283748" duration="7208000" />
+      <workItem from="1552254283748" duration="9473000" />
+      <workItem from="1552277298937" duration="1205000" />
     </task>
     <task id="LOCAL-00001" summary="This should fix the ShipWarfare file and bring it up to date with the rest of the file.">
       <created>1550458470138</created>
@@ -525,24 +515,24 @@
       <option name="project" value="LOCAL" />
       <updated>1552269681200</updated>
     </task>
-    <task id="LOCAL-00033" summary="some changes...">
-      <created>1552276190903</created>
+    <task id="LOCAL-00033" summary="Probably should upload">
+      <created>1552270321401</created>
       <option name="number" value="00033" />
       <option name="presentableId" value="LOCAL-00033" />
       <option name="project" value="LOCAL" />
-      <updated>1552276190903</updated>
+      <updated>1552270321402</updated>
     </task>
     <option name="localTasksCounter" value="34" />
     <servers />
   </component>
   <component name="TimeTrackingManager">
-    <option name="totallyTimeSpent" value="78373000" />
+    <option name="totallyTimeSpent" value="74278000" />
   </component>
   <component name="ToolWindowManager">
-    <frame x="-8" y="-8" width="1936" height="1056" extended-state="6" />
+    <frame x="6" y="26" width="1189" height="652" extended-state="0" />
     <editor active="true" />
     <layout>
-      <window_info content_ui="combo" id="Project" order="0" visible="true" weight="0.28997868" />
+      <window_info active="true" content_ui="combo" id="Project" order="0" visible="true" weight="0.2798605" />
       <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" />
@@ -551,7 +541,7 @@
       <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" weight="0.32922733" />
-      <window_info active="true" anchor="bottom" id="Run" order="2" visible="true" weight="0.09967497" />
+      <window_info anchor="bottom" id="Run" order="2" weight="0.9357143" />
       <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" />
@@ -663,8 +653,8 @@
     <MESSAGE value="A lot of errors but easily fixable SHipwarfareGUI" />
     <MESSAGE value="Completed SHipWarfareGUI" />
     <MESSAGE value="Completed ShipWarfareGUI" />
-    <MESSAGE value="some changes..." />
-    <option name="LAST_COMMIT_MESSAGE" value="some changes..." />
+    <MESSAGE value="Probably should upload" />
+    <option name="LAST_COMMIT_MESSAGE" value="Probably should upload" />
   </component>
   <component name="editorHistoryManager">
     <entry file="uml://JAVA/ShipWarfare">
@@ -706,130 +696,86 @@
       </provider>
     </entry>
     <entry file="file://$PROJECT_DIR$/src/Game.java" />
-    <entry file="file://$PROJECT_DIR$/src/Warehouse.java">
+    <entry file="file://$PROJECT_DIR$/src/Warehouse.java" />
+    <entry file="file://$PROJECT_DIR$/src/Bank.java" />
+    <entry file="file://$PROJECT_DIR$/src/TaipanShop.java" />
+    <entry file="file://$PROJECT_DIR$/src/Travel.java">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="945">
-          <caret line="45" selection-start-line="45" selection-end-line="45" />
+        <state relative-caret-position="27">
+          <caret line="125" column="63" selection-start-line="125" selection-start-column="63" selection-end-line="125" selection-end-column="63" />
+          <folding>
+            <element signature="imports" expanded="true" />
+          </folding>
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/Bank.java">
+    <entry file="jar:///Library/Java/JavaVirtualMachines/jdk1.8.0_201.jdk/Contents/Home/javafx-src.zip!/com/sun/glass/ui/InvokeLaterDispatcher.java">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="2100">
-          <caret line="100" column="6" selection-start-line="100" selection-start-column="6" selection-end-line="100" selection-end-column="6" />
+        <state relative-caret-position="140">
+          <caret line="110" column="19" selection-start-line="110" selection-start-column="19" selection-end-line="110" selection-end-column="19" />
         </state>
       </provider>
     </entry>
-    <entry file="jar:///Library/Java/JavaVirtualMachines/jdk1.8.0_201.jdk/Contents/Home/javafx-src.zip!/com/sun/glass/ui/InvokeLaterDispatcher.java" />
     <entry file="file://$PROJECT_DIR$/src/ShopGUI" />
-    <entry file="file://$PROJECT_DIR$/src/main.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="546">
-          <caret line="26" selection-start-line="26" selection-end-line="26" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/ShipWarfareGUI.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="218">
-          <caret line="386" column="35" selection-start-line="386" selection-start-column="35" selection-end-line="386" selection-end-column="35" />
-          <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="1995">
-          <caret line="95" column="5" selection-start-line="95" selection-start-column="5" selection-end-line="95" selection-end-column="5" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/ShopGUI.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="693">
-          <caret line="113" column="15" lean-forward="true" selection-start-line="113" selection-start-column="15" selection-end-line="113" selection-end-column="15" />
-          <folding>
-            <element signature="imports" 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="399">
-          <caret line="62" selection-start-line="62" selection-end-line="62" />
-        </state>
-      </provider>
-    </entry>
     <entry file="file://$PROJECT_DIR$/src/Start.java">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="438">
-          <caret line="25" column="7" lean-forward="true" selection-start-line="25" selection-start-column="7" selection-end-line="25" selection-end-column="7" />
+        <state relative-caret-position="15">
+          <caret line="1" column="13" selection-start-line="1" selection-start-column="13" selection-end-line="1" selection-end-column="13" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="195">
+          <caret line="13" column="5" lean-forward="true" selection-start-line="13" selection-start-column="5" selection-end-line="13" selection-end-column="5" />
         </state>
       </provider>
     </entry>
     <entry file="file://$PROJECT_DIR$/src/ShipWarfare.java">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="-13">
-          <caret line="303" column="24" lean-forward="true" selection-start-line="303" selection-start-column="24" selection-end-line="303" selection-end-column="24" />
+        <state relative-caret-position="-1074">
+          <caret line="17" column="35" selection-start-line="17" selection-start-column="35" selection-end-line="17" selection-end-column="35" />
           <folding>
             <element signature="imports" expanded="true" />
           </folding>
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/Travel.java">
+    <entry file="file://$PROJECT_DIR$/src/ShipWarfareGUI.java">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="774">
-          <caret line="157" column="43" selection-start-line="157" selection-start-column="43" selection-end-line="157" selection-end-column="43" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/loanSharkGUI.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="-273">
-          <caret line="13" column="13" selection-start-line="13" selection-start-column="13" selection-end-line="13" selection-end-column="13" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/MainGUI.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="483">
-          <caret line="45" column="39" selection-start-line="45" selection-start-column="39" selection-end-line="45" selection-end-column="39" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/Player.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="525">
-          <caret line="61" column="44" selection-start-line="61" selection-start-column="44" selection-end-line="61" selection-end-column="44" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/TravelGUI.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="19">
-          <caret line="436" column="33" selection-start-line="436" selection-start-column="33" selection-end-line="436" selection-end-column="33" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/StartGUI.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="2856">
-          <caret line="145" column="40" lean-forward="true" selection-start-line="145" selection-start-column="40" selection-end-line="145" selection-end-column="40" />
+        <state relative-caret-position="203">
+          <caret line="254" selection-start-line="254" selection-end-line="254" />
+          <folding>
+            <element signature="imports" expanded="true" />
+          </folding>
         </state>
       </provider>
     </entry>
     <entry file="file://$PROJECT_DIR$/src/TaipanShopGUI.java">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="399">
-          <caret line="312" column="7" selection-start-line="312" selection-start-column="7" selection-end-line="312" selection-end-column="7" />
-          <folding>
-            <element signature="e#24130#24131#0" expanded="true" />
-            <element signature="e#24170#24171#0" expanded="true" />
-          </folding>
+        <state relative-caret-position="915">
+          <caret line="76" column="16" selection-start-line="76" selection-start-column="16" selection-end-line="76" selection-end-column="16" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/MainGUI.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="780">
+          <caret line="55" column="28" selection-start-line="53" selection-start-column="7" selection-end-line="55" selection-end-column="28" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/TravelGUI.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="6615">
+          <caret line="465" column="42" selection-start-line="465" selection-start-column="42" selection-end-line="465" selection-end-column="42" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/Player.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="330">
+          <caret line="22" column="22" lean-forward="true" selection-start-line="22" selection-start-column="22" selection-end-line="22" selection-end-column="22" />
         </state>
       </provider>
     </entry>
@@ -890,7 +836,6 @@
             <option name="proportions">
               <list>
                 <option value="0.2" />
-                <option value="0.6" />
               </list>
             </option>
           </splitter-proportions>
diff --git a/TaipanClone.iml b/TaipanClone.iml
index d5c0743..a860761 100644
--- a/TaipanClone.iml
+++ b/TaipanClone.iml
@@ -5,8 +5,7 @@
     <content url="file://$MODULE_DIR$">
       <sourceFolder url="file://$MODULE_DIR$/src" isTestSource="false" />
     </content>
-    <orderEntry type="inheritedJdk" />
+    <orderEntry type="jdk" jdkName="1.8.0_201" jdkType="JavaSDK" />
     <orderEntry type="sourceFolder" forTests="false" />
   </component>
-</module>
-
+</module>
\ No newline at end of file
diff --git a/src/ShipWarfareGUI.java b/src/ShipWarfareGUI.java
index 44fe25b..5dac988 100644
--- a/src/ShipWarfareGUI.java
+++ b/src/ShipWarfareGUI.java
@@ -250,7 +250,10 @@ public class ShipWarfareGUI {
             player.setGuns(player.getGuns() - 1);
             gunFrustration = true;
         } else {
-            player.setHP(player.getHP() - (1 + randomValue.nextInt(10)));
+            if (numOfPeasantShips>0) {
+                player.setHP(player.getHP() - (1 + randomValue.nextInt(10)));
+
+            }
         }
         if (player.getHP() <= 0) {
             exitValue = 2;
@@ -290,6 +293,12 @@ public class ShipWarfareGUI {
         return false;
     }
 
+    /**
+     * Sets up the graphical part of ShipWarfare
+     * @param stage sets the stage to which we will execute the scene of the ShipWarfare class
+     * @return
+     */
+
     public Stage initializeShip(Stage stage){
         setNumOfPeasantShips(numOfShips());
 

From 9b9af573a8754a177893c7d7e18c2d493f43837d Mon Sep 17 00:00:00 2001
From: Nathan Lum <33772546+Templarre@users.noreply.github.com>
Date: Sun, 10 Mar 2019 22:56:26 -0600
Subject: [PATCH 3/4] Added Javadoc comments

---
 src/WarehouseGUI.java | 422 +++++++++++++++++++++++++++++++++++++++++-
 1 file changed, 418 insertions(+), 4 deletions(-)

diff --git a/src/WarehouseGUI.java b/src/WarehouseGUI.java
index f7196a3..b66bd05 100644
--- a/src/WarehouseGUI.java
+++ b/src/WarehouseGUI.java
@@ -1,4 +1,4 @@
-
+import java.util.Scanner;
 import javafx.application.Application;
 import javafx.event.ActionEvent;
 import javafx.event.EventHandler;
@@ -12,6 +12,10 @@ import javafx.scene.text.Font;
 import javafx.scene.text.Text;
 import javafx.stage.Stage;
 
+/**
+ * A class that makes the GUI for the Warehouse class.
+ *
+ */
 public class WarehouseGUI {
 
     private Player player;
@@ -20,6 +24,7 @@ public class WarehouseGUI {
     private HBox hBox;
     private Button withdraw;
     private Button deposit;
+    private Button goBack;
     private VBox vBox;
     private Text playerName;
     private Text text;
@@ -39,21 +44,42 @@ public class WarehouseGUI {
     private Text vacantWarehouse;
     private BorderPane borderPane;
 
+    /**
+     * A constructor that takes an object of type Player as an argument
+     *
+     * @param player object of the class Player
+     */
     public WarehouseGUI(Player player) {
         Player playerDummy = new Player(player);
         this.player = playerDummy;
     }
 
+    /**
+     * Setter method for the Player object, player
+     *
+     * @param player an object of type Player
+     */
     public void setPlayer(Player player) {
         Player playerDummy = new Player(player);
         this.player = playerDummy;
     }
 
+    /**
+     * Getter method for the Player object, player.
+     *
+     * @return returns a copy of the Player object, player
+     */
     public Player getPlayer(){
         Player playerDummy = new Player(player);
         return playerDummy;
     }
 
+    /**
+     * initializes the GUI for the warehouse aspect of our game.
+     *
+     * @param stage an object of type Stage
+     * @return returns the stage of the GUI
+     */
     public Stage initializeWarehouse(Stage stage) {
 
         title = new Text();
@@ -79,9 +105,17 @@ public class WarehouseGUI {
         vacantWarehouse = new Text();
         borderPane = new BorderPane();
 
+        /**
+         * Sets the preferred width and height of the borderpane window to 600 by 480.
+         *
+         */
         borderPane.setPrefHeight(480.0);
         borderPane.setPrefWidth(600.0);
 
+        /**
+         * Creates a label "Hong Kong Warehouse: at the top of the borderpane.
+         *
+         */
         borderPane.setAlignment(title, javafx.geometry.Pos.CENTER);
         title.setStrokeType(javafx.scene.shape.StrokeType.OUTSIDE);
         title.setStrokeWidth(0.0);
@@ -91,11 +125,19 @@ public class WarehouseGUI {
         title.setFont(new Font(24.0));
         borderPane.setTop(title);
 
+        /**
+         * creates an HBox at the center of the borderpane with a width of 200 and height of 100.
+         *
+         */
         borderPane.setAlignment(hBox, javafx.geometry.Pos.CENTER);
         hBox.setAlignment(javafx.geometry.Pos.CENTER);
         hBox.setPrefHeight(100.0);
         hBox.setPrefWidth(200.0);
 
+        /**
+         * Creates a button with text "Withdraw" which handles user events.
+         *
+         */
         withdraw.setContentDisplay(javafx.scene.control.ContentDisplay.CENTER);
         withdraw.setMnemonicParsing(false);
         withdraw.setPrefWidth(250.0);
@@ -104,11 +146,14 @@ public class WarehouseGUI {
         withdraw.setOnAction(new EventHandler<ActionEvent>() {
             @Override
             public void handle(ActionEvent event) {
-                //NATHAN WRITE CODE HERE
+                System.out.println("hello");
             }
         });
 
-
+        /**
+         * Creates a button with text "Deposit" which handles user events.
+         *
+         */
         deposit.setMnemonicParsing(false);
         deposit.setPrefWidth(250.0);
         deposit.setText("Deposit");
@@ -118,14 +163,41 @@ public class WarehouseGUI {
         deposit.setOnAction(new EventHandler<ActionEvent>() {
             @Override
             public void handle(ActionEvent event) {
-                //NATHAN WRITE CODE HERE
+                System.out.println("hello");
+
             }
         });
 
+        /**
+         * Creates a button with text "Go Back" which handles user events.
+         *
+         */
+        goBack.setMnemonicParsing(false);
+        goBack.setPrefWidth(250.0);
+        goBack.setText("Go Back");
+        goBack.setTextAlignment(javafx.scene.text.TextAlignment.CENTER);
+        borderPane.setBottom(hBox);
+
+        goBack.setOnAction(new EventHandler<ActionEvent>() {
+            @Override
+            public void handle(ActionEvent event) {
+                System.out.println("hello");
+
+            }
+        });
+
+        /**
+         * Creates a VBox at the left of the center of the borderpane with a width of 106 and a height of 156.
+         *
+         */
         borderPane.setAlignment(vBox, javafx.geometry.Pos.CENTER_LEFT);
         vBox.setPrefHeight(156.0);
         vBox.setPrefWidth(106.0);
 
+        /**
+         * Creates a label with text "Player" with size 18 font and default font style.
+         *
+         */
         playerName.setStrokeType(javafx.scene.shape.StrokeType.OUTSIDE);
         playerName.setStrokeWidth(0.0);
         playerName.setText("Player");
@@ -133,12 +205,20 @@ public class WarehouseGUI {
         playerName.setWrappingWidth(103.47265625);
         playerName.setFont(new Font(18.0));
 
+        /**
+         * Creates a label with no text for aesthetic spacing purposes.
+         *
+         */
         text.setStrokeType(javafx.scene.shape.StrokeType.OUTSIDE);
         text.setStrokeWidth(0.0);
         text.setTextAlignment(javafx.scene.text.TextAlignment.CENTER);
         text.setWrappingWidth(103.47265625);
         text.setFont(new Font(18.0));
 
+        /**
+         * Creates a label with text "Opium" under the "Player" label with size 18 font and default font style
+         *
+         */
         opiumPlayer.setAlignment(javafx.geometry.Pos.CENTER);
         opiumPlayer.setContentDisplay(javafx.scene.control.ContentDisplay.CENTER);
         opiumPlayer.setPrefWidth(100.0);
@@ -146,16 +226,28 @@ public class WarehouseGUI {
         opiumPlayer.setTextAlignment(javafx.scene.text.TextAlignment.CENTER);
         opiumPlayer.setFont(new Font(18.0));
 
+        /**
+         * Creates a label with text "Silk" under the "Player" label with size 18 font and default font style.
+         *
+         */
         silkPlayer.setAlignment(javafx.geometry.Pos.CENTER);
         silkPlayer.setPrefWidth(100.0);
         silkPlayer.setText("Silk");
         silkPlayer.setFont(new Font(18.0));
 
+        /**
+         * Creates a label with text "Arms" under the "Player" label with size 18 font and default font style.
+         *
+         */
         armsPlayer.setAlignment(javafx.geometry.Pos.CENTER);
         armsPlayer.setPrefWidth(100.0);
         armsPlayer.setText("Arms");
         armsPlayer.setFont(new Font(18.0));
 
+        /**
+         * Creates a label with text "General" under the "Player" label with size 18 font and default font style.
+         *
+         */
         generalPlayer.setAlignment(javafx.geometry.Pos.CENTER);
         generalPlayer.setPrefWidth(100.0);
         generalPlayer.setText("General");
@@ -163,11 +255,19 @@ public class WarehouseGUI {
         generalPlayer.setFont(new Font(18.0));
         borderPane.setLeft(vBox);
 
+        /**
+         * Creates a VBox at the center of the borderpane with a width of 261 and a height of 343.
+         *
+         */
         BorderPane.setAlignment(vBox0, javafx.geometry.Pos.TOP_LEFT);
         vBox0.setAlignment(javafx.geometry.Pos.CENTER);
         vBox0.setPrefHeight(343.0);
         vBox0.setPrefWidth(261.0);
 
+        /**
+         * Creates a label with text "Warehouse" with size 18 font and default font style.
+         *
+         */
         text0.setStrokeType(javafx.scene.shape.StrokeType.OUTSIDE);
         text0.setStrokeWidth(0.0);
         text0.setText("Warehouse");
@@ -175,12 +275,20 @@ public class WarehouseGUI {
         text0.setWrappingWidth(103.47265625);
         text0.setFont(new Font(18.0));
 
+        /**
+         * Creates a label with no text for aesthetic spacing purposes.
+         *
+         */
         text1.setStrokeType(javafx.scene.shape.StrokeType.OUTSIDE);
         text1.setStrokeWidth(0.0);
         text1.setTextAlignment(javafx.scene.text.TextAlignment.CENTER);
         text1.setWrappingWidth(103.47265625);
         text1.setFont(new Font(18.0));
 
+        /**
+         * Creates a label with text "Opium" under the "Warehouse" label with size 18 font and default font style.
+         *
+         */
         opiumWarehouse.setStrokeType(javafx.scene.shape.StrokeType.OUTSIDE);
         opiumWarehouse.setStrokeWidth(0.0);
         opiumWarehouse.setText("Opium");
@@ -188,6 +296,10 @@ public class WarehouseGUI {
         opiumWarehouse.setWrappingWidth(103.47265625);
         opiumWarehouse.setFont(new Font(18.0));
 
+        /**
+         * Creates a label with text "Silk" under the "Warehouse" label with size 18 font and default font style.
+         *
+         */
         silkWarehouse.setStrokeType(javafx.scene.shape.StrokeType.OUTSIDE);
         silkWarehouse.setStrokeWidth(0.0);
         silkWarehouse.setText("Silk");
@@ -195,6 +307,10 @@ public class WarehouseGUI {
         silkWarehouse.setWrappingWidth(103.47265625);
         silkWarehouse.setFont(new Font(18.0));
 
+        /**
+         * Creates a label with text "Arms" under the "Warehouse" label with size 18 font and default font style.
+         *
+         */
         armsWarehouse.setStrokeType(javafx.scene.shape.StrokeType.OUTSIDE);
         armsWarehouse.setStrokeWidth(0.0);
         armsWarehouse.setText("Arms");
@@ -202,6 +318,10 @@ public class WarehouseGUI {
         armsWarehouse.setWrappingWidth(103.47265625);
         armsWarehouse.setFont(new Font(18.0));
 
+        /**
+         * Creates a label with text "General" under the "Warehouse" label with size 18 font and default font style.
+         *
+         */
         generalWarehouse.setStrokeType(javafx.scene.shape.StrokeType.OUTSIDE);
         generalWarehouse.setStrokeWidth(0.0);
         generalWarehouse.setText("General");
@@ -210,21 +330,37 @@ public class WarehouseGUI {
         generalWarehouse.setFont(new Font(18.0));
         borderPane.setCenter(vBox0);
 
+        /**
+         * Creates a VBox at the center of the borderpane with a width of 152 and a height of 48.
+         *
+         */
         borderPane.setAlignment(vBox1, javafx.geometry.Pos.CENTER);
         vBox1.setPrefHeight(48.0);
         vBox1.setPrefWidth(152.0);
 
+        /**
+         * Creates a label with "In use:" text with size 18 font and default font style.
+         *
+         */
         inUseWarehouse.setStrokeType(javafx.scene.shape.StrokeType.OUTSIDE);
         inUseWarehouse.setStrokeWidth(0.0);
         inUseWarehouse.setText("In use:");
         inUseWarehouse.setFont(new Font(18.0));
 
+        /**
+         * Creates a label with "Vacant:" text with size 18 font and default font style.
+         *
+         */
         vacantWarehouse.setStrokeType(javafx.scene.shape.StrokeType.OUTSIDE);
         vacantWarehouse.setStrokeWidth(0.0);
         vacantWarehouse.setText("Vacant:");
         vacantWarehouse.setFont(new Font(18.0));
         borderPane.setRight(vBox1);
 
+        /**
+         * Adds all the labels and buttons to their respective boxes.
+         *
+         */
         hBox.getChildren().add(withdraw);
         hBox.getChildren().add(deposit);
         vBox.getChildren().add(playerName);
@@ -250,9 +386,287 @@ public class WarehouseGUI {
         return stage;
     }
 
+    /**
+     * When run, shows the stage as a graphical interface through JavaFX.
+     *
+     * @param primaryStage object of type Stage
+     */
     public void start(Stage primaryStage) {
         WarehouseGUI warehouseGUI = new WarehouseGUI(player);
         warehouseGUI.initializeWarehouse(primaryStage);
         primaryStage.show();
     }
+
+    /**
+     * The purpose of this class is to create a warehouse where the goods
+     * can be safely stored without holing space on the ship!
+     */
+
+    public class Warehouse {
+        /*private int wOpium = 0;
+        private int wSilk = 0;
+        private int wGeneral = 0;
+        private int wArms = 0;*/
+        private Player player;
+
+        /**
+         * setter method that takes in a Player object as an argument.
+         *
+         * @param player object of the class Player
+         */
+
+        public void setPlayer(Player player) {
+            Player playerDummy = new Player(player);
+            this.player = playerDummy;
+        }
+
+        /**
+         * getter method for obtaining a player object.
+         *
+         * @return returns player object
+         */
+
+        public Player getPlayer() {
+            Player playerDummy = new Player(player);
+            return playerDummy;
+        }
+
+        /**
+         * Class Constructor that takes in a type player as a parameter
+         *
+         * @param player object of the class Player
+         */
+
+        public Warehouse(Player player) {
+            Player playerDummy = new Player(player);
+            this.player = playerDummy;
+        }
+
+        /**
+         * This method adds an amount of a certain good
+         * the user is prompted to enter the amount they would like to
+         * 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
+         * then the method executes the transfer
+         *
+         */
+        public void addAmount() {
+            boolean askGood = false;
+            String amount;
+            int finalAmount = 0;
+            System.out.println("Please enter the amount of the good you would like to ADD.");
+            Scanner keyboard = new Scanner(System.in);
+            amount = keyboard.nextLine();//Asks the user for the amount of the good they would like to add
+         /*The try function ensures that the program does not crash
+         due to any errors while giving the program an incorrect input*/
+            try {
+                //The if statement checks that you have enough resources to make the transfer
+                if (Integer.parseInt(amount) <= player.getOpiumHeld() || Integer.parseInt(amount) <= player.getSilkHeld() || Integer.parseInt(amount) <= player.getGeneralHeld() || Integer.parseInt(amount) <= player.getArmsHeld()) {
+                    finalAmount = Integer.parseInt(amount);
+                    askGood = true;
+                }
+                //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!");
+                    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) {
+                    String good;
+                    System.out.println("Please enter a good to transfer O, S, G, A :");
+                    good = keyboard.nextLine();
+                    int held = 0;
+                    //The following set of loops check to see which good the user has selected and makes the transfer
+                    if (Integer.parseInt(amount) > 0) {
+                        if (good.equalsIgnoreCase("O")) {
+                            if (player.getOpiumHeld() >= Integer.parseInt(amount)) {
+                                player.setwOpium(player.getwOpium() + finalAmount);
+                                held = player.getOpiumHeld();
+                                player.setOpiumHeld(held - finalAmount);
+                                System.out.println(player.getOpiumHeld());
+                            } else {
+                                System.out.println("You don't even have that much opium!");
+                            }
+                        } else if (good.equalsIgnoreCase("S")) {
+                            if (player.getSilkHeld() >= Integer.parseInt(amount)) {
+                                player.setwSilk(player.getwSilk() + finalAmount);
+                                held = player.getSilkHeld();
+                                player.setSilkHeld(held - finalAmount);
+                            } else {
+                                System.out.println("You don't even have that much silk!");
+
+                            }
+                        } else if (good.equalsIgnoreCase("G")) {
+                            if (player.getGeneralHeld() >= Integer.parseInt(amount)) {
+                                player.setwGeneral(player.getwGeneral() + finalAmount);
+                                held = player.getGeneralHeld();
+                                player.setGeneralHeld(held - finalAmount);
+                            } else {
+                                System.out.println("You don't even have that much general cargo!");
+
+                            }
+                        } else if (good.equalsIgnoreCase("A")) {
+                            if (player.getArmsHeld() >= Integer.parseInt(amount)) {
+                                player.setwArms(player.getwArms() + finalAmount);
+                                held = player.getArmsHeld();
+                                player.setArmsHeld(held - finalAmount);
+                            } else {
+                                System.out.println("You don't even have that much Arms!");
+                            }
+                        }
+                    }
+                    //Ensures no negative amounts are entered
+                    else {
+                        System.out.println("Sorry this transfer cannot be made");
+                    }
+                }
+                //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");
+            }
+        }
+
+        /**
+         * This method removes an amount of a certain good
+         * the user is prompted to enter the amount they would like to
+         * 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
+         * then the method executes the transfer
+         *
+         */
+
+        public void removeAmount() {
+            String amount;
+            boolean askGood = false;
+            int finalAmount = 0;
+            System.out.println("Please enter the amount of the good you would like to REMOVE");
+            Scanner keyboard = new Scanner(System.in);
+            //Prompts the user for the amount they would like to remove
+            amount = keyboard.nextLine();
+            //The if statement checks that you have enough resources to make the transfer
+            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()) {
+                    finalAmount = Integer.parseInt(amount);
+                    askGood = true;
+                }
+                //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!");
+                    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) {
+                    String good;
+                    System.out.println("Please enter a good to transfer O, S, G, A :");
+                    good = keyboard.nextLine();
+                    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 (good.equalsIgnoreCase("O")) {
+                            if (player.getwOpium() >= Integer.parseInt(amount)) {
+                                player.setwOpium(player.getwOpium() - Integer.parseInt(amount));
+                                held = player.getOpiumHeld();
+                                player.setOpiumHeld(held + finalAmount);
+                            } else {
+                                System.out.println("You don't have that much opium stored in the warehouse!");
+                            }
+                        } else if (good.equalsIgnoreCase("S")) {
+                            if (player.getwSilk() >= Integer.parseInt(amount)) {
+                                player.setwSilk(player.getwSilk() - Integer.parseInt(amount));
+                                held = player.getSilkHeld();
+                                player.setSilkHeld(held + finalAmount);
+                            } else {
+                                System.out.println("You don't have that much silk stored in the warehouse!");
+                            }
+                        } else if (good.equalsIgnoreCase("G")) {
+                            if (player.getwGeneral() >= Integer.parseInt(amount)) {
+                                player.setwGeneral(player.getwGeneral() - Integer.parseInt(amount));
+                                held = player.getGeneralHeld();
+                                player.setGeneralHeld(held + finalAmount);
+                            } else {
+                                System.out.println("You don't have that much general cargo stored in the warehouse!");
+
+                            }
+                        } else if (good.equalsIgnoreCase("A")) {
+                            if (player.getwArms() >= Integer.parseInt(amount)) {
+                                player.setwArms(player.getwArms() - Integer.parseInt(amount));
+                                held = player.getArmsHeld();
+                                player.setArmsHeld(held + finalAmount);
+                            } else {
+                                System.out.println("You don't have that much arms stored in the warehouse!");
+
+                            }
+                        }
+                    }
+                    //Ensures the value entered is positive
+                    else {
+                        System.out.println("Sorry this transfer cannot be made");
+                    }
+                }
+            }
+            //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");
+            }
+        }
+
+        /**
+         * 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() {
+            System.out.println("--------------------\nWarehouse\n--------------------");
+            System.out.println("Opium : " + player.getwOpium());
+            System.out.println("Silk : " + player.getwSilk());
+            System.out.println("General : " + player.getwGeneral());
+            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() {
+            boolean keepGoing = true;
+            while (keepGoing) {
+                this.showWarehouse();
+                String input = " ";
+                System.out.println("Would you like to add(A) or remove(R) resources? ");
+                Scanner keyboard = new Scanner(System.in);
+                input = keyboard.next();
+                if (input.equalsIgnoreCase("R")) {
+                    this.removeAmount();
+                    this.showWarehouse();
+                } else if (input.equalsIgnoreCase("A")) {
+                    this.addAmount();
+                    this.showWarehouse();
+
+                }
+                else{
+                    System.out.println("Don't waste the warehouse's time, try again later with a valid input");
+                }
+
+                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?");
+                check = keyboard.nextLine();
+                check = keyboard.nextLine();
+
+                if (check.equalsIgnoreCase("Y")) {
+                    keepGoing = true;
+                } else if (check.equalsIgnoreCase("N")) {
+                    keepGoing = false;
+                }
+            }
+        }
+
+    }
+
 }

From ba16ea180978e40979e53f43c4d3559d5c10e860 Mon Sep 17 00:00:00 2001
From: KahootChampion <p.harismuhammadkhan@gmail.com>
Date: Sun, 10 Mar 2019 22:58:31 -0600
Subject: [PATCH 4/4] Completed javadocs for shipwarfare GUI

---
 .idea/workspace.xml     | 69 ++++++++++++++++++++++-------------------
 src/ShipWarfareGUI.java | 24 ++++++++++++--
 2 files changed, 59 insertions(+), 34 deletions(-)

diff --git a/.idea/workspace.xml b/.idea/workspace.xml
index 1055077..b6e4175 100644
--- a/.idea/workspace.xml
+++ b/.idea/workspace.xml
@@ -1,10 +1,8 @@
 <?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="Probably should upload">
+    <list default="true" id="3114a2b9-4919-4fdf-8fd9-d03b60109ce4" name="Default Changelist" comment="">
       <change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/TaipanClone.iml" beforeDir="false" afterPath="$PROJECT_DIR$/TaipanClone.iml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/Player.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Player.java" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/src/ShipWarfareGUI.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/ShipWarfareGUI.java" afterDir="false" />
     </list>
     <ignored path="$PROJECT_DIR$/out/" />
@@ -18,11 +16,11 @@
   </component>
   <component name="FileEditorManager">
     <leaf SIDE_TABS_SIZE_LIMIT_KEY="300">
-      <file pinned="false" current-in-tab="false">
+      <file pinned="false" current-in-tab="true">
         <entry file="file://$PROJECT_DIR$/src/ShipWarfareGUI.java">
           <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="203">
-              <caret line="254" selection-start-line="254" selection-end-line="254" />
+            <state relative-caret-position="7290">
+              <caret line="486" column="32" lean-forward="true" selection-start-line="486" selection-start-column="32" selection-end-line="486" selection-end-column="32" />
               <folding>
                 <element signature="imports" expanded="true" />
               </folding>
@@ -30,11 +28,11 @@
           </provider>
         </entry>
       </file>
-      <file pinned="false" current-in-tab="true">
+      <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="330">
-              <caret line="22" column="22" lean-forward="true" selection-start-line="22" selection-start-column="22" selection-end-line="22" selection-end-column="22" />
+            <state>
+              <caret column="5" lean-forward="true" selection-start-column="5" selection-end-column="5" />
             </state>
           </provider>
         </entry>
@@ -42,8 +40,8 @@
       <file pinned="false" current-in-tab="false">
         <entry file="file://$PROJECT_DIR$/src/TaipanShopGUI.java">
           <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="915">
-              <caret line="76" column="16" selection-start-line="76" selection-start-column="16" selection-end-line="76" selection-end-column="16" />
+            <state relative-caret-position="810">
+              <caret line="69" column="16" selection-start-line="69" selection-start-column="16" selection-end-line="69" selection-end-column="16" />
             </state>
           </provider>
         </entry>
@@ -133,8 +131,8 @@
         <option value="$PROJECT_DIR$/src/ShipWarfare.java" />
         <option value="$PROJECT_DIR$/src/TaipanShopGUI.java" />
         <option value="$PROJECT_DIR$/src/TravelGUI.java" />
-        <option value="$PROJECT_DIR$/src/ShipWarfareGUI.java" />
         <option value="$PROJECT_DIR$/src/Player.java" />
+        <option value="$PROJECT_DIR$/src/ShipWarfareGUI.java" />
       </list>
     </option>
   </component>
@@ -174,7 +172,7 @@
     <property name="ChangesTree.GroupingKeys" value="" />
     <property name="WebServerToolWindowFactoryState" value="false" />
     <property name="aspect.path.notification.shown" value="true" />
-    <property name="com.android.tools.idea.instantapp.provision.ProvisionBeforeRunTaskProvider.myTimeStamp" value="1552279380815" />
+    <property name="com.android.tools.idea.instantapp.provision.ProvisionBeforeRunTaskProvider.myTimeStamp" value="1552280276915" />
     <property name="extract.method.default.visibility" value="private" />
     <property name="last_opened_file_path" value="$PROJECT_DIR$/../GitHub/Cpsc233" />
     <property name="project.structure.last.edited" value="Modules" />
@@ -289,7 +287,7 @@
       <workItem from="1552240770629" duration="40000" />
       <workItem from="1552241394045" duration="178000" />
       <workItem from="1552254283748" duration="9473000" />
-      <workItem from="1552277298937" duration="1205000" />
+      <workItem from="1552277298937" duration="2115000" />
     </task>
     <task id="LOCAL-00001" summary="This should fix the ShipWarfare file and bring it up to date with the rest of the file.">
       <created>1550458470138</created>
@@ -522,11 +520,18 @@
       <option name="project" value="LOCAL" />
       <updated>1552270321402</updated>
     </task>
-    <option name="localTasksCounter" value="34" />
+    <task id="LOCAL-00034" summary="Fixed ShipWarfare bug about one-shotting.">
+      <created>1552279406065</created>
+      <option name="number" value="00034" />
+      <option name="presentableId" value="LOCAL-00034" />
+      <option name="project" value="LOCAL" />
+      <updated>1552279406066</updated>
+    </task>
+    <option name="localTasksCounter" value="35" />
     <servers />
   </component>
   <component name="TimeTrackingManager">
-    <option name="totallyTimeSpent" value="74278000" />
+    <option name="totallyTimeSpent" value="75188000" />
   </component>
   <component name="ToolWindowManager">
     <frame x="6" y="26" width="1189" height="652" extended-state="0" />
@@ -629,7 +634,6 @@
     <ignored-roots>
       <path value="$PROJECT_DIR$" />
     </ignored-roots>
-    <MESSAGE value="Fixed the commenting on a lot of the code. Also added some stuff to Travel, fixed some bugs." />
     <MESSAGE value="Added time stuff to Shipwarfare GUI" />
     <MESSAGE value="Nitified of getting attacked" />
     <MESSAGE value="Notified of getting attacked" />
@@ -654,7 +658,8 @@
     <MESSAGE value="Completed SHipWarfareGUI" />
     <MESSAGE value="Completed ShipWarfareGUI" />
     <MESSAGE value="Probably should upload" />
-    <option name="LAST_COMMIT_MESSAGE" value="Probably should upload" />
+    <MESSAGE value="Fixed ShipWarfare bug about one-shotting." />
+    <option name="LAST_COMMIT_MESSAGE" value="Fixed ShipWarfare bug about one-shotting." />
   </component>
   <component name="editorHistoryManager">
     <entry file="uml://JAVA/ShipWarfare">
@@ -741,20 +746,10 @@
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/ShipWarfareGUI.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="203">
-          <caret line="254" selection-start-line="254" selection-end-line="254" />
-          <folding>
-            <element signature="imports" expanded="true" />
-          </folding>
-        </state>
-      </provider>
-    </entry>
     <entry file="file://$PROJECT_DIR$/src/TaipanShopGUI.java">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="915">
-          <caret line="76" column="16" selection-start-line="76" selection-start-column="16" selection-end-line="76" selection-end-column="16" />
+        <state relative-caret-position="810">
+          <caret line="69" column="16" selection-start-line="69" selection-start-column="16" selection-end-line="69" selection-end-column="16" />
         </state>
       </provider>
     </entry>
@@ -774,8 +769,18 @@
     </entry>
     <entry file="file://$PROJECT_DIR$/src/Player.java">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="330">
-          <caret line="22" column="22" lean-forward="true" selection-start-line="22" selection-start-column="22" selection-end-line="22" selection-end-column="22" />
+        <state>
+          <caret column="5" lean-forward="true" selection-start-column="5" selection-end-column="5" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/ShipWarfareGUI.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="7290">
+          <caret line="486" column="32" lean-forward="true" selection-start-line="486" selection-start-column="32" selection-end-line="486" selection-end-column="32" />
+          <folding>
+            <element signature="imports" expanded="true" />
+          </folding>
         </state>
       </provider>
     </entry>
diff --git a/src/ShipWarfareGUI.java b/src/ShipWarfareGUI.java
index 5dac988..f028417 100644
--- a/src/ShipWarfareGUI.java
+++ b/src/ShipWarfareGUI.java
@@ -294,9 +294,9 @@ public class ShipWarfareGUI {
     }
 
     /**
-     * Sets up the graphical part of ShipWarfare
+     * Sets up the graphical part of ShipWarfare and includes all logic for the class
      * @param stage sets the stage to which we will execute the scene of the ShipWarfare class
-     * @return
+     * @return stage so that another class can switch to the stage
      */
 
     public Stage initializeShip(Stage stage){
@@ -384,6 +384,10 @@ public class ShipWarfareGUI {
         //Fight
         fightButton.setOnAction(new EventHandler<ActionEvent>() {
             @Override
+            /**
+             * Fight Button, engages in fight logic and graphical interface
+             * @param event, once button is clicked, executes graphical information
+             */
             public void handle(ActionEvent event) {
                 counter++;
                 chooseFightOrRun.setText("Ohh, Fight ehh?");
@@ -395,6 +399,10 @@ public class ShipWarfareGUI {
                         runButton.setVisible(false);
                         continueButton.setOnAction(new EventHandler<ActionEvent>() {
                             @Override
+                            /**
+                             * Switches to Taipan Shop scene
+                             * @param event, once button is clicked, executes graphical information
+                             */
                             public void handle(ActionEvent event) {
                                 TaipanShopGUI shop = new TaipanShopGUI(player);
                                 shop.initializeShop(stage);
@@ -417,6 +425,10 @@ public class ShipWarfareGUI {
         //Flee
         runButton.setOnAction(new EventHandler<ActionEvent>() {
             @Override
+            /**
+             * Run Button, engages in run logic and graphical interface
+             * @param event, once button is clicked, executes graphical information
+             */
             public void handle(ActionEvent event) {
                 chooseFightOrRun.setText("Ayy captain we will try to run!");
                 counter++;
@@ -433,6 +445,10 @@ public class ShipWarfareGUI {
                             runButton.setVisible(false);
                             continueButton.setOnAction(new EventHandler<ActionEvent>() {
                                 @Override
+                                /**
+                                 * Switches to Taipan Shop scene
+                                 * @param event, once button is clicked, executes graphical information
+                                 */
                                 public void handle(ActionEvent event) {
                                     TaipanShopGUI shop = new TaipanShopGUI(player);
                                     shop.initializeShop(stage);
@@ -467,6 +483,10 @@ public class ShipWarfareGUI {
         return stage;
     }
 
+    /**
+     * sets scene and runs stage
+     * @param primaryStage the stage in which the scene may be run and switched to
+     */
     public void start(Stage primaryStage){
         primaryStage = initializeShip(primaryStage);
         primaryStage.show();