From 4b8507a9412724475b3a6fd591fd8bb7ec24a6ec Mon Sep 17 00:00:00 2001 From: North Date: Tue, 27 Dec 2011 15:25:36 +0200 Subject: [PATCH] minor refactoring --- .../src/mage/sets/mirrodinbesieged/KuldothaFlamefiend.java | 1 - Mage.Sets/src/mage/sets/ravnika/BorosSignet.java | 3 +-- Mage.Sets/src/mage/sets/scarsofmirrodin/PsychicMiasma.java | 4 ++-- Mage.Sets/src/mage/sets/tempest/NaturalSpring.java | 4 +++- Mage.Sets/src/mage/sets/worldwake/LoamLion.java | 3 ++- .../mage/abilities/effects/common/DestroyTargetEffect.java | 2 +- Mage/src/mage/filter/common/FilterCreatureOrPlayer.java | 2 -- 7 files changed, 9 insertions(+), 10 deletions(-) diff --git a/Mage.Sets/src/mage/sets/mirrodinbesieged/KuldothaFlamefiend.java b/Mage.Sets/src/mage/sets/mirrodinbesieged/KuldothaFlamefiend.java index e56c0b544fa..55301bda4c6 100644 --- a/Mage.Sets/src/mage/sets/mirrodinbesieged/KuldothaFlamefiend.java +++ b/Mage.Sets/src/mage/sets/mirrodinbesieged/KuldothaFlamefiend.java @@ -33,7 +33,6 @@ import mage.Constants.Outcome; import mage.Constants.Rarity; import mage.MageInt; import mage.abilities.Ability; -import mage.abilities.Mode; import mage.abilities.common.EntersBattlefieldTriggeredAbility; import mage.abilities.effects.OneShotEffect; import mage.abilities.effects.common.DamageMultiEffect; diff --git a/Mage.Sets/src/mage/sets/ravnika/BorosSignet.java b/Mage.Sets/src/mage/sets/ravnika/BorosSignet.java index 548ee25b20d..2379c1cac4e 100644 --- a/Mage.Sets/src/mage/sets/ravnika/BorosSignet.java +++ b/Mage.Sets/src/mage/sets/ravnika/BorosSignet.java @@ -30,7 +30,6 @@ package mage.sets.ravnika; import java.util.UUID; import mage.Constants.CardType; -import mage.Constants.Duration; import mage.Constants.Rarity; import mage.Constants.Zone; import mage.Mana; @@ -38,7 +37,6 @@ import mage.abilities.Ability; import mage.abilities.costs.common.TapSourceCost; import mage.abilities.costs.mana.GenericManaCost; import mage.abilities.effects.common.BasicManaEffect; -import mage.abilities.mana.BasicManaAbility; import mage.abilities.mana.SimpleManaAbility; import mage.cards.CardImpl; @@ -51,6 +49,7 @@ public class BorosSignet extends CardImpl { public BorosSignet (UUID ownerId) { super(ownerId, 255, "Boros Signet", Rarity.COMMON, new CardType[]{CardType.ARTIFACT}, "{2}"); this.expansionSetCode = "RAV"; + Ability ability = new SimpleManaAbility(Zone.BATTLEFIELD, new BasicManaEffect(new Mana(1, 0, 0, 1, 0, 0, 0)), new GenericManaCost(1)); ability.addCost(new TapSourceCost()); this.addAbility(ability); diff --git a/Mage.Sets/src/mage/sets/scarsofmirrodin/PsychicMiasma.java b/Mage.Sets/src/mage/sets/scarsofmirrodin/PsychicMiasma.java index 1e019d09499..64d3a5926c9 100644 --- a/Mage.Sets/src/mage/sets/scarsofmirrodin/PsychicMiasma.java +++ b/Mage.Sets/src/mage/sets/scarsofmirrodin/PsychicMiasma.java @@ -73,7 +73,7 @@ class PsychicMiasmaEffect1 extends OneShotEffect { public PsychicMiasmaEffect1() { super(Outcome.Discard); - staticText = "Target player discards a card."; + staticText = "Target player discards a card"; } public PsychicMiasmaEffect1(final PsychicMiasmaEffect1 effect) { @@ -106,7 +106,7 @@ class PsychicMiasmaEffect1 extends OneShotEffect { class PsychicMiasmaEffect2 extends PostResolveEffect { public PsychicMiasmaEffect2() { - staticText = "If a land card is discarded this way, return {this} to its owner's hand."; + staticText = "If a land card is discarded this way, return {this} to its owner's hand"; } public PsychicMiasmaEffect2(final PsychicMiasmaEffect2 effect) { diff --git a/Mage.Sets/src/mage/sets/tempest/NaturalSpring.java b/Mage.Sets/src/mage/sets/tempest/NaturalSpring.java index 65e7496d640..230c1206cc5 100644 --- a/Mage.Sets/src/mage/sets/tempest/NaturalSpring.java +++ b/Mage.Sets/src/mage/sets/tempest/NaturalSpring.java @@ -44,8 +44,10 @@ public class NaturalSpring extends CardImpl { super(ownerId, 133, "Natural Spring", Rarity.COMMON, new CardType[]{CardType.SORCERY}, "{3}{G}{G}"); this.expansionSetCode = "TMP"; this.color.setGreen(true); + + // Target player gains 8 life. this.getSpellAbility().addEffect(new GainLifeTargetEffect(8)); - this.getSpellAbility().addTarget(new TargetPlayer(1)); + this.getSpellAbility().addTarget(new TargetPlayer()); } public NaturalSpring(final NaturalSpring card) { diff --git a/Mage.Sets/src/mage/sets/worldwake/LoamLion.java b/Mage.Sets/src/mage/sets/worldwake/LoamLion.java index 4a2b9add7f0..004545be4df 100644 --- a/Mage.Sets/src/mage/sets/worldwake/LoamLion.java +++ b/Mage.Sets/src/mage/sets/worldwake/LoamLion.java @@ -47,7 +47,7 @@ import mage.filter.common.FilterLandPermanent; */ public class LoamLion extends CardImpl { - private static final String rule = "Loam Lion gets +1/+2 as long as you control a Forest"; + private static final String rule = "{this} gets +1/+2 as long as you control a Forest"; private static final FilterLandPermanent filter = new FilterLandPermanent("a Forest"); static { @@ -64,6 +64,7 @@ public class LoamLion extends CardImpl { this.power = new MageInt(1); this.toughness = new MageInt(1); + // Loam Lion gets +1/+2 as long as you control a Forest. this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new ConditionalContinousEffect(new BoostSourceEffect(1, 2, Duration.WhileOnBattlefield), new ControlsPermanentCondition(filter), rule))); diff --git a/Mage/src/mage/abilities/effects/common/DestroyTargetEffect.java b/Mage/src/mage/abilities/effects/common/DestroyTargetEffect.java index e50f85fea26..78d0c68cdd2 100644 --- a/Mage/src/mage/abilities/effects/common/DestroyTargetEffect.java +++ b/Mage/src/mage/abilities/effects/common/DestroyTargetEffect.java @@ -81,7 +81,7 @@ public class DestroyTargetEffect extends OneShotEffect { @Override public String getText(Mode mode) { - StringBuffer sb = new StringBuffer(); + StringBuilder sb = new StringBuilder(); if (mode.getTargets().size() == 0) { sb.append("destroy that creature"); //TODO add possibility to specify text with targetPointer usage } else if (mode.getTargets().get(0).getNumberOfTargets() == 1) diff --git a/Mage/src/mage/filter/common/FilterCreatureOrPlayer.java b/Mage/src/mage/filter/common/FilterCreatureOrPlayer.java index a477139bbaa..8449c6da1b3 100644 --- a/Mage/src/mage/filter/common/FilterCreatureOrPlayer.java +++ b/Mage/src/mage/filter/common/FilterCreatureOrPlayer.java @@ -30,8 +30,6 @@ package mage.filter.common; import java.util.UUID; -import mage.abilities.Ability; -import mage.filter.Filter; import mage.filter.FilterImpl; import mage.filter.FilterInPlay; import mage.filter.FilterPlayer;