diff --git a/MerchantRPGCSE2102/src/controller/RPGame.java b/MerchantRPGCSE2102/src/controller/RPGame.java index ae9c1e1..a643482 100644 --- a/MerchantRPGCSE2102/src/controller/RPGame.java +++ b/MerchantRPGCSE2102/src/controller/RPGame.java @@ -122,12 +122,15 @@ public ArrayList getPlayerInventoryList() { */ public void createTransaction(Player player, Merchant targetMerchant) { - if(_transactionLimit > 0){ + if(_transactionLimit > 0) + { toggleMovement("OFF"); Transaction newTransaction = new Transaction(player, targetMerchant); toggleMovement("ON"); _transactionLimit -= 1; - }else{ + } + else + { System.out.println("The shops are closed."); } } @@ -146,7 +149,7 @@ private void refreshTransactionLimit(){ * Will call setDailyRandomPercentage, scaleAllAdjustedPrices, refreshCash, incrementBaseCash * */ - private void advanceDailyCycle(){ + public void advanceDailyCycle(){ Merchant[] allMerchants = {_merchant1, _merchant2, _merchant3}; _merchant1.setDailyRandomPercentage(50,200); //these methods have to be separated since they all take different percentages diff --git a/MerchantRPGCSE2102/src/tests/TestRPGame.java b/MerchantRPGCSE2102/src/tests/TestRPGame.java index 12504ef..272bbbb 100644 --- a/MerchantRPGCSE2102/src/tests/TestRPGame.java +++ b/MerchantRPGCSE2102/src/tests/TestRPGame.java @@ -37,5 +37,21 @@ public void testDailyCycle() { setup(); assertEquals(1, game.getDay()); + game.getMerchant(1).subtractCash(500); + assertEquals(500, game.getMerchant(1).getCurrentCash()); + game.advanceDailyCycle(); + assertEquals(2, game.getDay()); + + boolean test; + if(game.getMerchant(1).getRandomPercent() >= 50 && game.getMerchant(1).getRandomPercent() <= 200) + { + test = true; + } + else + test = false; + + assertEquals(true, test); + assertEquals(1000, game.getMerchant(1).getCurrentCash()); + } }