- Re-did the recent fix to Reanimate.

This commit is contained in:
jendave
2011-08-06 06:00:23 +00:00
parent 3b3041456d
commit 0b808e6c3f

View File

@@ -7616,6 +7616,7 @@ public class CardFactory_Sorceries {
card.addSpellAbility(spell); card.addSpellAbility(spell);
}//*************** END ************ END ************************** }//*************** END ************ END **************************
//*************** START *********** START ************************** //*************** START *********** START **************************
else if(cardName.equals("Reanimate")) { else if(cardName.equals("Reanimate")) {
final SpellAbility spell = new Spell(card) { final SpellAbility spell = new Spell(card) {
@@ -7635,11 +7636,6 @@ public class CardFactory_Sorceries {
AllZone.GameAction.getPlayerLife(c.getController()).subtractLife(cmc,card); AllZone.GameAction.getPlayerLife(c.getController()).subtractLife(cmc,card);
}//resolve() }//resolve()
@Override
public boolean canPlayAI() {
return getCreatures().size() > 0;
}
@Override @Override
public boolean canPlay() { public boolean canPlay() {
return super.canPlay() && getCreatures().size() > 0; return super.canPlay() && getCreatures().size() > 0;
@@ -7647,17 +7643,12 @@ public class CardFactory_Sorceries {
public CardList getCreatures() { public CardList getCreatures() {
CardList creatures = AllZoneUtil.getCardsInGraveyard(); CardList creatures = AllZoneUtil.getCardsInGraveyard();
creatures.filter(new CardListFilter() { creatures.filter(AllZoneUtil.creatures);
public boolean addCard(Card c) { if (card.getController().equals("Computer")) {
return CardFactoryUtil.canTarget(card, c)
&& c.getType().contains("Creature")
/* && !c.getKeyword().contains("At the beginning of the end step, sacrifice CARDNAME.") */ ;
}
});
// The keyword filter above does not work, the one below does work.
creatures = creatures.getNotKeyword("At the beginning of the end step, sacrifice CARDNAME."); creatures = creatures.getNotKeyword("At the beginning of the end step, sacrifice CARDNAME.");
}
return creatures; return creatures;
}//getCreatures() }
@Override @Override
public void chooseTargetAI() { public void chooseTargetAI() {
@@ -7693,6 +7684,7 @@ public class CardFactory_Sorceries {
spell.setBeforePayMana(target); spell.setBeforePayMana(target);
}//*************** END ************ END ************************** }//*************** END ************ END **************************
//*************** START *********** START ************************** //*************** START *********** START **************************
else if(cardName.equals("Recall")) { else if(cardName.equals("Recall")) {
/* /*