diff --git a/Mage.Sets/src/mage/cards/b/BloodsoakedReveler.java b/Mage.Sets/src/mage/cards/b/BloodsoakedReveler.java index 881611ab1a2..03fde45f86b 100644 --- a/Mage.Sets/src/mage/cards/b/BloodsoakedReveler.java +++ b/Mage.Sets/src/mage/cards/b/BloodsoakedReveler.java @@ -24,7 +24,7 @@ import java.util.UUID; */ public final class BloodsoakedReveler extends CardImpl { - private static final Condition condition = new YouGainedLifeCondition(ComparisonType.MORE_THAN, 0); + private static final Condition condition = new YouGainedLifeCondition(); private static final Hint hint = new ConditionHint(condition, "You gained life this turn"); public BloodsoakedReveler(UUID ownerId, CardSetInfo setInfo) { diff --git a/Mage.Sets/src/mage/cards/b/BrackishTrudge.java b/Mage.Sets/src/mage/cards/b/BrackishTrudge.java index 2e9224a6637..1ecf6b1bed1 100644 --- a/Mage.Sets/src/mage/cards/b/BrackishTrudge.java +++ b/Mage.Sets/src/mage/cards/b/BrackishTrudge.java @@ -24,7 +24,7 @@ import java.util.UUID; */ public final class BrackishTrudge extends CardImpl { - private static final Condition condition = new YouGainedLifeCondition(ComparisonType.MORE_THAN, 0); + private static final Condition condition = new YouGainedLifeCondition(); private static final Hint hint = new ConditionHint(condition, "You gained life this turn"); public BrackishTrudge(UUID ownerId, CardSetInfo setInfo) { diff --git a/Mage.Sets/src/mage/cards/c/CourierBat.java b/Mage.Sets/src/mage/cards/c/CourierBat.java index d74d2ddaddb..3fd82faab44 100644 --- a/Mage.Sets/src/mage/cards/c/CourierBat.java +++ b/Mage.Sets/src/mage/cards/c/CourierBat.java @@ -1,6 +1,7 @@ package mage.cards.c; import java.util.UUID; + import mage.MageInt; import mage.abilities.Ability; import mage.abilities.common.EntersBattlefieldTriggeredAbility; @@ -18,7 +19,6 @@ import mage.target.common.TargetCardInYourGraveyard; import mage.watchers.common.PlayerGainedLifeWatcher; /** - * * @author weirddan455 */ public final class CourierBat extends CardImpl { @@ -36,7 +36,7 @@ public final class CourierBat extends CardImpl { // When Courier Bat enters the battlefield, if you gained life this turn, return up to one target creature card from your graveyard to your hand. Ability ability = new ConditionalInterveningIfTriggeredAbility( new EntersBattlefieldTriggeredAbility(new ReturnFromGraveyardToHandTargetEffect()), - new YouGainedLifeCondition(ComparisonType.MORE_THAN, 0), + new YouGainedLifeCondition(), "When {this} enters the battlefield, if you gained life this turn, return up to one target creature card from your graveyard to your hand." ); ability.addTarget(new TargetCardInYourGraveyard(0, 1, StaticFilters.FILTER_CARD_CREATURE_YOUR_GRAVEYARD)); diff --git a/Mage.Sets/src/mage/cards/c/CrestedSunmare.java b/Mage.Sets/src/mage/cards/c/CrestedSunmare.java index 12b08868932..8ebfb08632c 100644 --- a/Mage.Sets/src/mage/cards/c/CrestedSunmare.java +++ b/Mage.Sets/src/mage/cards/c/CrestedSunmare.java @@ -46,7 +46,7 @@ public final class CrestedSunmare extends CardImpl { new BeginningOfEndStepTriggeredAbility( new CreateTokenEffect(new CrestedSunmareToken()), TargetController.ANY, false - ), new YouGainedLifeCondition(ComparisonType.MORE_THAN, 0), + ), new YouGainedLifeCondition(), "At the beginning of each end step, if you gained life this turn, " + "create a 5/5 white Horse creature token." ).addHint(ControllerGainedLifeCount.getHint()), new PlayerGainedLifeWatcher()); diff --git a/Mage.Sets/src/mage/cards/l/LathielTheBounteousDawn.java b/Mage.Sets/src/mage/cards/l/LathielTheBounteousDawn.java index 92af0e65973..fb1facbf7f9 100644 --- a/Mage.Sets/src/mage/cards/l/LathielTheBounteousDawn.java +++ b/Mage.Sets/src/mage/cards/l/LathielTheBounteousDawn.java @@ -29,7 +29,7 @@ import java.util.UUID; */ public final class LathielTheBounteousDawn extends CardImpl { - private static final Condition condition = new YouGainedLifeCondition(ComparisonType.MORE_THAN, 0); + private static final Condition condition = new YouGainedLifeCondition(); public LathielTheBounteousDawn(UUID ownerId, CardSetInfo setInfo) { super(ownerId, setInfo, new CardType[]{CardType.CREATURE}, "{2}{G}{W}"); diff --git a/Mage.Sets/src/mage/cards/m/MarkovPurifier.java b/Mage.Sets/src/mage/cards/m/MarkovPurifier.java index 7d1b490efc7..5be96f2e255 100644 --- a/Mage.Sets/src/mage/cards/m/MarkovPurifier.java +++ b/Mage.Sets/src/mage/cards/m/MarkovPurifier.java @@ -1,6 +1,7 @@ package mage.cards.m; import java.util.UUID; + import mage.MageInt; import mage.abilities.common.BeginningOfEndStepTriggeredAbility; import mage.abilities.condition.common.YouGainedLifeCondition; @@ -14,7 +15,6 @@ import mage.cards.CardSetInfo; import mage.watchers.common.PlayerGainedLifeWatcher; /** - * * @author weirddan455 */ public final class MarkovPurifier extends CardImpl { @@ -34,7 +34,7 @@ public final class MarkovPurifier extends CardImpl { this.addAbility(new BeginningOfEndStepTriggeredAbility( Zone.BATTLEFIELD, new DoIfCostPaid(new DrawCardSourceControllerEffect(1), new GenericManaCost(2)), - TargetController.YOU, new YouGainedLifeCondition(ComparisonType.MORE_THAN, 0), false + TargetController.YOU, new YouGainedLifeCondition(), false ), new PlayerGainedLifeWatcher()); } diff --git a/Mage.Sets/src/mage/cards/m/MortalitySpear.java b/Mage.Sets/src/mage/cards/m/MortalitySpear.java index 4b2e7718fa5..76be71659a6 100644 --- a/Mage.Sets/src/mage/cards/m/MortalitySpear.java +++ b/Mage.Sets/src/mage/cards/m/MortalitySpear.java @@ -21,7 +21,7 @@ import java.util.UUID; */ public final class MortalitySpear extends CardImpl { - private static final Condition condition = new YouGainedLifeCondition(ComparisonType.MORE_THAN, 0); + private static final Condition condition = new YouGainedLifeCondition(); public MortalitySpear(UUID ownerId, CardSetInfo setInfo) { super(ownerId, setInfo, new CardType[]{CardType.INSTANT}, "{2}{B}{G}"); diff --git a/Mage.Sets/src/mage/cards/o/OcelotPride.java b/Mage.Sets/src/mage/cards/o/OcelotPride.java index bc10cced950..b1260156e3e 100644 --- a/Mage.Sets/src/mage/cards/o/OcelotPride.java +++ b/Mage.Sets/src/mage/cards/o/OcelotPride.java @@ -36,7 +36,7 @@ import java.util.UUID; */ public final class OcelotPride extends CardImpl { - private static final Condition condition = new YouGainedLifeCondition(ComparisonType.MORE_THAN, 0); + private static final Condition condition = new YouGainedLifeCondition(); private static final Hint hint = new ConditionHint(condition, "You gained life this turn"); public OcelotPride(UUID ownerId, CardSetInfo setInfo) { diff --git a/Mage.Sets/src/mage/cards/r/RegalBloodlord.java b/Mage.Sets/src/mage/cards/r/RegalBloodlord.java index 5d43f75fc25..d799e47c888 100644 --- a/Mage.Sets/src/mage/cards/r/RegalBloodlord.java +++ b/Mage.Sets/src/mage/cards/r/RegalBloodlord.java @@ -40,7 +40,7 @@ public final class RegalBloodlord extends CardImpl { new CreateTokenEffect(new BatToken()), TargetController.ANY, false ), - new YouGainedLifeCondition(ComparisonType.MORE_THAN, 0), + new YouGainedLifeCondition(), "At the beginning of each end step, " + "if you gained life this turn, " + "create a 1/1 black Bat creature token with flying." diff --git a/Mage.Sets/src/mage/cards/r/RestlessBloodseeker.java b/Mage.Sets/src/mage/cards/r/RestlessBloodseeker.java index 4ad07aa614b..e854d512d31 100644 --- a/Mage.Sets/src/mage/cards/r/RestlessBloodseeker.java +++ b/Mage.Sets/src/mage/cards/r/RestlessBloodseeker.java @@ -28,7 +28,7 @@ import java.util.UUID; */ public final class RestlessBloodseeker extends CardImpl { - private static final Condition condition = new YouGainedLifeCondition(ComparisonType.MORE_THAN, 0); + private static final Condition condition = new YouGainedLifeCondition(); private static final Hint hint = new ConditionHint(condition, "You gained life this turn"); private static final FilterControlledPermanent filter = new FilterControlledPermanent(SubType.BLOOD, "Blood tokens"); diff --git a/Mage.Sets/src/mage/cards/s/SproutbackTrudge.java b/Mage.Sets/src/mage/cards/s/SproutbackTrudge.java index 719e1ceb946..ecc81c8bc9f 100644 --- a/Mage.Sets/src/mage/cards/s/SproutbackTrudge.java +++ b/Mage.Sets/src/mage/cards/s/SproutbackTrudge.java @@ -27,7 +27,7 @@ import java.util.UUID; */ public final class SproutbackTrudge extends CardImpl { - private static final Condition condition = new YouGainedLifeCondition(ComparisonType.MORE_THAN, 0); + private static final Condition condition = new YouGainedLifeCondition(); public SproutbackTrudge(UUID ownerId, CardSetInfo setInfo) { super(ownerId, setInfo, new CardType[]{CardType.CREATURE}, "{7}{G}{G}"); diff --git a/Mage.Sets/src/mage/cards/t/TivashGloomSummoner.java b/Mage.Sets/src/mage/cards/t/TivashGloomSummoner.java index 8a79bdfd234..90e68e0c084 100644 --- a/Mage.Sets/src/mage/cards/t/TivashGloomSummoner.java +++ b/Mage.Sets/src/mage/cards/t/TivashGloomSummoner.java @@ -25,7 +25,7 @@ import java.util.UUID; */ public final class TivashGloomSummoner extends CardImpl { - private static final Condition condition = new YouGainedLifeCondition(ComparisonType.MORE_THAN, 0); + private static final Condition condition = new YouGainedLifeCondition(); public TivashGloomSummoner(UUID ownerId, CardSetInfo setInfo) { super(ownerId, setInfo, new CardType[]{CardType.CREATURE}, "{4}{B}"); diff --git a/Mage.Sets/src/mage/cards/w/WitchOfTheMoors.java b/Mage.Sets/src/mage/cards/w/WitchOfTheMoors.java index 07088f10b01..e0f2b8609bf 100644 --- a/Mage.Sets/src/mage/cards/w/WitchOfTheMoors.java +++ b/Mage.Sets/src/mage/cards/w/WitchOfTheMoors.java @@ -27,7 +27,7 @@ import java.util.UUID; */ public final class WitchOfTheMoors extends CardImpl { - private static final Condition condition = new YouGainedLifeCondition(ComparisonType.MORE_THAN, 0); + private static final Condition condition = new YouGainedLifeCondition(); public WitchOfTheMoors(UUID ownerId, CardSetInfo setInfo) { super(ownerId, setInfo, new CardType[]{CardType.CREATURE}, "{3}{B}{B}"); diff --git a/Mage/src/main/java/mage/abilities/condition/common/YouGainedLifeCondition.java b/Mage/src/main/java/mage/abilities/condition/common/YouGainedLifeCondition.java index 3a2336e0b20..fd848917998 100644 --- a/Mage/src/main/java/mage/abilities/condition/common/YouGainedLifeCondition.java +++ b/Mage/src/main/java/mage/abilities/condition/common/YouGainedLifeCondition.java @@ -13,6 +13,13 @@ import mage.watchers.common.PlayerGainedLifeWatcher; */ public class YouGainedLifeCondition extends IntCompareCondition { + /** + * "if you gained life this turn" + */ + public YouGainedLifeCondition() { + super(ComparisonType.MORE_THAN, 0); + } + public YouGainedLifeCondition(ComparisonType type, int value) { super(type, value); }