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

Fixes issue 40

Browse Source 
Added CardList.getTargetableCards. 
Replaced the redundant filter code for the DestroyTgt and BounceTgt effects. Added this method in the CanPlayAI and the ETB command which chooses the target.
This commit is contained in:
jendave
2011-08-06 08:13:50 +00:00
parent 904d22853e
commit 5029706d80
2 changed files with 26 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

35
src/forge/CardFactory.java
View File

@@ -2588,13 +2588,10 @@ public class CardFactory implements NewConstants {
CardList getTargets() {
CardList tmpList = new CardList();
tmpList.addAll(AllZone.Human_Play.getCards());
tmpList = tmpList.filter(new CardListFilter() {
public boolean addCard(Card c) {
return (CardFactoryUtil.canTarget(card, c));
}
});
tmpList = tmpList.getValidCards(Tgts);
tmpList = tmpList.getTargetableCards(card);
return tmpList.getValidCards(Tgts);
return tmpList;
}
@Override
@@ -2749,13 +2746,10 @@ public class CardFactory implements NewConstants {
CardList getTargets() {
CardList tmpList = new CardList();
tmpList.addAll(AllZone.Human_Play.getCards());
tmpList = tmpList.filter(new CardListFilter() {
public boolean addCard(Card c) {
return (CardFactoryUtil.canTarget(card, c));
}
});
tmpList = tmpList.getValidCards(Tgts);
tmpList = tmpList.getTargetableCards(card);
return tmpList.getValidCards(Tgts);
return tmpList;
}
@Override
@@ -2854,11 +2848,13 @@ public class CardFactory implements NewConstants {
CardList hCards = new CardList(AllZone.getZone(Constant.Zone.Play, Constant.Player.Human).getCards());
hCards = hCards.getValidCards(Tgts);
hCards = hCards.getTargetableCards(card);
if (hCards.size() > 0)
return true;
CardList cCards = new CardList(AllZone.getZone(Constant.Zone.Play, Constant.Player.Computer).getCards());
cCards = cCards.getValidCards(Tgts);
cCards = cCards.getTargetableCards(card);
if (cCards.size() == 0)
return true;
else
@@ -2908,7 +2904,9 @@ public class CardFactory implements NewConstants {
CardList cCards = new CardList(AllZone.Computer_Play.getCards());
hCards = hCards.getValidCards(Tgts);
hCards = hCards.getTargetableCards(card);
cCards = cCards.getValidCards(Tgts);
cCards = cCards.getTargetableCards(card);
if(hCards.size() > 0 || cCards.size() > 0)
{
@@ -3209,13 +3207,10 @@ public class CardFactory implements NewConstants {
CardList getTargets() {
CardList tmpList = new CardList();
tmpList.addAll(AllZone.Human_Play.getCards());
tmpList = tmpList.filter(new CardListFilter() {
public boolean addCard(Card c) {
return (CardFactoryUtil.canTarget(card, c));
}
});
tmpList = tmpList.getValidCards(Tgts);
tmpList = tmpList.getTargetableCards(card);
return tmpList.getValidCards(Tgts);
return tmpList;
}
@Override
@@ -3357,11 +3352,13 @@ public class CardFactory implements NewConstants {
CardList hCards = new CardList(AllZone.getZone(Constant.Zone.Play, Constant.Player.Human).getCards());
hCards = hCards.getValidCards(Tgts);
hCards = hCards.getTargetableCards(card);
if (hCards.size() > 0)
return true;
CardList cCards = new CardList(AllZone.getZone(Constant.Zone.Play, Constant.Player.Computer).getCards());
cCards = cCards.getValidCards(Tgts);
cCards = cCards.getTargetableCards(card);
if (cCards.size() == 0)
return true;
else
@@ -3423,7 +3420,9 @@ public class CardFactory implements NewConstants {
CardList cCards = new CardList(AllZone.Computer_Play.getCards());
hCards = hCards.getValidCards(Tgts);
hCards = hCards.getTargetableCards(card);
cCards = cCards.getValidCards(Tgts);
cCards = cCards.getTargetableCards(card);
if (hCards.size() > 0 || cCards.size() > 0)
{

9
src/forge/CardList.java
View File

@@ -279,6 +279,15 @@ public class CardList implements Iterable<Card> {
Collections.sort(list, c);
}
public CardList getTargetableCards(final Card Source)
{
return this.filter(new CardListFilter() {
public boolean addCard(Card c) {
return CardFactoryUtil.canTarget(Source, c);
}
});
}
public CardList getValidCards(final String Restrictions[], final String Controller) {
return this.filter(new CardListFilter() {
public boolean addCard(Card c) {