diff --git a/MerchantRPGCSE2102/src/controller/RPGame.java b/MerchantRPGCSE2102/src/controller/RPGame.java index 165db89..8f5c926 100644 --- a/MerchantRPGCSE2102/src/controller/RPGame.java +++ b/MerchantRPGCSE2102/src/controller/RPGame.java @@ -23,12 +23,14 @@ public class RPGame { private ArrayList merchantInventoryList2 = new ArrayList(); // merchant 2's inventory list private ArrayList merchantInventoryList3 = new ArrayList(); // merchant 3's inventory list private ArrayList playerInventoryList = new ArrayList(); // the player's inventory list + private ArrayList miscList = new ArrayList(); // Character instances private Player _player; private Merchant _merchant1; private Merchant _merchant2; private Merchant _merchant3; + private Merchant _misc1; // Map instance private Map map; @@ -65,6 +67,7 @@ public RPGame(int transactionLimit, int tileSize) { map.initializeMerchant(_merchant1, rows/2, 1); map.initializeMerchant(_merchant2, rows-2, cols/2); map.initializeMerchant(_merchant3, rows/2, cols-2); + map.initializeMerchant(_misc1, rows/3, cols/3); // Creating the MapUI instance and Sprites cooresponding to characters @@ -135,6 +138,7 @@ public void buildMerchants() _merchant1 = new Merchant("Cheap Merchant", 200, merchantInventoryList1, 0); _merchant2 = new Merchant("Medium Merchant", 600, merchantInventoryList2, merchantInventoryList1.size()); _merchant3 = new Merchant("Expensive Merchant", 1000, merchantInventoryList3, merchantInventoryList1.size()+ merchantInventoryList2.size()); + _misc1 = new Merchant(null, 0, miscList, 0); } /**