Skip to content

Commit

Permalink
Updated RPGame and Transaction Classes with unfinished methods
Browse files Browse the repository at this point in the history
  • Loading branch information
Gavin Li committed Feb 20, 2015
1 parent 5049c7a commit 48ca7a1
Show file tree
Hide file tree
Showing 3 changed files with 37 additions and 2 deletions.
21 changes: 20 additions & 1 deletion MerchantRPGCSE2102/src/controller/RPGame.java
Original file line number Diff line number Diff line change
Expand Up @@ -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
}
Expand Down Expand Up @@ -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();
}
}
15 changes: 15 additions & 0 deletions MerchantRPGCSE2102/src/controller/Transaction.java
Original file line number Diff line number Diff line change
Expand Up @@ -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()
{

}
}
3 changes: 2 additions & 1 deletion MerchantRPGCSE2102/src/view/TransactionUI.java
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
package view;

public class TransactionUI {
public class TransactionUI
{

}

0 comments on commit 48ca7a1

Please sign in to comment.