From ea591057cda8186e46f411b4965901f78a3bd5d9 Mon Sep 17 00:00:00 2001
From: Solargale <harkamalsr@gmail.com>
Date: Sun, 7 Apr 2019 12:59:00 -0600
Subject: [PATCH] Fixed the severe lack of TaipanShopText

---
 .idea/workspace.xml      | 976 +++++++++++++++++----------------------
 src/TaipanShopText.java  | 267 +++++++++++
 src/TravelText.java      |   1 +
 src/saves/playerSave.txt | Bin 383 -> 383 bytes
 4 files changed, 686 insertions(+), 558 deletions(-)
 create mode 100644 src/TaipanShopText.java

diff --git a/.idea/workspace.xml b/.idea/workspace.xml
index a141c98..2fbce8d 100644
--- a/.idea/workspace.xml
+++ b/.idea/workspace.xml
@@ -1,40 +1,31 @@
 <?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="Failed attempt at separating logic and GUI but saving just in case I need it later">
+    <list default="true" id="3114a2b9-4919-4fdf-8fd9-d03b60109ce4" name="Default Changelist" comment="Fixed a bunch of errors where">
       <change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/ShipWarfareGUI.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/ShipWarfareGUI.java" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/src/saves/playerSave.txt" beforeDir="false" afterPath="$PROJECT_DIR$/src/saves/playerSave.txt" afterDir="false" />
     </list>
-    <ignored path="$PROJECT_DIR$/out/" />
-    <ignored path="C:\Users\Harkamal Randhawa\IdeaProjects\TaipanClone\.idea\shelf/" />
-    <ignored path="$PROJECT_DIR$/.idea/shelf/" />
-    <option name="EXCLUDED_CONVERTED_TO_IGNORED" value="true" />
     <option name="SHOW_DIALOG" value="false" />
     <option name="HIGHLIGHT_CONFLICTS" value="true" />
     <option name="HIGHLIGHT_NON_ACTIVE_CHANGELIST" value="false" />
     <option name="LAST_RESOLUTION" value="IGNORE" />
   </component>
   <component name="FileEditorManager">
-    <leaf SIDE_TABS_SIZE_LIMIT_KEY="300">
+    <leaf>
       <file pinned="false" current-in-tab="false">
-        <entry file="file://$PROJECT_DIR$/src/MainGUI.java">
+        <entry file="file://$PROJECT_DIR$/src/ShipWarfareLogic.java">
           <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="210">
-              <caret line="15" column="6" selection-start-line="15" selection-start-column="6" selection-end-line="15" selection-end-column="6" />
-              <folding>
-                <element signature="e#551#552#0" expanded="true" />
-                <element signature="e#579#580#0" expanded="true" />
-              </folding>
+            <state relative-caret-position="153">
+              <caret line="9" column="13" selection-start-line="9" selection-start-column="13" selection-end-line="9" selection-end-column="13" />
             </state>
           </provider>
         </entry>
       </file>
-      <file pinned="false" current-in-tab="true">
+      <file pinned="false" current-in-tab="false">
         <entry file="file://$PROJECT_DIR$/src/ShipWarfareGUI.java">
           <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="-3881">
-              <caret line="159" selection-start-line="159" selection-end-line="159" />
+            <state relative-caret-position="425">
+              <caret line="70" column="26" selection-start-line="70" selection-start-column="26" selection-end-line="70" selection-end-column="26" />
               <folding>
                 <element signature="imports" expanded="true" />
               </folding>
@@ -42,47 +33,58 @@
           </provider>
         </entry>
       </file>
-      <file pinned="false" current-in-tab="false">
-        <entry file="file://$PROJECT_DIR$/src/ShipWarfareGUILogic.java">
-          <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="-1415">
-              <caret line="43" column="53" lean-forward="true" selection-start-line="43" selection-start-column="35" selection-end-line="43" selection-end-column="53" />
-              <folding>
-                <element signature="imports" expanded="true" />
-                <element signature="e#1238#1239#0" expanded="true" />
-                <element signature="e#1275#1276#0" expanded="true" />
-                <element signature="e#1675#1676#0" expanded="true" />
-                <element signature="e#1710#1711#0" expanded="true" />
-                <element signature="e#1766#1767#0" expanded="true" />
-                <element signature="e#1814#1815#0" expanded="true" />
-                <element signature="e#1854#1855#0" expanded="true" />
-                <element signature="e#1890#1891#0" expanded="true" />
-                <element signature="e#1948#1949#0" expanded="true" />
-                <element signature="e#1998#1999#0" expanded="true" />
-                <element signature="e#2047#2048#0" expanded="true" />
-                <element signature="e#2092#2093#0" expanded="true" />
-                <element signature="e#2283#2284#0" expanded="true" />
-                <element signature="e#2326#2327#0" expanded="true" />
-                <element signature="e#2510#2511#0" expanded="true" />
-                <element signature="e#2554#2555#0" expanded="true" />
-                <element signature="e#2734#2735#0" expanded="true" />
-                <element signature="e#2770#2771#0" expanded="true" />
-                <element signature="e#2828#2829#0" expanded="true" />
-                <element signature="e#2878#2879#0" expanded="true" />
-                <element signature="e#2960#2961#0" expanded="true" />
-                <element signature="e#2989#2990#0" expanded="true" />
-                <element signature="e#3030#3031#0" expanded="true" />
-                <element signature="e#3066#3067#0" expanded="true" />
-              </folding>
-            </state>
-          </provider>
-        </entry>
-      </file>
       <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="119">
-              <caret line="178" selection-start-line="178" selection-end-line="178" />
+            <state relative-caret-position="624">
+              <caret line="104" column="17" lean-forward="true" selection-start-line="104" selection-start-column="17" selection-end-line="104" selection-end-column="17" />
+              <folding>
+                <element signature="n#!!doc" expanded="true" />
+                <element signature="imports" expanded="true" />
+                <element signature="method#shipStatusString#0;class#TravelGUI#0" />
+              </folding>
+            </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="7175">
+              <caret line="720" lean-forward="true" selection-start-line="720" selection-end-line="720" />
+              <folding>
+                <element signature="n#!!doc" expanded="true" />
+              </folding>
+            </state>
+          </provider>
+        </entry>
+      </file>
+      <file pinned="false" current-in-tab="false">
+        <entry file="file://$PROJECT_DIR$/src/TaipanShopLogic.java">
+          <provider selected="true" editor-type-id="text-editor">
+            <state relative-caret-position="391">
+              <caret line="23" column="56" selection-start-line="23" selection-start-column="56" selection-end-line="23" selection-end-column="56" />
+              <folding>
+                <element signature="n#!!doc" expanded="true" />
+              </folding>
+            </state>
+          </provider>
+        </entry>
+      </file>
+      <file pinned="false" current-in-tab="false">
+        <entry file="file://$PROJECT_DIR$/src/TravelText.java">
+          <provider selected="true" editor-type-id="text-editor">
+            <state relative-caret-position="153">
+              <caret line="9" lean-forward="true" selection-start-line="9" selection-end-line="9" />
+            </state>
+          </provider>
+        </entry>
+      </file>
+      <file pinned="false" current-in-tab="true">
+        <entry file="file://$PROJECT_DIR$/src/ShipWarfareText.java">
+          <provider selected="true" editor-type-id="text-editor">
+            <state relative-caret-position="544">
+              <caret line="63" lean-forward="true" selection-start-line="63" selection-end-line="63" />
             </state>
           </provider>
         </entry>
@@ -92,88 +94,54 @@
   <component name="FileTemplateManagerImpl">
     <option name="RECENT_TEMPLATES">
       <list>
-        <option value="JavaFXApplication" />
+        <option value="CSS File" />
         <option value="Class" />
       </list>
     </option>
   </component>
   <component name="FindInProjectRecents">
     <findStrings>
-      <find>flee</find>
-      <find>runFrom</find>
-      <find>report</find>
-      <find>report.setVisible</find>
-      <find>fightButton</find>
-      <find>PlayerSh</find>
-      <find>andT</find>
-      <find>dest</find>
-      <find>shotsFired</find>
-      <find>duration</find>
-      <find>shop()</find>
-      <find>dang i</find>
-      <find>playerS</find>
-      <find>cowards</find>
-      <find>playerShoots</find>
-      <find>playerSh</find>
-      <find>getGuns</find>
-      <find>!</find>
-      <find>earned</find>
-      <find>destroyLitty</find>
-      <find>des</find>
-      <find>counter1</find>
-      <find>destro</find>
-      <find>logic</find>
-      <find>getNum</find>
-      <find>boolean</find>
-      <find>initializetrace</find>
-      <find>checkIfDone</find>
-      <find>winOrLose</find>
-      <find>setNum</find>
+      <find>updat</find>
+      <find>flowPane</find>
+      <find>declar</find>
+      <find>stage</find>
+      <find>defaultTextOut</find>
+      <find>player</find>
+      <find>WarehouseText</find>
     </findStrings>
     <replaceStrings>
-      <replace>HP</replace>
-      <replace>p1.get</replace>
-      <replace>p1.set</replace>
-      <replace>shipWarfare.getHowMuchRun()</replace>
-      <replace>shipWarfare.isUserAttacks()</replace>
-      <replace>shipWarfare.getNumOfPeasantShips()</replace>
-      <replace>attackImage</replace>
-      <replace>shipsAttacking</replace>
-      <replace>shipsApproachingGIF</replace>
-      <replace>centeringLittyShipPane</replace>
-      <replace>numOfLittyShips</replace>
-      <replace>startingLitty</replace>
-      <replace>littyShip</replace>
-      <replace>whenfinished</replace>
-      <replace>whenFinished</replace>
+      <replace>player</replace>
     </replaceStrings>
   </component>
   <component name="Git.Settings">
     <option name="UPDATE_TYPE" value="REBASE" />
     <option name="RECENT_GIT_ROOT_PATH" value="$PROJECT_DIR$" />
+    <option name="RECENT_BRANCH_BY_REPOSITORY">
+      <map>
+        <entry key="$PROJECT_DIR$" value="dedupe" />
+      </map>
+    </option>
+    <option name="RESET_MODE" value="HARD" />
   </component>
   <component name="IdeDocumentHistory">
     <option name="CHANGED_PATHS">
       <list>
-        <option value="$PROJECT_DIR$/src/Core.java" />
-        <option value="$PROJECT_DIR$/src/Game.java" />
-        <option value="$PROJECT_DIR$/src/Start.java" />
-        <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/ShipWarfare.java" />
-        <option value="$PROJECT_DIR$/src/StartGUI.java" />
-        <option value="$PROJECT_DIR$/src/Player.java" />
-        <option value="$PROJECT_DIR$/src/AnimationTesting.java" />
-        <option value="$PROJECT_DIR$/src/TravelGUI.java" />
+        <option value="$PROJECT_DIR$/src/TravelText.java" />
+        <option value="$PROJECT_DIR$/src/WarehouseText.java" />
+        <option value="$PROJECT_DIR$/src/BankText.java" />
+        <option value="$PROJECT_DIR$/src/loanSharkText.java" />
+        <option value="$PROJECT_DIR$/src/text/BankText.java" />
+        <option value="$PROJECT_DIR$/src/TaipanShopText.java" />
         <option value="$PROJECT_DIR$/src/TaipanShopGUI.java" />
-        <option value="$PROJECT_DIR$/src/ShipWarfareGUILogic.java" />
         <option value="$PROJECT_DIR$/src/ShipWarfareGUI.java" />
+        <option value="$PROJECT_DIR$/src/ShipWarfareText.java" />
+        <option value="$PROJECT_DIR$/src/TravelGUI.java" />
       </list>
     </option>
   </component>
-  <component name="ProjectFrameBounds">
-    <option name="y" value="23" />
+  <component name="ProjectFrameBounds" extendedState="6">
+    <option name="x" value="106" />
+    <option name="y" value="-19" />
     <option name="width" value="1189" />
     <option name="height" value="652" />
   </component>
@@ -183,48 +151,38 @@
       <foldersAlwaysOnTop value="true" />
     </navigator>
     <panes>
+      <pane id="Scope" />
       <pane id="ProjectPane">
         <subPane>
           <expand>
             <path>
-              <item name="TaipanClone" type="b2602c69:ProjectViewProjectNode" />
-              <item name="TaipanClone" type="462c0819:PsiDirectoryNode" />
+              <item name="TaipanClone2" type="b2602c69:ProjectViewProjectNode" />
+              <item name="TaipanClone2" type="462c0819:PsiDirectoryNode" />
             </path>
             <path>
-              <item name="TaipanClone" type="b2602c69:ProjectViewProjectNode" />
-              <item name="TaipanClone" type="462c0819:PsiDirectoryNode" />
+              <item name="TaipanClone2" type="b2602c69:ProjectViewProjectNode" />
+              <item name="TaipanClone2" type="462c0819:PsiDirectoryNode" />
               <item name="src" type="462c0819:PsiDirectoryNode" />
             </path>
-            <path>
-              <item name="TaipanClone" type="b2602c69:ProjectViewProjectNode" />
-              <item name="TaipanClone" type="462c0819:PsiDirectoryNode" />
-              <item name="src" type="462c0819:PsiDirectoryNode" />
-              <item name="images" type="462c0819:PsiDirectoryNode" />
-            </path>
           </expand>
           <select />
         </subPane>
       </pane>
       <pane id="PackagesPane" />
-      <pane id="Scope" />
     </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="1554589447322" />
-    <property name="extract.method.default.visibility" value="public" />
-    <property name="last_opened_file_path" value="$PROJECT_DIR$/../GitHub/Cpsc233" />
-    <property name="project.structure.last.edited" value="Modules" />
-    <property name="project.structure.proportion" value="0.15" />
+    <property name="com.android.tools.idea.instantapp.provision.ProvisionBeforeRunTaskProvider.myTimeStamp" value="1554663465257" />
+    <property name="extract.method.default.visibility" value="private" />
+    <property name="last_opened_file_path" value="$PROJECT_DIR$/src/junit-4.12.jar!/" />
+    <property name="nodejs_package_manager_path" value="npm" />
+    <property name="project.structure.last.edited" value="Problems" />
+    <property name="project.structure.proportion" value="0.0" />
     <property name="project.structure.side.proportion" value="0.2" />
-    <property name="settings.editor.selected.configurable" value="editing.templates" />
   </component>
   <component name="RecentsManager">
-    <key name="MoveFile.RECENT_KEYS">
-      <recent name="$PROJECT_DIR$/src/images" />
-      <recent name="$PROJECT_DIR$/src" />
+    <key name="CreateClassDialog.RecentsKey">
+      <recent name="" />
     </key>
   </component>
   <component name="RunDashboard">
@@ -254,8 +212,8 @@
         <option name="Make" enabled="true" />
       </method>
     </configuration>
-    <configuration name="ShipWarfareGUI" type="Application" factoryName="Application" temporary="true" nameIsGenerated="true">
-      <option name="MAIN_CLASS_NAME" value="ShipWarfareGUI" />
+    <configuration name="ShipWarfareText" type="Application" factoryName="Application" temporary="true" nameIsGenerated="true">
+      <option name="MAIN_CLASS_NAME" value="ShipWarfareText" />
       <module name="TaipanClone" />
       <method v="2">
         <option name="Make" enabled="true" />
@@ -278,22 +236,22 @@
     <list>
       <item itemvalue="Application.TaipanShop" />
       <item itemvalue="Application.main" />
-      <item itemvalue="Application.MainGUI" />
       <item itemvalue="Application.ShipWarfareGUI" />
+      <item itemvalue="Application.MainGUI" />
+      <item itemvalue="Application.ShipWarfareText" />
     </list>
     <recent_temporary>
       <list>
         <item itemvalue="Application.MainGUI" />
-        <item itemvalue="Application.ShipWarfareGUI" />
+        <item itemvalue="Application.ShipWarfareText" />
         <item itemvalue="Application.ShipWarfareGUI" />
         <item itemvalue="Application.main" />
         <item itemvalue="Application.TaipanShop" />
       </list>
     </recent_temporary>
   </component>
-  <component name="SvnConfiguration" cleanupOnStartRun="true">
-    <configuration>C:\Users\Harkamal Randhawa\AppData\Roaming\Subversion</configuration>
-    <supportedVersion>125</supportedVersion>
+  <component name="SvnConfiguration">
+    <configuration />
   </component>
   <component name="TaskManager">
     <task active="true" id="Default" summary="Default task">
@@ -333,30 +291,111 @@
       <workItem from="1552240770629" duration="40000" />
       <workItem from="1552241394045" duration="178000" />
       <workItem from="1552254283748" duration="9473000" />
-      <workItem from="1552277298937" duration="11151000" />
-      <workItem from="1552353291496" duration="1918000" />
-      <workItem from="1552359156805" duration="98000" />
-      <workItem from="1552533765176" duration="1016000" />
-      <workItem from="1552622234355" duration="130000" />
-      <workItem from="1553037480176" duration="499000" />
-      <workItem from="1553047073421" duration="2245000" />
-      <workItem from="1553050110780" duration="21000" />
-      <workItem from="1553051761247" duration="104000" />
-      <workItem from="1553051882218" duration="12177000" />
-      <workItem from="1553369996499" duration="3948000" />
-      <workItem from="1553376520648" duration="32000" />
-      <workItem from="1553383476219" duration="1349000" />
-      <workItem from="1553386923955" duration="4000" />
-      <workItem from="1553387088425" duration="330000" />
-      <workItem from="1553387443301" duration="11000" />
-      <workItem from="1553387530005" duration="22322000" />
-      <workItem from="1553444493182" duration="159000" />
-      <workItem from="1553444769737" duration="82000" />
-      <workItem from="1553444880371" duration="36052000" />
-      <workItem from="1553560570410" duration="3016000" />
-      <workItem from="1553832002953" duration="940000" />
-      <workItem from="1554082372500" duration="879000" />
-      <workItem from="1554159550800" duration="10940000" />
+      <workItem from="1552277298937" duration="2427000" />
+      <workItem from="1552542283204" duration="152000" />
+      <workItem from="1553061169716" duration="603000" />
+      <workItem from="1553309944652" duration="63685000" />
+      <workItem from="1553661269531" duration="1969000" />
+      <workItem from="1553965313291" duration="2578000" />
+      <workItem from="1554580719911" duration="4636000" />
+    </task>
+    <task id="LOCAL-00001" summary="Fixed duplication between Shop and Travel">
+      <created>1554662120663</created>
+      <option name="number" value="00001" />
+      <option name="presentableId" value="LOCAL-00001" />
+      <option name="project" value="LOCAL" />
+      <updated>1554662120663</updated>
+    </task>
+    <task id="LOCAL-00002" summary="Updated shipwarfare text to the modern era">
+      <created>1554662739797</created>
+      <option name="number" value="00002" />
+      <option name="presentableId" value="LOCAL-00002" />
+      <option name="project" value="LOCAL" />
+      <updated>1554662739797</updated>
+    </task>
+    <task id="LOCAL-00003" summary="Finished the merger with Dedupe and the main branch.&#10;Travel and Taipan shop shouldn't have any code sharing anymore">
+      <created>1554663152314</created>
+      <option name="number" value="00003" />
+      <option name="presentableId" value="LOCAL-00003" />
+      <option name="project" value="LOCAL" />
+      <updated>1554663152314</updated>
+    </task>
+    <task id="LOCAL-00004" summary="Created Player class">
+      <created>1550541406597</created>
+      <option name="number" value="00004" />
+      <option name="presentableId" value="LOCAL-00004" />
+      <option name="project" value="LOCAL" />
+      <updated>1550541406597</updated>
+    </task>
+    <task id="LOCAL-00005" summary="Fixed the setters to be greater than 0">
+      <created>1550541751914</created>
+      <option name="number" value="00005" />
+      <option name="presentableId" value="LOCAL-00005" />
+      <option name="project" value="LOCAL" />
+      <updated>1550541751914</updated>
+    </task>
+    <task id="LOCAL-00006" summary="Created Player class">
+      <created>1550543764970</created>
+      <option name="number" value="00006" />
+      <option name="presentableId" value="LOCAL-00006" />
+      <option name="project" value="LOCAL" />
+      <updated>1550543764971</updated>
+    </task>
+    <task id="LOCAL-00007" summary="Added some stuff for the Travel Class">
+      <created>1550575512841</created>
+      <option name="number" value="00007" />
+      <option name="presentableId" value="LOCAL-00007" />
+      <option name="project" value="LOCAL" />
+      <updated>1550575512841</updated>
+    </task>
+    <task id="LOCAL-00008" summary="Added disasters as well as removing a bug from the flee method in Haris's code">
+      <created>1550623749854</created>
+      <option name="number" value="00008" />
+      <option name="presentableId" value="LOCAL-00008" />
+      <option name="project" value="LOCAL" />
+      <updated>1550623749854</updated>
+    </task>
+    <task id="LOCAL-00009" summary="Fixed a bunch of stuff inside of Travel, but also discovered a MASSIVE problem with our code">
+      <created>1550628232136</created>
+      <option name="number" value="00009" />
+      <option name="presentableId" value="LOCAL-00009" />
+      <option name="project" value="LOCAL" />
+      <updated>1550628232136</updated>
+    </task>
+    <task id="LOCAL-00010" summary="Brought back Vikram's changes">
+      <created>1550879092914</created>
+      <option name="number" value="00010" />
+      <option name="presentableId" value="LOCAL-00010" />
+      <option name="project" value="LOCAL" />
+      <updated>1550879092914</updated>
+    </task>
+    <task id="LOCAL-00011" summary="Fixed the commenting on a lot of the code. Also added some stuff to Travel, fixed some bugs.">
+      <created>1551162699319</created>
+      <option name="number" value="00011" />
+      <option name="presentableId" value="LOCAL-00011" />
+      <option name="project" value="LOCAL" />
+      <updated>1551162699319</updated>
+    </task>
+    <task id="LOCAL-00012" summary="Added time stuff to Shipwarfare GUI">
+      <created>1552168801248</created>
+      <option name="number" value="00012" />
+      <option name="presentableId" value="LOCAL-00012" />
+      <option name="project" value="LOCAL" />
+      <updated>1552168801248</updated>
+    </task>
+    <task id="LOCAL-00013" summary="Notified of getting attacked">
+      <created>1552172956109</created>
+      <option name="number" value="00013" />
+      <option name="presentableId" value="LOCAL-00013" />
+      <option name="project" value="LOCAL" />
+      <updated>1552172956109</updated>
+    </task>
+    <task id="LOCAL-00014" summary="Added fight stuff">
+      <created>1552173216531</created>
+      <option name="number" value="00014" />
+      <option name="presentableId" value="LOCAL-00014" />
+      <option name="project" value="LOCAL" />
+      <updated>1552173216532</updated>
     </task>
     <task id="LOCAL-00015" summary="Made ShipWarfare easier to access by ShipWarfareGUI">
       <created>1552181324520</created>
@@ -505,232 +544,146 @@
       <option name="project" value="LOCAL" />
       <updated>1552280311399</updated>
     </task>
-    <task id="LOCAL-00036" summary="Added to my javadocs a bit">
-      <created>1552280610787</created>
+    <task id="LOCAL-00036" summary="Finished cleaning up the code. Ready for Demo 2">
+      <created>1552291526354</created>
       <option name="number" value="00036" />
       <option name="presentableId" value="LOCAL-00036" />
       <option name="project" value="LOCAL" />
-      <updated>1552280610787</updated>
+      <updated>1552291526354</updated>
     </task>
-    <task id="LOCAL-00037" summary="Changed one line of text in shipwarfare GUI">
-      <created>1552282957716</created>
+    <task id="LOCAL-00037" summary="Renamed a few classes so that all of them are uppercase">
+      <created>1552291930927</created>
       <option name="number" value="00037" />
       <option name="presentableId" value="LOCAL-00037" />
       <option name="project" value="LOCAL" />
-      <updated>1552282957716</updated>
+      <updated>1552291930927</updated>
     </task>
-    <task id="LOCAL-00038" summary="Fixed output for start and TaipanShop GUI">
-      <created>1552328825548</created>
+    <task id="LOCAL-00038" summary="Made it so you can go inbetween screens by pressing enter, allowing for you to speed through the game without pressing buttons.">
+      <created>1553317292291</created>
       <option name="number" value="00038" />
       <option name="presentableId" value="LOCAL-00038" />
       <option name="project" value="LOCAL" />
-      <updated>1552328825548</updated>
+      <updated>1553317292291</updated>
     </task>
-    <task id="LOCAL-00039" summary="Added JavaDocs for ShipWarfare">
-      <created>1552339973224</created>
+    <task id="LOCAL-00039" summary="File saving is work in progress&#10;Added a css file for the game&#10;Made it so that you can press enter to continue forwars&#10;Made folder for both images and save files">
+      <created>1553333862860</created>
       <option name="number" value="00039" />
       <option name="presentableId" value="LOCAL-00039" />
       <option name="project" value="LOCAL" />
-      <updated>1552339973224</updated>
+      <updated>1553333862860</updated>
     </task>
-    <task id="LOCAL-00040" summary="wrote javadocs for authorname">
-      <created>1552351619924</created>
+    <task id="LOCAL-00040" summary="Finished game saves">
+      <created>1553386388417</created>
       <option name="number" value="00040" />
       <option name="presentableId" value="LOCAL-00040" />
       <option name="project" value="LOCAL" />
-      <updated>1552351619924</updated>
+      <updated>1553386388417</updated>
     </task>
-    <task id="LOCAL-00041" summary="Added fight Button gif. Might not work on your computers yet though... I inputed my own local documents folder as the library temporarily.">
-      <created>1553060094595</created>
+    <task id="LOCAL-00041" summary="Should completely get rid of error messages and print statements related to save state">
+      <created>1553386560208</created>
       <option name="number" value="00041" />
       <option name="presentableId" value="LOCAL-00041" />
       <option name="project" value="LOCAL" />
-      <updated>1553060094595</updated>
+      <updated>1553386560208</updated>
     </task>
-    <task id="LOCAL-00042" summary="Made the fight gif runnable by everyone hopefully">
-      <created>1553060976358</created>
+    <task id="LOCAL-00042" summary="Made animation testing same as everyother class, can run from other classes.">
+      <created>1553389478439</created>
       <option name="number" value="00042" />
       <option name="presentableId" value="LOCAL-00042" />
       <option name="project" value="LOCAL" />
-      <updated>1553060976358</updated>
+      <updated>1553389478440</updated>
     </task>
-    <task id="LOCAL-00043" summary="Made the fight gif runnable by everyone hopefully">
-      <created>1553061205759</created>
+    <task id="LOCAL-00043" summary="Made warehouse reappear">
+      <created>1553465550904</created>
       <option name="number" value="00043" />
       <option name="presentableId" value="LOCAL-00043" />
       <option name="project" value="LOCAL" />
-      <updated>1553061205759</updated>
+      <updated>1553465550904</updated>
     </task>
-    <task id="LOCAL-00044" summary="Ayy added all the gifs needed.">
-      <created>1553124112040</created>
+    <task id="LOCAL-00044" summary="Warehouse and Travel events are still work in progress but added their code to the github repo">
+      <created>1553476314578</created>
       <option name="number" value="00044" />
       <option name="presentableId" value="LOCAL-00044" />
       <option name="project" value="LOCAL" />
-      <updated>1553124112040</updated>
+      <updated>1553476314578</updated>
     </task>
-    <task id="LOCAL-00045" summary="Maybe this is whack idk">
-      <created>1553193939606</created>
+    <task id="LOCAL-00045" summary="Finished Warehouse">
+      <created>1553480113870</created>
       <option name="number" value="00045" />
       <option name="presentableId" value="LOCAL-00045" />
       <option name="project" value="LOCAL" />
-      <updated>1553193939606</updated>
+      <updated>1553480113870</updated>
     </task>
-    <task id="LOCAL-00046" summary="Litty Animation Practice">
-      <created>1553387960582</created>
+    <task id="LOCAL-00046" summary="Commented a bit of Random Event">
+      <created>1553486869684</created>
       <option name="number" value="00046" />
       <option name="presentableId" value="LOCAL-00046" />
       <option name="project" value="LOCAL" />
-      <updated>1553387960582</updated>
+      <updated>1553486869684</updated>
     </task>
-    <task id="LOCAL-00047" summary="Added gifs back">
-      <created>1553389067767</created>
+    <task id="LOCAL-00047" summary="Made it so that the user doesn't get pushed into travel if they press enter while buying something">
+      <created>1553487676090</created>
       <option name="number" value="00047" />
       <option name="presentableId" value="LOCAL-00047" />
       <option name="project" value="LOCAL" />
-      <updated>1553389067767</updated>
+      <updated>1553487676090</updated>
     </task>
-    <task id="LOCAL-00048" summary="Added method for animation">
-      <created>1553390319733</created>
+    <task id="LOCAL-00048" summary="Fixed some of the code related with Liu Yuen and fixed some of the javadocing">
+      <created>1553491865868</created>
       <option name="number" value="00048" />
       <option name="presentableId" value="LOCAL-00048" />
       <option name="project" value="LOCAL" />
-      <updated>1553390319734</updated>
+      <updated>1553491865869</updated>
     </task>
-    <task id="LOCAL-00049" summary="Litty Animation Practice littier">
-      <created>1553390384762</created>
+    <task id="LOCAL-00049" summary="Pushed the fix for ship repair while 100 hp">
+      <created>1553494120569</created>
       <option name="number" value="00049" />
       <option name="presentableId" value="LOCAL-00049" />
       <option name="project" value="LOCAL" />
-      <updated>1553390384762</updated>
+      <updated>1553494120570</updated>
     </task>
-    <task id="LOCAL-00050" summary="Sep up the scene which will be used for animation">
-      <created>1553400771267</created>
-      <option name="number" value="00050" />
-      <option name="presentableId" value="LOCAL-00050" />
-      <option name="project" value="LOCAL" />
-      <updated>1553400771272</updated>
-    </task>
-    <task id="LOCAL-00051" summary="Made fight button basically functional for AnimationTesting">
-      <created>1553476072174</created>
-      <option name="number" value="00051" />
-      <option name="presentableId" value="LOCAL-00051" />
-      <option name="project" value="LOCAL" />
-      <updated>1553476072175</updated>
-    </task>
-    <task id="LOCAL-00052" summary="changed some stuff related to the fight button animation">
-      <created>1553478643204</created>
-      <option name="number" value="00052" />
-      <option name="presentableId" value="LOCAL-00052" />
-      <option name="project" value="LOCAL" />
-      <updated>1553478643204</updated>
-    </task>
-    <task id="LOCAL-00053" summary="Small error in animation whcih shoots even if no guns must fix that">
-      <created>1553482933744</created>
-      <option name="number" value="00053" />
-      <option name="presentableId" value="LOCAL-00053" />
-      <option name="project" value="LOCAL" />
-      <updated>1553482933744</updated>
-    </task>
-    <task id="LOCAL-00054" summary="Fixed the issue where the ship shot with no guns">
-      <created>1553484357669</created>
-      <option name="number" value="00054" />
-      <option name="presentableId" value="LOCAL-00054" />
-      <option name="project" value="LOCAL" />
-      <updated>1553484357670</updated>
-    </task>
-    <task id="LOCAL-00055" summary="ShipWarfare javaDocs completed">
-      <created>1553485725159</created>
-      <option name="number" value="00055" />
-      <option name="presentableId" value="LOCAL-00055" />
-      <option name="project" value="LOCAL" />
-      <updated>1553485725159</updated>
-    </task>
-    <task id="LOCAL-00056" summary="Completed ShipWarfareGUI">
-      <created>1553486334208</created>
-      <option name="number" value="00056" />
-      <option name="presentableId" value="LOCAL-00056" />
-      <option name="project" value="LOCAL" />
-      <updated>1553486334209</updated>
-    </task>
-    <task id="LOCAL-00057" summary="Fixed silk issue">
-      <created>1553533396273</created>
-      <option name="number" value="00057" />
-      <option name="presentableId" value="LOCAL-00057" />
-      <option name="project" value="LOCAL" />
-      <updated>1553533396273</updated>
-    </task>
-    <task id="LOCAL-00058" summary="Completed ShipWarfareGUI">
-      <created>1553533600087</created>
-      <option name="number" value="00058" />
-      <option name="presentableId" value="LOCAL-00058" />
-      <option name="project" value="LOCAL" />
-      <updated>1553533600087</updated>
-    </task>
-    <task id="LOCAL-00059" summary="Ship Warfare &quot;dang it&quot; issue fixed">
-      <created>1553542511809</created>
-      <option name="number" value="00059" />
-      <option name="presentableId" value="LOCAL-00059" />
-      <option name="project" value="LOCAL" />
-      <updated>1553542511809</updated>
-    </task>
-    <task id="LOCAL-00060" summary="Fixed an issue with ShipWarfareGUI with the ships running away label">
-      <created>1553560337526</created>
-      <option name="number" value="00060" />
-      <option name="presentableId" value="LOCAL-00060" />
-      <option name="project" value="LOCAL" />
-      <updated>1553560337526</updated>
-    </task>
-    <task id="LOCAL-00061" summary="Playing with miss animation">
-      <created>1553869256642</created>
-      <option name="number" value="00061" />
-      <option name="presentableId" value="LOCAL-00061" />
-      <option name="project" value="LOCAL" />
-      <updated>1553869256642</updated>
-    </task>
-    <task id="LOCAL-00062" summary="Failed attempt at separating logic and GUI but saving just in case I need it later">
-      <created>1554437585221</created>
-      <option name="number" value="00062" />
-      <option name="presentableId" value="LOCAL-00062" />
-      <option name="project" value="LOCAL" />
-      <updated>1554437585221</updated>
-    </task>
-    <task id="LOCAL-00063" summary="Failed attempt at separating logic and GUI but saving just in case I need it later">
-      <created>1554585714023</created>
-      <option name="number" value="00063" />
-      <option name="presentableId" value="LOCAL-00063" />
-      <option name="project" value="LOCAL" />
-      <updated>1554585714024</updated>
-    </task>
-    <option name="localTasksCounter" value="64" />
+    <option name="localTasksCounter" value="4" />
     <servers />
   </component>
   <component name="TimeTrackingManager">
-    <option name="totallyTimeSpent" value="182496000" />
+    <option name="totallyTimeSpent" value="8326000" />
+  </component>
+  <component name="TodoView">
+    <todo-panel id="selected-file">
+      <is-autoscroll-to-source value="true" />
+    </todo-panel>
+    <todo-panel id="all">
+      <are-packages-shown value="true" />
+      <is-autoscroll-to-source value="true" />
+    </todo-panel>
   </component>
   <component name="ToolWindowManager">
-    <frame x="0" y="23" width="1189" height="652" extended-state="0" />
+    <frame x="-8" y="-8" width="1696" height="1026" extended-state="6" />
+    <editor active="true" />
     <layout>
-      <window_info content_ui="combo" id="Project" order="0" visible="true" weight="0.23452485" />
+      <window_info content_ui="combo" id="Project" order="0" weight="0.12408313" />
       <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" />
       <window_info id="UI Designer" order="4" />
       <window_info id="Capture Tool" order="5" />
       <window_info id="Favorites" order="6" side_tool="true" />
-      <window_info anchor="bottom" id="Message" order="0" />
+      <window_info anchor="bottom" id="Inspection Results" order="0" weight="0.32922733" />
       <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.22678572" />
-      <window_info anchor="bottom" id="Debug" order="3" weight="0.4" />
-      <window_info anchor="bottom" id="Cvs" order="4" weight="0.25" />
-      <window_info anchor="bottom" id="Inspection" order="5" weight="0.4" />
+      <window_info anchor="bottom" x="22" y="418" width="1636" height="174" id="Run" order="2" sideWeight="0.49874055" type="SLIDING" weight="0.19148937" />
+      <window_info anchor="bottom" id="Debug" order="3" weight="0.39977604" />
+      <window_info anchor="bottom" id="Duplicates" order="4" weight="0.50391936" />
+      <window_info anchor="bottom" id="Message" order="5" />
       <window_info anchor="bottom" id="TODO" order="6" />
-      <window_info anchor="bottom" id="Docker" order="7" show_stripe_button="false" />
-      <window_info anchor="bottom" id="Version Control" order="8" sideWeight="0.49938875" weight="0.32922733" />
-      <window_info anchor="bottom" id="Database Changes" order="9" />
-      <window_info anchor="bottom" id="Terminal" order="10" weight="0.32922733" />
-      <window_info anchor="bottom" id="Event Log" order="11" sideWeight="0.50061125" side_tool="true" weight="0.32922733" />
-      <window_info anchor="bottom" id="Messages" order="12" sideWeight="0.49938875" weight="0.32857144" />
-      <window_info anchor="bottom" id="Duplicate detector" order="13" weight="0.32857144" />
+      <window_info anchor="bottom" id="Cvs" order="7" weight="0.25" />
+      <window_info anchor="bottom" id="Inspection" order="8" weight="0.4" />
+      <window_info anchor="bottom" id="Docker" order="9" show_stripe_button="false" />
+      <window_info anchor="bottom" id="Version Control" order="10" sideWeight="0.49938875" type="SLIDING" weight="0.32922733" />
+      <window_info anchor="bottom" id="Database Changes" order="11" />
+      <window_info anchor="bottom" id="Terminal" order="12" weight="0.32922733" />
+      <window_info anchor="bottom" id="Event Log" order="13" sideWeight="0.50125945" side_tool="true" weight="0.37058824" />
+      <window_info anchor="bottom" id="Messages" order="14" sideWeight="0.49938875" weight="0.18141097" />
+      <window_info anchor="bottom" id="Duplicate detector" order="15" weight="0.32922733" />
       <window_info anchor="right" id="Commander" internal_type="SLIDING" order="0" type="SLIDING" weight="0.4" />
       <window_info anchor="right" id="Ant Build" order="1" weight="0.25" />
       <window_info anchor="right" content_ui="combo" id="Hierarchy" order="2" weight="0.25" />
@@ -742,27 +695,29 @@
       <window_info anchor="right" id="Palette&#9;" order="8" />
     </layout>
     <layout-to-restore>
-      <window_info active="true" content_ui="combo" id="Project" order="0" visible="true" weight="0.21026894" />
+      <window_info content_ui="combo" id="Project" order="0" weight="0.12408313" />
       <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" />
       <window_info id="UI Designer" order="4" />
       <window_info id="Capture Tool" order="5" />
       <window_info id="Favorites" order="6" side_tool="true" />
-      <window_info anchor="bottom" id="Message" order="0" />
+      <window_info anchor="bottom" id="Inspection Results" order="0" weight="0.32922733" />
       <window_info anchor="bottom" id="Find" order="1" weight="0.32922733" />
-      <window_info anchor="bottom" id="Run" order="2" weight="0.3975364" />
-      <window_info anchor="bottom" id="Debug" order="3" weight="0.4" />
-      <window_info anchor="bottom" id="Cvs" order="4" weight="0.25" />
-      <window_info anchor="bottom" id="Inspection" order="5" weight="0.4" />
+      <window_info active="true" anchor="bottom" x="22" y="418" width="1636" height="174" id="Run" order="2" sideWeight="0.49874055" type="SLIDING" visible="true" weight="0.19148937" />
+      <window_info anchor="bottom" id="Debug" order="3" weight="0.39977604" />
+      <window_info anchor="bottom" id="Duplicates" order="4" weight="0.50391936" />
+      <window_info anchor="bottom" id="Message" order="5" />
       <window_info anchor="bottom" id="TODO" order="6" />
-      <window_info anchor="bottom" id="Docker" order="7" show_stripe_button="false" />
-      <window_info anchor="bottom" id="Version Control" order="8" sideWeight="0.49938875" weight="0.32922733" />
-      <window_info anchor="bottom" id="Database Changes" order="9" />
-      <window_info anchor="bottom" id="Terminal" order="10" weight="0.32922733" />
-      <window_info anchor="bottom" id="Event Log" order="11" sideWeight="0.50061125" side_tool="true" weight="0.32922733" />
-      <window_info anchor="bottom" id="Messages" order="12" sideWeight="0.49938875" weight="0.32922733" />
-      <window_info anchor="bottom" id="Duplicate detector" order="13" weight="0.32922733" />
+      <window_info anchor="bottom" id="Cvs" order="7" weight="0.25" />
+      <window_info anchor="bottom" id="Inspection" order="8" weight="0.4" />
+      <window_info anchor="bottom" id="Docker" order="9" show_stripe_button="false" />
+      <window_info anchor="bottom" id="Version Control" order="10" sideWeight="0.49938875" weight="0.32922733" />
+      <window_info anchor="bottom" id="Database Changes" order="11" />
+      <window_info anchor="bottom" id="Terminal" order="12" weight="0.32922733" />
+      <window_info anchor="bottom" id="Event Log" order="13" sideWeight="0.50125945" side_tool="true" weight="0.37058824" />
+      <window_info anchor="bottom" id="Messages" order="14" sideWeight="0.49938875" visible="true" weight="0.18141097" />
+      <window_info anchor="bottom" id="Duplicate detector" order="15" weight="0.32922733" />
       <window_info anchor="right" id="Commander" internal_type="SLIDING" order="0" type="SLIDING" weight="0.4" />
       <window_info anchor="right" id="Ant Build" order="1" weight="0.25" />
       <window_info anchor="right" content_ui="combo" id="Hierarchy" order="2" weight="0.25" />
@@ -774,20 +729,31 @@
       <window_info anchor="right" id="Palette&#9;" order="8" />
     </layout-to-restore>
   </component>
-  <component name="TypeScriptGeneratedFilesManager">
-    <option name="version" value="1" />
-  </component>
-  <component name="Vcs.Log.History.Properties">
-    <option name="COLUMN_ORDER">
-      <list>
-        <option value="0" />
-        <option value="2" />
-        <option value="3" />
-        <option value="1" />
-      </list>
-    </option>
-  </component>
   <component name="Vcs.Log.Tabs.Properties">
+    <option name="TAB_STATES">
+      <map>
+        <entry key="MAIN">
+          <value>
+            <State>
+              <option name="RECENTLY_FILTERED_USER_GROUPS">
+                <collection />
+              </option>
+              <option name="RECENTLY_FILTERED_BRANCH_GROUPS">
+                <collection />
+              </option>
+              <option name="COLUMN_ORDER">
+                <list>
+                  <option value="0" />
+                  <option value="1" />
+                  <option value="2" />
+                  <option value="3" />
+                </list>
+              </option>
+            </State>
+          </value>
+        </entry>
+      </map>
+    </option>
     <option name="RECENT_FILTERS">
       <map>
         <entry key="Branch">
@@ -807,239 +773,142 @@
     <ignored-roots>
       <path value="$PROJECT_DIR$" />
     </ignored-roots>
-    <MESSAGE value="Changed one line of text in shipwarfare GUI" />
-    <MESSAGE value="Fixed output for start and TaipanShop GUI" />
-    <MESSAGE value="Added JavaDocs for ShipWarfare" />
-    <MESSAGE value="wrote javadocs for authorname" />
-    <MESSAGE value="Added fight Button gif. Might not work on your computers yet though... I inputed my own local documents folder as the library temporarily." />
-    <MESSAGE value="Made the fight gif runnable by everyone hopefully" />
-    <MESSAGE value="Ayy added all the gifs needed." />
-    <MESSAGE value="Maybe this is whack idk" />
-    <MESSAGE value="Litty Animation Practice" />
-    <MESSAGE value="Added gifs back" />
-    <MESSAGE value="Added method for animation" />
-    <MESSAGE value="Litty Animation Practice littier" />
-    <MESSAGE value="Sep up the scene which will be used for animation" />
-    <MESSAGE value="Made fight button basically functional for AnimationTesting" />
-    <MESSAGE value="changed some stuff related to the fight button animation" />
-    <MESSAGE value="Small error in animation whcih shoots even if no guns must fix that" />
-    <MESSAGE value="Fixed the issue where the ship shot with no guns" />
-    <MESSAGE value="ShipWarfare javaDocs completed" />
-    <MESSAGE value="Fixed silk issue" />
+    <MESSAGE value="Fined minor bugs in shipwarfareGUI including the &quot;gun frustration&quot; variable" />
+    <MESSAGE value="Just checking" />
+    <MESSAGE value="A lot of errors but easily fixable SHipwarfareGUI" />
+    <MESSAGE value="Completed SHipWarfareGUI" />
     <MESSAGE value="Completed ShipWarfareGUI" />
-    <MESSAGE value="Ship Warfare &quot;dang it&quot; issue fixed" />
-    <MESSAGE value="Fixed an issue with shipWarfare with the ships running away label" />
-    <MESSAGE value="Fixed an issue with ShipWarfareGUI with the ships running away label" />
-    <MESSAGE value="Playing with miss animation" />
-    <MESSAGE value="Failed attempt at separating logic and GUI but saving just in case I need it later" />
-    <option name="LAST_COMMIT_MESSAGE" value="Failed attempt at separating logic and GUI but saving just in case I need it later" />
+    <MESSAGE value="Probably should upload" />
+    <MESSAGE value="Fixed ShipWarfare bug about one-shotting." />
+    <MESSAGE value="Completed javadocs for shipwarfare GUI" />
+    <MESSAGE value="Finished cleaning up the code. Ready for Demo 2" />
+    <MESSAGE value="Renamed a few classes so that all of them are uppercase" />
+    <MESSAGE value="Made it so you can go inbetween screens by pressing enter, allowing for you to speed through the game without pressing buttons." />
+    <MESSAGE value="File saving is work in progress&#10;Added a css file for the game&#10;Made it so that you can press enter to continue forwars&#10;Made folder for both images and save files" />
+    <MESSAGE value="Finished game saves" />
+    <MESSAGE value="Should completely get rid of error messages and print statements related to save state" />
+    <MESSAGE value="Made animation testing same as everyother class, can run from other classes." />
+    <MESSAGE value="Made warehouse reappear" />
+    <MESSAGE value="Warehouse and Travel events are still work in progress but added their code to the github repo" />
+    <MESSAGE value="Finished Warehouse" />
+    <MESSAGE value="Commented a bit of Random Event" />
+    <MESSAGE value="Made it so that the user doesn't get pushed into travel if they press enter while buying something" />
+    <MESSAGE value="Fixed some of the code related with Liu Yuen and fixed some of the javadocing" />
+    <MESSAGE value="Pushed the fix for ship repair while 100 hp" />
+    <MESSAGE value="Fixed duplication between Shop and Travel" />
+    <MESSAGE value="Updated shipwarfare text to the modern era" />
+    <MESSAGE value="Finished the merger with Dedupe and the main branch.&#10;Travel and Taipan shop shouldn't have any code sharing anymore" />
+    <option name="LAST_COMMIT_MESSAGE" value="Finished the merger with Dedupe and the main branch.&#10;Travel and Taipan shop shouldn't have any code sharing anymore" />
   </component>
   <component name="editorHistoryManager">
-    <entry file="uml://JAVA/ShipWarfare">
-      <provider selected="true" editor-type-id="UmlEditorProvider">
-        <state>
-          <ID>JAVA</ID>
-          <OriginalElement>ShipWarfare</OriginalElement>
-          <nodes>
-            <node x="" y="">ShipWarfare</node>
-            <node x="" y="">Player</node>
-          </nodes>
-          <notes />
-          <edges />
-          <settings layout="Hierarchic Group" zoom="1.0" x="213.0" y="195.0" />
-          <SelectedNodes />
-          <Categories />
-          <SCOPE>Project Files</SCOPE>
-          <VISIBILITY>private</VISIBILITY>
-        </state>
-      </provider>
-    </entry>
-    <entry file="uml://JAVA/TaipanShop">
-      <provider selected="true" editor-type-id="UmlEditorProvider">
-        <state>
-          <ID>JAVA</ID>
-          <OriginalElement>TaipanShop</OriginalElement>
-          <nodes>
-            <node x="" y="">TaipanShop</node>
-            <node x="" y="">Player</node>
-          </nodes>
-          <notes />
-          <edges />
-          <settings layout="Hierarchic Group" zoom="1.0" x="56.0" y="54.0" />
-          <SelectedNodes />
-          <Categories />
-          <SCOPE>All</SCOPE>
-          <VISIBILITY>private</VISIBILITY>
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/Game.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" />
-    <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/FileSaving.java">
       <provider selected="true" editor-type-id="text-editor">
-        <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="file://$PROJECT_DIR$/src/ShopGUI" />
-    <entry file="file://$PROJECT_DIR$/src/Start.java" />
-    <entry file="file://$PROJECT_DIR$/src/main.java" />
-    <entry file="file://$PROJECT_DIR$/src/ShipWarfare.java" />
-    <entry file="file://$PROJECT_DIR$/src/WarehouseGUI.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="-1968">
-          <caret line="14" column="13" selection-start-line="14" selection-start-column="13" selection-end-line="14" selection-end-column="13" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/StartGUI.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="30">
-          <caret line="10" selection-start-line="10" selection-end-line="15" selection-end-column="2" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/LoanSharkGUI.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="30">
-          <caret line="12" column="13" selection-start-line="12" selection-start-column="13" selection-end-line="12" selection-end-column="13" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/BankGUI.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="240">
-          <caret line="26" column="51" lean-forward="true" selection-start-line="26" selection-start-column="51" selection-end-line="26" selection-end-column="51" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/Ships Approaching.gif" />
-    <entry file="file://$PROJECT_DIR$/src/Player.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="300">
-          <caret line="20" column="25" lean-forward="true" selection-start-line="20" selection-start-column="25" selection-end-line="20" selection-end-column="25" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/ShipsRunning.gif" />
-    <entry file="file://$PROJECT_DIR$/src/images/ShipsRunning.gif">
-      <provider selected="true" editor-type-id="images" />
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/images/ShipsAttacking.gif">
-      <provider selected="true" editor-type-id="images" />
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/FinalShipWarfareGUI.java" />
-    <entry file="jar:///Library/Java/JavaVirtualMachines/jdk1.8.0_201.jdk/Contents/Home/javafx-src.zip!/javafx/application/Application.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="842">
-          <caret line="145" column="7" lean-forward="true" selection-start-line="145" selection-start-column="7" selection-end-line="145" selection-end-column="7" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="jar:///Library/Java/JavaVirtualMachines/jdk1.8.0_201.jdk/Contents/Home/javafx-src.zip!/javafx/event/EventHandler.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="298">
-          <caret line="44" column="9" selection-start-line="44" selection-start-column="9" selection-end-line="44" selection-end-column="9" />
+        <state relative-caret-position="-34">
+          <caret line="3" column="12" selection-start-line="3" selection-start-column="12" selection-end-line="3" selection-end-column="12" />
         </state>
       </provider>
     </entry>
     <entry file="file://$PROJECT_DIR$/src/PlayerTest.java">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="41">
-          <caret line="18" column="71" selection-start-line="18" selection-start-column="71" selection-end-line="18" selection-end-column="71" />
+        <state relative-caret-position="320">
+          <caret line="23" column="14" selection-start-line="23" selection-start-column="14" selection-end-line="23" selection-end-column="14" />
           <folding>
             <element signature="imports" expanded="true" />
           </folding>
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/GameEndGUI.java">
+    <entry file="file://$PROJECT_DIR$/src/WarehouseText.java">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="750">
-          <caret line="56" column="24" selection-start-line="56" selection-start-column="24" selection-end-line="56" selection-end-column="24" />
+        <state relative-caret-position="51">
+          <caret line="3" column="31" selection-start-line="3" selection-start-column="31" selection-end-line="3" selection-end-column="31" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/MainGUI.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="204">
+          <caret line="13" column="14" selection-start-line="13" selection-start-column="14" selection-end-line="13" selection-end-column="14" />
+          <folding>
+            <element signature="imports" expanded="true" />
+          </folding>
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/BankText.java">
+      <provider selected="true" editor-type-id="text-editor" />
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/loanSharkText.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="119">
+          <caret line="7" column="5" lean-forward="true" selection-start-line="7" selection-start-column="5" selection-end-line="7" selection-end-column="5" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/styleguide.css">
+      <provider selected="true" editor-type-id="text-editor" />
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/TaipanShopText.java" />
+    <entry file="file://$PROJECT_DIR$/src/ShipWarfareLogic.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="153">
+          <caret line="9" column="13" selection-start-line="9" selection-start-column="13" selection-end-line="9" selection-end-column="13" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/ShipWarfareGUI.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="425">
+          <caret line="70" column="26" selection-start-line="70" selection-start-column="26" selection-end-line="70" selection-end-column="26" />
+          <folding>
+            <element signature="imports" expanded="true" />
+          </folding>
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/TravelGUI.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="624">
+          <caret line="104" column="17" lean-forward="true" selection-start-line="104" selection-start-column="17" selection-end-line="104" selection-end-column="17" />
+          <folding>
+            <element signature="n#!!doc" expanded="true" />
+            <element signature="imports" expanded="true" />
+            <element signature="method#shipStatusString#0;class#TravelGUI#0" />
+          </folding>
         </state>
       </provider>
     </entry>
     <entry file="file://$PROJECT_DIR$/src/TaipanShopGUI.java">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="3825">
-          <caret line="269" column="66" selection-start-line="269" selection-start-column="66" selection-end-line="269" selection-end-column="67" />
+        <state relative-caret-position="7175">
+          <caret line="720" lean-forward="true" selection-start-line="720" selection-end-line="720" />
           <folding>
             <element signature="n#!!doc" expanded="true" />
           </folding>
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/MainGUI.java">
+    <entry file="file://$PROJECT_DIR$/src/TaipanShopLogic.java">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="210">
-          <caret line="15" column="6" selection-start-line="15" selection-start-column="6" selection-end-line="15" selection-end-column="6" />
+        <state relative-caret-position="391">
+          <caret line="23" column="56" selection-start-line="23" selection-start-column="56" selection-end-line="23" selection-end-column="56" />
           <folding>
-            <element signature="e#551#552#0" expanded="true" />
-            <element signature="e#579#580#0" expanded="true" />
+            <element signature="n#!!doc" expanded="true" />
           </folding>
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/TaipanShopText.java">
+    <entry file="file://$PROJECT_DIR$/src/TravelText.java">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="262">
-          <caret line="22" column="48" lean-forward="true" selection-start-line="22" selection-start-column="48" selection-end-line="22" selection-end-column="48" />
+        <state relative-caret-position="153">
+          <caret line="9" lean-forward="true" selection-start-line="9" selection-end-line="9" />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/TravelGUI.java">
+    <entry file="file://$PROJECT_DIR$/src/ShipWarfareText.java">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="119">
-          <caret line="178" selection-start-line="178" selection-end-line="178" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/ShipWarfareGUILogic.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="-1415">
-          <caret line="43" column="53" lean-forward="true" selection-start-line="43" selection-start-column="35" selection-end-line="43" selection-end-column="53" />
-          <folding>
-            <element signature="imports" expanded="true" />
-            <element signature="e#1238#1239#0" expanded="true" />
-            <element signature="e#1275#1276#0" expanded="true" />
-            <element signature="e#1675#1676#0" expanded="true" />
-            <element signature="e#1710#1711#0" expanded="true" />
-            <element signature="e#1766#1767#0" expanded="true" />
-            <element signature="e#1814#1815#0" expanded="true" />
-            <element signature="e#1854#1855#0" expanded="true" />
-            <element signature="e#1890#1891#0" expanded="true" />
-            <element signature="e#1948#1949#0" expanded="true" />
-            <element signature="e#1998#1999#0" expanded="true" />
-            <element signature="e#2047#2048#0" expanded="true" />
-            <element signature="e#2092#2093#0" expanded="true" />
-            <element signature="e#2283#2284#0" expanded="true" />
-            <element signature="e#2326#2327#0" expanded="true" />
-            <element signature="e#2510#2511#0" expanded="true" />
-            <element signature="e#2554#2555#0" expanded="true" />
-            <element signature="e#2734#2735#0" expanded="true" />
-            <element signature="e#2770#2771#0" expanded="true" />
-            <element signature="e#2828#2829#0" expanded="true" />
-            <element signature="e#2878#2879#0" expanded="true" />
-            <element signature="e#2960#2961#0" expanded="true" />
-            <element signature="e#2989#2990#0" expanded="true" />
-            <element signature="e#3030#3031#0" expanded="true" />
-            <element signature="e#3066#3067#0" expanded="true" />
-          </folding>
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/ShipWarfareGUI.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="-3881">
-          <caret line="159" selection-start-line="159" selection-end-line="159" />
-          <folding>
-            <element signature="imports" expanded="true" />
-          </folding>
+        <state relative-caret-position="544">
+          <caret line="63" lean-forward="true" selection-start-line="63" selection-end-line="63" />
         </state>
       </provider>
     </entry>
@@ -1083,7 +952,7 @@
       </state>
       <state key="JdkListConfigurable.UI">
         <settings>
-          <last-edited>1.8.0_201</last-edited>
+          <last-edited>1.8</last-edited>
           <splitter-proportions>
             <option name="proportions">
               <list>
@@ -1100,6 +969,7 @@
             <option name="proportions">
               <list>
                 <option value="0.2" />
+                <option value="0.6" />
               </list>
             </option>
           </splitter-proportions>
@@ -1107,17 +977,7 @@
       </state>
       <state key="ProjectLibrariesConfigurable.UI">
         <settings>
-          <splitter-proportions>
-            <option name="proportions">
-              <list>
-                <option value="0.2" />
-              </list>
-            </option>
-          </splitter-proportions>
-        </settings>
-      </state>
-      <state key="ScopeChooserConfigurable.UI">
-        <settings>
+          <last-edited>hamcrest-core-1.3</last-edited>
           <splitter-proportions>
             <option name="proportions">
               <list>
diff --git a/src/TaipanShopText.java b/src/TaipanShopText.java
new file mode 100644
index 0000000..7613d12
--- /dev/null
+++ b/src/TaipanShopText.java
@@ -0,0 +1,267 @@
+/**
+ * TaipanShopText deals with the text based version of the shop.
+ *
+ * Author: Vikram Bawa
+ */
+import java.util.Scanner;
+public class TaipanShopText extends Player{
+    /**
+     * This method is evoked if the user is eligible to win, and chooses to end the game (by winning).
+     */
+    public void retire(){
+        setRetire(true);
+        System.out.println("You win!");
+        System.exit(0);
+    }
+
+    /**
+     * 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 TaipanShopText(Player player){
+        Player playerDummy = new Player(player);
+        setPlayer(playerDummy);
+    }
+
+    /**
+     * this method is evoked if the user has decided to travel elsewhere.
+     */
+    public void travel(){
+        TravelText travel = new TravelText(getPlayer());
+        travel.travelTo();
+        setPlayer(travel.getPlayer());
+    }
+
+    /**
+     * this method is evoked if the user wants to use the warehouse to store items or take items out.
+     */
+    public void warehouse(){
+        WarehouseText warehouse = new WarehouseText(getPlayer());
+        warehouse.changeWarehouse();
+        setPlayer(warehouse.getPlayer());
+    }
+
+    /**
+     * this method is evoked if the user wants to use the bank to deposit or withdraw money.
+     */
+    public void bank(){
+        BankText bank = new BankText(getPlayer());
+        bank.bank();
+        setPlayer(bank.getPlayer());
+    }
+
+    /**
+     * this method is evoked if the user wants to use get a loan or pay a loan off.
+     */
+    public void loan(){
+        loanSharkText loan = new loanSharkText(getPlayer());
+        loan.loanMoney();
+        setPlayer(loan.getPlayer());
+    }
+
+
+    /**
+     * this method prints the shop UI and the player's inventory and status.
+     */
+    public void printShop(){
+        int currentCargo = getOpiumHeld()+getGuns()*10+getSilkHeld()+getArmsHeld()+getGeneralHeld();
+        if(getCargoSpace() - currentCargo < 0){
+            System.out.println("Hold: Overloaded" + "          Guns: " + getGuns() + "          HP: " + getHP() +"%");
+        }else{
+            System.out.println("Hold: " + (getCargoSpace()-currentCargo) + "          Guns: " + getGuns() + "          HP: " + getHP() +"%");
+        }
+        System.out.println("-------------------------------------------------------------");
+        System.out.println("     Opium: " + getOpiumHeld() + "      Silk: " + getSilkHeld());
+        System.out.println("     Arms: " + getArmsHeld() + "       General: " + getGeneralHeld());
+        System.out.println("-------------------------------------------------------------");
+        System.out.println("Cash: " + getMoney() + "         Bank: " + getBank()+ "          Debt: " + getDebt()+"\n");
+        System.out.println(getName() + ", present prices per unit here are:");
+        System.out.println("     Opium: " + getOpiumPrice() + "    Silk: " + getSilkPrice());
+        System.out.println("     Arms: " + getArmsPrice() + "       General: " + getGeneralPrice());
+    }
+
+    /**
+     * this is the shop method. Activates the shopping screen.
+     */
+    public void shop(){
+        TaipanShopLogic logic = new TaipanShopLogic(getPlayer());
+        System.out.println(logic.updatePrices());
+        setPlayer(logic.getPlayer());
+
+        boolean notDone = true;
+        int caseNum;
+        String optionText;
+
+        // first case is triggered if the user is at location one, and has less than $1 million net worth
+        if (getLocation() == 1 && getBank()+getMoney()-getDebt() < 1000000) {
+            caseNum = 1;
+            optionText = " Visit Bank, Transfer Cargo, Get Loans,";
+        } // the second case is triggered if the user is at a location other than location one.
+        else if(getLocation() != 1) {
+            caseNum = 2;
+            optionText = "";
+        } // the last case is triggered when the other conditions are not met; it is triggered when the user has a net
+        // worth that is greater than or equal to $1 million and is at location one.
+        else{
+            caseNum = 3;
+            optionText = " Visit Bank, Transfer Cargo, Get Loans, Retire,";
+        }
+
+        Scanner input = new Scanner(System.in);
+
+        // as long as the user does not enter a valid input, the code will run in a loop forever.
+        while(notDone){
+            printShop();
+            System.out.printf("\nShall I Buy, Sell,%s or Quit Trading?\n", optionText);
+            String response = input.next();
+            if (response.equalsIgnoreCase("B")) {
+                boolean notDone2 = true;
+                System.out.println("What do you wish me to buy, " + getName() + "?");
+
+                // when buying an item, the user must have the right amount of money, and buy non-negative amounts.
+                while (notDone2) {
+                    response = input.nextLine();
+                    if (response.equalsIgnoreCase("O")) {
+                        System.out.println("\nHow much Opium shall I buy, " + getName() + "? (You can afford " + getMoney() / getOpiumPrice() + ")");
+                        while (notDone2) {
+                            int num = input.nextInt();
+                            if (num <= getMoney() /getOpiumPrice() && num >= 0) {
+                                setOpiumHeld(getOpiumHeld()+num);
+                                setMoney(getMoney()-num *getOpiumPrice());
+                                notDone2 = false;
+                            } else if (num >= 0) {
+                                System.out.println(getName() + ", you can't afford that!");
+                            } else {
+                                System.out.println(getName() + ", how am I supposed to buy " + "'" + num + "'" + " Opium?");
+                            }
+                        }
+                    } else if (response.equalsIgnoreCase("S")) {
+                        System.out.println("\nHow much Silk shall I buy, " + getName() + "? (You can afford " + getMoney() /getSilkPrice() + ")");
+                        while (notDone2) {
+                            int num = input.nextInt();
+                            if (num <= getMoney() /getSilkPrice() && num >= 0) {
+                                setSilkHeld(getSilkHeld()+num);
+                                setMoney(getMoney()-num *getSilkPrice());
+                                notDone2 = false;
+                            } else if (num >= 0) {
+                                System.out.println(getName() + ", you can't afford that!");
+                            } else {
+                                System.out.println(getName() + ", how am I supposed to buy " + "'" + num + "'" + " Silk?");
+                            }
+                        }
+                    } else if (response.equalsIgnoreCase("A")) {
+                        System.out.println("\nHow many Arms shall I buy, " + getName() + "? (You can afford " + getMoney() /getArmsPrice() + ")");
+                        while (notDone2) {
+                            int num = input.nextInt();
+                            if (num <= getMoney() /getArmsPrice() && num >= 0) {
+                                setArmsHeld(getArmsHeld()+num);
+                                setMoney(getMoney() - num*getArmsPrice());
+                                notDone2 = false;
+                            } else if (num >= 0) {
+                                System.out.println(getName() + ", you can't afford that!");
+                            } else {
+                                System.out.println(getName() + ", how am I supposed to buy " + "'" + num + "'" + " Arms?");
+                            }
+                        }
+                    } else if (response.equalsIgnoreCase("G")) {
+                        System.out.println("\nHow much General Cargo shall I buy, " + getName() + "? (You can afford " + getMoney() /getGeneralPrice() + ")");
+                        while (notDone2) {
+                            int num = input.nextInt();
+                            if (num <= getMoney() /getGeneralPrice() && num >= 0) {
+                                setGeneralHeld(getGeneralHeld()+num);
+                                setMoney(getMoney() - num*getGeneralPrice());
+                                notDone2 = false;
+                            } else if (num >= 0) {
+                                System.out.println(getName() + ", you can't afford that!");
+                            } else {
+                                System.out.println(getName() + ", how am I supposed to buy " + "'" + num + "'" + " General Cargo?");
+                            }
+                        }
+                    }
+                }
+
+            } // when selling, the user must enter a non-negative amount of items, and not more than what they have.
+            else if (response.equalsIgnoreCase("S")) {
+                boolean notDone2 = true;
+                System.out.println("What do you wish me to sell, " + getName() + "?");
+                while (notDone2) {
+                    response = input.nextLine();
+                    if (response.equalsIgnoreCase("O")) {
+                        System.out.println("\nHow much Opium shall I sell, " + getName() + "? (You have " + getOpiumHeld() + ")");
+                        while (notDone2) {
+                            int num = input.nextInt();
+                            if (num <= getOpiumHeld() && num >= 0) {
+                                setOpiumHeld(getOpiumHeld()-num);
+                                setMoney(getMoney() + num*getOpiumPrice());
+                                notDone2 = false;
+                            } else if (num >= 0) {
+                                System.out.println(getName() + ", you don't have that many to sell!");
+                            } else {
+                                System.out.println(getName() + ", how am I supposed to sell " + "'" + num + "'" + " Opium?");
+                            }
+                        }
+                    } else if (response.equalsIgnoreCase("S")) {
+                        System.out.println("\nHow much Silk shall I sell, " + getName() + "? (You have " + getSilkHeld() + ")");
+                        while (notDone2) {
+                            int num = input.nextInt();
+                            if (num <= getSilkHeld() && num >= 0) {
+                                setSilkHeld(getSilkHeld()-num);
+                                setMoney(getMoney() + num*getSilkPrice());
+                                notDone2 = false;
+                            } else if (num >= 0) {
+                                System.out.println(getName() + ", you don't have that many to sell!");
+                            } else {
+                                System.out.println(getName() + ", how am I supposed to sell " + "'" + num + "'" + " Silk?");
+                            }
+                        }
+                    } else if (response.equalsIgnoreCase("A")) {
+                        System.out.println("\nHow many Arms shall I sell, " + getName() + "? (You have " + getArmsHeld() + ")");
+                        while (notDone2) {
+                            int num = input.nextInt();
+                            if (num <= getArmsHeld() && num >= 0) {
+                                setArmsHeld(getArmsHeld()-num);
+                                setMoney(getMoney() + num*getArmsPrice());
+                                notDone2 = false;
+                            } else if (num >= 0) {
+                                System.out.println(getName() + ", you don't have that many to sell!");
+                            } else {
+                                System.out.println(getName() + ", how am I supposed to sell " + "'" + num + "'" + " Arms?");
+                            }
+                        }
+                    } else if (response.equalsIgnoreCase("G")) {
+                        System.out.println("\nHow much General Cargo shall I sell, " + getName() + "? (You have " + getGeneralHeld() + ")");
+                        while (notDone2) {
+                            int num = input.nextInt();
+                            if (num <= getGeneralHeld() && num >= 0) {
+                                setGeneralHeld(getGeneralHeld()-num);
+                                setMoney(getMoney() + num*getGeneralPrice());
+                                notDone2 = false;
+                            } else if (num >= 0) {
+                                System.out.println(getName() + ", you don't have that many to sell!");
+                            } else {
+                                System.out.println(getName() + ", how am I supposed to sell " + "'" + num + "'" + " General Cargo?");
+                            }
+                        }
+                    }
+
+                }
+
+            } else if (response.equalsIgnoreCase("V") && (caseNum == 1 || caseNum == 3)) {
+                bank();
+            } else if (response.equalsIgnoreCase("T") && (caseNum == 1 || caseNum == 3)) {
+                warehouse();
+            } else if ((response.equalsIgnoreCase("G")||response.equalsIgnoreCase("L")) && (caseNum == 1 || caseNum == 3)) {
+                loan();
+            } // if the user wishes to quit trading, they may do so. Doing this breaks them out of the loop.
+            else if (response.equalsIgnoreCase("Q") && (caseNum == 1 || caseNum == 3)) {
+                travel();
+                notDone = false;
+            } // if the user wishes to retire and win the game, they may do so. Doing this breaks them out of the loop.
+            else if (response.equalsIgnoreCase("R") && caseNum == 3) {
+                retire();
+                notDone = false;
+            }
+        }
+    }
+}
diff --git a/src/TravelText.java b/src/TravelText.java
index d700f24..46e881c 100644
--- a/src/TravelText.java
+++ b/src/TravelText.java
@@ -1,4 +1,5 @@
 public class TravelText extends Player{
+
     public TravelText(Player player) {
         Player playerDummy = new Player(player);
         setPlayer(playerDummy);
diff --git a/src/saves/playerSave.txt b/src/saves/playerSave.txt
index 53f0be612acd6db0b0afa8aecfb9f7fb186cf9c6..dac0a7ebe6ad472831ea09ead03187dc784da79d 100644
GIT binary patch
delta 81
zcmey*^q*;iIwNN=0|Z=}Y``dDEezx^0x=U1voJ7l9)U=*IY4LzrY<N0PL(jQg(PMc
HB<2AC!3znj

delta 81
zcmey*^q*;iIwNNa0|YFXY``dD%>m@FLPZ#%G?21ufU?;fpbR)w!oU`im|2jR2LPR-
B2;=|&