diff --git a/Mage.Sets/src/mage/cards/b/BoobyTrap.java b/Mage.Sets/src/mage/cards/b/BoobyTrap.java index f8fd5f92907..e26b8ebf1af 100644 --- a/Mage.Sets/src/mage/cards/b/BoobyTrap.java +++ b/Mage.Sets/src/mage/cards/b/BoobyTrap.java @@ -91,7 +91,7 @@ class BoobyTrapTriggeredAbility extends TriggeredAbilityImpl { @Override public String getRule() { - return "The chosen player reveals each card they draw.\n" + + return "The chosen player reveals each card they draw.
" + "When the chosen player draws the named card, sacrifice {this}. If you do, {this} deals 10 damage to that player."; } -} \ No newline at end of file +} diff --git a/Mage.Sets/src/mage/cards/d/DispenseJustice.java b/Mage.Sets/src/mage/cards/d/DispenseJustice.java index 19870987397..700076f16fb 100644 --- a/Mage.Sets/src/mage/cards/d/DispenseJustice.java +++ b/Mage.Sets/src/mage/cards/d/DispenseJustice.java @@ -7,7 +7,6 @@ import mage.abilities.effects.common.SacrificeEffect; import mage.abilities.hint.common.MetalcraftHint; import mage.cards.CardImpl; import mage.cards.CardSetInfo; -import mage.constants.AbilityWord; import mage.constants.CardType; import mage.constants.Outcome; import mage.filter.common.FilterAttackingCreature; @@ -44,7 +43,7 @@ public final class DispenseJustice extends CardImpl { class DispenseJusticeEffect extends OneShotEffect { - private static final String effectText = "Target player sacrifices an attacking creature.\r\n\r\n" + private static final String effectText = "Target player sacrifices an attacking creature.
" + "Metalcraft — That player sacrifices two attacking creatures instead if you control three or more artifacts"; private static final FilterAttackingCreature filter = new FilterAttackingCreature(); diff --git a/Mage.Sets/src/mage/cards/i/InquisitorsFlail.java b/Mage.Sets/src/mage/cards/i/InquisitorsFlail.java index 03205bc4cf1..e52c817ec8f 100644 --- a/Mage.Sets/src/mage/cards/i/InquisitorsFlail.java +++ b/Mage.Sets/src/mage/cards/i/InquisitorsFlail.java @@ -3,12 +3,14 @@ package mage.cards.i; import mage.abilities.Ability; import mage.abilities.common.SimpleStaticAbility; -import mage.abilities.costs.mana.GenericManaCost; import mage.abilities.effects.ReplacementEffectImpl; import mage.abilities.keyword.EquipAbility; import mage.cards.CardImpl; import mage.cards.CardSetInfo; -import mage.constants.*; +import mage.constants.CardType; +import mage.constants.Duration; +import mage.constants.Outcome; +import mage.constants.SubType; import mage.game.Game; import mage.game.events.DamageEvent; import mage.game.events.GameEvent; @@ -16,7 +18,6 @@ import mage.game.permanent.Permanent; import mage.util.CardUtil; import java.util.UUID; -import mage.target.common.TargetControlledCreaturePermanent; /** * @author nantuko @@ -32,7 +33,7 @@ public final class InquisitorsFlail extends CardImpl { this.addAbility(new SimpleStaticAbility(new InquisitorsFlailEffect())); // Equip {2} - this.addAbility(new EquipAbility(Outcome.BoostCreature, new GenericManaCost(2), new TargetControlledCreaturePermanent(), false)); + this.addAbility(new EquipAbility(2, false)); } private InquisitorsFlail(final InquisitorsFlail card) { @@ -49,7 +50,7 @@ class InquisitorsFlailEffect extends ReplacementEffectImpl { InquisitorsFlailEffect() { super(Duration.WhileOnBattlefield, Outcome.Damage); - staticText = "If equipped creature would deal combat damage, it deals double that damage instead. \n" + staticText = "If equipped creature would deal combat damage, it deals double that damage instead.
" + "If another creature would deal combat damage to equipped creature, it deals double that damage to equipped creature instead"; } diff --git a/Mage.Sets/src/mage/cards/m/MoltenPsyche.java b/Mage.Sets/src/mage/cards/m/MoltenPsyche.java index f65d6f902a3..69011bd09ce 100644 --- a/Mage.Sets/src/mage/cards/m/MoltenPsyche.java +++ b/Mage.Sets/src/mage/cards/m/MoltenPsyche.java @@ -47,7 +47,7 @@ class MoltenPsycheEffect extends OneShotEffect { MoltenPsycheEffect() { super(Outcome.Neutral); - staticText = "Each player shuffles the cards from their hand into their library, then draws that many cards.\n" + staticText = "Each player shuffles the cards from their hand into their library, then draws that many cards.
" + "Metalcraft — If you control three or more artifacts, {this} deals damage to each opponent equal to the number of cards that player has drawn this turn."; } diff --git a/Mage.Sets/src/mage/cards/p/Paroxysm.java b/Mage.Sets/src/mage/cards/p/Paroxysm.java index 970b2ea0334..d646d2186b6 100644 --- a/Mage.Sets/src/mage/cards/p/Paroxysm.java +++ b/Mage.Sets/src/mage/cards/p/Paroxysm.java @@ -55,9 +55,8 @@ class ParoxysmEffect extends OneShotEffect { ParoxysmEffect() { super(Outcome.BoostCreature); - this.staticText = "that player reveals the top card of their library. \n" - + "If that card is a land card, destroy that creature. \n" - + "Otherwise, it gets +3/+3 until end of turn."; + this.staticText = "that player reveals the top card of their library. If that card is a land card, "+ + "destroy that creature. Otherwise, it gets +3/+3 until end of turn."; } private ParoxysmEffect(final ParoxysmEffect effect) { diff --git a/Mage.Sets/src/mage/cards/s/ScorchingLava.java b/Mage.Sets/src/mage/cards/s/ScorchingLava.java index 3f732919af5..dd3143ad363 100644 --- a/Mage.Sets/src/mage/cards/s/ScorchingLava.java +++ b/Mage.Sets/src/mage/cards/s/ScorchingLava.java @@ -1,27 +1,21 @@ package mage.cards.s; -import java.util.UUID; -import mage.MageObjectReference; -import mage.abilities.Ability; import mage.abilities.condition.LockedInCondition; import mage.abilities.condition.common.KickedCondition; import mage.abilities.decorator.ConditionalContinuousRuleModifyingEffect; import mage.abilities.decorator.ConditionalOneShotEffect; -import mage.abilities.effects.OneShotEffect; import mage.abilities.effects.common.DamageTargetEffect; import mage.abilities.effects.common.ExileTargetIfDiesEffect; -import mage.abilities.effects.common.replacement.DiesReplacementEffect; import mage.abilities.effects.common.ruleModifying.CantRegenerateTargetEffect; import mage.abilities.keyword.KickerAbility; import mage.cards.CardImpl; import mage.cards.CardSetInfo; import mage.constants.CardType; import mage.constants.Duration; -import mage.constants.Outcome; -import mage.game.Game; -import mage.game.permanent.Permanent; import mage.target.common.TargetAnyTarget; +import java.util.UUID; + /** * * @author LoneFox @@ -37,8 +31,7 @@ public final class ScorchingLava extends CardImpl { // that creature can't be regenerated this turn and if it would die this turn, exile it instead. this.getSpellAbility().addEffect(new DamageTargetEffect(2)); this.getSpellAbility().addEffect(new ConditionalContinuousRuleModifyingEffect( - new CantRegenerateTargetEffect(Duration.EndOfTurn, "If Scorching Lava was kicked, " - + "\n" + "that creature "), + new CantRegenerateTargetEffect(Duration.EndOfTurn, "If {this} was kicked, that creature"), new LockedInCondition(KickedCondition.ONCE))); this.getSpellAbility().addEffect(new ConditionalOneShotEffect( new ExileTargetIfDiesEffect(), @@ -56,28 +49,3 @@ public final class ScorchingLava extends CardImpl { return new ScorchingLava(this); } } - -class ScorchingLavaEffect extends OneShotEffect { - - ScorchingLavaEffect() { - super(Outcome.Exile); - } - - private ScorchingLavaEffect(final ScorchingLavaEffect effect) { - super(effect); - } - - @Override - public ScorchingLavaEffect copy() { - return new ScorchingLavaEffect(this); - } - - @Override - public boolean apply(Game game, Ability source) { - Permanent targetCreature = game.getPermanent(getTargetPointer().getFirst(game, source)); - if (targetCreature != null) { - game.addEffect(new DiesReplacementEffect(new MageObjectReference(targetCreature, game), Duration.EndOfTurn), source); - } - return true; - } -}