external-repos/forge
1
0
Fork 0
mirror of https://github.com/Card-Forge/forge.git synced 2025-11-20 12:48:00 +00:00
Code Issues Packages Projects Releases Wiki Activity

more code cleanup for Zones.

Browse Source
This commit is contained in:
jendave
2011-08-06 09:29:33 +00:00
parent 0cd83a7b74
commit c12b17affb
2 changed files with 13 additions and 30 deletions
Download Patch File Download Diff File Expand all files Collapse all files

39
src/forge/CardFactoryUtil.java
View File

@@ -4289,20 +4289,24 @@ public class CardFactoryUtil {
return s; return s;
} }
@Deprecated
public static CardList getCards(String cardName) public static CardList getCards(String cardName)
{ {
CardList list = new CardList(); return AllZoneUtil.getCardsInPlay(cardName);
/*CardList list = new CardList();
list.addAll(AllZone.Human_Play.getCards()); list.addAll(AllZone.Human_Play.getCards());
list.addAll(AllZone.Computer_Play.getCards()); list.addAll(AllZone.Computer_Play.getCards());
list = list.getName(cardName); list = list.getName(cardName);
return list; return list;*/
} }
@Deprecated
public static CardList getCards(String cardName, Player player) { public static CardList getCards(String cardName, Player player) {
PlayerZone play = AllZone.getZone(Constant.Zone.Play, player); return AllZoneUtil.getPlayerCardsInPlay(player, cardName);
/*PlayerZone play = AllZone.getZone(Constant.Zone.Play, player);
CardList list = new CardList(play.getCards()); CardList list = new CardList(play.getCards());
list = list.getName(cardName); list = list.getName(cardName);
return list; return list;*/
} }
public static int countBasicLandTypes(Player player) { public static int countBasicLandTypes(Player player) {
@@ -4388,8 +4392,9 @@ public class CardFactoryUtil {
return null; return null;
} }
@Deprecated
public static CardList makeToken(String name, String imageName, Card source, String manaCost, String[] types, int baseAttack, int baseDefense, String[] intrinsicKeywords) { public static CardList makeToken(String name, String imageName, Card source, String manaCost, String[] types, int baseAttack, int baseDefense, String[] intrinsicKeywords) {
// todo(sol) this function shouldn't be called, better to call makeToken with String controller as third paramter // todo(sol) this function shouldn't be called, better to call makeToken with Player controller as third paramter
CardList list = new CardList(); CardList list = new CardList();
Card c = new Card(); Card c = new Card();
c.setName(name); c.setName(name);
@@ -4598,7 +4603,7 @@ public class CardFactoryUtil {
*/ */
public static Card getWorstLand(Player player) { public static Card getWorstLand(Player player) {
Card worstLand = null; Card worstLand = null;
CardList lands = CardFactoryUtil.getLandsInPlay(player); CardList lands = AllZoneUtil.getPlayerLandsInPlay(player);
//first, check for tapped, basic lands //first, check for tapped, basic lands
for( int i = 0; i < lands.size(); i++ ) { for( int i = 0; i < lands.size(); i++ ) {
Card tmp = lands.get(i); Card tmp = lands.get(i);
@@ -4636,28 +4641,6 @@ public class CardFactoryUtil {
return worstLand; return worstLand;
}//end getWorstLand }//end getWorstLand
/**
* getLandsInPlay(Player)
*
* This function returns a CardList of all lands that the given
* player has in Constant.Zone.Play
*
* @param player - AllZone.HumanPlayer or AllZone.ComputerPlayer
* @return a CardList of that players lands
*/
public static CardList getLandsInPlay(Player player) {
PlayerZone compBattlezone = AllZone.getZone(Constant.Zone.Play, player);
CardList list = new CardList(compBattlezone.getCards());
list = list.filter(new CardListFilter() {
public boolean addCard(Card c) {
if(c.isLand()) return true;
else return false;
}
});
return list;
}
//may return null //may return null
static public Card getRandomCard(CardList list) { static public Card getRandomCard(CardList list) {
if(list.size() == 0) return null; if(list.size() == 0) return null;

2
src/forge/CardFactory_Creatures.java
View File

@@ -5806,7 +5806,7 @@ public class CardFactory_Creatures {
CardList getCreature() { CardList getCreature() {
final int total = CardFactoryUtil.getLandsInPlay(AllZone.ComputerPlayer).size(); final int total = AllZoneUtil.getPlayerLandsInPlay(AllZone.ComputerPlayer).size();
//toughness of 1 //toughness of 1
CardList list = CardFactoryUtil.AI_getHumanCreature(total, card, true); CardList list = CardFactoryUtil.AI_getHumanCreature(total, card, true);
list = list.filter(new CardListFilter() { list = list.filter(new CardListFilter() {