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

Text fix for cards with "named {this}" to use actual card name

Browse source
This commit is contained in:
Steven Knipe 2025-06-21 21:00:48 -07:00
parent c07837f743
commit 3888547fdb
9 changed files with 34 additions and 32 deletions
Download patch file Download diff file Expand all files Collapse all files

6
Mage.Sets/src/mage/cards/a/AccumulatedKnowledge.java
View file

@ -1,7 +1,6 @@
package mage.cards.a;
import java.util.UUID;
import mage.abilities.dynamicvalue.common.CardsInAllGraveyardsCount;
import mage.abilities.effects.Effect;
import mage.abilities.effects.common.DrawCardSourceControllerEffect;
@ -11,8 +10,9 @@ import mage.constants.CardType;
import mage.filter.FilterCard;
import mage.filter.predicate.mageobject.NamePredicate;
import java.util.UUID;
/**
*
* @author LevelX2
*/
public final class AccumulatedKnowledge extends CardImpl {
@ -30,7 +30,7 @@ public final class AccumulatedKnowledge extends CardImpl {
// Draw a card, then draw cards equal to the number of cards named Accumulated Knowledge in all graveyards.
this.getSpellAbility().addEffect(new DrawCardSourceControllerEffect(1));
Effect effect = new DrawCardSourceControllerEffect(new CardsInAllGraveyardsCount(filter));
effect.setText(", then draw cards equal to the number of cards named {this} in all graveyards");
effect.setText(", then draw cards equal to the number of cards named Accumulated Knowledge in all graveyards");
this.getSpellAbility().addEffect(effect);
}

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

@ -48,7 +48,7 @@ class ApproachOfTheSecondSunEffect extends OneShotEffect {
ApproachOfTheSecondSunEffect() {
super(Outcome.Win);
this.staticText
= "If this spell was cast from your hand and you've cast another spell named {this} this game, you win the game. "
= "If this spell was cast from your hand and you've cast another spell named Approach of the Second Sun this game, you win the game. "
+ "Otherwise, put {this} into its owner's library seventh from the top and you gain 7 life.";
}

6
Mage.Sets/src/mage/cards/f/FeastOfFlesh.java
View file

@ -1,7 +1,6 @@
package mage.cards.f;
import java.util.UUID;
import mage.abilities.dynamicvalue.IntPlusDynamicValue;
import mage.abilities.dynamicvalue.common.CardsInAllGraveyardsCount;
import mage.abilities.effects.Effect;
@ -14,8 +13,9 @@ import mage.filter.FilterCard;
import mage.filter.predicate.mageobject.NamePredicate;
import mage.target.common.TargetCreaturePermanent;
import java.util.UUID;
/**
*
* @author L_J
*/
public final class FeastOfFlesh extends CardImpl {
@ -34,7 +34,7 @@ public final class FeastOfFlesh extends CardImpl {
Effect effect1 = new DamageTargetEffect(value);
effect1.setText("Feast of Flesh deals X damage to target creature");
Effect effect2 = new GainLifeEffect(value);
effect2.setText("and you gain X life, where X is 1 plus the number of cards named {this} in all graveyards");
effect2.setText("and you gain X life, where X is 1 plus the number of cards named Feast of Flesh in all graveyards");
this.getSpellAbility().addEffect(effect1);
this.getSpellAbility().addEffect(effect2);
this.getSpellAbility().addTarget(new TargetCreaturePermanent());

7
Mage.Sets/src/mage/cards/g/GalvanicBombardment.java
View file

@ -1,7 +1,6 @@
package mage.cards.g;
import java.util.UUID;
import mage.abilities.Ability;
import mage.abilities.dynamicvalue.DynamicValue;
import mage.abilities.effects.Effect;
@ -17,8 +16,9 @@ import mage.game.Game;
import mage.players.Player;
import mage.target.common.TargetCreaturePermanent;
import java.util.UUID;
/**
*
* @author fireshoes
* modified tiera3 - added Hint
*/
@ -29,6 +29,7 @@ public final class GalvanicBombardment extends CardImpl {
static {
filter.add(new NamePredicate("Galvanic Bombardment"));
}
private static final Hint hint = new ValueHint(
"Cards named Galvanic Bombardment in your graveyard", new GalvanicBombardmentCardsInControllerGraveyardCount(filter)
);
@ -38,7 +39,7 @@ public final class GalvanicBombardment extends CardImpl {
// Galvanic Bombardment deals X damage to target creature, where X is 2 plus the number of cards named Galvanic Bombardment in your graveyard.
Effect effect = new DamageTargetEffect(new GalvanicBombardmentCardsInControllerGraveyardCount(filter));
effect.setText("{this} deals X damage to target creature, where X is 2 plus the number of cards named {this} in your graveyard");
effect.setText("{this} deals X damage to target creature, where X is 2 plus the number of cards named Galvanic Bombardment in your graveyard");
this.getSpellAbility().addEffect(effect);
this.getSpellAbility().addTarget(new TargetCreaturePermanent());
this.getSpellAbility().addHint(hint);

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

@ -33,7 +33,7 @@ public final class Kindle extends CardImpl {
// Kindle deals X damage to any target, where X is 2 plus the number of cards named Kindle in all graveyards.
Effect effect = new DamageTargetEffect(new KindleCardsInAllGraveyardsCount(filter));
effect.setText("{this} deals X damage to any target, where X is 2 plus the number of cards named {this} in all graveyards");
effect.setText("{this} deals X damage to any target, where X is 2 plus the number of cards named Kindle in all graveyards");
this.getSpellAbility().addEffect(effect);
this.getSpellAbility().addTarget(new TargetAnyTarget());
}

6
Mage.Sets/src/mage/cards/k/KjeldoranWarCry.java
View file

@ -1,7 +1,6 @@
package mage.cards.k;
import java.util.UUID;
import mage.abilities.dynamicvalue.IntPlusDynamicValue;
import mage.abilities.dynamicvalue.common.CardsInAllGraveyardsCount;
import mage.abilities.effects.Effect;
@ -14,8 +13,9 @@ import mage.filter.FilterCard;
import mage.filter.common.FilterCreaturePermanent;
import mage.filter.predicate.mageobject.NamePredicate;
import java.util.UUID;
/**
*
* @author L_J
*/
public final class KjeldoranWarCry extends CardImpl {
@ -32,7 +32,7 @@ public final class KjeldoranWarCry extends CardImpl {
// Creatures you control get +X/+X until end of turn, where X is 1 plus the number of cards named Kjeldoran War Cry in all graveyards.
IntPlusDynamicValue value = new IntPlusDynamicValue(1, new CardsInAllGraveyardsCount(filter));
Effect effect = new BoostControlledEffect(value, value, Duration.EndOfTurn, new FilterCreaturePermanent("creatures"), false);
effect.setText("Creatures you control get +X/+X until end of turn, where X is 1 plus the number of cards named {this} in all graveyards");
effect.setText("Creatures you control get +X/+X until end of turn, where X is 1 plus the number of cards named Kjeldoran War Cry in all graveyards");
this.getSpellAbility().addEffect(effect);
}

6
Mage.Sets/src/mage/cards/l/LifeBurst.java
View file

@ -1,7 +1,6 @@
package mage.cards.l;
import java.util.UUID;
import mage.abilities.dynamicvalue.MultipliedValue;
import mage.abilities.dynamicvalue.common.CardsInAllGraveyardsCount;
import mage.abilities.effects.Effect;
@ -13,8 +12,9 @@ import mage.filter.FilterCard;
import mage.filter.predicate.mageobject.NamePredicate;
import mage.target.TargetPlayer;
import java.util.UUID;
/**
*
* @author escplan9 (Derek Monturo - dmontur1 at gmail dot com)
*/
public final class LifeBurst extends CardImpl {
@ -31,7 +31,7 @@ public final class LifeBurst extends CardImpl {
// Target player gains 4 life, then gains 4 life for each card named Life Burst in each graveyard.
this.getSpellAbility().addEffect(new GainLifeTargetEffect(4));
Effect effect = new GainLifeTargetEffect(new MultipliedValue(new CardsInAllGraveyardsCount(filter), 4));
effect.setText(", then gains 4 life for each card named {this} in each graveyard");
effect.setText(", then gains 4 life for each card named Life Burst in each graveyard");
this.getSpellAbility().addEffect(effect);
this.getSpellAbility().addTarget(new TargetPlayer());
}

6
Mage.Sets/src/mage/cards/o/OnceMoreWithFeeling.java
View file

@ -1,7 +1,6 @@
package mage.cards.o;
import java.util.UUID;
import mage.abilities.Ability;
import mage.abilities.effects.Effect;
import mage.abilities.effects.OneShotEffect;
@ -19,8 +18,9 @@ import mage.game.Game;
import mage.game.permanent.Permanent;
import mage.players.Player;
import java.util.UUID;
/**
*
* @author L_J
*/
public final class OnceMoreWithFeeling extends CardImpl {
@ -38,7 +38,7 @@ public final class OnceMoreWithFeeling extends CardImpl {
// DCI ruling — A deck can have only one card named Once More with Feeling.
// (according to rule 112.6m, this shouldn't do anything)
this.getSpellAbility().addEffect(new InfoEffect("<br>DCI ruling &mdash; A deck can have only one card named {this}"));
this.getSpellAbility().addEffect(new InfoEffect("<br>DCI ruling &mdash; A deck can have only one card named Once More With Feeling"));
}
private OnceMoreWithFeeling(final OnceMoreWithFeeling card) {

7
Mage.Sets/src/mage/cards/t/TakeInventory.java
View file

@ -1,7 +1,6 @@
package mage.cards.t;
import java.util.UUID;
import mage.abilities.dynamicvalue.common.CardsInControllerGraveyardCount;
import mage.abilities.effects.Effect;
import mage.abilities.effects.common.DrawCardSourceControllerEffect;
@ -13,8 +12,9 @@ import mage.constants.CardType;
import mage.filter.FilterCard;
import mage.filter.predicate.mageobject.NamePredicate;
import java.util.UUID;
/**
*
* @author fireshoes
* modified tiera3 - added Hint
*/
@ -25,6 +25,7 @@ public final class TakeInventory extends CardImpl {
static {
filter.add(new NamePredicate("Take Inventory"));
}
private static final Hint hint = new ValueHint(
"Cards named Take Inventory in your graveyard", new CardsInControllerGraveyardCount(filter)
);
@ -35,7 +36,7 @@ public final class TakeInventory extends CardImpl {
// Draw a card, then draw cards equal to the number of cards named Take Inventory in your graveyard.
this.getSpellAbility().addEffect(new DrawCardSourceControllerEffect(1));
Effect effect = new DrawCardSourceControllerEffect(new CardsInControllerGraveyardCount(filter));
effect.setText(", then draw cards equal to the number of cards named {this} in your graveyard");
effect.setText(", then draw cards equal to the number of cards named Take Inventory in your graveyard");
this.getSpellAbility().addEffect(effect);
this.getSpellAbility().addHint(hint);
}