github/mage
1
0
Fork 0
mirror of https://github.com/correl/mage.git synced 2024-12-26 11:09:27 +00:00
Code Issues Projects Releases Packages Wiki Activity

Fixed Wording on 2 cards and removed duplicate StaticFilter (#8596)

Browse source 
Closes #6643
This commit is contained in:
Alex Vasile 2022-01-25 21:08:46 -05:00 committed by GitHub
parent bd33191308
commit d33acc7c80
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
15 changed files with 14 additions and 18 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
Mage.Sets/src/mage/cards/a/AngelsTomb.java
View file

@ -34,7 +34,7 @@ public final class AngelsTomb extends CardImpl {
this.addAbility(new EntersBattlefieldControlledTriggeredAbility(
Zone.BATTLEFIELD,
effect,
StaticFilters.FILTER_PERMANENT_CREATURE_A,
StaticFilters.FILTER_PERMANENT_A_CREATURE,
true)
);
}

2
Mage.Sets/src/mage/cards/a/AnsweredPrayers.java
View file

@ -30,7 +30,7 @@ public final class AnsweredPrayers extends CardImpl {
// Whenever a creature enters the battlefield under your control, you gain 1 life. If Answered Prayers isn't a creature, it becomes a 3/3 Angel creature with flying in addition to its other types until end of turn.
this.addAbility(new EntersBattlefieldControlledTriggeredAbility(
new AnsweredPrayersEffect(), StaticFilters.FILTER_PERMANENT_CREATURE_A
new AnsweredPrayersEffect(), StaticFilters.FILTER_PERMANENT_A_CREATURE
));
}

2
Mage.Sets/src/mage/cards/c/CatharsCrusade.java
View file

@ -26,7 +26,7 @@ public final class CatharsCrusade extends CardImpl {
this.addAbility(new EntersBattlefieldControlledTriggeredAbility(
Zone.BATTLEFIELD,
new AddCountersAllEffect(CounterType.P1P1.createInstance(), new FilterControlledCreaturePermanent()),
StaticFilters.FILTER_PERMANENT_CREATURE_A,
StaticFilters.FILTER_PERMANENT_A_CREATURE,
false)
);
}

2
Mage.Sets/src/mage/cards/d/DecoctionModule.java
View file

@ -29,7 +29,7 @@ public final class DecoctionModule extends CardImpl {
this.addAbility(new EntersBattlefieldControlledTriggeredAbility(
Zone.BATTLEFIELD,
new GetEnergyCountersControllerEffect(1),
StaticFilters.FILTER_PERMANENT_CREATURE_A,
StaticFilters.FILTER_PERMANENT_A_CREATURE,
false)
);

1
Mage.Sets/src/mage/cards/d/DreamLeash.java
View file

@ -29,6 +29,7 @@ public final class DreamLeash extends CardImpl {
// Enchant permanent
TargetPermanent auraTarget = new TargetTappedPermanentAsYouCast();
auraTarget.withChooseHint("must be tapped");
this.getSpellAbility().addTarget(auraTarget);
this.getSpellAbility().addEffect(new AttachEffect(Outcome.GainControl));
Ability ability = new EnchantAbility(auraTarget.getTargetName());

1
Mage.Sets/src/mage/cards/e/EnthrallingHold.java
View file

@ -30,6 +30,7 @@ public final class EnthrallingHold extends CardImpl {
// Enchant creature
TargetPermanent auraTarget = new TargetTappedPermanentAsYouCast(StaticFilters.FILTER_PERMANENT_CREATURE);
auraTarget.withChooseHint("must be tapped");
this.getSpellAbility().addTarget(auraTarget);
this.getSpellAbility().addEffect(new AttachEffect(Outcome.GainControl));
Ability ability = new EnchantAbility(auraTarget.getTargetName());

2
Mage.Sets/src/mage/cards/k/KaldraCompleat.java
View file

@ -65,7 +65,7 @@ public final class KaldraCompleat extends CardImpl {
true,
false,
true,
StaticFilters.FILTER_PERMANENT_CREATURE_A
StaticFilters.FILTER_PERMANENT_A_CREATURE
),
AttachmentType.EQUIPMENT,
Duration.WhileOnBattlefield,

2
Mage.Sets/src/mage/cards/l/LeylineOfVitality.java
View file

@ -33,7 +33,7 @@ public final class LeylineOfVitality extends CardImpl {
this.addAbility(new EntersBattlefieldControlledTriggeredAbility(
Zone.BATTLEFIELD,
new GainLifeEffect(1),
StaticFilters.FILTER_PERMANENT_CREATURE_A,
StaticFilters.FILTER_PERMANENT_A_CREATURE,
true)
);
}

2
Mage.Sets/src/mage/cards/n/NurturingPresence.java
View file

@ -41,7 +41,7 @@ public final class NurturingPresence extends CardImpl {
new EntersBattlefieldControlledTriggeredAbility(
new BoostSourceEffect(1, 1, Duration.EndOfTurn)
.setText("this creature gets +1/+1 until end of turn"),
StaticFilters.FILTER_PERMANENT_CREATURE_A
StaticFilters.FILTER_PERMANENT_A_CREATURE
), AttachmentType.AURA
)));

2
Mage.Sets/src/mage/cards/s/SeasonOfGrowth.java
View file

@ -29,7 +29,7 @@ public final class SeasonOfGrowth extends CardImpl {
// Whenever a creature enters the battlefield under your control, scry 1.
this.addAbility(new EntersBattlefieldControlledTriggeredAbility(
new ScryEffect(1), StaticFilters.FILTER_PERMANENT_CREATURE_A
new ScryEffect(1), StaticFilters.FILTER_PERMANENT_A_CREATURE
));
// Whenever you cast a spell that targets a creature you control, draw a card.

2
Mage.Sets/src/mage/cards/t/TrialOfAmbition.java
View file

@ -31,7 +31,7 @@ public final class TrialOfAmbition extends CardImpl {
super(ownerId, setInfo, new CardType[]{CardType.ENCHANTMENT}, "{1}{B}");
// When Trial of Ambition enters the battlefield, target opponent sacrifices a creature.
Ability ability = new EntersBattlefieldTriggeredAbility(new SacrificeEffect(StaticFilters.FILTER_PERMANENT_CREATURE_A, 1, "target opponent"));
Ability ability = new EntersBattlefieldTriggeredAbility(new SacrificeEffect(StaticFilters.FILTER_PERMANENT_A_CREATURE, 1, "target opponent"));
ability.addTarget(new TargetOpponent());
this.addAbility(ability);

2
Mage.Sets/src/mage/cards/v/ValorInAkros.java
View file

@ -24,7 +24,7 @@ public final class ValorInAkros extends CardImpl {
this.addAbility(new EntersBattlefieldControlledTriggeredAbility(
Zone.BATTLEFIELD,
new BoostControlledEffect(1, 1, Duration.EndOfTurn),
StaticFilters.FILTER_PERMANENT_CREATURE_A,
StaticFilters.FILTER_PERMANENT_A_CREATURE,
false)
);
}

2
Mage/src/main/java/mage/abilities/common/BecomesBlockedAllTriggeredAbility.java
View file

@ -19,7 +19,7 @@ public class BecomesBlockedAllTriggeredAbility extends TriggeredAbilityImpl {
private final boolean setTargetPointer;
public BecomesBlockedAllTriggeredAbility(Effect effect, boolean optional) {
this(effect, optional, StaticFilters.FILTER_PERMANENT_CREATURE_A, false);
this(effect, optional, StaticFilters.FILTER_PERMANENT_A_CREATURE, false);
}
public BecomesBlockedAllTriggeredAbility(Effect effect, boolean optional, FilterCreaturePermanent filter, boolean setTargetPointer) {

6
Mage/src/main/java/mage/filter/StaticFilters.java
View file

@ -522,12 +522,6 @@ public final class StaticFilters {
FILTER_PERMANENT_CREATURE.setLockedFilter(true);
}
public static final FilterCreaturePermanent FILTER_PERMANENT_CREATURE_A = new FilterCreaturePermanent("a creature");
static {
FILTER_PERMANENT_CREATURE_A.setLockedFilter(true);
}
public static final FilterPermanent FILTER_PERMANENT_CREATURE_OR_PLANESWALKER_A = new FilterPermanent("a creature or planeswalker");
static {

2
Mage/src/main/java/mage/game/command/emblems/LukkaWaywardBonderEmblem.java
View file

@ -23,7 +23,7 @@ public final class LukkaWaywardBonderEmblem extends Emblem {
this.setExpansionSetCodeForImage("STX");
Ability ability = new EntersBattlefieldControlledTriggeredAbility(
Zone.COMMAND, new LukkaWaywardBonderEmblemEffect(),
StaticFilters.FILTER_PERMANENT_CREATURE_A, false
StaticFilters.FILTER_PERMANENT_A_CREATURE, false
);
ability.addTarget(new TargetAnyTarget());
this.getAbilities().add(ability);