From 03ff12b832f78a5ef599503b02b6e0ec0c45bb8d Mon Sep 17 00:00:00 2001
From: Solargale <harkamalsr@gmail.com>
Date: Fri, 12 Apr 2019 01:07:45 -0600
Subject: [PATCH] Got the text version up and running, had to make a bunch of
 methods to get it running though

---
 .idea/workspace.xml             | 762 ++++++++++++++++++++++----------
 src/gui/StartGUI.java           |  60 ++-
 src/gui/TravelGUI.java          | 190 ++++----
 src/logic/ShipWarfareLogic.java |   3 -
 src/logic/TravelLogic.java      |  76 ++++
 src/saves/playerSave.txt        | Bin 389 -> 389 bytes
 src/text/MainText.java          |   5 +
 src/text/RandomEventText.java   |  81 ++++
 src/text/ShipWarfareText.java   |   1 +
 src/text/StartText.java         |  58 ++-
 src/text/TaipanShopText.java    | 273 +++++++-----
 src/text/TravelText.java        | 148 +++----
 src/text/WarehouseText.java     |   4 +-
 13 files changed, 1066 insertions(+), 595 deletions(-)

diff --git a/.idea/workspace.xml b/.idea/workspace.xml
index bb2e2c6..27a4125 100644
--- a/.idea/workspace.xml
+++ b/.idea/workspace.xml
@@ -1,11 +1,20 @@
 <?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="Made every appropriate Text and Logic class">
+    <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$/src/gui/RandomEventGUI.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/gui/RandomEventGUI.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/logic/RandomEventLogic.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/logic/RandomEventLogic.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/gui/StartGUI.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/gui/StartGUI.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/gui/TravelGUI.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/gui/TravelGUI.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/logic/ShipWarfareLogic.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/logic/ShipWarfareLogic.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/logic/TravelLogic.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/logic/TravelLogic.java" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/src/saves/playerSave.txt" beforeDir="false" afterPath="$PROJECT_DIR$/src/saves/playerSave.txt" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/text/MainText.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/text/MainText.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/text/RandomEventText.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/text/RandomEventText.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/text/ShipWarfareText.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/text/ShipWarfareText.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/text/StartText.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/text/StartText.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/text/TaipanShopText.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/text/TaipanShopText.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/text/TravelText.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/text/TravelText.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/text/WarehouseText.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/text/WarehouseText.java" afterDir="false" />
     </list>
     <ignored path="$PROJECT_DIR$/out/" />
     <option name="EXCLUDED_CONVERTED_TO_IGNORED" value="true" />
@@ -14,86 +23,139 @@
     <option name="HIGHLIGHT_NON_ACTIVE_CHANGELIST" value="false" />
     <option name="LAST_RESOLUTION" value="IGNORE" />
   </component>
-  <component name="DefaultGradleProjectSettings">
-    <option name="testRunner" value="GRADLE" />
-    <option name="delegatedBuild" value="true" />
+  <component name="DockManager">
+    <window id="1">
+      <content type="file-editors">
+        <state>
+          <leaf>
+            <file pinned="false" current-in-tab="true">
+              <entry file="file://$PROJECT_DIR$/src/gui/TravelGUI.java">
+                <provider selected="true" editor-type-id="text-editor">
+                  <state relative-caret-position="380">
+                    <caret line="125" column="43" lean-forward="true" selection-start-line="125" selection-start-column="43" selection-end-line="125" selection-end-column="43" />
+                    <folding>
+                      <element signature="imports" expanded="true" />
+                      <element signature="docComment;method#TravelGUI#0;class#TravelGUI#0" />
+                      <element signature="method#TravelGUI#0;class#TravelGUI#0" />
+                      <element signature="docComment;method#initializeTravel#0;class#TravelGUI#0" />
+                      <element signature="docComment;method#seaAtlas#0;class#TravelGUI#0" />
+                      <element signature="docComment;method#randomEventSea#0;class#TravelGUI#0" />
+                    </folding>
+                  </state>
+                </provider>
+              </entry>
+            </file>
+          </leaf>
+        </state>
+      </content>
+    </window>
   </component>
   <component name="FileEditorManager">
-    <splitter split-orientation="horizontal" split-proportion="0.5782396">
-      <split-first>
-        <leaf SIDE_TABS_SIZE_LIMIT_KEY="300">
-          <file pinned="false" current-in-tab="false">
-            <entry file="file://$PROJECT_DIR$/src/gui/TravelGUI.java">
-              <provider selected="true" editor-type-id="text-editor">
-                <state relative-caret-position="340">
-                  <caret line="20" selection-start-line="20" selection-end-line="20" />
-                  <folding>
-                    <element signature="imports" expanded="true" />
-                  </folding>
-                </state>
-              </provider>
-            </entry>
-          </file>
-          <file pinned="false" current-in-tab="false">
-            <entry file="file://$PROJECT_DIR$/src/gui/TaipanShopGUI.java">
-              <provider selected="true" editor-type-id="text-editor">
-                <state relative-caret-position="187">
-                  <caret line="11" column="34" selection-start-line="11" selection-start-column="34" selection-end-line="11" selection-end-column="34" />
-                </state>
-              </provider>
-            </entry>
-          </file>
-          <file pinned="false" current-in-tab="false">
-            <entry file="file://$PROJECT_DIR$/src/gui/BankGUI.java">
-              <provider selected="true" editor-type-id="text-editor" />
-            </entry>
-          </file>
-          <file pinned="false" current-in-tab="true">
-            <entry file="file://$PROJECT_DIR$/src/gui/RandomEventGUI.java">
-              <provider selected="true" editor-type-id="text-editor">
-                <state relative-caret-position="135">
-                  <caret line="133" selection-start-line="133" selection-end-line="136" selection-end-column="33" />
-                  <folding>
-                    <element signature="imports" expanded="true" />
-                  </folding>
-                </state>
-              </provider>
-            </entry>
-          </file>
-        </leaf>
-      </split-first>
-      <split-second>
-        <leaf>
-          <file pinned="false" current-in-tab="false">
-            <entry file="file://$PROJECT_DIR$/src/logic/TravelLogic.java">
-              <provider selected="true" editor-type-id="text-editor">
-                <state relative-caret-position="68">
-                  <caret line="4" selection-end-line="4" />
-                </state>
-              </provider>
-            </entry>
-          </file>
-          <file pinned="false" current-in-tab="false">
-            <entry file="file://$PROJECT_DIR$/src/logic/BankLogic.java">
-              <provider selected="true" editor-type-id="text-editor">
-                <state relative-caret-position="34">
-                  <caret line="2" column="13" selection-start-line="2" selection-start-column="13" selection-end-line="2" selection-end-column="13" />
-                </state>
-              </provider>
-            </entry>
-          </file>
-          <file pinned="false" current-in-tab="true">
-            <entry file="file://$PROJECT_DIR$/src/logic/RandomEventLogic.java">
-              <provider selected="true" editor-type-id="text-editor">
-                <state relative-caret-position="357">
-                  <caret line="21" column="22" lean-forward="true" selection-start-line="21" selection-start-column="22" selection-end-line="21" selection-end-column="22" />
-                </state>
-              </provider>
-            </entry>
-          </file>
-        </leaf>
-      </split-second>
-    </splitter>
+    <leaf>
+      <file pinned="false" current-in-tab="false">
+        <entry file="file://$PROJECT_DIR$/src/text/TravelText.java">
+          <provider selected="true" editor-type-id="text-editor">
+            <state relative-caret-position="458">
+              <caret line="29" column="51" selection-start-line="29" selection-start-column="12" selection-end-line="29" selection-end-column="51" />
+              <folding>
+                <element signature="imports" expanded="true" />
+              </folding>
+            </state>
+          </provider>
+        </entry>
+      </file>
+      <file pinned="false" current-in-tab="false">
+        <entry file="file://$PROJECT_DIR$/src/text/ShipWarfareText.java">
+          <provider selected="true" editor-type-id="text-editor">
+            <state relative-caret-position="230">
+              <caret line="265" column="9" lean-forward="true" selection-start-line="265" selection-start-column="9" selection-end-line="265" selection-end-column="9" />
+            </state>
+          </provider>
+        </entry>
+      </file>
+      <file pinned="false" current-in-tab="false">
+        <entry file="file://$PROJECT_DIR$/src/logic/ShipWarfareLogic.java">
+          <provider selected="true" editor-type-id="text-editor">
+            <state relative-caret-position="314">
+              <caret line="101" column="29" selection-start-line="101" selection-start-column="29" selection-end-line="101" selection-end-column="29" />
+            </state>
+          </provider>
+        </entry>
+      </file>
+      <file pinned="false" current-in-tab="false">
+        <entry file="file://$PROJECT_DIR$/src/gui/RandomEventGUI.java">
+          <provider selected="true" editor-type-id="text-editor">
+            <state relative-caret-position="272">
+              <caret line="128" selection-start-line="128" selection-end-line="192" selection-end-column="13" />
+            </state>
+          </provider>
+        </entry>
+      </file>
+      <file pinned="false" current-in-tab="false">
+        <entry file="file://$PROJECT_DIR$/src/logic/RandomEventLogic.java">
+          <provider selected="true" editor-type-id="text-editor">
+            <state relative-caret-position="68">
+              <caret line="4" column="13" selection-start-line="4" selection-start-column="13" selection-end-line="4" selection-end-column="13" />
+            </state>
+          </provider>
+        </entry>
+      </file>
+      <file pinned="false" current-in-tab="true">
+        <entry file="file://$PROJECT_DIR$/src/text/RandomEventText.java">
+          <provider selected="true" editor-type-id="text-editor">
+            <state relative-caret-position="272">
+              <caret line="16" column="32" lean-forward="true" selection-start-line="16" selection-start-column="32" selection-end-line="16" selection-end-column="32" />
+              <folding>
+                <element signature="imports" expanded="true" />
+              </folding>
+            </state>
+          </provider>
+        </entry>
+      </file>
+      <file pinned="false" current-in-tab="false">
+        <entry file="file://$PROJECT_DIR$/src/text/WarehouseText.java">
+          <provider selected="true" editor-type-id="text-editor">
+            <state relative-caret-position="323">
+              <caret line="102" selection-start-line="102" selection-end-line="107" selection-end-column="46" />
+            </state>
+          </provider>
+        </entry>
+      </file>
+      <file pinned="false" current-in-tab="false">
+        <entry file="file://$PROJECT_DIR$/src/text/StartText.java">
+          <provider selected="true" editor-type-id="text-editor">
+            <state relative-caret-position="692">
+              <caret line="69" column="30" lean-forward="true" selection-start-line="69" selection-start-column="30" selection-end-line="69" selection-end-column="30" />
+              <folding>
+                <element signature="imports" expanded="true" />
+              </folding>
+            </state>
+          </provider>
+        </entry>
+      </file>
+      <file pinned="false" current-in-tab="false">
+        <entry file="file://$PROJECT_DIR$/src/text/TaipanShopText.java">
+          <provider selected="true" editor-type-id="text-editor">
+            <state relative-caret-position="391">
+              <caret line="38" selection-start-line="38" selection-end-line="40" selection-end-column="38" />
+              <folding>
+                <element signature="imports" expanded="true" />
+                <element signature="method#selling#0;class#TaipanShopText#0" />
+              </folding>
+            </state>
+          </provider>
+        </entry>
+      </file>
+      <file pinned="false" current-in-tab="false">
+        <entry file="file://$PROJECT_DIR$/src/logic/TravelLogic.java">
+          <provider selected="true" editor-type-id="text-editor">
+            <state relative-caret-position="556">
+              <caret line="69" column="52" lean-forward="true" selection-start-line="69" selection-start-column="52" selection-end-line="69" selection-end-column="52" />
+            </state>
+          </provider>
+        </entry>
+      </file>
+    </leaf>
   </component>
   <component name="FileTemplateManagerImpl">
     <option name="RECENT_TEMPLATES">
@@ -117,13 +179,24 @@
       <find>stormScene</find>
       <find>textout</find>
       <find>center</find>
-      <find>player.</find>
-      <find>price</find>
       <find>where</find>
       <find>getName</find>
       <find>;</find>
-      <find>Goods</find>
-      <find>Y</find>
+      <find>price</find>
+      <find>player.</find>
+      <find>setIsPriceChanged</find>
+      <find>travel</find>
+      <find>opium</find>
+      <find>With</find>
+      <find>withdraw</find>
+      <find>saving</find>
+      <find>Q</find>
+      <find>randomEnco</find>
+      <find>D</find>
+      <find>ship</find>
+      <find>money</find>
+      <find>logic</find>
+      <find>loot</find>
     </findStrings>
     <replaceStrings>
       <replace>player</replace>
@@ -152,44 +225,45 @@
         <option value="$PROJECT_DIR$/src/TaipanShopText.java" />
         <option value="$PROJECT_DIR$/src/ShipWarfareText.java" />
         <option value="$PROJECT_DIR$/src/tests/PlayerTest.java" />
+        <option value="$PROJECT_DIR$/src/gui/WarehouseGUI.java" />
         <option value="$PROJECT_DIR$/src/gui/LoanSharkGUI.java" />
-        <option value="$PROJECT_DIR$/src/gui/StartGUI.java" />
+        <option value="$PROJECT_DIR$/src/gui/RandomEventGUI.java" />
         <option value="$PROJECT_DIR$/src/gui/ShipWarfareGUI.java" />
         <option value="$PROJECT_DIR$/src/text/loanSharkText.java" />
         <option value="$PROJECT_DIR$/src/gui/MainGUI.java" />
-        <option value="$PROJECT_DIR$/src/text/TaipanShopText.java" />
         <option value="$PROJECT_DIR$/src/text/LoanSharkText.java" />
         <option value="$PROJECT_DIR$/src/logic/BankLogic.java" />
         <option value="$PROJECT_DIR$/src/logic/MainLogic.java" />
+        <option value="$PROJECT_DIR$/src/logic/RandomEventLogic.java" />
         <option value="$PROJECT_DIR$/src/logic/StartLogic.java" />
-        <option value="$PROJECT_DIR$/src/logic/TravelLogic.java" />
-        <option value="$PROJECT_DIR$/src/text/MainText.java" />
-        <option value="$PROJECT_DIR$/src/text/RandomEventText.java" />
-        <option value="$PROJECT_DIR$/src/text/ShipWarfareText.java" />
+        <option value="$PROJECT_DIR$/src/logic/WarehouseLogic.java" />
         <option value="$PROJECT_DIR$/src/gui/BankGUI.java" />
         <option value="$PROJECT_DIR$/src/logic/FileSaving.java" />
-        <option value="$PROJECT_DIR$/src/text/TravelText.java" />
-        <option value="$PROJECT_DIR$/src/text/StartText.java" />
         <option value="$PROJECT_DIR$/src/text/BankText.java" />
         <option value="$PROJECT_DIR$/src/text/GameEndText.java" />
         <option value="$PROJECT_DIR$/src/logic/GameEndLogic.java" />
         <option value="$PROJECT_DIR$/src/gui/GameEndGUI.java" />
         <option value="$PROJECT_DIR$/src/gui/TaipanShopGUI.java" />
         <option value="$PROJECT_DIR$/src/logic/TaipanShopLogic.java" />
+        <option value="$PROJECT_DIR$/src/logic/TravelLogic.java" />
         <option value="$PROJECT_DIR$/src/gui/TravelGUI.java" />
-        <option value="$PROJECT_DIR$/src/gui/WarehouseGUI.java" />
-        <option value="$PROJECT_DIR$/src/logic/WarehouseLogic.java" />
+        <option value="$PROJECT_DIR$/src/text/MainText.java" />
+        <option value="$PROJECT_DIR$/src/gui/StartGUI.java" />
+        <option value="$PROJECT_DIR$/src/text/StartText.java" />
         <option value="$PROJECT_DIR$/src/text/WarehouseText.java" />
-        <option value="$PROJECT_DIR$/src/logic/RandomEventLogic.java" />
-        <option value="$PROJECT_DIR$/src/gui/RandomEventGUI.java" />
+        <option value="$PROJECT_DIR$/src/text/TaipanShopText.java" />
+        <option value="$PROJECT_DIR$/src/text/TravelText.java" />
+        <option value="$PROJECT_DIR$/src/logic/ShipWarfareLogic.java" />
+        <option value="$PROJECT_DIR$/src/text/ShipWarfareText.java" />
+        <option value="$PROJECT_DIR$/src/text/RandomEventText.java" />
       </list>
     </option>
   </component>
   <component name="ProjectFrameBounds" extendedState="6">
-    <option name="x" value="1672" />
-    <option name="y" value="264" />
-    <option name="width" value="1376" />
-    <option name="height" value="744" />
+    <option name="x" value="134" />
+    <option name="y" value="-30" />
+    <option name="width" value="1189" />
+    <option name="height" value="652" />
   </component>
   <component name="ProjectLevelVcsManager" settingsEditedManually="true" />
   <component name="ProjectView">
@@ -203,29 +277,29 @@
         <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="TaipanClone2" type="b2602c69:ProjectViewProjectNode" />
+              <item name="TaipanClone2" type="462c0819:PsiDirectoryNode" />
               <item name="src" type="462c0819:PsiDirectoryNode" />
               <item name="gui" 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" />
               <item name="logic" 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" />
               <item name="text" type="462c0819:PsiDirectoryNode" />
             </path>
@@ -236,10 +310,10 @@
     </panes>
   </component>
   <component name="PropertiesComponent">
-    <property name="SHARE_PROJECT_CONFIGURATION_FILES" value="true" />
+    <property name="ToolWindowStatistic.ShowToolbar" value="false" />
     <property name="WebServerToolWindowFactoryState" value="false" />
     <property name="aspect.path.notification.shown" value="true" />
-    <property name="com.android.tools.idea.instantapp.provision.ProvisionBeforeRunTaskProvider.myTimeStamp" value="1554676381347" />
+    <property name="com.android.tools.idea.instantapp.provision.ProvisionBeforeRunTaskProvider.myTimeStamp" value="1555052692637" />
     <property name="extract.method.default.visibility" value="public" />
     <property name="last_opened_file_path" value="$PROJECT_DIR$/src/junit-4.12.jar!/" />
     <property name="nodejs_package_manager_path" value="npm" />
@@ -272,6 +346,19 @@
         <option name="Make" enabled="true" />
       </method>
     </configuration>
+    <configuration name="MainText" type="Application" factoryName="Application" temporary="true" nameIsGenerated="true">
+      <option name="MAIN_CLASS_NAME" value="text.MainText" />
+      <module name="TaipanClone" />
+      <extension name="coverage">
+        <pattern>
+          <option name="PATTERN" value="text.*" />
+          <option name="ENABLED" value="true" />
+        </pattern>
+      </extension>
+      <method v="2">
+        <option name="Make" enabled="true" />
+      </method>
+    </configuration>
     <configuration name="ShipWarfareGUI" type="Application" factoryName="Application" temporary="true" nameIsGenerated="true">
       <option name="MAIN_CLASS_NAME" value="gui.ShipWarfareGUI" />
       <module name="TaipanClone" />
@@ -286,19 +373,6 @@
         <option name="Make" enabled="true" />
       </method>
     </configuration>
-    <configuration name="WarehouseText" type="Application" factoryName="Application" temporary="true" nameIsGenerated="true">
-      <option name="MAIN_CLASS_NAME" value="text.WarehouseText" />
-      <module name="TaipanClone" />
-      <extension name="coverage">
-        <pattern>
-          <option name="PATTERN" value="text.*" />
-          <option name="ENABLED" value="true" />
-        </pattern>
-      </extension>
-      <method v="2">
-        <option name="Make" enabled="true" />
-      </method>
-    </configuration>
     <configuration name="main" type="Application" factoryName="Application" temporary="true" nameIsGenerated="true">
       <option name="MAIN_CLASS_NAME" value="main" />
       <module name="TaipanClone" />
@@ -311,12 +385,12 @@
       <item itemvalue="Application.ShipWarfareGUI" />
       <item itemvalue="Application.MainGUI" />
       <item itemvalue="Application.ShipWarfareText" />
-      <item itemvalue="Application.WarehouseText" />
+      <item itemvalue="Application.MainText" />
     </list>
     <recent_temporary>
       <list>
         <item itemvalue="Application.MainGUI" />
-        <item itemvalue="Application.WarehouseText" />
+        <item itemvalue="Application.MainText" />
         <item itemvalue="Application.ShipWarfareText" />
         <item itemvalue="Application.ShipWarfareGUI" />
         <item itemvalue="Application.main" />
@@ -371,7 +445,8 @@
       <workItem from="1553661269531" duration="1969000" />
       <workItem from="1553965313291" duration="2578000" />
       <workItem from="1554580719911" duration="4636000" />
-      <workItem from="1554933069926" duration="10764000" />
+      <workItem from="1554923452115" duration="1634000" />
+      <workItem from="1555022688721" duration="15460000" />
     </task>
     <task id="LOCAL-00001" summary="Fixed duplication between Shop and Travel">
       <created>1554662120663</created>
@@ -415,19 +490,19 @@
       <option name="project" value="LOCAL" />
       <updated>1554670728348</updated>
     </task>
-    <task id="LOCAL-00007" summary="Created logic class for Warehouse">
-      <created>1554940686318</created>
+    <task id="LOCAL-00007" summary="Added some content to the textgame files and added some stuff to the logic files. Also fixed formating in TravelGUI">
+      <created>1554676522805</created>
       <option name="number" value="00007" />
       <option name="presentableId" value="LOCAL-00007" />
       <option name="project" value="LOCAL" />
-      <updated>1554940686318</updated>
+      <updated>1554676522805</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>
+    <task id="LOCAL-00008" summary="Minor changes">
+      <created>1554683312806</created>
       <option name="number" value="00008" />
       <option name="presentableId" value="LOCAL-00008" />
       <option name="project" value="LOCAL" />
-      <updated>1550623749854</updated>
+      <updated>1554683312806</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>
@@ -716,11 +791,11 @@
       <option name="project" value="LOCAL" />
       <updated>1553494120570</updated>
     </task>
-    <option name="localTasksCounter" value="8" />
+    <option name="localTasksCounter" value="9" />
     <servers />
   </component>
   <component name="TimeTrackingManager">
-    <option name="totallyTimeSpent" value="30005000" />
+    <option name="totallyTimeSpent" value="38487000" />
   </component>
   <component name="TodoView">
     <todo-panel id="selected-file">
@@ -732,10 +807,10 @@
     </todo-panel>
   </component>
   <component name="ToolWindowManager">
-    <frame x="1672" y="264" width="1376" height="744" extended-state="6" />
+    <frame x="-8" y="-8" width="1696" height="1026" extended-state="6" />
     <editor active="true" />
     <layout>
-      <window_info content_ui="combo" x="151" y="114" width="256" height="893" id="Project" order="0" weight="0.15647922" />
+      <window_info active="true" content_ui="combo" id="Project" order="0" visible="true" weight="0.12713936" />
       <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" />
@@ -744,20 +819,21 @@
       <window_info id="Favorites" order="6" side_tool="true" />
       <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" x="22" y="418" width="1636" height="174" id="Run" order="2" sideWeight="0.49874055" weight="0.17133258" />
+      <window_info anchor="bottom" x="22" y="418" width="1636" height="174" id="Run" order="2" sideWeight="0.49874055" visible="true" weight="0.42329228" />
       <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" type="SLIDING" weight="0.33034715" />
+      <window_info anchor="bottom" id="TODO" order="6" weight="0.33034715" />
       <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="Terminal" order="12" type="SLIDING" 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" type="SLIDING" weight="0.18141097" />
       <window_info anchor="bottom" id="Duplicate detector" order="15" type="SLIDING" weight="0.08958567" />
+      <window_info anchor="bottom" id="Statistic" order="16" />
       <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" />
@@ -769,7 +845,7 @@
       <window_info anchor="right" id="Palette&#9;" order="8" />
     </layout>
     <layout-to-restore>
-      <window_info content_ui="combo" x="151" y="114" width="256" height="893" id="Project" order="0" visible="true" weight="0.15647922" />
+      <window_info active="true" content_ui="combo" id="Project" order="0" visible="true" weight="0.12713936" />
       <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" />
@@ -778,20 +854,21 @@
       <window_info id="Favorites" order="6" side_tool="true" />
       <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" x="22" y="418" width="1636" height="174" id="Run" order="2" sideWeight="0.49874055" type="SLIDING" weight="0.19148937" />
+      <window_info anchor="bottom" x="22" y="418" width="1636" height="174" id="Run" order="2" sideWeight="0.49874055" weight="0.22396417" />
       <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" type="SLIDING" weight="0.33034715" />
+      <window_info anchor="bottom" id="TODO" order="6" weight="0.33034715" />
       <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="Terminal" order="12" type="SLIDING" 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" type="SLIDING" weight="0.18141097" />
       <window_info anchor="bottom" id="Duplicate detector" order="15" type="SLIDING" weight="0.08958567" />
+      <window_info anchor="bottom" id="Statistic" order="16" />
       <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" />
@@ -850,7 +927,6 @@
     <ignored-roots>
       <path value="$PROJECT_DIR$" />
     </ignored-roots>
-    <MESSAGE value="Completed ShipWarfareGUI" />
     <MESSAGE value="Probably should upload" />
     <MESSAGE value="Fixed ShipWarfare bug about one-shotting." />
     <MESSAGE value="Completed javadocs for shipwarfare GUI" />
@@ -874,165 +950,383 @@
     <MESSAGE value="Fixed the severe lack of TaipanShopText" />
     <MESSAGE value="Moved everything into logic classes" />
     <MESSAGE value="Made every appropriate Text and Logic class" />
-    <MESSAGE value="Created logic class for Warehouse" />
-    <option name="LAST_COMMIT_MESSAGE" value="Created logic class for Warehouse" />
+    <MESSAGE value="Added some content to the textgame files and added some stuff to the logic files. Also fixed formating in TravelGUI" />
+    <MESSAGE value="Minor changes" />
+    <option name="LAST_COMMIT_MESSAGE" value="Minor changes" />
   </component>
   <component name="editorHistoryManager">
     <entry file="file://$PROJECT_DIR$/src/styleguide.css">
       <provider selected="true" editor-type-id="text-editor" />
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/gui/LoanSharkGUI.java" />
-    <entry file="file://$PROJECT_DIR$/src/gui/StartGUI.java" />
-    <entry file="file://$PROJECT_DIR$/src/gui/ShipWarfareGUI.java" />
+    <entry file="file://$PROJECT_DIR$/src/gui/WarehouseGUI.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="170">
+          <caret line="18" column="37" selection-start-line="18" selection-start-column="37" selection-end-line="18" selection-end-column="37" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/gui/LoanSharkGUI.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="170">
+          <caret line="22" column="38" lean-forward="true" selection-start-line="22" selection-start-column="38" selection-end-line="22" selection-end-column="38" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/gui/MainGUI.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="408">
+          <caret line="26" column="47" selection-start-line="26" selection-start-column="47" selection-end-line="26" selection-end-column="47" />
+          <folding>
+            <element signature="imports" expanded="true" />
+          </folding>
+        </state>
+      </provider>
+    </entry>
     <entry file="file://$PROJECT_DIR$/src/logic/MainGUI.java" />
     <entry file="file://$PROJECT_DIR$/src/logic/RandomEventGUI.java" />
     <entry file="file://$PROJECT_DIR$/src/logic/Warehouse.java" />
-    <entry file="file://$PROJECT_DIR$/src/text/LoanSharkText.java" />
-    <entry file="file://$PROJECT_DIR$/src/text/MainText.java" />
-    <entry file="file://$PROJECT_DIR$/src/text/RandomEventText.java" />
-    <entry file="file://$PROJECT_DIR$/src/tests/PlayerTest.java" />
-    <entry file="file://$PROJECT_DIR$/src/text/ShipWarfareText.java" />
-    <entry file="file://$PROJECT_DIR$/src/text/StartText.java" />
-    <entry file="file://$PROJECT_DIR$/src/text/BankText.java" />
-    <entry file="file://$PROJECT_DIR$/src/text/GameEndText.java" />
-    <entry file="file://$PROJECT_DIR$/src/text/TaipanShopText.java" />
-    <entry file="file://$PROJECT_DIR$/src/gui/GameEndGUI.java" />
-    <entry file="file://$PROJECT_DIR$/src/text/TravelText.java" />
-    <entry file="uml://JAVA/" />
-    <entry file="uml://JAVA/logic.TravelLogic" />
-    <entry file="file://$PROJECT_DIR$/src/logic/FileSaving.java">
+    <entry file="file://$PROJECT_DIR$/src/logic/MainLogic.java">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="-345">
-          <caret line="9" column="13" selection-start-line="9" selection-start-column="13" selection-end-line="9" selection-end-column="13" />
+        <state relative-caret-position="34">
+          <caret line="2" column="37" selection-start-line="2" selection-start-column="37" selection-end-line="2" selection-end-column="37" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/logic/Player.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="153">
+          <caret line="11" column="13" selection-start-line="11" selection-start-column="13" selection-end-line="11" selection-end-column="13" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/text/LoanSharkText.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="68">
+          <caret line="4" column="13" selection-start-line="4" selection-start-column="13" selection-end-line="4" selection-end-column="13" />
         </state>
       </provider>
     </entry>
     <entry file="file://$PROJECT_DIR$/src/logic/StartLogic.java">
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="34">
-          <caret line="2" column="13" selection-start-line="2" selection-start-column="13" selection-end-line="2" selection-end-column="13" />
+          <caret line="2" column="38" selection-start-line="2" selection-start-column="38" selection-end-line="2" selection-end-column="38" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/tests/PlayerTest.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="408">
+          <caret line="25" column="29" selection-start-line="25" selection-start-column="29" selection-end-line="25" selection-end-column="29" />
           <folding>
-            <element signature="e#777#778#0" expanded="true" />
-            <element signature="e#803#804#0" expanded="true" />
+            <element signature="imports" expanded="true" />
           </folding>
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/logic/ShipWarfareLogic.java">
+    <entry file="file://$PROJECT_DIR$/src/text/BankText.java">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="-872">
-          <caret line="11" column="13" selection-start-line="11" selection-start-column="13" selection-end-line="11" selection-end-column="13" />
+        <state relative-caret-position="204">
+          <caret line="77" column="4" selection-start-line="77" selection-start-column="4" selection-end-line="77" selection-end-column="4" />
+          <folding>
+            <element signature="imports" expanded="true" />
+            <element signature="method#BankText#0;class#BankText#0" />
+            <element signature="docComment;method#bank#0;class#BankText#0" />
+            <element signature="method#bank#0;class#BankText#0" />
+          </folding>
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/logic/MainLogic.java">
+    <entry file="file://$PROJECT_DIR$/src/text/GameEndText.java">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="34">
-          <caret line="2" column="13" selection-start-line="2" selection-start-column="13" selection-end-line="2" selection-end-column="13" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/logic/Player.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="-748">
-          <caret line="11" column="13" selection-start-line="11" selection-start-column="13" selection-end-line="11" selection-end-column="13" />
+        <state relative-caret-position="153">
+          <caret line="9" column="5" selection-start-line="9" selection-start-column="5" selection-end-line="9" selection-end-column="5" />
         </state>
       </provider>
     </entry>
     <entry file="file://$PROJECT_DIR$/src/logic/GameEndLogic.java">
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="238">
-          <caret line="14" lean-forward="true" selection-start-line="14" selection-end-line="14" />
+          <caret line="14" selection-start-line="14" selection-end-line="14" />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/gui/MainGUI.java">
-      <provider selected="true" editor-type-id="text-editor" />
+    <entry file="uml://JAVA/">
+      <provider selected="true" editor-type-id="UmlEditorProvider">
+        <state>
+          <ID>JAVA</ID>
+          <OriginalElement />
+          <nodes>
+            <node x="0.0" y="153.0">images</node>
+            <node x="152.0" y="227.0">tests</node>
+            <node x="0.0" y="227.0">saves</node>
+            <node x="118.0" y="79.0">gui</node>
+            <node x="0.0" y="79.0">text</node>
+            <node x="55.0" y="0.0">logic</node>
+          </nodes>
+          <notes />
+          <edges>
+            <edge source="gui" target="logic">
+              <point x="0.0" y="-14.5" />
+              <point x="166.0" y="54.0" />
+              <point x="133.75" y="54.0" />
+              <point x="26.25" y="14.5" />
+            </edge>
+            <edge source="text" target="logic">
+              <point x="0.0" y="-14.5" />
+              <point x="49.0" y="54.0" />
+              <point x="81.25" y="54.0" />
+              <point x="-26.25" y="14.5" />
+            </edge>
+          </edges>
+          <settings layout="Hierarchic Group" zoom="1.0" x="-199.0" y="58.0" />
+          <SelectedNodes />
+          <Categories>
+            <Category>Fields</Category>
+            <Category>Constructors</Category>
+            <Category>Methods</Category>
+            <Category>Properties</Category>
+            <Category>Inner Classes</Category>
+          </Categories>
+          <SCOPE>Project Files</SCOPE>
+          <VISIBILITY>private</VISIBILITY>
+        </state>
+      </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/gui/TravelGUI.java">
+    <entry file="uml://JAVA/logic.TravelLogic">
+      <provider selected="true" editor-type-id="UmlEditorProvider">
+        <state>
+          <ID>JAVA</ID>
+          <OriginalElement>logic.TravelLogic</OriginalElement>
+          <nodes>
+            <node x="" y="">logic.WarehouseLogic</node>
+            <node x="" y="">logic.BankLogic</node>
+            <node x="" y="">gui.WarehouseGUI</node>
+            <node x="" y="">logic.GameEndLogic</node>
+            <node x="" y="">text.BankText</node>
+            <node x="" y="">text.TravelText</node>
+            <node x="" y="">logic.ShipWarfareLogic</node>
+            <node x="" y="">gui.RandomEventGUI</node>
+            <node x="" y="">logic.TravelLogic</node>
+            <node x="" y="">gui.ShipWarfareGUI</node>
+            <node x="" y="">javafx.application.Application</node>
+            <node x="" y="">text.MainText</node>
+            <node x="" y="">gui.TravelGUI</node>
+            <node x="" y="">logic.MainLogic</node>
+            <node x="" y="">logic.FileSaving</node>
+            <node x="" y="">text.TaipanShopText</node>
+            <node x="" y="">logic.Player</node>
+            <node x="" y="">text.StartText</node>
+            <node x="" y="">text.RandomEventText</node>
+            <node x="" y="">text.LoanSharkText</node>
+            <node x="" y="">text.GameEndText</node>
+            <node x="" y="">gui.TaipanShopGUI</node>
+            <node x="" y="">text.WarehouseText</node>
+            <node x="" y="">logic.TaipanShopLogic</node>
+            <node x="" y="">gui.GameEndGUI</node>
+            <node x="" y="">logic.RandomEventLogic</node>
+            <node x="" y="">tests.PlayerTest</node>
+            <node x="" y="">gui.StartGUI</node>
+            <node x="" y="">text.ShipWarfareText</node>
+            <node x="" y="">java.io.Serializable</node>
+            <node x="" y="">gui.BankGUI</node>
+            <node x="" y="">gui.MainGUI</node>
+            <node x="" y="">gui.LoanSharkGUI</node>
+            <node x="" y="">logic.StartLogic</node>
+          </nodes>
+          <notes />
+          <edges />
+          <settings layout="Hierarchic Group" zoom="0.4564676616915422" x="1492.0" y="777.0" />
+          <SelectedNodes />
+          <Categories />
+          <SCOPE>All</SCOPE>
+          <VISIBILITY>private</VISIBILITY>
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/logic/TaipanShopLogic.java">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="340">
-          <caret line="20" selection-start-line="20" selection-end-line="20" />
+        <state relative-caret-position="1802">
+          <caret line="106" column="47" lean-forward="true" selection-start-line="106" selection-start-column="47" selection-end-line="106" selection-end-column="47" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/gui/GameEndGUI.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="969">
+          <caret line="95" column="29" selection-start-line="95" selection-start-column="29" selection-end-line="95" selection-end-column="29" />
           <folding>
             <element signature="imports" expanded="true" />
+            <element signature="method#GameEndGUI#0;class#GameEndGUI#0" />
+            <element signature="docComment;method#initializeGameEndGUI#0;class#GameEndGUI#0" />
+            <element signature="docComment;method#start#0;class#GameEndGUI#0" />
+            <element signature="method#start#0;class#GameEndGUI#0" />
           </folding>
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/logic/TravelLogic.java">
+    <entry file="file://$PROJECT_DIR$/src/gui/BankGUI.java">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="68">
-          <caret line="4" selection-end-line="4" />
+        <state relative-caret-position="697">
+          <caret line="162" column="5" selection-start-line="162" selection-start-column="5" selection-end-line="162" selection-end-column="5" />
+          <folding>
+            <element signature="imports" expanded="true" />
+            <element signature="method#initializeBank#0;class#BankGUI#0" />
+            <element signature="method#deposits#0;class#BankGUI#0" />
+            <element signature="method#withdraw#0;class#BankGUI#0" />
+          </folding>
         </state>
       </provider>
     </entry>
     <entry file="file://$PROJECT_DIR$/src/logic/BankLogic.java">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="34">
-          <caret line="2" column="13" selection-start-line="2" selection-start-column="13" selection-end-line="2" selection-end-column="13" />
+        <state relative-caret-position="68">
+          <caret line="4" selection-start-line="4" selection-end-line="4" />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/gui/BankGUI.java">
-      <provider selected="true" editor-type-id="text-editor" />
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/logic/TaipanShopLogic.java">
+    <entry file="file://$PROJECT_DIR$/src/gui/StartGUI.java">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="289">
-          <caret line="17" column="31" selection-start-line="17" selection-start-column="8" selection-end-line="17" selection-end-column="31" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/gui/TaipanShopGUI.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="187">
-          <caret line="11" column="34" selection-start-line="11" selection-start-column="34" selection-end-line="11" selection-end-column="34" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/gui/WarehouseGUI.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="49">
-          <caret line="239" column="50" lean-forward="true" selection-start-line="239" selection-start-column="50" selection-end-line="239" selection-end-column="50" />
+        <state relative-caret-position="199">
+          <caret line="207" column="13" selection-start-line="207" selection-start-column="13" selection-end-line="207" selection-end-column="13" />
           <folding>
             <element signature="imports" expanded="true" />
-            <element signature="method#settingBorderFormat#0;class#WarehouseGUI#0" />
-            <element signature="method#updateLabels#0;class#WarehouseGUI#0" />
-          </folding>
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/text/WarehouseText.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="-1158">
-          <caret line="5" column="25" lean-forward="true" selection-start-line="5" selection-start-column="25" selection-end-line="5" selection-end-column="25" />
-          <folding>
-            <element signature="method#showWarehouse#0;class#WarehouseText#0" />
           </folding>
         </state>
       </provider>
     </entry>
     <entry file="file://$PROJECT_DIR$/src/logic/WarehouseLogic.java">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="408">
-          <caret line="24" column="41" selection-start-line="24" selection-start-column="41" selection-end-line="24" selection-end-column="41" />
+        <state relative-caret-position="1088">
+          <caret line="64" column="22" selection-start-line="64" selection-start-column="18" selection-end-line="64" selection-end-column="22" />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/gui/RandomEventGUI.java">
+    <entry file="file://$PROJECT_DIR$/src/logic/FileSaving.java">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="135">
-          <caret line="133" selection-start-line="133" selection-end-line="136" selection-end-column="33" />
+        <state relative-caret-position="403">
+          <caret line="53" lean-forward="true" selection-start-line="53" selection-end-line="53" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/gui/ShipWarfareGUI.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="222">
+          <caret line="33" column="13" selection-start-line="33" selection-start-column="13" selection-end-line="33" selection-end-column="13" />
           <folding>
             <element signature="imports" expanded="true" />
           </folding>
         </state>
       </provider>
     </entry>
+    <entry file="file://$PROJECT_DIR$/src/gui/TaipanShopGUI.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="204">
+          <caret line="244" selection-start-line="244" selection-end-line="246" selection-end-column="43" />
+        </state>
+      </provider>
+    </entry>
     <entry file="file://$PROJECT_DIR$/src/logic/RandomEventLogic.java">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="357">
-          <caret line="21" column="22" lean-forward="true" selection-start-line="21" selection-start-column="22" selection-end-line="21" selection-end-column="22" />
+        <state relative-caret-position="68">
+          <caret line="4" column="13" selection-start-line="4" selection-start-column="13" selection-end-line="4" selection-end-column="13" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/gui/RandomEventGUI.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="272">
+          <caret line="128" selection-start-line="128" selection-end-line="192" selection-end-column="13" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/text/MainText.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="289">
+          <caret line="17" selection-start-line="17" selection-end-line="17" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/logic/TravelLogic.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="556">
+          <caret line="69" column="52" lean-forward="true" selection-start-line="69" selection-start-column="52" selection-end-line="69" selection-end-column="52" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/text/StartText.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="692">
+          <caret line="69" column="30" lean-forward="true" selection-start-line="69" selection-start-column="30" selection-end-line="69" selection-end-column="30" />
+          <folding>
+            <element signature="imports" expanded="true" />
+          </folding>
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/text/TaipanShopText.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="391">
+          <caret line="38" selection-start-line="38" selection-end-line="40" selection-end-column="38" />
+          <folding>
+            <element signature="imports" expanded="true" />
+            <element signature="method#selling#0;class#TaipanShopText#0" />
+          </folding>
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/gui/TravelGUI.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="380">
+          <caret line="125" column="43" lean-forward="true" selection-start-line="125" selection-start-column="43" selection-end-line="125" selection-end-column="43" />
+          <folding>
+            <element signature="imports" expanded="true" />
+            <element signature="docComment;method#TravelGUI#0;class#TravelGUI#0" />
+            <element signature="method#TravelGUI#0;class#TravelGUI#0" />
+            <element signature="docComment;method#initializeTravel#0;class#TravelGUI#0" />
+            <element signature="docComment;method#seaAtlas#0;class#TravelGUI#0" />
+            <element signature="docComment;method#randomEventSea#0;class#TravelGUI#0" />
+          </folding>
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/text/WarehouseText.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="323">
+          <caret line="102" selection-start-line="102" selection-end-line="107" selection-end-column="46" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/text/TravelText.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="458">
+          <caret line="29" column="51" selection-start-line="29" selection-start-column="12" selection-end-line="29" selection-end-column="51" />
+          <folding>
+            <element signature="imports" expanded="true" />
+          </folding>
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/logic/ShipWarfareLogic.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="314">
+          <caret line="101" column="29" selection-start-line="101" selection-start-column="29" selection-end-line="101" selection-end-column="29" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/text/ShipWarfareText.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="230">
+          <caret line="265" column="9" lean-forward="true" selection-start-line="265" selection-start-column="9" selection-end-line="265" selection-end-column="9" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/text/RandomEventText.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="272">
+          <caret line="16" column="32" lean-forward="true" selection-start-line="16" selection-start-column="32" selection-end-line="16" selection-end-column="32" />
+          <folding>
+            <element signature="imports" expanded="true" />
+          </folding>
         </state>
       </provider>
     </entry>
diff --git a/src/gui/StartGUI.java b/src/gui/StartGUI.java
index 204336e..e5c3698 100644
--- a/src/gui/StartGUI.java
+++ b/src/gui/StartGUI.java
@@ -191,44 +191,38 @@ public class StartGUI extends Player {
          * scenario 2 gives the player 5 guns.
          *
          */
-        startButton.setOnAction(new EventHandler<ActionEvent>() {
-            @Override
-            public void handle(ActionEvent event) {
-                StartLogic startLogic = new StartLogic(getPlayer());
-                if (Start.getSelectedToggle() == cashChoice) {
-                    startLogic.money_and_debt();
-                }
-                if (Start.getSelectedToggle() == gunChoice) {
-                    startLogic.guns();
-                }
+        startButton.setOnAction(event -> {
+            StartLogic startLogic = new StartLogic(getPlayer());
+            if (Start.getSelectedToggle() == cashChoice) {
+                startLogic.money_and_debt();
+            }
+            if (Start.getSelectedToggle() == gunChoice) {
+                startLogic.guns();
+            }
 
-                String response = nameField.getText();
-                // purely for testing purposes.
-                if (response.equalsIgnoreCase("Vikram")) {
-                    startLogic.cheat();
-                    setCargoSpace(Integer.MAX_VALUE);
-                }
-                setFirm(response);
+            String response = nameField.getText();
+            // purely for testing purposes.
+            if (response.equalsIgnoreCase("Vikram")) {
+                startLogic.cheat();
+                setCargoSpace(Integer.MAX_VALUE);
+            }
+            setFirm(response);
 
-                setPlayer(startLogic.getPlayer());
-                TaipanShopGUI shop = new TaipanShopGUI(getPlayer());
+            setPlayer(startLogic.getPlayer());
+            TaipanShopGUI shop = new TaipanShopGUI(getPlayer());
+            shop.initializeShop(stage);
+            stage.show();
+        });
+
+        continueButton.setOnAction(event -> {
+            FileSaving saving = new FileSaving();
+            if(saving.loadFile() != null){
+                TaipanShopGUI shop = new TaipanShopGUI(saving.loadFile());
                 shop.initializeShop(stage);
                 stage.show();
             }
-        });
-
-        continueButton.setOnAction(new EventHandler<ActionEvent>() {
-            @Override
-            public void handle(ActionEvent event) {
-                FileSaving saving = new FileSaving();
-                if(saving.loadFile() != null){
-                    TaipanShopGUI shop = new TaipanShopGUI(saving.loadFile());
-                    shop.initializeShop(stage);
-                    stage.show();
-                }
-                else{
-                    authors.setText("There are no previous saves!");
-                }
+            else{
+                authors.setText("There are no previous saves!");
             }
         });
 
diff --git a/src/gui/TravelGUI.java b/src/gui/TravelGUI.java
index 1298dc2..7ed1a7e 100644
--- a/src/gui/TravelGUI.java
+++ b/src/gui/TravelGUI.java
@@ -9,11 +9,13 @@ import javafx.scene.Scene;
 import javafx.scene.control.Button;
 import javafx.scene.control.TextField;
 import javafx.scene.input.KeyCode;
+import javafx.scene.input.KeyEvent;
 import javafx.scene.layout.*;
 import javafx.stage.Stage;
 import javafx.scene.control.Label;
 import javafx.scene.text.Font;
 import logic.Player;
+import logic.TravelLogic;
 
 import java.util.Random;
 
@@ -79,82 +81,14 @@ public class TravelGUI extends Player {
 
         //Continues on to either shop or shipwarfare
         continueButton.setOnAction(event -> {
-            if(peasantShipScene && getAttackingShips()){
-                ShipWarfareGUI ship = new ShipWarfareGUI(getPlayer());
-                try {
-                    ship.initializeShip(stage);
-                } catch (Exception e) {
-                    e.printStackTrace();
-                }
-                stage.show();
-            }
-            else if(shopScene){
-                Random rand = new Random();
-                int randGenNum = rand.nextInt(3) + 1;
-                if(randGenNum >= 2) {
-                    TaipanShopGUI shop = new TaipanShopGUI(getPlayer());
-                    shop.initializeShop(stage);
-                    stage.show();
-                }
-                else {
-                    RandomEventGUI randomEventGUI = new RandomEventGUI(getPlayer());
-                    randomEventGUI.initializeRandomEventGUI(stage);
-                    stage.show();
-                }
-            }
+            continueButton(stage);
         });
 
         //Text input for where the player needs to go inside of the game world
         numberInput.setAlignment(javafx.geometry.Pos.CENTER_RIGHT);
         //numberInput.setText("Enter preferred location.");
         numberInput.setOnKeyPressed(event -> {
-            if(event.getCode().equals(KeyCode.ENTER)||event.getCode().equals(KeyCode.Z)) {
-                int response;
-                try {
-                    response = Integer.parseInt(numberInput.getText().replace(" ", ""));
-                }
-                catch (Exception e){
-                    response = 0;
-                }
-                boolean hasTraveled = false;
-                //Only lets the player leave the port if their inventory is greater than or equal to the sum of the items in the inventory.
-                if(getCargoSpace() >= (getOpiumHeld()+ (getGuns()*10)+getSilkHeld() + getArmsHeld() + getGeneralHeld())){
-                    //Just in case the player types something that was not intended. It will refresh the question and ask it again
-                    try {
-                        //Makes sure you can't travel to your own location.
-                        if (response != getLocation() && response > 0  && 8 > response && event.getCode().equals(KeyCode.ENTER)||event.getCode().equals(KeyCode.Z)){
-                            hasTraveled = seaAtlas(response);
-                            randomEventSea(response);
-                            setBank((int) (getBank() * 1.01));
-                            setDebt((int) (getDebt() * 1.01));
-                            setIsPriceChanged(2);
-                            stormScene = false;
-
-                        } else{
-                            if(response == getLocation()){
-                                textOut.setText("\tYou're already here " + getName() + "\n");
-                            }
-                            else{
-                                textOut.setText("\t" + getName() + "; Sorry but could you say that again?");
-                            }
-
-                            textOut.setText(textOut.getText() + "\n\n\t\t1) Hong Kong, 2) Shanghai, 3) Nagasaki, 4) Saigon,\n\t\t5) Manila, 6) Singapore, or 7) Batavia?");
-                        }
-                    } catch (Exception e) {
-                        textOut.setText("\tSorry, " + getName() + " could you say that again?");
-                    }
-                    if (hasTraveled) {
-                        continueButton.setVisible(true);
-                        continueButton.setDefaultButton(true);
-                        quitButton.setVisible(false);
-                        numberInput.setVisible(false);
-                        shopScene = true;
-                    }
-                }
-            }
-            else if (getCargoSpace() < (getOpiumHeld()+ (getGuns()*10)+getSilkHeld() + getArmsHeld() + getGeneralHeld())){
-                textOut.setText("   "+getName() + " the cargo is too heavy! We can't set sail!");
-            }
+            numberInput(event);
         });
 
         firm.setAlignment(Pos.CENTER);
@@ -174,6 +108,90 @@ public class TravelGUI extends Player {
         return stage;
     }
 
+    public void continueButton(Stage stage) {
+        if(peasantShipScene && getAttackingShips()){
+            ShipWarfareGUI ship = new ShipWarfareGUI(getPlayer());
+            try {
+                ship.initializeShip(stage);
+            } catch (Exception e) {
+                e.printStackTrace();
+            }
+            stage.show();
+        }
+        else if(shopScene){
+            Random rand = new Random();
+            int randGenNum = rand.nextInt(3) + 1;
+            if(randGenNum >= 2) {
+                TaipanShopGUI shop = new TaipanShopGUI(getPlayer());
+                shop.initializeShop(stage);
+                stage.show();
+            }
+            else {
+                RandomEventGUI randomEventGUI = new RandomEventGUI(getPlayer());
+                randomEventGUI.initializeRandomEventGUI(stage);
+                stage.show();
+            }
+        }
+    }
+
+    public void numberInput(KeyEvent event) {
+        if(event.getCode().equals(KeyCode.ENTER)||event.getCode().equals(KeyCode.Z)) {
+            int response;
+            try {
+                response = Integer.parseInt(numberInput.getText().replace(" ", ""));
+            }
+            catch (Exception e){
+                response = 0;
+            }
+            boolean hasTraveled = false;
+            //Only lets the player leave the port if their inventory is greater than or equal to the sum of the items in the inventory.
+            if(getCargoSpace() >= (getOpiumHeld()+ (getGuns()*10)+getSilkHeld() + getArmsHeld() + getGeneralHeld())){
+                traveling(event, response, hasTraveled);
+            }
+        }
+        else if (getCargoSpace() < (getOpiumHeld()+ (getGuns()*10)+getSilkHeld() + getArmsHeld() + getGeneralHeld())){
+            textOut.setText("   "+getName() + " the cargo is too heavy! We can't set sail!");
+        }
+    }
+
+    public void traveling(KeyEvent event, int response, boolean hasTraveled) {
+        //Just in case the player types something that was not intended. It will refresh the question and ask it again
+        try {
+            //Makes sure you can't travel to your own location.
+            if (response != getLocation() && response > 0  && 8 > response && event.getCode().equals(KeyCode.ENTER)||event.getCode().equals(KeyCode.Z)){
+                hasTraveled = seaAtlas(response);
+                randomEventSea(response);
+                setBank((int) (getBank() * 1.01));
+                setDebt((int) (getDebt() * 1.01));
+                setIsPriceChanged(2);
+                stormScene = false;
+
+            } else{
+                responseTravel(response);
+            }
+        } catch (Exception e) {
+            textOut.setText("\tSorry, " + getName() + " could you say that again?");
+        }
+        if (hasTraveled) {
+            continueButton.setVisible(true);
+            continueButton.setDefaultButton(true);
+            quitButton.setVisible(false);
+            numberInput.setVisible(false);
+            shopScene = true;
+        }
+    }
+
+    public void responseTravel(int response) {
+        if(response == getLocation()){
+            textOut.setText("\tYou're already here " + getName() + "\n");
+        }
+        else{
+            textOut.setText("\t" + getName() + "; Sorry but could you say that again?");
+        }
+
+        textOut.setText(textOut.getText() + "\n\n\t\t1) Hong Kong, 2) Shanghai, 3) Nagasaki, 4) Saigon,\n\t\t5) Manila, 6) Singapore, or 7) Batavia?");
+    }
+
     /**
      * When provided a location number: the method returns a print statement stating the location's name and call another
      * method to change the location of the Player object.
@@ -233,36 +251,14 @@ public class TravelGUI extends Player {
             textOut.setText("\tWe see a ship on the horizon " + getName() + "; Prepare for combat!");
             peasantShipScene = true;
         }else if (randGenNum == 2) {
-            disaster(locationOfTravel);
+            textOut.setText("\tStorm " + getName() + "! ");
+            TravelLogic travelLogic = new TravelLogic(getPlayer());
+            textOut.setText(textOut.getText()+"\n\t" + travelLogic.disaster(locationOfTravel));
+            setPlayer(travelLogic.getPlayer());
             textOut.setText(textOut.getText() + "\n    " + "We made it!");
+
         }
     }
 
-    /**
-     * Based on random chance either throws the player character off course, or continues them on their way to their
-     * destination.
-     *
-     * @param locationOfTravel is used to see where the player is going to travel, just in case their location is changed
-     *                         by a typhoon.
-     **/
-    private void disaster(int locationOfTravel) {
-        //Tells player that there is a storm approaching.
-        textOut.setText("\tStorm " + getName() + "! ");
-        Random rand = new Random();
-        int randGenNum = rand.nextInt(5) + 1;
 
-        //If the player lands within this range, nothing happens to them
-        //Else they randomly get thrown into a location they weren't planning on going to(Anything but location of Travel).
-        if (randGenNum <= 2) {
-            textOut.setText(textOut.getText() + "\n\tWe got through the storm " + getName() + "!");
-        }else {
-            while (randGenNum == locationOfTravel) {
-                randGenNum = rand.nextInt(7) + 1;
-                if (randGenNum != locationOfTravel) {
-                    textOut.setText(textOut.getText() + "\n\tWe've been blown off course!");
-                    seaAtlas(randGenNum);
-                }
-            }
-        }
-    }
 }
diff --git a/src/logic/ShipWarfareLogic.java b/src/logic/ShipWarfareLogic.java
index f253e53..5289e12 100644
--- a/src/logic/ShipWarfareLogic.java
+++ b/src/logic/ShipWarfareLogic.java
@@ -96,12 +96,9 @@ public class ShipWarfareLogic extends Player {
      * @return the loot for defeating the fleet
      */
     public int calculateLoot() {
-
         Random randomValue = new Random();
         int calculateLoot;
         calculateLoot = (startingShips * 100) + randomValue.nextInt(startingShips) * 200;
-        super.setMoney(super.getMoney() + calculateLoot);
         return calculateLoot;
-
     }
 }
diff --git a/src/logic/TravelLogic.java b/src/logic/TravelLogic.java
index 0441468..7953c77 100644
--- a/src/logic/TravelLogic.java
+++ b/src/logic/TravelLogic.java
@@ -1,4 +1,80 @@
 package logic;
 
+import java.util.Random;
+
 public class TravelLogic extends Player {
+
+    public TravelLogic(Player player) {
+        Player playerDummy = new Player(player);
+        setPlayer(playerDummy);
+    }
+
+
+    /**
+     * When provided a location number: the method returns a print statement stating the location's name and call another
+     * method to change the location of the Player object.
+     *
+     * @param locationOfTravel is a Player object that will be copied and the player instance variable is set to the copy.
+     */
+    public void seaAtlas(int locationOfTravel) {
+        switch (locationOfTravel) {
+            case 1:
+                System.out.println("\nArriving at Hong Kong");
+                setLocation(1);
+                break;
+            case 2:
+                System.out.println("\nArriving at Shanghai");
+                setLocation(2);
+                break;
+            case 3:
+                System.out.println("\nArriving at Nagasaki");
+                setLocation(3);
+                break;
+            case 4:
+                System.out.println("\nArriving at Saigon");
+                setLocation(4);
+                break;
+            case 5:
+                System.out.println("\nArriving at Manila");
+                setLocation(5);
+                break;
+            case 6:
+                System.out.println("\nArriving at Singapore");
+                setLocation(6);
+                break;
+            case 7:
+                System.out.println("\nArriving at Batavia");
+                setLocation(7);
+                break;
+        }
+    }
+
+
+    /**
+     * Based on random chance either throws the player character off course, or continues them on their way to their
+     * destination.
+     *
+     * @param locationOfTravel is used to see where the player is going to travel, just in case their location is changed
+     *                         by a typhoon.
+     **/
+    public String disaster(int locationOfTravel) {
+        //Tells player that there is a storm approaching.
+        Random rand = new Random();
+        int randGenNum = rand.nextInt(5) + 1;
+
+        //If the player lands within this range, nothing happens to them
+        //Else they randomly get thrown into a location they weren't planning on going to(Anything but location of Travel).
+        if (randGenNum <= 2) {
+            return "We got through the storm " + getName() + "!";
+        }else {
+            while (randGenNum == locationOfTravel) {
+                randGenNum = rand.nextInt(7) + 1;
+                if (randGenNum != locationOfTravel) {
+                    seaAtlas(randGenNum);
+                    return "We've been blown off course!";
+                }
+            }
+        }
+        return null;
+    }
 }
diff --git a/src/saves/playerSave.txt b/src/saves/playerSave.txt
index f1e8ef0f573d078cb5005eff4002d04ca899cc88..e2948ffc27aff2aff116007b314a6b089cb1b482 100644
GIT binary patch
delta 75
wcmZo=Ze`w}%V;0V00H|Lp$r=+4Wjsfm=%bbpcqJj0DA<4W?=m=Ifqda0R8s{3IG5A

delta 75
wcmZo=Ze`w}%V?j%00B`@n!yIf0Mcww%mk!afT$B9Cv*TpGq8kB&S8`U0QVaP3;+NC

diff --git a/src/text/MainText.java b/src/text/MainText.java
index 2c80173..96009db 100644
--- a/src/text/MainText.java
+++ b/src/text/MainText.java
@@ -11,4 +11,9 @@ public class MainText extends Player {
         Player playerDummy = new Player(player);
         setPlayer(playerDummy);
     }
+
+    public static void main(String[] args) {
+        StartText startText = new StartText(new Player());
+        startText.start();
+    }
 }
diff --git a/src/text/RandomEventText.java b/src/text/RandomEventText.java
index b6de8e3..acc1d89 100644
--- a/src/text/RandomEventText.java
+++ b/src/text/RandomEventText.java
@@ -1,10 +1,91 @@
 package text;
 
+import gui.TaipanShopGUI;
 import logic.Player;
+import logic.RandomEventLogic;
+
+import java.util.Scanner;
 
 public class RandomEventText extends Player {
     public RandomEventText(Player player) {
         Player playerDummy = new Player(player);
         setPlayer(playerDummy);
     }
+
+    public void randomEvent(){
+        /*Pick a random number dictating the events that could happen.
+         * 1: New gun for player
+         * 2: Paying Liu Yuen
+         * 3: Repairing the Ship
+         */
+        RandomEventLogic randomEventLogic = new RandomEventLogic(getPlayer());
+        int[] randEvent = randomEventLogic.randEvent();
+        int eventNumber = randEvent[0];
+        int itemPrice = randEvent[1];
+
+        if(eventNumber == 1){
+            System.out.println("\nA vendor is selling a gun for $" + itemPrice + " for a gun?");
+        }
+        if(eventNumber == 2){
+            System.out.println("\nLiu Yuen asks $" + itemPrice + " in donation to the temple of Tin Hau, the Sea Goddess");
+        }
+        if(eventNumber == 3){
+            System.out.println("\nMc Henry from the Hong Kong shipyard has arrived,\nwould be willing to repair your ship for $" + itemPrice);
+        }
+
+        if((eventNumber == 1 && getCargoSpace() < 10)){
+            TaipanShopText taipanShopText = new TaipanShopText(getPlayer());
+            taipanShopText.shop();
+        }
+        if((eventNumber == 3 && getPlayer().getHP() >= 100)){
+            TaipanShopText taipanShopText = new TaipanShopText(getPlayer());
+            taipanShopText.shop();
+        }
+
+
+        while(true){
+            System.out.println("Would you like to pay? (Y)es or (N)o");
+            Scanner keyboard = new Scanner(System.in);
+            String input = keyboard.next();
+            if (input.equalsIgnoreCase("Y") && getPlayer().getMoney() > itemPrice) {
+                //Buy Guns
+                if (eventNumber == 1 && (getCargoSpace() >= 10)) {
+                    setGuns(getPlayer().getGuns() + 1);
+                    setMoney(getPlayer().getMoney() - itemPrice);
+
+                    TaipanShopText taipanShopText = new TaipanShopText(getPlayer());
+                    taipanShopText.shop();
+                }
+
+                //Liu Yuen
+                if (eventNumber == 2) {
+                    setAttackingShips(false);
+                    setMoney(getPlayer().getMoney() - itemPrice);
+
+                    TaipanShopText taipanShopText = new TaipanShopText(getPlayer());
+                    taipanShopText.shop();
+                }
+
+                //Ship Repair
+                if (eventNumber == 3 && getPlayer().getHP() != 100) {
+                    setHP(100);
+                    setMoney(getPlayer().getMoney() - itemPrice);
+
+                    TaipanShopText taipanShopText = new TaipanShopText(getPlayer());
+                    taipanShopText.shop();
+                }
+
+
+            }
+            else {
+                System.out.println("Sorry you don't have enough money");
+            }
+            if(input.equalsIgnoreCase("N")){
+                System.out.println("Aye aye Taipan, we'll send them off!\n");
+                TaipanShopText taipanShopText = new TaipanShopText(getPlayer());
+                taipanShopText.shop();
+            }
+        }
+
+    }
 }
diff --git a/src/text/ShipWarfareText.java b/src/text/ShipWarfareText.java
index 2aa44df..e249bd6 100644
--- a/src/text/ShipWarfareText.java
+++ b/src/text/ShipWarfareText.java
@@ -234,6 +234,7 @@ public class ShipWarfareText extends Player {
             System.out.printf("\nGot eem\nVictory!\nIt appears we have defeated the enemy fleet and made it out at %d%% ship status\n", getHP());
             delayForSeconds(1);
             calculateLoot = logic.calculateLoot();
+            setMoney(calculateLoot+ getPlayer().getMoney());
             System.out.printf("We got $%,d!", calculateLoot);
             delayForSeconds(2);
             return true;
diff --git a/src/text/StartText.java b/src/text/StartText.java
index cdec4d6..36d6032 100644
--- a/src/text/StartText.java
+++ b/src/text/StartText.java
@@ -1,5 +1,7 @@
 package text;
 
+import gui.TaipanShopGUI;
+import logic.FileSaving;
 import logic.Player;
 import logic.StartLogic;
 import java.util.Scanner;
@@ -17,20 +19,54 @@ public class StartText extends Player {
      */
     public void start() {
         Scanner userInput = new Scanner(System.in);
+
+        System.out.println("Taipan, do you want to...\n\t1) load a save file?\n\t\t\t>> or <<\n\t2) make a new save file?");
+        while (true) {
+            int input = userInput.nextInt();
+            if(input == 1){
+                FileSaving saving = new FileSaving();
+                if(saving.loadFile() != null){
+                    TaipanShopText taipanShopText = new TaipanShopText(saving.loadFile());
+                    taipanShopText.shop();
+                }
+                else{
+                    System.out.println("There are no previous saves!");
+                }
+                break;
+            }
+            else if(input == 2){
+                break;
+            }
+            else{
+                System.out.println("Invalid input, please try again.");
+            }
+        }
+
+
+
         System.out.println("Taipan, \nWhat will you name your firm:");
         setName(userInput.nextLine());
         System.out.println("Do you want to start . . .\n\t1) With cash (and a debt)\n\t\t\t>> or <<\n\t" + "2) With five guns and no cash (But no debt!)?\n ");
-        int input = userInput.nextInt();
-        StartLogic startLogic = new StartLogic(getPlayer());
-        if (input == 1) {
-        startLogic.money_and_debt();
-        }
-        if (input == 2) {
-        startLogic.guns();
-        }
-        // purely for testing purposes.
-        if (getName().equalsIgnoreCase("Vikram")) {
-            startLogic.cheat();
+        while (true) {
+            int input = userInput.nextInt();
+            StartLogic startLogic = new StartLogic(getPlayer());
+            if (input == 1) {
+                startLogic.money_and_debt();
+                break;
+            }
+            else if (input == 2) {
+                startLogic.guns();
+                break;
+            }
+            // purely for testing purposes.
+            else if (getName().equalsIgnoreCase("Vikram")) {
+                startLogic.cheat();
+            }
+            else {
+                System.out.println("Invalid input, please try again.");
+            }
         }
+        TaipanShopText taipanShopText = new TaipanShopText(getPlayer());
+        taipanShopText.shop();
     }
 }
diff --git a/src/text/TaipanShopText.java b/src/text/TaipanShopText.java
index 2103345..20185d7 100644
--- a/src/text/TaipanShopText.java
+++ b/src/text/TaipanShopText.java
@@ -2,6 +2,8 @@ package text;
 
 import java.util.Scanner;
 
+import javafx.scene.layout.FlowPane;
+import logic.FileSaving;
 import logic.Player;
 import logic.TaipanShopLogic;
 
@@ -91,6 +93,12 @@ public class TaipanShopText extends Player {
      * this is the shop method. Activates the shopping screen.
      */
     public void shop(){
+
+        //Saves the game when loading into the shop
+        FileSaving saving = new FileSaving();
+        saving.saveFile(getPlayer());
+        FlowPane flowPane = new FlowPane();
+
         TaipanShopLogic logic = new TaipanShopLogic(getPlayer());
         System.out.println(logic.updatePrices());
         setPlayer(logic.getPlayer());
@@ -115,7 +123,17 @@ public class TaipanShopText extends Player {
         }
 
         Scanner input = new Scanner(System.in);
+        try {
+            runShop(notDone, caseNum, optionText, input);
+        }
+        catch (Exception e){
+            TaipanShopText taipanShopText = new TaipanShopText(getPlayer());
+            taipanShopText.shop();
+        }
 
+    }
+
+    public void runShop(boolean notDone, int caseNum, String optionText, Scanner input) {
         // as long as the user does not enter a valid input, the code will run in a loop forever.
         while(notDone){
             printShop();
@@ -126,132 +144,13 @@ public class TaipanShopText extends Player {
                 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?");
-                            }
-                        }
-                    }
-                }
+                buying(input, notDone2);
 
             } // 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?");
-                            }
-                        }
-                    }
-
-                }
+                selling(input, notDone2);
 
             } else if (response.equalsIgnoreCase("V") && (caseNum == 1 || caseNum == 3)) {
                 bank();
@@ -260,7 +159,8 @@ public class TaipanShopText extends Player {
             } 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)) {
+            else if (response.equalsIgnoreCase("Q") ) {
+                System.out.println("1");
                 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.
@@ -270,4 +170,133 @@ public class TaipanShopText extends Player {
             }
         }
     }
+
+    public void buying(Scanner input, boolean notDone2) {
+        String response;
+        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?");
+                    }
+                }
+            }
+        }
+    }
+
+    public void selling(Scanner input, boolean notDone2) {
+        String response;
+        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?");
+                    }
+                }
+            }
+
+        }
+    }
 }
diff --git a/src/text/TravelText.java b/src/text/TravelText.java
index 32658f5..16f5145 100644
--- a/src/text/TravelText.java
+++ b/src/text/TravelText.java
@@ -1,6 +1,9 @@
 package text;
 
+import gui.RandomEventGUI;
+import gui.TaipanShopGUI;
 import logic.Player;
+import logic.TravelLogic;
 
 import java.util.Random;
 import java.util.Scanner;
@@ -12,45 +15,6 @@ public class TravelText extends Player {
         setPlayer(playerDummy);
     }
 
-    /**
-     * When provided a location number: the method returns a print statement stating the location's name and call another
-     * method to change the location of the Player object.
-     *
-     * @param locationOfTravel is a Player object that will be copied and the player instance variable is set to the copy.
-     */
-    private void seaAtlas(int locationOfTravel) {
-        switch (locationOfTravel) {
-            case 1:
-                System.out.println("\nArriving at Hong Kong");
-                setLocation(1);
-                break;
-            case 2:
-                System.out.println("\nArriving at Shanghai");
-                setLocation(2);
-                break;
-            case 3:
-                System.out.println("\nArriving at Nagasaki");
-                setLocation(3);
-                break;
-            case 4:
-                System.out.println("\nArriving at Saigon");
-                setLocation(4);
-                break;
-            case 5:
-                System.out.println("\nArriving at Manila");
-                setLocation(5);
-                break;
-            case 6:
-                System.out.println("\nArriving at Singapore");
-                setLocation(6);
-                break;
-            case 7:
-                System.out.println("\nArriving at Batavia");
-                setLocation(7);
-                break;
-        }
-    }
-
     /**
      * Based on random chance either attacks the player with enemy ships, throws them to a different location or does nothing.
      *
@@ -65,39 +29,14 @@ public class TravelText extends Player {
             shipWarfareText.peasantFleetAttack();
             setPlayer(shipWarfareText.getPlayer());
         } else if (randGenNum == 2) {
-            disaster(locationOfTravel);
+            TravelLogic travelLogic = new TravelLogic(getPlayer());
+            travelLogic.disaster(locationOfTravel);
+            setPlayer(travelLogic.getPlayer());
+
             System.out.println("We made it!");
         }
     }
 
-    /**
-     * Based on random chance either throws the player character off course, or continues them on their way to their
-     * destination.
-     *
-     * @param locationOfTravel is used to see where the player is going to travel, just in case their location is changed
-     *                         by a typhoon.
-     **/
-    private void disaster(int locationOfTravel) {
-        //Tells player that there is a storm approaching.
-        System.out.print("Storm " + getName() + "! ");
-        Random rand = new Random();
-        int randGenNum = rand.nextInt(5) + 1;
-
-        //If the player lands within this range, nothing happens to them
-        //Else they randomly get thrown into a location they weren't planning on going to(Anything but location of Travel).
-        if (randGenNum <= 2) {
-            System.out.println(" We made it through!");
-        } else {
-            while (randGenNum == locationOfTravel) {
-                randGenNum = rand.nextInt(7) + 1;
-                if (randGenNum != locationOfTravel) {
-                    System.out.println("We've been blown off course!");
-                    seaAtlas(randGenNum);
-                }
-            }
-        }
-    }
-
     /**
      * Used to travel between different areas inside of the game world.
      * If the player's inventory is too full it won't run.
@@ -105,38 +44,61 @@ public class TravelText extends Player {
      **/
     public void travelTo() {
         Scanner keyboard = new Scanner(System.in);
-        String response;
-        int tempInt;
         boolean hasTraveled = false;
 
         //Only lets the player leave the port if their inventory is greater than or equal to the sum of the items in the inventory.
         if (getCargoSpace() >= (getOpiumHeld() + (getGuns() * 10) + getSilkHeld() + getArmsHeld() + getGeneralHeld())) {
-            while (true) {
-                System.out.println("\n" + getName() + ", do you wish to go to:\n");
-                System.out.println("1) Hong Kong, 2) Shanghai, 3) Nagasaki,\n4) Saigon, 5) Manila, 6) Singapore, or 7) Batavia?");
-
-                response = keyboard.nextLine();
-                //Just in case the player types something that was not intended. It will refresh the question and ask it again
-                try {
-                    tempInt = Integer.parseInt(response);
-                    //Makes sure you can't travel to your own location.
-                    if (tempInt != getLocation()) {
-                        randomEventSea(tempInt);
-                        seaAtlas(tempInt);
-                        hasTraveled = true;
-                        setBank((int) (getBank() * 1.01));
-                        setDebt((int) (getDebt() * 1.01));
-                    } else System.out.println("\nYou're already here " + getName() + ".");
-                } catch (Exception e) {
-                    System.out.print("\nSorry, " + getName() + " could you say that again?");
-                }
-                if (hasTraveled) {
-                    break;
-                }
-            }
+            traveling(keyboard, hasTraveled);
         } else {
             System.out.println(getName() + " the cargo is too heavy! We can't set sail!");
         }
     }
+
+    public void traveling(Scanner keyboard, boolean hasTraveled) {
+        String response;
+        int tempInt;
+        while (true) {
+            System.out.println("\n" + getName() + ", do you wish to go to:\n");
+            System.out.println("1) Hong Kong, 2) Shanghai, 3) Nagasaki,\n4) Saigon, 5) Manila, 6) Singapore, or 7) Batavia?");
+
+            response = keyboard.nextLine();
+            //Just in case the player types something that was not intended. It will refresh the question and ask it again
+            try {
+                tempInt = Integer.parseInt(response);
+                //Makes sure you can't travel to your own location.
+                if (tempInt != getLocation()) {
+                    randomEventSea(tempInt);
+
+                    TravelLogic travelLogic = new TravelLogic(getPlayer());
+                    travelLogic.seaAtlas(tempInt);
+                    setPlayer(travelLogic.getPlayer());
+
+                    hasTraveled = true;
+                    setBank((int) (getBank() * 1.01));
+                    setDebt((int) (getDebt() * 1.01));
+                    setIsPriceChanged(2);
+
+                } else System.out.println("\nYou're already here " + getName() + ".");
+            } catch (Exception e) {
+                System.out.print("\nSorry, " + getName() + " could you say that again?");
+            }
+            if (hasTraveled) {
+
+                Random rand = new Random();
+                int randGenNum = rand.nextInt(3) + 1;
+                if(randGenNum >= 2) {
+                    TaipanShopText taipanShopText = new TaipanShopText(getPlayer());
+                    taipanShopText.shop();
+                }
+                else {
+                    RandomEventText randomEventText = new RandomEventText(getPlayer());
+                    randomEventText.randomEvent();
+                    setPlayer(randomEventText.getPlayer());
+                }
+                break;
+
+            }
+        }
+    }
 }
 
diff --git a/src/text/WarehouseText.java b/src/text/WarehouseText.java
index 4f57fd9..d885151 100644
--- a/src/text/WarehouseText.java
+++ b/src/text/WarehouseText.java
@@ -106,10 +106,10 @@ public class WarehouseText extends Player {
             Scanner keyboard = new Scanner(System.in);
             String input = keyboard.next();
             if (input.equalsIgnoreCase("D")) {
-                this.removeAmount();
+                this.addAmount();
                 this.showWarehouse();
             } else if (input.equalsIgnoreCase("W")) {
-                this.addAmount();
+                this.removeAmount();
                 this.showWarehouse();
             }
             else{