diff --git a/Mage.Sets/src/mage/cards/f/ForceOfDespair.java b/Mage.Sets/src/mage/cards/f/ForceOfDespair.java index bb2177fcab1..24a725fa0b1 100644 --- a/Mage.Sets/src/mage/cards/f/ForceOfDespair.java +++ b/Mage.Sets/src/mage/cards/f/ForceOfDespair.java @@ -5,7 +5,6 @@ import mage.abilities.condition.common.NotMyTurnCondition; import mage.abilities.costs.AlternativeCostSourceAbility; import mage.abilities.costs.common.ExileFromHandCost; import mage.abilities.effects.common.DestroyAllEffect; -import mage.abilities.hint.common.NotMyTurnHint; import mage.cards.CardImpl; import mage.cards.CardSetInfo; import mage.constants.CardType; @@ -41,7 +40,7 @@ public final class ForceOfDespair extends CardImpl { new ExileFromHandCost(new TargetCardInHand(filter)), NotMyTurnCondition.instance, "If it's not your turn, you may exile a black card from " + "your hand rather than pay this spell's mana cost." - ).addHint(NotMyTurnHint.instance)); + )); // Destroy all creatures that entered the battlefield this turn. this.getSpellAbility().addEffect(new DestroyAllEffect(filter2)); diff --git a/Mage.Sets/src/mage/cards/f/ForceOfNegation.java b/Mage.Sets/src/mage/cards/f/ForceOfNegation.java index 39dd59e8028..8e4421c478e 100644 --- a/Mage.Sets/src/mage/cards/f/ForceOfNegation.java +++ b/Mage.Sets/src/mage/cards/f/ForceOfNegation.java @@ -5,7 +5,6 @@ import mage.abilities.condition.common.NotMyTurnCondition; import mage.abilities.costs.AlternativeCostSourceAbility; import mage.abilities.costs.common.ExileFromHandCost; import mage.abilities.effects.common.CounterTargetWithReplacementEffect; -import mage.abilities.hint.common.NotMyTurnHint; import mage.cards.CardImpl; import mage.cards.CardSetInfo; import mage.constants.CardType; @@ -37,7 +36,7 @@ public final class ForceOfNegation extends CardImpl { new ExileFromHandCost(new TargetCardInHand(filter)), NotMyTurnCondition.instance, "If it's not your turn, you may exile a blue card from " + "your hand rather than pay this spell's mana cost." - ).addHint(NotMyTurnHint.instance)); + )); // Counter target noncreature spell. If that spell is countered this way, exile it instead of putting it into its owner's graveyard. this.getSpellAbility().addEffect(new CounterTargetWithReplacementEffect(PutCards.EXILED)); diff --git a/Mage.Sets/src/mage/cards/f/ForceOfRage.java b/Mage.Sets/src/mage/cards/f/ForceOfRage.java index 9dbd00cb51b..ed79f2fda15 100644 --- a/Mage.Sets/src/mage/cards/f/ForceOfRage.java +++ b/Mage.Sets/src/mage/cards/f/ForceOfRage.java @@ -9,7 +9,6 @@ import mage.abilities.costs.common.ExileFromHandCost; import mage.abilities.effects.Effect; import mage.abilities.effects.OneShotEffect; import mage.abilities.effects.common.SacrificeTargetEffect; -import mage.abilities.hint.common.NotMyTurnHint; import mage.cards.CardImpl; import mage.cards.CardSetInfo; import mage.constants.CardType; @@ -46,7 +45,7 @@ public final class ForceOfRage extends CardImpl { new ExileFromHandCost(new TargetCardInHand(filter)), NotMyTurnCondition.instance, "If it's not your turn, you may exile a red card from " + "your hand rather than pay this spell's mana cost." - ).addHint(NotMyTurnHint.instance)); + )); // Create two 3/1 red Elemental creature tokens with trample and haste. Sacrifice those tokens at the beginning of your next upkeep. this.getSpellAbility().addEffect(new ForceOfRageEffect()); @@ -93,4 +92,3 @@ class ForceOfRageEffect extends OneShotEffect { return true; } } - diff --git a/Mage.Sets/src/mage/cards/f/ForceOfVigor.java b/Mage.Sets/src/mage/cards/f/ForceOfVigor.java index 3ad3e881e02..510b0140ffc 100644 --- a/Mage.Sets/src/mage/cards/f/ForceOfVigor.java +++ b/Mage.Sets/src/mage/cards/f/ForceOfVigor.java @@ -5,7 +5,6 @@ import mage.abilities.condition.common.NotMyTurnCondition; import mage.abilities.costs.AlternativeCostSourceAbility; import mage.abilities.costs.common.ExileFromHandCost; import mage.abilities.effects.common.DestroyTargetEffect; -import mage.abilities.hint.common.NotMyTurnHint; import mage.cards.CardImpl; import mage.cards.CardSetInfo; import mage.constants.CardType; @@ -40,7 +39,7 @@ public final class ForceOfVigor extends CardImpl { new ExileFromHandCost(new TargetCardInHand(filter)), NotMyTurnCondition.instance, "If it's not your turn, you may exile a green card from " + "your hand rather than pay this spell's mana cost." - ).addHint(NotMyTurnHint.instance)); + )); // Destroy up to two target artifacts and/or enchantments. this.getSpellAbility().addEffect(new DestroyTargetEffect()); diff --git a/Mage.Sets/src/mage/cards/f/ForceOfVirtue.java b/Mage.Sets/src/mage/cards/f/ForceOfVirtue.java index c3f5c9c1c8d..5a8adf54fed 100644 --- a/Mage.Sets/src/mage/cards/f/ForceOfVirtue.java +++ b/Mage.Sets/src/mage/cards/f/ForceOfVirtue.java @@ -6,7 +6,6 @@ import mage.abilities.condition.common.NotMyTurnCondition; import mage.abilities.costs.AlternativeCostSourceAbility; import mage.abilities.costs.common.ExileFromHandCost; import mage.abilities.effects.common.continuous.BoostControlledEffect; -import mage.abilities.hint.common.NotMyTurnHint; import mage.abilities.keyword.FlashAbility; import mage.cards.CardImpl; import mage.cards.CardSetInfo; @@ -37,7 +36,7 @@ public final class ForceOfVirtue extends CardImpl { new ExileFromHandCost(new TargetCardInHand(filter)), NotMyTurnCondition.instance, "If it's not your turn, you may exile a white card from " + "your hand rather than pay this spell's mana cost." - ).addHint(NotMyTurnHint.instance)); + )); // Flash this.addAbility(FlashAbility.getInstance()); diff --git a/Mage.Sets/src/mage/cards/g/GhostTown.java b/Mage.Sets/src/mage/cards/g/GhostTown.java index 01e430d8539..750abeae827 100644 --- a/Mage.Sets/src/mage/cards/g/GhostTown.java +++ b/Mage.Sets/src/mage/cards/g/GhostTown.java @@ -4,7 +4,6 @@ import mage.abilities.common.ActivateIfConditionActivatedAbility; import mage.abilities.condition.common.NotMyTurnCondition; import mage.abilities.costs.mana.GenericManaCost; import mage.abilities.effects.common.ReturnToHandSourceEffect; -import mage.abilities.hint.common.NotMyTurnHint; import mage.abilities.mana.ColorlessManaAbility; import mage.cards.CardImpl; import mage.cards.CardSetInfo; @@ -26,8 +25,7 @@ public final class GhostTown extends CardImpl { // {0}: Return Ghost Town to its owner's hand. Activate this ability only if it's not your turn. this.addAbility(new ActivateIfConditionActivatedAbility(Zone.BATTLEFIELD, new ReturnToHandSourceEffect(true), - new GenericManaCost(0), NotMyTurnCondition.instance) - .addHint(NotMyTurnHint.instance)); + new GenericManaCost(0), NotMyTurnCondition.instance)); } private GhostTown(final GhostTown card) { diff --git a/Mage.Sets/src/mage/cards/l/LighthouseChronologist.java b/Mage.Sets/src/mage/cards/l/LighthouseChronologist.java index 8f3ea692923..dac6af86ece 100644 --- a/Mage.Sets/src/mage/cards/l/LighthouseChronologist.java +++ b/Mage.Sets/src/mage/cards/l/LighthouseChronologist.java @@ -8,7 +8,6 @@ import mage.abilities.triggers.BeginningOfEndStepTriggeredAbility; import mage.abilities.condition.common.NotMyTurnCondition; import mage.abilities.costs.mana.ManaCostsImpl; import mage.abilities.effects.common.turn.AddExtraTurnControllerEffect; -import mage.abilities.hint.common.NotMyTurnHint; import mage.abilities.keyword.LevelUpAbility; import mage.abilities.keyword.LevelerCardBuilder; import mage.cards.CardSetInfo; @@ -43,8 +42,7 @@ public final class LighthouseChronologist extends LevelerCard { // At the beginning of each end step, if it's not your turn, take an extra turn after this one. Abilities abilities2 = new AbilitiesImpl<>(); abilities2.add(new BeginningOfEndStepTriggeredAbility( - TargetController.ANY, new AddExtraTurnControllerEffect(false), false, NotMyTurnCondition.instance) - .addHint(NotMyTurnHint.instance)); + TargetController.ANY, new AddExtraTurnControllerEffect(false), false, NotMyTurnCondition.instance)); this.addAbilities(LevelerCardBuilder.construct( new LevelerCardBuilder.LevelAbility(4, 6, abilities1, 2, 4), diff --git a/Mage.Sets/src/mage/cards/o/OakStreetInnkeeper.java b/Mage.Sets/src/mage/cards/o/OakStreetInnkeeper.java index d023ef9ba24..ebb810f2df0 100644 --- a/Mage.Sets/src/mage/cards/o/OakStreetInnkeeper.java +++ b/Mage.Sets/src/mage/cards/o/OakStreetInnkeeper.java @@ -5,14 +5,12 @@ import mage.abilities.common.SimpleStaticAbility; import mage.abilities.condition.common.NotMyTurnCondition; import mage.abilities.decorator.ConditionalContinuousEffect; import mage.abilities.effects.common.continuous.GainAbilityControlledEffect; -import mage.abilities.hint.common.NotMyTurnHint; import mage.abilities.keyword.HexproofAbility; import mage.cards.CardImpl; import mage.cards.CardSetInfo; import mage.constants.CardType; import mage.constants.Duration; import mage.constants.SubType; -import mage.constants.Zone; import mage.filter.FilterPermanent; import mage.filter.common.FilterControlledCreaturePermanent; import mage.filter.predicate.permanent.TappedPredicate; @@ -41,8 +39,7 @@ public final class OakStreetInnkeeper extends CardImpl { this.addAbility(new SimpleStaticAbility(new ConditionalContinuousEffect( new GainAbilityControlledEffect(HexproofAbility.getInstance(), Duration.WhileOnBattlefield, filter), NotMyTurnCondition.instance, - "During turns other than yours, tapped creatures you control have hexproof")) - .addHint(NotMyTurnHint.instance)); + "During turns other than yours, tapped creatures you control have hexproof"))); } diff --git a/Mage.Sets/src/mage/cards/w/WardenOfTheWall.java b/Mage.Sets/src/mage/cards/w/WardenOfTheWall.java index 80682bee3e0..7cce5da4550 100644 --- a/Mage.Sets/src/mage/cards/w/WardenOfTheWall.java +++ b/Mage.Sets/src/mage/cards/w/WardenOfTheWall.java @@ -6,7 +6,6 @@ import mage.abilities.common.SimpleStaticAbility; import mage.abilities.condition.common.NotMyTurnCondition; import mage.abilities.decorator.ConditionalContinuousEffect; import mage.abilities.effects.common.continuous.BecomesCreatureSourceEffect; -import mage.abilities.hint.common.NotMyTurnHint; import mage.abilities.keyword.FlyingAbility; import mage.abilities.mana.ColorlessManaAbility; import mage.cards.CardImpl; @@ -14,7 +13,6 @@ import mage.cards.CardSetInfo; import mage.constants.CardType; import mage.constants.Duration; import mage.constants.SubType; -import mage.constants.Zone; import mage.game.permanent.token.TokenImpl; import java.util.UUID; @@ -37,8 +35,7 @@ public final class WardenOfTheWall extends CardImpl { this.addAbility(new SimpleStaticAbility(new ConditionalContinuousEffect( new BecomesCreatureSourceEffect(new GargoyleToken(), CardType.ARTIFACT, Duration.WhileOnBattlefield), NotMyTurnCondition.instance, - "During turns other than yours, Warden of the Wall is a 2/3 Gargoyle artifact creature with flying")) - .addHint(NotMyTurnHint.instance)); + "During turns other than yours, Warden of the Wall is a 2/3 Gargoyle artifact creature with flying"))); } private WardenOfTheWall(final WardenOfTheWall card) { diff --git a/Mage/src/main/java/mage/abilities/hint/common/NotMyTurnHint.java b/Mage/src/main/java/mage/abilities/hint/common/NotMyTurnHint.java deleted file mode 100644 index 9b95d0666e1..00000000000 --- a/Mage/src/main/java/mage/abilities/hint/common/NotMyTurnHint.java +++ /dev/null @@ -1,26 +0,0 @@ -package mage.abilities.hint.common; - -import mage.abilities.Ability; -import mage.abilities.condition.common.NotMyTurnCondition; -import mage.abilities.hint.ConditionHint; -import mage.abilities.hint.Hint; -import mage.game.Game; - -/** - * @author JayDi85 - */ -public enum NotMyTurnHint implements Hint { - - instance; - private static final ConditionHint hint = new ConditionHint(NotMyTurnCondition.instance, "It's not your turn"); - - @Override - public String getText(Game game, Ability ability) { - return hint.getText(game, ability); - } - - @Override - public Hint copy() { - return instance; - } -}