forked from External/mage
text errata updates: various "enters the battlefield" -> "enters" (#12626)
* enters the battlefield, -> enters,
* {this} enters the battlefield -> {this} enters
* EntersBattlefieldAbility
* , it enters
* enters the battlefield under your control -> you control enters
* rework some trigger phrase logic
* fix tests
This commit is contained in:
parent
ab803079b9
commit
b78956d286
1137 changed files with 1403 additions and 1395 deletions
|
|
@ -7,6 +7,7 @@ import mage.filter.FilterPermanent;
|
|||
import mage.game.Game;
|
||||
import mage.game.events.GameEvent;
|
||||
import mage.game.permanent.Permanent;
|
||||
import mage.util.CardUtil;
|
||||
|
||||
/**
|
||||
*
|
||||
|
|
@ -27,7 +28,7 @@ public class EntersBattlefieldControlledTriggeredAbility extends EntersBattlefie
|
|||
|
||||
public EntersBattlefieldControlledTriggeredAbility(Zone zone, Effect effect, FilterPermanent filter, boolean optional, SetTargetPointer setTargetPointer) {
|
||||
super(zone, effect, filter, optional, setTargetPointer);
|
||||
setTriggerPhrase(getTriggerPhraseFromFilter() + " under your control, ");
|
||||
makeTriggerPhrase();
|
||||
}
|
||||
|
||||
protected EntersBattlefieldControlledTriggeredAbility(final EntersBattlefieldControlledTriggeredAbility ability) {
|
||||
|
|
@ -43,6 +44,14 @@ public class EntersBattlefieldControlledTriggeredAbility extends EntersBattlefie
|
|||
return super.checkTrigger(event, game);
|
||||
}
|
||||
|
||||
private void makeTriggerPhrase() {
|
||||
String filterMessage = filter.getMessage();
|
||||
if (filterMessage.startsWith("one or more")) {
|
||||
setTriggerPhrase(getWhen() + filterMessage + " you control enter, ");
|
||||
}
|
||||
setTriggerPhrase(getWhen() + CardUtil.addArticle(filterMessage) + " you control enters, ");
|
||||
}
|
||||
|
||||
@Override
|
||||
public EntersBattlefieldControlledTriggeredAbility copy() {
|
||||
return new EntersBattlefieldControlledTriggeredAbility(this);
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue