Removing transaction check for MapUI

gal11002 · Apr 11, 2015 · 92e353c · 92e353c
1 parent 01a8d5a
commit 92e353c
Showing 1 changed file with 1 addition and 12 deletions.
diff --git a/MerchantRPGCSE2102/src/view/MapUI.java b/MerchantRPGCSE2102/src/view/MapUI.java
@@ -80,11 +80,7 @@ public void paint(Graphics g) {
 		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);
-
-		if (transactionAvailable) {
-			g2d.setFont(new Font("Verdana", Font.BOLD, 18));
-			g2d.drawString("Would you like to trade with merchant?", 800, 60);
-		}
+
 	}
 
 	/**
@@ -133,13 +129,6 @@ public void move() {
 			map.movePlayer("south");
 			player.setChangeInY(1);
 		}
-
-		// Checking if a Merchant is nearby
-		if (map.collisionTo("north")||map.collisionTo("south")||map.collisionTo("east")||map.collisionTo("west")||map.collisionTo("southeast")||map.collisionTo("southwest")||map.collisionTo("northeast")||map.collisionTo("northwest")) {
-			transactionAvailable = true;
-		} else {
-			transactionAvailable = false;
-		}
 	}
 
 	/**