From 68bf7aa3383065ff3efd2fa0ae536e4046dd97f2 Mon Sep 17 00:00:00 2001 From: Evan Kranzler Date: Mon, 27 May 2019 17:01:28 -0400 Subject: [PATCH] fixed fateful hour text --- Mage.Sets/src/mage/cards/b/BreakOfDay.java | 22 ++++++++++--------- Mage.Sets/src/mage/cards/c/ClingingMists.java | 14 ++++++------ .../src/mage/cards/g/GatherTheTownsfolk.java | 10 ++++----- .../src/mage/cards/g/GavonyIronwright.java | 14 +++++------- Mage.Sets/src/mage/cards/s/SpellSnuff.java | 2 +- .../src/mage/cards/t/ThrabenDoomsayer.java | 11 +++++----- .../src/mage/cards/v/VillageSurvivors.java | 9 ++++---- 7 files changed, 39 insertions(+), 43 deletions(-) diff --git a/Mage.Sets/src/mage/cards/b/BreakOfDay.java b/Mage.Sets/src/mage/cards/b/BreakOfDay.java index 3b0fbb2c78..9c22e8a4c3 100644 --- a/Mage.Sets/src/mage/cards/b/BreakOfDay.java +++ b/Mage.Sets/src/mage/cards/b/BreakOfDay.java @@ -1,7 +1,5 @@ - package mage.cards.b; -import java.util.UUID; import mage.abilities.condition.LockedInCondition; import mage.abilities.condition.common.FatefulHourCondition; import mage.abilities.decorator.ConditionalContinuousEffect; @@ -12,26 +10,30 @@ import mage.cards.CardImpl; import mage.cards.CardSetInfo; import mage.constants.CardType; import mage.constants.Duration; -import mage.filter.common.FilterControlledCreaturePermanent; +import mage.filter.StaticFilters; + +import java.util.UUID; /** - * * @author Loki - */ public final class BreakOfDay extends CardImpl { public BreakOfDay(UUID ownerId, CardSetInfo setInfo) { - super(ownerId,setInfo,new CardType[]{CardType.INSTANT},"{1}{W}"); - + super(ownerId, setInfo, new CardType[]{CardType.INSTANT}, "{1}{W}"); // Creatures you control get +1/+1 until end of turn. this.getSpellAbility().addEffect(new BoostControlledEffect(1, 1, Duration.EndOfTurn)); + // Fateful hour - If you have 5 or less life, those creatures also are indestructible this turn. this.getSpellAbility().addEffect(new ConditionalContinuousEffect( - new GainAbilityAllEffect(IndestructibleAbility.getInstance(), Duration.EndOfTurn, new FilterControlledCreaturePermanent("creatures you control"), false), - new LockedInCondition(FatefulHourCondition.instance), - "If you have 5 or less life, those creatures also are indestructible this turn")); + new GainAbilityAllEffect( + IndestructibleAbility.getInstance(), Duration.EndOfTurn, + StaticFilters.FILTER_PERMANENT_CREATURES, false + ), new LockedInCondition(FatefulHourCondition.instance), + "
Fateful hour — If you have 5 or less life, " + + "those creatures also are indestructible this turn" + )); } public BreakOfDay(final BreakOfDay card) { diff --git a/Mage.Sets/src/mage/cards/c/ClingingMists.java b/Mage.Sets/src/mage/cards/c/ClingingMists.java index 7d0a944e1d..ca0a2c8e53 100644 --- a/Mage.Sets/src/mage/cards/c/ClingingMists.java +++ b/Mage.Sets/src/mage/cards/c/ClingingMists.java @@ -1,9 +1,5 @@ - package mage.cards.c; -import java.util.ArrayList; -import java.util.List; -import java.util.UUID; import mage.abilities.Ability; import mage.abilities.condition.common.FatefulHourCondition; import mage.abilities.decorator.ConditionalOneShotEffect; @@ -21,21 +17,25 @@ import mage.game.Game; import mage.game.permanent.Permanent; import mage.target.targetpointer.FixedTargets; +import java.util.ArrayList; +import java.util.List; +import java.util.UUID; + /** - * * @author BetaSteward */ public final class ClingingMists extends CardImpl { public ClingingMists(UUID ownerId, CardSetInfo setInfo) { - super(ownerId,setInfo,new CardType[]{CardType.INSTANT},"{2}{G}"); + super(ownerId, setInfo, new CardType[]{CardType.INSTANT}, "{2}{G}"); // Prevent all combat damage that would be dealt this turn. this.getSpellAbility().addEffect(new PreventAllDamageByAllPermanentsEffect(null, Duration.EndOfTurn, true)); // Fateful hour - If you have 5 or less life, tap all attacking creatures. Those creatures don't untap during their controller's next untap step. this.getSpellAbility().addEffect(new ConditionalOneShotEffect(new ClingingMistsEffect(), - FatefulHourCondition.instance, "If you have 5 or less life, tap all attacking creatures. Those creatures don't untap during their controller's next untap step.")); + FatefulHourCondition.instance, "
Fateful hour — If you have 5 or less life, " + + "tap all attacking creatures. Those creatures don't untap during their controller's next untap step.")); } diff --git a/Mage.Sets/src/mage/cards/g/GatherTheTownsfolk.java b/Mage.Sets/src/mage/cards/g/GatherTheTownsfolk.java index defe225511..ef74d21c1c 100644 --- a/Mage.Sets/src/mage/cards/g/GatherTheTownsfolk.java +++ b/Mage.Sets/src/mage/cards/g/GatherTheTownsfolk.java @@ -1,7 +1,5 @@ - package mage.cards.g; -import java.util.UUID; import mage.abilities.condition.common.FatefulHourCondition; import mage.abilities.decorator.ConditionalOneShotEffect; import mage.abilities.effects.common.CreateTokenEffect; @@ -10,20 +8,20 @@ import mage.cards.CardSetInfo; import mage.constants.CardType; import mage.game.permanent.token.HumanToken; +import java.util.UUID; + /** - * * @author anonymous */ public final class GatherTheTownsfolk extends CardImpl { public GatherTheTownsfolk(UUID ownerId, CardSetInfo setInfo) { - super(ownerId,setInfo,new CardType[]{CardType.SORCERY},"{1}{W}"); - + super(ownerId, setInfo, new CardType[]{CardType.SORCERY}, "{1}{W}"); // Create two 1/1 white Human creature tokens. // Fateful hour - If you have 5 or less life, create five of those tokens instead. this.getSpellAbility().addEffect(new ConditionalOneShotEffect(new CreateTokenEffect(new HumanToken(), 5), new CreateTokenEffect(new HumanToken(), 2), - FatefulHourCondition.instance, "Create two 1/1 white Human creature tokens. If you have 5 or less life, create five of those tokens instead")); + FatefulHourCondition.instance, "Create two 1/1 white Human creature tokens.
Fateful hour — If you have 5 or less life, create five of those tokens instead")); } public GatherTheTownsfolk(final GatherTheTownsfolk card) { diff --git a/Mage.Sets/src/mage/cards/g/GavonyIronwright.java b/Mage.Sets/src/mage/cards/g/GavonyIronwright.java index a3a9f10b0c..d618ee560a 100644 --- a/Mage.Sets/src/mage/cards/g/GavonyIronwright.java +++ b/Mage.Sets/src/mage/cards/g/GavonyIronwright.java @@ -1,7 +1,5 @@ - package mage.cards.g; -import java.util.UUID; import mage.MageInt; import mage.abilities.common.SimpleStaticAbility; import mage.abilities.condition.common.FatefulHourCondition; @@ -10,19 +8,19 @@ import mage.abilities.effects.common.continuous.BoostControlledEffect; import mage.cards.CardImpl; import mage.cards.CardSetInfo; import mage.constants.CardType; -import mage.constants.SubType; import mage.constants.Duration; +import mage.constants.SubType; import mage.constants.Zone; -/** - * - * @author Loki +import java.util.UUID; +/** + * @author Loki */ public final class GavonyIronwright extends CardImpl { public GavonyIronwright(UUID ownerId, CardSetInfo setInfo) { - super(ownerId,setInfo,new CardType[]{CardType.CREATURE},"{2}{W}"); + super(ownerId, setInfo, new CardType[]{CardType.CREATURE}, "{2}{W}"); this.subtype.add(SubType.HUMAN); this.subtype.add(SubType.SOLDIER); @@ -31,7 +29,7 @@ public final class GavonyIronwright extends CardImpl { // Fateful hour - As long as you have 5 or less life, other creatures you control get +1/+4. this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new ConditionalContinuousEffect(new BoostControlledEffect(1, 4, Duration.WhileOnBattlefield, false), - FatefulHourCondition.instance, "As long as you have 5 or less life, other creatures you control get +1/+4"))); + FatefulHourCondition.instance, "
Fateful hour — As long as you have 5 or less life, other creatures you control get +1/+4"))); } public GavonyIronwright(final GavonyIronwright card) { diff --git a/Mage.Sets/src/mage/cards/s/SpellSnuff.java b/Mage.Sets/src/mage/cards/s/SpellSnuff.java index 369266e8c9..2cf1cd729f 100644 --- a/Mage.Sets/src/mage/cards/s/SpellSnuff.java +++ b/Mage.Sets/src/mage/cards/s/SpellSnuff.java @@ -26,7 +26,7 @@ public final class SpellSnuff extends CardImpl { // Fateful hour — If you have 5 or less life, draw a card. this.getSpellAbility().addEffect(new ConditionalOneShotEffect( new DrawCardSourceControllerEffect(1), FatefulHourCondition.instance, - "
Fateful Hour — If you have 5 or less life, draw a card." + "
Fateful hour — If you have 5 or less life, draw a card." )); } diff --git a/Mage.Sets/src/mage/cards/t/ThrabenDoomsayer.java b/Mage.Sets/src/mage/cards/t/ThrabenDoomsayer.java index b75dc39925..82b95a2e98 100644 --- a/Mage.Sets/src/mage/cards/t/ThrabenDoomsayer.java +++ b/Mage.Sets/src/mage/cards/t/ThrabenDoomsayer.java @@ -1,7 +1,5 @@ - package mage.cards.t; -import java.util.UUID; import mage.MageInt; import mage.abilities.common.SimpleActivatedAbility; import mage.abilities.common.SimpleStaticAbility; @@ -13,19 +11,20 @@ import mage.abilities.effects.common.continuous.BoostControlledEffect; import mage.cards.CardImpl; import mage.cards.CardSetInfo; import mage.constants.CardType; -import mage.constants.SubType; import mage.constants.Duration; +import mage.constants.SubType; import mage.constants.Zone; import mage.game.permanent.token.HumanToken; +import java.util.UUID; + /** - * * @author anonymous */ public final class ThrabenDoomsayer extends CardImpl { public ThrabenDoomsayer(UUID ownerId, CardSetInfo setInfo) { - super(ownerId,setInfo,new CardType[]{CardType.CREATURE},"{1}{W}{W}"); + super(ownerId, setInfo, new CardType[]{CardType.CREATURE}, "{1}{W}{W}"); this.subtype.add(SubType.HUMAN); this.subtype.add(SubType.CLERIC); @@ -36,7 +35,7 @@ public final class ThrabenDoomsayer extends CardImpl { this.addAbility(new SimpleActivatedAbility(Zone.BATTLEFIELD, new CreateTokenEffect(new HumanToken()), new TapSourceCost())); // Fateful hour - As long as you have 5 or less life, other creatures you control get +2/+2. this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new ConditionalContinuousEffect(new BoostControlledEffect(2, 2, Duration.WhileOnBattlefield, true), - FatefulHourCondition.instance, "As long as you have 5 or less life, other creatures you control get +2/+2"))); + FatefulHourCondition.instance, "
Fateful hour — As long as you have 5 or less life, other creatures you control get +2/+2"))); } public ThrabenDoomsayer(final ThrabenDoomsayer card) { diff --git a/Mage.Sets/src/mage/cards/v/VillageSurvivors.java b/Mage.Sets/src/mage/cards/v/VillageSurvivors.java index 57c8a88208..7eac629e4d 100644 --- a/Mage.Sets/src/mage/cards/v/VillageSurvivors.java +++ b/Mage.Sets/src/mage/cards/v/VillageSurvivors.java @@ -1,7 +1,5 @@ - package mage.cards.v; -import java.util.UUID; import mage.MageInt; import mage.abilities.common.SimpleStaticAbility; import mage.abilities.condition.common.FatefulHourCondition; @@ -11,13 +9,14 @@ import mage.abilities.keyword.VigilanceAbility; import mage.cards.CardImpl; import mage.cards.CardSetInfo; import mage.constants.CardType; -import mage.constants.SubType; import mage.constants.Duration; +import mage.constants.SubType; import mage.constants.Zone; import mage.filter.StaticFilters; +import java.util.UUID; + /** - * * @author Loki */ public final class VillageSurvivors extends CardImpl { @@ -34,7 +33,7 @@ public final class VillageSurvivors extends CardImpl { this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new ConditionalContinuousEffect( new GainAbilityControlledEffect(VigilanceAbility.getInstance(), Duration.WhileOnBattlefield, StaticFilters.FILTER_PERMANENT_CREATURE, true), FatefulHourCondition.instance, - "Fateful hour - As long as you have 5 or less life, other creatures you control have vigilance"))); + "
Fateful hour — As long as you have 5 or less life, other creatures you control have vigilance"))); } public VillageSurvivors(final VillageSurvivors card) {