AI should no longer be able to animate an equip or to attach an animated equip onto one of it's creatures (animated equip or not). I am not sure how to handle the human player at this time.

This commit is contained in:
jendave
2011-08-06 04:42:59 +00:00
parent 06d1b8b975
commit 9d8e6680b0

View File

@@ -1488,7 +1488,9 @@ public class CardFactoryUtil {
@Override @Override
public boolean canPlayAI() { public boolean canPlayAI() {
return getCreature().size() != 0 && !sourceCard.isEquipping(); return getCreature().size() != 0 &&
!sourceCard.isEquipping() &&
!sourceCard.isCreature();
} }
@@ -1502,10 +1504,12 @@ public class CardFactoryUtil {
CardList list = new CardList(AllZone.Computer_Play.getCards()); CardList list = new CardList(AllZone.Computer_Play.getCards());
list = list.filter(new CardListFilter() { list = list.filter(new CardListFilter() {
public boolean addCard(Card c) { public boolean addCard(Card c) {
return c.isCreature() && (!CardFactoryUtil.AI_doesCreatureAttack(c)) return c.isCreature() &&
&& CardFactoryUtil.canTarget(sourceCard, c) (!CardFactoryUtil.AI_doesCreatureAttack(c)) &&
&& (!c.getKeyword().contains("Defender")) CardFactoryUtil.canTarget(sourceCard, c) &&
&& (c.getNetDefense() + Tough > 0); (!c.getKeyword().contains("Defender")) &&
(c.getNetDefense() + Tough > 0) &&
c != sourceCard;
} }
}); });
// list.remove(card); // if mana-only cost, allow self-target // list.remove(card); // if mana-only cost, allow self-target