From 3beb1ff33d9a57a726875f83fd228bbf2375fba1 Mon Sep 17 00:00:00 2001
From: Solargale <harkamalsr@gmail.com>
Date: Sat, 6 Apr 2019 14:00:33 -0600
Subject: [PATCH 1/3] Merge branch 'master' of C:\Users\Harkamal
 Randhawa\IdeaProjects\TaipanClone with conflicts.

---
 .idea/cssdialects.xml    |   6 +
 .idea/encodings.xml      |   3 +-
 .idea/misc.xml           |   2 +-
 .idea/workspace.xml      | 802 +++++++++++++++++++--------------------
 src/FileSaving.java      |   8 +-
 src/saves/playerSave.txt | Bin 383 -> 383 bytes
 6 files changed, 415 insertions(+), 406 deletions(-)
 create mode 100644 .idea/cssdialects.xml

diff --git a/.idea/cssdialects.xml b/.idea/cssdialects.xml
new file mode 100644
index 0000000..c60d418
--- /dev/null
+++ b/.idea/cssdialects.xml
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project version="4">
+  <component name="CssDialectMappings">
+    <file url="file://$PROJECT_DIR$/src/styleguide.css" dialect="CLASSIC" />
+  </component>
+</project>
\ No newline at end of file
diff --git a/.idea/encodings.xml b/.idea/encodings.xml
index ada92a5..aa446f1 100644
--- a/.idea/encodings.xml
+++ b/.idea/encodings.xml
@@ -1,6 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <project version="4">
-  <component name="Encoding" addBOMForNewFiles="with NO BOM">
+  <component name="Encoding">
+    <file url="file://$PROJECT_DIR$/src/saves/playerSave.txt" charset="windows-1252" />
     <file url="PROJECT" charset="UTF-8" />
   </component>
 </project>
\ No newline at end of file
diff --git a/.idea/misc.xml b/.idea/misc.xml
index c496ad9..29ec0d7 100644
--- a/.idea/misc.xml
+++ b/.idea/misc.xml
@@ -9,7 +9,7 @@
   <component name="ProjectKey">
     <option name="state" value="project://63537948-39a4-48a0-9c97-34259a0fa913" />
   </component>
-  <component name="ProjectRootManager" version="2" languageLevel="JDK_1_8" default="true" project-jdk-name="1.8.0_201" project-jdk-type="JavaSDK">
+  <component name="ProjectRootManager" version="2" languageLevel="JDK_1_8" default="true" project-jdk-name="1.8.0_141" project-jdk-type="JavaSDK">
     <output url="file://$PROJECT_DIR$/out" />
   </component>
   <component name="SvnBranchConfigurationManager">
diff --git a/.idea/workspace.xml b/.idea/workspace.xml
index e531918..5732e5c 100644
--- a/.idea/workspace.xml
+++ b/.idea/workspace.xml
@@ -1,9 +1,15 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <project version="4">
+  <component name="BookmarkManager">
+    <bookmark url="file://$PROJECT_DIR$/src/LoanSharkGUI.java" line="66" />
+  </component>
   <component name="ChangeListManager">
-    <list default="true" id="3114a2b9-4919-4fdf-8fd9-d03b60109ce4" name="Default Changelist" comment="Fixed an issue with shipWarfare with the ships running away label">
+    <list default="true" id="3114a2b9-4919-4fdf-8fd9-d03b60109ce4" name="Default Changelist" comment="Made">
+      <change afterPath="$PROJECT_DIR$/.idea/cssdialects.xml" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/.idea/encodings.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/encodings.xml" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/.idea/misc.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/misc.xml" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/ShipWarfareGUI.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/ShipWarfareGUI.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/FileSaving.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/FileSaving.java" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/src/saves/playerSave.txt" beforeDir="false" afterPath="$PROJECT_DIR$/src/saves/playerSave.txt" afterDir="false" />
     </list>
     <ignored path="$PROJECT_DIR$/out/" />
@@ -15,29 +21,28 @@
     <option name="HIGHLIGHT_NON_ACTIVE_CHANGELIST" value="false" />
     <option name="LAST_RESOLUTION" value="IGNORE" />
   </component>
+  <component name="DefaultGradleProjectSettings">
+    <option name="isMigrated" value="true" />
+  </component>
   <component name="FileEditorManager">
     <leaf SIDE_TABS_SIZE_LIMIT_KEY="300">
       <file pinned="false" current-in-tab="false">
         <entry file="file://$PROJECT_DIR$/src/MainGUI.java">
           <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="315">
-              <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="221">
+              <caret line="13" column="14" selection-start-line="13" selection-start-column="14" selection-end-line="13" selection-end-column="14" />
               <folding>
-                <element signature="e#551#552#0" expanded="true" />
-                <element signature="e#579#580#0" expanded="true" />
+                <element signature="imports" expanded="true" />
               </folding>
             </state>
           </provider>
         </entry>
       </file>
       <file pinned="false" current-in-tab="true">
-        <entry file="file://$PROJECT_DIR$/src/ShipWarfareGUI.java">
+        <entry file="file://$PROJECT_DIR$/src/FileSaving.java">
           <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="322">
-              <caret line="589" column="27" selection-start-line="589" selection-start-column="27" selection-end-line="589" selection-end-column="27" />
-              <folding>
-                <element signature="imports" expanded="true" />
-              </folding>
+            <state relative-caret-position="646">
+              <caret line="38" column="24" lean-forward="true" selection-start-line="38" selection-start-column="24" selection-end-line="38" selection-end-column="24" />
             </state>
           </provider>
         </entry>
@@ -47,43 +52,43 @@
   <component name="FileTemplateManagerImpl">
     <option name="RECENT_TEMPLATES">
       <list>
+        <option value="CSS File" />
         <option value="Class" />
-        <option value="JavaFXApplication" />
       </list>
     </option>
   </component>
   <component name="FindInProjectRecents">
     <findStrings>
-      <find>continueButton</find>
-      <find>continueButton.setV</find>
-      <find>.setText</find>
-      <find>.setVisi</find>
-      <find>taipanSH</find>
-      <find>runButton.setOn</find>
-      <find>runButton.se</find>
-      <find>setVis</find>
-      <find>counter</find>
-      <find>stage</find>
-      <find>run</find>
-      <find>flee</find>
-      <find>runFrom</find>
-      <find>report</find>
-      <find>report.setVisible</find>
-      <find>fightButton</find>
-      <find>PlayerSh</find>
-      <find>andT</find>
-      <find>dest</find>
-      <find>shotsFired</find>
-      <find>duration</find>
-      <find>shop()</find>
-      <find>dang i</find>
-      <find>playerS</find>
-      <find>cowards</find>
-      <find>playerShoots</find>
-      <find>playerSh</find>
-      <find>getGuns</find>
-      <find>!</find>
-      <find>earned</find>
+      <find>runAwayOrLeft</find>
+      <find>gunsLeftOrTaken</find>
+      <find>continueToFight</find>
+      <find>sellingItemLab</find>
+      <find>You can'</find>
+      <find>cannotAfford</find>
+      <find>warehouse</find>
+      <find>cargoButton</find>
+      <find>cargobutton</find>
+      <find>peasantShip</find>
+      <find>BorderPane</find>
+      <find>houseLabel</find>
+      <find>setGuns</find>
+      <find>for a gun</find>
+      <find>cannon</find>
+      <find>quitButton</find>
+      <find>textField</find>
+      <find>numberInput</find>
+      <find>shop</find>
+      <find>default</find>
+      <find>defaultButton</find>
+      <find>printSt</find>
+      <find>txtField</find>
+      <find>vBox</find>
+      <find>Would you like to pay</find>
+      <find>shipWa</find>
+      <find>attackingShips</find>
+      <find>random</find>
+      <find>cargo</find>
+      <find>Noot</find>
     </findStrings>
     <replaceStrings>
       <replace>HP</replace>
@@ -92,19 +97,13 @@
       <replace>shipWarfare.getHowMuchRun()</replace>
       <replace>shipWarfare.isUserAttacks()</replace>
       <replace>shipWarfare.getNumOfPeasantShips()</replace>
-      <replace>attackImage</replace>
-      <replace>shipsAttacking</replace>
-      <replace>shipsApproachingGIF</replace>
-      <replace>centeringLittyShipPane</replace>
-      <replace>numOfLittyShips</replace>
-      <replace>startingLitty</replace>
-      <replace>littyShip</replace>
-      <replace>whenfinished</replace>
-      <replace>whenFinished</replace>
+      <replace>deposit</replace>
+      <replace>textOut.setText(&quot;    &quot; +</replace>
+      <replace>borderPane</replace>
     </replaceStrings>
   </component>
   <component name="Git.Settings">
-    <option name="UPDATE_TYPE" value="REBASE" />
+    <option name="UPDATE_TYPE" value="MERGE" />
     <option name="RECENT_GIT_ROOT_PATH" value="$PROJECT_DIR$" />
   </component>
   <component name="IdeDocumentHistory">
@@ -117,26 +116,42 @@
         <option value="$PROJECT_DIR$/src/main.java" />
         <option value="$PROJECT_DIR$/src/Travel.java" />
         <option value="$PROJECT_DIR$/src/ShipWarfare.java" />
-        <option value="$PROJECT_DIR$/src/StartGUI.java" />
-        <option value="$PROJECT_DIR$/src/Player.java" />
+        <option value="$PROJECT_DIR$/src/bankGUI.java" />
+        <option value="$PROJECT_DIR$/src/MainGUI.java" />
+        <option value="$PROJECT_DIR$/src/stylesheet.css" />
+        <option value="$PROJECT_DIR$/src/styleguide.css" />
+        <option value="$PROJECT_DIR$/src/BankGUI.java" />
+        <option value="$PROJECT_DIR$/src/GameEndGUI.java" />
+        <option value="$PROJECT_DIR$/src/LoanSharkGUI.java" />
+        <option value="$PROJECT_DIR$/src/Save.java" />
         <option value="$PROJECT_DIR$/src/AnimationTesting.java" />
-        <option value="$PROJECT_DIR$/src/TravelGUI.java" />
-        <option value="$PROJECT_DIR$/src/TaipanShopGUI.java" />
         <option value="$PROJECT_DIR$/src/ShipWarfareGUI.java" />
+        <option value="$PROJECT_DIR$/src/StartGUI.java" />
+        <option value="$PROJECT_DIR$/src/WarehouseGUI.java" />
+        <option value="$PROJECT_DIR$/src/TaipanShopGUI.java" />
+        <option value="$PROJECT_DIR$/src/TravelGUI.java" />
+        <option value="$PROJECT_DIR$/src/Player.java" />
+        <option value="$PROJECT_DIR$/src/RandomEventGUI.java" />
+        <option value="$PROJECT_DIR$/src/FileSaving.java" />
+        <option value="$PROJECT_DIR$/src/HighScore.java" />
       </list>
     </option>
   </component>
-  <component name="ProjectFrameBounds">
-    <option name="y" value="23" />
-    <option name="width" value="1189" />
-    <option name="height" value="652" />
+  <component name="ProjectFrameBounds" extendedState="6">
+    <option name="x" value="-8" />
+    <option name="y" value="-8" />
+    <option name="width" value="1696" />
+    <option name="height" value="1026" />
+  </component>
+  <component name="ProjectLevelVcsManager" settingsEditedManually="true">
+    <ConfirmationsSetting value="2" id="Add" />
   </component>
-  <component name="ProjectLevelVcsManager" settingsEditedManually="true" />
   <component name="ProjectView">
     <navigator proportions="" version="1">
       <foldersAlwaysOnTop value="true" />
     </navigator>
     <panes>
+      <pane id="PackagesPane" />
       <pane id="ProjectPane">
         <subPane>
           <expand>
@@ -149,36 +164,32 @@
               <item name="TaipanClone" type="462c0819:PsiDirectoryNode" />
               <item name="src" type="462c0819:PsiDirectoryNode" />
             </path>
-            <path>
-              <item name="TaipanClone" type="b2602c69:ProjectViewProjectNode" />
-              <item name="TaipanClone" type="462c0819:PsiDirectoryNode" />
-              <item name="src" type="462c0819:PsiDirectoryNode" />
-              <item name="images" type="462c0819:PsiDirectoryNode" />
-            </path>
           </expand>
           <select />
         </subPane>
       </pane>
       <pane id="Scope" />
-      <pane id="PackagesPane" />
     </panes>
   </component>
   <component name="PropertiesComponent">
     <property name="ChangesTree.GroupingKeys" value="" />
+    <property name="SHARE_PROJECT_CONFIGURATION_FILES" value="true" />
     <property name="WebServerToolWindowFactoryState" value="false" />
     <property name="aspect.path.notification.shown" value="true" />
-    <property name="com.android.tools.idea.instantapp.provision.ProvisionBeforeRunTaskProvider.myTimeStamp" value="1553647592854" />
-    <property name="extract.method.default.visibility" value="public" />
-    <property name="last_opened_file_path" value="$PROJECT_DIR$/../GitHub/Cpsc233" />
+    <property name="com.android.tools.idea.instantapp.provision.ProvisionBeforeRunTaskProvider.myTimeStamp" value="1552292013744" />
+    <property name="extract.method.default.visibility" value="private" />
+    <property name="last_opened_file_path" value="$USER_HOME$/Desktop/Demo 3" />
+    <property name="list.type.of.created.stylesheet" value="CSS" />
+    <property name="nodejs_package_manager_path" value="npm" />
     <property name="project.structure.last.edited" value="Modules" />
     <property name="project.structure.proportion" value="0.15" />
     <property name="project.structure.side.proportion" value="0.2" />
+    <property name="run.code.analysis.last.selected.profile" value="pProject Default" />
     <property name="settings.editor.selected.configurable" value="editing.templates" />
   </component>
   <component name="RecentsManager">
     <key name="MoveFile.RECENT_KEYS">
-      <recent name="$PROJECT_DIR$/src/images" />
-      <recent name="$PROJECT_DIR$/src" />
+      <recent name="C:\Users\Harkamal Randhawa\IdeaProjects\TaipanClone\src" />
     </key>
   </component>
   <component name="RunDashboard">
@@ -194,15 +205,15 @@
     </option>
   </component>
   <component name="RunManager" selected="Application.MainGUI">
-    <configuration name="MainGUI" type="Application" factoryName="Application" temporary="true" nameIsGenerated="true">
-      <option name="MAIN_CLASS_NAME" value="MainGUI" />
+    <configuration name="Game" type="Application" factoryName="Application" temporary="true" nameIsGenerated="true">
+      <option name="MAIN_CLASS_NAME" value="Game" />
       <module name="TaipanClone" />
       <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="ShipWarfareGUI" />
+    <configuration name="MainGUI" type="Application" factoryName="Application" temporary="true" nameIsGenerated="true">
+      <option name="MAIN_CLASS_NAME" value="MainGUI" />
       <module name="TaipanClone" />
       <method v="2">
         <option name="Make" enabled="true" />
@@ -231,17 +242,18 @@
     </configuration>
     <list>
       <item itemvalue="Application.TaipanShop" />
+      <item itemvalue="Application.Game" />
       <item itemvalue="Application.main" />
-      <item itemvalue="Application.MainGUI" />
       <item itemvalue="Application.ShipWarfareGUI" />
+      <item itemvalue="Application.MainGUI" />
     </list>
     <recent_temporary>
       <list>
         <item itemvalue="Application.MainGUI" />
         <item itemvalue="Application.ShipWarfareGUI" />
-        <item itemvalue="Application.ShipWarfareGUI" />
         <item itemvalue="Application.main" />
         <item itemvalue="Application.TaipanShop" />
+        <item itemvalue="Application.Game" />
       </list>
     </recent_temporary>
   </component>
@@ -287,28 +299,89 @@
       <workItem from="1552240770629" duration="40000" />
       <workItem from="1552241394045" duration="178000" />
       <workItem from="1552254283748" duration="9473000" />
-      <workItem from="1552277298937" duration="11151000" />
-      <workItem from="1552353291496" duration="1918000" />
-      <workItem from="1552359156805" duration="98000" />
-      <workItem from="1552533765176" duration="1016000" />
-      <workItem from="1552622234355" duration="130000" />
-      <workItem from="1553037480176" duration="499000" />
-      <workItem from="1553047073421" duration="2245000" />
-      <workItem from="1553050110780" duration="21000" />
-      <workItem from="1553051761247" duration="104000" />
-      <workItem from="1553051882218" duration="12177000" />
-      <workItem from="1553369996499" duration="3948000" />
-      <workItem from="1553376520648" duration="32000" />
-      <workItem from="1553383476219" duration="1349000" />
-      <workItem from="1553386923955" duration="4000" />
-      <workItem from="1553387088425" duration="330000" />
-      <workItem from="1553387443301" duration="11000" />
-      <workItem from="1553387530005" duration="22322000" />
-      <workItem from="1553444493182" duration="159000" />
-      <workItem from="1553444769737" duration="82000" />
-      <workItem from="1553444880371" duration="36052000" />
-      <workItem from="1553560570410" duration="3016000" />
-      <workItem from="1553832002953" duration="139000" />
+      <workItem from="1552277298937" duration="2427000" />
+      <workItem from="1552542283204" duration="152000" />
+      <workItem from="1553061169716" duration="603000" />
+      <workItem from="1553309944652" duration="63685000" />
+      <workItem from="1553661269531" duration="1969000" />
+      <workItem from="1553965313291" duration="2578000" />
+    </task>
+    <task id="LOCAL-00001" summary="This should fix the ShipWarfare file and bring it up to date with the rest of the file.">
+      <created>1550458470138</created>
+      <option name="number" value="00001" />
+      <option name="presentableId" value="LOCAL-00001" />
+      <option name="project" value="LOCAL" />
+      <updated>1550458470138</updated>
+    </task>
+    <task id="LOCAL-00002" summary="Created Core class">
+      <created>1550540282400</created>
+      <option name="number" value="00002" />
+      <option name="presentableId" value="LOCAL-00002" />
+      <option name="project" value="LOCAL" />
+      <updated>1550540282400</updated>
+    </task>
+    <task id="LOCAL-00003" summary="Created Player class">
+      <created>1550540820542</created>
+      <option name="number" value="00003" />
+      <option name="presentableId" value="LOCAL-00003" />
+      <option name="project" value="LOCAL" />
+      <updated>1550540820542</updated>
+    </task>
+    <task id="LOCAL-00004" summary="Created Player class">
+      <created>1550541406597</created>
+      <option name="number" value="00004" />
+      <option name="presentableId" value="LOCAL-00004" />
+      <option name="project" value="LOCAL" />
+      <updated>1550541406597</updated>
+    </task>
+    <task id="LOCAL-00005" summary="Fixed the setters to be greater than 0">
+      <created>1550541751914</created>
+      <option name="number" value="00005" />
+      <option name="presentableId" value="LOCAL-00005" />
+      <option name="project" value="LOCAL" />
+      <updated>1550541751914</updated>
+    </task>
+    <task id="LOCAL-00006" summary="Created Player class">
+      <created>1550543764970</created>
+      <option name="number" value="00006" />
+      <option name="presentableId" value="LOCAL-00006" />
+      <option name="project" value="LOCAL" />
+      <updated>1550543764971</updated>
+    </task>
+    <task id="LOCAL-00007" summary="Added some stuff for the Travel Class">
+      <created>1550575512841</created>
+      <option name="number" value="00007" />
+      <option name="presentableId" value="LOCAL-00007" />
+      <option name="project" value="LOCAL" />
+      <updated>1550575512841</updated>
+    </task>
+    <task id="LOCAL-00008" summary="Added disasters as well as removing a bug from the flee method in Haris's code">
+      <created>1550623749854</created>
+      <option name="number" value="00008" />
+      <option name="presentableId" value="LOCAL-00008" />
+      <option name="project" value="LOCAL" />
+      <updated>1550623749854</updated>
+    </task>
+    <task id="LOCAL-00009" summary="Fixed a bunch of stuff inside of Travel, but also discovered a MASSIVE problem with our code">
+      <created>1550628232136</created>
+      <option name="number" value="00009" />
+      <option name="presentableId" value="LOCAL-00009" />
+      <option name="project" value="LOCAL" />
+      <updated>1550628232136</updated>
+    </task>
+    <task id="LOCAL-00010" summary="Brought back Vikram's changes">
+      <created>1550879092914</created>
+      <option name="number" value="00010" />
+      <option name="presentableId" value="LOCAL-00010" />
+      <option name="project" value="LOCAL" />
+      <updated>1550879092914</updated>
+    </task>
+    <task id="LOCAL-00011" summary="Fixed the commenting on a lot of the code. Also added some stuff to Travel, fixed some bugs.">
+      <created>1551162699319</created>
+      <option name="number" value="00011" />
+      <option name="presentableId" value="LOCAL-00011" />
+      <option name="project" value="LOCAL" />
+      <updated>1551162699319</updated>
     </task>
     <task id="LOCAL-00012" summary="Added time stuff to Shipwarfare GUI">
       <created>1552168801248</created>
@@ -478,212 +551,137 @@
       <option name="project" value="LOCAL" />
       <updated>1552280311399</updated>
     </task>
-    <task id="LOCAL-00036" summary="Added to my javadocs a bit">
-      <created>1552280610787</created>
+    <task id="LOCAL-00036" summary="Finished cleaning up the code. Ready for Demo 2">
+      <created>1552291526354</created>
       <option name="number" value="00036" />
       <option name="presentableId" value="LOCAL-00036" />
       <option name="project" value="LOCAL" />
-      <updated>1552280610787</updated>
+      <updated>1552291526354</updated>
     </task>
-    <task id="LOCAL-00037" summary="Changed one line of text in shipwarfare GUI">
-      <created>1552282957716</created>
+    <task id="LOCAL-00037" summary="Renamed a few classes so that all of them are uppercase">
+      <created>1552291930927</created>
       <option name="number" value="00037" />
       <option name="presentableId" value="LOCAL-00037" />
       <option name="project" value="LOCAL" />
-      <updated>1552282957716</updated>
+      <updated>1552291930927</updated>
     </task>
-    <task id="LOCAL-00038" summary="Fixed output for start and TaipanShop GUI">
-      <created>1552328825548</created>
+    <task id="LOCAL-00038" summary="Made it so you can go inbetween screens by pressing enter, allowing for you to speed through the game without pressing buttons.">
+      <created>1553317292291</created>
       <option name="number" value="00038" />
       <option name="presentableId" value="LOCAL-00038" />
       <option name="project" value="LOCAL" />
-      <updated>1552328825548</updated>
+      <updated>1553317292291</updated>
     </task>
-    <task id="LOCAL-00039" summary="Added JavaDocs for ShipWarfare">
-      <created>1552339973224</created>
+    <task id="LOCAL-00039" summary="File saving is work in progress&#10;Added a css file for the game&#10;Made it so that you can press enter to continue forwars&#10;Made folder for both images and save files">
+      <created>1553333862860</created>
       <option name="number" value="00039" />
       <option name="presentableId" value="LOCAL-00039" />
       <option name="project" value="LOCAL" />
-      <updated>1552339973224</updated>
+      <updated>1553333862860</updated>
     </task>
-    <task id="LOCAL-00040" summary="wrote javadocs for authorname">
-      <created>1552351619924</created>
+    <task id="LOCAL-00040" summary="Finished game saves">
+      <created>1553386388417</created>
       <option name="number" value="00040" />
       <option name="presentableId" value="LOCAL-00040" />
       <option name="project" value="LOCAL" />
-      <updated>1552351619924</updated>
+      <updated>1553386388417</updated>
     </task>
-    <task id="LOCAL-00041" summary="Added fight Button gif. Might not work on your computers yet though... I inputed my own local documents folder as the library temporarily.">
-      <created>1553060094595</created>
+    <task id="LOCAL-00041" summary="Should completely get rid of error messages and print statements related to save state">
+      <created>1553386560208</created>
       <option name="number" value="00041" />
       <option name="presentableId" value="LOCAL-00041" />
       <option name="project" value="LOCAL" />
-      <updated>1553060094595</updated>
+      <updated>1553386560208</updated>
     </task>
-    <task id="LOCAL-00042" summary="Made the fight gif runnable by everyone hopefully">
-      <created>1553060976358</created>
+    <task id="LOCAL-00042" summary="Made animation testing same as everyother class, can run from other classes.">
+      <created>1553389478439</created>
       <option name="number" value="00042" />
       <option name="presentableId" value="LOCAL-00042" />
       <option name="project" value="LOCAL" />
-      <updated>1553060976358</updated>
+      <updated>1553389478440</updated>
     </task>
-    <task id="LOCAL-00043" summary="Made the fight gif runnable by everyone hopefully">
-      <created>1553061205759</created>
+    <task id="LOCAL-00043" summary="Made warehouse reappear">
+      <created>1553465550904</created>
       <option name="number" value="00043" />
       <option name="presentableId" value="LOCAL-00043" />
       <option name="project" value="LOCAL" />
-      <updated>1553061205759</updated>
+      <updated>1553465550904</updated>
     </task>
-    <task id="LOCAL-00044" summary="Ayy added all the gifs needed.">
-      <created>1553124112040</created>
+    <task id="LOCAL-00044" summary="Warehouse and Travel events are still work in progress but added their code to the github repo">
+      <created>1553476314578</created>
       <option name="number" value="00044" />
       <option name="presentableId" value="LOCAL-00044" />
       <option name="project" value="LOCAL" />
-      <updated>1553124112040</updated>
+      <updated>1553476314578</updated>
     </task>
-    <task id="LOCAL-00045" summary="Maybe this is whack idk">
-      <created>1553193939606</created>
+    <task id="LOCAL-00045" summary="Finished Warehouse">
+      <created>1553480113870</created>
       <option name="number" value="00045" />
       <option name="presentableId" value="LOCAL-00045" />
       <option name="project" value="LOCAL" />
-      <updated>1553193939606</updated>
+      <updated>1553480113870</updated>
     </task>
-    <task id="LOCAL-00046" summary="Litty Animation Practice">
-      <created>1553387960582</created>
+    <task id="LOCAL-00046" summary="Commented a bit of Random Event">
+      <created>1553486869684</created>
       <option name="number" value="00046" />
       <option name="presentableId" value="LOCAL-00046" />
       <option name="project" value="LOCAL" />
-      <updated>1553387960582</updated>
+      <updated>1553486869684</updated>
     </task>
-    <task id="LOCAL-00047" summary="Added gifs back">
-      <created>1553389067767</created>
+    <task id="LOCAL-00047" summary="Made it so that the user doesn't get pushed into travel if they press enter while buying something">
+      <created>1553487676090</created>
       <option name="number" value="00047" />
       <option name="presentableId" value="LOCAL-00047" />
       <option name="project" value="LOCAL" />
-      <updated>1553389067767</updated>
+      <updated>1553487676090</updated>
     </task>
-    <task id="LOCAL-00048" summary="Added method for animation">
-      <created>1553390319733</created>
+    <task id="LOCAL-00048" summary="Fixed some of the code related with Liu Yuen and fixed some of the javadocing">
+      <created>1553491865868</created>
       <option name="number" value="00048" />
       <option name="presentableId" value="LOCAL-00048" />
       <option name="project" value="LOCAL" />
-      <updated>1553390319734</updated>
+      <updated>1553491865869</updated>
     </task>
-    <task id="LOCAL-00049" summary="Litty Animation Practice littier">
-      <created>1553390384762</created>
+    <task id="LOCAL-00049" summary="Pushed the fix for ship repair while 100 hp">
+      <created>1553494120569</created>
       <option name="number" value="00049" />
       <option name="presentableId" value="LOCAL-00049" />
       <option name="project" value="LOCAL" />
-      <updated>1553390384762</updated>
+      <updated>1553494120570</updated>
     </task>
-    <task id="LOCAL-00050" summary="Sep up the scene which will be used for animation">
-      <created>1553400771267</created>
-      <option name="number" value="00050" />
-      <option name="presentableId" value="LOCAL-00050" />
-      <option name="project" value="LOCAL" />
-      <updated>1553400771272</updated>
-    </task>
-    <task id="LOCAL-00051" summary="Made fight button basically functional for AnimationTesting">
-      <created>1553476072174</created>
-      <option name="number" value="00051" />
-      <option name="presentableId" value="LOCAL-00051" />
-      <option name="project" value="LOCAL" />
-      <updated>1553476072175</updated>
-    </task>
-    <task id="LOCAL-00052" summary="changed some stuff related to the fight button animation">
-      <created>1553478643204</created>
-      <option name="number" value="00052" />
-      <option name="presentableId" value="LOCAL-00052" />
-      <option name="project" value="LOCAL" />
-      <updated>1553478643204</updated>
-    </task>
-    <task id="LOCAL-00053" summary="Small error in animation whcih shoots even if no guns must fix that">
-      <created>1553482933744</created>
-      <option name="number" value="00053" />
-      <option name="presentableId" value="LOCAL-00053" />
-      <option name="project" value="LOCAL" />
-      <updated>1553482933744</updated>
-    </task>
-    <task id="LOCAL-00054" summary="Fixed the issue where the ship shot with no guns">
-      <created>1553484357669</created>
-      <option name="number" value="00054" />
-      <option name="presentableId" value="LOCAL-00054" />
-      <option name="project" value="LOCAL" />
-      <updated>1553484357670</updated>
-    </task>
-    <task id="LOCAL-00055" summary="ShipWarfare javaDocs completed">
-      <created>1553485725159</created>
-      <option name="number" value="00055" />
-      <option name="presentableId" value="LOCAL-00055" />
-      <option name="project" value="LOCAL" />
-      <updated>1553485725159</updated>
-    </task>
-    <task id="LOCAL-00056" summary="Completed ShipWarfareGUI">
-      <created>1553486334208</created>
-      <option name="number" value="00056" />
-      <option name="presentableId" value="LOCAL-00056" />
-      <option name="project" value="LOCAL" />
-      <updated>1553486334209</updated>
-    </task>
-    <task id="LOCAL-00057" summary="Fixed silk issue">
-      <created>1553533396273</created>
-      <option name="number" value="00057" />
-      <option name="presentableId" value="LOCAL-00057" />
-      <option name="project" value="LOCAL" />
-      <updated>1553533396273</updated>
-    </task>
-    <task id="LOCAL-00058" summary="Completed ShipWarfareGUI">
-      <created>1553533600087</created>
-      <option name="number" value="00058" />
-      <option name="presentableId" value="LOCAL-00058" />
-      <option name="project" value="LOCAL" />
-      <updated>1553533600087</updated>
-    </task>
-    <task id="LOCAL-00059" summary="Ship Warfare &quot;dang it&quot; issue fixed">
-      <created>1553542511809</created>
-      <option name="number" value="00059" />
-      <option name="presentableId" value="LOCAL-00059" />
-      <option name="project" value="LOCAL" />
-      <updated>1553542511809</updated>
-    </task>
-    <task id="LOCAL-00060" summary="Fixed an issue with ShipWarfareGUI with the ships running away label">
-      <created>1553560337526</created>
-      <option name="number" value="00060" />
-      <option name="presentableId" value="LOCAL-00060" />
-      <option name="project" value="LOCAL" />
-      <updated>1553560337526</updated>
-    </task>
-    <option name="localTasksCounter" value="61" />
+    <option name="localTasksCounter" value="50" />
     <servers />
   </component>
   <component name="TimeTrackingManager">
-    <option name="totallyTimeSpent" value="169876000" />
+    <option name="totallyTimeSpent" value="147501000" />
   </component>
   <component name="ToolWindowManager">
-    <frame x="0" y="23" width="1189" height="652" extended-state="0" />
+    <frame x="-8" y="-8" width="1696" height="1026" extended-state="6" />
     <editor active="true" />
     <layout>
-      <window_info content_ui="combo" id="Project" order="0" visible="true" weight="0.22755013" />
+      <window_info active="true" content_ui="combo" id="Project" order="0" visible="true" weight="0.12286063" />
       <window_info id="Structure" order="1" side_tool="true" weight="0.25" />
       <window_info id="Image Layers" order="2" />
       <window_info id="Designer" order="3" />
       <window_info id="UI Designer" order="4" />
       <window_info id="Capture Tool" order="5" />
       <window_info id="Favorites" order="6" side_tool="true" />
-      <window_info anchor="bottom" id="Message" order="0" />
-      <window_info anchor="bottom" id="Find" order="1" weight="0.32922733" />
-      <window_info anchor="bottom" id="Run" order="2" weight="0.22678572" />
-      <window_info anchor="bottom" id="Debug" order="3" weight="0.4" />
-      <window_info anchor="bottom" id="Cvs" order="4" weight="0.25" />
-      <window_info anchor="bottom" id="Inspection" order="5" weight="0.4" />
-      <window_info anchor="bottom" id="TODO" order="6" />
-      <window_info anchor="bottom" id="Docker" order="7" show_stripe_button="false" />
-      <window_info anchor="bottom" id="Version Control" order="8" sideWeight="0.49938875" weight="0.32922733" />
-      <window_info anchor="bottom" id="Database Changes" order="9" />
-      <window_info anchor="bottom" id="Terminal" order="10" weight="0.32922733" />
-      <window_info anchor="bottom" id="Event Log" order="11" sideWeight="0.50061125" side_tool="true" weight="0.32922733" />
-      <window_info anchor="bottom" id="Messages" order="12" sideWeight="0.49938875" weight="0.32857144" />
-      <window_info anchor="bottom" id="Duplicate detector" order="13" weight="0.32857144" />
+      <window_info anchor="bottom" id="Inspection Results" order="0" weight="0.32922733" />
+      <window_info anchor="bottom" id="Duplicates" order="1" weight="0.50391936" />
+      <window_info anchor="bottom" id="Message" order="2" />
+      <window_info anchor="bottom" id="Find" order="3" weight="0.32922733" />
+      <window_info anchor="bottom" id="Run" order="4" sideWeight="0.49874055" weight="0.36954087" />
+      <window_info anchor="bottom" id="Debug" order="5" weight="0.39977604" />
+      <window_info anchor="bottom" id="Cvs" order="6" weight="0.25" />
+      <window_info anchor="bottom" id="Inspection" order="7" weight="0.4" />
+      <window_info anchor="bottom" id="TODO" order="8" />
+      <window_info anchor="bottom" id="Docker" order="9" show_stripe_button="false" />
+      <window_info anchor="bottom" id="Version Control" order="10" sideWeight="0.49938875" weight="0.32922733" />
+      <window_info anchor="bottom" id="Database Changes" order="11" />
+      <window_info anchor="bottom" id="Terminal" order="12" weight="0.32922733" />
+      <window_info anchor="bottom" id="Event Log" order="13" sideWeight="0.50125945" side_tool="true" weight="0.37058824" />
+      <window_info anchor="bottom" id="Messages" order="14" sideWeight="0.49938875" weight="0.3281075" />
+      <window_info anchor="bottom" id="Duplicate detector" order="15" weight="0.32922733" />
       <window_info anchor="right" id="Commander" internal_type="SLIDING" order="0" type="SLIDING" weight="0.4" />
       <window_info anchor="right" id="Ant Build" order="1" weight="0.25" />
       <window_info anchor="right" content_ui="combo" id="Hierarchy" order="2" weight="0.25" />
@@ -695,27 +693,29 @@
       <window_info anchor="right" id="Palette&#9;" order="8" />
     </layout>
     <layout-to-restore>
-      <window_info active="true" content_ui="combo" id="Project" order="0" visible="true" weight="0.21026894" />
+      <window_info active="true" content_ui="combo" id="Project" order="0" visible="true" weight="0.118581906" />
       <window_info id="Structure" order="1" side_tool="true" weight="0.25" />
       <window_info id="Image Layers" order="2" />
       <window_info id="Designer" order="3" />
       <window_info id="UI Designer" order="4" />
       <window_info id="Capture Tool" order="5" />
       <window_info id="Favorites" order="6" side_tool="true" />
-      <window_info anchor="bottom" id="Message" order="0" />
-      <window_info anchor="bottom" id="Find" order="1" weight="0.32922733" />
-      <window_info anchor="bottom" id="Run" order="2" weight="0.3975364" />
-      <window_info anchor="bottom" id="Debug" order="3" weight="0.4" />
-      <window_info anchor="bottom" id="Cvs" order="4" weight="0.25" />
-      <window_info anchor="bottom" id="Inspection" order="5" weight="0.4" />
-      <window_info anchor="bottom" id="TODO" order="6" />
-      <window_info anchor="bottom" id="Docker" order="7" show_stripe_button="false" />
-      <window_info anchor="bottom" id="Version Control" order="8" sideWeight="0.49938875" weight="0.32922733" />
-      <window_info anchor="bottom" id="Database Changes" order="9" />
-      <window_info anchor="bottom" id="Terminal" order="10" weight="0.32922733" />
-      <window_info anchor="bottom" id="Event Log" order="11" sideWeight="0.50061125" side_tool="true" weight="0.32922733" />
-      <window_info anchor="bottom" id="Messages" order="12" sideWeight="0.49938875" weight="0.32922733" />
-      <window_info anchor="bottom" id="Duplicate detector" order="13" weight="0.32922733" />
+      <window_info anchor="bottom" id="Inspection Results" order="0" weight="0.32922733" />
+      <window_info anchor="bottom" id="Duplicates" order="1" weight="0.50391936" />
+      <window_info anchor="bottom" id="Message" order="2" />
+      <window_info anchor="bottom" id="Find" order="3" weight="0.32922733" />
+      <window_info anchor="bottom" id="Run" order="4" sideWeight="0.49874055" weight="0.36954087" />
+      <window_info anchor="bottom" id="Debug" order="5" weight="0.39977604" />
+      <window_info anchor="bottom" id="Cvs" order="6" weight="0.25" />
+      <window_info anchor="bottom" id="Inspection" order="7" weight="0.4" />
+      <window_info anchor="bottom" id="TODO" order="8" />
+      <window_info anchor="bottom" id="Docker" order="9" show_stripe_button="false" />
+      <window_info anchor="bottom" id="Version Control" order="10" sideWeight="0.49938875" weight="0.32922733" />
+      <window_info anchor="bottom" id="Database Changes" order="11" />
+      <window_info anchor="bottom" id="Terminal" order="12" weight="0.32922733" />
+      <window_info anchor="bottom" id="Event Log" order="13" sideWeight="0.50125945" side_tool="true" weight="0.37058824" />
+      <window_info anchor="bottom" id="Messages" order="14" sideWeight="0.49938875" weight="0.3281075" />
+      <window_info anchor="bottom" id="Duplicate detector" order="15" weight="0.32922733" />
       <window_info anchor="right" id="Commander" internal_type="SLIDING" order="0" type="SLIDING" weight="0.4" />
       <window_info anchor="right" id="Ant Build" order="1" weight="0.25" />
       <window_info anchor="right" content_ui="combo" id="Hierarchy" order="2" weight="0.25" />
@@ -760,201 +760,201 @@
     <ignored-roots>
       <path value="$PROJECT_DIR$" />
     </ignored-roots>
-    <MESSAGE value="Completed javadocs for shipwarfare GUI" />
-    <MESSAGE value="Added to my javadocs a bit" />
-    <MESSAGE value="Changed one line of text in shipwarfare GUI" />
-    <MESSAGE value="Fixed output for start and TaipanShop GUI" />
-    <MESSAGE value="Added JavaDocs for ShipWarfare" />
-    <MESSAGE value="wrote javadocs for authorname" />
-    <MESSAGE value="Added fight Button gif. Might not work on your computers yet though... I inputed my own local documents folder as the library temporarily." />
-    <MESSAGE value="Made the fight gif runnable by everyone hopefully" />
-    <MESSAGE value="Ayy added all the gifs needed." />
-    <MESSAGE value="Maybe this is whack idk" />
-    <MESSAGE value="Litty Animation Practice" />
-    <MESSAGE value="Added gifs back" />
-    <MESSAGE value="Added method for animation" />
-    <MESSAGE value="Litty Animation Practice littier" />
-    <MESSAGE value="Sep up the scene which will be used for animation" />
-    <MESSAGE value="Made fight button basically functional for AnimationTesting" />
-    <MESSAGE value="changed some stuff related to the fight button animation" />
-    <MESSAGE value="Small error in animation whcih shoots even if no guns must fix that" />
-    <MESSAGE value="Fixed the issue where the ship shot with no guns" />
-    <MESSAGE value="ShipWarfare javaDocs completed" />
-    <MESSAGE value="Fixed silk issue" />
+    <MESSAGE value="Basic functionality of buttons completed, think all I have to do now is to find a way to break the code when the user wins, loses or runs away." />
+    <MESSAGE value="Fixed probability of ships running away" />
+    <MESSAGE value="Fined minor bugs in shipwarfareGUI" />
+    <MESSAGE value="Fined minor bugs in shipwarfareGUI including the &quot;gun frustration&quot; variable" />
+    <MESSAGE value="Just checking" />
+    <MESSAGE value="A lot of errors but easily fixable SHipwarfareGUI" />
+    <MESSAGE value="Completed SHipWarfareGUI" />
     <MESSAGE value="Completed ShipWarfareGUI" />
-    <MESSAGE value="Ship Warfare &quot;dang it&quot; issue fixed" />
-    <MESSAGE value="Fixed an issue with shipWarfare with the ships running away label" />
-    <MESSAGE value="Fixed an issue with ShipWarfareGUI with the ships running away label" />
-    <option name="LAST_COMMIT_MESSAGE" value="Fixed an issue with ShipWarfareGUI with the ships running away label" />
+    <MESSAGE value="Probably should upload" />
+    <MESSAGE value="Fixed ShipWarfare bug about one-shotting." />
+    <MESSAGE value="Completed javadocs for shipwarfare GUI" />
+    <MESSAGE value="Finished cleaning up the code. Ready for Demo 2" />
+    <MESSAGE value="Renamed a few classes so that all of them are uppercase" />
+    <MESSAGE value="Made it so you can go inbetween screens by pressing enter, allowing for you to speed through the game without pressing buttons." />
+    <MESSAGE value="File saving is work in progress&#10;Added a css file for the game&#10;Made it so that you can press enter to continue forwars&#10;Made folder for both images and save files" />
+    <MESSAGE value="Finished game saves" />
+    <MESSAGE value="Should completely get rid of error messages and print statements related to save state" />
+    <MESSAGE value="Made animation testing same as everyother class, can run from other classes." />
+    <MESSAGE value="Made warehouse reappear" />
+    <MESSAGE value="Warehouse and Travel events are still work in progress but added their code to the github repo" />
+    <MESSAGE value="Finished Warehouse" />
+    <MESSAGE value="Commented a bit of Random Event" />
+    <MESSAGE value="Made it so that the user doesn't get pushed into travel if they press enter while buying something" />
+    <MESSAGE value="Fixed some of the code related with Liu Yuen and fixed some of the javadocing" />
+    <MESSAGE value="Pushed the fix for ship repair while 100 hp" />
+    <option name="LAST_COMMIT_MESSAGE" value="Pushed the fix for ship repair while 100 hp" />
   </component>
   <component name="editorHistoryManager">
-    <entry file="uml://JAVA/ShipWarfare">
-      <provider selected="true" editor-type-id="UmlEditorProvider">
-        <state>
-          <ID>JAVA</ID>
-          <OriginalElement>ShipWarfare</OriginalElement>
-          <nodes>
-            <node x="" y="">ShipWarfare</node>
-            <node x="" y="">Player</node>
-          </nodes>
-          <notes />
-          <edges />
-          <settings layout="Hierarchic Group" zoom="1.0" x="213.0" y="195.0" />
-          <SelectedNodes />
-          <Categories />
-          <SCOPE>Project Files</SCOPE>
-          <VISIBILITY>private</VISIBILITY>
-        </state>
-      </provider>
-    </entry>
-    <entry file="uml://JAVA/TaipanShop">
-      <provider selected="true" editor-type-id="UmlEditorProvider">
-        <state>
-          <ID>JAVA</ID>
-          <OriginalElement>TaipanShop</OriginalElement>
-          <nodes>
-            <node x="" y="">TaipanShop</node>
-            <node x="" y="">Player</node>
-          </nodes>
-          <notes />
-          <edges />
-          <settings layout="Hierarchic Group" zoom="1.0" x="56.0" y="54.0" />
-          <SelectedNodes />
-          <Categories />
-          <SCOPE>All</SCOPE>
-          <VISIBILITY>private</VISIBILITY>
-        </state>
-      </provider>
-    </entry>
+    <entry file="uml://JAVA/ShipWarfare" />
+    <entry file="uml://JAVA/TaipanShop" />
     <entry file="file://$PROJECT_DIR$/src/Game.java" />
     <entry file="file://$PROJECT_DIR$/src/Warehouse.java" />
     <entry file="file://$PROJECT_DIR$/src/Bank.java" />
     <entry file="file://$PROJECT_DIR$/src/TaipanShop.java" />
     <entry file="file://$PROJECT_DIR$/src/Travel.java" />
-    <entry file="jar:///Library/Java/JavaVirtualMachines/jdk1.8.0_201.jdk/Contents/Home/javafx-src.zip!/com/sun/glass/ui/InvokeLaterDispatcher.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="140">
-          <caret line="110" column="19" selection-start-line="110" selection-start-column="19" selection-end-line="110" selection-end-column="19" />
-        </state>
-      </provider>
-    </entry>
+    <entry file="jar:///Library/Java/JavaVirtualMachines/jdk1.8.0_201.jdk/Contents/Home/javafx-src.zip!/com/sun/glass/ui/InvokeLaterDispatcher.java" />
     <entry file="file://$PROJECT_DIR$/src/ShopGUI" />
     <entry file="file://$PROJECT_DIR$/src/Start.java" />
     <entry file="file://$PROJECT_DIR$/src/main.java" />
     <entry file="file://$PROJECT_DIR$/src/ShipWarfare.java" />
-    <entry file="file://$PROJECT_DIR$/src/WarehouseGUI.java">
+    <entry file="uml://JAVA/TaipanShopGUI" />
+    <entry file="uml://JAVA/bankGUI" />
+    <entry file="file://$PROJECT_DIR$/src/stylesheet.css" />
+    <entry file="jar://C:/Program Files/Java/jdk1.8.0_141/jre/lib/ext/jfxrt.jar!/com/sun/javafx/scene/control/skin/modena/blackOnWhite.css">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="-1968">
-          <caret line="14" column="13" selection-start-line="14" selection-start-column="13" selection-end-line="14" selection-end-column="13" />
+        <state relative-caret-position="272">
+          <caret line="41" column="41" selection-start-line="41" selection-start-column="41" selection-end-line="41" selection-end-column="41" />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/StartGUI.java">
+    <entry file="jar://C:/Program Files/Java/jdk1.8.0_141/jre/lib/ext/jfxrt.jar!/com/sun/javafx/scene/control/skin/modena/modena.css">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="30">
-          <caret line="10" selection-start-line="10" selection-end-line="15" selection-end-column="2" />
+        <state relative-caret-position="272">
+          <caret line="127" column="24" lean-forward="true" selection-start-line="127" selection-end-line="128" />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/LoanSharkGUI.java">
+    <entry file="file://$PROJECT_DIR$/src/styleguide.css">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="30">
-          <caret line="12" column="13" selection-start-line="12" selection-start-column="13" selection-end-line="12" selection-end-column="13" />
+        <state relative-caret-position="34">
+          <caret line="2" column="36" selection-start-line="2" selection-start-column="36" selection-end-line="2" selection-end-column="36" />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/BankGUI.java">
+    <entry file="file://$PROJECT_DIR$/src/saves/playerSave.txt">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="240">
-          <caret line="26" column="51" lean-forward="true" selection-start-line="26" selection-start-column="51" selection-end-line="26" selection-end-column="51" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/Ships Approaching.gif" />
-    <entry file="file://$PROJECT_DIR$/src/Player.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="300">
-          <caret line="20" column="25" lean-forward="true" selection-start-line="20" selection-start-column="25" selection-end-line="20" selection-end-column="25" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/ShipsRunning.gif" />
-    <entry file="file://$PROJECT_DIR$/src/images/ShipsRunning.gif">
-      <provider selected="true" editor-type-id="images" />
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/images/ShipsAttacking.gif">
-      <provider selected="true" editor-type-id="images" />
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/FinalShipWarfareGUI.java" />
-    <entry file="jar:///Library/Java/JavaVirtualMachines/jdk1.8.0_201.jdk/Contents/Home/javafx-src.zip!/javafx/application/Application.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="842">
-          <caret line="145" column="7" lean-forward="true" selection-start-line="145" selection-start-column="7" selection-end-line="145" selection-end-column="7" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="jar:///Library/Java/JavaVirtualMachines/jdk1.8.0_201.jdk/Contents/Home/javafx-src.zip!/javafx/event/EventHandler.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="298">
-          <caret line="44" column="9" selection-start-line="44" selection-start-column="9" selection-end-line="44" selection-end-column="9" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/PlayerTest.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="41">
-          <caret line="18" column="71" selection-start-line="18" selection-start-column="71" selection-end-line="18" selection-end-column="71" />
-          <folding>
-            <element signature="imports" expanded="true" />
-          </folding>
+        <state relative-caret-position="17">
+          <caret line="1" column="101" selection-start-line="1" selection-start-column="101" selection-end-line="1" selection-end-column="101" />
         </state>
       </provider>
     </entry>
     <entry file="file://$PROJECT_DIR$/src/GameEndGUI.java">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="750">
-          <caret line="56" column="24" selection-start-line="56" selection-start-column="24" selection-end-line="56" selection-end-column="24" />
+        <state relative-caret-position="437">
+          <caret line="101" selection-start-line="101" selection-end-line="101" />
+          <folding>
+            <element signature="imports" expanded="true" />
+          </folding>
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/AnimationTesting.java" />
+    <entry file="uml://MODULES/mdl-TaipanClone" />
+    <entry file="uml://JAVA/AnimationTesting" />
+    <entry file="file://$PROJECT_DIR$/src/TaipanShopGUI.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="239">
+          <caret line="641" column="33" lean-forward="true" selection-start-line="641" selection-start-column="33" selection-end-line="641" selection-end-column="33" />
+          <folding>
+            <element signature="imports" expanded="true" />
+          </folding>
+        </state>
+      </provider>
+    </entry>
+    <entry file="uml://JAVA/" />
+    <entry file="uml://JAVA/TravelGUI" />
+    <entry file="file://$PROJECT_DIR$/src/ShipWarfareGUI.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="6443">
+          <caret line="396" column="18" selection-start-line="396" selection-start-column="18" selection-end-line="396" selection-end-column="18" />
+          <folding>
+            <element signature="imports" expanded="true" />
+          </folding>
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/BankGUI.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="1700">
+          <caret line="111" column="79" selection-start-line="111" selection-start-column="79" selection-end-line="111" selection-end-column="79" />
+          <folding>
+            <element signature="imports" expanded="true" />
+          </folding>
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/StartGUI.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="3094">
+          <caret line="191" selection-start-line="191" selection-end-line="198" selection-end-column="17" />
+          <folding>
+            <element signature="imports" expanded="true" />
+          </folding>
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/LoanSharkGUI.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="255">
+          <caret line="26" selection-start-line="26" selection-end-line="29" selection-end-column="5" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/Player.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="1921">
+          <caret line="121" column="43" selection-start-line="121" selection-start-column="43" selection-end-line="121" selection-end-column="43" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/WarehouseGUI.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="119">
+          <caret line="14" selection-start-line="14" selection-end-line="14" />
+          <folding>
+            <element signature="imports" expanded="true" />
+          </folding>
         </state>
       </provider>
     </entry>
     <entry file="file://$PROJECT_DIR$/src/TravelGUI.java">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="2550">
-          <caret line="188" column="11" selection-start-line="188" selection-start-column="11" selection-end-line="188" selection-end-column="11" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/TaipanShopGUI.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="291">
-          <caret line="277" column="43" selection-start-line="277" selection-start-column="43" selection-end-line="277" selection-end-column="43" />
+        <state relative-caret-position="3264">
+          <caret line="215" column="73" selection-start-line="215" selection-start-column="73" selection-end-line="215" selection-end-column="73" />
           <folding>
-            <element signature="n#!!doc" expanded="true" />
+            <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" />
+            <element signature="docComment;method#disaster#0;class#TravelGUI#0" />
+            <element signature="method#disaster#0;class#TravelGUI#0" />
+            <element signature="docComment;method#getStringLocation#0;class#TravelGUI#0" />
+            <element signature="method#getStringLocation#0;class#TravelGUI#0" />
+            <element signature="docComment;method#shipStatusString#0;class#TravelGUI#0" />
+            <element signature="method#shipStatusString#0;class#TravelGUI#0" />
+            <element signature="docComment;method#updateStage#0;class#TravelGUI#0" />
+            <element signature="method#updateStage#0;class#TravelGUI#0" />
           </folding>
         </state>
       </provider>
     </entry>
+    <entry file="file://$PROJECT_DIR$/src/RandomEventGUI.java" />
     <entry file="file://$PROJECT_DIR$/src/MainGUI.java">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="315">
-          <caret line="24" column="41" selection-start-line="24" selection-start-column="41" selection-end-line="24" selection-end-column="41" />
-          <folding>
-            <element signature="e#551#552#0" expanded="true" />
-            <element signature="e#579#580#0" expanded="true" />
-          </folding>
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/ShipWarfareGUI.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="322">
-          <caret line="589" column="27" selection-start-line="589" selection-start-column="27" selection-end-line="589" selection-end-column="27" />
+        <state relative-caret-position="221">
+          <caret line="13" column="14" selection-start-line="13" selection-start-column="14" selection-end-line="13" selection-end-column="14" />
           <folding>
             <element signature="imports" expanded="true" />
           </folding>
         </state>
       </provider>
     </entry>
+    <entry file="file://$PROJECT_DIR$/src/HighScore.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/FileSaving.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="646">
+          <caret line="38" column="24" lean-forward="true" selection-start-line="38" selection-start-column="24" selection-end-line="38" selection-end-column="24" />
+        </state>
+      </provider>
+    </entry>
   </component>
   <component name="masterDetails">
     <states>
diff --git a/src/FileSaving.java b/src/FileSaving.java
index 60055f8..9956f63 100644
--- a/src/FileSaving.java
+++ b/src/FileSaving.java
@@ -1,7 +1,7 @@
 import java.io.*;
 /**
  * 2019-03-10 (Edited on 2019-03-19)
- * Authors:
+ * Authors: 
  * FileSaving Class allows the user to save the current status of the game and to continue from where they left off.
  */
 
@@ -37,6 +37,10 @@ public class FileSaving extends Player implements Serializable {
         }
     }
 
+    /**
+     * Saves the file of type player which contains all the player instances
+     * @param player The player object being saved
+     */
     public boolean saveFile(Player player){
         try{
             FileOutputStream out = new FileOutputStream(new File("src/saves/playerSave.txt"));
@@ -64,6 +68,4 @@ public class FileSaving extends Player implements Serializable {
             }
         }
     }
-
-
 }
diff --git a/src/saves/playerSave.txt b/src/saves/playerSave.txt
index 2d1ed894e98b2b1cfb4d760ebba9ae25b6de1b7b..26ef5358d74f6179a221844d8d8ece4569c294e5 100644
GIT binary patch
delta 73
zcmey*^q*;iJ|p9u$p(xf*1`-746H!R1f@>^X$A(y875$wfq{($%79ZP3~V8ZnFWb?
E0Gi$jXaE2J

delta 73
zcmey*^q*;iJ|p9n$p(xf)|?Cs46Hy50*nv}MC!Xh*&N#tf)G{-16xR9W<g>e0C7JE
A!T<mO


From 7f1e8a4be8c26efe8ca52ce1dc70d2b7edd42869 Mon Sep 17 00:00:00 2001
From: Solargale <harkamalsr@gmail.com>
Date: Sat, 6 Apr 2019 15:20:37 -0600
Subject: [PATCH 2/3] Made

---
 .idea/encodings.xml                   |   2 +-
 .idea/libraries/hamcrest_core_1_3.xml |  11 +
 .idea/workspace.xml                   | 476 +++++++++++---------------
 src/BankText.java                     |   9 +
 src/ShipWarfareGUI.java               | 318 +----------------
 src/TaipanShopGUI.java                | 242 +++++++------
 src/TravelGUI.java                    | 200 +----------
 src/TravelText.java                   |   9 +
 src/WarehouseText.java                |   9 +
 src/loanSharkText.java                |   9 +
 src/saves/playerSave.txt              | Bin 383 -> 383 bytes
 11 files changed, 384 insertions(+), 901 deletions(-)
 create mode 100644 .idea/libraries/hamcrest_core_1_3.xml
 create mode 100644 src/BankText.java
 create mode 100644 src/TravelText.java
 create mode 100644 src/WarehouseText.java
 create mode 100644 src/loanSharkText.java

diff --git a/.idea/encodings.xml b/.idea/encodings.xml
index aa446f1..6f02b7a 100644
--- a/.idea/encodings.xml
+++ b/.idea/encodings.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <project version="4">
-  <component name="Encoding">
+  <component name="Encoding" addBOMForNewFiles="with NO BOM">
     <file url="file://$PROJECT_DIR$/src/saves/playerSave.txt" charset="windows-1252" />
     <file url="PROJECT" charset="UTF-8" />
   </component>
diff --git a/.idea/libraries/hamcrest_core_1_3.xml b/.idea/libraries/hamcrest_core_1_3.xml
new file mode 100644
index 0000000..1b92cf2
--- /dev/null
+++ b/.idea/libraries/hamcrest_core_1_3.xml
@@ -0,0 +1,11 @@
+<component name="libraryTable">
+  <library name="hamcrest-core-1.3">
+    <CLASSES>
+      <root url="jar://$PROJECT_DIR$/src/hamcrest-core-1.3.jar!/" />
+      <root url="jar://$PROJECT_DIR$/src/jfxrt.jar!/" />
+      <root url="jar://$PROJECT_DIR$/src/junit-4.12.jar!/" />
+    </CLASSES>
+    <JAVADOC />
+    <SOURCES />
+  </library>
+</component>
\ No newline at end of file
diff --git a/.idea/workspace.xml b/.idea/workspace.xml
index 5732e5c..8f5d24f 100644
--- a/.idea/workspace.xml
+++ b/.idea/workspace.xml
@@ -1,48 +1,98 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <project version="4">
-  <component name="BookmarkManager">
-    <bookmark url="file://$PROJECT_DIR$/src/LoanSharkGUI.java" line="66" />
-  </component>
   <component name="ChangeListManager">
     <list default="true" id="3114a2b9-4919-4fdf-8fd9-d03b60109ce4" name="Default Changelist" comment="Made">
-      <change afterPath="$PROJECT_DIR$/.idea/cssdialects.xml" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/.idea/libraries/hamcrest_core_1_3.xml" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/src/BankText.java" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/src/TravelText.java" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/src/WarehouseText.java" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/src/loanSharkText.java" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/.idea/encodings.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/encodings.xml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/.idea/misc.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/misc.xml" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/FileSaving.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/FileSaving.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/ShipWarfareGUI.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/ShipWarfareGUI.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/TaipanShopGUI.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/TaipanShopGUI.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/TravelGUI.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/TravelGUI.java" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/src/saves/playerSave.txt" beforeDir="false" afterPath="$PROJECT_DIR$/src/saves/playerSave.txt" afterDir="false" />
     </list>
-    <ignored path="$PROJECT_DIR$/out/" />
-    <ignored path="C:\Users\Harkamal Randhawa\IdeaProjects\TaipanClone\.idea\shelf/" />
-    <ignored path="$PROJECT_DIR$/.idea/shelf/" />
-    <option name="EXCLUDED_CONVERTED_TO_IGNORED" value="true" />
     <option name="SHOW_DIALOG" value="false" />
     <option name="HIGHLIGHT_CONFLICTS" value="true" />
     <option name="HIGHLIGHT_NON_ACTIVE_CHANGELIST" value="false" />
     <option name="LAST_RESOLUTION" value="IGNORE" />
   </component>
-  <component name="DefaultGradleProjectSettings">
-    <option name="isMigrated" value="true" />
-  </component>
   <component name="FileEditorManager">
     <leaf SIDE_TABS_SIZE_LIMIT_KEY="300">
       <file pinned="false" current-in-tab="false">
-        <entry file="file://$PROJECT_DIR$/src/MainGUI.java">
+        <entry file="file://$PROJECT_DIR$/src/TravelGUI.java">
           <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="221">
-              <caret line="13" column="14" selection-start-line="13" selection-start-column="14" selection-end-line="13" selection-end-column="14" />
+            <state relative-caret-position="442">
+              <caret line="176" column="31" lean-forward="true" selection-start-line="176" selection-start-column="31" selection-end-line="176" selection-end-column="31" />
               <folding>
+                <element signature="n#!!doc" expanded="true" />
                 <element signature="imports" expanded="true" />
+                <element signature="docComment;method#seaAtlas#0;class#TravelGUI#0" />
+                <element signature="method#seaAtlas#0;class#TravelGUI#0" />
+                <element signature="docComment;method#randomEventSea#0;class#TravelGUI#0" />
+                <element signature="method#randomEventSea#0;class#TravelGUI#0" />
+                <element signature="docComment;method#disaster#0;class#TravelGUI#0" />
+                <element signature="method#disaster#0;class#TravelGUI#0" />
+                <element signature="docComment;method#getStringLocation#0;class#TravelGUI#0" />
+                <element signature="method#getStringLocation#0;class#TravelGUI#0" />
+                <element signature="docComment;method#shipStatusString#0;class#TravelGUI#0" />
+                <element signature="method#shipStatusString#0;class#TravelGUI#0" />
               </folding>
             </state>
           </provider>
         </entry>
       </file>
       <file pinned="false" current-in-tab="true">
-        <entry file="file://$PROJECT_DIR$/src/FileSaving.java">
+        <entry file="file://$PROJECT_DIR$/src/TaipanShopGUI.java">
           <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="646">
-              <caret line="38" column="24" lean-forward="true" selection-start-line="38" selection-start-column="24" selection-end-line="38" selection-end-column="24" />
+            <state relative-caret-position="185">
+              <caret line="465" column="38" lean-forward="true" selection-start-line="465" selection-start-column="38" selection-end-line="465" selection-end-column="38" />
+              <folding>
+                <element signature="docComment;method#TaipanShopGUI#0;class#TaipanShopGUI#0" />
+                <element signature="method#TaipanShopGUI#0;class#TaipanShopGUI#0" />
+                <element signature="docComment;method#retire#0;class#TaipanShopGUI#0" />
+                <element signature="method#retire#0;class#TaipanShopGUI#0" />
+                <element signature="docComment;method#defaultTextOut#0;class#TaipanShopGUI#0" />
+                <element signature="method#defaultTextOut#0;class#TaipanShopGUI#0" />
+                <element signature="docComment;method#buttonSetup#0;class#TaipanShopGUI#0" />
+                <element signature="method#buttonSetup#0;class#TaipanShopGUI#0" />
+                <element signature="method#shop#0;class#TaipanShopGUI#0" />
+                <element signature="docComment;method#initializeShop#0;class#TaipanShopGUI#0" />
+                <element signature="class#16068:16656" />
+                <element signature="class#16894:17482" />
+                <element signature="class#17646:18088" />
+                <element signature="class#18418:18904" />
+                <element signature="class#19069:19536" />
+                <element signature="method#handle#0;class#19069:19536" />
+                <element signature="class#19773:20283" />
+                <element signature="class#20487:20841" />
+                <element signature="class#21134:22015" />
+                <element signature="class#22253:23127" />
+                <element signature="class#23289:24163" />
+                <element signature="method#handle#0;class#23289:24163" />
+                <element signature="class#24498:25411" />
+                <element signature="method#handle#0;class#24498:25411" />
+                <element signature="class#25615:26933" />
+                <element signature="method#handle#0;class#25615:26933" />
+                <element signature="e#31225#31481#1" />
+                <element signature="method#updateStage#0;class#TaipanShopGUI#0" />
+              </folding>
+            </state>
+          </provider>
+        </entry>
+      </file>
+      <file pinned="false" current-in-tab="false">
+        <entry file="file://$PROJECT_DIR$/src/ShipWarfareGUI.java">
+          <provider selected="true" editor-type-id="text-editor">
+            <state relative-caret-position="1406">
+              <caret line="186" column="6" selection-start-line="186" selection-start-column="6" selection-end-line="186" selection-end-column="6" />
+              <folding>
+                <element signature="imports" expanded="true" />
+                <element signature="method#setVisibilitiesAndTransition#0;class#ShipWarfareGUI#0" />
+                <element signature="docComment;method#initializeShip#0;class#ShipWarfareGUI#0" />
+              </folding>
             </state>
           </provider>
         </entry>
@@ -59,89 +109,33 @@
   </component>
   <component name="FindInProjectRecents">
     <findStrings>
-      <find>runAwayOrLeft</find>
-      <find>gunsLeftOrTaken</find>
-      <find>continueToFight</find>
-      <find>sellingItemLab</find>
-      <find>You can'</find>
-      <find>cannotAfford</find>
-      <find>warehouse</find>
-      <find>cargoButton</find>
-      <find>cargobutton</find>
-      <find>peasantShip</find>
-      <find>BorderPane</find>
-      <find>houseLabel</find>
-      <find>setGuns</find>
-      <find>for a gun</find>
-      <find>cannon</find>
-      <find>quitButton</find>
-      <find>textField</find>
-      <find>numberInput</find>
-      <find>shop</find>
-      <find>default</find>
-      <find>defaultButton</find>
-      <find>printSt</find>
-      <find>txtField</find>
-      <find>vBox</find>
-      <find>Would you like to pay</find>
-      <find>shipWa</find>
-      <find>attackingShips</find>
-      <find>random</find>
-      <find>cargo</find>
-      <find>Noot</find>
+      <find>updat</find>
     </findStrings>
-    <replaceStrings>
-      <replace>HP</replace>
-      <replace>p1.get</replace>
-      <replace>p1.set</replace>
-      <replace>shipWarfare.getHowMuchRun()</replace>
-      <replace>shipWarfare.isUserAttacks()</replace>
-      <replace>shipWarfare.getNumOfPeasantShips()</replace>
-      <replace>deposit</replace>
-      <replace>textOut.setText(&quot;    &quot; +</replace>
-      <replace>borderPane</replace>
-    </replaceStrings>
   </component>
   <component name="Git.Settings">
-    <option name="UPDATE_TYPE" value="MERGE" />
+    <option name="UPDATE_TYPE" value="REBASE" />
     <option name="RECENT_GIT_ROOT_PATH" value="$PROJECT_DIR$" />
   </component>
   <component name="IdeDocumentHistory">
     <option name="CHANGED_PATHS">
       <list>
-        <option value="$PROJECT_DIR$/src/Core.java" />
-        <option value="$PROJECT_DIR$/src/Game.java" />
-        <option value="$PROJECT_DIR$/src/Start.java" />
-        <option value="$PROJECT_DIR$/src/TaipanShop.java" />
-        <option value="$PROJECT_DIR$/src/main.java" />
-        <option value="$PROJECT_DIR$/src/Travel.java" />
-        <option value="$PROJECT_DIR$/src/ShipWarfare.java" />
-        <option value="$PROJECT_DIR$/src/bankGUI.java" />
-        <option value="$PROJECT_DIR$/src/MainGUI.java" />
-        <option value="$PROJECT_DIR$/src/stylesheet.css" />
-        <option value="$PROJECT_DIR$/src/styleguide.css" />
-        <option value="$PROJECT_DIR$/src/BankGUI.java" />
-        <option value="$PROJECT_DIR$/src/GameEndGUI.java" />
-        <option value="$PROJECT_DIR$/src/LoanSharkGUI.java" />
-        <option value="$PROJECT_DIR$/src/Save.java" />
-        <option value="$PROJECT_DIR$/src/AnimationTesting.java" />
+        <option value="$PROJECT_DIR$/src/TravelText.java" />
+        <option value="$PROJECT_DIR$/src/WarehouseText.java" />
+        <option value="$PROJECT_DIR$/src/BankText.java" />
+        <option value="$PROJECT_DIR$/src/loanSharkText.java" />
+        <option value="$PROJECT_DIR$/src/text/BankText.java" />
+        <option value="$PROJECT_DIR$/src/TaipanShopText.java" />
         <option value="$PROJECT_DIR$/src/ShipWarfareGUI.java" />
-        <option value="$PROJECT_DIR$/src/StartGUI.java" />
-        <option value="$PROJECT_DIR$/src/WarehouseGUI.java" />
         <option value="$PROJECT_DIR$/src/TaipanShopGUI.java" />
         <option value="$PROJECT_DIR$/src/TravelGUI.java" />
-        <option value="$PROJECT_DIR$/src/Player.java" />
-        <option value="$PROJECT_DIR$/src/RandomEventGUI.java" />
-        <option value="$PROJECT_DIR$/src/FileSaving.java" />
-        <option value="$PROJECT_DIR$/src/HighScore.java" />
       </list>
     </option>
   </component>
   <component name="ProjectFrameBounds" extendedState="6">
-    <option name="x" value="-8" />
-    <option name="y" value="-8" />
-    <option name="width" value="1696" />
-    <option name="height" value="1026" />
+    <option name="x" value="106" />
+    <option name="y" value="-13" />
+    <option name="width" value="1111" />
+    <option name="height" value="533" />
   </component>
   <component name="ProjectLevelVcsManager" settingsEditedManually="true">
     <ConfirmationsSetting value="2" id="Add" />
@@ -151,6 +145,7 @@
       <foldersAlwaysOnTop value="true" />
     </navigator>
     <panes>
+      <pane id="Scope" />
       <pane id="PackagesPane" />
       <pane id="ProjectPane">
         <subPane>
@@ -168,28 +163,20 @@
           <select />
         </subPane>
       </pane>
-      <pane id="Scope" />
     </panes>
   </component>
   <component name="PropertiesComponent">
-    <property name="ChangesTree.GroupingKeys" value="" />
-    <property name="SHARE_PROJECT_CONFIGURATION_FILES" value="true" />
-    <property name="WebServerToolWindowFactoryState" value="false" />
-    <property name="aspect.path.notification.shown" value="true" />
-    <property name="com.android.tools.idea.instantapp.provision.ProvisionBeforeRunTaskProvider.myTimeStamp" value="1552292013744" />
+    <property name="com.android.tools.idea.instantapp.provision.ProvisionBeforeRunTaskProvider.myTimeStamp" value="1554585449403" />
     <property name="extract.method.default.visibility" value="private" />
-    <property name="last_opened_file_path" value="$USER_HOME$/Desktop/Demo 3" />
-    <property name="list.type.of.created.stylesheet" value="CSS" />
+    <property name="last_opened_file_path" value="$PROJECT_DIR$/src/junit-4.12.jar!/" />
     <property name="nodejs_package_manager_path" value="npm" />
-    <property name="project.structure.last.edited" value="Modules" />
-    <property name="project.structure.proportion" value="0.15" />
+    <property name="project.structure.last.edited" value="Problems" />
+    <property name="project.structure.proportion" value="0.0" />
     <property name="project.structure.side.proportion" value="0.2" />
-    <property name="run.code.analysis.last.selected.profile" value="pProject Default" />
-    <property name="settings.editor.selected.configurable" value="editing.templates" />
   </component>
   <component name="RecentsManager">
-    <key name="MoveFile.RECENT_KEYS">
-      <recent name="C:\Users\Harkamal Randhawa\IdeaProjects\TaipanClone\src" />
+    <key name="CreateClassDialog.RecentsKey">
+      <recent name="" />
     </key>
   </component>
   <component name="RunDashboard">
@@ -257,9 +244,8 @@
       </list>
     </recent_temporary>
   </component>
-  <component name="SvnConfiguration" cleanupOnStartRun="true">
-    <configuration>C:\Users\Harkamal Randhawa\AppData\Roaming\Subversion</configuration>
-    <supportedVersion>125</supportedVersion>
+  <component name="SvnConfiguration">
+    <configuration />
   </component>
   <component name="TaskManager">
     <task active="true" id="Default" summary="Default task">
@@ -305,6 +291,7 @@
       <workItem from="1553309944652" duration="63685000" />
       <workItem from="1553661269531" duration="1969000" />
       <workItem from="1553965313291" duration="2578000" />
+      <workItem from="1554580719911" duration="4636000" />
     </task>
     <task id="LOCAL-00001" summary="This should fix the ShipWarfare file and bring it up to date with the rest of the file.">
       <created>1550458470138</created>
@@ -649,17 +636,16 @@
       <option name="project" value="LOCAL" />
       <updated>1553494120570</updated>
     </task>
-    <option name="localTasksCounter" value="50" />
     <servers />
   </component>
   <component name="TimeTrackingManager">
-    <option name="totallyTimeSpent" value="147501000" />
+    <option name="totallyTimeSpent" value="4582000" />
   </component>
   <component name="ToolWindowManager">
     <frame x="-8" y="-8" width="1696" height="1026" extended-state="6" />
     <editor active="true" />
     <layout>
-      <window_info active="true" content_ui="combo" id="Project" order="0" visible="true" weight="0.12286063" />
+      <window_info content_ui="combo" id="Project" order="0" weight="0.12408313" />
       <window_info id="Structure" order="1" side_tool="true" weight="0.25" />
       <window_info id="Image Layers" order="2" />
       <window_info id="Designer" order="3" />
@@ -670,7 +656,7 @@
       <window_info anchor="bottom" id="Duplicates" order="1" weight="0.50391936" />
       <window_info anchor="bottom" id="Message" order="2" />
       <window_info anchor="bottom" id="Find" order="3" weight="0.32922733" />
-      <window_info anchor="bottom" id="Run" order="4" sideWeight="0.49874055" weight="0.36954087" />
+      <window_info anchor="bottom" id="Run" order="4" sideWeight="0.49874055" weight="0.19484882" />
       <window_info anchor="bottom" id="Debug" order="5" weight="0.39977604" />
       <window_info anchor="bottom" id="Cvs" order="6" weight="0.25" />
       <window_info anchor="bottom" id="Inspection" order="7" weight="0.4" />
@@ -680,7 +666,7 @@
       <window_info anchor="bottom" id="Database Changes" order="11" />
       <window_info anchor="bottom" id="Terminal" order="12" weight="0.32922733" />
       <window_info anchor="bottom" id="Event Log" order="13" sideWeight="0.50125945" side_tool="true" weight="0.37058824" />
-      <window_info anchor="bottom" id="Messages" order="14" sideWeight="0.49938875" weight="0.3281075" />
+      <window_info anchor="bottom" id="Messages" order="14" sideWeight="0.49938875" weight="0.18141097" />
       <window_info anchor="bottom" id="Duplicate detector" order="15" weight="0.32922733" />
       <window_info anchor="right" id="Commander" internal_type="SLIDING" order="0" type="SLIDING" weight="0.4" />
       <window_info anchor="right" id="Ant Build" order="1" weight="0.25" />
@@ -693,7 +679,7 @@
       <window_info anchor="right" id="Palette&#9;" order="8" />
     </layout>
     <layout-to-restore>
-      <window_info active="true" content_ui="combo" id="Project" order="0" visible="true" weight="0.118581906" />
+      <window_info active="true" content_ui="combo" id="Project" order="0" visible="true" weight="0.12408313" />
       <window_info id="Structure" order="1" side_tool="true" weight="0.25" />
       <window_info id="Image Layers" order="2" />
       <window_info id="Designer" order="3" />
@@ -704,7 +690,7 @@
       <window_info anchor="bottom" id="Duplicates" order="1" weight="0.50391936" />
       <window_info anchor="bottom" id="Message" order="2" />
       <window_info anchor="bottom" id="Find" order="3" weight="0.32922733" />
-      <window_info anchor="bottom" id="Run" order="4" sideWeight="0.49874055" weight="0.36954087" />
+      <window_info anchor="bottom" id="Run" order="4" sideWeight="0.49874055" weight="0.19484882" />
       <window_info anchor="bottom" id="Debug" order="5" weight="0.39977604" />
       <window_info anchor="bottom" id="Cvs" order="6" weight="0.25" />
       <window_info anchor="bottom" id="Inspection" order="7" weight="0.4" />
@@ -714,7 +700,7 @@
       <window_info anchor="bottom" id="Database Changes" order="11" />
       <window_info anchor="bottom" id="Terminal" order="12" weight="0.32922733" />
       <window_info anchor="bottom" id="Event Log" order="13" sideWeight="0.50125945" side_tool="true" weight="0.37058824" />
-      <window_info anchor="bottom" id="Messages" order="14" sideWeight="0.49938875" weight="0.3281075" />
+      <window_info anchor="bottom" id="Messages" order="14" sideWeight="0.49938875" weight="0.18141097" />
       <window_info anchor="bottom" id="Duplicate detector" order="15" weight="0.32922733" />
       <window_info anchor="right" id="Commander" internal_type="SLIDING" order="0" type="SLIDING" weight="0.4" />
       <window_info anchor="right" id="Ant Build" order="1" weight="0.25" />
@@ -727,19 +713,6 @@
       <window_info anchor="right" id="Palette&#9;" order="8" />
     </layout-to-restore>
   </component>
-  <component name="TypeScriptGeneratedFilesManager">
-    <option name="version" value="1" />
-  </component>
-  <component name="Vcs.Log.History.Properties">
-    <option name="COLUMN_ORDER">
-      <list>
-        <option value="0" />
-        <option value="2" />
-        <option value="3" />
-        <option value="1" />
-      </list>
-    </option>
-  </component>
   <component name="Vcs.Log.Tabs.Properties">
     <option name="RECENT_FILTERS">
       <map>
@@ -788,152 +761,33 @@
     <option name="LAST_COMMIT_MESSAGE" value="Pushed the fix for ship repair while 100 hp" />
   </component>
   <component name="editorHistoryManager">
-    <entry file="uml://JAVA/ShipWarfare" />
-    <entry file="uml://JAVA/TaipanShop" />
-    <entry file="file://$PROJECT_DIR$/src/Game.java" />
-    <entry file="file://$PROJECT_DIR$/src/Warehouse.java" />
-    <entry file="file://$PROJECT_DIR$/src/Bank.java" />
-    <entry file="file://$PROJECT_DIR$/src/TaipanShop.java" />
-    <entry file="file://$PROJECT_DIR$/src/Travel.java" />
-    <entry file="jar:///Library/Java/JavaVirtualMachines/jdk1.8.0_201.jdk/Contents/Home/javafx-src.zip!/com/sun/glass/ui/InvokeLaterDispatcher.java" />
-    <entry file="file://$PROJECT_DIR$/src/ShopGUI" />
-    <entry file="file://$PROJECT_DIR$/src/Start.java" />
-    <entry file="file://$PROJECT_DIR$/src/main.java" />
-    <entry file="file://$PROJECT_DIR$/src/ShipWarfare.java" />
-    <entry file="uml://JAVA/TaipanShopGUI" />
-    <entry file="uml://JAVA/bankGUI" />
-    <entry file="file://$PROJECT_DIR$/src/stylesheet.css" />
-    <entry file="jar://C:/Program Files/Java/jdk1.8.0_141/jre/lib/ext/jfxrt.jar!/com/sun/javafx/scene/control/skin/modena/blackOnWhite.css">
+    <entry file="file://$PROJECT_DIR$/src/FileSaving.java">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="272">
-          <caret line="41" column="41" selection-start-line="41" selection-start-column="41" selection-end-line="41" selection-end-column="41" />
+        <state relative-caret-position="-34">
+          <caret line="3" column="12" selection-start-line="3" selection-start-column="12" selection-end-line="3" selection-end-column="12" />
         </state>
       </provider>
     </entry>
-    <entry file="jar://C:/Program Files/Java/jdk1.8.0_141/jre/lib/ext/jfxrt.jar!/com/sun/javafx/scene/control/skin/modena/modena.css">
+    <entry file="file://$PROJECT_DIR$/src/PlayerTest.java">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="272">
-          <caret line="127" column="24" lean-forward="true" selection-start-line="127" selection-end-line="128" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/styleguide.css">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="34">
-          <caret line="2" column="36" selection-start-line="2" selection-start-column="36" selection-end-line="2" selection-end-column="36" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/saves/playerSave.txt">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="17">
-          <caret line="1" column="101" selection-start-line="1" selection-start-column="101" selection-end-line="1" selection-end-column="101" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/GameEndGUI.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="437">
-          <caret line="101" selection-start-line="101" selection-end-line="101" />
+        <state relative-caret-position="320">
+          <caret line="23" column="14" selection-start-line="23" selection-start-column="14" selection-end-line="23" selection-end-column="14" />
           <folding>
             <element signature="imports" expanded="true" />
           </folding>
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/AnimationTesting.java" />
-    <entry file="uml://MODULES/mdl-TaipanClone" />
-    <entry file="uml://JAVA/AnimationTesting" />
-    <entry file="file://$PROJECT_DIR$/src/TaipanShopGUI.java">
+    <entry file="file://$PROJECT_DIR$/src/WarehouseText.java">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="239">
-          <caret line="641" column="33" lean-forward="true" selection-start-line="641" selection-start-column="33" selection-end-line="641" selection-end-column="33" />
-          <folding>
-            <element signature="imports" expanded="true" />
-          </folding>
+        <state relative-caret-position="51">
+          <caret line="3" column="31" selection-start-line="3" selection-start-column="31" selection-end-line="3" selection-end-column="31" />
         </state>
       </provider>
     </entry>
-    <entry file="uml://JAVA/" />
-    <entry file="uml://JAVA/TravelGUI" />
-    <entry file="file://$PROJECT_DIR$/src/ShipWarfareGUI.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="6443">
-          <caret line="396" column="18" selection-start-line="396" selection-start-column="18" selection-end-line="396" selection-end-column="18" />
-          <folding>
-            <element signature="imports" expanded="true" />
-          </folding>
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/BankGUI.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="1700">
-          <caret line="111" column="79" selection-start-line="111" selection-start-column="79" selection-end-line="111" selection-end-column="79" />
-          <folding>
-            <element signature="imports" expanded="true" />
-          </folding>
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/StartGUI.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="3094">
-          <caret line="191" selection-start-line="191" selection-end-line="198" selection-end-column="17" />
-          <folding>
-            <element signature="imports" expanded="true" />
-          </folding>
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/LoanSharkGUI.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="255">
-          <caret line="26" selection-start-line="26" selection-end-line="29" selection-end-column="5" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/Player.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="1921">
-          <caret line="121" column="43" selection-start-line="121" selection-start-column="43" selection-end-line="121" selection-end-column="43" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/WarehouseGUI.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="119">
-          <caret line="14" selection-start-line="14" selection-end-line="14" />
-          <folding>
-            <element signature="imports" expanded="true" />
-          </folding>
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/TravelGUI.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="3264">
-          <caret line="215" column="73" selection-start-line="215" selection-start-column="73" selection-end-line="215" selection-end-column="73" />
-          <folding>
-            <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" />
-            <element signature="docComment;method#disaster#0;class#TravelGUI#0" />
-            <element signature="method#disaster#0;class#TravelGUI#0" />
-            <element signature="docComment;method#getStringLocation#0;class#TravelGUI#0" />
-            <element signature="method#getStringLocation#0;class#TravelGUI#0" />
-            <element signature="docComment;method#shipStatusString#0;class#TravelGUI#0" />
-            <element signature="method#shipStatusString#0;class#TravelGUI#0" />
-            <element signature="docComment;method#updateStage#0;class#TravelGUI#0" />
-            <element signature="method#updateStage#0;class#TravelGUI#0" />
-          </folding>
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/RandomEventGUI.java" />
     <entry file="file://$PROJECT_DIR$/src/MainGUI.java">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="221">
+        <state relative-caret-position="204">
           <caret line="13" column="14" selection-start-line="13" selection-start-column="14" selection-end-line="13" selection-end-column="14" />
           <folding>
             <element signature="imports" expanded="true" />
@@ -941,17 +795,104 @@
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/HighScore.java">
+    <entry file="file://$PROJECT_DIR$/src/BankText.java">
+      <provider selected="true" editor-type-id="text-editor" />
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/TaipanShopText.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="918">
+          <caret line="58" column="19" selection-start-line="58" selection-start-column="19" selection-end-line="58" selection-end-column="19" />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/FileSaving.java">
+    <entry file="file://$PROJECT_DIR$/src/loanSharkText.java">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="646">
-          <caret line="38" column="24" lean-forward="true" selection-start-line="38" selection-start-column="24" selection-end-line="38" selection-end-column="24" />
+        <state relative-caret-position="119">
+          <caret line="7" column="5" lean-forward="true" selection-start-line="7" selection-start-column="5" selection-end-line="7" selection-end-column="5" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/TravelText.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="153">
+          <caret line="9" lean-forward="true" selection-start-line="9" selection-end-line="9" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/TaipanShopLogic.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="-1139">
+          <caret line="7" column="13" selection-start-line="7" selection-start-column="13" selection-end-line="7" selection-end-column="13" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/ShipWarfareGUI.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="1406">
+          <caret line="186" column="6" selection-start-line="186" selection-start-column="6" selection-end-line="186" selection-end-column="6" />
+          <folding>
+            <element signature="imports" expanded="true" />
+            <element signature="method#setVisibilitiesAndTransition#0;class#ShipWarfareGUI#0" />
+            <element signature="docComment;method#initializeShip#0;class#ShipWarfareGUI#0" />
+          </folding>
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/TravelGUI.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="442">
+          <caret line="176" column="31" lean-forward="true" selection-start-line="176" selection-start-column="31" selection-end-line="176" selection-end-column="31" />
+          <folding>
+            <element signature="n#!!doc" expanded="true" />
+            <element signature="imports" expanded="true" />
+            <element signature="docComment;method#seaAtlas#0;class#TravelGUI#0" />
+            <element signature="method#seaAtlas#0;class#TravelGUI#0" />
+            <element signature="docComment;method#randomEventSea#0;class#TravelGUI#0" />
+            <element signature="method#randomEventSea#0;class#TravelGUI#0" />
+            <element signature="docComment;method#disaster#0;class#TravelGUI#0" />
+            <element signature="method#disaster#0;class#TravelGUI#0" />
+            <element signature="docComment;method#getStringLocation#0;class#TravelGUI#0" />
+            <element signature="method#getStringLocation#0;class#TravelGUI#0" />
+            <element signature="docComment;method#shipStatusString#0;class#TravelGUI#0" />
+            <element signature="method#shipStatusString#0;class#TravelGUI#0" />
+          </folding>
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/TaipanShopGUI.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="185">
+          <caret line="465" column="38" lean-forward="true" selection-start-line="465" selection-start-column="38" selection-end-line="465" selection-end-column="38" />
+          <folding>
+            <element signature="docComment;method#TaipanShopGUI#0;class#TaipanShopGUI#0" />
+            <element signature="method#TaipanShopGUI#0;class#TaipanShopGUI#0" />
+            <element signature="docComment;method#retire#0;class#TaipanShopGUI#0" />
+            <element signature="method#retire#0;class#TaipanShopGUI#0" />
+            <element signature="docComment;method#defaultTextOut#0;class#TaipanShopGUI#0" />
+            <element signature="method#defaultTextOut#0;class#TaipanShopGUI#0" />
+            <element signature="docComment;method#buttonSetup#0;class#TaipanShopGUI#0" />
+            <element signature="method#buttonSetup#0;class#TaipanShopGUI#0" />
+            <element signature="method#shop#0;class#TaipanShopGUI#0" />
+            <element signature="docComment;method#initializeShop#0;class#TaipanShopGUI#0" />
+            <element signature="class#16068:16656" />
+            <element signature="class#16894:17482" />
+            <element signature="class#17646:18088" />
+            <element signature="class#18418:18904" />
+            <element signature="class#19069:19536" />
+            <element signature="method#handle#0;class#19069:19536" />
+            <element signature="class#19773:20283" />
+            <element signature="class#20487:20841" />
+            <element signature="class#21134:22015" />
+            <element signature="class#22253:23127" />
+            <element signature="class#23289:24163" />
+            <element signature="method#handle#0;class#23289:24163" />
+            <element signature="class#24498:25411" />
+            <element signature="method#handle#0;class#24498:25411" />
+            <element signature="class#25615:26933" />
+            <element signature="method#handle#0;class#25615:26933" />
+            <element signature="e#31225#31481#1" />
+            <element signature="method#updateStage#0;class#TaipanShopGUI#0" />
+          </folding>
         </state>
       </provider>
     </entry>
@@ -995,7 +936,7 @@
       </state>
       <state key="JdkListConfigurable.UI">
         <settings>
-          <last-edited>1.8.0_201</last-edited>
+          <last-edited>1.8</last-edited>
           <splitter-proportions>
             <option name="proportions">
               <list>
@@ -1012,6 +953,7 @@
             <option name="proportions">
               <list>
                 <option value="0.2" />
+                <option value="0.6" />
               </list>
             </option>
           </splitter-proportions>
@@ -1019,17 +961,7 @@
       </state>
       <state key="ProjectLibrariesConfigurable.UI">
         <settings>
-          <splitter-proportions>
-            <option name="proportions">
-              <list>
-                <option value="0.2" />
-              </list>
-            </option>
-          </splitter-proportions>
-        </settings>
-      </state>
-      <state key="ScopeChooserConfigurable.UI">
-        <settings>
+          <last-edited>hamcrest-core-1.3</last-edited>
           <splitter-proportions>
             <option name="proportions">
               <list>
diff --git a/src/BankText.java b/src/BankText.java
new file mode 100644
index 0000000..608bbe9
--- /dev/null
+++ b/src/BankText.java
@@ -0,0 +1,9 @@
+public class BankText extends Player {
+    public BankText(Player player) {
+        Player playerDummy = new Player(player);
+        setPlayer(playerDummy);
+    }
+
+    public void bank() {
+    }
+}
diff --git a/src/ShipWarfareGUI.java b/src/ShipWarfareGUI.java
index 3e982d0..bea33cb 100644
--- a/src/ShipWarfareGUI.java
+++ b/src/ShipWarfareGUI.java
@@ -19,6 +19,7 @@ import java.io.FileInputStream;
 import java.util.Random;
 import java.util.concurrent.ExecutionException;
 
+
 /**
  * 2019-03-10 (Edited on 2019-03-23)
  * Author: Haris Muhammad
@@ -29,7 +30,7 @@ import java.util.concurrent.ExecutionException;
 public class ShipWarfareGUI extends Player {
 
     private ShipWarfareGUI ship;
-    private  ShipWarfareGUILogic logic;
+    //private ShipWarfareGUILogic logic;
     private Circle cannon;
     private VBox buttonBox;
     private HBox fightRunBox;
@@ -46,7 +47,6 @@ public class ShipWarfareGUI extends Player {
     private Label report;
 
 
-
     private int timeCounter;
 
 
@@ -70,9 +70,6 @@ public class ShipWarfareGUI extends Player {
     }
 
 
-
-
-
     /**
      * Sets most of the labels invisible except for the "fight or run" label
      */
@@ -99,9 +96,6 @@ public class ShipWarfareGUI extends Player {
     }
 
 
-
-
-
     /**
      * Player attacks enemy ships in an animation
      */
@@ -160,7 +154,8 @@ public class ShipWarfareGUI extends Player {
         });
     }
 
-    public boolean winOrLose( Stage stage){
+    /*
+    public boolean winOrLose(Stage stage) {
         if (logic.destroyLittyShipsOrEscape() == 1) {
             wipe();
             report.setText(logic.getReportMessage());
@@ -189,8 +184,7 @@ public class ShipWarfareGUI extends Player {
             return true;
         }
     }
-
-
+    */
 
     /**
      * Generaties ships and deploys logic for the shipwarfare
@@ -198,303 +192,7 @@ public class ShipWarfareGUI extends Player {
      * @param primaryStage sets up the stage to whcih the GUI may be based around
      * @throws Exception in case of interruptions withing the graphical interface
      */
-    public void initializeShip(Stage primaryStage) throws Exception {
-        cannon.setLayoutX(beginningX);
-        cannon.setLayoutY(beginningY);
-        logic.setNumOfLittyShips(logic.numOfShips());
-
-        Pane root = new Pane();
-        HBox usAgainstEnemyDivisor;
-        BorderPane centeringUserShipPane = new BorderPane();
-        Circle cannon;
-        BorderPane centeringLittyShipPane = new BorderPane();
-        BorderPane encompassingPane = new BorderPane();
-        usAgainstEnemyDivisor = new HBox();
-        cannon = new Circle();
-        this.cannon = cannon;
-
-
-        cannon.setVisible(false);
-
-        buttonBox = new VBox();
-        fightRunBox = new HBox();
-        fightButton = new Button();
-        runButton = new Button();
-        continueButton = new Button();
-        labelBox = new VBox();
-        title = new Label();
-        HPLeft = new Label();
-        gunsLeftOrTaken = new Label();
-        runAwayOrLeft = new Label();
-        shipsRemaining = new Label();
-        report = new Label();
-
-        title.setText(String.format("%d ships from Liu Yuen's Fleet are attacking, Would you like to fight or run?", numOfLittyShips));
-
-
-        fightButton.setText("Fight");
-        runButton.setText("Run");
-        continueButton.setText("Continue");
-
-        fightButton.setVisible(true);
-        runButton.setVisible(true);
-        continueButton.setVisible(false);
-
-
-        encompassingPane.setAlignment(labelBox, javafx.geometry.Pos.CENTER);
-        labelBox.setAlignment(javafx.geometry.Pos.CENTER);
-        labelBox.setPrefHeight(41.0);
-        labelBox.setPrefWidth(600.0);
-        labelBox.setSpacing(20.0);
-
-        labelBox.setPadding(new Insets(10.0, 0.0, 0.0, 0.0));
-
-        encompassingPane.setAlignment(buttonBox, javafx.geometry.Pos.CENTER);
-        buttonBox.setAlignment(javafx.geometry.Pos.TOP_CENTER);
-
-
-        fightRunBox.setAlignment(javafx.geometry.Pos.CENTER);
-        fightRunBox.setPrefHeight(100.0);
-        fightRunBox.setPrefWidth(200.0);
-        fightRunBox.setSpacing(10.0);
-
-        VBox.setMargin(continueButton, new Insets(0.0, 0.0, 20.0, 0.0));
-
-
-        root.getChildren().add(cannon);
-
-        encompassingPane.setPrefHeight(480);
-        encompassingPane.setPrefWidth(600);
-
-
-        usAgainstEnemyDivisor.setPrefHeight(0.0);
-        usAgainstEnemyDivisor.setPrefWidth(600.0);
-
-        centeringUserShipPane.setPrefHeight(200.0);
-        centeringUserShipPane.setPrefWidth(200.0);
-
-        Image ourShip;
-        Image enemyShip;
-
-        try {
-            ourShip = new Image(new FileInputStream("src/images/ourShip.png"));
-            enemyShip = new Image(new FileInputStream("src/images/enemyShip.png"));
-
-        } catch (Exception e) {
-            ourShip = new Image(new FileInputStream("images/ourShip.png"));
-            enemyShip = new Image(new FileInputStream("images/enemyShip.png"));
-        }
-
-
-        //Setting the image view
-        ImageView userShip = new ImageView(ourShip);
-        ImageView littyShip = new ImageView(enemyShip);
-
-        BorderPane.setAlignment(userShip, javafx.geometry.Pos.CENTER);
-        userShip.setFitHeight(150.0);
-        userShip.setFitWidth(248.0);
-        userShip.setPickOnBounds(true);
-        userShip.setPreserveRatio(true);
-        centeringUserShipPane.setCenter(userShip);
-
-        BorderPane.setAlignment(buttonBox, javafx.geometry.Pos.CENTER);
-        buttonBox.setAlignment(javafx.geometry.Pos.TOP_CENTER);
-
-        usAgainstEnemyDivisor.setTranslateY(-20.0);
-
-        cannon.setRadius(10.0);
-        cannon.setStroke(javafx.scene.paint.Color.BLACK);
-        cannon.setStrokeType(javafx.scene.shape.StrokeType.INSIDE);
-        centeringUserShipPane.setRight(cannon);
-
-        centeringLittyShipPane.setPrefHeight(200.0);
-        centeringLittyShipPane.setPrefWidth(200.0);
-        centeringLittyShipPane.setOpaqueInsets(new Insets(0.0));
-        HBox.setMargin(centeringLittyShipPane, new Insets(0.0, 0.0, 0.0, 200.0));
-
-        encompassingPane.setAlignment(littyShip, javafx.geometry.Pos.CENTER);
-        littyShip.setFitHeight(165.0);
-        littyShip.setFitWidth(180.0);
-        littyShip.setPickOnBounds(true);
-        littyShip.setPreserveRatio(true);
-        encompassingPane.setMargin(littyShip, new Insets(0.0, 0.0, 20.0, 0.0));
-        centeringLittyShipPane.setCenter(littyShip);
-
-        usAgainstEnemyDivisor.getChildren().add(centeringUserShipPane);
-        usAgainstEnemyDivisor.getChildren().add(centeringLittyShipPane);
-        fightRunBox.getChildren().add(fightButton);
-        fightRunBox.getChildren().add(continueButton);
-        fightRunBox.getChildren().add(runButton);
-        buttonBox.getChildren().add(fightRunBox);
-        labelBox.getChildren().add(title);
-        labelBox.getChildren().add(HPLeft);
-        labelBox.getChildren().add(gunsLeftOrTaken);
-        labelBox.getChildren().add(runAwayOrLeft);
-        labelBox.getChildren().add(shipsRemaining);
-        labelBox.getChildren().add(report);
-
-        encompassingPane.setTop(labelBox);
-        encompassingPane.setCenter(usAgainstEnemyDivisor);
-
-        encompassingPane.setBottom(buttonBox);
-
-        root.getChildren().addAll(encompassingPane, cannon);
-
-        Scene scene = new Scene(root, 600, 480);
-        root.getStylesheets().add("styleguide.css");
-
-        primaryStage.setResizable(false);
-
-        primaryStage.setTitle("Ship Warfare");
-        primaryStage.setScene(scene);
-        primaryStage.show();
-        continueButton.setOnAction(new EventHandler<ActionEvent>() {
-            @Override
-            /**
-             * Continue Button, engages in run logic and graphical interface
-             * @param event, once button is clicked, executes graphical information
-             */
-            public void handle(ActionEvent event) {
-                shotsFired.stop();
-
-                /**
-                 * Switches to Taipan Shop scene
-                 */
-
-                TaipanShopGUI shop = new TaipanShopGUI(getPlayer());
-                shop.initializeShop(primaryStage);
-                primaryStage.show();
-
-            }
-        });
-
-        //Flee
-        runButton.setOnAction(new EventHandler<ActionEvent>() {
-            @Override
-            /**
-             * Run Button, engages in run logic and graphical interface
-             * @param event, once button is clicked, executes graphical information
-             */
-            public void handle(ActionEvent event) {
-                report.setVisible(true);
-                title.setVisible(true);
-                shipsRemaining.setVisible(true);
-                gunsLeftOrTaken.setVisible(true);
-
-                title.setText("Ayy captain we will try to run!");
-                report.setText("Epic");
-                counter++;
-
-                if (logic.runFromShips() == false) {
-                    report.setText(("Couldn't run away"));
-                    try {
-                        winOrLose = destroyLittyShipsOrEscape(primaryStage);
-                    } catch (Exception e) {
-                        e.printStackTrace();
-                    }
-                    if (winOrLose == true) {
-                        report.setVisible(true);
-                        title.setVisible(true);
-                        shipsRemaining.setVisible(true);
-                        gunsLeftOrTaken.setVisible(true);
-
-                    }
-                } else {
-
-                    report.setText("Phew! Got away safely");
-                    setVisibilitiesAndTransition(primaryStage);
-
-
-                }
-
-            }
-        });
-
-        //Fight
-        fightButton.setOnAction(new EventHandler<ActionEvent>() {
-
-            @Override
-            /**
-             * Fight Button, engages in fight logic and graphical interface
-             * @param event, once button is clicked, executes graphical information
-             */
-            public void handle(ActionEvent event) {
-                report.setVisible(false);
-                runAwayOrLeft.setVisible(false);
-                shipsRemaining.setVisible(false);
-                HPLeft.setVisible(false);
-                gunsLeftOrTaken.setVisible(false);
-                fightButton.setVisible(false);
-                runButton.setVisible(false);
-
-                try {
-                    winOrLose = destroyLittyShipsOrEscape(primaryStage);
-                } catch (Exception e) {
-                    e.printStackTrace();
-                }
-
-                counter++;
-
-                cannon.setVisible(true);
-                cannon.setLayoutX(beginningX);
-                cannon.setLayoutY(beginningY);
-
-                if (counter >= 1) {
-                    title.setVisible(false);
-
-                }
-
-                playerShoots(getGuns());
-
-                shotsFired.setOnFinished(new EventHandler<ActionEvent>() {
-                    @Override
-                    /**
-                     * When the user is completed their volley this information will be accessed
-                     * @param event, once the shots fired transition is completed, execute graphical information
-                     */
-                    public void handle(ActionEvent event) {
-                        shotsFired.stop();
-                        if (!winOrLose) {
-                            shipsRetaliate();
-                        } else {
-                            report.setVisible(true);
-                            continueButton.setVisible(true);
-                            usAgainstEnemyDivisor.setVisible(false);
-                            cannon.setVisible(false);
-                            shotsFired.stop();
-
-                        }
-                        enemyShots.setOnFinished(new EventHandler<ActionEvent>() {
-                            @Override
-                            /**
-                             * When the user is completed their volley, this information will be accessed
-                             * @param event, once the enemy shots transition is completed, execute graphical information
-                             */
-                            public void handle(ActionEvent event) {
-                                fightButton.setVisible(true);
-                                runButton.setVisible(true);
-                                report.setVisible(true);
-                                cannon.setVisible(false);
-                                runAwayOrLeft.setVisible(true);
-                                gunsLeftOrTaken.setVisible(true);
-                                shipsRemaining.setVisible(true);
-                                HPLeft.setVisible(true);
-                                gunsLeftOrTaken.setVisible(true);
-
-                                if (winOrLose == true) {
-                                    usAgainstEnemyDivisor.setVisible(false);
-                                }
-
-                            }
-                        });
-
-                    }
-
-                });
-
-
-            }
-        });
-
-    }
+    /*
+    public void initializeShip(Stage primaryStage) throws Exception
+    */
 }
\ No newline at end of file
diff --git a/src/TaipanShopGUI.java b/src/TaipanShopGUI.java
index c8ae2f2..d75debd 100644
--- a/src/TaipanShopGUI.java
+++ b/src/TaipanShopGUI.java
@@ -14,7 +14,9 @@ import javafx.scene.control.TextField;
 import javafx.scene.input.KeyCode;
 import javafx.scene.input.KeyEvent;
 import javafx.scene.layout.*;
+import javafx.scene.paint.Color;
 import javafx.scene.shape.Rectangle;
+import javafx.scene.shape.StrokeType;
 import javafx.scene.text.Font;
 import javafx.stage.Stage;
 
@@ -239,94 +241,6 @@ public class TaipanShopGUI extends Player{
         FileSaving saving = new FileSaving();
         saving.saveFile(getPlayer());
 
-        Font size14 = new Font(14.0);
-        Rectangle dialogueRectangle = new Rectangle();
-        dialogueRectangle.setFill(javafx.scene.paint.Color.WHITE);
-        dialogueRectangle.setHeight(180.0);
-        dialogueRectangle.setLayoutX(8.0);
-        dialogueRectangle.setLayoutY(294.0);
-        dialogueRectangle.setStroke(javafx.scene.paint.Color.BLACK);
-        dialogueRectangle.setStrokeType(javafx.scene.shape.StrokeType.INSIDE);
-        dialogueRectangle.setWidth(582.0);
-
-        Rectangle inventoryRectangle = new Rectangle();
-        inventoryRectangle.setFill(javafx.scene.paint.Color.WHITE);
-        inventoryRectangle.setHeight(108.0);
-        inventoryRectangle.setLayoutX(8.0);
-        inventoryRectangle.setLayoutY(147.0);
-        inventoryRectangle.setStroke(javafx.scene.paint.Color.BLACK);
-        inventoryRectangle.setStrokeType(javafx.scene.shape.StrokeType.INSIDE);
-        inventoryRectangle.setWidth(405.0);
-
-        Rectangle warehouseRectangle = new Rectangle();
-        warehouseRectangle.setFill(javafx.scene.paint.Color.WHITE);
-        warehouseRectangle.setHeight(108.0);
-        warehouseRectangle.setLayoutY(33.0);
-        warehouseRectangle.setLayoutX(8.0);
-        warehouseRectangle.setStroke(javafx.scene.paint.Color.BLACK);
-        warehouseRectangle.setStrokeType(javafx.scene.shape.StrokeType.INSIDE);
-        warehouseRectangle.setWidth(405.0);
-
-        AnchorPane anchorPane = new AnchorPane();
-        anchorPane.setPrefHeight(480.0);
-        anchorPane.setPrefWidth(600.0);
-
-        GridPane gridPane = new GridPane();
-        gridPane.setPrefHeight(480.0);
-        gridPane.setPrefWidth(600.0);
-
-        ColumnConstraints columnConstraints = new ColumnConstraints();
-        columnConstraints.setMaxWidth(590.0);
-        columnConstraints.setMinWidth(0.0);
-        columnConstraints.setPrefWidth(590.0);
-
-        RowConstraints rowConstraints = new RowConstraints();
-        rowConstraints.setMinHeight(20.0);
-        rowConstraints.setPrefHeight(20.0);
-
-        RowConstraints rowConstraints0 = new RowConstraints();
-        rowConstraints0.setMaxHeight(122.0);
-        rowConstraints0.setMinHeight(10.0);
-        rowConstraints0.setPrefHeight(117.0);
-
-        RowConstraints rowConstraints1 = new RowConstraints();
-        rowConstraints1.setMaxHeight(163.0);
-        rowConstraints1.setMinHeight(10.0);
-        rowConstraints1.setPrefHeight(112.0);
-
-        RowConstraints rowConstraints2 = new RowConstraints();
-        rowConstraints2.setMaxHeight(126.0);
-        rowConstraints2.setMinHeight(0.0);
-        rowConstraints2.setPrefHeight(42.0);
-
-        RowConstraints rowConstraints3 = new RowConstraints();
-        rowConstraints3.setMaxHeight(269.0);
-        rowConstraints3.setMinHeight(10.0);
-        rowConstraints3.setPrefHeight(118.0);
-
-        RowConstraints rowConstraints4 = new RowConstraints();
-        rowConstraints4.setMaxHeight(179.0);
-        rowConstraints4.setMinHeight(10.0);
-        rowConstraints4.setPrefHeight(52.0);
-
-        gridPane.setPadding(new Insets(10.0, 10.0, 10.0, 0.0));
-
-        HBox hBox = new HBox();
-        GridPane.setRowIndex(hBox, 1);
-        hBox.setPrefHeight(100.0);
-        hBox.setPrefWidth(200.0);
-
-        HBox hBox0 = new HBox();
-        GridPane.setRowIndex(hBox0, 2);
-        hBox0.setPrefHeight(100.0);
-        hBox0.setPrefWidth(200.0);
-
-        FlowPane flowPane = new FlowPane();
-        GridPane.setRowIndex(flowPane, 5);
-        flowPane.setAlignment(javafx.geometry.Pos.CENTER);
-        flowPane.setHgap(5.0);
-        flowPane.setPrefHeight(200.0);
-        flowPane.setPrefWidth(200.0);
 
         buyButton.setMnemonicParsing(false);
         buyButton.setPrefHeight(25.0);
@@ -603,19 +517,129 @@ public class TaipanShopGUI extends Player{
                             break;
                         }
                     }
-                    updateStage();
+                    updateStage(firm,wItemsText,wItemSpaceText,locationText,gunsText,inventoryText,inventoryHeldText,shipStatusText,cashText,bankText);
 
                     buttonSetup("reset");
                 }
             }
         });
 
+        stage.setTitle("Shop");
+        stage.setResizable(false);
+        Scene root = new Scene(declareStage(), 600, 480);
+        stage.setScene(root);
+
+        // general updates to the buttons, user stats/inventory, and text.
+        buttonSetup("reset");
+        if(getIsPriceChanged() == 0 || getIsPriceChanged() == 2){
+            TaipanShopLogic logic = new TaipanShopLogic(getPlayer());
+            String temp = logic.updatePrices();
+            setPlayer(logic.getPlayer());
+            defaultTextOut();
+            textOut.setText(temp + textOut.getText());
+        }
+        //defaultTextOut();
+        updateStage(firm,wItemsText,wItemSpaceText,locationText,gunsText,inventoryText,inventoryHeldText,shipStatusText,cashText,bankText);
+    }
+
+    public AnchorPane declareStage() {
+        //Declaring all the elements required for the information on screen
+        Rectangle dialogueRectangle = new Rectangle();
+        Rectangle inventoryRectangle = new Rectangle();
+        Rectangle warehouseRectangle = new Rectangle();
+        AnchorPane anchorPane = new AnchorPane();
+        GridPane gridPane = new GridPane();
+        ColumnConstraints columnConstraints = new ColumnConstraints();
+        RowConstraints rowConstraints = new RowConstraints();
+        RowConstraints rowConstraints0 = new RowConstraints();
+        RowConstraints rowConstraints1 = new RowConstraints();
+        RowConstraints rowConstraints2 = new RowConstraints();
+        RowConstraints rowConstraints3 = new RowConstraints();
+        RowConstraints rowConstraints4 = new RowConstraints();
+        HBox hBox = new HBox();
+        HBox hBox0 = new HBox();
+        FlowPane flowPane = new FlowPane();
+        Font size14 = new Font(14.0);
+        Label warehouseText = new Label();
+
+        dialogueRectangle.setFill(Color.WHITE);
+        dialogueRectangle.setHeight(180.0);
+        dialogueRectangle.setLayoutX(8.0);
+        dialogueRectangle.setLayoutY(294.0);
+        dialogueRectangle.setStroke(Color.BLACK);
+        dialogueRectangle.setStrokeType(StrokeType.INSIDE);
+        dialogueRectangle.setWidth(582.0);
+
+        inventoryRectangle.setFill(Color.WHITE);
+        inventoryRectangle.setHeight(108.0);
+        inventoryRectangle.setLayoutX(8.0);
+        inventoryRectangle.setLayoutY(147.0);
+        inventoryRectangle.setStroke(Color.BLACK);
+        inventoryRectangle.setStrokeType(StrokeType.INSIDE);
+        inventoryRectangle.setWidth(405.0);
+
+        warehouseRectangle.setFill(Color.WHITE);
+        warehouseRectangle.setHeight(108.0);
+        warehouseRectangle.setLayoutY(33.0);
+        warehouseRectangle.setLayoutX(8.0);
+        warehouseRectangle.setStroke(Color.BLACK);
+        warehouseRectangle.setStrokeType(StrokeType.INSIDE);
+        warehouseRectangle.setWidth(405.0);
+
+        anchorPane.setPrefHeight(480.0);
+        anchorPane.setPrefWidth(600.0);
+
+        gridPane.setPrefHeight(480.0);
+        gridPane.setPrefWidth(600.0);
+
+        columnConstraints.setMaxWidth(590.0);
+        columnConstraints.setMinWidth(0.0);
+        columnConstraints.setPrefWidth(590.0);
+
+        rowConstraints.setMinHeight(20.0);
+        rowConstraints.setPrefHeight(20.0);
+
+        rowConstraints0.setMaxHeight(122.0);
+        rowConstraints0.setMinHeight(10.0);
+        rowConstraints0.setPrefHeight(117.0);
+
+        rowConstraints1.setMaxHeight(163.0);
+        rowConstraints1.setMinHeight(10.0);
+        rowConstraints1.setPrefHeight(112.0);
+
+        rowConstraints2.setMaxHeight(126.0);
+        rowConstraints2.setMinHeight(0.0);
+        rowConstraints2.setPrefHeight(42.0);
+
+        rowConstraints3.setMaxHeight(269.0);
+        rowConstraints3.setMinHeight(10.0);
+        rowConstraints3.setPrefHeight(118.0);
+
+        rowConstraints4.setMaxHeight(179.0);
+        rowConstraints4.setMinHeight(10.0);
+        rowConstraints4.setPrefHeight(52.0);
+
+        gridPane.setPadding(new Insets(10.0, 10.0, 10.0, 0.0));
+
+        GridPane.setRowIndex(hBox, 1);
+        hBox.setPrefHeight(100.0);
+        hBox.setPrefWidth(200.0);
+
+        GridPane.setRowIndex(hBox0, 2);
+        hBox0.setPrefHeight(100.0);
+        hBox0.setPrefWidth(200.0);
+
+        GridPane.setRowIndex(flowPane, 5);
+        flowPane.setAlignment(Pos.CENTER);
+        flowPane.setHgap(5.0);
+        flowPane.setPrefHeight(200.0);
+        flowPane.setPrefWidth(200.0);
+
         firm.setAlignment(Pos.CENTER);
         firm.setPrefHeight(27.0);
         firm.setPrefWidth(632.0);
         firm.setFont(new Font(18.0));
 
-        Label warehouseText = new Label();
         warehouseText.setAlignment(Pos.CENTER);
         warehouseText.setPrefHeight(108.0);
         warehouseText.setPrefWidth(100.0);
@@ -674,7 +698,7 @@ public class TaipanShopGUI extends Player{
         textOut.setContentDisplay(javafx.scene.control.ContentDisplay.TOP);
         textOut.setPrefHeight(163.0);
         textOut.setPrefWidth(583.0);
-        defaultTextOut();
+        //defaultTextOut();
         textOut.setFont(size14);
 
         anchorPane.getChildren().addAll(dialogueRectangle, inventoryRectangle, warehouseRectangle);
@@ -683,7 +707,7 @@ public class TaipanShopGUI extends Player{
 
         hBox0.getChildren().addAll(inventoryText, inventoryHeldText, gunsText, shipStatusText);
 
-        flowPane.getChildren().addAll(buyButton, sellButton, bankButton, cargoButton, loanButton, quitButton, retireButton, opiumButton, silkButton, armsButton, generalButton, numberInput);
+        //flowPane.getChildren().addAll(buyButton, sellButton, bankButton, cargoButton, loanButton, quitButton, retireButton, opiumButton, silkButton, armsButton, generalButton, numberInput);
 
         gridPane.getColumnConstraints().add(columnConstraints);
         gridPane.getRowConstraints().addAll(rowConstraints, rowConstraints0, rowConstraints1, rowConstraints2, rowConstraints3, rowConstraints4);
@@ -691,42 +715,13 @@ public class TaipanShopGUI extends Player{
 
         anchorPane.getChildren().add(gridPane);
 
-        Scene root = new Scene(anchorPane, 600, 480);
-
-        root.getStylesheets().add("styleguide.css");
-        stage.setTitle("Shop");
-        stage.setResizable(false);
-        stage.setScene(root);
-        buyButton.setFocusTraversable(false);
-        sellButton.setFocusTraversable(false);
-        bankButton.setFocusTraversable(false);
-        loanButton.setFocusTraversable(false);
-        generalButton.setFocusTraversable(false);
-        armsButton.setFocusTraversable(false);
-        silkButton.setFocusTraversable(false);
-        opiumButton.setFocusTraversable(false);
-        sellButton.setFocusTraversable(false);
-        retireButton.setFocusTraversable(false);
-        cargoButton.setFocusTraversable(false);
-        quitButton.setFocusTraversable(false);
-
-        // general updates to the buttons, user stats/inventory, and text.
-        buttonSetup("reset");
-        if(getIsPriceChanged() == 0 || getIsPriceChanged() == 2){
-            TaipanShopLogic logic = new TaipanShopLogic(getPlayer());
-            String temp = logic.updatePrices();
-            setPlayer(logic.getPlayer());
-            defaultTextOut();
-            textOut.setText(temp + textOut.getText());
-        }
-        //defaultTextOut();
-        updateStage();
+        return anchorPane;
     }
 
     /**
      * updates the text associated with the user's inventory.
      */
-    public void updateStage() {
+    public void updateStage(Label firm, Label wItemsText, Label wItemSpaceText, Label locationText, Label gunsText, Label inventoryText, Label inventoryHeldText, Label shipStatusText, Label cashText, Label bankText) {
         TaipanShopLogic logic = new TaipanShopLogic(getPlayer());
         firm.setText(String.format("Firm: %s, %s", getName(), logic.getStringLocation()));
         wItemsText.setText(String.format("\n %d\n %d\n %d\n %d", getwOpium(), getwSilk(), getwArms(), getwGeneral()));
@@ -745,5 +740,4 @@ public class TaipanShopGUI extends Player{
         cashText.setText(String.format("  Cash: $%,d", getMoney()));
         bankText.setText(String.format("Bank: $%,d", getBank()));
     }
-
 }
diff --git a/src/TravelGUI.java b/src/TravelGUI.java
index 76982af..3361497 100644
--- a/src/TravelGUI.java
+++ b/src/TravelGUI.java
@@ -9,6 +9,8 @@ import javafx.scene.control.Button;
 import javafx.scene.control.TextField;
 import javafx.scene.input.KeyCode;
 import javafx.scene.layout.*;
+import javafx.scene.paint.Color;
+import javafx.scene.shape.StrokeType;
 import javafx.stage.Stage;
 import javafx.geometry.Insets;
 import javafx.scene.control.Label;
@@ -61,96 +63,9 @@ public class TravelGUI extends Player{
      */
     public Stage initializeTravel(Stage stage) {
         //Updates the stage for the first-time you read it
-        updateStage();
+        shop.updateStage(firm,wItemsText,wItemSpaceText,locationText,gunsText,inventoryText,inventoryHeldText,shipStatusText,cashText,bankText);
 
-        Font size14 = new Font(14.0);
-        Rectangle dialogueRectangle = new Rectangle();
-        dialogueRectangle.setFill(javafx.scene.paint.Color.WHITE);
-        dialogueRectangle.setHeight(180.0);
-        dialogueRectangle.setLayoutX(8.0);
-        dialogueRectangle.setLayoutY(294.0);
-        dialogueRectangle.setStroke(javafx.scene.paint.Color.BLACK);
-        dialogueRectangle.setStrokeType(javafx.scene.shape.StrokeType.INSIDE);
-        dialogueRectangle.setWidth(582.0);
-
-        Rectangle inventoryRectangle = new Rectangle();
-        inventoryRectangle.setFill(javafx.scene.paint.Color.WHITE);
-        inventoryRectangle.setHeight(108.0);
-        inventoryRectangle.setLayoutX(8.0);
-        inventoryRectangle.setLayoutY(147.0);
-        inventoryRectangle.setStroke(javafx.scene.paint.Color.BLACK);
-        inventoryRectangle.setStrokeType(javafx.scene.shape.StrokeType.INSIDE);
-        inventoryRectangle.setWidth(405.0);
-
-        Rectangle warehouseRectangle = new Rectangle();
-        warehouseRectangle.setFill(javafx.scene.paint.Color.WHITE);
-        warehouseRectangle.setHeight(108.0);
-        warehouseRectangle.setLayoutY(33.0);
-        warehouseRectangle.setLayoutX(8.0);
-        warehouseRectangle.setStroke(javafx.scene.paint.Color.BLACK);
-        warehouseRectangle.setStrokeType(javafx.scene.shape.StrokeType.INSIDE);
-        warehouseRectangle.setWidth(405.0);
-
-        AnchorPane anchorPane = new AnchorPane();
-        anchorPane.setPrefHeight(480.0);
-        anchorPane.setPrefWidth(600.0);
-
-        GridPane gridPane = new GridPane();
-        gridPane.setPrefHeight(480.0);
-        gridPane.setPrefWidth(600.0);
-
-        ColumnConstraints columnConstraints = new ColumnConstraints();
-        columnConstraints.setMaxWidth(590.0);
-        columnConstraints.setMinWidth(0.0);
-        columnConstraints.setPrefWidth(590.0);
-
-        RowConstraints rowConstraints = new RowConstraints();
-        rowConstraints.setMinHeight(20.0);
-        rowConstraints.setPrefHeight(20.0);
-
-        RowConstraints rowConstraints0 = new RowConstraints();
-        rowConstraints0.setMaxHeight(122.0);
-        rowConstraints0.setMinHeight(10.0);
-        rowConstraints0.setPrefHeight(117.0);
-
-        RowConstraints rowConstraints1 = new RowConstraints();
-        rowConstraints1.setMaxHeight(163.0);
-        rowConstraints1.setMinHeight(10.0);
-        rowConstraints1.setPrefHeight(112.0);
-
-        RowConstraints rowConstraints2 = new RowConstraints();
-        rowConstraints2.setMaxHeight(126.0);
-        rowConstraints2.setMinHeight(0.0);
-        rowConstraints2.setPrefHeight(42.0);
-
-        RowConstraints rowConstraints3 = new RowConstraints();
-        rowConstraints3.setMaxHeight(269.0);
-        rowConstraints3.setMinHeight(10.0);
-        rowConstraints3.setPrefHeight(118.0);
-
-        RowConstraints rowConstraints4 = new RowConstraints();
-        rowConstraints4.setMaxHeight(179.0);
-        rowConstraints4.setMinHeight(10.0);
-        rowConstraints4.setPrefHeight(52.0);
-
-        gridPane.setPadding(new Insets(10.0, 10.0, 10.0, 0.0));
-
-        HBox hBox = new HBox();
-        GridPane.setRowIndex(hBox, 1);
-        hBox.setPrefHeight(100.0);
-        hBox.setPrefWidth(200.0);
-
-        HBox hBox0 = new HBox();
-        GridPane.setRowIndex(hBox0, 2);
-        hBox0.setPrefHeight(100.0);
-        hBox0.setPrefWidth(200.0);
-
-        FlowPane flowPane = new FlowPane();
-        GridPane.setRowIndex(flowPane, 5);
-        flowPane.setAlignment(javafx.geometry.Pos.CENTER);
-        flowPane.setHgap(5.0);
-        flowPane.setPrefHeight(200.0);
-        flowPane.setPrefWidth(200.0);
+        shop.declareStage();
 
         //Creating the continue and quit buttons
         quitButton.setPrefHeight(25.0);
@@ -176,7 +91,7 @@ public class TravelGUI extends Player{
             if(peasantShipScene && getAttackingShips()){
                 ShipWarfareGUI ship = new ShipWarfareGUI(getPlayer());
                 try {
-                    ship.initializeShip(stage);
+                    //ship.initializeShip(stage);
                 } catch (Exception e) {
                     e.printStackTrace();
                 }
@@ -257,88 +172,7 @@ public class TravelGUI extends Player{
         firm.setPrefWidth(632.0);
         firm.setFont(new Font(18.0));
 
-        Label warehouseText = new Label();
-        warehouseText.setAlignment(Pos.CENTER);
-        warehouseText.setPrefHeight(108.0);
-        warehouseText.setPrefWidth(100.0);
-        warehouseText.setText("  Warehouse\n\tOpium\n\tSilk\n\tArms\n\tGeneral");
-        warehouseText.setFont(size14);
-
-        wItemsText.setAlignment(Pos.CENTER);
-        wItemsText.setPrefWidth(100.0);
-        wItemsText.setPrefHeight(108.0);
-        wItemsText.setFont(size14);
-
-        wItemSpaceText.setPrefHeight(108.0);
-        wItemSpaceText.setPrefWidth(210.0);
-        wItemSpaceText.setFont(size14);
-
-        locationText.setAlignment(Pos.BOTTOM_RIGHT);
-        locationText.setPrefHeight(106.0);
-        locationText.setPrefWidth(140.0);
-        locationText.setTextAlignment(javafx.scene.text.TextAlignment.CENTER);
-        locationText.setFont(size14);
-
-        inventoryText.setAlignment(Pos.CENTER);
-        inventoryText.setPrefWidth(110.0);
-        inventoryText.setPrefHeight(108.0);
-        inventoryText.setFont(size14);
-
-        inventoryHeldText.setAlignment(Pos.CENTER);
-        inventoryHeldText.setPrefHeight(108.0);
-        inventoryHeldText.setPrefWidth(100.0);
-        inventoryHeldText.setFont(size14);
-
-        gunsText.setPrefHeight(108.0);
-        gunsText.setPrefWidth(212.0);
-        gunsText.setAlignment(Pos.CENTER_LEFT);
-        gunsText.setFont(size14);
-
-        shipStatusText.setAlignment(Pos.TOP_CENTER);
-        shipStatusText.setContentDisplay(javafx.scene.control.ContentDisplay.CENTER);
-        shipStatusText.setPrefHeight(110.0);
-        shipStatusText.setPrefWidth(200.0);
-        shipStatusText.setTextAlignment(javafx.scene.text.TextAlignment.CENTER);
-        shipStatusText.setFont(size14);
-
-        GridPane.setRowIndex(cashText, 3);
-        cashText.setPrefHeight(17.0);
-        cashText.setPrefWidth(209.0);
-        cashText.setFont(size14);
-
-        GridPane.setHalignment(bankText, javafx.geometry.HPos.CENTER);
-        GridPane.setRowIndex(bankText, 3);
-        bankText.setAlignment(Pos.CENTER);
-        bankText.setPrefHeight(20.0);
-        bankText.setPrefWidth(264.0);
-        bankText.setFont(size14);
-
-        GridPane.setRowIndex(textOut, 4);
-        textOut.setAlignment(Pos.TOP_LEFT);
-        textOut.setContentDisplay(javafx.scene.control.ContentDisplay.TOP);
-        textOut.setPrefHeight(163.0);
-        textOut.setPrefWidth(583.0);
-        textOut.setText("   Taipan, do you wish to go to:\n\n    1) Hong Kong, 2) Shanghai, 3) Nagasaki, 4) Saigon,\n    5) Manila, 6) Singapore, or 7) Batavia?\n    After typing the number you want to go to press 'Enter' or 'Z'");
-        textOut.setFont(size14);
-
-        //Added all the nodes into a single scene
-        anchorPane.getChildren().addAll(dialogueRectangle, inventoryRectangle, warehouseRectangle);
-
-        hBox.getChildren().addAll(warehouseText, wItemsText, wItemSpaceText, locationText);
-
-        hBox0.getChildren().addAll(inventoryText, inventoryHeldText, gunsText, shipStatusText);
-
-        numberInput.requestFocus();
-        flowPane.getChildren().addAll(numberInput, quitButton, continueButton);
-
-        gridPane.getColumnConstraints().add(columnConstraints);
-        gridPane.getRowConstraints().addAll(rowConstraints, rowConstraints0, rowConstraints1, rowConstraints2, rowConstraints3, rowConstraints4);
-        gridPane.getChildren().addAll(firm, hBox, hBox0, cashText, bankText, textOut, flowPane);
-
-        anchorPane.getChildren().add(gridPane);
-
-        Scene root = new Scene(anchorPane, 600, 480);
-        root.getStylesheets().add("styleguide.css");
+        Scene root = new Scene(shop.declareStage(), 600, 480);
 
         stage.setTitle("Travel");
         stage.setResizable(false);
@@ -481,26 +315,4 @@ public class TravelGUI extends Player{
         }
         return shipStatus;
     }
-
-    /**
-     * updates the text associated with the user's inventory.
-     */
-    public void updateStage(){
-        firm.setText(String.format("Firm: %s, %s", getName(), getStringLocation()));
-        wItemsText.setText(String.format("\n %d\n %d\n %d\n %d", getwOpium(), getwSilk(), getwArms(), getwGeneral()));
-        int itemsInWarehouse = getwOpium()+getwGeneral()+getwArms()+getwSilk();
-        wItemSpaceText.setText(String.format("\n\t\tIn use:\n\t\t %d \n\t\tVacant:\n\t\t %d", itemsInWarehouse, (10000-itemsInWarehouse)));
-        locationText.setText(String.format("Location\n%s", getStringLocation()));
-        int itemsInInventory = getCargoSpace()-getSilkHeld()-getOpiumHeld()-getGeneralHeld()-getArmsHeld()-10*getGuns();
-        if(itemsInInventory < 0){
-            inventoryText.setText("   Overloaded\n\t  Opium\n\t  Silk\n\t  Arms\n\t  General");
-        }else{
-            inventoryText.setText(String.format("   Hold %d\n\t  Opium\n\t  Silk\n\t  Arms\n\t  General", itemsInInventory));
-        }
-        gunsText.setText(String.format("Guns %d\n\n\n\n ", getGuns()));
-        inventoryHeldText.setText(String.format("\n %d\n %d\n %d\n %d", getOpiumHeld(), getSilkHeld(), getArmsHeld(), getGeneralHeld()));
-        shipStatusText.setText(String.format("\tDebt\n\t%d\n\n\tShip status\n\t%s: %d", getDebt(), shipStatusString(), getHP()));
-        cashText.setText(String.format("  Cash: $%,d", getMoney()));
-        bankText.setText(String.format("Bank: $%,d", getBank()));
-    }
 }
diff --git a/src/TravelText.java b/src/TravelText.java
new file mode 100644
index 0000000..d700f24
--- /dev/null
+++ b/src/TravelText.java
@@ -0,0 +1,9 @@
+public class TravelText extends Player{
+    public TravelText(Player player) {
+        Player playerDummy = new Player(player);
+        setPlayer(playerDummy);
+    }
+
+    public void travelTo() {
+    }
+}
diff --git a/src/WarehouseText.java b/src/WarehouseText.java
new file mode 100644
index 0000000..6ce6a0b
--- /dev/null
+++ b/src/WarehouseText.java
@@ -0,0 +1,9 @@
+public class WarehouseText extends Player {
+    public WarehouseText(Player player) {
+        Player playerDummy = new Player(player);
+        setPlayer(playerDummy);
+    }
+
+    public void changeWarehouse() {
+    }
+}
diff --git a/src/loanSharkText.java b/src/loanSharkText.java
new file mode 100644
index 0000000..d794b16
--- /dev/null
+++ b/src/loanSharkText.java
@@ -0,0 +1,9 @@
+public class loanSharkText extends Player{
+    public loanSharkText(Player player) {
+        Player playerDummy = new Player(player);
+        setPlayer(playerDummy);
+    }
+
+    public void loanMoney() {
+    }
+}
diff --git a/src/saves/playerSave.txt b/src/saves/playerSave.txt
index 26ef5358d74f6179a221844d8d8ece4569c294e5..53f0be612acd6db0b0afa8aecfb9f7fb186cf9c6 100644
GIT binary patch
delta 73
zcmey*^q*;iJ|p9T$p(xf)*K8B46Hy50*nv}MA|h#*=!C_2AnEkU<*miEJ(})0BQ~h
AfB*mh

delta 73
zcmey*^q*;iJ|p9u$p(xf*1`-746H!R1f@>^X$A(y875$wfq{($%79ZP3~V8ZnFWb?
E0Gi$jXaE2J


From ca778137a5be34e5c3eb9058f38981ce44725295 Mon Sep 17 00:00:00 2001
From: Solargale <harkamalsr@gmail.com>
Date: Sun, 7 Apr 2019 12:35:20 -0600
Subject: [PATCH 3/3] Fixed duplication between Shop and Travel

---
 src/TaipanShopGUI.java | 17 +++++++++--------
 src/TravelGUI.java     | 14 ++++++++------
 2 files changed, 17 insertions(+), 14 deletions(-)

diff --git a/src/TaipanShopGUI.java b/src/TaipanShopGUI.java
index d75debd..82d1020 100644
--- a/src/TaipanShopGUI.java
+++ b/src/TaipanShopGUI.java
@@ -45,6 +45,7 @@ public class TaipanShopGUI extends Player{
     private Button generalButton = new Button();
     private TextField numberInput = new TextField();
 
+
     /**
      * constructor; only runs when a Player object is provided. The constructor is fully encapsulated.
      *
@@ -240,7 +241,7 @@ public class TaipanShopGUI extends Player{
     public void initializeShop(Stage stage) {
         FileSaving saving = new FileSaving();
         saving.saveFile(getPlayer());
-
+        FlowPane flowPane = new FlowPane();
 
         buyButton.setMnemonicParsing(false);
         buyButton.setPrefHeight(25.0);
@@ -526,8 +527,10 @@ public class TaipanShopGUI extends Player{
 
         stage.setTitle("Shop");
         stage.setResizable(false);
-        Scene root = new Scene(declareStage(), 600, 480);
+        flowPane.getChildren().addAll(buyButton, sellButton, bankButton, cargoButton, loanButton, quitButton, retireButton, opiumButton, silkButton, armsButton, generalButton, numberInput);
+        Scene root = new Scene(declareStage(flowPane,firm,wItemsText,wItemSpaceText,locationText,gunsText,inventoryText,inventoryHeldText,shipStatusText,cashText,bankText,textOut), 600, 480);
         stage.setScene(root);
+        root.getStylesheets().add("styleguide.css");
 
         // general updates to the buttons, user stats/inventory, and text.
         buttonSetup("reset");
@@ -538,11 +541,12 @@ public class TaipanShopGUI extends Player{
             defaultTextOut();
             textOut.setText(temp + textOut.getText());
         }
-        //defaultTextOut();
+        defaultTextOut();
         updateStage(firm,wItemsText,wItemSpaceText,locationText,gunsText,inventoryText,inventoryHeldText,shipStatusText,cashText,bankText);
     }
 
-    public AnchorPane declareStage() {
+
+    public AnchorPane declareStage(FlowPane flowPane,Label firm, Label wItemsText, Label wItemSpaceText, Label locationText, Label gunsText, Label inventoryText, Label inventoryHeldText, Label shipStatusText, Label cashText, Label bankText, Label textOut) {
         //Declaring all the elements required for the information on screen
         Rectangle dialogueRectangle = new Rectangle();
         Rectangle inventoryRectangle = new Rectangle();
@@ -558,7 +562,6 @@ public class TaipanShopGUI extends Player{
         RowConstraints rowConstraints4 = new RowConstraints();
         HBox hBox = new HBox();
         HBox hBox0 = new HBox();
-        FlowPane flowPane = new FlowPane();
         Font size14 = new Font(14.0);
         Label warehouseText = new Label();
 
@@ -707,8 +710,6 @@ public class TaipanShopGUI extends Player{
 
         hBox0.getChildren().addAll(inventoryText, inventoryHeldText, gunsText, shipStatusText);
 
-        //flowPane.getChildren().addAll(buyButton, sellButton, bankButton, cargoButton, loanButton, quitButton, retireButton, opiumButton, silkButton, armsButton, generalButton, numberInput);
-
         gridPane.getColumnConstraints().add(columnConstraints);
         gridPane.getRowConstraints().addAll(rowConstraints, rowConstraints0, rowConstraints1, rowConstraints2, rowConstraints3, rowConstraints4);
         gridPane.getChildren().addAll(firm, hBox, hBox0, cashText, bankText, textOut, flowPane);
@@ -722,7 +723,7 @@ public class TaipanShopGUI extends Player{
      * updates the text associated with the user's inventory.
      */
     public void updateStage(Label firm, Label wItemsText, Label wItemSpaceText, Label locationText, Label gunsText, Label inventoryText, Label inventoryHeldText, Label shipStatusText, Label cashText, Label bankText) {
-        TaipanShopLogic logic = new TaipanShopLogic(getPlayer());
+        TaipanShopLogic logic = new TaipanShopLogic(super.getPlayer());
         firm.setText(String.format("Firm: %s, %s", getName(), logic.getStringLocation()));
         wItemsText.setText(String.format("\n %d\n %d\n %d\n %d", getwOpium(), getwSilk(), getwArms(), getwGeneral()));
         int itemsInWarehouse = getwOpium() + getwGeneral() + getwArms() + getwSilk();
diff --git a/src/TravelGUI.java b/src/TravelGUI.java
index 3361497..f3fabc0 100644
--- a/src/TravelGUI.java
+++ b/src/TravelGUI.java
@@ -34,6 +34,7 @@ public class TravelGUI extends Player{
     private Label cashText = new Label();
     private Label bankText = new Label();
     private Label textOut = new Label();
+    private FlowPane flowPane = new FlowPane();
 
     private Button quitButton = new Button();
     private Button continueButton = new Button();
@@ -62,10 +63,7 @@ public class TravelGUI extends Player{
      * @return stage so that another class can switch to the stage
      */
     public Stage initializeTravel(Stage stage) {
-        //Updates the stage for the first-time you read it
-        shop.updateStage(firm,wItemsText,wItemSpaceText,locationText,gunsText,inventoryText,inventoryHeldText,shipStatusText,cashText,bankText);
 
-        shop.declareStage();
 
         //Creating the continue and quit buttons
         quitButton.setPrefHeight(25.0);
@@ -171,9 +169,13 @@ public class TravelGUI extends Player{
         firm.setPrefHeight(27.0);
         firm.setPrefWidth(632.0);
         firm.setFont(new Font(18.0));
-
-        Scene root = new Scene(shop.declareStage(), 600, 480);
-
+        flowPane.getChildren().addAll(numberInput, quitButton, continueButton);
+        TaipanShopGUI shop = new TaipanShopGUI(super.getPlayer());
+        Scene root = new Scene(shop.declareStage(flowPane,firm,wItemsText,wItemSpaceText,locationText,gunsText,inventoryText,inventoryHeldText,shipStatusText,cashText,bankText,textOut), 600, 480);
+        root.getStylesheets().add("styleguide.css");
+        //Updates the stage for the first-time you read it
+        shop.updateStage(firm,wItemsText,wItemSpaceText,locationText,gunsText,inventoryText,inventoryHeldText,shipStatusText,cashText,bankText);
+        textOut.setText("   Taipan, do you wish to go to:\n\n    1) Hong Kong, 2) Shanghai, 3) Nagasaki, 4) Saigon,\n    5) Manila, 6) Singapore, or 7) Batavia?\n    After typing the number you want to go to press 'Enter' or 'Z'");
         stage.setTitle("Travel");
         stage.setResizable(false);
         stage.setScene(root);