diff --git a/Mage.Sets/src/mage/cards/b/BrassTalonChimera.java b/Mage.Sets/src/mage/cards/b/BrassTalonChimera.java index 4012646d0c0..e0add840401 100644 --- a/Mage.Sets/src/mage/cards/b/BrassTalonChimera.java +++ b/Mage.Sets/src/mage/cards/b/BrassTalonChimera.java @@ -45,7 +45,7 @@ public final class BrassTalonChimera extends CardImpl { // Sacrifice Brass-Talon Chimera: Put a +2/+2 counter on target Chimera creature. It gains first strike. Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new AddCountersTargetEffect(CounterType.P2P2.createInstance()), new SacrificeSourceCost()); - ability.addEffect(new GainAbilityTargetEffect(FirstStrikeAbility.getInstance(), Duration.WhileOnBattlefield)); + ability.addEffect(new GainAbilityTargetEffect(FirstStrikeAbility.getInstance(), Duration.WhileOnBattlefield).setText("It gains first strike. (This effect lasts indefinitely.)")); ability.addTarget(new TargetCreaturePermanent(filter)); addAbility(ability); } diff --git a/Mage.Sets/src/mage/cards/b/BreathstealersCrypt.java b/Mage.Sets/src/mage/cards/b/BreathstealersCrypt.java index 503f832836f..aaeb5b471e2 100644 --- a/Mage.Sets/src/mage/cards/b/BreathstealersCrypt.java +++ b/Mage.Sets/src/mage/cards/b/BreathstealersCrypt.java @@ -46,7 +46,7 @@ class BreathstealersCryptEffect extends ReplacementEffectImpl { public BreathstealersCryptEffect() { super(Duration.WhileOnBattlefield, Outcome.LoseLife); - staticText = "If a player would draw a card, instead he or she draws a card and reveals it. If it's a creature card, that player discards it unless he or she pays 3 life"; + staticText = "If a player would draw a card, instead they draw a card and reveal it. If it's a creature card, that player discards it unless they pay 3 life"; } public BreathstealersCryptEffect(final BreathstealersCryptEffect effect) { diff --git a/Mage/src/main/java/mage/abilities/effects/Effects.java b/Mage/src/main/java/mage/abilities/effects/Effects.java index cb32b8471a2..0fa4a320954 100644 --- a/Mage/src/main/java/mage/abilities/effects/Effects.java +++ b/Mage/src/main/java/mage/abilities/effects/Effects.java @@ -1,16 +1,15 @@ - package mage.abilities.effects; +import mage.abilities.Mode; +import mage.constants.Outcome; +import mage.target.targetpointer.TargetPointer; + import java.util.ArrayList; import java.util.HashSet; import java.util.List; import java.util.Set; -import mage.abilities.Mode; -import mage.constants.Outcome; -import mage.target.targetpointer.TargetPointer; /** - * * @author BetaSteward_at_googlemail.com */ public class Effects extends ArrayList { @@ -46,6 +45,12 @@ public class Effects extends ArrayList { for (Effect effect : this) { String endString = ""; String nextRule = effect.getText(mode); + + // ignore empty rules + if (nextRule == null || nextRule.isEmpty()) { + continue; + } + if (nextRule != null) { if (nextRule.startsWith("and ") || nextRule.startsWith("with ")) { endString = " "; @@ -63,6 +68,7 @@ public class Effects extends ArrayList { } lastRule = nextRule; } + if (lastRule != null && lastRule.length() > 3 && !lastRule.endsWith(".") && !lastRule.endsWith("\"") @@ -71,6 +77,7 @@ public class Effects extends ArrayList { && !lastRule.endsWith("")) { sbText.append('.'); } + return sbText.toString(); } diff --git a/Mage/src/main/java/mage/abilities/keyword/EquipAbility.java b/Mage/src/main/java/mage/abilities/keyword/EquipAbility.java index 6495c39ceca..ccb08800bba 100644 --- a/Mage/src/main/java/mage/abilities/keyword/EquipAbility.java +++ b/Mage/src/main/java/mage/abilities/keyword/EquipAbility.java @@ -1,17 +1,12 @@ package mage.abilities.keyword; -import java.util.UUID; import mage.abilities.ActivatedAbilityImpl; import mage.abilities.costs.Cost; import mage.abilities.costs.mana.GenericManaCost; import mage.abilities.effects.EquipEffect; -import mage.abilities.effects.common.AttachEffect; import mage.constants.Outcome; -import mage.constants.SubType; import mage.constants.TimingRule; import mage.constants.Zone; -import mage.game.Game; -import mage.game.permanent.Permanent; import mage.target.Target; import mage.target.common.TargetControlledCreaturePermanent; @@ -45,7 +40,7 @@ public class EquipAbility extends ActivatedAbilityImpl { @Override public String getRule() { - return "Equip " + costs.getText() + manaCosts.getText() + " (" + manaCosts.getText() + ": Attach to target creature you control. Equip only as a sorcery.)"; + return "Equip " + costs.getText() + manaCosts.getText() + " (" + manaCosts.getText() + ": Attach to target creature you control. Equip only as a sorcery.)"; } }