diff --git a/.idea/workspace.xml b/.idea/workspace.xml index ea1a992..dd86bd4 100644 --- a/.idea/workspace.xml +++ b/.idea/workspace.xml @@ -1,11 +1,8 @@ - - + - - @@ -35,7 +32,7 @@ - + @@ -43,8 +40,8 @@ - - + + @@ -74,8 +71,8 @@ - - + + @@ -115,10 +112,7 @@ - - - - + @@ -126,8 +120,8 @@ - - + + @@ -188,6 +182,7 @@ player.set %s loan(); + player.getCargoSpace() @@ -473,7 +468,14 @@ @@ -537,7 +539,8 @@ - @@ -567,23 +570,6 @@ - - - - - - - - - - - - - - - - - @@ -594,14 +580,14 @@ - + - - + + @@ -616,10 +602,24 @@ + + + + + + + + + + + + + + - - + + diff --git a/src/TaipanShop.java b/src/TaipanShop.java index 002f68c..ad16004 100644 --- a/src/TaipanShop.java +++ b/src/TaipanShop.java @@ -48,16 +48,18 @@ public class TaipanShop { } /** + * getter for opiumPrice instance variable. * - * @return + * @return opiumPrice -- the price of opium in the shop */ public int getOpiumPrice() { return opiumPrice; } /** + * setter for the opiumPrice instance variable. Runs so long as the parameter is greater than 0. * - * @param opiumPrice + * @param opiumPrice -- what the instance variable opiumPrice should be changed to. */ public void setOpiumPrice(int opiumPrice) { if(opiumPrice > 0){ @@ -66,16 +68,18 @@ public class TaipanShop { } /** + * getter for silkPrice instance variable. * - * @return + * @return silkPrice -- the price of silk in the shop. */ public int getSilkPrice() { return silkPrice; } /** + * setter for the opiumPrice instance variable. * - * @param silkPrice + * @param silkPrice -- what the instance variable silkPrice should be changed to. */ public void setSilkPrice(int silkPrice) { if(silkPrice > 0){