External/mage
1
0
Fork 1
mirror of https://github.com/magefree/mage.git synced 2025-12-23 20:11:59 -08:00
Code Issues Projects Releases Packages Wiki Activity Actions

add Revolt hints, closes #12406

Browse source
This commit is contained in:
xenohedron 2024-06-06 23:34:44 -04:00
parent 79a37d249e
commit 78b46d622f
22 changed files with 24 additions and 22 deletions
Download patch file Download diff file Expand all files Collapse all files

3
Mage.Sets/src/mage/cards/a/AidFromTheCowl.java
View file

@ -1,4 +1,3 @@
package mage.cards.a;
import java.util.UUID;
@ -33,7 +32,7 @@ public final class AidFromTheCowl extends CardImpl {
// <i>Revolt</i> &mdash; 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) {

2
Mage.Sets/src/mage/cards/a/AirdropAeronauts.java
View file

@ -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) {

2
Mage.Sets/src/mage/cards/c/CallForUnity.java
View file

@ -34,7 +34,7 @@ public final class CallForUnity extends CardImpl {
// <i>Revolt</i> &mdash; 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,

2
Mage.Sets/src/mage/cards/c/CountlessGearsRenegade.java
View file

@ -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) {

2
Mage.Sets/src/mage/cards/d/DeadeyeHarpooner.java
View file

@ -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) {

1
Mage.Sets/src/mage/cards/d/Decommission.java
View file

@ -30,6 +30,7 @@ public final class Decommission extends CardImpl {
// <i>Revolt</i> &mdash; If a permanent you controlled left the battlefield this turn, you gain 3 life.
this.getSpellAbility().addEffect(new ConditionalOneShotEffect(new GainLifeEffect(3), RevoltCondition.instance, "<br><i>Revolt</i> &mdash; 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) {

1
Mage.Sets/src/mage/cards/f/FatalPush.java
View file

@ -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) {

2
Mage.Sets/src/mage/cards/g/GreenwheelLiberator.java
View file

@ -33,7 +33,7 @@ public final class GreenwheelLiberator extends CardImpl {
new AddCountersSourceEffect(CounterType.P1P1.createInstance(2)), false, RevoltCondition.instance,
"<i>Revolt</i> &mdash; {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) {

2
Mage.Sets/src/mage/cards/h/HiddenHerbalists.java
View file

@ -33,7 +33,7 @@ public final class HiddenHerbalists extends CardImpl {
new ConditionalInterveningIfTriggeredAbility(new EntersBattlefieldTriggeredAbility(
new BasicManaEffect(Mana.GreenMana(2)), false), RevoltCondition.instance,
"<i>Revolt</i> &mdash; 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()
);
}

2
Mage.Sets/src/mage/cards/h/HiddenStockpile.java
View file

@ -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));

3
Mage.Sets/src/mage/cards/l/LifecraftCavalry.java
View file

@ -37,7 +37,8 @@ public final class LifecraftCavalry extends CardImpl {
new AddCountersSourceEffect(CounterType.P1P1.createInstance(2)),
false,
RevoltCondition.instance,
"<i>Revolt</i> &mdash; {this} enters the battlefield with two +1/+1 counters on it if a permanent you controlled left the battlefield this turn.", null),
"<i>Revolt</i> &mdash; {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()
);
}

2
Mage.Sets/src/mage/cards/l/LuluLoyalHollyphant.java
View file

@ -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());

4
Mage.Sets/src/mage/cards/m/MintharaMercilessSoul.java
View file

@ -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);
}
}
}

2
Mage.Sets/src/mage/cards/n/NarnamRenegade.java
View file

@ -35,7 +35,7 @@ public final class NarnamRenegade extends CardImpl {
new AddCountersSourceEffect(CounterType.P1P1.createInstance()), false,
RevoltCondition.instance, "<i>Revolt</i> &mdash; {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) {

2
Mage.Sets/src/mage/cards/n/NightMarketAeronaut.java
View file

@ -36,7 +36,7 @@ public final class NightMarketAeronaut extends CardImpl {
new AddCountersSourceEffect(CounterType.P1P1.createInstance()), false,
RevoltCondition.instance, "<i>Revolt</i> &mdash; {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) {

2
Mage.Sets/src/mage/cards/p/PegasusGuardian.java
View file

@ -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.

2
Mage.Sets/src/mage/cards/r/RenegadeRallier.java
View file

@ -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) {

2
Mage.Sets/src/mage/cards/s/ShortcutToMushrooms.java
View file

@ -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());
}

2
Mage.Sets/src/mage/cards/s/SilkweaverElite.java
View file

@ -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) {

2
Mage.Sets/src/mage/cards/s/SolemnRecruit.java
View file

@ -40,7 +40,7 @@ public final class SolemnRecruit extends CardImpl {
),
RevoltCondition.instance,
"<i>Revolt</i> &mdash; 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) {

2
Mage.Sets/src/mage/cards/v/VengefulRebel.java
View file

@ -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) {

2
Mage.Sets/src/mage/cards/v/Vrock.java
View file

@ -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) {