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

Fix some BBD card text

Browse source
This commit is contained in:
Plopman 2018-06-06 23:23:55 +02:00
parent 2662fa7799
commit cd6a847db7
19 changed files with 24 additions and 24 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -64,7 +64,7 @@ class ArchfiendOfDespairEffect extends OneShotEffect {
public ArchfiendOfDespairEffect() {
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) {

2
Mage.Sets/src/mage/cards/b/BloodFeud.java
View file

@ -25,7 +25,7 @@ public final class BloodFeud extends CardImpl {
target.setTargetTag(1);
this.getSpellAbility().addTarget(target);
FilterCreaturePermanent filter = new FilterCreaturePermanent("another target creature");
FilterCreaturePermanent filter = new FilterCreaturePermanent();
filter.add(new AnotherTargetPredicate(2));
TargetCreaturePermanent target2 = new TargetCreaturePermanent(filter);
target2.setTargetTag(2);

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

@ -44,7 +44,7 @@ class ChainLightningEffect extends OneShotEffect {
ChainLightningEffect() {
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) {

2
Mage.Sets/src/mage/cards/e/EvilTwin.java
View file

@ -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."
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));
}

2
Mage.Sets/src/mage/cards/f/FertileGround.java
View file

@ -86,6 +86,6 @@ class FertileGroundTriggeredAbility extends TriggeredManaAbility {
@Override
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.";
}
}

2
Mage.Sets/src/mage/cards/i/InnerDemon.java
View file

@ -57,7 +57,7 @@ public final class InnerDemon extends CardImpl {
effect.setText(", has flying");
ability.addEffect(effect);
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);
this.addAbility(ability);

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

@ -32,7 +32,7 @@ public final class KitesailCorsair extends CardImpl {
this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new ConditionalContinuousEffect(
gainEffect,
SourceAttackingCondition.instance,
"{this} has flying as long as it’s attacking."
"{this} has flying as long as it's attacking."
)));
}

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

@ -35,7 +35,7 @@ import mage.game.permanent.token.WarriorToken;
*/
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) {
super(ownerId, setInfo, new CardType[]{CardType.CREATURE}, "{2}{R}");

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

@ -60,7 +60,7 @@ class NimbusChampionEffect extends OneShotEffect {
super(Outcome.Benefit);
this.staticText = "return target creature to its owner's hand if "
+ "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) {

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

@ -74,7 +74,7 @@ class CardsInChosenPlayerHandCount implements DynamicValue {
@Override
public String getMessage() {
return "cards in chosen opponents hand";
return "card in chosen opponents hand";
}
@Override

2
Mage.Sets/src/mage/cards/p/PulseOfMurasa.java
View file

@ -18,7 +18,7 @@ import mage.target.common.TargetCardInGraveyard;
*/
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 {
FILTER.add(Predicates.or(

4
Mage.Sets/src/mage/cards/s/SavageVentmaw.java
View file

@ -31,9 +31,9 @@ public final class SavageVentmaw extends CardImpl {
// Flying
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.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));
}

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

@ -16,7 +16,7 @@ import mage.constants.SubType;
*/
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) {
super(ownerId,setInfo,new CardType[]{CardType.CREATURE},"{1}{B}");

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

@ -17,7 +17,7 @@ import mage.target.common.TargetCardInLibrary;
*/
public final class SkyshroudClaim extends CardImpl {
private static final FilterLandCard filter = new FilterLandCard("Forest");
private static final FilterLandCard filter = new FilterLandCard("Forest cards");
static {
filter.add(new SubtypePredicate(SubType.FOREST));
}

4
Mage.Sets/src/mage/cards/s/SpectralSearchlight.java
View file

@ -26,9 +26,9 @@ public final class SpectralSearchlight extends CardImpl {
public SpectralSearchlight(UUID ownerId, CardSetInfo setInfo) {
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");
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());
// choosing player as first effect, before adding mana effect
ability.getEffects().add(0, new ChoosePlayerEffect(Outcome.PutManaInPool));

6
Mage/src/main/java/mage/abilities/common/BeginningOfCombatTriggeredAbility.java
View file

@ -77,11 +77,11 @@ public class BeginningOfCombatTriggeredAbility extends TriggeredAbilityImpl {
public String getRule() {
switch (targetController) {
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:
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:
return "At the beginning of each combat, " + generateZoneString() + getEffects().getText(modes.getMode());
return "At the beginning of each combat, " + generateZoneString() + super.getRule();
}
return "";
}

4
Mage/src/main/java/mage/abilities/effects/common/DrawDiscardTargetEffect.java
View file

@ -28,10 +28,10 @@ public class DrawDiscardTargetEffect extends OneShotEffect {
this.cardsToDiscard = cardsToDiscard;
staticText = new StringBuilder("Target player draws ")
.append(cardsToDraw == 1?"a": CardUtil.numberToText(cardsToDraw))
.append(" card").append(cardsToDraw == 1?" ": "s")
.append(" card").append(cardsToDraw == 1?"": "s")
.append(", then discards ")
.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) {

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

@ -60,7 +60,7 @@ public class GainLifeTargetEffect extends OneShotEffect {
String message = life.getMessage();
if (!mode.getTargets().isEmpty()) {
sb.append("Target ").append(mode.getTargets().get(0).getTargetName());
sb.append("target ").append(mode.getTargets().get(0).getTargetName());
} else {
sb.append("that player");
}

2
Mage/src/main/java/mage/abilities/effects/common/continuous/BoostAllEffect.java
View file

@ -147,7 +147,7 @@ public class BoostAllEffect extends ContinuousEffectImpl {
protected void setText() {
StringBuilder sb = new StringBuilder();
if (excludeSource) {
sb.append("Other ");
sb.append("other ");
}
sb.append(filter.getMessage()).append(" get ");
String p = power.toString();