From 1d5e5aa70660d5a43aa80307f759040dd6d78cac Mon Sep 17 00:00:00 2001
From: Siddhant Dewani <siddhant.dewani@ucalgary.ca>
Date: Sun, 10 Mar 2019 21:11:49 -0600
Subject: [PATCH 1/5] Fixed bank and loanshark

---
 src/TaipanShopGUI.java |  4 ++--
 src/bankGUI.java       | 21 +++++++++++----------
 src/loanSharkGUI.java  | 12 ++++++------
 3 files changed, 19 insertions(+), 18 deletions(-)

diff --git a/src/TaipanShopGUI.java b/src/TaipanShopGUI.java
index fbf07a9..2822951 100644
--- a/src/TaipanShopGUI.java
+++ b/src/TaipanShopGUI.java
@@ -491,7 +491,7 @@ public class TaipanShopGUI {
         bankButton.setOnAction(new EventHandler<ActionEvent>() {
             @Override
             public void handle(ActionEvent event) {
-                bankGUI bank = new bankGUI();
+                bankGUI bank = new bankGUI(player);
                 bank.initializeBank(stage);
                 stage.show();
             }
@@ -520,7 +520,7 @@ public class TaipanShopGUI {
         loanButton.setOnAction(new EventHandler<ActionEvent>() {
             @Override
             public void handle(ActionEvent event) {
-                loanSharkGUI loan = new loanSharkGUI();
+                loanSharkGUI loan = new loanSharkGUI(player);
                 loan.initializeLoanShark(stage);
                 stage.show();
             }
diff --git a/src/bankGUI.java b/src/bankGUI.java
index 4818102..5c0ad4d 100644
--- a/src/bankGUI.java
+++ b/src/bankGUI.java
@@ -12,7 +12,7 @@ import javafx.scene.layout.VBox;
 import javafx.stage.Stage;
 
 public class bankGUI{
-    private Player player = new Player();
+    private Player player;
     /**
      * setter method that takes in a Player object as an argument.
      *
@@ -36,19 +36,19 @@ public class bankGUI{
      *
      //* @param player object of the class Player
      */
-    //public bankGUI(Player player){
-    //    Player playerDummy = new Player(player);
-    //    this.player = playerDummy;
-    //}
+    public bankGUI(Player player){
+        Player playerDummy = new Player(player);
+        this.player = playerDummy;
+    }
 
     public Stage initializeBank(Stage primaryStage) {
         primaryStage.setTitle("Bank");
 
         //Declaring each Layout
         BorderPane brdr1 = new BorderPane();
-        HBox hbx1 = new HBox(10);
-        HBox hbx2 = new HBox(10);
-        VBox vbx1 = new VBox(10);
+        HBox hbx1 = new HBox(30);
+        HBox hbx2 = new HBox(30);
+        VBox vbx1 = new VBox(30);
 
         //Declaring all Variables
         Label l1 = new Label("Player:  " + player.getName());
@@ -88,11 +88,11 @@ public class bankGUI{
         brdr1.setTop(vbx1);
 
         // Set the event handler when the deposit button is clicked
-        boolean keepGoing = true;
         b1.setOnAction(new EventHandler<ActionEvent>() {
                            @Override
                            public void handle(ActionEvent event) {
                                int withdraw = Integer.parseInt(txtField1.getText());
+                               System.out.println(withdraw);
                                if(withdraw <= player.getBank()){
                                    player.setMoney(withdraw + player.getMoney());
                                    player.setBank(player.getBank()-withdraw);
@@ -111,6 +111,7 @@ public class bankGUI{
                            @Override
                            public void handle(ActionEvent event) {
                                int deposit = Integer.parseInt(txtField1.getText());
+                               System.out.println(deposit);
                                if(deposit <= player.getMoney()){
                                    player.setBank(deposit + player.getBank());
                                    player.setMoney(player.getMoney()-deposit);
@@ -146,7 +147,7 @@ public class bankGUI{
 
 
     public void start(Stage primaryStage) {
-        bankGUI bank = new bankGUI();
+        bankGUI bank = new bankGUI(player);
         bank.initializeBank(primaryStage);
         primaryStage.show();
     }
diff --git a/src/loanSharkGUI.java b/src/loanSharkGUI.java
index c1dc880..4c335cd 100644
--- a/src/loanSharkGUI.java
+++ b/src/loanSharkGUI.java
@@ -12,7 +12,7 @@ import javafx.scene.layout.VBox;
 import javafx.stage.Stage;
 
 public class loanSharkGUI{
-        private Player player = new Player();
+        private Player player;
         /**
          * setter method that takes in a Player object as an argument.
          *
@@ -36,10 +36,10 @@ public class loanSharkGUI{
          *
          //* @param player object of the class Player
          */
-        //public loanSharkGUI(Player player){
-        //    Player playerDummy = new Player(player);
-        //    this.player = playerDummy;
-        //}
+        public loanSharkGUI(Player player){
+            Player playerDummy = new Player(player);
+            this.player = playerDummy;
+        }
 
     public Stage initializeLoanShark(Stage primaryStage) {
         primaryStage.setTitle("Loan Shark");
@@ -151,7 +151,7 @@ public class loanSharkGUI{
 
 
     public void start(Stage primaryStage) {
-        loanSharkGUI loan = new loanSharkGUI();
+        loanSharkGUI loan = new loanSharkGUI(player);
         loan.initializeLoanShark(primaryStage);
         primaryStage.show();
     }

From 13f30b681a852c593fad3836fa23195806ac7645 Mon Sep 17 00:00:00 2001
From: Vikramb987 <47336882+Vikramb987@users.noreply.github.com>
Date: Sun, 10 Mar 2019 21:12:26 -0600
Subject: [PATCH 2/5] Update TaipanShopGUI.java

made it so that certain buttons are invisible in certain locations.
---
 src/TaipanShopGUI.java | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/src/TaipanShopGUI.java b/src/TaipanShopGUI.java
index 2822951..7c794cf 100644
--- a/src/TaipanShopGUI.java
+++ b/src/TaipanShopGUI.java
@@ -491,7 +491,7 @@ public class TaipanShopGUI {
         bankButton.setOnAction(new EventHandler<ActionEvent>() {
             @Override
             public void handle(ActionEvent event) {
-                bankGUI bank = new bankGUI(player);
+                bankGUI bank = new bankGUI();
                 bank.initializeBank(stage);
                 stage.show();
             }
@@ -520,7 +520,7 @@ public class TaipanShopGUI {
         loanButton.setOnAction(new EventHandler<ActionEvent>() {
             @Override
             public void handle(ActionEvent event) {
-                loanSharkGUI loan = new loanSharkGUI(player);
+                loanSharkGUI loan = new loanSharkGUI();
                 loan.initializeLoanShark(stage);
                 stage.show();
             }
@@ -754,6 +754,7 @@ public class TaipanShopGUI {
         stage.setResizable(false);
         stage.setScene(root);
 
+        buttonSetup("reset");
         updatePrices();
         defaultTextOut();
         updateStage();

From 461171ff469a9db0d1450b0ac9d57434f16c356d Mon Sep 17 00:00:00 2001
From: Vikram <arshvikram@gmail.com>
Date: Mon, 25 Feb 2019 19:42:37 -0700
Subject: [PATCH 3/5] minor changes. Still in progress.

---
 src/Player.java | 16 +++++++++++++++-
 1 file changed, 15 insertions(+), 1 deletion(-)

diff --git a/src/Player.java b/src/Player.java
index 8ff4e2b..8542fd6 100644
--- a/src/Player.java
+++ b/src/Player.java
@@ -444,6 +444,20 @@ public class Player {
     public void gameOver(){
         System.out.flush();
         System.out.println("Game over");
-        System.exit(0);
+    }
+
+    public boolean playAgain(){
+        Scanner input = new Scanner(System.in);
+        System.out.println("Would you like to play again? Y/N");
+        while(true){
+            String response = input.nextLine();
+            if(response.equalsIgnoreCase("Y")){
+                return true;
+            }else if(response.equalsIgnoreCase("N")){
+                System.exit(0);
+            }else{
+                System.out.println("That is not a valid input.");
+            }
+        }
     }
 }

From 0c5317cf6fbacb52d9b18abde01bcc5ea44c3086 Mon Sep 17 00:00:00 2001
From: Vikramb987 <47336882+Vikramb987@users.noreply.github.com>
Date: Sun, 10 Mar 2019 21:15:38 -0600
Subject: [PATCH 4/5] Update TaipanShopGUI.java

fixed to adapt to loanshark
---
 src/TaipanShopGUI.java | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/TaipanShopGUI.java b/src/TaipanShopGUI.java
index 7c794cf..55a2b0a 100644
--- a/src/TaipanShopGUI.java
+++ b/src/TaipanShopGUI.java
@@ -491,7 +491,7 @@ public class TaipanShopGUI {
         bankButton.setOnAction(new EventHandler<ActionEvent>() {
             @Override
             public void handle(ActionEvent event) {
-                bankGUI bank = new bankGUI();
+                bankGUI bank = new bankGUI(getPlayer());
                 bank.initializeBank(stage);
                 stage.show();
             }
@@ -520,7 +520,7 @@ public class TaipanShopGUI {
         loanButton.setOnAction(new EventHandler<ActionEvent>() {
             @Override
             public void handle(ActionEvent event) {
-                loanSharkGUI loan = new loanSharkGUI();
+                loanSharkGUI loan = new loanSharkGUI(getPlayer());
                 loan.initializeLoanShark(stage);
                 stage.show();
             }

From ffb77b14a013f26d65fbd3c24d6fb1f194b5f9f5 Mon Sep 17 00:00:00 2001
From: Vikram <arshvikram@gmail.com>
Date: Sun, 10 Mar 2019 21:49:50 -0600
Subject: [PATCH 5/5] some changes...

---
 .idea/misc.xml         |   2 +-
 .idea/workspace.xml    | 268 ++++++++++++++++++++++++++++-------------
 src/Player.java        |  18 +--
 src/StartGUI.java      |  10 +-
 src/TaipanShop.java    |  61 +++++++++-
 src/TaipanShopGUI.java |  27 +++--
 src/TravelGUI.java     |  23 ++--
 7 files changed, 276 insertions(+), 133 deletions(-)

diff --git a/.idea/misc.xml b/.idea/misc.xml
index c496ad9..fa20b13 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" 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 4d27f11..ccfdf14 100644
--- a/.idea/workspace.xml
+++ b/.idea/workspace.xml
@@ -2,7 +2,12 @@
 <project version="4">
   <component name="ChangeListManager">
     <list default="true" id="3114a2b9-4919-4fdf-8fd9-d03b60109ce4" name="Default Changelist" comment="">
+      <change beforePath="$PROJECT_DIR$/.idea/misc.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/misc.xml" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/Player.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Player.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/StartGUI.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/StartGUI.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/TaipanShop.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/TaipanShop.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/TaipanShopGUI.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/TaipanShopGUI.java" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/src/TravelGUI.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/TravelGUI.java" afterDir="false" />
     </list>
     <ignored path="$PROJECT_DIR$/out/" />
@@ -17,10 +22,82 @@
   <component name="FileEditorManager">
     <leaf SIDE_TABS_SIZE_LIMIT_KEY="300">
       <file pinned="false" current-in-tab="false">
-        <entry file="file://$PROJECT_DIR$/src/ShipWarfareGUI.java">
+        <entry file="file://$PROJECT_DIR$/src/main.java">
           <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="218">
-              <caret line="386" column="35" selection-start-line="386" selection-start-column="35" selection-end-line="386" selection-end-column="35" />
+            <state relative-caret-position="546">
+              <caret line="26" selection-start-line="26" selection-end-line="26" />
+            </state>
+          </provider>
+        </entry>
+      </file>
+      <file pinned="false" current-in-tab="false">
+        <entry file="file://$PROJECT_DIR$/src/TaipanShop.java">
+          <provider selected="true" editor-type-id="text-editor">
+            <state relative-caret-position="399">
+              <caret line="62" selection-start-line="62" selection-end-line="62" />
+            </state>
+          </provider>
+        </entry>
+      </file>
+      <file pinned="false" current-in-tab="false">
+        <entry file="file://$PROJECT_DIR$/src/MainGUI.java">
+          <provider selected="true" editor-type-id="text-editor">
+            <state relative-caret-position="483">
+              <caret line="45" column="39" selection-start-line="45" selection-start-column="39" selection-end-line="45" selection-end-column="39" />
+            </state>
+          </provider>
+        </entry>
+      </file>
+      <file pinned="false" current-in-tab="true">
+        <entry file="file://$PROJECT_DIR$/src/StartGUI.java">
+          <provider selected="true" editor-type-id="text-editor">
+            <state relative-caret-position="1497">
+              <caret line="145" column="36" selection-start-line="145" selection-start-column="36" selection-end-line="145" selection-end-column="36" />
+            </state>
+          </provider>
+        </entry>
+      </file>
+      <file pinned="false" current-in-tab="false">
+        <entry file="file://$PROJECT_DIR$/src/TravelGUI.java">
+          <provider selected="true" editor-type-id="text-editor">
+            <state relative-caret-position="19">
+              <caret line="436" column="33" lean-forward="true" selection-start-line="436" selection-start-column="33" selection-end-line="436" selection-end-column="33" />
+            </state>
+          </provider>
+        </entry>
+      </file>
+      <file pinned="false" current-in-tab="false">
+        <entry file="file://$PROJECT_DIR$/src/TaipanShopGUI.java">
+          <provider selected="true" editor-type-id="text-editor">
+            <state relative-caret-position="124">
+              <caret line="779" column="4" lean-forward="true" selection-start-line="779" selection-start-column="4" selection-end-line="796" selection-end-column="5" />
+            </state>
+          </provider>
+        </entry>
+      </file>
+      <file pinned="false" current-in-tab="false">
+        <entry file="file://$PROJECT_DIR$/src/loanSharkGUI.java">
+          <provider selected="true" editor-type-id="text-editor">
+            <state relative-caret-position="-273">
+              <caret line="13" column="13" selection-start-line="13" selection-start-column="13" selection-end-line="13" selection-end-column="13" />
+            </state>
+          </provider>
+        </entry>
+      </file>
+      <file pinned="false" current-in-tab="false">
+        <entry file="file://$PROJECT_DIR$/src/Travel.java">
+          <provider selected="true" editor-type-id="text-editor">
+            <state relative-caret-position="774">
+              <caret line="157" column="43" selection-start-line="157" selection-start-column="43" selection-end-line="157" selection-end-column="43" />
+            </state>
+          </provider>
+        </entry>
+      </file>
+      <file pinned="false" current-in-tab="false">
+        <entry file="file://$PROJECT_DIR$/src/ShipWarfare.java">
+          <provider selected="true" editor-type-id="text-editor">
+            <state relative-caret-position="-13">
+              <caret line="303" column="24" lean-forward="true" selection-start-line="303" selection-start-column="24" selection-end-line="303" selection-end-column="24" />
               <folding>
                 <element signature="imports" expanded="true" />
               </folding>
@@ -29,28 +106,10 @@
         </entry>
       </file>
       <file pinned="false" current-in-tab="false">
-        <entry file="file://$PROJECT_DIR$/src/TaipanShopGUI.java">
+        <entry file="file://$PROJECT_DIR$/src/Start.java">
           <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="320">
-              <caret line="805" column="49" lean-forward="true" selection-start-line="805" selection-end-line="806" />
-            </state>
-          </provider>
-        </entry>
-      </file>
-      <file pinned="false" current-in-tab="false">
-        <entry file="file://$PROJECT_DIR$/src/MainGUI.java">
-          <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="378">
-              <caret line="55" column="28" selection-start-line="53" selection-start-column="7" selection-end-line="55" selection-end-column="28" />
-            </state>
-          </provider>
-        </entry>
-      </file>
-      <file pinned="false" current-in-tab="true">
-        <entry file="file://$PROJECT_DIR$/src/TravelGUI.java">
-          <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="6570">
-              <caret line="455" column="42" selection-start-line="455" selection-start-column="42" selection-end-line="455" selection-end-column="42" />
+            <state relative-caret-position="438">
+              <caret line="25" column="7" lean-forward="true" selection-start-line="25" selection-start-column="7" selection-end-line="25" selection-end-column="7" />
             </state>
           </provider>
         </entry>
@@ -66,10 +125,6 @@
   </component>
   <component name="FindInProjectRecents">
     <findStrings>
-      <find>numOfLittyShips</find>
-      <find>delay</find>
-      <find>Hp</find>
-      <find>shipwarfare</find>
       <find>destroyPeasa</find>
       <find>destr</find>
       <find>destro</find>
@@ -96,6 +151,10 @@
       <find>continue</find>
       <find>cashTex</find>
       <find>cashTe</find>
+      <find>10000</find>
+      <find>too</find>
+      <find>shipstatusstr</find>
+      <find>shipstatus</find>
     </findStrings>
     <replaceStrings>
       <replace>HP</replace>
@@ -122,16 +181,17 @@
         <option value="$PROJECT_DIR$/src/Player.java" />
         <option value="$PROJECT_DIR$/src/ShipWarfare.java" />
         <option value="$PROJECT_DIR$/src/ShipWarfareGUI.java" />
+        <option value="$PROJECT_DIR$/src/StartGUI.java" />
         <option value="$PROJECT_DIR$/src/TaipanShopGUI.java" />
         <option value="$PROJECT_DIR$/src/TravelGUI.java" />
       </list>
     </option>
   </component>
-  <component name="ProjectFrameBounds">
-    <option name="x" value="48" />
-    <option name="y" value="23" />
-    <option name="width" value="1189" />
-    <option name="height" value="652" />
+  <component name="ProjectFrameBounds" extendedState="6">
+    <option name="x" value="167" />
+    <option name="y" value="-11" />
+    <option name="width" value="1696" />
+    <option name="height" value="1026" />
   </component>
   <component name="ProjectLevelVcsManager" settingsEditedManually="true" />
   <component name="ProjectView">
@@ -139,6 +199,7 @@
       <foldersAlwaysOnTop value="true" />
     </navigator>
     <panes>
+      <pane id="PackagesPane" />
       <pane id="ProjectPane">
         <subPane>
           <expand>
@@ -155,7 +216,6 @@
           <select />
         </subPane>
       </pane>
-      <pane id="PackagesPane" />
       <pane id="Scope" />
     </panes>
   </component>
@@ -163,7 +223,7 @@
     <property name="ChangesTree.GroupingKeys" value="" />
     <property name="WebServerToolWindowFactoryState" value="false" />
     <property name="aspect.path.notification.shown" value="true" />
-    <property name="com.android.tools.idea.instantapp.provision.ProvisionBeforeRunTaskProvider.myTimeStamp" value="1552270131392" />
+    <property name="com.android.tools.idea.instantapp.provision.ProvisionBeforeRunTaskProvider.myTimeStamp" value="1552275701838" />
     <property name="extract.method.default.visibility" value="private" />
     <property name="last_opened_file_path" value="$PROJECT_DIR$/../GitHub/Cpsc233" />
     <property name="project.structure.last.edited" value="Project" />
@@ -507,13 +567,13 @@
     <servers />
   </component>
   <component name="TimeTrackingManager">
-    <option name="totallyTimeSpent" value="70808000" />
+    <option name="totallyTimeSpent" value="75291000" />
   </component>
   <component name="ToolWindowManager">
-    <frame x="48" y="23" width="1189" height="652" extended-state="0" />
+    <frame x="-8" y="-8" width="1936" height="1056" extended-state="6" />
     <editor active="true" />
     <layout>
-      <window_info active="true" content_ui="combo" id="Project" order="0" visible="true" weight="0.2755013" />
+      <window_info content_ui="combo" id="Project" order="0" visible="true" weight="0.28997868" />
       <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" />
@@ -522,7 +582,7 @@
       <window_info id="Favorites" order="6" side_tool="true" />
       <window_info anchor="bottom" id="Message" order="0" />
       <window_info anchor="bottom" id="Find" order="1" weight="0.32922733" />
-      <window_info anchor="bottom" id="Run" order="2" weight="0.9357143" />
+      <window_info active="true" anchor="bottom" id="Run" order="2" visible="true" weight="0.09967497" />
       <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" />
@@ -677,62 +737,29 @@
       </provider>
     </entry>
     <entry file="file://$PROJECT_DIR$/src/Game.java" />
-    <entry file="file://$PROJECT_DIR$/src/Warehouse.java" />
-    <entry file="file://$PROJECT_DIR$/src/Bank.java" />
-    <entry file="file://$PROJECT_DIR$/src/TaipanShop.java" />
-    <entry file="file://$PROJECT_DIR$/src/Travel.java">
+    <entry file="file://$PROJECT_DIR$/src/Warehouse.java">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="27">
-          <caret line="125" column="63" selection-start-line="125" selection-start-column="63" selection-end-line="125" selection-end-column="63" />
-          <folding>
-            <element signature="imports" expanded="true" />
-          </folding>
+        <state relative-caret-position="945">
+          <caret line="45" selection-start-line="45" selection-end-line="45" />
         </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/Bank.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 relative-caret-position="2100">
+          <caret line="100" column="6" selection-start-line="100" selection-start-column="6" selection-end-line="100" selection-end-column="6" />
         </state>
       </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">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="15">
-          <caret line="1" column="13" selection-start-line="1" selection-start-column="13" selection-end-line="1" selection-end-column="13" />
-        </state>
-      </provider>
-    </entry>
     <entry file="file://$PROJECT_DIR$/src/Player.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="120">
-          <caret line="8" column="29" selection-start-line="8" selection-start-column="29" selection-end-line="8" selection-end-column="29" />
-        </state>
-      </provider>
+      <provider selected="true" editor-type-id="text-editor" />
     </entry>
     <entry file="file://$PROJECT_DIR$/src/main.java">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="195">
-          <caret line="13" column="5" lean-forward="true" selection-start-line="13" selection-start-column="5" selection-end-line="13" selection-end-column="5" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/ShipWarfare.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="-1074">
-          <caret line="17" column="35" selection-start-line="17" selection-start-column="35" selection-end-line="17" selection-end-column="35" />
-          <folding>
-            <element signature="imports" expanded="true" />
-          </folding>
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/MainGUI.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="378">
-          <caret line="55" column="28" selection-start-line="53" selection-start-column="7" selection-end-line="55" selection-end-column="28" />
+        <state relative-caret-position="546">
+          <caret line="26" selection-start-line="26" selection-end-line="26" />
         </state>
       </provider>
     </entry>
@@ -746,17 +773,86 @@
         </state>
       </provider>
     </entry>
+    <entry file="file://$PROJECT_DIR$/src/loanShark.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="1995">
+          <caret line="95" column="5" selection-start-line="95" selection-start-column="5" selection-end-line="95" selection-end-column="5" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/Start.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="438">
+          <caret line="25" column="7" lean-forward="true" selection-start-line="25" selection-start-column="7" selection-end-line="25" selection-end-column="7" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/Travel.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="774">
+          <caret line="157" column="43" selection-start-line="157" selection-start-column="43" selection-end-line="157" selection-end-column="43" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/ShopGUI.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="693">
+          <caret line="113" column="15" lean-forward="true" selection-start-line="113" selection-start-column="15" selection-end-line="113" selection-end-column="15" />
+          <folding>
+            <element signature="imports" expanded="true" />
+          </folding>
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/loanSharkGUI.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="-273">
+          <caret line="13" column="13" selection-start-line="13" selection-start-column="13" selection-end-line="13" selection-end-column="13" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/ShipWarfare.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="-13">
+          <caret line="303" column="24" lean-forward="true" selection-start-line="303" selection-start-column="24" selection-end-line="303" selection-end-column="24" />
+          <folding>
+            <element signature="imports" expanded="true" />
+          </folding>
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/MainGUI.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="483">
+          <caret line="45" column="39" selection-start-line="45" selection-start-column="39" selection-end-line="45" selection-end-column="39" />
+        </state>
+      </provider>
+    </entry>
     <entry file="file://$PROJECT_DIR$/src/TaipanShopGUI.java">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="320">
-          <caret line="805" column="49" lean-forward="true" selection-start-line="805" selection-end-line="806" />
+        <state relative-caret-position="124">
+          <caret line="779" column="4" lean-forward="true" selection-start-line="779" selection-start-column="4" selection-end-line="796" selection-end-column="5" />
         </state>
       </provider>
     </entry>
     <entry file="file://$PROJECT_DIR$/src/TravelGUI.java">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="6570">
-          <caret line="455" column="42" selection-start-line="455" selection-start-column="42" selection-end-line="455" selection-end-column="42" />
+        <state relative-caret-position="19">
+          <caret line="436" column="33" lean-forward="true" selection-start-line="436" selection-start-column="33" selection-end-line="436" selection-end-column="33" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/TaipanShop.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="399">
+          <caret line="62" selection-start-line="62" selection-end-line="62" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/StartGUI.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="1497">
+          <caret line="145" column="36" selection-start-line="145" selection-start-column="36" selection-end-line="145" selection-end-column="36" />
         </state>
       </provider>
     </entry>
diff --git a/src/Player.java b/src/Player.java
index 8542fd6..02ad4ec 100644
--- a/src/Player.java
+++ b/src/Player.java
@@ -1,5 +1,3 @@
-import java.util.Scanner;
-
 public class Player {
 
     private String name = "Taipan";
@@ -444,20 +442,6 @@ public class Player {
     public void gameOver(){
         System.out.flush();
         System.out.println("Game over");
-    }
-
-    public boolean playAgain(){
-        Scanner input = new Scanner(System.in);
-        System.out.println("Would you like to play again? Y/N");
-        while(true){
-            String response = input.nextLine();
-            if(response.equalsIgnoreCase("Y")){
-                return true;
-            }else if(response.equalsIgnoreCase("N")){
-                System.exit(0);
-            }else{
-                System.out.println("That is not a valid input.");
-            }
-        }
+        System.exit(0);
     }
 }
diff --git a/src/StartGUI.java b/src/StartGUI.java
index de9b167..efb2229 100644
--- a/src/StartGUI.java
+++ b/src/StartGUI.java
@@ -140,16 +140,14 @@ public class StartGUI {
 
                 String response = nameField.getText();
                 // purely for testing purposes.
-                if (player.getName().equalsIgnoreCase("Vikram")) {
+                if (response.equalsIgnoreCase("Vikram")) {
                     player.setMoney(999999999);
                     player.setBank(999999999);
-                    player.setGuns(999);
+                    player.setGuns(0);
                     player.setHP(99999999);
-                    player.setCargoSpace(99999999);
-                }
-                else{
-                    setFirm(response);
+                    player.setCargoSpace(Integer.MAX_VALUE);
                 }
+                setFirm(response);
 
                 TaipanShopGUI shop = new TaipanShopGUI(player);
                 shop.initializeShop(stage);
diff --git a/src/TaipanShop.java b/src/TaipanShop.java
index 9e8af02..e1c0399 100644
--- a/src/TaipanShop.java
+++ b/src/TaipanShop.java
@@ -1,6 +1,65 @@
 import java.util.Random;
 import java.util.Scanner;
-public class TaipanShop {
+import javafx.application.Application;
+import javafx.geometry.Insets;
+import javafx.scene.Scene;
+import javafx.scene.control.Label;
+import javafx.scene.layout.GridPane;
+import javafx.scene.layout.HBox;
+import javafx.stage.Stage;
+public class TaipanShop extends Application {
+
+    public static void main(String args[]){
+        launch(args);
+    }
+    public void start(Stage stage){
+        stage.setTitle("Shop");
+
+        GridPane grid = new GridPane();
+        grid.setPadding(new Insets(10,10,10,10));
+        grid.setVgap(20);
+        grid.setHgap(20);
+
+        grid.add(new Label("Firm: "+ player.getName()), 2, 0);
+
+        HBox warehouse = new HBox();
+        warehouse.setSpacing(20);
+        int itemsInWarehouse = player.getwOpium()+player.getwGeneral()+player.getwArms()+player.getwSilk();
+        Label ware1 = new Label("Warehouse\n\tOpium\n\tSilk\n\tArms\n\tGeneral");
+        Label ware2 = new Label("\n"+player.getwOpium()+"\n"+player.getwSilk()+"\n"+player.getwArms()+"\n"+player.getwGeneral());
+        Label ware3 = new Label("\nIn use:\n " + itemsInWarehouse + "\nVacant:\n " + (10000 - itemsInWarehouse));
+        warehouse.getChildren().addAll(ware1, ware2, new Label(), ware3);
+
+        HBox inventory = new HBox();
+        inventory.setSpacing(20);
+        int itemsInInventory = player.getCargoSpace()-player.getSilkHeld()-player.getOpiumHeld()-player.getGeneralHeld()-player.getArmsHeld();
+        Label inv1 = new Label("Hold "+itemsInInventory+"\n\tOpium\n\tSilk\n\tArms\n\tGeneral");
+        Label inv2 = new Label("\n"+player.getOpiumHeld()+"\n"+player.getSilkHeld()+"\n"+player.getArmsHeld()+"\n"+player.getGeneralHeld());
+        Label inv3 = new Label("Guns "+player.getGuns());
+        inventory.getChildren().addAll(inv1, inv2, new Label(), inv3);
+
+        String location;
+        switch(player.getLocation()){
+            case 1: location = "Hong Kong"; break;
+            case 2: location = "Shanghai"; break;
+            case 3: location = "Nagasaki"; break;
+            case 4: location = "Saigon"; break;
+            case 5: location = "Manila"; break;
+            case 6: location = "Singapore"; break;
+            case 7: location = "Batavia"; break;
+            default: location = "Error"; break;
+        }
+
+        grid.add(warehouse, 1, 1);
+        grid.add(inventory, 1, 2);
+        grid.add(new Label("\n\n\n Location\n"+location),3, 1 );
+        grid.add(new Label("Debt\n"+player.getDebt()), 3, 2);
+
+        Scene root = new Scene(grid, 600, 480);
+        stage.setResizable(false);
+        stage.setScene(root);
+        stage.show();
+    }
 
     private Player player;
     private int opiumPrice = 16000;
diff --git a/src/TaipanShopGUI.java b/src/TaipanShopGUI.java
index 7c794cf..0a2beee 100644
--- a/src/TaipanShopGUI.java
+++ b/src/TaipanShopGUI.java
@@ -491,7 +491,7 @@ public class TaipanShopGUI {
         bankButton.setOnAction(new EventHandler<ActionEvent>() {
             @Override
             public void handle(ActionEvent event) {
-                bankGUI bank = new bankGUI();
+                bankGUI bank = new bankGUI(getPlayer());
                 bank.initializeBank(stage);
                 stage.show();
             }
@@ -520,7 +520,7 @@ public class TaipanShopGUI {
         loanButton.setOnAction(new EventHandler<ActionEvent>() {
             @Override
             public void handle(ActionEvent event) {
-                loanSharkGUI loan = new loanSharkGUI();
+                loanSharkGUI loan = new loanSharkGUI(getPlayer());
                 loan.initializeLoanShark(stage);
                 stage.show();
             }
@@ -779,16 +779,19 @@ public class TaipanShopGUI {
     
     public String shipStatusString(){
         String shipStatus;
-        switch(player.getHP()){
-            case 100: shipStatus = "Mint Condition"; break;
-            case 80: shipStatus = "Great"; break;
-            case 70: shipStatus = "Good"; break;
-            case 60: shipStatus = "Acceptable"; break;
-            case 50: shipStatus = "Tolerable"; break;
-            case 30: shipStatus = "Damaged"; break;
-            case 10: shipStatus = "Poor"; break;
-            case 1: shipStatus = "Extremely Poor"; break;
-            default: shipStatus = "Sinking"; break;
+        switch(player.getHP()/10){
+            case 10: shipStatus = "Mint Condition"; break;
+            case 9: shipStatus = "Near Perfect"; break;
+            case 8: shipStatus = "Great"; break;
+            case 7: shipStatus = "Good"; break;
+            case 6: shipStatus = "Acceptable"; break;
+            case 5: shipStatus = "Tolerable"; break;
+            case 4: shipStatus = "Needs Repair"; break;
+            case 3: shipStatus = "Damaged"; break;
+            case 2: shipStatus = "Indangered"; break;
+            case 1: shipStatus = "Near Sinking"; break;
+            case 0: shipStatus = "Sinking"; break;
+            default: shipStatus = "Invincible"; break;
         }
         return shipStatus;
     }
diff --git a/src/TravelGUI.java b/src/TravelGUI.java
index a5b96d6..4bcca68 100644
--- a/src/TravelGUI.java
+++ b/src/TravelGUI.java
@@ -423,16 +423,19 @@ public class TravelGUI{
 
     public String shipStatusString(){
         String shipStatus;
-        switch(player.getHP()){
-            case 100: shipStatus = "Mint Condition"; break;
-            case 80: shipStatus = "Great"; break;
-            case 70: shipStatus = "Good"; break;
-            case 60: shipStatus = "Acceptable"; break;
-            case 50: shipStatus = "Tolerable"; break;
-            case 30: shipStatus = "Damaged"; break;
-            case 10: shipStatus = "Poor"; break;
-            case 1: shipStatus = "Extremely Poor"; break;
-            default: shipStatus = "Sinking"; break;
+        switch(player.getHP()/10){
+            case 10: shipStatus = "Mint Condition"; break;
+            case 9: shipStatus = "Near Perfect"; break;
+            case 8: shipStatus = "Great"; break;
+            case 7: shipStatus = "Good"; break;
+            case 6: shipStatus = "Acceptable"; break;
+            case 5: shipStatus = "Tolerable"; break;
+            case 4: shipStatus = "Needs Repair"; break;
+            case 3: shipStatus = "Damaged"; break;
+            case 2: shipStatus = "Indangered"; break;
+            case 1: shipStatus = "Near Sinking"; break;
+            case 0: shipStatus = "Sinking"; break;
+            default: shipStatus = "Invincible"; break;
         }
         return shipStatus;
     }