External/mage
1
0
Fork 1
mirror of https://github.com/magefree/mage.git synced 2026-01-26 21:29:17 -08:00
Code Issues Projects Releases Packages Wiki Activity Actions

Fix cards in set using UntapAllControllerEffect with AnotherPredicate

Browse source
This commit is contained in:
Mark Langen 2017-04-16 23:22:50 -06:00
parent 2b4e8c3e4c
commit e2f39b289b
2 changed files with 2 additions and 13 deletions
Download patch file Download diff file Expand all files Collapse all files

7
Mage.Sets/src/mage/cards/a/AhnCropChampion.java
View file

@ -43,11 +43,6 @@ import mage.filter.predicate.permanent.AnotherPredicate;
* @author stravant
*/
public class AhnCropChampion extends CardImpl {
private final static FilterControlledCreaturePermanent otherCreaturesFilter = new FilterControlledCreaturePermanent("other creatures you control");
static {
otherCreaturesFilter.add(new AnotherPredicate());
}
public AhnCropChampion(UUID ownerId, CardSetInfo setInfo) {
super(ownerId, setInfo, new CardType[]{CardType.CREATURE}, "{2}{G}{W}");
@ -57,7 +52,7 @@ public class AhnCropChampion extends CardImpl {
this.toughness = new MageInt(4);
// You may exert Ahn-Crop Champion as it attacks. When you do, untap all other creatures you control.
addAbility(new ExertAbility(new BecomesExertSourceTriggeredAbility(new UntapAllControllerEffect(otherCreaturesFilter))));
addAbility(new ExertAbility(new BecomesExertSourceTriggeredAbility(new UntapAllControllerEffect(new FilterControlledCreaturePermanent("creatures you control"), null, false))));
}
public AhnCropChampion(final AhnCropChampion card) {

8
Mage.Sets/src/mage/cards/c/CombatCelebrant.java
View file

@ -45,12 +45,6 @@ import mage.filter.predicate.permanent.AnotherPredicate;
*/
public class CombatCelebrant extends CardImpl {
private final static FilterControlledCreaturePermanent filter = new FilterControlledCreaturePermanent("other creatures you control");
static {
filter.add(new AnotherPredicate());
}
public CombatCelebrant(UUID ownerId, CardSetInfo setInfo) {
super(ownerId, setInfo, new CardType[]{CardType.CREATURE}, "{2}{R}");
@ -60,7 +54,7 @@ public class CombatCelebrant extends CardImpl {
this.toughness = new MageInt(1);
// If Combat Celebrant hasn't been exerted this turn, you may exert it as it attacks. When you do, untap all other creatures you control and after this phase, there is an additional combat phase.
BecomesExertSourceTriggeredAbility ability = new BecomesExertSourceTriggeredAbility(new UntapAllControllerEffect(filter));
BecomesExertSourceTriggeredAbility ability = new BecomesExertSourceTriggeredAbility(new UntapAllControllerEffect(new FilterControlledCreaturePermanent(), null, false));
ability.addEffect(new AdditionalCombatPhaseEffect("and after this phase, there is an additional combat phase"));
this.addAbility(new ExertAbility(ability, true));
}