diff --git a/Mage.Sets/src/mage/cards/f/FellThePheasant.java b/Mage.Sets/src/mage/cards/f/FellThePheasant.java index 14c4c01826e..5eb8f2d3034 100644 --- a/Mage.Sets/src/mage/cards/f/FellThePheasant.java +++ b/Mage.Sets/src/mage/cards/f/FellThePheasant.java @@ -20,7 +20,7 @@ import java.util.UUID; public final class FellThePheasant extends CardImpl { - private static final FilterPermanent filter = new FilterCreaturePermanent("creature with flying."); + private static final FilterPermanent filter = new FilterCreaturePermanent("creature with flying. "); static { filter.add(new AbilityPredicate(FlyingAbility.class)); diff --git a/Mage.Sets/src/mage/cards/h/HauntedCloak.java b/Mage.Sets/src/mage/cards/h/HauntedCloak.java index 1a6e8bc058a..c6188419031 100644 --- a/Mage.Sets/src/mage/cards/h/HauntedCloak.java +++ b/Mage.Sets/src/mage/cards/h/HauntedCloak.java @@ -1,4 +1,3 @@ - package mage.cards.h; import java.util.UUID; @@ -31,7 +30,7 @@ public final class HauntedCloak extends CardImpl { // Equipped creature has vigilance, trample, and haste. Effect effect = new GainAbilityAttachedEffect(VigilanceAbility.getInstance(), AttachmentType.EQUIPMENT); - effect.setText("Equipped creature has vigilance,"); + effect.setText("Equipped creature has vigilance"); Ability ability = new SimpleStaticAbility(Zone.BATTLEFIELD, effect); effect = new GainAbilityAttachedEffect(TrampleAbility.getInstance(), AttachmentType.EQUIPMENT); effect.setText(", trample"); @@ -45,7 +44,7 @@ public final class HauntedCloak extends CardImpl { this.addAbility(new EquipAbility(Outcome.AddAbility, new GenericManaCost(1))); } - public HauntedCloak(final HauntedCloak card) { + private HauntedCloak(final HauntedCloak card) { super(card); } diff --git a/Mage.Sets/src/mage/cards/l/LandsEdge.java b/Mage.Sets/src/mage/cards/l/LandsEdge.java index d0e026ad478..e6320be8fd9 100644 --- a/Mage.Sets/src/mage/cards/l/LandsEdge.java +++ b/Mage.Sets/src/mage/cards/l/LandsEdge.java @@ -54,7 +54,7 @@ class LandsEdgeEffect extends OneShotEffect { public LandsEdgeEffect() { super(Outcome.Neutral); - staticText = "If the discarded card was a land card, Land's Edge deals 2 damage to target player."; + staticText = "If the discarded card was a land card, {this} deals 2 damage to target player"; } public LandsEdgeEffect(final LandsEdgeEffect effect) { diff --git a/Mage.Sets/src/mage/cards/n/NajeelaTheBladeBlossom.java b/Mage.Sets/src/mage/cards/n/NajeelaTheBladeBlossom.java index 8b268d3ff52..6c8f5e55279 100644 --- a/Mage.Sets/src/mage/cards/n/NajeelaTheBladeBlossom.java +++ b/Mage.Sets/src/mage/cards/n/NajeelaTheBladeBlossom.java @@ -64,17 +64,17 @@ public final class NajeelaTheBladeBlossom extends CardImpl { TrampleAbility.getInstance(), Duration.EndOfTurn, StaticFilters.FILTER_ATTACKING_CREATURES - ).setText("They gain trample,")); + ).setText("They gain trample")); ability.addEffect(new GainAbilityAllEffect( LifelinkAbility.getInstance(), Duration.EndOfTurn, StaticFilters.FILTER_ATTACKING_CREATURES - ).setText("lifelink,")); + ).setText(", lifelink")); ability.addEffect(new GainAbilityAllEffect( HasteAbility.getInstance(), Duration.EndOfTurn, StaticFilters.FILTER_ATTACKING_CREATURES - ).setText("and haste until end of turn.")); + ).setText(", and haste until end of turn.")); ability.addEffect(new AdditionalCombatPhaseEffect()); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/cards/o/OpportunisticDragon.java b/Mage.Sets/src/mage/cards/o/OpportunisticDragon.java index aead5e13281..0195ee0ac1e 100644 --- a/Mage.Sets/src/mage/cards/o/OpportunisticDragon.java +++ b/Mage.Sets/src/mage/cards/o/OpportunisticDragon.java @@ -1,6 +1,5 @@ package mage.cards.o; -import java.util.UUID; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.common.EntersBattlefieldTriggeredAbility; @@ -20,6 +19,8 @@ import mage.game.Game; import mage.game.permanent.Permanent; import mage.target.TargetPermanent; +import java.util.UUID; + /** * @author TheElk801 */ @@ -69,7 +70,7 @@ class OpportunisticDragonControlEffect extends GainControlTargetEffect { OpportunisticDragonControlEffect() { super(Duration.Custom); staticText = "choose target Human or artifact an opponent controls. " - + "For as long as {this} remains on the battlefield, gain control of that permanent,"; + + "For as long as {this} remains on the battlefield, gain control of that permanent"; } private OpportunisticDragonControlEffect(final OpportunisticDragonControlEffect effect) { @@ -95,7 +96,7 @@ class OpportunisticDragonLoseAbilitiesEffect extends LoseAllAbilitiesTargetEffec OpportunisticDragonLoseAbilitiesEffect() { super(Duration.Custom); - staticText = "it loses all abilities,"; + staticText = ", it loses all abilities"; } private OpportunisticDragonLoseAbilitiesEffect(final OpportunisticDragonLoseAbilitiesEffect effect) { @@ -121,7 +122,7 @@ class OpportunisticDragonAttackBlockEffect extends CantAttackBlockTargetEffect { OpportunisticDragonAttackBlockEffect() { super(Duration.Custom); - staticText = "and it can't attack or block"; + staticText = ", and it can't attack or block"; } private OpportunisticDragonAttackBlockEffect(final OpportunisticDragonAttackBlockEffect effect) { diff --git a/Mage.Sets/src/mage/cards/s/SoulSeparator.java b/Mage.Sets/src/mage/cards/s/SoulSeparator.java index d45530e37fe..352e18aafb6 100644 --- a/Mage.Sets/src/mage/cards/s/SoulSeparator.java +++ b/Mage.Sets/src/mage/cards/s/SoulSeparator.java @@ -36,7 +36,7 @@ public final class SoulSeparator extends CardImpl { // Create a black Zombie creature token with power equal to that card's power and toughness equal that card's toughness. CreateTokenCopyTargetEffect copyEffect = new CreateTokenCopyTargetEffect(null, null, false, 1, false, false, null, 1, 1, true); copyEffect.setAdditionalSubType(SubType.SPIRIT); - copyEffect.setText("Create a token that's a copy of that card except it's 1/1, it's a Spirit in addition to its other types, and it has flying."); + copyEffect.setText("Create a token that's a copy of that card except it's 1/1, it's a Spirit in addition to its other types, and it has flying. "); Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, copyEffect, new ManaCostsImpl("{5}")); ability.addCost(new TapSourceCost()); ability.addCost(new SacrificeSourceCost()); diff --git a/Mage.Sets/src/mage/cards/t/TallAsABeanstalk.java b/Mage.Sets/src/mage/cards/t/TallAsABeanstalk.java index fbb5509206b..249a67404d4 100644 --- a/Mage.Sets/src/mage/cards/t/TallAsABeanstalk.java +++ b/Mage.Sets/src/mage/cards/t/TallAsABeanstalk.java @@ -35,14 +35,14 @@ public final class TallAsABeanstalk extends CardImpl { // Enchanted creature gets +3/+3, has reach, and is a Giant in addition to its other types. ability = new SimpleStaticAbility( - new BoostEnchantedEffect(3, 3).setText("enchanted creature gets +3/+3,") + new BoostEnchantedEffect(3, 3).setText("enchanted creature gets +3/+3") ); ability.addEffect(new GainAbilityAttachedEffect( ReachAbility.getInstance(), AttachmentType.AURA - ).setText("has reach,")); + ).setText(", has reach")); ability.addEffect(new AddCardSubtypeAttachedEffect( SubType.GIANT, Duration.WhileOnBattlefield, AttachmentType.AURA - ).setText("and is a Giant in addition to its other types")); + ).setText(", and is a Giant in addition to its other types")); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/cards/t/TorgaarFamineIncarnate.java b/Mage.Sets/src/mage/cards/t/TorgaarFamineIncarnate.java index f25874461b7..e98b05af413 100644 --- a/Mage.Sets/src/mage/cards/t/TorgaarFamineIncarnate.java +++ b/Mage.Sets/src/mage/cards/t/TorgaarFamineIncarnate.java @@ -42,7 +42,7 @@ public final class TorgaarFamineIncarnate extends CardImpl { // As an additional cost to cast this spell, you may sacrifice any number of creatures. Cost cost = new SacrificeXTargetCost(StaticFilters.FILTER_CONTROLLED_CREATURE_SHORT_TEXT); - cost.setText("As an additional cost to cast this spell, you may sacrifice any number of creatures."); + cost.setText("As an additional cost to cast this spell, you may sacrifice any number of creatures"); this.getSpellAbility().addCost(cost); // This spell costs {2} less to cast for each creature sacrificed this way. this.addAbility(new SimpleStaticAbility(Zone.STACK, new TorgaarFamineIncarnateEffectCostReductionEffect())); diff --git a/Mage.Sets/src/mage/cards/t/TribalGolem.java b/Mage.Sets/src/mage/cards/t/TribalGolem.java index 5bbc46385ff..9f86d2fe773 100644 --- a/Mage.Sets/src/mage/cards/t/TribalGolem.java +++ b/Mage.Sets/src/mage/cards/t/TribalGolem.java @@ -54,22 +54,22 @@ public final class TribalGolem extends CardImpl { Effect effect1 = new ConditionalContinuousEffect( new GainAbilitySourceEffect(TrampleAbility.getInstance()), new PermanentsOnTheBattlefieldCondition(filter1), - "{this} has trample as long as you control a Beast," + "{this} has trample as long as you control a Beast" ); Effect effect2 = new ConditionalContinuousEffect( new GainAbilitySourceEffect(HasteAbility.getInstance()), new PermanentsOnTheBattlefieldCondition(filter2), - "haste as long as you control a Goblin," + ", haste as long as you control a Goblin" ); Effect effect3 = new ConditionalContinuousEffect( new GainAbilitySourceEffect(FirstStrikeAbility.getInstance()), new PermanentsOnTheBattlefieldCondition(filter3), - "first strike as long as you control a Soldier," + ", first strike as long as you control a Soldier" ); Effect effect4 = new ConditionalContinuousEffect( new GainAbilitySourceEffect(FlyingAbility.getInstance()), new PermanentsOnTheBattlefieldCondition(filter4), - "flying as long as you control a Wizard," + ", flying as long as you control a Wizard" ); Effect effect5 = new ConditionalContinuousEffect( new GainAbilitySourceEffect(new SimpleActivatedAbility( @@ -78,9 +78,9 @@ public final class TribalGolem extends CardImpl { new ManaCostsImpl("{B}") )), new PermanentsOnTheBattlefieldCondition(filter5), - "and \"{B}: Regenerate {this}\" as long as you control a Zombie" + ", and \"{B}: Regenerate {this}\" as long as you control a Zombie" ); - Ability ability = new SimpleStaticAbility(Zone.BATTLEFIELD, effect1); + Ability ability = new SimpleStaticAbility(effect1); ability.addEffect(effect2); ability.addEffect(effect3); ability.addEffect(effect4); diff --git a/Mage.Sets/src/mage/cards/w/WireflyHive.java b/Mage.Sets/src/mage/cards/w/WireflyHive.java index fbfc8cecaac..69a56320ac5 100644 --- a/Mage.Sets/src/mage/cards/w/WireflyHive.java +++ b/Mage.Sets/src/mage/cards/w/WireflyHive.java @@ -1,7 +1,5 @@ - package mage.cards.w; -import java.util.UUID; import mage.abilities.Ability; import mage.abilities.common.SimpleActivatedAbility; import mage.abilities.costs.common.TapSourceCost; @@ -12,25 +10,31 @@ import mage.abilities.effects.common.FlipCoinEffect; import mage.cards.CardImpl; import mage.cards.CardSetInfo; import mage.constants.CardType; -import mage.constants.Zone; import mage.filter.FilterPermanent; import mage.filter.predicate.mageobject.NamePredicate; import mage.game.permanent.token.WireflyToken; +import java.util.UUID; + /** - * * @author fireshoes */ public final class WireflyHive extends CardImpl { + private static final FilterPermanent filter = new FilterPermanent("permanents named Wirefly"); + + static { + filter.add(new NamePredicate("Wirefly")); + } + public WireflyHive(UUID ownerId, CardSetInfo setInfo) { super(ownerId, setInfo, new CardType[]{CardType.ARTIFACT}, "{3}"); + // {3}, {tap}: Flip a coin. If you win the flip, create a 2/2 colorless Insect artifact creature token with flying named Wirefly. // If you lose the flip, destroy all permanents named Wirefly. - FilterPermanent filter = new FilterPermanent("permanents named Wirefly"); - filter.add(new NamePredicate("Wirefly")); - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, - new FlipCoinEffect(new CreateTokenEffect(new WireflyToken()), new DestroyAllEffect(filter)), new GenericManaCost(3)); + Ability ability = new SimpleActivatedAbility(new FlipCoinEffect( + new CreateTokenEffect(new WireflyToken()), new DestroyAllEffect(filter) + ), new GenericManaCost(3)); ability.addCost(new TapSourceCost()); this.addAbility(ability); } diff --git a/Mage/src/main/java/mage/abilities/effects/common/FlipCoinEffect.java b/Mage/src/main/java/mage/abilities/effects/common/FlipCoinEffect.java index 32b1b7940db..954d77c1920 100644 --- a/Mage/src/main/java/mage/abilities/effects/common/FlipCoinEffect.java +++ b/Mage/src/main/java/mage/abilities/effects/common/FlipCoinEffect.java @@ -80,7 +80,7 @@ public class FlipCoinEffect extends OneShotEffect { } StringBuilder sb = new StringBuilder("Flip a coin. If you win the flip, ").append(executingEffectsWon.getText(mode)); if (!executingEffectsLost.isEmpty()) { - sb.append(". If you lose the flip, ").append(executingEffectsLost.getText(mode)); + sb.append(" If you lose the flip, ").append(executingEffectsLost.getText(mode)); } return sb.toString(); }