ideas for world

gal11002 · Apr 25, 2015 · 3e808eb · 3e808eb
1 parent c18db4d
commit 3e808eb
Showing 1 changed file with 4 additions and 0 deletions.
diff --git a/MerchantRPGCSE2102/src/controller/RPGame.java b/MerchantRPGCSE2102/src/controller/RPGame.java
@@ -23,12 +23,14 @@ public class RPGame {
 	private ArrayList<String> merchantInventoryList2 = new ArrayList<String>();	// merchant 2's inventory list
 	private ArrayList<String> merchantInventoryList3 = new ArrayList<String>();	// merchant 3's inventory list
 	private ArrayList<String> playerInventoryList = new ArrayList<String>();	// the player's inventory list
+	private ArrayList<String> miscList = new ArrayList<String>();
 
 	// 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);
 	}
 
 	/**