diff --git a/Mage.Sets/src/mage/cards/a/AidFromTheCowl.java b/Mage.Sets/src/mage/cards/a/AidFromTheCowl.java
index 566daa5011e..9f9278c3691 100644
--- a/Mage.Sets/src/mage/cards/a/AidFromTheCowl.java
+++ b/Mage.Sets/src/mage/cards/a/AidFromTheCowl.java
@@ -1,4 +1,3 @@
-
package mage.cards.a;
import java.util.UUID;
@@ -33,7 +32,7 @@ public final class AidFromTheCowl extends CardImpl {
// Revolt — At the beginning of your end step, if a permanent you controlled left the battlefield this turn,
// reveal the top card of your library. If it is a permanent card, you may put it onto the battlefield. Otherwise, put it on the bottom of your library.
TriggeredAbility ability = new BeginningOfYourEndStepTriggeredAbility(new AidFromTheCowlEffect(), false);
- this.addAbility(new ConditionalInterveningIfTriggeredAbility(ability, RevoltCondition.instance, ruleText), new RevoltWatcher());
+ this.addAbility(new ConditionalInterveningIfTriggeredAbility(ability, RevoltCondition.instance, ruleText).addHint(RevoltCondition.getHint()), new RevoltWatcher());
}
private AidFromTheCowl(final AidFromTheCowl card) {
diff --git a/Mage.Sets/src/mage/cards/a/AirdropAeronauts.java b/Mage.Sets/src/mage/cards/a/AirdropAeronauts.java
index d62249d4086..de1068c27f3 100644
--- a/Mage.Sets/src/mage/cards/a/AirdropAeronauts.java
+++ b/Mage.Sets/src/mage/cards/a/AirdropAeronauts.java
@@ -39,7 +39,7 @@ public final class AirdropAeronauts extends CardImpl {
"if a permanent you controlled left the battlefield this turn, you gain 5 life."
);
ability.setAbilityWord(AbilityWord.REVOLT);
- this.addAbility(ability, new RevoltWatcher());
+ this.addAbility(ability.addHint(RevoltCondition.getHint()), new RevoltWatcher());
}
private AirdropAeronauts(final AirdropAeronauts card) {
diff --git a/Mage.Sets/src/mage/cards/c/CallForUnity.java b/Mage.Sets/src/mage/cards/c/CallForUnity.java
index 0a63ee94500..912c1528dfe 100644
--- a/Mage.Sets/src/mage/cards/c/CallForUnity.java
+++ b/Mage.Sets/src/mage/cards/c/CallForUnity.java
@@ -34,7 +34,7 @@ public final class CallForUnity extends CardImpl {
// Revolt — At the beginning of your end step, if a permanent you controlled left the battlefield this turn, put a unity counter on Call for Unity.
TriggeredAbility ability = new BeginningOfYourEndStepTriggeredAbility(new AddCountersSourceEffect(CounterType.UNITY.createInstance(), true), false);
- this.addAbility(new ConditionalInterveningIfTriggeredAbility(ability, RevoltCondition.instance, ruleText), new RevoltWatcher());
+ this.addAbility(new ConditionalInterveningIfTriggeredAbility(ability, RevoltCondition.instance, ruleText).addHint(RevoltCondition.getHint()), new RevoltWatcher());
// Creatures you control get +1/+1 for each unity counter on Call for Unity.
Effect effect = new BoostControlledEffect(new CountersSourceCount(CounterType.UNITY), new CountersSourceCount(CounterType.UNITY), Duration.WhileOnBattlefield,
diff --git a/Mage.Sets/src/mage/cards/c/CountlessGearsRenegade.java b/Mage.Sets/src/mage/cards/c/CountlessGearsRenegade.java
index 96974b33217..9ff37ff9a3b 100644
--- a/Mage.Sets/src/mage/cards/c/CountlessGearsRenegade.java
+++ b/Mage.Sets/src/mage/cards/c/CountlessGearsRenegade.java
@@ -37,7 +37,7 @@ public final class CountlessGearsRenegade extends CardImpl {
"left the battlefield this turn, create a 1/1 colorless Servo artifact creature token."
);
ability.setAbilityWord(AbilityWord.REVOLT);
- this.addAbility(ability, new RevoltWatcher());
+ this.addAbility(ability.addHint(RevoltCondition.getHint()), new RevoltWatcher());
}
private CountlessGearsRenegade(final CountlessGearsRenegade card) {
diff --git a/Mage.Sets/src/mage/cards/d/DeadeyeHarpooner.java b/Mage.Sets/src/mage/cards/d/DeadeyeHarpooner.java
index f6912f11f9d..0575f36dde6 100644
--- a/Mage.Sets/src/mage/cards/d/DeadeyeHarpooner.java
+++ b/Mage.Sets/src/mage/cards/d/DeadeyeHarpooner.java
@@ -47,7 +47,7 @@ public final class DeadeyeHarpooner extends CardImpl {
);
ability.setAbilityWord(AbilityWord.REVOLT);
ability.addTarget(new TargetPermanent(filter));
- this.addAbility(ability, new RevoltWatcher());
+ this.addAbility(ability.addHint(RevoltCondition.getHint()), new RevoltWatcher());
}
private DeadeyeHarpooner(final DeadeyeHarpooner card) {
diff --git a/Mage.Sets/src/mage/cards/d/Decommission.java b/Mage.Sets/src/mage/cards/d/Decommission.java
index f1b2d55a774..147fe2d959a 100644
--- a/Mage.Sets/src/mage/cards/d/Decommission.java
+++ b/Mage.Sets/src/mage/cards/d/Decommission.java
@@ -30,6 +30,7 @@ public final class Decommission extends CardImpl {
// Revolt — If a permanent you controlled left the battlefield this turn, you gain 3 life.
this.getSpellAbility().addEffect(new ConditionalOneShotEffect(new GainLifeEffect(3), RevoltCondition.instance, "
Revolt — If a permanent you controlled left the battlefield this turn, you gain 3 life."));
this.getSpellAbility().addWatcher(new RevoltWatcher());
+ this.getSpellAbility().addHint(RevoltCondition.getHint());
}
private Decommission(final Decommission card) {
diff --git a/Mage.Sets/src/mage/cards/f/FatalPush.java b/Mage.Sets/src/mage/cards/f/FatalPush.java
index a8a5280070f..19452081f46 100644
--- a/Mage.Sets/src/mage/cards/f/FatalPush.java
+++ b/Mage.Sets/src/mage/cards/f/FatalPush.java
@@ -29,6 +29,7 @@ public final class FatalPush extends CardImpl {
this.getSpellAbility().addEffect(new FatalPushEffect());
this.getSpellAbility().addWatcher(new RevoltWatcher());
this.getSpellAbility().addTarget(new TargetCreaturePermanent());
+ this.getSpellAbility().addHint(RevoltCondition.getHint());
}
private FatalPush(final FatalPush card) {
diff --git a/Mage.Sets/src/mage/cards/g/GreenwheelLiberator.java b/Mage.Sets/src/mage/cards/g/GreenwheelLiberator.java
index 560f85dc0da..34ddf1dcbd5 100644
--- a/Mage.Sets/src/mage/cards/g/GreenwheelLiberator.java
+++ b/Mage.Sets/src/mage/cards/g/GreenwheelLiberator.java
@@ -33,7 +33,7 @@ public final class GreenwheelLiberator extends CardImpl {
new AddCountersSourceEffect(CounterType.P1P1.createInstance(2)), false, RevoltCondition.instance,
"Revolt — {this} enters the battlefield with two +1/+1 counters on it if a permanent you controlled left the battlefield this turn.", null);
ability.addWatcher(new RevoltWatcher());
- this.addAbility(ability);
+ this.addAbility(ability.addHint(RevoltCondition.getHint()));
}
private GreenwheelLiberator(final GreenwheelLiberator card) {
diff --git a/Mage.Sets/src/mage/cards/h/HiddenHerbalists.java b/Mage.Sets/src/mage/cards/h/HiddenHerbalists.java
index 89eca30c19b..e1f23dace2f 100644
--- a/Mage.Sets/src/mage/cards/h/HiddenHerbalists.java
+++ b/Mage.Sets/src/mage/cards/h/HiddenHerbalists.java
@@ -33,7 +33,7 @@ public final class HiddenHerbalists extends CardImpl {
new ConditionalInterveningIfTriggeredAbility(new EntersBattlefieldTriggeredAbility(
new BasicManaEffect(Mana.GreenMana(2)), false), RevoltCondition.instance,
"Revolt — When {this} enters the battlefield, if a permanent you controlled left"
- + " the battlefield this turn, add {G}{G}."),
+ + " the battlefield this turn, add {G}{G}.").addHint(RevoltCondition.getHint()),
new RevoltWatcher()
);
}
diff --git a/Mage.Sets/src/mage/cards/h/HiddenStockpile.java b/Mage.Sets/src/mage/cards/h/HiddenStockpile.java
index 7d0f63530ce..ae0cb85811b 100644
--- a/Mage.Sets/src/mage/cards/h/HiddenStockpile.java
+++ b/Mage.Sets/src/mage/cards/h/HiddenStockpile.java
@@ -34,7 +34,7 @@ public final class HiddenStockpile extends CardImpl {
new BeginningOfYourEndStepTriggeredAbility(new CreateTokenEffect(new ServoToken()), false),
RevoltCondition.instance, "At the beginning of your end step, if a permanent you controlled " +
"left the battlefield this turn, create a 1/1 colorless Servo artifact creature token."
- ).setAbilityWord(AbilityWord.REVOLT), new RevoltWatcher());
+ ).setAbilityWord(AbilityWord.REVOLT).addHint(RevoltCondition.getHint()), new RevoltWatcher());
// {1}, Sacrifice a creature: Scry 1.
Ability ability = new SimpleActivatedAbility(new ScryEffect(1, false), new GenericManaCost(1));
diff --git a/Mage.Sets/src/mage/cards/l/LifecraftCavalry.java b/Mage.Sets/src/mage/cards/l/LifecraftCavalry.java
index d66cc678d58..a1dbc8c54d7 100644
--- a/Mage.Sets/src/mage/cards/l/LifecraftCavalry.java
+++ b/Mage.Sets/src/mage/cards/l/LifecraftCavalry.java
@@ -37,7 +37,8 @@ public final class LifecraftCavalry extends CardImpl {
new AddCountersSourceEffect(CounterType.P1P1.createInstance(2)),
false,
RevoltCondition.instance,
- "Revolt — {this} enters the battlefield with two +1/+1 counters on it if a permanent you controlled left the battlefield this turn.", null),
+ "Revolt — {this} enters the battlefield with two +1/+1 counters on it if a permanent you controlled left the battlefield this turn.",
+ null).addHint(RevoltCondition.getHint()),
new RevoltWatcher()
);
}
diff --git a/Mage.Sets/src/mage/cards/l/LuluLoyalHollyphant.java b/Mage.Sets/src/mage/cards/l/LuluLoyalHollyphant.java
index 86a824527d7..7d45ddc310e 100644
--- a/Mage.Sets/src/mage/cards/l/LuluLoyalHollyphant.java
+++ b/Mage.Sets/src/mage/cards/l/LuluLoyalHollyphant.java
@@ -52,7 +52,7 @@ public final class LuluLoyalHollyphant extends CardImpl {
TargetController.YOU, RevoltCondition.instance, false
);
ability.addEffect(new UntapAllEffect(filter).setText(", then untap them"));
- this.addAbility(ability, new RevoltWatcher());
+ this.addAbility(ability.addHint(RevoltCondition.getHint()), new RevoltWatcher());
// Choose a Background
this.addAbility(ChooseABackgroundAbility.getInstance());
diff --git a/Mage.Sets/src/mage/cards/m/MintharaMercilessSoul.java b/Mage.Sets/src/mage/cards/m/MintharaMercilessSoul.java
index edc536d2758..89c6d837820 100644
--- a/Mage.Sets/src/mage/cards/m/MintharaMercilessSoul.java
+++ b/Mage.Sets/src/mage/cards/m/MintharaMercilessSoul.java
@@ -41,7 +41,7 @@ public final class MintharaMercilessSoul extends CardImpl {
this.addAbility(new BeginningOfEndStepTriggeredAbility(
new AddCountersPlayersEffect(CounterType.EXPERIENCE.createInstance(), TargetController.YOU),
TargetController.YOU, RevoltCondition.instance, false
- ), new RevoltWatcher());
+ ).addHint(RevoltCondition.getHint()), new RevoltWatcher());
// Creatures you control get +1/+0 for each experience counter you have.
this.addAbility(new SimpleStaticAbility(new BoostAllEffect(
@@ -61,4 +61,4 @@ public final class MintharaMercilessSoul extends CardImpl {
public MintharaMercilessSoul copy() {
return new MintharaMercilessSoul(this);
}
-}
\ No newline at end of file
+}
diff --git a/Mage.Sets/src/mage/cards/n/NarnamRenegade.java b/Mage.Sets/src/mage/cards/n/NarnamRenegade.java
index 1a7f53b57af..e5c6fa7d8eb 100644
--- a/Mage.Sets/src/mage/cards/n/NarnamRenegade.java
+++ b/Mage.Sets/src/mage/cards/n/NarnamRenegade.java
@@ -35,7 +35,7 @@ public final class NarnamRenegade extends CardImpl {
new AddCountersSourceEffect(CounterType.P1P1.createInstance()), false,
RevoltCondition.instance, "Revolt — {this} enters the battlefield with " +
"a +1/+1 counter on it if a permanent you controlled left the battlefield this turn.", null
- ), new RevoltWatcher());
+ ).addHint(RevoltCondition.getHint()), new RevoltWatcher());
}
private NarnamRenegade(final NarnamRenegade card) {
diff --git a/Mage.Sets/src/mage/cards/n/NightMarketAeronaut.java b/Mage.Sets/src/mage/cards/n/NightMarketAeronaut.java
index 7a2a91fd8d8..2cd907f216a 100644
--- a/Mage.Sets/src/mage/cards/n/NightMarketAeronaut.java
+++ b/Mage.Sets/src/mage/cards/n/NightMarketAeronaut.java
@@ -36,7 +36,7 @@ public final class NightMarketAeronaut extends CardImpl {
new AddCountersSourceEffect(CounterType.P1P1.createInstance()), false,
RevoltCondition.instance, "Revolt — {this} enters the battlefield with " +
"a +1/+1 counter on it if a permanent you controlled left the battlefield this turn.", null
- ), new RevoltWatcher());
+ ).addHint(RevoltCondition.getHint()), new RevoltWatcher());
}
private NightMarketAeronaut(final NightMarketAeronaut card) {
diff --git a/Mage.Sets/src/mage/cards/p/PegasusGuardian.java b/Mage.Sets/src/mage/cards/p/PegasusGuardian.java
index 3bd677590dc..64d9dc2941c 100644
--- a/Mage.Sets/src/mage/cards/p/PegasusGuardian.java
+++ b/Mage.Sets/src/mage/cards/p/PegasusGuardian.java
@@ -36,7 +36,7 @@ public final class PegasusGuardian extends AdventureCard {
this.addAbility(new BeginningOfEndStepTriggeredAbility(
new CreateTokenEffect(new PegasusToken()), TargetController.YOU,
RevoltCondition.instance, false
- ), new RevoltWatcher());
+ ).addHint(RevoltCondition.getHint()), new RevoltWatcher());
// Rescue the Foal
// Exile target creature you control, then return that card to the battlefield under its owner's control.
diff --git a/Mage.Sets/src/mage/cards/r/RenegadeRallier.java b/Mage.Sets/src/mage/cards/r/RenegadeRallier.java
index 8b99f7d8665..eb69f47321a 100644
--- a/Mage.Sets/src/mage/cards/r/RenegadeRallier.java
+++ b/Mage.Sets/src/mage/cards/r/RenegadeRallier.java
@@ -46,7 +46,7 @@ public final class RenegadeRallier extends CardImpl {
"left the battlefield this turn, return target permanent card with mana value 2 or less from your graveyard to the battlefield."
).setAbilityWord(AbilityWord.REVOLT);
ability.addTarget(new TargetCardInYourGraveyard(filter));
- this.addAbility(ability, new RevoltWatcher());
+ this.addAbility(ability.addHint(RevoltCondition.getHint()), new RevoltWatcher());
}
private RenegadeRallier(final RenegadeRallier card) {
diff --git a/Mage.Sets/src/mage/cards/s/ShortcutToMushrooms.java b/Mage.Sets/src/mage/cards/s/ShortcutToMushrooms.java
index 91210d37dd9..d89b0c5a666 100644
--- a/Mage.Sets/src/mage/cards/s/ShortcutToMushrooms.java
+++ b/Mage.Sets/src/mage/cards/s/ShortcutToMushrooms.java
@@ -31,7 +31,7 @@ public final class ShortcutToMushrooms extends CardImpl {
Ability ability = new BeginningOfEndStepTriggeredAbility(
new AddCountersTargetEffect(CounterType.P1P1.createInstance()),
TargetController.YOU, RevoltCondition.instance, false
- );
+ ).addHint(RevoltCondition.getHint());
ability.addTarget(new TargetControlledCreaturePermanent());
this.addAbility(ability, new RevoltWatcher());
}
diff --git a/Mage.Sets/src/mage/cards/s/SilkweaverElite.java b/Mage.Sets/src/mage/cards/s/SilkweaverElite.java
index df1a5fa6aad..120acaabc16 100644
--- a/Mage.Sets/src/mage/cards/s/SilkweaverElite.java
+++ b/Mage.Sets/src/mage/cards/s/SilkweaverElite.java
@@ -36,7 +36,7 @@ public final class SilkweaverElite extends CardImpl {
new EntersBattlefieldTriggeredAbility(new DrawCardSourceControllerEffect(1), false),
RevoltCondition.instance, "When {this} enters the battlefield, " +
"if a permanent you controlled left the battlefield this turn, draw a card."
- ).setAbilityWord(AbilityWord.REVOLT), new RevoltWatcher());
+ ).setAbilityWord(AbilityWord.REVOLT).addHint(RevoltCondition.getHint()), new RevoltWatcher());
}
private SilkweaverElite(final SilkweaverElite card) {
diff --git a/Mage.Sets/src/mage/cards/s/SolemnRecruit.java b/Mage.Sets/src/mage/cards/s/SolemnRecruit.java
index f1015e0a725..ead1d9f7ad9 100644
--- a/Mage.Sets/src/mage/cards/s/SolemnRecruit.java
+++ b/Mage.Sets/src/mage/cards/s/SolemnRecruit.java
@@ -40,7 +40,7 @@ public final class SolemnRecruit extends CardImpl {
),
RevoltCondition.instance,
"Revolt — At the beginning of your end step, if a permanent you controlled left the battlefield this turn, put a +1/+1 counter on {this}."
- ), new RevoltWatcher());
+ ).addHint(RevoltCondition.getHint()), new RevoltWatcher());
}
private SolemnRecruit(final SolemnRecruit card) {
diff --git a/Mage.Sets/src/mage/cards/v/VengefulRebel.java b/Mage.Sets/src/mage/cards/v/VengefulRebel.java
index dcdbd1f12ee..e7c341d0a75 100644
--- a/Mage.Sets/src/mage/cards/v/VengefulRebel.java
+++ b/Mage.Sets/src/mage/cards/v/VengefulRebel.java
@@ -41,7 +41,7 @@ public final class VengefulRebel extends CardImpl {
);
ability.addTarget(new TargetOpponentsCreaturePermanent());
ability.setAbilityWord(AbilityWord.REVOLT);
- this.addAbility(ability, new RevoltWatcher());
+ this.addAbility(ability.addHint(RevoltCondition.getHint()), new RevoltWatcher());
}
private VengefulRebel(final VengefulRebel card) {
diff --git a/Mage.Sets/src/mage/cards/v/Vrock.java b/Mage.Sets/src/mage/cards/v/Vrock.java
index 4bb49822411..070191f4054 100644
--- a/Mage.Sets/src/mage/cards/v/Vrock.java
+++ b/Mage.Sets/src/mage/cards/v/Vrock.java
@@ -34,7 +34,7 @@ public final class Vrock extends CardImpl {
this.addAbility(new BeginningOfEndStepTriggeredAbility(
new LoseLifeOpponentsEffect(3), TargetController.YOU,
RevoltCondition.instance, false
- ).withFlavorWord("Toxic Spores"), new RevoltWatcher());
+ ).withFlavorWord("Toxic Spores").addHint(RevoltCondition.getHint()), new RevoltWatcher());
}
private Vrock(final Vrock card) {