mirror of
https://github.com/correl/mage.git
synced 2024-12-26 03:00:11 +00:00
Fix some BBD card text
This commit is contained in:
parent
2662fa7799
commit
cd6a847db7
19 changed files with 24 additions and 24 deletions
|
@ -64,7 +64,7 @@ class ArchfiendOfDespairEffect extends OneShotEffect {
|
||||||
|
|
||||||
public ArchfiendOfDespairEffect() {
|
public ArchfiendOfDespairEffect() {
|
||||||
super(Outcome.LoseLife);
|
super(Outcome.LoseLife);
|
||||||
this.staticText = "each opponent loses life equal to the life he or she lost this turn";
|
this.staticText = "each opponent loses life equal to the life that player lost this turn";
|
||||||
}
|
}
|
||||||
|
|
||||||
public ArchfiendOfDespairEffect(final ArchfiendOfDespairEffect effect) {
|
public ArchfiendOfDespairEffect(final ArchfiendOfDespairEffect effect) {
|
||||||
|
|
|
@ -25,7 +25,7 @@ public final class BloodFeud extends CardImpl {
|
||||||
target.setTargetTag(1);
|
target.setTargetTag(1);
|
||||||
this.getSpellAbility().addTarget(target);
|
this.getSpellAbility().addTarget(target);
|
||||||
|
|
||||||
FilterCreaturePermanent filter = new FilterCreaturePermanent("another target creature");
|
FilterCreaturePermanent filter = new FilterCreaturePermanent();
|
||||||
filter.add(new AnotherTargetPredicate(2));
|
filter.add(new AnotherTargetPredicate(2));
|
||||||
TargetCreaturePermanent target2 = new TargetCreaturePermanent(filter);
|
TargetCreaturePermanent target2 = new TargetCreaturePermanent(filter);
|
||||||
target2.setTargetTag(2);
|
target2.setTargetTag(2);
|
||||||
|
|
|
@ -44,7 +44,7 @@ class ChainLightningEffect extends OneShotEffect {
|
||||||
|
|
||||||
ChainLightningEffect() {
|
ChainLightningEffect() {
|
||||||
super(Outcome.Damage);
|
super(Outcome.Damage);
|
||||||
this.staticText = "Chain Lightning deals 3 damage to any target. Then that player or that creature's controller may pay {R}{R}. If the player does, he or she may copy this spell and may choose a new target for that copy.";
|
this.staticText = "{this} deals 3 damage to any target. Then that player or that permanent's controller may pay {R}{R}. If the player does, they may copy this spell and may choose a new target for that copy";
|
||||||
}
|
}
|
||||||
|
|
||||||
ChainLightningEffect(final ChainLightningEffect effect) {
|
ChainLightningEffect(final ChainLightningEffect effect) {
|
||||||
|
|
|
@ -41,7 +41,7 @@ public final class EvilTwin extends CardImpl {
|
||||||
|
|
||||||
// You may have Evil Twin enter the battlefield as a copy of any creature on the battlefield except it gains "{U}{B}, {T}: Destroy target creature with the same name as this creature."
|
// You may have Evil Twin enter the battlefield as a copy of any creature on the battlefield except it gains "{U}{B}, {T}: Destroy target creature with the same name as this creature."
|
||||||
Effect effect = new CopyPermanentEffect(StaticFilters.FILTER_PERMANENT_CREATURE, new EvilTwinApplyToPermanent());
|
Effect effect = new CopyPermanentEffect(StaticFilters.FILTER_PERMANENT_CREATURE, new EvilTwinApplyToPermanent());
|
||||||
effect.setText("a copy of any creature on the battlefield except it gains \"{U}{B}, {T}: Destroy target creature with the same name as this creature.\"");
|
effect.setText("as a copy of any creature on the battlefield except it gains \"{U}{B}, {T}: Destroy target creature with the same name as this creature.\"");
|
||||||
this.addAbility(new EntersBattlefieldAbility(effect, true));
|
this.addAbility(new EntersBattlefieldAbility(effect, true));
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
|
@ -86,6 +86,6 @@ class FertileGroundTriggeredAbility extends TriggeredManaAbility {
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
public String getRule() {
|
public String getRule() {
|
||||||
return "Whenever enchanted land is tapped for mana, its controller adds one mana of any color";
|
return "Whenever enchanted land is tapped for mana, its controller adds an additional one mana of any color.";
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
|
@ -57,7 +57,7 @@ public final class InnerDemon extends CardImpl {
|
||||||
effect.setText(", has flying");
|
effect.setText(", has flying");
|
||||||
ability.addEffect(effect);
|
ability.addEffect(effect);
|
||||||
effect = new AddCardSubtypeAttachedEffect(SubType.DEMON, Duration.WhileOnBattlefield, AttachmentType.AURA);
|
effect = new AddCardSubtypeAttachedEffect(SubType.DEMON, Duration.WhileOnBattlefield, AttachmentType.AURA);
|
||||||
effect.setText(", and is an Demon in addition to its other types");
|
effect.setText(", and is a Demon in addition to its other types");
|
||||||
ability.addEffect(effect);
|
ability.addEffect(effect);
|
||||||
this.addAbility(ability);
|
this.addAbility(ability);
|
||||||
|
|
||||||
|
|
|
@ -32,7 +32,7 @@ public final class KitesailCorsair extends CardImpl {
|
||||||
this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new ConditionalContinuousEffect(
|
this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new ConditionalContinuousEffect(
|
||||||
gainEffect,
|
gainEffect,
|
||||||
SourceAttackingCondition.instance,
|
SourceAttackingCondition.instance,
|
||||||
"{this} has flying as long as it’s attacking."
|
"{this} has flying as long as it's attacking."
|
||||||
)));
|
)));
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
@ -35,7 +35,7 @@ import mage.game.permanent.token.WarriorToken;
|
||||||
*/
|
*/
|
||||||
public final class NajeelaTheBladeBlossom extends CardImpl {
|
public final class NajeelaTheBladeBlossom extends CardImpl {
|
||||||
|
|
||||||
private static final FilterCreaturePermanent filter = new FilterCreaturePermanent(SubType.WARRIOR, "a Warrior");
|
private static final FilterCreaturePermanent filter = new FilterCreaturePermanent(SubType.WARRIOR, "Warrior");
|
||||||
|
|
||||||
public NajeelaTheBladeBlossom(UUID ownerId, CardSetInfo setInfo) {
|
public NajeelaTheBladeBlossom(UUID ownerId, CardSetInfo setInfo) {
|
||||||
super(ownerId, setInfo, new CardType[]{CardType.CREATURE}, "{2}{R}");
|
super(ownerId, setInfo, new CardType[]{CardType.CREATURE}, "{2}{R}");
|
||||||
|
|
|
@ -60,7 +60,7 @@ class NimbusChampionEffect extends OneShotEffect {
|
||||||
super(Outcome.Benefit);
|
super(Outcome.Benefit);
|
||||||
this.staticText = "return target creature to its owner's hand if "
|
this.staticText = "return target creature to its owner's hand if "
|
||||||
+ "that creature's power is less than or equal to "
|
+ "that creature's power is less than or equal to "
|
||||||
+ "the number of Warriors your team control.";
|
+ "the number of Warriors your team controls";
|
||||||
}
|
}
|
||||||
|
|
||||||
NimbusChampionEffect(final NimbusChampionEffect effect) {
|
NimbusChampionEffect(final NimbusChampionEffect effect) {
|
||||||
|
|
|
@ -74,7 +74,7 @@ class CardsInChosenPlayerHandCount implements DynamicValue {
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
public String getMessage() {
|
public String getMessage() {
|
||||||
return "cards in chosen opponents hand";
|
return "card in chosen opponents hand";
|
||||||
}
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
|
|
|
@ -18,7 +18,7 @@ import mage.target.common.TargetCardInGraveyard;
|
||||||
*/
|
*/
|
||||||
public final class PulseOfMurasa extends CardImpl {
|
public final class PulseOfMurasa extends CardImpl {
|
||||||
|
|
||||||
private static final FilterCard FILTER = new FilterCard("creature or land card in a graveyard");
|
private static final FilterCard FILTER = new FilterCard("creature or land card from a graveyard");
|
||||||
|
|
||||||
static {
|
static {
|
||||||
FILTER.add(Predicates.or(
|
FILTER.add(Predicates.or(
|
||||||
|
|
|
@ -31,9 +31,9 @@ public final class SavageVentmaw extends CardImpl {
|
||||||
// Flying
|
// Flying
|
||||||
this.addAbility(FlyingAbility.getInstance());
|
this.addAbility(FlyingAbility.getInstance());
|
||||||
|
|
||||||
// Whenever Savage Ventmaw attacks, add {R}{R}{R}{G}{G}{G}. Until end of turn, you don’t lose this mana as steps and phases end.
|
// Whenever Savage Ventmaw attacks, add {R}{R}{R}{G}{G}{G}. Until end of turn, you don't lose this mana as steps and phases end.
|
||||||
Effect effect = new SavageVentmawManaEffect(new Mana(3, 3, 0, 0, 0, 0, 0, 0), "your", true);
|
Effect effect = new SavageVentmawManaEffect(new Mana(3, 3, 0, 0, 0, 0, 0, 0), "your", true);
|
||||||
effect.setText("add {R}{R}{R}{G}{G}{G}. Until end of turn, you don’t lose this mana as steps and phases end");
|
effect.setText("add {R}{R}{R}{G}{G}{G}. Until end of turn, you don't lose this mana as steps and phases end");
|
||||||
this.addAbility(new AttacksTriggeredAbility(effect, false));
|
this.addAbility(new AttacksTriggeredAbility(effect, false));
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
|
@ -16,7 +16,7 @@ import mage.constants.SubType;
|
||||||
*/
|
*/
|
||||||
public final class ShamblingGhoul extends CardImpl {
|
public final class ShamblingGhoul extends CardImpl {
|
||||||
|
|
||||||
private static final String staticText = "{this} enters the battlefield tapped";
|
private static final String staticText = "tapped";
|
||||||
|
|
||||||
public ShamblingGhoul(UUID ownerId, CardSetInfo setInfo) {
|
public ShamblingGhoul(UUID ownerId, CardSetInfo setInfo) {
|
||||||
super(ownerId,setInfo,new CardType[]{CardType.CREATURE},"{1}{B}");
|
super(ownerId,setInfo,new CardType[]{CardType.CREATURE},"{1}{B}");
|
||||||
|
|
|
@ -17,7 +17,7 @@ import mage.target.common.TargetCardInLibrary;
|
||||||
*/
|
*/
|
||||||
public final class SkyshroudClaim extends CardImpl {
|
public final class SkyshroudClaim extends CardImpl {
|
||||||
|
|
||||||
private static final FilterLandCard filter = new FilterLandCard("Forest");
|
private static final FilterLandCard filter = new FilterLandCard("Forest cards");
|
||||||
static {
|
static {
|
||||||
filter.add(new SubtypePredicate(SubType.FOREST));
|
filter.add(new SubtypePredicate(SubType.FOREST));
|
||||||
}
|
}
|
||||||
|
|
|
@ -26,9 +26,9 @@ public final class SpectralSearchlight extends CardImpl {
|
||||||
public SpectralSearchlight(UUID ownerId, CardSetInfo setInfo) {
|
public SpectralSearchlight(UUID ownerId, CardSetInfo setInfo) {
|
||||||
super(ownerId, setInfo, new CardType[]{CardType.ARTIFACT}, "{3}");
|
super(ownerId, setInfo, new CardType[]{CardType.ARTIFACT}, "{3}");
|
||||||
|
|
||||||
// {T}: Choose a player. That player adds one mana of any color he or she chooses.
|
// {T}: Choose a player. That player adds one mana of any color they chooses.
|
||||||
ManaEffect effect = new SpectralSearchlightManaEffect("chosen player");
|
ManaEffect effect = new SpectralSearchlightManaEffect("chosen player");
|
||||||
effect.setText("That player adds one mana of any color he or she chooses");
|
effect.setText("That player adds one mana of any color they choose");
|
||||||
Ability ability = new SimpleManaAbility(Zone.BATTLEFIELD, effect, new TapSourceCost());
|
Ability ability = new SimpleManaAbility(Zone.BATTLEFIELD, effect, new TapSourceCost());
|
||||||
// choosing player as first effect, before adding mana effect
|
// choosing player as first effect, before adding mana effect
|
||||||
ability.getEffects().add(0, new ChoosePlayerEffect(Outcome.PutManaInPool));
|
ability.getEffects().add(0, new ChoosePlayerEffect(Outcome.PutManaInPool));
|
||||||
|
|
|
@ -77,11 +77,11 @@ public class BeginningOfCombatTriggeredAbility extends TriggeredAbilityImpl {
|
||||||
public String getRule() {
|
public String getRule() {
|
||||||
switch (targetController) {
|
switch (targetController) {
|
||||||
case YOU:
|
case YOU:
|
||||||
return "At the beginning of combat on your turn, " + generateZoneString() + getEffects().getText(modes.getMode());
|
return "At the beginning of combat on your turn, " + generateZoneString() + super.getRule();
|
||||||
case OPPONENT:
|
case OPPONENT:
|
||||||
return "At the beginning of each opponent's combat step, " + generateZoneString() + getEffects().getText(modes.getMode());
|
return "At the beginning of each opponent's combat step, " + generateZoneString() + super.getRule();
|
||||||
case ANY:
|
case ANY:
|
||||||
return "At the beginning of each combat, " + generateZoneString() + getEffects().getText(modes.getMode());
|
return "At the beginning of each combat, " + generateZoneString() + super.getRule();
|
||||||
}
|
}
|
||||||
return "";
|
return "";
|
||||||
}
|
}
|
||||||
|
|
|
@ -28,10 +28,10 @@ public class DrawDiscardTargetEffect extends OneShotEffect {
|
||||||
this.cardsToDiscard = cardsToDiscard;
|
this.cardsToDiscard = cardsToDiscard;
|
||||||
staticText = new StringBuilder("Target player draws ")
|
staticText = new StringBuilder("Target player draws ")
|
||||||
.append(cardsToDraw == 1?"a": CardUtil.numberToText(cardsToDraw))
|
.append(cardsToDraw == 1?"a": CardUtil.numberToText(cardsToDraw))
|
||||||
.append(" card").append(cardsToDraw == 1?" ": "s")
|
.append(" card").append(cardsToDraw == 1?"": "s")
|
||||||
.append(", then discards ")
|
.append(", then discards ")
|
||||||
.append(cardsToDiscard == 1?"a": CardUtil.numberToText(cardsToDiscard))
|
.append(cardsToDiscard == 1?"a": CardUtil.numberToText(cardsToDiscard))
|
||||||
.append(" card").append(cardsToDiscard == 1?" ": "s").toString();
|
.append(" card").append(cardsToDiscard == 1?"": "s").toString();
|
||||||
}
|
}
|
||||||
|
|
||||||
public DrawDiscardTargetEffect(final DrawDiscardTargetEffect effect) {
|
public DrawDiscardTargetEffect(final DrawDiscardTargetEffect effect) {
|
||||||
|
|
|
@ -60,7 +60,7 @@ public class GainLifeTargetEffect extends OneShotEffect {
|
||||||
String message = life.getMessage();
|
String message = life.getMessage();
|
||||||
|
|
||||||
if (!mode.getTargets().isEmpty()) {
|
if (!mode.getTargets().isEmpty()) {
|
||||||
sb.append("Target ").append(mode.getTargets().get(0).getTargetName());
|
sb.append("target ").append(mode.getTargets().get(0).getTargetName());
|
||||||
} else {
|
} else {
|
||||||
sb.append("that player");
|
sb.append("that player");
|
||||||
}
|
}
|
||||||
|
|
|
@ -147,7 +147,7 @@ public class BoostAllEffect extends ContinuousEffectImpl {
|
||||||
protected void setText() {
|
protected void setText() {
|
||||||
StringBuilder sb = new StringBuilder();
|
StringBuilder sb = new StringBuilder();
|
||||||
if (excludeSource) {
|
if (excludeSource) {
|
||||||
sb.append("Other ");
|
sb.append("other ");
|
||||||
}
|
}
|
||||||
sb.append(filter.getMessage()).append(" get ");
|
sb.append(filter.getMessage()).append(" get ");
|
||||||
String p = power.toString();
|
String p = power.toString();
|
||||||
|
|
Loading…
Reference in a new issue