From 330f8cf5d086b4fa49d89defa2374186bbada221 Mon Sep 17 00:00:00 2001 From: Oleg Agafonov Date: Tue, 5 Feb 2019 17:47:00 +0400 Subject: [PATCH] Added city blessing hints to all other cards --- Mage.Sets/src/mage/cards/d/DeadeyeBrawler.java | 13 +++++++------ Mage.Sets/src/mage/cards/d/DuskCharger.java | 8 ++++---- Mage.Sets/src/mage/cards/g/GoldenDemise.java | 7 ++++--- Mage.Sets/src/mage/cards/k/KumenasAwakening.java | 9 +++++---- Mage.Sets/src/mage/cards/m/MausoleumHarpy.java | 9 +++++---- Mage.Sets/src/mage/cards/o/OrazcaRelic.java | 9 +++++---- .../src/mage/cards/p/PrideOfConquerors.java | 7 ++++--- Mage.Sets/src/mage/cards/r/RadiantDestiny.java | 16 +++++++--------- .../src/mage/cards/r/ResplendentGriffin.java | 9 +++++---- .../src/mage/cards/s/SecretsOfTheGoldenCity.java | 7 ++++--- .../src/mage/cards/s/SkymarcherAspirant.java | 8 ++++---- .../src/mage/cards/s/SlipperyScoundrel.java | 7 ++++--- Mage.Sets/src/mage/cards/s/SnubhornSentry.java | 8 ++++---- Mage.Sets/src/mage/cards/s/SpireWinder.java | 8 ++++---- .../src/mage/cards/s/StormFleetSwashbuckler.java | 8 ++++---- Mage.Sets/src/mage/cards/t/TendershootDryad.java | 16 ++++++---------- .../src/mage/cards/t/TilonallisSummoner.java | 14 +++++--------- .../src/mage/cards/t/TimestreamNavigator.java | 7 ++++--- Mage.Sets/src/mage/cards/t/TwilightProphet.java | 15 ++++++--------- Mage.Sets/src/mage/cards/v/VonasHunger.java | 11 ++++++----- .../src/mage/cards/w/WaywardSwordtooth.java | 11 ++++++----- 21 files changed, 103 insertions(+), 104 deletions(-) diff --git a/Mage.Sets/src/mage/cards/d/DeadeyeBrawler.java b/Mage.Sets/src/mage/cards/d/DeadeyeBrawler.java index 88ace23bc5..96646bfe96 100644 --- a/Mage.Sets/src/mage/cards/d/DeadeyeBrawler.java +++ b/Mage.Sets/src/mage/cards/d/DeadeyeBrawler.java @@ -1,21 +1,21 @@ - package mage.cards.d; -import java.util.UUID; import mage.MageInt; import mage.abilities.common.DealsCombatDamageToAPlayerTriggeredAbility; import mage.abilities.condition.common.CitysBlessingCondition; import mage.abilities.decorator.ConditionalInterveningIfTriggeredAbility; import mage.abilities.effects.common.DrawCardSourceControllerEffect; -import mage.constants.SubType; -import mage.abilities.keyword.DeathtouchAbility; +import mage.abilities.hint.CitysBlessingHint; import mage.abilities.keyword.AscendAbility; +import mage.abilities.keyword.DeathtouchAbility; import mage.cards.CardImpl; import mage.cards.CardSetInfo; import mage.constants.CardType; +import mage.constants.SubType; + +import java.util.UUID; /** - * * @author LevelX2 */ public final class DeadeyeBrawler extends CardImpl { @@ -37,7 +37,8 @@ public final class DeadeyeBrawler extends CardImpl { // Whenever Deadeye Brawler deals combat damage to a player, if you have the city's blessing, draw a card. this.addAbility(new ConditionalInterveningIfTriggeredAbility(new DealsCombatDamageToAPlayerTriggeredAbility( new DrawCardSourceControllerEffect(1), false, false), CitysBlessingCondition.instance, - "Whenever {this} deals combat damage to a player, if you have the city's blessing, draw a card.")); + "Whenever {this} deals combat damage to a player, if you have the city's blessing, draw a card.") + .addHint(CitysBlessingHint.instance)); } diff --git a/Mage.Sets/src/mage/cards/d/DuskCharger.java b/Mage.Sets/src/mage/cards/d/DuskCharger.java index 8f807004e2..cdd43d8807 100644 --- a/Mage.Sets/src/mage/cards/d/DuskCharger.java +++ b/Mage.Sets/src/mage/cards/d/DuskCharger.java @@ -1,7 +1,5 @@ - package mage.cards.d; -import java.util.UUID; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.common.SimpleStaticAbility; @@ -9,6 +7,7 @@ import mage.abilities.condition.common.CitysBlessingCondition; import mage.abilities.decorator.ConditionalContinuousEffect; import mage.abilities.effects.ContinuousEffect; import mage.abilities.effects.common.continuous.BoostSourceEffect; +import mage.abilities.hint.CitysBlessingHint; import mage.abilities.keyword.AscendAbility; import mage.cards.CardImpl; import mage.cards.CardSetInfo; @@ -17,8 +16,9 @@ import mage.constants.Duration; import mage.constants.SubType; import mage.constants.Zone; +import java.util.UUID; + /** - * * @author LevelX2 */ public final class DuskCharger extends CardImpl { @@ -37,7 +37,7 @@ public final class DuskCharger extends CardImpl { ContinuousEffect boostSource = new BoostSourceEffect(2, 2, Duration.WhileOnBattlefield); ConditionalContinuousEffect effect = new ConditionalContinuousEffect(boostSource, CitysBlessingCondition.instance, "{this} gets +2/+2 as long as you have the city's blessing"); - Ability ability = new SimpleStaticAbility(Zone.BATTLEFIELD, effect); + Ability ability = new SimpleStaticAbility(Zone.BATTLEFIELD, effect).addHint(CitysBlessingHint.instance); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/cards/g/GoldenDemise.java b/Mage.Sets/src/mage/cards/g/GoldenDemise.java index fb6cc3f53d..8f66dfa4f1 100644 --- a/Mage.Sets/src/mage/cards/g/GoldenDemise.java +++ b/Mage.Sets/src/mage/cards/g/GoldenDemise.java @@ -1,11 +1,10 @@ - package mage.cards.g; -import java.util.UUID; import mage.abilities.condition.common.CitysBlessingCondition; import mage.abilities.decorator.ConditionalContinuousEffect; import mage.abilities.effects.common.continuous.BoostAllEffect; import mage.abilities.effects.keyword.AscendEffect; +import mage.abilities.hint.CitysBlessingHint; import mage.cards.CardImpl; import mage.cards.CardSetInfo; import mage.constants.CardType; @@ -14,8 +13,9 @@ import mage.constants.TargetController; import mage.filter.common.FilterCreaturePermanent; import mage.filter.predicate.permanent.ControllerPredicate; +import java.util.UUID; + /** - * * @author LevelX2 */ public final class GoldenDemise extends CardImpl { @@ -35,6 +35,7 @@ public final class GoldenDemise extends CardImpl { CitysBlessingCondition.instance, "All creatures get -2/-2 until end of turn. If you have the city's blessing, instead only creatures your opponents control get -2/-2 until end of turn" )); + this.getSpellAbility().addHint(CitysBlessingHint.instance); } public GoldenDemise(final GoldenDemise card) { diff --git a/Mage.Sets/src/mage/cards/k/KumenasAwakening.java b/Mage.Sets/src/mage/cards/k/KumenasAwakening.java index 0dfc5df142..5a8b18b567 100644 --- a/Mage.Sets/src/mage/cards/k/KumenasAwakening.java +++ b/Mage.Sets/src/mage/cards/k/KumenasAwakening.java @@ -1,20 +1,20 @@ - package mage.cards.k; -import java.util.UUID; import mage.abilities.common.BeginningOfUpkeepTriggeredAbility; import mage.abilities.condition.common.CitysBlessingCondition; import mage.abilities.decorator.ConditionalOneShotEffect; import mage.abilities.effects.common.DrawCardAllEffect; import mage.abilities.effects.common.DrawCardSourceControllerEffect; +import mage.abilities.hint.CitysBlessingHint; import mage.abilities.keyword.AscendAbility; import mage.cards.CardImpl; import mage.cards.CardSetInfo; import mage.constants.CardType; import mage.constants.TargetController; +import java.util.UUID; + /** - * * @author LevelX2 */ public final class KumenasAwakening extends CardImpl { @@ -29,7 +29,8 @@ public final class KumenasAwakening extends CardImpl { this.addAbility(new BeginningOfUpkeepTriggeredAbility( new ConditionalOneShotEffect(new DrawCardSourceControllerEffect(1), new DrawCardAllEffect(1), CitysBlessingCondition.instance, "each player draws a card. If you have the city's blessing, instead only you draw a card"), - TargetController.YOU, false)); + TargetController.YOU, false) + .addHint(CitysBlessingHint.instance)); } public KumenasAwakening(final KumenasAwakening card) { diff --git a/Mage.Sets/src/mage/cards/m/MausoleumHarpy.java b/Mage.Sets/src/mage/cards/m/MausoleumHarpy.java index 8c17f8b06a..60569f87a0 100644 --- a/Mage.Sets/src/mage/cards/m/MausoleumHarpy.java +++ b/Mage.Sets/src/mage/cards/m/MausoleumHarpy.java @@ -1,12 +1,11 @@ - package mage.cards.m; -import java.util.UUID; import mage.MageInt; import mage.abilities.common.DiesCreatureTriggeredAbility; import mage.abilities.condition.common.CitysBlessingCondition; import mage.abilities.decorator.ConditionalInterveningIfTriggeredAbility; import mage.abilities.effects.common.counter.AddCountersSourceEffect; +import mage.abilities.hint.CitysBlessingHint; import mage.abilities.keyword.AscendAbility; import mage.abilities.keyword.FlyingAbility; import mage.cards.CardImpl; @@ -19,8 +18,9 @@ import mage.filter.common.FilterCreaturePermanent; import mage.filter.predicate.permanent.AnotherPredicate; import mage.filter.predicate.permanent.ControllerPredicate; +import java.util.UUID; + /** - * * @author LevelX2 */ public final class MausoleumHarpy extends CardImpl { @@ -49,7 +49,8 @@ public final class MausoleumHarpy extends CardImpl { this.addAbility(new ConditionalInterveningIfTriggeredAbility( new DiesCreatureTriggeredAbility(new AddCountersSourceEffect(CounterType.P1P1.createInstance()), false, filter), CitysBlessingCondition.instance, - "Whenever another creature you control dies, if you have the city's blessing, put a +1/+1 counter on {this}. ")); + "Whenever another creature you control dies, if you have the city's blessing, put a +1/+1 counter on {this}. ") + .addHint(CitysBlessingHint.instance)); } diff --git a/Mage.Sets/src/mage/cards/o/OrazcaRelic.java b/Mage.Sets/src/mage/cards/o/OrazcaRelic.java index 51bc961bfc..02eb0e04c9 100644 --- a/Mage.Sets/src/mage/cards/o/OrazcaRelic.java +++ b/Mage.Sets/src/mage/cards/o/OrazcaRelic.java @@ -1,7 +1,5 @@ - package mage.cards.o; -import java.util.UUID; import mage.abilities.Ability; import mage.abilities.condition.common.CitysBlessingCondition; import mage.abilities.costs.common.SacrificeSourceCost; @@ -9,6 +7,7 @@ import mage.abilities.costs.common.TapSourceCost; import mage.abilities.decorator.ConditionalActivatedAbility; import mage.abilities.effects.common.DrawCardSourceControllerEffect; import mage.abilities.effects.common.GainLifeEffect; +import mage.abilities.hint.CitysBlessingHint; import mage.abilities.keyword.AscendAbility; import mage.abilities.mana.ColorlessManaAbility; import mage.cards.CardImpl; @@ -16,8 +15,9 @@ import mage.cards.CardSetInfo; import mage.constants.CardType; import mage.constants.Zone; +import java.util.UUID; + /** - * * @author LevelX2 */ public final class OrazcaRelic extends CardImpl { @@ -37,7 +37,8 @@ public final class OrazcaRelic extends CardImpl { new TapSourceCost(), CitysBlessingCondition.instance); ability.addCost(new SacrificeSourceCost()); - ability.addEffect(new DrawCardSourceControllerEffect(1).setText("and draw a card")); + ability.addEffect(new DrawCardSourceControllerEffect(1).concatBy("and")); + ability.addHint(CitysBlessingHint.instance); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/cards/p/PrideOfConquerors.java b/Mage.Sets/src/mage/cards/p/PrideOfConquerors.java index ae0e67a2e4..91af34fcf0 100644 --- a/Mage.Sets/src/mage/cards/p/PrideOfConquerors.java +++ b/Mage.Sets/src/mage/cards/p/PrideOfConquerors.java @@ -1,18 +1,18 @@ - package mage.cards.p; -import java.util.UUID; import mage.abilities.condition.common.CitysBlessingCondition; import mage.abilities.decorator.ConditionalContinuousEffect; import mage.abilities.effects.common.continuous.BoostControlledEffect; import mage.abilities.effects.keyword.AscendEffect; +import mage.abilities.hint.CitysBlessingHint; import mage.cards.CardImpl; import mage.cards.CardSetInfo; import mage.constants.CardType; import mage.constants.Duration; +import java.util.UUID; + /** - * * @author LevelX2 */ public final class PrideOfConquerors extends CardImpl { @@ -27,6 +27,7 @@ public final class PrideOfConquerors extends CardImpl { this.getSpellAbility().addEffect(new ConditionalContinuousEffect(new BoostControlledEffect(2, 2, Duration.EndOfTurn), new BoostControlledEffect(1, 1, Duration.EndOfTurn), CitysBlessingCondition.instance, "Creatures you control get +1/+1 until end of turn. If you have the city's blessing, those creatures get +2/+2 until end of turn instead")); + this.getSpellAbility().addHint(CitysBlessingHint.instance); } public PrideOfConquerors(final PrideOfConquerors card) { diff --git a/Mage.Sets/src/mage/cards/r/RadiantDestiny.java b/Mage.Sets/src/mage/cards/r/RadiantDestiny.java index f008dc39c4..f6a15800bf 100644 --- a/Mage.Sets/src/mage/cards/r/RadiantDestiny.java +++ b/Mage.Sets/src/mage/cards/r/RadiantDestiny.java @@ -1,7 +1,5 @@ - package mage.cards.r; -import java.util.UUID; import mage.abilities.Ability; import mage.abilities.common.AsEntersBattlefieldAbility; import mage.abilities.common.SimpleStaticAbility; @@ -11,21 +9,20 @@ import mage.abilities.effects.ContinuousEffect; import mage.abilities.effects.common.ChooseCreatureTypeEffect; import mage.abilities.effects.common.continuous.BoostAllOfChosenSubtypeEffect; import mage.abilities.effects.common.continuous.GainAbilityAllOfChosenSubtypeEffect; +import mage.abilities.hint.CitysBlessingHint; import mage.abilities.keyword.AscendAbility; import mage.abilities.keyword.VigilanceAbility; import mage.cards.CardImpl; import mage.cards.CardSetInfo; -import mage.constants.CardType; -import mage.constants.Duration; -import mage.constants.Outcome; -import mage.constants.TargetController; -import mage.constants.Zone; -import static mage.filter.StaticFilters.FILTER_PERMANENT_CREATURES_CONTROLLED; +import mage.constants.*; import mage.filter.common.FilterCreaturePermanent; import mage.filter.predicate.permanent.ControllerPredicate; +import java.util.UUID; + +import static mage.filter.StaticFilters.FILTER_PERMANENT_CREATURES_CONTROLLED; + /** - * * @author LevelX2 */ public final class RadiantDestiny extends CardImpl { @@ -52,6 +49,7 @@ public final class RadiantDestiny extends CardImpl { CitysBlessingCondition.instance, "As long as you have the city's blessing, they also have vigilance."); ability.addEffect(effect); + ability.addHint(CitysBlessingHint.instance); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/cards/r/ResplendentGriffin.java b/Mage.Sets/src/mage/cards/r/ResplendentGriffin.java index eb2ca73672..a0aa13d763 100644 --- a/Mage.Sets/src/mage/cards/r/ResplendentGriffin.java +++ b/Mage.Sets/src/mage/cards/r/ResplendentGriffin.java @@ -1,12 +1,11 @@ - package mage.cards.r; -import java.util.UUID; import mage.MageInt; import mage.abilities.common.AttacksTriggeredAbility; import mage.abilities.condition.common.CitysBlessingCondition; import mage.abilities.decorator.ConditionalInterveningIfTriggeredAbility; import mage.abilities.effects.common.counter.AddCountersSourceEffect; +import mage.abilities.hint.CitysBlessingHint; import mage.abilities.keyword.AscendAbility; import mage.abilities.keyword.FlyingAbility; import mage.cards.CardImpl; @@ -15,8 +14,9 @@ import mage.constants.CardType; import mage.constants.SubType; import mage.counters.CounterType; +import java.util.UUID; + /** - * * @author LevelX2 */ public final class ResplendentGriffin extends CardImpl { @@ -37,7 +37,8 @@ public final class ResplendentGriffin extends CardImpl { // Whenever Resplendent Griffin attacks, if you have the city's blessing, put a +1/+1 counter on it. this.addAbility(new ConditionalInterveningIfTriggeredAbility(new AttacksTriggeredAbility( new AddCountersSourceEffect(CounterType.P1P1.createInstance()), false), CitysBlessingCondition.instance, - "Whenever {this} attacks, if you have the city's blessing, put a +1/+1 counter on it.")); + "Whenever {this} attacks, if you have the city's blessing, put a +1/+1 counter on it.") + .addHint(CitysBlessingHint.instance)); } public ResplendentGriffin(final ResplendentGriffin card) { diff --git a/Mage.Sets/src/mage/cards/s/SecretsOfTheGoldenCity.java b/Mage.Sets/src/mage/cards/s/SecretsOfTheGoldenCity.java index 03e1500255..b5a4aa74d2 100644 --- a/Mage.Sets/src/mage/cards/s/SecretsOfTheGoldenCity.java +++ b/Mage.Sets/src/mage/cards/s/SecretsOfTheGoldenCity.java @@ -1,17 +1,17 @@ - package mage.cards.s; -import java.util.UUID; import mage.abilities.condition.common.CitysBlessingCondition; import mage.abilities.decorator.ConditionalOneShotEffect; import mage.abilities.effects.common.DrawCardSourceControllerEffect; import mage.abilities.effects.keyword.AscendEffect; +import mage.abilities.hint.CitysBlessingHint; import mage.cards.CardImpl; import mage.cards.CardSetInfo; import mage.constants.CardType; +import java.util.UUID; + /** - * * @author LevelX2 */ public final class SecretsOfTheGoldenCity extends CardImpl { @@ -28,6 +28,7 @@ public final class SecretsOfTheGoldenCity extends CardImpl { new DrawCardSourceControllerEffect(2), CitysBlessingCondition.instance, "Draw two cards. If you have the city's blessing, draw three cards instead")); + this.getSpellAbility().addHint(CitysBlessingHint.instance); } public SecretsOfTheGoldenCity(final SecretsOfTheGoldenCity card) { diff --git a/Mage.Sets/src/mage/cards/s/SkymarcherAspirant.java b/Mage.Sets/src/mage/cards/s/SkymarcherAspirant.java index 94095c759b..815388d9a7 100644 --- a/Mage.Sets/src/mage/cards/s/SkymarcherAspirant.java +++ b/Mage.Sets/src/mage/cards/s/SkymarcherAspirant.java @@ -1,7 +1,5 @@ - package mage.cards.s; -import java.util.UUID; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.common.SimpleStaticAbility; @@ -9,6 +7,7 @@ import mage.abilities.condition.common.CitysBlessingCondition; import mage.abilities.decorator.ConditionalContinuousEffect; import mage.abilities.effects.ContinuousEffect; import mage.abilities.effects.common.continuous.GainAbilitySourceEffect; +import mage.abilities.hint.CitysBlessingHint; import mage.abilities.keyword.AscendAbility; import mage.abilities.keyword.FlyingAbility; import mage.cards.CardImpl; @@ -18,8 +17,9 @@ import mage.constants.Duration; import mage.constants.SubType; import mage.constants.Zone; +import java.util.UUID; + /** - * * @author LevelX2 */ public final class SkymarcherAspirant extends CardImpl { @@ -39,7 +39,7 @@ public final class SkymarcherAspirant extends CardImpl { ContinuousEffect boostSource = new GainAbilitySourceEffect(FlyingAbility.getInstance(), Duration.WhileOnBattlefield); ConditionalContinuousEffect effect = new ConditionalContinuousEffect(boostSource, CitysBlessingCondition.instance, "{this} has flying as long as you have the city's blessing"); - Ability ability = new SimpleStaticAbility(Zone.BATTLEFIELD, effect); + Ability ability = new SimpleStaticAbility(Zone.BATTLEFIELD, effect).addHint(CitysBlessingHint.instance); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/cards/s/SlipperyScoundrel.java b/Mage.Sets/src/mage/cards/s/SlipperyScoundrel.java index 3476f5f56f..b9e0659576 100644 --- a/Mage.Sets/src/mage/cards/s/SlipperyScoundrel.java +++ b/Mage.Sets/src/mage/cards/s/SlipperyScoundrel.java @@ -1,7 +1,5 @@ - package mage.cards.s; -import java.util.UUID; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.common.SimpleStaticAbility; @@ -13,6 +11,7 @@ import mage.abilities.effects.Effect; import mage.abilities.effects.RestrictionEffect; import mage.abilities.effects.common.combat.CantBeBlockedSourceEffect; import mage.abilities.effects.common.continuous.GainAbilitySourceEffect; +import mage.abilities.hint.CitysBlessingHint; import mage.abilities.keyword.AscendAbility; import mage.abilities.keyword.HexproofAbility; import mage.cards.CardImpl; @@ -22,8 +21,9 @@ import mage.constants.Duration; import mage.constants.SubType; import mage.constants.Zone; +import java.util.UUID; + /** - * * @author LevelX2 */ public final class SlipperyScoundrel extends CardImpl { @@ -48,6 +48,7 @@ public final class SlipperyScoundrel extends CardImpl { Effect effect2 = new ConditionalRestrictionEffect(restrictionEffect, CitysBlessingCondition.instance) .setText("and can't be blocked"); ability.addEffect(effect2); + ability.addHint(CitysBlessingHint.instance); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/cards/s/SnubhornSentry.java b/Mage.Sets/src/mage/cards/s/SnubhornSentry.java index c573af3009..1adcf87637 100644 --- a/Mage.Sets/src/mage/cards/s/SnubhornSentry.java +++ b/Mage.Sets/src/mage/cards/s/SnubhornSentry.java @@ -1,7 +1,5 @@ - package mage.cards.s; -import java.util.UUID; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.common.SimpleStaticAbility; @@ -9,6 +7,7 @@ import mage.abilities.condition.common.CitysBlessingCondition; import mage.abilities.decorator.ConditionalContinuousEffect; import mage.abilities.effects.ContinuousEffect; import mage.abilities.effects.common.continuous.BoostSourceEffect; +import mage.abilities.hint.CitysBlessingHint; import mage.abilities.keyword.AscendAbility; import mage.cards.CardImpl; import mage.cards.CardSetInfo; @@ -17,8 +16,9 @@ import mage.constants.Duration; import mage.constants.SubType; import mage.constants.Zone; +import java.util.UUID; + /** - * * @author LevelX2 */ public final class SnubhornSentry extends CardImpl { @@ -37,7 +37,7 @@ public final class SnubhornSentry extends CardImpl { ContinuousEffect boostSource = new BoostSourceEffect(3, 0, Duration.WhileOnBattlefield); ConditionalContinuousEffect effect = new ConditionalContinuousEffect(boostSource, CitysBlessingCondition.instance, "{this} gets +3/+0 as long as you have the city's blessing"); - Ability ability = new SimpleStaticAbility(Zone.BATTLEFIELD, effect); + Ability ability = new SimpleStaticAbility(Zone.BATTLEFIELD, effect).addHint(CitysBlessingHint.instance); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/cards/s/SpireWinder.java b/Mage.Sets/src/mage/cards/s/SpireWinder.java index bf4965e077..1c39748f03 100644 --- a/Mage.Sets/src/mage/cards/s/SpireWinder.java +++ b/Mage.Sets/src/mage/cards/s/SpireWinder.java @@ -1,7 +1,5 @@ - package mage.cards.s; -import java.util.UUID; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.common.SimpleStaticAbility; @@ -9,6 +7,7 @@ import mage.abilities.condition.common.CitysBlessingCondition; import mage.abilities.decorator.ConditionalContinuousEffect; import mage.abilities.effects.ContinuousEffect; import mage.abilities.effects.common.continuous.BoostSourceEffect; +import mage.abilities.hint.CitysBlessingHint; import mage.abilities.keyword.AscendAbility; import mage.abilities.keyword.FlyingAbility; import mage.cards.CardImpl; @@ -18,8 +17,9 @@ import mage.constants.Duration; import mage.constants.SubType; import mage.constants.Zone; +import java.util.UUID; + /** - * * @author LevelX2 */ public final class SpireWinder extends CardImpl { @@ -41,7 +41,7 @@ public final class SpireWinder extends CardImpl { ContinuousEffect boostSource = new BoostSourceEffect(1, 1, Duration.WhileOnBattlefield); ConditionalContinuousEffect effect = new ConditionalContinuousEffect(boostSource, CitysBlessingCondition.instance, "{this} gets +1/+1 as long as you have the city's blessing"); - Ability ability = new SimpleStaticAbility(Zone.BATTLEFIELD, effect); + Ability ability = new SimpleStaticAbility(Zone.BATTLEFIELD, effect).addHint(CitysBlessingHint.instance); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/cards/s/StormFleetSwashbuckler.java b/Mage.Sets/src/mage/cards/s/StormFleetSwashbuckler.java index bfcb93d8e4..c615fee18c 100644 --- a/Mage.Sets/src/mage/cards/s/StormFleetSwashbuckler.java +++ b/Mage.Sets/src/mage/cards/s/StormFleetSwashbuckler.java @@ -1,7 +1,5 @@ - package mage.cards.s; -import java.util.UUID; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.common.SimpleStaticAbility; @@ -9,6 +7,7 @@ import mage.abilities.condition.common.CitysBlessingCondition; import mage.abilities.decorator.ConditionalContinuousEffect; import mage.abilities.effects.ContinuousEffect; import mage.abilities.effects.common.continuous.GainAbilitySourceEffect; +import mage.abilities.hint.CitysBlessingHint; import mage.abilities.keyword.AscendAbility; import mage.abilities.keyword.DoubleStrikeAbility; import mage.cards.CardImpl; @@ -18,8 +17,9 @@ import mage.constants.Duration; import mage.constants.SubType; import mage.constants.Zone; +import java.util.UUID; + /** - * * @author LevelX2 */ public final class StormFleetSwashbuckler extends CardImpl { @@ -39,7 +39,7 @@ public final class StormFleetSwashbuckler extends CardImpl { ContinuousEffect boostSource = new GainAbilitySourceEffect(DoubleStrikeAbility.getInstance(), Duration.WhileOnBattlefield); ConditionalContinuousEffect effect = new ConditionalContinuousEffect(boostSource, CitysBlessingCondition.instance, "{this} has double strike as long as you have the city's blessing"); - Ability ability = new SimpleStaticAbility(Zone.BATTLEFIELD, effect); + Ability ability = new SimpleStaticAbility(Zone.BATTLEFIELD, effect).addHint(CitysBlessingHint.instance); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/cards/t/TendershootDryad.java b/Mage.Sets/src/mage/cards/t/TendershootDryad.java index 44e27ae9d1..7cf549bd03 100644 --- a/Mage.Sets/src/mage/cards/t/TendershootDryad.java +++ b/Mage.Sets/src/mage/cards/t/TendershootDryad.java @@ -1,7 +1,5 @@ - package mage.cards.t; -import java.util.UUID; import mage.MageInt; import mage.abilities.common.BeginningOfUpkeepTriggeredAbility; import mage.abilities.common.SimpleStaticAbility; @@ -9,21 +7,19 @@ import mage.abilities.condition.common.CitysBlessingCondition; import mage.abilities.decorator.ConditionalContinuousEffect; import mage.abilities.effects.common.CreateTokenEffect; import mage.abilities.effects.common.continuous.BoostControlledEffect; +import mage.abilities.hint.CitysBlessingHint; import mage.abilities.keyword.AscendAbility; import mage.cards.CardImpl; import mage.cards.CardSetInfo; -import mage.constants.CardType; -import mage.constants.Duration; -import mage.constants.SubType; -import mage.constants.TargetController; -import mage.constants.Zone; +import mage.constants.*; import mage.filter.common.FilterCreaturePermanent; import mage.filter.predicate.mageobject.SubtypePredicate; import mage.filter.predicate.permanent.ControllerPredicate; import mage.game.permanent.token.SaprolingToken; +import java.util.UUID; + /** - * * @author LevelX2 */ public final class TendershootDryad extends CardImpl { @@ -55,8 +51,8 @@ public final class TendershootDryad extends CardImpl { new BoostControlledEffect(2, 2, Duration.WhileOnBattlefield, filter), CitysBlessingCondition.instance, "Saprolings you control get +2/+2 as long as you have the city's blessing." - ) - )); + )) + .addHint(CitysBlessingHint.instance)); } public TendershootDryad(final TendershootDryad card) { diff --git a/Mage.Sets/src/mage/cards/t/TilonallisSummoner.java b/Mage.Sets/src/mage/cards/t/TilonallisSummoner.java index a9082d7749..d594c21dba 100644 --- a/Mage.Sets/src/mage/cards/t/TilonallisSummoner.java +++ b/Mage.Sets/src/mage/cards/t/TilonallisSummoner.java @@ -1,7 +1,5 @@ - package mage.cards.t; -import java.util.UUID; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.common.AttacksTriggeredAbility; @@ -15,22 +13,20 @@ import mage.abilities.effects.Effect; import mage.abilities.effects.OneShotEffect; import mage.abilities.effects.common.CreateTokenEffect; import mage.abilities.effects.common.ExileTargetEffect; +import mage.abilities.hint.CitysBlessingHint; import mage.abilities.keyword.AscendAbility; import mage.cards.CardImpl; import mage.cards.CardSetInfo; import mage.cards.CardsImpl; -import mage.constants.CardType; -import mage.constants.Outcome; -import mage.constants.SubType; -import mage.constants.TargetController; -import mage.constants.Zone; +import mage.constants.*; import mage.game.Game; import mage.game.permanent.token.TilonallisSummonerElementalToken; import mage.players.Player; import mage.target.targetpointer.FixedTargets; +import java.util.UUID; + /** - * * @author LevelX2 */ public final class TilonallisSummoner extends CardImpl { @@ -47,7 +43,7 @@ public final class TilonallisSummoner extends CardImpl { this.addAbility(new AscendAbility()); // Whenever Tilonalli's Summoner attacks, you may pay {X}{R}. If you do, create X 1/1 red Elemental creature tokens that are tapped and attacking. At the beginning of the next end step, exile those tokens unless you have the city's blessing. - this.addAbility(new AttacksTriggeredAbility(new TilonallisSummonerEffect(), false)); + this.addAbility(new AttacksTriggeredAbility(new TilonallisSummonerEffect(), false).addHint(CitysBlessingHint.instance)); } public TilonallisSummoner(final TilonallisSummoner card) { diff --git a/Mage.Sets/src/mage/cards/t/TimestreamNavigator.java b/Mage.Sets/src/mage/cards/t/TimestreamNavigator.java index dcc7ad3574..f882c8ef28 100644 --- a/Mage.Sets/src/mage/cards/t/TimestreamNavigator.java +++ b/Mage.Sets/src/mage/cards/t/TimestreamNavigator.java @@ -1,7 +1,5 @@ - package mage.cards.t; -import java.util.UUID; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.condition.common.CitysBlessingCondition; @@ -10,6 +8,7 @@ import mage.abilities.costs.common.TapSourceCost; import mage.abilities.costs.mana.ManaCostsImpl; import mage.abilities.decorator.ConditionalActivatedAbility; import mage.abilities.effects.common.turn.AddExtraTurnControllerEffect; +import mage.abilities.hint.CitysBlessingHint; import mage.abilities.keyword.AscendAbility; import mage.cards.CardImpl; import mage.cards.CardSetInfo; @@ -17,8 +16,9 @@ import mage.constants.CardType; import mage.constants.SubType; import mage.constants.Zone; +import java.util.UUID; + /** - * * @author LevelX2 */ public final class TimestreamNavigator extends CardImpl { @@ -42,6 +42,7 @@ public final class TimestreamNavigator extends CardImpl { CitysBlessingCondition.instance); ability.addCost(new TapSourceCost()); ability.addCost(new PutSourceOnBottomOwnerLibraryCost()); + ability.addHint(CitysBlessingHint.instance); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/cards/t/TwilightProphet.java b/Mage.Sets/src/mage/cards/t/TwilightProphet.java index cced90fe5d..ce27b12e1e 100644 --- a/Mage.Sets/src/mage/cards/t/TwilightProphet.java +++ b/Mage.Sets/src/mage/cards/t/TwilightProphet.java @@ -1,7 +1,5 @@ - package mage.cards.t; -import java.util.UUID; import mage.MageInt; import mage.MageObject; import mage.abilities.Ability; @@ -10,22 +8,20 @@ import mage.abilities.condition.common.CitysBlessingCondition; import mage.abilities.decorator.ConditionalInterveningIfTriggeredAbility; import mage.abilities.effects.OneShotEffect; import mage.abilities.effects.common.LoseLifeOpponentsEffect; +import mage.abilities.hint.CitysBlessingHint; import mage.abilities.keyword.AscendAbility; import mage.abilities.keyword.FlyingAbility; import mage.cards.Card; import mage.cards.CardImpl; import mage.cards.CardSetInfo; import mage.cards.CardsImpl; -import mage.constants.CardType; -import mage.constants.Outcome; -import mage.constants.SubType; -import mage.constants.TargetController; -import mage.constants.Zone; +import mage.constants.*; import mage.game.Game; import mage.players.Player; +import java.util.UUID; + /** - * * @author LevelX2 */ public final class TwilightProphet extends CardImpl { @@ -49,7 +45,8 @@ public final class TwilightProphet extends CardImpl { this.addAbility(new ConditionalInterveningIfTriggeredAbility(new BeginningOfUpkeepTriggeredAbility( new TwilightProphetEffect(), TargetController.YOU, false), CitysBlessingCondition.instance, "At the beginning of your upkeep, if you have the city's blessing, reveal the top card of your library and put it into your hand." - + "Each opponent loses X life and you gain X life, where X is that card's converted mana cost.")); + + "Each opponent loses X life and you gain X life, where X is that card's converted mana cost.") + .addHint(CitysBlessingHint.instance)); } diff --git a/Mage.Sets/src/mage/cards/v/VonasHunger.java b/Mage.Sets/src/mage/cards/v/VonasHunger.java index 07e06bb034..4bc1bbb88b 100644 --- a/Mage.Sets/src/mage/cards/v/VonasHunger.java +++ b/Mage.Sets/src/mage/cards/v/VonasHunger.java @@ -1,9 +1,5 @@ - package mage.cards.v; -import java.util.ArrayList; -import java.util.List; -import java.util.UUID; import mage.abilities.Ability; import mage.abilities.condition.InvertCondition; import mage.abilities.condition.common.CitysBlessingCondition; @@ -11,6 +7,7 @@ import mage.abilities.decorator.ConditionalOneShotEffect; import mage.abilities.effects.OneShotEffect; import mage.abilities.effects.common.SacrificeOpponentsEffect; import mage.abilities.effects.keyword.AscendEffect; +import mage.abilities.hint.CitysBlessingHint; import mage.cards.CardImpl; import mage.cards.CardSetInfo; import mage.constants.CardType; @@ -21,8 +18,11 @@ import mage.game.permanent.Permanent; import mage.players.Player; import mage.target.TargetPermanent; +import java.util.ArrayList; +import java.util.List; +import java.util.UUID; + /** - * * @author LevelX2 */ public final class VonasHunger extends CardImpl { @@ -43,6 +43,7 @@ public final class VonasHunger extends CardImpl { new VonasHungerEffect(), CitysBlessingCondition.instance, "If you have the city's blessing, instead each opponent sacrifices half the creatures he or she controls rounded up")); + this.getSpellAbility().addHint(CitysBlessingHint.instance); } public VonasHunger(final VonasHunger card) { diff --git a/Mage.Sets/src/mage/cards/w/WaywardSwordtooth.java b/Mage.Sets/src/mage/cards/w/WaywardSwordtooth.java index f26adf2969..a64e65d4e2 100644 --- a/Mage.Sets/src/mage/cards/w/WaywardSwordtooth.java +++ b/Mage.Sets/src/mage/cards/w/WaywardSwordtooth.java @@ -1,12 +1,11 @@ - package mage.cards.w; -import java.util.UUID; import mage.MageInt; import mage.abilities.common.SimpleStaticAbility; import mage.abilities.condition.common.CitysBlessingCondition; import mage.abilities.effects.common.combat.CantAttackBlockUnlessConditionSourceEffect; import mage.abilities.effects.common.continuous.PlayAdditionalLandsControllerEffect; +import mage.abilities.hint.CitysBlessingHint; import mage.abilities.keyword.AscendAbility; import mage.cards.CardImpl; import mage.cards.CardSetInfo; @@ -15,8 +14,9 @@ import mage.constants.Duration; import mage.constants.SubType; import mage.constants.Zone; +import java.util.UUID; + /** - * * @author LevelX2 */ public final class WaywardSwordtooth extends CardImpl { @@ -36,8 +36,9 @@ public final class WaywardSwordtooth extends CardImpl { new PlayAdditionalLandsControllerEffect(1, Duration.WhileOnBattlefield))); // Wayward Sawtooth can't attack or block unless you have the city's blessing. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new CantAttackBlockUnlessConditionSourceEffect(CitysBlessingCondition.instance))); - + this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new CantAttackBlockUnlessConditionSourceEffect(CitysBlessingCondition.instance)) + .addHint(CitysBlessingHint.instance) + ); } public WaywardSwordtooth(final WaywardSwordtooth card) {