External/mage
1
0
Fork 1
mirror of https://github.com/magefree/mage.git synced 2025-12-20 02:30:08 -08:00
Code Issues Projects Releases Packages Wiki Activity Actions

Fix 'A' cards with card name instead of {this}

Browse source
This commit is contained in:
Steven Knipe 2025-06-21 21:15:02 -07:00
parent 747b29dfb7
commit 60fa9f1a65
9 changed files with 37 additions and 31 deletions
Download patch file Download diff file Expand all files Collapse all files

5
Mage.Sets/src/mage/cards/a/AdmonitionAngel.java
View file

@ -1,7 +1,6 @@
package mage.cards.a;
import java.util.UUID;
import mage.MageInt;
import mage.abilities.Ability;
import mage.abilities.TriggeredAbility;
@ -20,13 +19,15 @@ import mage.filter.predicate.Predicates;
import mage.filter.predicate.mageobject.AnotherPredicate;
import mage.target.TargetPermanent;
import java.util.UUID;
/**
*
* @author jeffwadsworth
*/
public final class AdmonitionAngel extends CardImpl {
private static final FilterPermanent filter = new FilterPermanent("nonland permanent other than Admonition Angel");
private static final FilterPermanent filter = new FilterPermanent("nonland permanent other than {this}");
static {
filter.add(AnotherPredicate.instance);

9
Mage.Sets/src/mage/cards/a/AgentOfAcquisitions.java
View file

@ -1,15 +1,16 @@
package mage.cards.a;
import java.util.UUID;
import mage.MageInt;
import mage.abilities.common.SimpleStaticAbility;
import mage.abilities.effects.common.InfoEffect;
import mage.cards.CardImpl;
import mage.cards.CardSetInfo;
import mage.constants.CardType;
import mage.constants.SubType;
import mage.constants.Zone;
import mage.abilities.common.SimpleStaticAbility;
import mage.abilities.effects.common.InfoEffect;
import java.util.UUID;
/**
*
@ -27,7 +28,7 @@ public final class AgentOfAcquisitions extends CardImpl {
// TODO: Draft specific abilities not implemented
// Draft Agent of Acquisitions face up.
this.addAbility(new SimpleStaticAbility(Zone.ALL, new InfoEffect("Draft Agent of Acquisitions face up - not implemented.")));
this.addAbility(new SimpleStaticAbility(Zone.ALL, new InfoEffect("Draft {this} face up - not implemented.")));
// Instead of drafting a card from a booster pack, you may draft each card in that booster pack, one at a time. If you do, turn Agent of Acquisitions face down and you can’t draft cards for the rest of this draft round.
this.addAbility(new SimpleStaticAbility(Zone.ALL, new InfoEffect("Instead of drafting a card from a booster pack, "

4
Mage.Sets/src/mage/cards/a/AminatouTheFateshifter.java
View file

@ -118,8 +118,8 @@ class AminatouUltimateEffect extends OneShotEffect {
AminatouUltimateEffect() {
super(Outcome.Benefit);
staticText = "Choose left or right. Each player gains control of all nonland permanents other than Aminatou,"
+ " the Fateshifter controlled by the next player in the chosen direction.";
staticText = "Choose left or right. Each player gains control of all nonland permanents other than {this}"
+ " controlled by the next player in the chosen direction.";
}
private AminatouUltimateEffect(final AminatouUltimateEffect effect) {

10
Mage.Sets/src/mage/cards/a/Anavolver.java
View file

@ -2,7 +2,6 @@
package mage.cards.a;
import java.util.UUID;
import mage.MageInt;
import mage.abilities.common.EntersBattlefieldAbility;
import mage.abilities.common.SimpleActivatedAbility;
@ -19,9 +18,10 @@ import mage.cards.CardSetInfo;
import mage.constants.CardType;
import mage.constants.Duration;
import mage.constants.SubType;
import mage.constants.Zone;
import mage.counters.CounterType;
import java.util.UUID;
/**
* @author Loki
*/
@ -49,9 +49,9 @@ public final class Anavolver extends CardImpl {
// If Anavolver was kicked with its {B} kicker, it enters with a +1/+1 counter on it and with "Pay 3 life: Regenerate Anavolver."
EntersBattlefieldAbility ability2 = new EntersBattlefieldAbility(
new AddCountersSourceEffect(CounterType.P1P1.createInstance(1),false), new KickedCostCondition("{B}"),
"If {this} was kicked with its {B} kicker, it enters with a +1/+1 counter on it and with \"Pay 3 life: Regenerate Anavolver.\"",
"{this} enters with a +1/+1 counter on it and with \"Pay 3 life: Regenerate Anavolver.\"");
new AddCountersSourceEffect(CounterType.P1P1.createInstance(1), false), new KickedCostCondition("{B}"),
"If {this} was kicked with its {B} kicker, it enters with a +1/+1 counter on it and with \"Pay 3 life: Regenerate {this}.\"",
"{this} enters with a +1/+1 counter on it and with \"Pay 3 life: Regenerate {this}.\"");
((EntersBattlefieldEffect)ability2.getEffects().get(0)).addEffect(new GainAbilitySourceEffect(new SimpleActivatedAbility(new RegenerateSourceEffect(), new PayLifeCost(3)), Duration.WhileOnBattlefield));
this.addAbility(ability2);
}

9
Mage.Sets/src/mage/cards/a/AngelsTrumpet.java
View file

@ -2,14 +2,17 @@ package mage.cards.a;
import mage.MageObjectReference;
import mage.abilities.Ability;
import mage.abilities.triggers.BeginningOfEndStepTriggeredAbility;
import mage.abilities.common.SimpleStaticAbility;
import mage.abilities.effects.OneShotEffect;
import mage.abilities.effects.common.continuous.GainAbilityAllEffect;
import mage.abilities.keyword.VigilanceAbility;
import mage.abilities.triggers.BeginningOfEndStepTriggeredAbility;
import mage.cards.CardImpl;
import mage.cards.CardSetInfo;
import mage.constants.*;
import mage.constants.CardType;
import mage.constants.Duration;
import mage.constants.Outcome;
import mage.constants.TargetController;
import mage.filter.StaticFilters;
import mage.game.Game;
import mage.game.permanent.Permanent;
@ -47,7 +50,7 @@ class AngelsTrumpetTapEffect extends OneShotEffect {
AngelsTrumpetTapEffect() {
super(Outcome.Tap);
this.staticText = "tap all untapped creatures that player controls that didn't attack this turn. Angel's Trumpet deals damage to the player equal to the number of creatures tapped this way";
this.staticText = "tap all untapped creatures that player controls that didn't attack this turn. {this} deals damage to the player equal to the number of creatures tapped this way";
}
private AngelsTrumpetTapEffect(final AngelsTrumpetTapEffect effect) {

10
Mage.Sets/src/mage/cards/a/ArchdemonOfPaliano.java
View file

@ -1,14 +1,14 @@
package mage.cards.a;
import mage.MageInt;
import mage.abilities.common.SimpleStaticAbility;
import mage.abilities.effects.common.InfoEffect;
import mage.abilities.keyword.FlyingAbility;
import mage.cards.CardImpl;
import mage.cards.CardSetInfo;
import mage.constants.CardType;
import mage.constants.SubType;
import mage.constants.Zone;
import mage.abilities.common.SimpleStaticAbility;
import mage.abilities.effects.common.InfoEffect;
import java.util.UUID;
@ -27,12 +27,12 @@ public final class ArchdemonOfPaliano extends CardImpl {
// TODO: Draft specific abilities not implemented
// Draft Archdemon of Paliano face up.
this.addAbility(new SimpleStaticAbility(Zone.ALL, new InfoEffect("Draft Archdemon of Paliano face up - not implemented.")));
this.addAbility(new SimpleStaticAbility(Zone.ALL, new InfoEffect("Draft {this} face up - not implemented.")));
// As long as Archdemon of Paliano is face up during the draft, you can’t look at booster packs and must draft cards at random. After you draft three cards this way, turn Archdemon of Paliano face down.
this.addAbility(new SimpleStaticAbility(Zone.ALL, new InfoEffect("As long as Archdemon of Paliano is face up during the draft, "
this.addAbility(new SimpleStaticAbility(Zone.ALL, new InfoEffect("As long as {this} is face up during the draft, "
+ "you can't look at booster packs and must draft cards at random. "
+ "After you draft three cards this way, turn Archdemon of Paliano face down. - not implemented.")));
+ "After you draft three cards this way, turn {this} face down. - not implemented.")));
// Flying
this.addAbility(FlyingAbility.getInstance());

5
Mage.Sets/src/mage/cards/a/ArtifactPossession.java
View file

@ -1,7 +1,6 @@
package mage.cards.a;
import java.util.UUID;
import mage.abilities.Ability;
import mage.abilities.TriggeredAbilityImpl;
import mage.abilities.effects.common.AttachEffect;
@ -19,6 +18,8 @@ import mage.game.permanent.Permanent;
import mage.target.TargetPermanent;
import mage.target.common.TargetArtifactPermanent;
import java.util.UUID;
/**
*
* @author MarcoMarin
@ -87,6 +88,6 @@ class AbilityActivatedTriggeredAbility extends TriggeredAbilityImpl {
@Override
public String getRule() {
return "Whenever enchanted artifact becomes tapped or a player activates an ability of enchanted artifact without {T} in its activation cost, Artifact Possession deals 2 damage to that artifact's controller.";
return "Whenever enchanted artifact becomes tapped or a player activates an ability of enchanted artifact without {T} in its activation cost, {this} deals 2 damage to that artifact's controller.";
}
}

5
Mage.Sets/src/mage/cards/a/AutumnWillow.java
View file

@ -1,7 +1,6 @@
package mage.cards.a;
import java.util.UUID;
import mage.MageInt;
import mage.abilities.Ability;
import mage.abilities.common.SimpleActivatedAbility;
@ -15,6 +14,8 @@ import mage.game.Game;
import mage.game.permanent.Permanent;
import mage.target.TargetPlayer;
import java.util.UUID;
/**
*
* @author L_J
@ -51,7 +52,7 @@ class AutumnWillowEffect extends AsThoughEffectImpl {
AutumnWillowEffect() {
super(AsThoughEffectType.SHROUD, Duration.EndOfTurn, Outcome.Benefit);
staticText = "Until end of turn, Autumn Willow can be the target of spells and abilities controlled by target player as though it didn't have shroud";
staticText = "Until end of turn, {this} can be the target of spells and abilities controlled by target player as though it didn't have shroud";
}
private AutumnWillowEffect(final AutumnWillowEffect effect) {

11
Mage.Sets/src/mage/cards/a/AzorsGateway.java
View file

@ -1,10 +1,6 @@
package mage.cards.a;
import java.util.HashSet;
import java.util.Set;
import java.util.UUID;
import mage.MageObject;
import mage.abilities.Ability;
import mage.abilities.common.SimpleActivatedAbility;
@ -20,13 +16,16 @@ import mage.cards.CardSetInfo;
import mage.constants.CardType;
import mage.constants.Outcome;
import mage.constants.SuperType;
import mage.constants.Zone;
import mage.game.ExileZone;
import mage.game.Game;
import mage.players.Player;
import mage.target.common.TargetCardInHand;
import mage.util.CardUtil;
import java.util.HashSet;
import java.util.Set;
import java.util.UUID;
/**
* @author LevelX2
*/
@ -63,7 +62,7 @@ class AzorsGatewayEffect extends OneShotEffect {
super(Outcome.Benefit);
this.staticText = "Draw a card, then exile a card from your hand. " +
"If cards with five or more different mana values are exiled with {this}, " +
"you gain 5 life, untap Azor's Gateway, and transform it";
"you gain 5 life, untap {this}, and transform it";
}
private AzorsGatewayEffect(final AzorsGatewayEffect effect) {