From 7f6ddedd6dee95e77b66cb44a54b7991beaec1f2 Mon Sep 17 00:00:00 2001
From: John W Bojorquez <johnbojorquez36@gmail.com>
Date: Sat, 11 Apr 2015 15:46:11 -0400
Subject: [PATCH] Changed the way in which the player detected a transaction
 was available from a merchant. The transaction can now be initiated by
 pressing the 'f' key when within 1 vertex of the merchant.

---
 MerchantRPGCSE2102/src/controller/RPGame.java    | 2 +-
 MerchantRPGCSE2102/src/sprites/PlayerSprite.java | 3 ++-
 MerchantRPGCSE2102/src/view/MapUI.java           | 4 ++--
 3 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/MerchantRPGCSE2102/src/controller/RPGame.java b/MerchantRPGCSE2102/src/controller/RPGame.java
index 9d18455..f9d9229 100644
--- a/MerchantRPGCSE2102/src/controller/RPGame.java
+++ b/MerchantRPGCSE2102/src/controller/RPGame.java
@@ -21,7 +21,7 @@ public class RPGame {
 	private ArrayList<String> playerInventoryList = new ArrayList<String>();	// the player's inventory list
 	private Player _player;
 	private Merchant _merchant1, _merchant2, _merchant3;
-	public boolean _movement;
+	public boolean _movement = true;
 	private int _currentDay;
 	private int _transactionLimit;
 
diff --git a/MerchantRPGCSE2102/src/sprites/PlayerSprite.java b/MerchantRPGCSE2102/src/sprites/PlayerSprite.java
index 081da07..e922ba4 100644
--- a/MerchantRPGCSE2102/src/sprites/PlayerSprite.java
+++ b/MerchantRPGCSE2102/src/sprites/PlayerSprite.java
@@ -117,7 +117,8 @@ public void keyReleased(KeyEvent e) {
 				dy = 0;
 		}
 		if (e.getKeyCode() == KeyEvent.VK_F){
-			if(collision()){
+			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
 			}
 			else{
diff --git a/MerchantRPGCSE2102/src/view/MapUI.java b/MerchantRPGCSE2102/src/view/MapUI.java
index eae961f..1535611 100644
--- a/MerchantRPGCSE2102/src/view/MapUI.java
+++ b/MerchantRPGCSE2102/src/view/MapUI.java
@@ -25,7 +25,7 @@ public class MapUI extends JPanel {
 	public Map map;
 	private PlayerSprite player;	
 	private ArrayList<MerchantSprite> merchants = new ArrayList<MerchantSprite>();
-	private boolean _tranState=game._movement;
+
 
 
 	public MapUI(Map map,RPGame Game) {
@@ -114,7 +114,7 @@ public void changeState(){
 	 */
 	public void move() {
 		//check transaction
-		if (_tranState=false){
+		if (game._movement==false){
 			
 		}
 		else{