From 48ca7a14103e1d13a41c85f5cfa9c85e64094989 Mon Sep 17 00:00:00 2001
From: Gavin Li <itsgavin.li@gmail.com>
Date: Fri, 20 Feb 2015 00:20:29 -0500
Subject: [PATCH] Updated RPGame and Transaction Classes with unfinished
 methods

---
 MerchantRPGCSE2102/src/controller/RPGame.java | 21 ++++++++++++++++++-
 .../src/controller/Transaction.java           | 15 +++++++++++++
 .../src/view/TransactionUI.java               |  3 ++-
 3 files changed, 37 insertions(+), 2 deletions(-)

diff --git a/MerchantRPGCSE2102/src/controller/RPGame.java b/MerchantRPGCSE2102/src/controller/RPGame.java
index 0e1e3b5..669e0dc 100644
--- a/MerchantRPGCSE2102/src/controller/RPGame.java
+++ b/MerchantRPGCSE2102/src/controller/RPGame.java
@@ -5,12 +5,19 @@
 import java.util.ArrayList;
 import java.util.Scanner;
 
+import model.Merchant;
+import model.Player;
+
 public class RPGame {
 	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;
+	private Merchant _merchant2;
+	private Merchant _merchant3;
+	
 	public RPGame() {
 		//constructor
 	}
@@ -81,4 +88,16 @@ else if (merchantNumber == 3)
 	public ArrayList<String> getPlayerInventoryList() {
 		return playerInventoryList;
 	}
+	
+	/**
+	 * This method will create a new instance of Transaction
+	 * 
+	 * @param player
+	 * @param targetMerchant		The merchant that the player is trading with
+	 */
+	public void createTransaction(Player player, Merchant targetMerchant)
+	{
+		Transaction newTransaction = new Transaction(player, targetMerchant);
+		newTransaction.runTransaction();
+	}
 }
diff --git a/MerchantRPGCSE2102/src/controller/Transaction.java b/MerchantRPGCSE2102/src/controller/Transaction.java
index bf15d8f..bfb2956 100644
--- a/MerchantRPGCSE2102/src/controller/Transaction.java
+++ b/MerchantRPGCSE2102/src/controller/Transaction.java
@@ -9,4 +9,19 @@ public class Transaction
 	private Player _player;
 	private Merchant _targetMerchant;
 	private TransactionUI _window;
+	
+	public Transaction(Player player, Merchant targetMerchant)
+	{
+		_player = player;
+		_targetMerchant = targetMerchant;
+		_window = new TransactionUI();
+	}
+	
+	/**
+	 * Will be Transaction class's main method
+	 */
+	public void runTransaction()
+	{
+		
+	}
 }
diff --git a/MerchantRPGCSE2102/src/view/TransactionUI.java b/MerchantRPGCSE2102/src/view/TransactionUI.java
index 8090c8d..f759984 100644
--- a/MerchantRPGCSE2102/src/view/TransactionUI.java
+++ b/MerchantRPGCSE2102/src/view/TransactionUI.java
@@ -1,5 +1,6 @@
 package view;
 
-public class TransactionUI {
+public class TransactionUI 
+{
 
 }