From 5156547ad0a7cab95ad3273c8ba728c3f898c7e8 Mon Sep 17 00:00:00 2001
From: Vikram <arshvikram@gmail.com>
Date: Tue, 19 Feb 2019 10:08:52 -0700
Subject: [PATCH] now fully uses the player class

---
 .idea/workspace.xml |  75 ++++++++----
 src/TaipanShop.java | 274 ++++++++++++++++++++++++++------------------
 2 files changed, 215 insertions(+), 134 deletions(-)

diff --git a/.idea/workspace.xml b/.idea/workspace.xml
index ae040a0..9d8e6fc 100644
--- a/.idea/workspace.xml
+++ b/.idea/workspace.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <project version="4">
   <component name="ChangeListManager">
-    <list default="true" id="3114a2b9-4919-4fdf-8fd9-d03b60109ce4" name="Default Changelist" comment="" />
+    <list default="true" id="3114a2b9-4919-4fdf-8fd9-d03b60109ce4" name="Default Changelist" comment="">
+      <change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/TaipanShop.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/TaipanShop.java" afterDir="false" />
+    </list>
     <ignored path="$PROJECT_DIR$/out/" />
     <option name="EXCLUDED_CONVERTED_TO_IGNORED" value="true" />
     <option name="SHOW_DIALOG" value="false" />
@@ -14,8 +17,8 @@
       <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="209">
-              <caret line="11" column="36" lean-forward="true" selection-start-line="11" selection-start-column="36" selection-end-line="11" selection-end-column="36" />
+            <state relative-caret-position="171">
+              <caret line="11" column="36" selection-start-line="11" selection-start-column="36" selection-end-line="11" selection-end-column="36" />
               <folding>
                 <element signature="imports" expanded="true" />
                 <element signature="e#1150#1151#0" expanded="true" />
@@ -30,10 +33,20 @@
       <file pinned="false" current-in-tab="true">
         <entry file="file://$PROJECT_DIR$/src/TaipanShop.java">
           <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="380">
-              <caret line="20" column="22" lean-forward="true" selection-start-line="20" selection-start-column="22" selection-end-line="20" selection-end-column="22" />
+            <state relative-caret-position="-3629">
+              <caret line="10" lean-forward="true" selection-start-line="10" selection-end-line="10" />
               <folding>
                 <element signature="imports" expanded="true" />
+                <element signature="e#333#334#0" expanded="true" />
+                <element signature="e#366#367#0" expanded="true" />
+                <element signature="e#333#334#0" expanded="true" />
+                <element signature="e#366#367#0" expanded="true" />
+                <element signature="e#492#493#0" expanded="true" />
+                <element signature="e#524#525#0" expanded="true" />
+                <element signature="e#646#647#0" expanded="true" />
+                <element signature="e#678#679#0" expanded="true" />
+                <element signature="e#803#804#0" expanded="true" />
+                <element signature="e#838#839#0" expanded="true" />
               </folding>
             </state>
           </provider>
@@ -66,12 +79,14 @@
       <find>bank</find>
       <find>player.getMoney() += num *</find>
       <find>opiumHeld</find>
+      <find>silkPrice</find>
     </findStrings>
     <replaceStrings>
       <replace>player.getName()</replace>
       <replace>player.getBank()</replace>
       <replace>player.setMoney(player.getMoney() + num*)</replace>
       <replace>player.getOpiumHeld()</replace>
+      <replace>getSilkPrice()</replace>
     </replaceStrings>
   </component>
   <component name="Git.Settings">
@@ -97,7 +112,6 @@
     </navigator>
     <panes>
       <pane id="PackagesPane" />
-      <pane id="Scope" />
       <pane id="ProjectPane">
         <subPane>
           <expand>
@@ -114,12 +128,13 @@
           <select />
         </subPane>
       </pane>
+      <pane id="Scope" />
     </panes>
   </component>
   <component name="PropertiesComponent">
     <property name="WebServerToolWindowFactoryState" value="false" />
     <property name="aspect.path.notification.shown" value="true" />
-    <property name="com.android.tools.idea.instantapp.provision.ProvisionBeforeRunTaskProvider.myTimeStamp" value="1550544519995" />
+    <property name="com.android.tools.idea.instantapp.provision.ProvisionBeforeRunTaskProvider.myTimeStamp" value="1550596077065" />
     <property name="last_opened_file_path" value="$PROJECT_DIR$" />
     <property name="project.structure.last.edited" value="SDKs" />
     <property name="project.structure.proportion" value="0.0" />
@@ -210,7 +225,14 @@
       <option name="project" value="LOCAL" />
       <updated>1550544805794</updated>
     </task>
-    <option name="localTasksCounter" value="4" />
+    <task id="LOCAL-00004" summary="the shop now uses the player class as a parent class.">
+      <created>1550544933067</created>
+      <option name="number" value="00004" />
+      <option name="presentableId" value="LOCAL-00004" />
+      <option name="project" value="LOCAL" />
+      <updated>1550544933067</updated>
+    </task>
+    <option name="localTasksCounter" value="5" />
     <servers />
   </component>
   <component name="TimeTrackingManager">
@@ -218,8 +240,9 @@
   </component>
   <component name="ToolWindowManager">
     <frame x="-8" y="-8" width="1936" height="1056" extended-state="6" />
+    <editor active="true" />
     <layout>
-      <window_info content_ui="combo" id="Project" order="0" visible="true" weight="0.1705757" />
+      <window_info content_ui="combo" id="Project" order="0" visible="true" weight="0.17857143" />
       <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" />
@@ -234,7 +257,7 @@
       <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.49946696" visible="true" weight="0.32936078" />
+      <window_info active="true" anchor="bottom" id="Version Control" order="8" sideWeight="0.49946696" visible="true" weight="0.032502707" />
       <window_info anchor="bottom" id="Database Changes" order="9" />
       <window_info anchor="bottom" id="Terminal" order="10" weight="0.32936078" />
       <window_info anchor="bottom" id="Event Log" order="11" sideWeight="0.50053304" side_tool="true" weight="0.32936078" />
@@ -266,17 +289,10 @@
     <entry file="file://$PROJECT_DIR$/TaipanClone.iml">
       <provider selected="true" editor-type-id="text-editor" />
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/Player.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state>
-          <caret column="13" selection-start-column="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="209">
-          <caret line="11" column="36" lean-forward="true" selection-start-line="11" selection-start-column="36" selection-end-line="11" selection-end-column="36" />
+        <state relative-caret-position="171">
+          <caret line="11" column="36" selection-start-line="11" selection-start-column="36" selection-end-line="11" selection-end-column="36" />
           <folding>
             <element signature="imports" expanded="true" />
             <element signature="e#1150#1151#0" expanded="true" />
@@ -287,12 +303,29 @@
         </state>
       </provider>
     </entry>
+    <entry file="file://$PROJECT_DIR$/src/Player.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state>
+          <caret column="13" selection-start-column="13" selection-end-column="13" />
+        </state>
+      </provider>
+    </entry>
     <entry file="file://$PROJECT_DIR$/src/TaipanShop.java">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="380">
-          <caret line="20" column="22" lean-forward="true" selection-start-line="20" selection-start-column="22" selection-end-line="20" selection-end-column="22" />
+        <state relative-caret-position="-3629">
+          <caret line="10" lean-forward="true" selection-start-line="10" selection-end-line="10" />
           <folding>
             <element signature="imports" expanded="true" />
+            <element signature="e#333#334#0" expanded="true" />
+            <element signature="e#366#367#0" expanded="true" />
+            <element signature="e#333#334#0" expanded="true" />
+            <element signature="e#366#367#0" expanded="true" />
+            <element signature="e#492#493#0" expanded="true" />
+            <element signature="e#524#525#0" expanded="true" />
+            <element signature="e#646#647#0" expanded="true" />
+            <element signature="e#678#679#0" expanded="true" />
+            <element signature="e#803#804#0" expanded="true" />
+            <element signature="e#838#839#0" expanded="true" />
           </folding>
         </state>
       </provider>
diff --git a/src/TaipanShop.java b/src/TaipanShop.java
index bc4cb9e..ebd865d 100644
--- a/src/TaipanShop.java
+++ b/src/TaipanShop.java
@@ -1,8 +1,7 @@
 import java.util.Random;
 import java.util.Scanner;
 public class TaipanShop extends Player {
-
-    private Player player = new Player();
+    
     private int cargoSpace = 60;
     private int currentCargo = 0;
     private int opiumPrice = 16000;
@@ -10,8 +9,58 @@ public class TaipanShop extends Player {
     private int armsPrice = 160;
     private int generalPrice = 8;
 
+    public int getCargoSpace() {
+        return cargoSpace;
+    }
+
+    public void setCargoSpace(int cargoSpace) {
+        if(cargoSpace > 0){
+            this.cargoSpace = cargoSpace;
+        }
+    }
+
+    public int getOpiumPrice() {
+        return opiumPrice;
+    }
+
+    public void setOpiumPrice(int opiumPrice) {
+        if(opiumPrice > 0){
+            this.opiumPrice = opiumPrice;
+        }
+    }
+
+    public int getSilkPrice() {
+        return silkPrice;
+    }
+
+    public void setSilkPrice(int silkPrice) {
+        if(silkPrice > 0){
+            this.silkPrice = silkPrice;
+        }
+    }
+
+    public int getArmsPrice() {
+        return armsPrice;
+    }
+
+    public void setArmsPrice(int armsPrice) {
+        if(armsPrice > 0){
+            this.armsPrice = armsPrice;
+        }
+    }
+
+    public int getGeneralPrice() {
+        return generalPrice;
+    }
+
+    public void setGeneralPrice(int generalPrice) {
+        if(generalPrice > 0){
+            this.generalPrice = generalPrice;
+        }
+    }
+
     private void updatePrices(){
-        String s = "\n" + player.getName() + ", the price of ";
+        String s = "\n" + getName() + ", the price of ";
         double value = 80*Math.random();
         Random rand = new Random();
         opiumPrice = (rand.nextInt(201) + 60)*100;
@@ -56,18 +105,18 @@ public class TaipanShop extends Player {
     }
 
     private void printShop(){
-        currentCargo = player.getOpiumHeld()+player.getGuns()*10+player.getSilkHeld()+player.getArmsHeld()+player.getGeneralHeld();
+        currentCargo = getOpiumHeld()+getGuns()*10+getSilkHeld()+getArmsHeld()+getGeneralHeld();
         if(cargoSpace - currentCargo < 0){
-            System.out.println("Hold: Overloaded" + "          Guns: " + player.getGuns());
+            System.out.println("Hold: Overloaded" + "          Guns: " + getGuns());
         }else{
-            System.out.println("Hold: " + (cargoSpace-currentCargo) + "          Guns: " + player.getGuns());
+            System.out.println("Hold: " + (cargoSpace-currentCargo) + "          Guns: " + getGuns());
         }
         System.out.println("-------------------------------------------------------------");
-        System.out.println("     Opium: " + player.getOpiumHeld() + "      Silk: " + player.getSilkHeld());
-        System.out.println("     Arms: " + player.getArmsHeld() + "       General: " + player.getGeneralHeld());
+        System.out.println("     Opium: " + getOpiumHeld() + "      Silk: " + getSilkHeld());
+        System.out.println("     Arms: " + getArmsHeld() + "       General: " + getGeneralHeld());
         System.out.println("-------------------------------------------------------------");
-        System.out.println("Cash: " + player.getMoney() + "           Bank: " + player.getBank()+"\n");
-        System.out.println(player.getName() + ", present prices per unit here are:");
+        System.out.println("Cash: " + getMoney() + "           Bank: " + getBank()+"\n");
+        System.out.println(getName() + ", present prices per unit here are:");
         System.out.println("     Opium: " + opiumPrice + "    Silk: " + silkPrice);
         System.out.println("     Arms: " + armsPrice + "       General: " + generalPrice);
     }
@@ -76,70 +125,70 @@ public class TaipanShop extends Player {
         updatePrices();
         Scanner input = new Scanner(System.in);
         boolean notDone = true;
-        if (player.getLocation() == 1) {
+        if (getLocation() == 1) {
             while (notDone) {
                 printShop();
                 System.out.println("\nShall I Buy, Sell, Visit Bank, Transfer Cargo, or Quit Trading?");
                 String response = input.next();
                 if (response.equalsIgnoreCase("B")) {
                     boolean notDone2 = true;
-                    System.out.println("What do you wish me to buy, " + player.getName() + "?");
+                    System.out.println("What do you wish me to buy, " + getName() + "?");
                     while (notDone2) {
                         response = input.nextLine();
                         if (response.equalsIgnoreCase("O")) {
-                            System.out.println("\nHow much Opium shall I buy, " + player.getName() + "? (You can afford " + player.getMoney() / opiumPrice + ")");
+                            System.out.println("\nHow much Opium shall I buy, " + getName() + "? (You can afford " + getMoney() / opiumPrice + ")");
                             while (notDone2) {
                                 int num = input.nextInt();
-                                if (num <= player.getMoney() / opiumPrice && num >= 0) {
-                                    player.setOpiumHeld(player.getOpiumHeld()+num);
-                                    player.setMoney(player.getMoney()-num * opiumPrice);
+                                if (num <= getMoney() / opiumPrice && num >= 0) {
+                                    setOpiumHeld(getOpiumHeld()+num);
+                                    setMoney(getMoney()-num * opiumPrice);
                                     notDone2 = false;
                                 } else if (num >= 0) {
-                                    System.out.println(player.getName() + ", you can't afford that!");
+                                    System.out.println(getName() + ", you can't afford that!");
                                 } else {
-                                    System.out.println(player.getName() + ", how am I supposed to buy " + "'" + num + "'" + " Opium?");
+                                    System.out.println(getName() + ", how am I supposed to buy " + "'" + num + "'" + " Opium?");
                                 }
                             }
                         } else if (response.equalsIgnoreCase("S")) {
-                            System.out.println("\nHow much Silk shall I buy, " + player.getName() + "? (You can afford " + player.getMoney() / silkPrice + ")");
+                            System.out.println("\nHow much Silk shall I buy, " + getName() + "? (You can afford " + getMoney() / silkPrice + ")");
                             while (notDone2) {
                                 int num = input.nextInt();
-                                if (num <= player.getMoney() / silkPrice && num >= 0) {
-                                    player.setSilkHeld(player.getSilkHeld()+num);
-                                    player.setMoney(player.getMoney()-num * silkPrice);
+                                if (num <= getMoney() / silkPrice && num >= 0) {
+                                    setSilkHeld(getSilkHeld()+num);
+                                    setMoney(getMoney()-num * silkPrice);
                                     notDone2 = false;
                                 } else if (num >= 0) {
-                                    System.out.println(player.getName() + ", you can't afford that!");
+                                    System.out.println(getName() + ", you can't afford that!");
                                 } else {
-                                    System.out.println(player.getName() + ", how am I supposed to buy " + "'" + num + "'" + " Silk?");
+                                    System.out.println(getName() + ", how am I supposed to buy " + "'" + num + "'" + " Silk?");
                                 }
                             }
                         } else if (response.equalsIgnoreCase("A")) {
-                            System.out.println("\nHow many Arms shall I buy, " + player.getName() + "? (You can afford " + player.getMoney() / armsPrice + ")");
+                            System.out.println("\nHow many Arms shall I buy, " + getName() + "? (You can afford " + getMoney() / armsPrice + ")");
                             while (notDone2) {
                                 int num = input.nextInt();
-                                if (num <= player.getMoney() / armsPrice && num >= 0) {
-                                    player.setArmsHeld(player.getArmsHeld()+num);
-                                    player.setMoney(player.getMoney() - num*armsPrice);
+                                if (num <= getMoney() / armsPrice && num >= 0) {
+                                    setArmsHeld(getArmsHeld()+num);
+                                    setMoney(getMoney() - num*armsPrice);
                                     notDone2 = false;
                                 } else if (num >= 0) {
-                                    System.out.println(player.getName() + ", you can't afford that!");
+                                    System.out.println(getName() + ", you can't afford that!");
                                 } else {
-                                    System.out.println(player.getName() + ", how am I supposed to buy " + "'" + num + "'" + " Arms?");
+                                    System.out.println(getName() + ", how am I supposed to buy " + "'" + num + "'" + " Arms?");
                                 }
                             }
                         } else if (response.equalsIgnoreCase("G")) {
-                            System.out.println("\nHow much General Cargo shall I buy, " + player.getName() + "? (You can afford " + player.getMoney() / generalPrice + ")");
+                            System.out.println("\nHow much General Cargo shall I buy, " + getName() + "? (You can afford " + getMoney() / generalPrice + ")");
                             while (notDone2) {
                                 int num = input.nextInt();
-                                if (num <= player.getMoney() / generalPrice && num >= 0) {
-                                    player.setGeneralHeld(player.getGeneralHeld()+num);
-                                    player.setMoney(player.getMoney() - num*generalPrice);
+                                if (num <= getMoney() / generalPrice && num >= 0) {
+                                    setGeneralHeld(getGeneralHeld()+num);
+                                    setMoney(getMoney() - num*generalPrice);
                                     notDone2 = false;
                                 } else if (num >= 0) {
-                                    System.out.println(player.getName() + ", you can't afford that!");
+                                    System.out.println(getName() + ", you can't afford that!");
                                 } else {
-                                    System.out.println(player.getName() + ", how am I supposed to buy " + "'" + num + "'" + " General Cargo?");
+                                    System.out.println(getName() + ", how am I supposed to buy " + "'" + num + "'" + " General Cargo?");
                                 }
                             }
                         }
@@ -148,63 +197,63 @@ public class TaipanShop extends Player {
 
                 } else if (response.equalsIgnoreCase("S")) {
                     boolean notDone2 = true;
-                    System.out.println("What do you wish me to sell, " + player.getName() + "?");
+                    System.out.println("What do you wish me to sell, " + getName() + "?");
                     while (notDone2) {
                         response = input.nextLine();
                         if (response.equalsIgnoreCase("O")) {
-                            System.out.println("\nHow much Opium shall I sell, " + player.getName() + "? (You have " + player.getOpiumHeld() + ")");
+                            System.out.println("\nHow much Opium shall I sell, " + getName() + "? (You have " + getOpiumHeld() + ")");
                             while (notDone2) {
                                 int num = input.nextInt();
-                                if (num <= player.getOpiumHeld() && num >= 0) {
-                                    player.setOpiumHeld(player.getOpiumHeld()-num);
-                                    player.setMoney(player.getMoney() + num*opiumPrice);
+                                if (num <= getOpiumHeld() && num >= 0) {
+                                    setOpiumHeld(getOpiumHeld()-num);
+                                    setMoney(getMoney() + num*opiumPrice);
                                     notDone2 = false;
                                 } else if (num >= 0) {
-                                    System.out.println(player.getName() + ", you don't have that many to sell!");
+                                    System.out.println(getName() + ", you don't have that many to sell!");
                                 } else {
-                                    System.out.println(player.getName() + ", how am I supposed to sell " + "'" + num + "'" + " Opium?");
+                                    System.out.println(getName() + ", how am I supposed to sell " + "'" + num + "'" + " Opium?");
                                 }
                             }
                         } else if (response.equalsIgnoreCase("S")) {
-                            System.out.println("\nHow much Silk shall I sell, " + player.getName() + "? (You have " + player.getSilkHeld() + ")");
+                            System.out.println("\nHow much Silk shall I sell, " + getName() + "? (You have " + getSilkHeld() + ")");
                             while (notDone2) {
                                 int num = input.nextInt();
-                                if (num <= player.getSilkHeld() && num >= 0) {
-                                    player.setSilkHeld(player.getSilkHeld()-num);
-                                    player.setMoney(player.getMoney() + num*silkPrice);
+                                if (num <= getSilkHeld() && num >= 0) {
+                                    setSilkHeld(getSilkHeld()-num);
+                                    setMoney(getMoney() + num*silkPrice);
                                     notDone2 = false;
                                 } else if (num >= 0) {
-                                    System.out.println(player.getName() + ", you don't have that many to sell!");
+                                    System.out.println(getName() + ", you don't have that many to sell!");
                                 } else {
-                                    System.out.println(player.getName() + ", how am I supposed to sell " + "'" + num + "'" + " Silk?");
+                                    System.out.println(getName() + ", how am I supposed to sell " + "'" + num + "'" + " Silk?");
                                 }
                             }
                         } else if (response.equalsIgnoreCase("A")) {
-                            System.out.println("\nHow many Arms shall I sell, " + player.getName() + "? (You have " + player.getArmsHeld() + ")");
+                            System.out.println("\nHow many Arms shall I sell, " + getName() + "? (You have " + getArmsHeld() + ")");
                             while (notDone2) {
                                 int num = input.nextInt();
-                                if (num <= player.getArmsHeld() && num >= 0) {
-                                    player.setArmsHeld(player.getArmsHeld()-num);
-                                    player.setMoney(player.getMoney() + num*armsPrice);
+                                if (num <= getArmsHeld() && num >= 0) {
+                                    setArmsHeld(getArmsHeld()-num);
+                                    setMoney(getMoney() + num*armsPrice);
                                     notDone2 = false;
                                 } else if (num >= 0) {
-                                    System.out.println(player.getName() + ", you don't have that many to sell!");
+                                    System.out.println(getName() + ", you don't have that many to sell!");
                                 } else {
-                                    System.out.println(player.getName() + ", how am I supposed to sell " + "'" + num + "'" + " Arms?");
+                                    System.out.println(getName() + ", how am I supposed to sell " + "'" + num + "'" + " Arms?");
                                 }
                             }
                         } else if (response.equalsIgnoreCase("G")) {
-                            System.out.println("\nHow much General Cargo shall I sell, " + player.getName() + "? (You have " + player.getGeneralHeld() + ")");
+                            System.out.println("\nHow much General Cargo shall I sell, " + getName() + "? (You have " + getGeneralHeld() + ")");
                             while (notDone2) {
                                 int num = input.nextInt();
-                                if (num <= player.getGeneralHeld() && num >= 0) {
-                                    player.setGeneralHeld(player.getGeneralHeld()-num);
-                                    player.setMoney(player.getMoney() + num*generalPrice);
+                                if (num <= getGeneralHeld() && num >= 0) {
+                                    setGeneralHeld(getGeneralHeld()-num);
+                                    setMoney(getMoney() + num*generalPrice);
                                     notDone2 = false;
                                 } else if (num >= 0) {
-                                    System.out.println(player.getName() + ", you don't have that many to sell!");
+                                    System.out.println(getName() + ", you don't have that many to sell!");
                                 } else {
-                                    System.out.println(player.getName() + ", how am I supposed to sell " + "'" + num + "'" + " General Cargo?");
+                                    System.out.println(getName() + ", how am I supposed to sell " + "'" + num + "'" + " General Cargo?");
                                 }
                             }
                         }
@@ -227,63 +276,63 @@ public class TaipanShop extends Player {
                 String response = input.next();
                 if (response.equalsIgnoreCase("B")) {
                     boolean notDone2 = true;
-                    System.out.println("What do you wish me to buy, " + player.getName() + "?");
+                    System.out.println("What do you wish me to buy, " + getName() + "?");
                     while (notDone2) {
                         response = input.nextLine();
                         if (response.equalsIgnoreCase("O")) {
-                            System.out.println("\nHow much Opium shall I buy, " + player.getName() + "? (You can afford " + player.getMoney() / opiumPrice + ")");
+                            System.out.println("\nHow much Opium shall I buy, " + getName() + "? (You can afford " + getMoney() / opiumPrice + ")");
                             while (notDone2) {
                                 int num = input.nextInt();
-                                if (num <= player.getMoney() / opiumPrice && num >= 0) {
-                                    player.setOpiumHeld(player.getOpiumHeld()+num);
-                                    player.setMoney(player.getMoney() - num*opiumPrice);
+                                if (num <= getMoney() / opiumPrice && num >= 0) {
+                                    setOpiumHeld(getOpiumHeld()+num);
+                                    setMoney(getMoney() - num*opiumPrice);
                                     notDone2 = false;
                                 } else if (num >= 0) {
-                                    System.out.println(player.getName() + ", you can't afford that!");
+                                    System.out.println(getName() + ", you can't afford that!");
                                 } else {
-                                    System.out.println(player.getName() + ", how am I supposed to buy " + "'" + num + "'" + " Opium?");
+                                    System.out.println(getName() + ", how am I supposed to buy " + "'" + num + "'" + " Opium?");
                                 }
                             }
                         } else if (response.equalsIgnoreCase("S")) {
-                            System.out.println("\nHow much Silk shall I buy, " + player.getName() + "? (You can afford " + player.getMoney() / silkPrice + ")");
+                            System.out.println("\nHow much Silk shall I buy, " + getName() + "? (You can afford " + getMoney() / silkPrice + ")");
                             while (notDone2) {
                                 int num = input.nextInt();
-                                if (num <= player.getMoney() / silkPrice && num >= 0) {
-                                    player.setSilkHeld(player.getSilkHeld()+num);
-                                    player.setMoney(player.getMoney() - num*silkPrice);
+                                if (num <= getMoney() / silkPrice && num >= 0) {
+                                    setSilkHeld(getSilkHeld()+num);
+                                    setMoney(getMoney() - num*silkPrice);
                                     notDone2 = false;
                                 } else if (num >= 0) {
-                                    System.out.println(player.getName() + ", you can't afford that!");
+                                    System.out.println(getName() + ", you can't afford that!");
                                 } else {
-                                    System.out.println(player.getName() + ", how am I supposed to buy " + "'" + num + "'" + " Silk?");
+                                    System.out.println(getName() + ", how am I supposed to buy " + "'" + num + "'" + " Silk?");
                                 }
                             }
                         } else if (response.equalsIgnoreCase("A")) {
-                            System.out.println("\nHow many Arms shall I buy, " + player.getName() + "? (You can afford " + player.getMoney() / armsPrice + ")");
+                            System.out.println("\nHow many Arms shall I buy, " + getName() + "? (You can afford " + getMoney() / armsPrice + ")");
                             while (notDone2) {
                                 int num = input.nextInt();
-                                if (num <= player.getMoney() / armsPrice && num >= 0) {
-                                    player.setArmsHeld(player.getArmsHeld()+num);
-                                    player.setMoney(player.getMoney() - num*armsPrice);
+                                if (num <= getMoney() / armsPrice && num >= 0) {
+                                    setArmsHeld(getArmsHeld()+num);
+                                    setMoney(getMoney() - num*armsPrice);
                                     notDone2 = false;
                                 } else if (num >= 0) {
-                                    System.out.println(player.getName() + ", you can't afford that!");
+                                    System.out.println(getName() + ", you can't afford that!");
                                 } else {
-                                    System.out.println(player.getName() + ", how am I supposed to buy " + "'" + num + "'" + " Arms?");
+                                    System.out.println(getName() + ", how am I supposed to buy " + "'" + num + "'" + " Arms?");
                                 }
                             }
                         } else if (response.equalsIgnoreCase("G")) {
-                            System.out.println("\nHow much General Cargo shall I buy, " + player.getName() + "? (You can afford " + player.getMoney() / generalPrice + ")");
+                            System.out.println("\nHow much General Cargo shall I buy, " + getName() + "? (You can afford " + getMoney() / generalPrice + ")");
                             while (notDone2) {
                                 int num = input.nextInt();
-                                if (num <= player.getMoney() / generalPrice && num >= 0) {
-                                    player.setGeneralHeld(player.getGeneralHeld()+num);
-                                    player.setMoney(player.getMoney() - num*generalPrice);
+                                if (num <= getMoney() / generalPrice && num >= 0) {
+                                    setGeneralHeld(getGeneralHeld()+num);
+                                    setMoney(getMoney() - num*generalPrice);
                                     notDone2 = false;
                                 } else if (num >= 0) {
-                                    System.out.println(player.getName() + ", you can't afford that!");
+                                    System.out.println(getName() + ", you can't afford that!");
                                 } else {
-                                    System.out.println(player.getName() + ", how am I supposed to buy " + "'" + num + "'" + " General Cargo?");
+                                    System.out.println(getName() + ", how am I supposed to buy " + "'" + num + "'" + " General Cargo?");
                                 }
                             }
                         }
@@ -292,63 +341,63 @@ public class TaipanShop extends Player {
 
                 } else if (response.equalsIgnoreCase("S")) {
                     boolean notDone2 = true;
-                    System.out.println("What do you wish me to sell, " + player.getName() + "?");
+                    System.out.println("What do you wish me to sell, " + getName() + "?");
                     while (notDone2) {
                         response = input.nextLine();
                         if (response.equalsIgnoreCase("O")) {
-                            System.out.println("\nHow much Opium shall I sell, " + player.getName() + "? (You have " + player.getOpiumHeld() + ")");
+                            System.out.println("\nHow much Opium shall I sell, " + getName() + "? (You have " + getOpiumHeld() + ")");
                             while (notDone2) {
                                 int num = input.nextInt();
-                                if (num <= player.getOpiumHeld() && num >= 0) {
-                                    player.setOpiumHeld(player.getOpiumHeld()-num);
-                                    player.setMoney(player.getMoney() + num*opiumPrice);
+                                if (num <= getOpiumHeld() && num >= 0) {
+                                    setOpiumHeld(getOpiumHeld()-num);
+                                    setMoney(getMoney() + num*opiumPrice);
                                     notDone2 = false;
                                 } else if (num >= 0) {
-                                    System.out.println(player.getName() + ", you don't have that many to sell!");
+                                    System.out.println(getName() + ", you don't have that many to sell!");
                                 } else {
-                                    System.out.println(player.getName() + ", how am I supposed to sell " + "'" + num + "'" + " Opium?");
+                                    System.out.println(getName() + ", how am I supposed to sell " + "'" + num + "'" + " Opium?");
                                 }
                             }
                         } else if (response.equalsIgnoreCase("S")) {
-                            System.out.println("\nHow much Silk shall I sell, " + player.getName() + "? (You have " + player.getSilkHeld() + ")");
+                            System.out.println("\nHow much Silk shall I sell, " + getName() + "? (You have " + getSilkHeld() + ")");
                             while (notDone2) {
                                 int num = input.nextInt();
-                                if (num <= player.getSilkHeld() && num >= 0) {
-                                    player.setSilkHeld(player.getSilkHeld()-num);
-                                    player.setMoney(player.getMoney() + num*silkPrice);
+                                if (num <= getSilkHeld() && num >= 0) {
+                                    setSilkHeld(getSilkHeld()-num);
+                                    setMoney(getMoney() + num*silkPrice);
                                     notDone2 = false;
                                 } else if (num >= 0) {
-                                    System.out.println(player.getName() + ", you don't have that many to sell!");
+                                    System.out.println(getName() + ", you don't have that many to sell!");
                                 } else {
-                                    System.out.println(player.getName() + ", how am I supposed to sell " + "'" + num + "'" + " Silk?");
+                                    System.out.println(getName() + ", how am I supposed to sell " + "'" + num + "'" + " Silk?");
                                 }
                             }
                         } else if (response.equalsIgnoreCase("A")) {
-                            System.out.println("\nHow many Arms shall I sell, " + player.getName() + "? (You have " + player.getArmsHeld() + ")");
+                            System.out.println("\nHow many Arms shall I sell, " + getName() + "? (You have " + getArmsHeld() + ")");
                             while (notDone2) {
                                 int num = input.nextInt();
-                                if (num <= player.getArmsHeld() && num >= 0) {
-                                    player.setArmsHeld(player.getArmsHeld()-num);
-                                    player.setMoney(player.getMoney() + num*armsPrice);
+                                if (num <= getArmsHeld() && num >= 0) {
+                                    setArmsHeld(getArmsHeld()-num);
+                                    setMoney(getMoney() + num*armsPrice);
                                     notDone2 = false;
                                 } else if (num >= 0) {
-                                    System.out.println(player.getName() + ", you don't have that many to sell!");
+                                    System.out.println(getName() + ", you don't have that many to sell!");
                                 } else {
-                                    System.out.println(player.getName() + ", how am I supposed to sell " + "'" + num + "'" + " Arms?");
+                                    System.out.println(getName() + ", how am I supposed to sell " + "'" + num + "'" + " Arms?");
                                 }
                             }
                         } else if (response.equalsIgnoreCase("G")) {
-                            System.out.println("\nHow much General Cargo shall I sell, " + player.getName() + "? (You have " + player.getGeneralHeld() + ")");
+                            System.out.println("\nHow much General Cargo shall I sell, " + getName() + "? (You have " + getGeneralHeld() + ")");
                             while (notDone2) {
                                 int num = input.nextInt();
-                                if (num <= player.getGeneralHeld() && num >= 0) {
-                                    player.setGeneralHeld(player.getGeneralHeld()-num);
-                                    player.setMoney(player.getMoney() + num*generalPrice);
+                                if (num <= getGeneralHeld() && num >= 0) {
+                                    setGeneralHeld(getGeneralHeld()-num);
+                                    setMoney(getMoney() + num*generalPrice);
                                     notDone2 = false;
                                 } else if (num >= 0) {
-                                    System.out.println(player.getName() + ", you don't have that many to sell!");
+                                    System.out.println(getName() + ", you don't have that many to sell!");
                                 } else {
-                                    System.out.println(player.getName() + ", how am I supposed to sell " + "'" + num + "'" + " General Cargo?");
+                                    System.out.println(getName() + ", how am I supposed to sell " + "'" + num + "'" + " General Cargo?");
                                 }
                             }
                         }
@@ -365,5 +414,4 @@ public class TaipanShop extends Player {
         TaipanShop shop = new TaipanShop();
         shop.shop();
     }
-}
-
+}
\ No newline at end of file