mirror of
https://github.com/correl/mage.git
synced 2024-12-25 03:00:15 +00:00
[STX] some final text fixes
This commit is contained in:
parent
0664b02619
commit
cae1b271c2
7 changed files with 23 additions and 10 deletions
|
@ -1,6 +1,5 @@
|
|||
package mage.cards.a;
|
||||
|
||||
import java.util.UUID;
|
||||
import mage.MageInt;
|
||||
import mage.abilities.Ability;
|
||||
import mage.abilities.common.AttacksTriggeredAbility;
|
||||
|
@ -9,19 +8,20 @@ import mage.abilities.costs.CostImpl;
|
|||
import mage.abilities.effects.common.DoIfCostPaid;
|
||||
import mage.abilities.effects.common.ExileTopXMayPlayUntilEndOfTurnEffect;
|
||||
import mage.cards.Card;
|
||||
import mage.constants.Outcome;
|
||||
import mage.constants.SubType;
|
||||
import mage.cards.CardImpl;
|
||||
import mage.cards.CardSetInfo;
|
||||
import mage.constants.CardType;
|
||||
import mage.constants.Outcome;
|
||||
import mage.constants.SubType;
|
||||
import mage.filter.FilterCard;
|
||||
import mage.filter.common.FilterInstantOrSorceryCard;
|
||||
import mage.game.Game;
|
||||
import mage.players.Player;
|
||||
import mage.target.common.TargetCardInYourGraveyard;
|
||||
|
||||
import java.util.UUID;
|
||||
|
||||
/**
|
||||
*
|
||||
* @author weirddan455
|
||||
*/
|
||||
public final class ArdentDustspeaker extends CardImpl {
|
||||
|
@ -37,7 +37,11 @@ public final class ArdentDustspeaker extends CardImpl {
|
|||
// Whenever Ardent Dustspeaker attacks, you may put an instant or sorcery card from your graveyard on the bottom of your library.
|
||||
// If you do, exile the top two cards of your library. You may play those cards this turn.
|
||||
this.addAbility(new AttacksTriggeredAbility(
|
||||
new DoIfCostPaid(new ExileTopXMayPlayUntilEndOfTurnEffect(2), new ArdentDustspeakerCost()),
|
||||
new DoIfCostPaid(
|
||||
new ExileTopXMayPlayUntilEndOfTurnEffect(2)
|
||||
.setText("exile the top two cards of your library. You may play those cards this turn"),
|
||||
new ArdentDustspeakerCost()
|
||||
),
|
||||
false
|
||||
));
|
||||
}
|
||||
|
|
|
@ -24,7 +24,8 @@ public final class DecisiveDenial extends CardImpl {
|
|||
|
||||
// Choose one —
|
||||
// • Target creature you control fights target creature you don't control.
|
||||
this.getSpellAbility().addEffect(new FightTargetsEffect());
|
||||
this.getSpellAbility().addEffect(new FightTargetsEffect()
|
||||
.setText("target creature you control fights target creature you don't control"));
|
||||
this.getSpellAbility().addTarget(new TargetControlledCreaturePermanent());
|
||||
this.getSpellAbility().addTarget(new TargetCreaturePermanent(StaticFilters.FILTER_CREATURE_YOU_DONT_CONTROL));
|
||||
|
||||
|
|
|
@ -36,7 +36,7 @@ public final class DetentionVortex extends CardImpl {
|
|||
this.addAbility(new EnchantAbility(auraTarget.getTargetName()));
|
||||
|
||||
// Enchanted permanent can't attack or block, and its activated abilities can't be activated.
|
||||
this.addAbility(new SimpleStaticAbility(new CantBlockAttackActivateAttachedEffect()));
|
||||
this.addAbility(new SimpleStaticAbility(new CantBlockAttackActivateAttachedEffect("permanent")));
|
||||
|
||||
// {3}: Destroy Detention Vortex. Only your opponents may activate this ability and only as a sorcery.
|
||||
ActivatedAbility ability = new ActivateAsSorceryActivatedAbility(
|
||||
|
|
|
@ -170,7 +170,7 @@ public abstract class TriggeredAbilityImpl extends AbilityImpl implements Trigge
|
|||
}
|
||||
sb.append(superRule);
|
||||
if (triggersOnce) {
|
||||
sb.append(" This abilities triggers only once each turn.");
|
||||
sb.append(" This ability triggers only once each turn.");
|
||||
}
|
||||
}
|
||||
|
||||
|
|
|
@ -3,6 +3,7 @@ package mage.abilities.common;
|
|||
import mage.abilities.ActivatedAbilityImpl;
|
||||
import mage.abilities.costs.Cost;
|
||||
import mage.abilities.effects.Effect;
|
||||
import mage.constants.TargetController;
|
||||
import mage.constants.TimingRule;
|
||||
import mage.constants.Zone;
|
||||
|
||||
|
@ -28,6 +29,9 @@ public class ActivateAsSorceryActivatedAbility extends ActivatedAbilityImpl {
|
|||
|
||||
@Override
|
||||
public String getRule() {
|
||||
if (mayActivate == TargetController.OPPONENT) {
|
||||
return super.getRule() + " Only your opponents may activate this ability and only as a sorcery.";
|
||||
}
|
||||
return super.getRule() + " Activate only as a sorcery.";
|
||||
}
|
||||
}
|
||||
|
|
|
@ -86,6 +86,6 @@ public class DiesCreatureTriggeredAbility extends TriggeredAbilityImpl {
|
|||
|
||||
@Override
|
||||
public String getRule() {
|
||||
return "Whenever " + filter.getMessage() + " dies, " + super.getRule();
|
||||
return "Whenever " + filter.getMessage() + (filter.getMessage().startsWith("one or more") ? " die, " : " dies, ") + super.getRule();
|
||||
}
|
||||
}
|
||||
|
|
|
@ -113,7 +113,11 @@ public class EntersBattlefieldAllTriggeredAbility extends TriggeredAbilityImpl {
|
|||
sb.append("{this} or another ");
|
||||
}
|
||||
sb.append(filter.getMessage());
|
||||
sb.append(" enters the battlefield");
|
||||
if (filter.getMessage().startsWith("one or more")) {
|
||||
sb.append(" enter the battlefield");
|
||||
} else {
|
||||
sb.append(" enters the battlefield");
|
||||
}
|
||||
if (controlledText) {
|
||||
sb.append(" under your control, ");
|
||||
} else {
|
||||
|
|
Loading…
Reference in a new issue