1) add javadoc to AllZoneUtil.java

2) add CardList getPlayerHand(player);
3) update Glasses of Urza to use new function
This commit is contained in:
jendave
2011-08-06 04:07:50 +00:00
parent 795aa68cbc
commit c6d416a4d0
2 changed files with 32 additions and 3 deletions

View File

@@ -97,6 +97,12 @@ public class AllZoneUtil {
//////////GRAVEYARD //////////GRAVEYARD
/**
* gets all cards in given player's graveyard
*
* @param player the player whose graveyard we want to get
* @return a CardList containing all cards in that player's graveyard
*/
public static CardList getPlayerGraveyard(final String player) { public static CardList getPlayerGraveyard(final String player) {
CardList cards = new CardList(); CardList cards = new CardList();
if( player.equals(Constant.Player.Human) || player.equals(Constant.Player.Computer) ){ if( player.equals(Constant.Player.Human) || player.equals(Constant.Player.Computer) ){
@@ -106,10 +112,34 @@ public class AllZoneUtil {
return cards; return cards;
} }
/**
* gets a list of all cards with a given name in a certain player's graveyard
*
* @param player the player whose graveyard we want to get
* @param cardName the card name to find in the graveyard
* @return a CardList containing all cards with that name in the target graveyard
*/
public static CardList getPlayerGraveyard(final String player, final String cardName) { public static CardList getPlayerGraveyard(final String player, final String cardName) {
CardList cards = new CardList(); CardList cards = new CardList();
cards = getPlayerGraveyard(player); cards = getPlayerGraveyard(player);
cards = cards.getName(cardName); cards = cards.getName(cardName);
return cards; return cards;
} }
//////// HAND
/**
* gets a list of all cards in a given player's hand
*
* @param player the player's hand to target
* @return a CardList containing all cards in target player's hand
*/
public static CardList getPlayerHand(final String player) {
CardList cards = new CardList();
if( player.equals(Constant.Player.Human) || player.equals(Constant.Player.Computer) ){
PlayerZone hand = AllZone.getZone(Constant.Zone.Hand, player);
cards.addAll(hand.getCards());
}
return cards;
}
} }

View File

@@ -18592,9 +18592,8 @@ public class CardFactory implements NewConstants {
@Override @Override
public void resolve() { public void resolve() {
final String player = getTargetPlayer(); final String player = getTargetPlayer();
PlayerZone hand = AllZone.getZone(Constant.Zone.Hand, player); CardList hand = AllZoneUtil.getPlayerHand(player);
CardList handList = new CardList( hand.getCards()); AllZone.Display.getChoice("Target player's hand", hand.toArray());
AllZone.Display.getChoice("Target player's hand", handList.toArray());
} }
@Override @Override