package com.north.gamecore;

import com.north.cardspack.*;

import java.util.ArrayList;

public class Deck {
	private ArrayList<Card> cards;
	private ArrayList<Card> usedCards;
	
	public Deck() {
		cards = new ArrayList<Card>();
		usedCards = new ArrayList<Card>();
		cards.add(new Musician());
		cards.add(new Princess());
		cards.add(new Spy());
		cards.add(new Assassin());
		cards.add(new Ambassador());
		cards.add(new Wizard());
		cards.add(new General());
		cards.add(new Prince());
	}
	
	public void cardOut(Card thisCard) {
		cards.remove(thisCard);
		usedCards.add(thisCard);
	}
	
	public ArrayList<Card> getCards() {
		return cards;
	}
	public void setCards(ArrayList<Card> cards) {
		this.cards = cards;
	}
	public ArrayList<Card> getUsedCards() {
		return usedCards;
	}
	public void setUsedCards(ArrayList<Card> usedCards) {
		this.usedCards = usedCards;
	}
}

@@ -169,17 +169,119 @@
 edCards;
+ // cards being played%0A    private ArrayList%3CCard%3E exposedCards; // cards already exposed to opponents
 %0A
-
 %09%0A%09publi
@@ -361,16 +361,62 @@
 ard%3E();%0A
+        exposedCards = new ArrayList%3CCard%3E();%0A
 %09%09cards.
@@ -725,24 +725,109 @@
 hisCard);%0A%09%7D
+%0A%0A%09public void exposeThisCard(Card thisCard) %7B%0A%09    exposedCards.add(thisCard);%0A    %7D
 %0A%09%0A%09public A
@@ -1094,13 +1094,207 @@
 dCards;%0A
-
 %09%7D%0A
+    public ArrayList%3CCard%3E getExposedCards() %7B%0A        return exposedCards;%0A    %7D%0A    public void setExposedCards(ArrayList%3CCard%3E exposedCards) %7B%0A        this.exposedCards = exposedCards;%0A    %7D%0A
 %7D%0A

Update Deck.java