diff --git a/MerchantRPGCSE2102/src/controller/RPGame.java b/MerchantRPGCSE2102/src/controller/RPGame.java index ff4ad0d..8599022 100644 --- a/MerchantRPGCSE2102/src/controller/RPGame.java +++ b/MerchantRPGCSE2102/src/controller/RPGame.java @@ -60,6 +60,17 @@ else if (currentMerchant == 3) } + /** + * Generates all three merchants + * will add them to the map, but function is not written yet + */ + public void buildMerchants() + { + _merchant1 = new Merchant("Merchant 1", 1000, merchantInventoryList1); + _merchant2 = new Merchant("Merchant 2", 1000, merchantInventoryList2); + _merchant3 = new Merchant("Merchant 3", 1000, merchantInventoryList3); + } + /** * This method returns the specified merchant inventory list * diff --git a/MerchantRPGCSE2102/src/model/Player.java b/MerchantRPGCSE2102/src/model/Player.java index ab3aa3e..90f481f 100644 --- a/MerchantRPGCSE2102/src/model/Player.java +++ b/MerchantRPGCSE2102/src/model/Player.java @@ -85,14 +85,10 @@ public boolean sell(String itemName, Merchant targetMerchant, int amount) return true; } else - { return false; - } } else - { return false; - } } /**