From 317bda86118f5777355372926a73f75de00f691d Mon Sep 17 00:00:00 2001
From: John Bojorquez <johnbojorquez36@gmail.com>
Date: Sat, 18 Apr 2015 13:08:49 -0400
Subject: [PATCH] Refactored RPGame and TransactionUI classes and added
 graphics for the map as well as transactions. The player and merchant
 instances are now accessable during a tansaction and the transaction is able
 to be fully completed. Tested with next day cycle and it works as expected.
 Planning to further polish the game this upcoming weak and finish the Start
 menu.

---
 MerchantRPGCSE2102/src/controller/RPGame.java | 147 +++++-----
 .../src/controller/Transaction.java           |   6 +-
 MerchantRPGCSE2102/src/graph/Vertex.java      |   8 +-
 MerchantRPGCSE2102/src/images/testsprite.png  | Bin 8443 -> 4184 bytes
 MerchantRPGCSE2102/src/model/Character.java   |   8 +-
 MerchantRPGCSE2102/src/model/Map.java         |  16 +-
 MerchantRPGCSE2102/src/model/Merchant.java    |  12 +-
 MerchantRPGCSE2102/src/model/Player.java      |   7 +
 .../src/sprites/MerchantSprite.java           |  20 +-
 .../src/sprites/PlayerSprite.java             |  54 ++--
 .../{Sprite.java => SpriteLoader.java}        |   2 +-
 MerchantRPGCSE2102/src/tests/TestPlayer.java  |   2 +-
 MerchantRPGCSE2102/src/tests/TestRPGame.java  |   4 +-
 .../src/tests/TestTransaction.java            |   4 +-
 MerchantRPGCSE2102/src/view/MapUI.java        |  48 ++--
 .../src/view/TransactionUI.java               | 250 ++++++++++++------
 16 files changed, 382 insertions(+), 206 deletions(-)
 rename MerchantRPGCSE2102/src/sprites/{Sprite.java => SpriteLoader.java} (92%)

diff --git a/MerchantRPGCSE2102/src/controller/RPGame.java b/MerchantRPGCSE2102/src/controller/RPGame.java
index f9d9229..165db89 100644
--- a/MerchantRPGCSE2102/src/controller/RPGame.java
+++ b/MerchantRPGCSE2102/src/controller/RPGame.java
@@ -13,23 +13,80 @@
 import view.MapUI;
 
 public class RPGame {
+	
+	// Window properties
 	public static final int WIDTH = 1206;
 	public static final int HEIGHT = 929;
+	
+	// Inventory lists from file
 	private ArrayList<String> merchantInventoryList1 = new ArrayList<String>();	// merchant 1's inventory list
 	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 Player _player;
-	private Merchant _merchant1, _merchant2, _merchant3;
+	
+	// Character instances
+	private  Player _player;
+	private  Merchant _merchant1;
+	private  Merchant _merchant2;
+	private  Merchant _merchant3;
+	
+	// Map instance
+	private Map map;
+	
+	// MapUI instance and properties
+	private MapUI mapui;
+	
+	// Current game properties
 	public boolean _movement = true;
 	private int _currentDay;
 	private int _transactionLimit;
 
 
-	public RPGame() {
+	public RPGame(int transactionLimit, int tileSize) {
+		
+		// Initializing member variables
 		_currentDay = 1;
-		_transactionLimit = 3;
+		_transactionLimit = transactionLimit;
+		
+		// Calculating number of rows and columns for map
+		int rows = (HEIGHT - 29)/tileSize;
+		int cols = (WIDTH - 6)/tileSize;
+		
+		// Read inventory lists from file
 		inventoryFromFile();
+		
+		// Build merchant and player instances
+		buildMerchants();
+		buildPlayer("test", 500);
+		
+		// Initialiing Map instance and adding the player and merchants to the map
+		map = new Map(rows, cols);
+		map.initializePlayer(_player, rows/2, cols/2);
+		map.initializeMerchant(_merchant1, rows/2, 1);
+		map.initializeMerchant(_merchant2, rows-2, cols/2);
+		map.initializeMerchant(_merchant3, rows/2, cols-2);
+
+
+		// Creating the MapUI instance and Sprites cooresponding to characters
+		mapui = new MapUI(map, this, tileSize);
+		mapui.createPlayerSprite(rows/2, cols/2);
+		mapui.addMerchantSprite(rows/2, 1);
+		mapui.addMerchantSprite(rows-2, cols/2);
+		mapui.addMerchantSprite(rows/2, cols-2);
+		
+		// Creating JFrame window
+		JFrame frame = new JFrame("Merchant RPG");
+		
+		// Adding MapUI instance to window
+		frame.add(mapui);
+
+		// Setting properties of JFrame
+		frame.setSize(RPGame.WIDTH, RPGame.HEIGHT);
+		frame.setResizable(false);
+		frame.setVisible(true);
+		frame.setDefaultCloseOperation(JFrame.EXIT_ON_CLOSE);
+		frame.setLocationRelativeTo(null); 	
+
 	}
 
 	/**
@@ -75,20 +132,19 @@ else if (currentMerchant == 3)
 	 */
 	public void buildMerchants()
 	{
-		_merchant1 = new Merchant("Cheap Merchant", 200, merchantInventoryList1);
-		_merchant2 = new Merchant("Medium Merchant", 600, merchantInventoryList2);
-		_merchant3 = new Merchant("Expensive Merchant", 1000, merchantInventoryList3);
+		_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());
 	}
 
 	/**
 	 * Generates the player
 	 * @param name					Player name
 	 * @param startingCash			Amount of cash the player starts with
-	 * @param startingInventory		The Player's starting inventory
 	 */
-	public void buildPlayer(String name, int startingCash, ArrayList<String> startingInventory)
+	public void buildPlayer(String name, int startingCash)
 	{
-		_player = new Player(name, startingCash, startingInventory);
+		_player = new Player(name, startingCash, playerInventoryList);
 	}
 
 	/**
@@ -132,6 +188,7 @@ public void createTransaction(Player player, Merchant targetMerchant)
 		{
 			toggleMovement("OFF");
 			Transaction newTransaction = new Transaction(player, targetMerchant, this);
+			newTransaction.runTransaction();
 			_transactionLimit -= 1;
 		}
 		else
@@ -167,7 +224,7 @@ public void advanceDailyCycle(){
 		if( (_currentDay % 6) == 0)								//will increase the merchant's base cash every 6 days
 		{
 			int multiplier = (int) Math.floor(_currentDay / 10) + 1;
-			
+
 			addAndRefreshCash(_merchant1, multiplier * 100);
 			addAndRefreshCash(_merchant2, multiplier * 100);
 			addAndRefreshCash(_merchant3, multiplier * 100);
@@ -195,7 +252,7 @@ private void scaleAllMerchantPrices(Merchant[] merchants)
 			m.scaleAllAdjustedPrices();
 		}
 	}
-	
+
 	/**
 	 * Will call addCash on the merchant provided then refreshes their cash
 	 * 
@@ -207,6 +264,15 @@ public void addAndRefreshCash (Merchant targetMerchant, int increaseAmount)
 		targetMerchant.addCash(increaseAmount);
 		targetMerchant.refreshCash();
 	}
+	
+	/**
+	 * Updates the MapUI to move characters and detect events
+	 * 
+	 */
+	public void updateMapUI() {
+		mapui.move();
+		mapui.repaint();
+	}
 
 	/**
 	 * Toggles the movement on or off based on the input
@@ -245,7 +311,7 @@ else if(merchantNum == 2)
 		else
 			return _merchant3;
 	}
-	
+
 	/**
 	 * Getter for the current day number
 	 * @return	The day number
@@ -254,7 +320,7 @@ public int getDay()
 	{
 		return _currentDay;
 	}
-	
+
 	/**
 	 * 
 	 * @return Movement variable
@@ -271,51 +337,12 @@ public boolean getMovement()
 	 */
 	public static void main(String[] args) throws InterruptedException
 	{
-		RPGame _rpg = new RPGame();
-		_rpg.buildMerchants();
-		ArrayList<String> playerInventory = _rpg.getMerchantInventoryList(1);
-		playerInventory.addAll(_rpg.getMerchantInventoryList(2));
-		playerInventory.addAll(_rpg.getMerchantInventoryList(3));
-		_rpg.buildPlayer("test", 500, playerInventory);
-
-		// SETTING UP PLAYER AND MERCHANT
-				Player player = new Player("Player", 0, null);
-				Merchant merch1 = new Merchant("Bill", 0, null); 
-				Merchant merch2 = new Merchant("Joe", 0, null); 
-				Merchant merch3 = new Merchant("Sam", 0, null); 
-				
-				// CREATING MAP AND INITIALIZE PLAYER AND MERCHANTS
-				Map map = new Map(30, 40);
-				map.initializePlayer(player, 15, 20);
-				map.initializeMerchant(merch1, 15, 0);
-				map.initializeMerchant(merch2, 29, 20);
-				map.initializeMerchant(merch3, 15, 39);
-				
-				// CREATING JFRAME WINDOW
-				JFrame frame = new JFrame("Merchant RPG");
-				
-				// CREATING MAPUI AND SPRITES
-				MapUI mapui = new MapUI(map,_rpg);
-				mapui.createPlayerSprite(15, 20);
-				mapui.addMerchantSprite(15, 0);
-				mapui.addMerchantSprite(29, 20);
-				mapui.addMerchantSprite(15, 39);
-				
-				// ADDING MAPUI TO JFRAME
-				frame.add(mapui);
-				
-				// SETTING PROPERTIES OF JFRAME
-				frame.setSize(RPGame.WIDTH, RPGame.HEIGHT);
-				frame.setResizable(false);
-				frame.setVisible(true);
-				frame.setDefaultCloseOperation(JFrame.EXIT_ON_CLOSE);
-				frame.setLocationRelativeTo(null); 	
-				
-				// MAIN GAME LOOP
-				while (true) {
-					mapui.move();
-					mapui.repaint();
-					Thread.sleep(100/12); // Controls the speed of the game (currently 120 frames/second)
-				}			
+		RPGame rpgGame = new RPGame(3, 30);
+
+		// MAIN GAME LOOP
+		while (true) {
+			rpgGame.updateMapUI();
+			Thread.sleep(1000/144); // Controls the speed of the game (currently 144 frames/second)
+		}			
 	}
 }
diff --git a/MerchantRPGCSE2102/src/controller/Transaction.java b/MerchantRPGCSE2102/src/controller/Transaction.java
index e7b4fb9..6c005c6 100644
--- a/MerchantRPGCSE2102/src/controller/Transaction.java
+++ b/MerchantRPGCSE2102/src/controller/Transaction.java
@@ -19,16 +19,16 @@ public Transaction(Player player, Merchant targetMerchant, RPGame game)
 		_player = player;
 		_targetMerchant = targetMerchant;
 		_game = game;
-		_window = new TransactionUI(this);
-		_window.setVisible(true);
 	}
 	
 	/**
 	 * Will be Transaction class's main method
-	 * incomplete method
+	 * 
 	 */
 	public void runTransaction()
 	{
+		_window = new TransactionUI(this);
+		_window.setVisible(true);
 	}
 	
 	/**
diff --git a/MerchantRPGCSE2102/src/graph/Vertex.java b/MerchantRPGCSE2102/src/graph/Vertex.java
index c904344..a4dce98 100644
--- a/MerchantRPGCSE2102/src/graph/Vertex.java
+++ b/MerchantRPGCSE2102/src/graph/Vertex.java
@@ -2,12 +2,14 @@
 
 import java.util.LinkedList;
 
+import model.Character;
+
 public class Vertex
 {
 	private int _cellNum;
 	private int _row;
 	private int _col;
-	private Object _occupant = null;
+	private Character _occupant = null;
 	private LinkedList<Edge> _incidentEdges = new LinkedList<Edge>();
 
 	
@@ -37,11 +39,11 @@ public LinkedList<Edge> getIncidentList() {
 		return _incidentEdges;
 	}
 	
-	public Object getOccupant() {
+	public Character getOccupant() {
 		return _occupant;
 	}
 	
-	public void setOccupant(Object occupant) {
+	public void setOccupant(Character occupant) {
 		_occupant = occupant;
 	}
 	
diff --git a/MerchantRPGCSE2102/src/images/testsprite.png b/MerchantRPGCSE2102/src/images/testsprite.png
index 99d022279cbc8c4d3240f8a877a9bcbea3b4b05c..0d38f6169ffaa71fda72202dc31ef291a5dd7f21 100644
GIT binary patch
literal 4184
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

literal 8443
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

diff --git a/MerchantRPGCSE2102/src/model/Character.java b/MerchantRPGCSE2102/src/model/Character.java
index 37a63ab..53db13f 100644
--- a/MerchantRPGCSE2102/src/model/Character.java
+++ b/MerchantRPGCSE2102/src/model/Character.java
@@ -7,7 +7,7 @@ public class Character {
 	
 	
 	/**
-	 * Searches through the player's inventory for the item corresponding to the specified item name
+	 * Searches through the character's inventory for the item corresponding to the specified item name
 	 * 
 	 * @param	itemName	string containing the name of the item
 	 * @return	the item matching the specified item name
@@ -25,7 +25,7 @@ public Item getItem(String itemName)
 	}
 	
 	/**
-	 * Returns the merchant's item inventory
+	 * Returns the item inventory
 	 * @return	item inventory array
 	 */
 	public Item[] getInventory()
@@ -34,9 +34,9 @@ public Item[] getInventory()
 	}
 	
 	/**
-	 * Returns a string containing the name of the merchant
+	 * Returns a string containing the name of the character
 	 * 
-	 * @return	merchant name string
+	 * @return	character name string
 	 */
 	public String getName()
 	{
diff --git a/MerchantRPGCSE2102/src/model/Map.java b/MerchantRPGCSE2102/src/model/Map.java
index f410d11..4a23275 100644
--- a/MerchantRPGCSE2102/src/model/Map.java
+++ b/MerchantRPGCSE2102/src/model/Map.java
@@ -8,6 +8,7 @@ public class Map {
 	private int _rows, _cols;	// The n*n dimension of the map
 	private int[] initialPlayerLocation = new int[2];
 	private Player _player;
+	private Merchant currentNearbyMerchant;
 
 	public Map(int rows, int cols) {
 		_rows = rows;
@@ -112,8 +113,10 @@ public Graph getGraph() {
 	public boolean isOccupied(int col, int row) {
 		if (row < 0 || col < 0 || row >= _rows || col >= _cols)
 			return false;
-		else 
+		else {
+			setCurrentNearbyMerchant((Merchant) _mapGraph.getVertex(row*_cols + col).getOccupant());
 			return _mapGraph.getVertex(row*_cols + col).getOccupant() != null;
+		}
 	}
 	
 	public boolean collisionTo(String direction) {
@@ -137,7 +140,10 @@ public boolean collisionTo(String direction) {
 		return false;
 	}
 	
+	
 	public void resetPlayerLocation() {
+		_mapGraph.getVertex(_player.getRow()*_cols + _player.getCol()).setOccupant(null);
+		_mapGraph.getVertex(initialPlayerLocation[0]*_cols + initialPlayerLocation[1]).setOccupant(_player);
 		_player.setCol(initialPlayerLocation[1]);
 		_player.setRow(initialPlayerLocation[0]);
 	}
@@ -146,4 +152,12 @@ public Player getPlayer() {
 		return _player;
 	}
 
+	public Merchant getCurrentNearbyMerchant() {
+		return currentNearbyMerchant;
+	}
+
+	public void setCurrentNearbyMerchant(Merchant currentNearbyMerchant) {
+		this.currentNearbyMerchant = currentNearbyMerchant;
+	}
+
 }
diff --git a/MerchantRPGCSE2102/src/model/Merchant.java b/MerchantRPGCSE2102/src/model/Merchant.java
index e9651c7..2e938fb 100644
--- a/MerchantRPGCSE2102/src/model/Merchant.java
+++ b/MerchantRPGCSE2102/src/model/Merchant.java
@@ -8,13 +8,15 @@ public class Merchant extends Character
 	private int _currentCash;
 	private int _baseCash;
 	private int _dailyRandomPercent;
+	private int inventoryStartIndex;
 
 
-	public Merchant(String name, int cashLimit, ArrayList<String> inventory)
+	public Merchant(String name, int cashLimit, ArrayList<String> inventory, int inventoryStartIndex)
 	{
 		_name = name;
 		_currentCash = cashLimit;
 		_baseCash = cashLimit;
+		this.setInventoryStartIndex(inventoryStartIndex);
 		if (inventory != null)
 			generateMerchantInventory(inventory);
 		_dailyRandomPercent = 0; //placeholder percentage
@@ -162,4 +164,12 @@ public int getRandomPercent()
 	{
 		return _dailyRandomPercent;
 	}
+
+	public int getInventoryStartIndex() {
+		return inventoryStartIndex;
+	}
+
+	public void setInventoryStartIndex(int inventoryStartIndex) {
+		this.inventoryStartIndex = inventoryStartIndex;
+	}
 }
diff --git a/MerchantRPGCSE2102/src/model/Player.java b/MerchantRPGCSE2102/src/model/Player.java
index dc6a9a6..4f77878 100644
--- a/MerchantRPGCSE2102/src/model/Player.java
+++ b/MerchantRPGCSE2102/src/model/Player.java
@@ -60,9 +60,16 @@ public boolean buy(String itemName, Merchant targetMerchant, int amount)
 			deductCash(totalPrice);
 			Item targetItem = getItem(itemName);
 			targetItem.increaseQuantity(amount);
+			printInventory();
 			return true;
 		}
 	}
+	
+	public void printInventory() {
+		for (Item item : _inventory) {
+			System.out.println(item.getItemName() + " " + item.getQuantity());
+		}
+	}
 
 	/**
 	 * Allows player to sell an item to a target merchant
diff --git a/MerchantRPGCSE2102/src/sprites/MerchantSprite.java b/MerchantRPGCSE2102/src/sprites/MerchantSprite.java
index ba6414b..668b44d 100644
--- a/MerchantRPGCSE2102/src/sprites/MerchantSprite.java
+++ b/MerchantRPGCSE2102/src/sprites/MerchantSprite.java
@@ -2,6 +2,11 @@
 
 import java.awt.Graphics2D;
 import java.awt.Rectangle;
+import java.awt.image.BufferedImage;
+import java.io.File;
+import java.io.IOException;
+
+import javax.imageio.ImageIO;
 
 public class MerchantSprite {
 	private int x, y;
@@ -17,8 +22,21 @@ public MerchantSprite(int row, int col) {
 	 * @param g	Graphics2D for painting
 	 */
 	public void paint(Graphics2D g) {
-		g.fillRect(x, y, WIDTH, WIDTH);
+		g.drawImage(loadSprite("merchant.png"),x, y, null);
 	}
+	
+	public static BufferedImage loadSprite(String file) {
+
+        BufferedImage sprite = null;
+
+        try {
+            sprite = ImageIO.read(new File("src/images/" + file));
+        } catch (IOException e) {
+            e.printStackTrace();
+        }
+
+        return sprite;
+    }
 
 	/**
 	 * Gets the bounds of the sprite in the form of a Rectangle
diff --git a/MerchantRPGCSE2102/src/sprites/PlayerSprite.java b/MerchantRPGCSE2102/src/sprites/PlayerSprite.java
index e922ba4..0a0007e 100644
--- a/MerchantRPGCSE2102/src/sprites/PlayerSprite.java
+++ b/MerchantRPGCSE2102/src/sprites/PlayerSprite.java
@@ -1,6 +1,5 @@
 package sprites;
 
-import java.awt.Color;
 import java.awt.Graphics2D;
 import java.awt.Rectangle;
 import java.awt.event.KeyEvent;
@@ -10,8 +9,7 @@
 
 public class PlayerSprite {
 	MapUI mapui;								// Instance of MapUI which created this PlayerSprite
-	private static final int WIDTH = 30;		// Width of the PlayerSprite
-	private Color color = new Color(0, 0, 0);	// Color of the PlayerSprite (this will no longer be needed once we have a sprite sheet)
+	private int width = 30;		// Width of the PlayerSprite
 
 	private int x, y;			// x and y coordinates (in pixels)
 	private int dx, dy = 0;		// Velocity of the sprite
@@ -27,28 +25,29 @@ public class PlayerSprite {
 	private boolean upBeingPressed = false;
 	
 	// Images for each animation
-	private BufferedImage[] walkingLeft = {Sprite.getSprite(0, 1), Sprite.getSprite(2, 1)}; // Gets the upper left images of my sprite sheet
-	private BufferedImage[] walkingRight = {Sprite.getSprite(0, 2), Sprite.getSprite(2, 1)};
-	private BufferedImage[] walkingUp = {Sprite.getSprite(0, 1), Sprite.getSprite(2, 1)}; // Gets the upper left images of my sprite sheet
-	private BufferedImage[] walkingDown = {Sprite.getSprite(0, 2), Sprite.getSprite(2, 1)};
-	private BufferedImage[] standing = {Sprite.getSprite(1, 0)};
+	private BufferedImage[] walkingLeft = {SpriteLoader.getSprite(0, 1), SpriteLoader.getSprite(1, 1), SpriteLoader.getSprite(2, 1)}; // Gets the upper left images of my sprite sheet
+	private BufferedImage[] walkingRight = {SpriteLoader.getSprite(0, 2), SpriteLoader.getSprite(1, 2), SpriteLoader.getSprite(2, 2)};
+	private BufferedImage[] walkingUp = {SpriteLoader.getSprite(0, 3), SpriteLoader.getSprite(1, 3), SpriteLoader.getSprite(2, 3)}; // Gets the upper left images of my sprite sheet
+	private BufferedImage[] walkingDown = {SpriteLoader.getSprite(0, 0), SpriteLoader.getSprite(1, 0), SpriteLoader.getSprite(2, 0)};
+	private BufferedImage[] standing = {SpriteLoader.getSprite(1, 0)};
 
 	// Animation states
 	private Animation walkLeft = new Animation(walkingLeft, 10);
 	private Animation walkRight = new Animation(walkingRight, 10);
 	private Animation walkUp = new Animation(walkingUp, 10);
 	private Animation walkDown = new Animation(walkingDown, 10);
-	private Animation standing1 = new Animation(standing, 10);
+	private Animation stand = new Animation(standing, 10);
 
-	// Actual animation
-	private Animation animation = standing1;
+	// Current animation
+	private Animation animation;
 
-	public PlayerSprite(MapUI mapui, int row, int col) {
-		this.x = col*WIDTH;
+	public PlayerSprite(MapUI mapui, int row, int col, int width) {
+		this.x = col*width;
 		initialX = x;
-		this.y = row*WIDTH;
+		this.y = row*width;
 		initialY = y;
 		this.mapui = mapui;
+		animation = stand;
 	}
 
 	/**
@@ -97,29 +96,33 @@ public void keyReleased(KeyEvent e) {
 		if (e.getKeyCode() == KeyEvent.VK_LEFT) {
 			leftBeingPressed = false;
 			if (rightBeingPressed == false)	// Sprite will stop only when the RIGHT key is not being pressed 
+				animation = stand;
 				dx = 0;
 		}
 
 		if (e.getKeyCode() == KeyEvent.VK_RIGHT) {
 			rightBeingPressed = false;
 			if (leftBeingPressed == false) // Sprite will stop only when the LEFT key is not being pressed
+				animation = stand;
 				dx = 0;
 		}
 		if (e.getKeyCode() == KeyEvent.VK_UP) {
 			upBeingPressed = false;
 			if (downBeingPressed == false) // Sprite will stop only when the DOWN key is not being pressed
+				animation = stand;
 				dy = 0;
 		}
 
 		if (e.getKeyCode() == KeyEvent.VK_DOWN) {
 			downBeingPressed = false;
 			if (upBeingPressed == false) // Sprite will stop only when the UP key is not being pressed
+				animation = stand;
 				dy = 0;
 		}
 		if (e.getKeyCode() == KeyEvent.VK_F){
 			if((mapui.getMap().collisionTo("east"))||(mapui.getMap().collisionTo("west"))||(mapui.getMap().collisionTo("south"))||(mapui.getMap().collisionTo("north"))||(mapui.getMap().collisionTo("northeast"))||(mapui.getMap().collisionTo("northwest"))||(mapui.getMap().collisionTo("southeast"))||(mapui.getMap().collisionTo("southwest"))){
 				System.out.println("Transaction starting"); // For testing purposes
-				mapui.game.createTransaction(null, null);//RPGame initialize Trade
+				mapui.game.createTransaction(mapui.map.getPlayer(), mapui.map.getCurrentNearbyMerchant());//RPGame initialize Trade
 			}
 			else{
 				return;
@@ -127,14 +130,22 @@ public void keyReleased(KeyEvent e) {
 		}
 
 		// This fixes some bugs with holding three keys down at once and letting go of two (Basically ensures that dx and dy match which keys are currently being held)
-		if(leftBeingPressed)
+		if(leftBeingPressed) {
 			dx = -1;
-		if(rightBeingPressed)
+			animation = walkLeft;
+		}
+		if(rightBeingPressed) {
 			dx = 1;
-		if(downBeingPressed)
+			animation = walkRight;
+		}
+		if(downBeingPressed) {
 			dy = 1;
-		if(upBeingPressed)
+			animation = walkDown;
+		}
+		if(upBeingPressed) {
 			dy = -1;
+			animation = walkUp;
+		}
 
 	}
 
@@ -201,7 +212,7 @@ public void move() {
 		}
 
 		// Checks that the sprite is moving within the bounds of the panel
-		if (getX() + dx >= 0 && getX() + dx <= mapui.getWidth() - WIDTH && getY() + dy >= 0 && getY() + dy <= mapui.getHeight() - WIDTH) {
+		if (getX() + dx >= 0 && getX() + dx <= mapui.getWidth() - width && getY() + dy >= 0 && getY() + dy <= mapui.getHeight() - width) {
 			setX(getX() + dx);
 			setChangeInX(getChangeInX() +  dx);
 			setY(getY() + dy);
@@ -225,6 +236,7 @@ public void resetLocation() {
 	public void paint(Graphics2D g) {
 		
 		g.drawImage(animation.getSprite(), x, y, null);
+		animation.update();
 	}
 
 	/**
@@ -232,7 +244,7 @@ public void paint(Graphics2D g) {
 	 * @return	the Rectangle formed by the sprite
 	 */
 	public Rectangle getBounds() {
-		return new Rectangle(getX(), getY(), WIDTH, WIDTH);
+		return new Rectangle(getX(), getY(), width, width);
 	}
 
 	/**
diff --git a/MerchantRPGCSE2102/src/sprites/Sprite.java b/MerchantRPGCSE2102/src/sprites/SpriteLoader.java
similarity index 92%
rename from MerchantRPGCSE2102/src/sprites/Sprite.java
rename to MerchantRPGCSE2102/src/sprites/SpriteLoader.java
index 81711fa..5aa2c18 100644
--- a/MerchantRPGCSE2102/src/sprites/Sprite.java
+++ b/MerchantRPGCSE2102/src/sprites/SpriteLoader.java
@@ -6,7 +6,7 @@
 
 import javax.imageio.ImageIO;
 
-public class Sprite {
+public class SpriteLoader {
 
     private static BufferedImage spriteSheet;
     private static final int TILE_SIZE = 32;
diff --git a/MerchantRPGCSE2102/src/tests/TestPlayer.java b/MerchantRPGCSE2102/src/tests/TestPlayer.java
index 1052553..a03b91c 100644
--- a/MerchantRPGCSE2102/src/tests/TestPlayer.java
+++ b/MerchantRPGCSE2102/src/tests/TestPlayer.java
@@ -15,7 +15,7 @@ public class TestPlayer extends TestCase
 	
 	public void setup()
 	{
-		RPGame game = new RPGame();	//starting a new game
+		RPGame game = new RPGame(3, 30);	//starting a new game
 		game.inventoryFromFile(); //read from file
 		p = new Player("TestPlayer", 1000, game.getPlayerInventoryList());
 		m = new Merchant("TestMerchant1", 100000, game.getMerchantInventoryList(1));
diff --git a/MerchantRPGCSE2102/src/tests/TestRPGame.java b/MerchantRPGCSE2102/src/tests/TestRPGame.java
index 272bbbb..bab1507 100644
--- a/MerchantRPGCSE2102/src/tests/TestRPGame.java
+++ b/MerchantRPGCSE2102/src/tests/TestRPGame.java
@@ -11,12 +11,12 @@ public class TestRPGame extends TestCase
 	
 	public void setup()
 	{
-		game = new RPGame();
+		game = new RPGame(0, 0);
 		game.buildMerchants();
 		ArrayList<String> playerInventory = game.getMerchantInventoryList(1);
 		playerInventory.addAll(game.getMerchantInventoryList(2));
 		playerInventory.addAll(game.getMerchantInventoryList(3));
-		game.buildPlayer("Test", 1000, playerInventory);
+		game.buildPlayer("Test", 1000);
 	}
 	
 	public void testFile()
diff --git a/MerchantRPGCSE2102/src/tests/TestTransaction.java b/MerchantRPGCSE2102/src/tests/TestTransaction.java
index 876e1be..f881795 100644
--- a/MerchantRPGCSE2102/src/tests/TestTransaction.java
+++ b/MerchantRPGCSE2102/src/tests/TestTransaction.java
@@ -11,13 +11,13 @@ public class TestTransaction extends TestCase
 	
 	public void setup()
 	{
-		_rpg = new RPGame();
+		_rpg = new RPGame(0, 0);
 		_rpg.inventoryFromFile();
 		_rpg.buildMerchants();
 		ArrayList<String> playerInventory = _rpg.getMerchantInventoryList(1);
 		playerInventory.addAll(_rpg.getMerchantInventoryList(2));
 		playerInventory.addAll(_rpg.getMerchantInventoryList(3));
-		_rpg.buildPlayer("test", 500, playerInventory);
+		_rpg.buildPlayer("test", 500);
 	}
 	
 	public void testActionSell()
diff --git a/MerchantRPGCSE2102/src/view/MapUI.java b/MerchantRPGCSE2102/src/view/MapUI.java
index 1535611..ea577e5 100644
--- a/MerchantRPGCSE2102/src/view/MapUI.java
+++ b/MerchantRPGCSE2102/src/view/MapUI.java
@@ -7,12 +7,15 @@
 import java.awt.RenderingHints;
 import java.awt.event.KeyEvent;
 import java.awt.event.KeyListener;
+import java.awt.image.BufferedImage;
+import java.io.File;
+import java.io.IOException;
 import java.util.ArrayList;
 
+import javax.imageio.ImageIO;
 import javax.swing.JPanel;
 
 import controller.RPGame;
-
 import model.Map;
 import sprites.MerchantSprite;
 import sprites.PlayerSprite;
@@ -23,15 +26,16 @@ public class MapUI extends JPanel {
 
 	public RPGame game;
 	public Map map;
+	public int tileSize;
 	private PlayerSprite player;	
 	private ArrayList<MerchantSprite> merchants = new ArrayList<MerchantSprite>();
 
 
 
-	public MapUI(Map map,RPGame Game) {
+	public MapUI(Map map, RPGame Game, int tileSize) {
 		this.map = map;
 		this.game= Game;
-
+		this.tileSize = tileSize;
 		addKeyListener(new KeyListener() {
 
 			@Override
@@ -63,13 +67,7 @@ public void paint(Graphics g) {
 		Graphics2D g2d = (Graphics2D) g;
 		g2d.setRenderingHint(RenderingHints.KEY_ANTIALIASING, RenderingHints.VALUE_ANTIALIAS_ON);	// Prevents aliasing
 		
-		// For testing purposes. Creates a grid of lines on the canvas
-		for (int i = 0; i < map.getGraph().getCols(); i++) {
-			for (int j = 0; j < map.getGraph().getRows(); j++) {
-				g2d.fillRect(i*30, j*30, 1, 30);
-				g2d.fillRect(i*30, j*30, 30, 1);
-			}
-		}
+		g2d.drawImage(loadWorld("RPG_samplemap.png"), 0, 0, null);
 		
 		// Paints the player onto the canvas
 		player.paint(g2d);
@@ -77,12 +75,11 @@ public void paint(Graphics g) {
 		for (MerchantSprite merchant : merchants)
 			merchant.paint(g2d);
 		
-		// For testing purposes. Shows the Player's current x and y position as well as the current Vertex
-		g2d.setColor(Color.GRAY);
+		// For testing purposes. Shows the Player's current Vertex position
+		g2d.setColor(Color.BLACK);
 		g2d.setFont(new Font("Verdana", Font.BOLD, 20));
-		g2d.drawString("x: " + player.getX() + " y : " + player.getY(), 10, 20);
-		g2d.drawString("delta X: " + player.getChangeInX() +" delta Y: " + player.getChangeInY(), 10, 50);
 		g2d.drawString("Vertex: (" + map.getPlayer().getRow() + ", " + map.getPlayer().getCol() + ")", 1000, 20);
+		//g2d.dispose();
 
 	}
 	
@@ -102,7 +99,7 @@ public void addMerchantSprite(int row, int col) {
 	 * @param y		The column of the player	
 	 */
 	public void createPlayerSprite(int row, int col) {
-		player = new PlayerSprite(this, row, col);
+		player = new PlayerSprite(this, row, col, tileSize);
 	}
 	
 	public void changeState(){
@@ -127,25 +124,38 @@ public void move() {
 		// For example, if the player reaches a changeInX of 31, this means they are moving to a Vertex in the east direction and their changeInX is reset to 1
 		// if they then decide to move west, they will move to the next Vertex when their changeInX reaches 0.
 		// Thus, the border shared by two vertices is inbetween 0 and 1 as well as 30 and 31.
-		if (player.getChangeInX() == 31) {
+		if (player.getChangeInX() == tileSize + 1) {
 			map.movePlayer("east");
 			player.setChangeInX(1);
 		}
 		if (player.getChangeInX() == 0) {
 			map.movePlayer("west");
-			player.setChangeInX(30);
+			player.setChangeInX(tileSize);
 		}
 		if (player.getChangeInY() == 0) {
 			map.movePlayer("north");
-			player.setChangeInY(30);
+			player.setChangeInY(tileSize);
 		}
-		if (player.getChangeInY() == 31) {
+		if (player.getChangeInY() == tileSize + 1) {
 			map.movePlayer("south");
 			player.setChangeInY(1);
 		}
 		}
 	}
 	
+    public static BufferedImage loadWorld(String fileName) {
+
+        BufferedImage worldImage = null;
+
+        try {
+            worldImage = ImageIO.read(new File("src/images/" + fileName));
+        } catch (IOException e) {
+            e.printStackTrace();
+        }
+
+        return worldImage;
+    }
+	
 	/**
 	 * Calls the method for advancing the day in the instance of RPGame
 	 * @return
diff --git a/MerchantRPGCSE2102/src/view/TransactionUI.java b/MerchantRPGCSE2102/src/view/TransactionUI.java
index bfc722c..94057d8 100644
--- a/MerchantRPGCSE2102/src/view/TransactionUI.java
+++ b/MerchantRPGCSE2102/src/view/TransactionUI.java
@@ -1,143 +1,201 @@
 package view;
-import javax.swing.*;
-
+import java.awt.BorderLayout;
 import java.awt.Font;
-
+import java.awt.GridBagConstraints;
+import java.awt.GridBagLayout;
+import java.awt.Insets;
+import java.awt.event.MouseAdapter;
+import java.awt.event.MouseEvent;
+import java.awt.image.BufferedImage;
+import java.io.File;
+import java.io.IOException;
+
+import javax.imageio.ImageIO;
+import javax.swing.ImageIcon;
+import javax.swing.JButton;
+import javax.swing.JComboBox;
+import javax.swing.JFrame;
+import javax.swing.JLabel;
+import javax.swing.JPanel;
+import javax.swing.JTextField;
 import javax.swing.border.EmptyBorder;
 
 import controller.Transaction;
 import exceptions.MerchantNotEnoughCashException;
 import exceptions.NotInInventoryException;
 
-import java.awt.event.MouseAdapter;
-import java.awt.event.MouseEvent;
-import java.awt.event.ActionListener;
-import java.awt.event.ActionEvent;
-
 @SuppressWarnings("serial")
 public class TransactionUI extends JFrame {
 
-	private static JPanel transactionPanel;
-	private static Transaction MASTER;				//TransactionUI class will hold the instance of the Transaction that created it
-	private static boolean _isWarning;						
+	private JPanel transactionPanel;
+	private JPanel buttonPanel;
+	private GridBagConstraints buttonLayoutConstraints;
+	private Transaction transaction;
+	private boolean _isWarning;						
+
+
+	public TransactionUI(Transaction transaction) {
+
+		this.transaction = transaction;
+		setupJFrame();
+		setupButtons();
+		setupLabels();
+		addComponentsToFrame();
+
+	}
 
 	/**
-	 * Create the frame.
+	 * Configures the JFrame of the transaction window
+	 * 
 	 */
-	public TransactionUI(Transaction master) {
-		MASTER = master;
-		_isWarning = false;
-		setTitle("Transaction Window");
-		setDefaultCloseOperation(JFrame.EXIT_ON_CLOSE);
-		setBounds(100, 100, 600, 430);
-		transactionPanel = new JPanel();
-		transactionPanel.setBorder(new EmptyBorder(5, 5, 5, 5));
-		transactionPanel.setLayout(null);
-
-		JButton btnBuy = new JButton("BUY");							//creates a "Buy" button
-		btnBuy.addActionListener(new ActionListener() {
-			public void actionPerformed(ActionEvent arg0) {
-			}
-		});
-		btnBuy.addMouseListener(new MouseAdapter() {
+	public void setupJFrame() {
+		setTitle("Merchant Transaction");
+		setDefaultCloseOperation(JFrame.DO_NOTHING_ON_CLOSE);
+		setSize(600, 430);
+		transactionPanel = new TransactionPanel(new BorderLayout());
+		buttonPanel = new JPanel(new GridBagLayout());
+		buttonLayoutConstraints = new GridBagConstraints();
+		buttonLayoutConstraints.insets = new Insets(10,10,10,10);
+	}
+
+	/**
+	 * Creates the buy, sell, and end transaction buttons for the transaction window
+	 * 
+	 */
+	public void setupButtons() {
+		// Creating Buy button
+		ScrollButton buyButton = new ScrollButton("Buy Item");
+
+		buttonLayoutConstraints.gridx = 0;
+		buttonLayoutConstraints.gridy = 1;
+
+		buyButton.addMouseListener(new MouseAdapter() {
 			@Override
 			public void mouseReleased(MouseEvent arg0) {
-				System.out.println("BUY");								//temporary test code
 				createBuyWindow();
 			}
 		});
-		btnBuy.setBounds(58, 155, 169, 105);
-		transactionPanel.add(btnBuy);
 
-		JButton btnSell = new JButton("SELL");							//creates a "Sell" button
-		btnSell.addMouseListener(new MouseAdapter() {
+		buttonPanel.add(buyButton, buttonLayoutConstraints);
+
+		// Creating Sell button
+		ScrollButton sellButton = new ScrollButton("Sell Item");	
+
+		buttonLayoutConstraints.gridx = 2;
+		buttonLayoutConstraints.gridy = 1;
+
+		sellButton.addMouseListener(new MouseAdapter() {
 			@Override
 			public void mouseReleased(MouseEvent e) {
-				System.out.println("SELL");								//temporary test code
 				createSellWindow();
 			}
 		});
-		btnSell.setBounds(351, 155, 169, 105);
-		transactionPanel.add(btnSell);
 
-		JButton btnCancel = new JButton("End Transaction");				//creates a button to end the transaction
-		btnCancel.addMouseListener(new MouseAdapter() {
+		buttonPanel.add(sellButton, buttonLayoutConstraints);
+
+
+		// Creating End Transaction button
+		JButton cancelButton = new JButton("End Transaction");	
+		buttonLayoutConstraints.gridx = 1;
+		buttonLayoutConstraints.gridy = 2;
+
+		cancelButton.addMouseListener(new MouseAdapter() {
 			@Override
 			public void mouseReleased(MouseEvent e) {
-				System.out.println("Cancel");							//temporary test code
-
-				MASTER.endTransaction();
-				exitWindow();										//Will end the transaction main screen but only if player does not have another transaction screen open
+				exitWindow();										
 			}
 		});
-		btnCancel.setBounds(210, 310, 160, 50);
-		transactionPanel.add(btnCancel);
-
-		JLabel lblWouldYouLike = new JLabel("Would you like to:");
-		lblWouldYouLike.setFont(new Font("Tahoma", Font.PLAIN, 15));
-		lblWouldYouLike.setBounds(233, 76, 193, 32);
-		transactionPanel.add(lblWouldYouLike);
-
-		JLabel lblOr = new JLabel("OR");
-		lblOr.setFont(new Font("Tahoma", Font.PLAIN, 15));
-		lblOr.setBounds(277, 189, 35, 32);
-		transactionPanel.add(lblOr);
+
+		buttonPanel.add(cancelButton, buttonLayoutConstraints);
+
+		// Creating labels
+		JLabel label1 = new JLabel("Would you like to:");
+		label1.setFont(new Font("Elephant", Font.BOLD, 20));
+		buttonLayoutConstraints.gridx = 0;
+		buttonLayoutConstraints.gridy = 0;
+		buttonLayoutConstraints.gridwidth = 3;
+		buttonPanel.add(label1, buttonLayoutConstraints);
+		buttonLayoutConstraints.gridwidth = 1;
+	}
+
+	/**
+	 * Creates the labels for the main transaction window
+	 */
+	public void setupLabels() {
+
+		JLabel label2 = new JLabel("OR");
+		label2.setFont(new Font("Elephant", Font.BOLD, 15));
+		buttonLayoutConstraints.gridx = 1;
+		buttonLayoutConstraints.gridy = 1;
+		buttonPanel.add(label2, buttonLayoutConstraints);
+	}
+
+	public void addComponentsToFrame() {
+
+		buttonPanel.setOpaque(false);
+		transactionPanel.add(buttonPanel, BorderLayout.WEST);
 		add(transactionPanel);
 		setLocationRelativeTo(null);
 	}
 
 	/**
-	 * Will exit the transaction window
-	 * incomplete method
+	 * Ends transaction and disposes of JFrame
+	 * 
 	 */
 	public void exitWindow()
 	{
+		transaction.endTransaction();
 		this.dispose();
 	}
 
 	/**
-	 * Will create a window for the BUY option
-	 * INCOMPLETE METHOD
+	 * Creates a buy window to replace the current transaction window
+	 * 
 	 */
 	public void createBuyWindow()
 	{
-		JPanel contentPane = new JPanel();
-		contentPane.setBorder(new EmptyBorder(5, 5, 5, 5));
-		contentPane.setLayout(null);
+		// Creates panel for the components of the buy window
+		JPanel buyPanel = new JPanel();
+		buyPanel.setBorder(new EmptyBorder(5, 5, 5, 5));
+		buyPanel.setLayout(null);	// We should get out of the habit of using null layouts. We may change this later.
+
+		// Removes the current components of the JFrame and adds new panel
 		getContentPane().removeAll();
-		add(contentPane);
-		setVisible(false);
-		setVisible(true);
-		setVisible(true);
+		add(buyPanel);
+
+		// Refreshes the new panel
+		buyPanel.revalidate();
+		buyPanel.repaint();
 
-		String[] itemList = new String[MASTER.getTargetMerchant().getInventory().length];		//create a new array of strings with the length of the player's inventory
-		for(int i = 0; i < itemList.length; i++)												//adds all the item names to the item list
+		int itemListLength = transaction.getTargetMerchant().getInventory().length;
+		String[] itemList = new String[itemListLength];		//create a new array of strings with the length of the player's inventory
+		for(int i = 0; i < itemListLength; i++)												//adds all the item names to the item list
 		{
-			itemList[i] = MASTER.getTargetMerchant().getInventory()[i].getItemName();
-			itemList[i] = itemList[i] + " ($" + MASTER.getTargetMerchant().getInventory()[i].getAdjustedPrice() + ")";
+			itemList[i] = transaction.getTargetMerchant().getInventory()[i].getItemName();
+			itemList[i] = itemList[i] + " ($" + transaction.getTargetMerchant().getInventory()[i].getAdjustedPrice() + ")";
 		}
 
-		JLabel lblYouHave = new JLabel("You have: $" + MASTER.getPlayer().getPlayerCash());
+		JLabel lblYouHave = new JLabel("You have: $" + transaction.getPlayer().getPlayerCash());
 		lblYouHave.setBounds(61, 27, 86, 14);
-		contentPane.add(lblYouHave);
+		buyPanel.add(lblYouHave);
 
 		@SuppressWarnings({ "rawtypes", "unchecked" })
 		final JComboBox comboBox = new JComboBox(itemList);										//create a drop-down menu for the player to choose from
 		comboBox.setBounds(61, 141, 250, 20);
-		contentPane.add(comboBox);
+		buyPanel.add(comboBox);
 
 		final JTextField textField = new JTextField();											//create a text field for the player to enter the amount desired into
 		textField.setBounds(61, 238, 86, 20);
-		contentPane.add(textField);
+		buyPanel.add(textField);
 		textField.setColumns(10);
 
 		JLabel lblSelectTheItem = new JLabel("Select the Item you want:");						//label containing instructions
 		lblSelectTheItem.setBounds(61, 105, 168, 14);
-		contentPane.add(lblSelectTheItem);
+		buyPanel.add(lblSelectTheItem);
 
 		JLabel lblSelectTheAmount = new JLabel("Enter the amount you wish to buy:");			//label containing instructions
 		lblSelectTheAmount.setBounds(61, 197, 275, 30);
-		contentPane.add(lblSelectTheAmount);
+		buyPanel.add(lblSelectTheAmount);
 
 		JButton btnCancel = new JButton("Cancel");												//cancel button, re-enables the player's ability to call new transaction windows
 		btnCancel.addMouseListener(new MouseAdapter() {
@@ -153,7 +211,7 @@ public void mouseReleased(MouseEvent arg0) {
 			}
 		});
 		btnCancel.setBounds(61, 306, 89, 23);
-		contentPane.add(btnCancel);
+		buyPanel.add(btnCancel);
 
 		JButton btnAccept = new JButton("Accept");												//create an accept button to consume the information the player entered into the menu and text field
 		btnAccept.addMouseListener(new MouseAdapter() {
@@ -166,7 +224,7 @@ public void mouseReleased(MouseEvent e) {
 
 					try{																			//will attempt to parse the number player entered, will stay on the same screen if it cannot
 						int chosenAmount = Integer.parseInt(textField.getText());
-						if(MASTER.actionBuy(chosenItem, chosenAmount))								//will attempt to buy the specified amount of the chosen item 
+						if(transaction.actionBuy(chosenItem, chosenAmount))								//will attempt to buy the specified amount of the chosen item 
 						{
 							System.out.println(chosenAmount);
 							getContentPane().removeAll();
@@ -185,7 +243,7 @@ public void mouseReleased(MouseEvent e) {
 			}
 		});
 		btnAccept.setBounds(247, 306, 89, 23);
-		contentPane.add(btnAccept);
+		buyPanel.add(btnAccept);
 	}
 
 	/**
@@ -203,15 +261,17 @@ public void createSellWindow()
 		setVisible(false);
 		setVisible(true);
 
-		String[] itemList = new String[MASTER.getTargetMerchant().getInventory().length];				//create a new array of strings with the length of the player's inventory
+		String[] itemList = new String[transaction.getTargetMerchant().getInventory().length];				//create a new array of strings with the length of the player's inventory
+		int playerInventoryIndex = 0;
 		for(int i = 0; i < itemList.length; i++)														//adds all the item names to the item list
-		{
-			itemList[i] = MASTER.getTargetMerchant().getInventory()[i].getItemName();
-			itemList[i] = itemList[i] + " (x" + MASTER.getPlayer().getInventory()[i].getQuantity() + ")";						//appends the quantity of items that the player has
-			itemList[i] = itemList[i] + " ($" + MASTER.getTargetMerchant().getInventory()[i].getAdjustedPrice() + ")";			//appends the price of the item
+		{	
+			playerInventoryIndex = transaction.getTargetMerchant().getInventoryStartIndex() + i;
+			itemList[i] = transaction.getTargetMerchant().getInventory()[i].getItemName();
+			itemList[i] = itemList[i] + " (x" + transaction.getPlayer().getInventory()[playerInventoryIndex].getQuantity() + ")";						//appends the quantity of items that the player has
+			itemList[i] = itemList[i] + " ($" + transaction.getTargetMerchant().getInventory()[i].getAdjustedPrice() + ")";			//appends the price of the item
 		}
 
-		JLabel lblYouHave = new JLabel(MASTER.getTargetMerchant().getName() + " has: $" + MASTER.getTargetMerchant().getCurrentCash());
+		JLabel lblYouHave = new JLabel(transaction.getTargetMerchant().getName() + " has: $" + transaction.getTargetMerchant().getCurrentCash());
 		lblYouHave.setBounds(61, 27, 299, 14);
 		contentPane.add(lblYouHave);
 
@@ -242,6 +302,8 @@ public void mouseReleased(MouseEvent arg0) {
 					add(transactionPanel);
 					setVisible(false);
 					setVisible(true);
+					revalidate();
+					repaint();
 				}
 			}
 		});
@@ -262,7 +324,7 @@ public void mouseReleased(MouseEvent e) {													//information is consumed
 						try{
 							try{																					//will attempt to parse the number player entered, will stay on the same screen if it cannot
 								int chosenAmount = Integer.parseInt(textField.getText());
-								isGood = MASTER.actionSell(chosenItem, chosenAmount);								//checks if the merchant will buy that item
+								isGood = transaction.actionSell(chosenItem, chosenAmount);								//checks if the merchant will buy that item
 								if(isGood)																			//will attempt to sell the specified amount of the chosen item 
 								{
 									System.out.println(chosenAmount);
@@ -270,6 +332,8 @@ public void mouseReleased(MouseEvent e) {													//information is consumed
 									add(transactionPanel);
 									setVisible(false);
 									setVisible(true);
+									revalidate();
+									repaint();
 								}
 								else
 									throw new NumberFormatException();												//will throw a NumberFormatException if actionSell returns a false
@@ -297,8 +361,21 @@ public void mouseReleased(MouseEvent e) {													//information is consumed
 		//		frame.setLocationRelativeTo(null);
 	}
 
+	public BufferedImage loadImage(String fileName) {
+
+		BufferedImage image = null;
+
+		try {
+			image = ImageIO.read(new File("src/images/" + fileName));
+		} catch (IOException e) {
+			e.printStackTrace();
+		}
+
+		return image;
+	}
+
+
 	public static void createWarning(String message) {
-		_isWarning = true;
 		final JFrame contentFrame = new JFrame();
 		JPanel warningPane = new JPanel();
 		contentFrame.setDefaultCloseOperation(JFrame.DISPOSE_ON_CLOSE);
@@ -312,7 +389,6 @@ public static void createWarning(String message) {
 		btnOk.addMouseListener(new MouseAdapter() {
 			@Override
 			public void mouseReleased(MouseEvent arg0) {
-				_isWarning = false;
 				contentFrame.dispose();
 			}
 		});