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

some assorted text fixes

Browse source
This commit is contained in:
Evan Kranzler 2021-02-02 12:41:05 -05:00
parent 0c0333a716
commit fbab9f069e
20 changed files with 62 additions and 55 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

15
Mage.Sets/src/mage/cards/e/ExoticCurse.java
View file

@ -1,7 +1,5 @@
package mage.cards.e;
import java.util.UUID;
import mage.abilities.Ability;
import mage.abilities.common.SimpleStaticAbility;
import mage.abilities.dynamicvalue.DynamicValue;
@ -12,16 +10,13 @@ import mage.abilities.effects.common.continuous.BoostEnchantedEffect;
import mage.abilities.keyword.EnchantAbility;
import mage.cards.CardImpl;
import mage.cards.CardSetInfo;
import mage.constants.AbilityWord;
import mage.constants.CardType;
import mage.constants.SubType;
import mage.constants.Duration;
import mage.constants.Outcome;
import mage.constants.Zone;
import mage.constants.*;
import mage.target.TargetPermanent;
import mage.target.common.TargetCreaturePermanent;
import java.util.UUID;
/**
*
* @author FenrisulfrX
*/
public final class ExoticCurse extends CardImpl {
@ -31,7 +26,7 @@ public final class ExoticCurse extends CardImpl {
this.subtype.add(SubType.AURA);
// Enchant creature
TargetPermanent auraTarget = new TargetPermanent();
TargetPermanent auraTarget = new TargetCreaturePermanent();
this.getSpellAbility().addTarget(auraTarget);
this.getSpellAbility().addEffect(new AttachEffect(Outcome.UnboostCreature));
this.addAbility(new EnchantAbility(auraTarget.getTargetName()));

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

@ -6,7 +6,6 @@ import mage.abilities.effects.common.DamageTargetEffect;
import mage.abilities.hint.common.RaidHint;
import mage.cards.CardImpl;
import mage.cards.CardSetInfo;
import mage.constants.AbilityWord;
import mage.constants.CardType;
import mage.target.common.TargetCreaturePermanent;
import mage.watchers.common.PlayerAttackedWatcher;
@ -30,7 +29,6 @@ public final class FirecannonBlast extends CardImpl {
"{this} deals 3 damage to target creature.<br><i>Raid</i> &mdash; {this} deals 6 damage instead if you attacked this turn"));
this.getSpellAbility().addTarget(new TargetCreaturePermanent());
this.getSpellAbility().addWatcher(new PlayerAttackedWatcher());
this.getSpellAbility().setAbilityWord(AbilityWord.RAID);
this.getSpellAbility().addHint(RaidHint.instance);
}

2
Mage.Sets/src/mage/cards/h/HuntingKavu.java
View file

@ -42,7 +42,7 @@ public final class HuntingKavu extends CardImpl {
// {1}{R}{G}, {tap}: Exile Hunting Kavu and target creature without flying that's attacking you.
Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new ExileSourceEffect(), new ManaCostsImpl("{1}{R}{G}"));
ability.addCost(new TapSourceCost());
ability.addEffect(new ExileTargetEffect().setText("nd target creature without flying that's attacking you"));
ability.addEffect(new ExileTargetEffect().setText("and target creature without flying that's attacking you"));
ability.addTarget(new TargetCreaturePermanent(filter));
this.addAbility(ability);
}

2
Mage.Sets/src/mage/cards/h/HypnoticCloud.java
View file

@ -27,7 +27,7 @@ public final class HypnoticCloud extends CardImpl {
this.getSpellAbility().addTarget(new TargetPlayer());
this.getSpellAbility().addEffect(new ConditionalOneShotEffect(new DiscardTargetEffect(3), new DiscardTargetEffect(1), KickedCondition.instance,
"Target player discards a card. if this spell was kicked, that player discards three cards instead"));
"Target player discards a card. If this spell was kicked, that player discards three cards instead"));
}

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

@ -54,7 +54,7 @@ class TwinflameCopyEffect extends OneShotEffect {
public TwinflameCopyEffect() {
super(Outcome.PutCreatureInPlay);
this.staticText = "Choose any number of target creatures you control. For each of them, create a token that's a copy of that creature, except it has haste. Exile them at the beginning of the next end step";
this.staticText = "choose any number of target creatures you control. For each of them, create a token that's a copy of that creature, except it has haste. Exile those tokens at the beginning of the next end step";
}
public TwinflameCopyEffect(final TwinflameCopyEffect effect) {

2
Mage.Sets/src/mage/cards/w/WurmcoilEngine.java
View file

@ -32,7 +32,7 @@ public final class WurmcoilEngine extends CardImpl {
// When Wurmcoil Engine dies, create a 3/3 colorless Wurm artifact creature token with deathtouch and a 3/3 colorless Wurm artifact creature token with lifelink.
Ability ability = new DiesSourceTriggeredAbility(new CreateTokenEffect(new WurmWithDeathtouchToken()), false);
ability.addEffect(new CreateTokenEffect(new WurmWithLifelinkToken()));
ability.addEffect(new CreateTokenEffect(new WurmWithLifelinkToken()).setText("and a 3/3 colorless Wurm artifact creature token with lifelink"));
this.addAbility(ability);
}

4
Mage.Sets/src/mage/cards/x/XathridGorgon.java
View file

@ -50,9 +50,9 @@ public final class XathridGorgon extends CardImpl {
effect.setText("It gains defender");
ability.addEffect(effect);
effect = new AddCardTypeTargetEffect(Duration.Custom, CardType.ARTIFACT);
effect.setText("and becomes a colorless artifact in addition to its other types");
effect.setText("and becomes a colorless");
ability.addEffect(effect);
ability.addEffect(new BecomesColorTargetEffect(new ObjectColor(), Duration.Custom, ""));
ability.addEffect(new BecomesColorTargetEffect(new ObjectColor(), Duration.Custom, "artifact in addition to its other types"));
ability.addEffect(new XathridGorgonCantActivateEffect());
this.addAbility(ability);

18
Mage.Sets/src/mage/cards/y/YennettCrypticSovereign.java
View file

@ -1,27 +1,27 @@
package mage.cards.y;
import java.util.UUID;
import mage.ApprovingObject;
import mage.MageInt;
import mage.abilities.Ability;
import mage.abilities.common.AttacksTriggeredAbility;
import mage.abilities.effects.OneShotEffect;
import mage.constants.SubType;
import mage.constants.SuperType;
import mage.abilities.keyword.FlyingAbility;
import mage.abilities.keyword.VigilanceAbility;
import mage.abilities.keyword.MenaceAbility;
import mage.abilities.keyword.VigilanceAbility;
import mage.cards.Card;
import mage.cards.CardImpl;
import mage.cards.CardSetInfo;
import mage.cards.CardsImpl;
import mage.constants.CardType;
import mage.constants.Outcome;
import mage.constants.SubType;
import mage.constants.SuperType;
import mage.game.Game;
import mage.players.Player;
import java.util.UUID;
/**
*
* @author TheElk801
*/
public final class YennettCrypticSovereign extends CardImpl {
@ -64,10 +64,10 @@ class YennettCrypticSovereignEffect extends OneShotEffect {
public YennettCrypticSovereignEffect() {
super(Outcome.Benefit);
this.staticText = "reveal the top card of your library. "
+ "If that card's converted mana cost is odd, "
+ "you may cast it without paying its mana cost. "
+ "Otherwise, draw a card";
this.staticText = "reveal the top card of your library. " +
"You may cast it without paying its mana cost " +
"if its converted mana cost is odd. " +
"If you don't cast it, draw a card.";
}
public YennettCrypticSovereignEffect(final YennettCrypticSovereignEffect effect) {

2
Mage.Sets/src/mage/cards/y/YuanShaosInfantry.java
View file

@ -27,7 +27,7 @@ public final class YuanShaosInfantry extends CardImpl {
// Whenever Yuan Shao's Infantry attacks alone, Yuan Shao's Infantry can't be blocked this combat.
Effect effect = new CantBeBlockedSourceEffect(Duration.EndOfCombat);
effect.setText("it can't be blocked this combat");
effect.setText("{this} can't be blocked this combat");
this.addAbility(new AttacksAloneTriggeredAbility(effect));
}

2
Mage.Sets/src/mage/cards/z/ZealotIlVec.java
View file

@ -31,7 +31,7 @@ public final class ZealotIlVec extends CardImpl {
// Shadow
this.addAbility(ShadowAbility.getInstance());
// Whenever Zealot il-Vec attacks and isn't blocked, you may have it deal 1 damage to target creature. If you do, prevent all combat damage Zealot il-Vec would deal this turn.
Ability ability = new AttacksAndIsNotBlockedTriggeredAbility(new DamageTargetEffect(1), true);
Ability ability = new AttacksAndIsNotBlockedTriggeredAbility(new DamageTargetEffect(1).setText("it deal 1 damage to target creature"), true);
Effect effect = new PreventCombatDamageBySourceEffect(Duration.EndOfTurn);
effect.setText("if you do, prevent all combat damage {this} would deal this turn");
ability.addEffect(effect);

2
Mage.Sets/src/mage/cards/z/ZealousConscripts.java
View file

@ -33,7 +33,7 @@ public final class ZealousConscripts extends CardImpl {
// When Zealous Conscripts enters the battlefield, gain control of target permanent until end of turn. Untap that permanent. It gains haste until end of turn.
Ability ability = new EntersBattlefieldTriggeredAbility(new GainControlTargetEffect(Duration.EndOfTurn));
ability.addTarget(new TargetPermanent());
ability.addEffect(new UntapTargetEffect());
ability.addEffect(new UntapTargetEffect().setText("Untap that permanent."));
ability.addEffect(new GainAbilityTargetEffect(HasteAbility.getInstance(), Duration.EndOfTurn, "It gains haste until end of turn"));
this.addAbility(ability);
}

15
Mage.Sets/src/mage/cards/z/ZealousPersecution.java
View file

@ -1,7 +1,5 @@
package mage.cards.z;
import java.util.UUID;
import mage.abilities.effects.common.continuous.BoostControlledEffect;
import mage.abilities.effects.common.continuous.BoostOpponentsEffect;
import mage.cards.CardImpl;
@ -9,17 +7,22 @@ import mage.cards.CardSetInfo;
import mage.constants.CardType;
import mage.constants.Duration;
import java.util.UUID;
/**
*
* @author North
*/
public final class ZealousPersecution extends CardImpl {
public ZealousPersecution(UUID ownerId, CardSetInfo setInfo) {
super(ownerId,setInfo,new CardType[]{CardType.INSTANT},"{W}{B}");
super(ownerId, setInfo, new CardType[]{CardType.INSTANT}, "{W}{B}");
this.getSpellAbility().addEffect(new BoostControlledEffect(1, 1, Duration.EndOfTurn));
this.getSpellAbility().addEffect(new BoostOpponentsEffect(-1, -1, Duration.EndOfTurn));
this.getSpellAbility().addEffect(new BoostControlledEffect(
1, 1, Duration.EndOfTurn
).setText("until end of turn, creatures you control get +1/+1"));
this.getSpellAbility().addEffect(new BoostOpponentsEffect(
-1, -1, Duration.EndOfTurn
).setText("and creatures your opponents control get -1/-1"));
}
public ZealousPersecution(final ZealousPersecution card) {

15
Mage.Sets/src/mage/cards/z/ZealousStrike.java
View file

@ -1,7 +1,5 @@
package mage.cards.z;
import java.util.UUID;
import mage.abilities.effects.common.continuous.BoostTargetEffect;
import mage.abilities.effects.common.continuous.GainAbilityTargetEffect;
import mage.abilities.keyword.FirstStrikeAbility;
@ -11,18 +9,23 @@ import mage.constants.CardType;
import mage.constants.Duration;
import mage.target.common.TargetCreaturePermanent;
import java.util.UUID;
/**
*
* @author Loki
*/
public final class ZealousStrike extends CardImpl {
public ZealousStrike(UUID ownerId, CardSetInfo setInfo) {
super(ownerId,setInfo,new CardType[]{CardType.INSTANT},"{1}{W}");
super(ownerId, setInfo, new CardType[]{CardType.INSTANT}, "{1}{W}");
// Target creature gets +2/+2 and gains first strike until end of turn.
this.getSpellAbility().addEffect(new BoostTargetEffect(2, 2, Duration.EndOfTurn));
this.getSpellAbility().addEffect(new GainAbilityTargetEffect(FirstStrikeAbility.getInstance(), Duration.EndOfTurn));
this.getSpellAbility().addEffect(new BoostTargetEffect(
2, 2, Duration.EndOfTurn
).setText("target creature gets +2/+2"));
this.getSpellAbility().addEffect(new GainAbilityTargetEffect(
FirstStrikeAbility.getInstance(), Duration.EndOfTurn
).setText("and gains first strike until end of turn"));
this.getSpellAbility().addTarget(new TargetCreaturePermanent());
}

22
Mage.Sets/src/mage/cards/z/ZephyrNet.java
View file

@ -1,7 +1,5 @@
package mage.cards.z;
import java.util.UUID;
import mage.abilities.Ability;
import mage.abilities.common.SimpleStaticAbility;
import mage.abilities.effects.common.AttachEffect;
@ -11,18 +9,22 @@ import mage.abilities.keyword.EnchantAbility;
import mage.abilities.keyword.FlyingAbility;
import mage.cards.CardImpl;
import mage.cards.CardSetInfo;
import mage.constants.*;
import mage.constants.AttachmentType;
import mage.constants.CardType;
import mage.constants.Outcome;
import mage.constants.SubType;
import mage.target.TargetPermanent;
import mage.target.common.TargetCreaturePermanent;
import java.util.UUID;
/**
*
* @author Loki
*/
public final class ZephyrNet extends CardImpl {
public ZephyrNet(UUID ownerId, CardSetInfo setInfo) {
super(ownerId,setInfo,new CardType[]{CardType.ENCHANTMENT},"{1}{U}");
super(ownerId, setInfo, new CardType[]{CardType.ENCHANTMENT}, "{1}{U}");
this.subtype.add(SubType.AURA);
// Enchant creature
@ -31,9 +33,15 @@ public final class ZephyrNet extends CardImpl {
this.getSpellAbility().addEffect(new AttachEffect(Outcome.BoostCreature));
Ability ability = new EnchantAbility(auraTarget.getTargetName());
this.addAbility(ability);
// Enchanted creature has defender and flying.
this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new GainAbilityAttachedEffect(DefenderAbility.getInstance(), AttachmentType.AURA)));
this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new GainAbilityAttachedEffect(FlyingAbility.getInstance(), AttachmentType.AURA)));
ability = new SimpleStaticAbility(new GainAbilityAttachedEffect(
DefenderAbility.getInstance(), AttachmentType.AURA
));
ability.addEffect(new GainAbilityAttachedEffect(
FlyingAbility.getInstance(), AttachmentType.AURA
).setText("and flying"));
this.addAbility(ability);
}
public ZephyrNet(final ZephyrNet card) {

2
Mage.Sets/src/mage/cards/z/ZhurTaaDruid.java
View file

@ -49,7 +49,7 @@ public final class ZhurTaaDruid extends CardImpl {
class ZhurTaaDruidAbility extends TriggeredAbilityImpl {
public ZhurTaaDruidAbility() {
super(Zone.BATTLEFIELD, new DamagePlayersEffect(1, TargetController.OPPONENT));
super(Zone.BATTLEFIELD, new DamagePlayersEffect(1, TargetController.OPPONENT, "it"));
}
public ZhurTaaDruidAbility(final ZhurTaaDruidAbility ability) {

2
Mage.Sets/src/mage/cards/z/ZombieCannibal.java
View file

@ -84,6 +84,6 @@ class ZombieCannibalTriggeredAbility extends TriggeredAbilityImpl {
@Override
public String getRule() {
return "Whenever {this} deals combat damage to a player, "
+ "you may exile target card from that player's graveyard";
+ "you may exile target card from that player's graveyard.";
}
}

2
Mage/src/main/java/mage/abilities/abilityword/StriveAbility.java
View file

@ -39,7 +39,7 @@ public class StriveAbility extends SimpleStaticAbility {
@Override
public String getRule() {
return new StringBuilder("<i>Strive</i> &mdash; {this} costs ").append(striveCost).append(" more to cast for each target beyond the first.").toString();
return new StringBuilder("<i>Strive</i> &mdash; this spell costs ").append(striveCost).append(" more to cast for each target beyond the first.").toString();
}
}

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

@ -141,7 +141,7 @@ public class AmplifyEffect extends ReplacementEffectImpl {
@Override
public String getText(Mode mode) {
StringBuilder sb = new StringBuilder(amplifyFactor.toString());
sb.append("<i>(As this enter the battlefield, ");
sb.append(" <i>(As this enter the battlefield, ");
sb.append(amplifyFactor.getRuleText()).append(" for each card"
+ " you reveal that shares a type with it in your hand.)</i>");
return sb.toString();

2
Mage/src/main/java/mage/abilities/effects/keyword/AdaptEffect.java
View file

@ -22,7 +22,7 @@ public class AdaptEffect extends OneShotEffect {
super(Outcome.BoostCreature);
this.adaptNumber = adaptNumber;
staticText = "Adapt " + adaptNumber
+ " <i>(If this creature has no +1/+1 counters on it, put "
+ ". <i>(If this creature has no +1/+1 counters on it, put "
+ CardUtil.numberToText(adaptNumber) + " +1/+1 counter"
+ (adaptNumber > 1 ? "s" : "") + " on it.)</i>";
}

2
Mage/src/main/java/mage/abilities/keyword/MonstrosityAbility.java
View file

@ -112,7 +112,7 @@ class BecomeMonstrousSourceEffect extends OneShotEffect {
private String setText(int monstrosityValue) {
StringBuilder sb = new StringBuilder("Monstrosity ");
sb.append(monstrosityValue == Integer.MAX_VALUE ? "X":monstrosityValue)
.append(". <i>(If this creature isn't monstrous, put ")
.append(". <i>(If this creature isn't monstrous, put ")
.append(monstrosityValue == Integer.MAX_VALUE ? "X":CardUtil.numberToText(monstrosityValue))
.append(" +1/+1 counters on it and it becomes monstrous.)</i>").toString();
return sb.toString();