Failure/foul-magics
1
0
Fork 0
forked from External/mage
Code Pull requests Releases Packages Activity Actions

text errata updates: various "enters the battlefield" -> "enters" (#12626)

Browse source 
* 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:
xenohedron 2024-08-02 18:43:59 -04:00 • committed by GitHub
parent ab803079b9
commit b78956d286
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
1137 changed files with 1403 additions and 1395 deletions
Download patch file Download diff file Expand all files Collapse all files

2
Mage/src/main/java/mage/abilities/common/AllyEntersBattlefieldTriggeredAbility.java
View file

@ -18,7 +18,7 @@ public class AllyEntersBattlefieldTriggeredAbility extends TriggeredAbilityImpl
public AllyEntersBattlefieldTriggeredAbility(Effect effect, boolean optional) {
super(Zone.BATTLEFIELD, effect, optional);
this.setAbilityWord(AbilityWord.RALLY);
setTriggerPhrase("Whenever {this} or another Ally enters the battlefield under your control, ");
setTriggerPhrase("Whenever {this} or another Ally you control enters, ");
}
public AllyEntersBattlefieldTriggeredAbility(AllyEntersBattlefieldTriggeredAbility ability) {

2
Mage/src/main/java/mage/abilities/common/AnimateDeadTriggeredAbility.java
View file

@ -44,7 +44,7 @@ public class AnimateDeadTriggeredAbility extends EntersBattlefieldTriggeredAbili
super(new AnimateDeadReplaceAbilityEffect(becomesAura));
addEffect(new AnimateDeadPutOntoBattlefieldEffect(becomesAura, tapped));
addWatcher(new AnimateDeadWatcher());
setTriggerPhrase("When {this} enters the battlefield, if it's on the battlefield, ");
setTriggerPhrase("When {this} enters, if it's on the battlefield, ");
}
private AnimateDeadTriggeredAbility(final AnimateDeadTriggeredAbility ability) {

2
Mage/src/main/java/mage/abilities/common/AsEntersBattlefieldAbility.java
View file

@ -47,6 +47,6 @@ public class AsEntersBattlefieldAbility extends StaticAbility {
@Override
public String getRule() {
return "As {this} enters the battlefield, " + super.getRule();
return "As {this} enters, " + super.getRule();
}
}

2
Mage/src/main/java/mage/abilities/common/BecomeDayAsEntersAbility.java
View file

@ -27,7 +27,7 @@ public class BecomeDayAsEntersAbility extends EntersBattlefieldAbility {
@Override
public String getRule() {
return "If it's neither day nor night, it becomes day as {this} enters the battlefield.";
return "If it's neither day nor night, it becomes day as {this} enters.";
}
}

2
Mage/src/main/java/mage/abilities/common/CaseAbility.java
View file

@ -74,7 +74,7 @@ public class CaseAbility extends SimpleStaticAbility {
super(Zone.ALL, null);
if (initialAbility instanceof EntersBattlefieldTriggeredAbility) {
((EntersBattlefieldTriggeredAbility) initialAbility).setTriggerPhrase("When this Case enters the battlefield, ");
((EntersBattlefieldTriggeredAbility) initialAbility).setTriggerPhrase("When this Case enters, ");
}
addSubAbility(initialAbility);

4
Mage/src/main/java/mage/abilities/common/EntersBattlefieldAbility.java
View file

@ -89,8 +89,8 @@ public class EntersBattlefieldAbility extends StaticAbility {
} else {
prefix = null;
}
String rule = (optional ? "you may have " : "") + "{this} enter" + (optional ? "" : "s") +
" the battlefield" + (!superRule.isEmpty() && superRule.charAt(0) == ' ' ? "" : " ") + superRule;
String rule = (optional ? "you may have " : "") + "{this} enter" + (optional ? "" : "s")
+ (!superRule.isEmpty() && superRule.charAt(0) == ' ' ? "" : " ") + superRule;
if (prefix != null) {
return prefix + CardUtil.getTextWithFirstCharUpperCase(rule);
}

8
Mage/src/main/java/mage/abilities/common/EntersBattlefieldAllTriggeredAbility.java
View file

@ -34,7 +34,7 @@ public class EntersBattlefieldAllTriggeredAbility extends TriggeredAbilityImpl {
super(zone, effect, optional);
this.filter = filter;
this.setTargetPointer = setTargetPointer;
setTriggerPhrase(getTriggerPhraseFromFilter() + ", ");
makeTriggerPhrase();
}
protected EntersBattlefieldAllTriggeredAbility(final EntersBattlefieldAllTriggeredAbility ability) {
@ -68,12 +68,12 @@ public class EntersBattlefieldAllTriggeredAbility extends TriggeredAbilityImpl {
return true;
}
protected final String getTriggerPhraseFromFilter() {
private void makeTriggerPhrase() {
String filterMessage = filter.getMessage();
if (filterMessage.startsWith("one or more")) {
return getWhen() + filterMessage + " enter";
setTriggerPhrase(getWhen() + filterMessage + " enter, ");
}
return getWhen() + CardUtil.addArticle(filterMessage) + " enters";
setTriggerPhrase(getWhen() + CardUtil.addArticle(filterMessage) + " enters, ");
}
@Override

4
Mage/src/main/java/mage/abilities/common/EntersBattlefieldCastTriggeredAbility.java
View file

@ -6,6 +6,7 @@ import mage.constants.Zone;
import mage.filter.FilterPermanent;
import mage.game.Game;
import mage.game.events.GameEvent;
import mage.util.CardUtil;
import mage.watchers.common.PermanentWasCastWatcher;
/**
@ -22,7 +23,8 @@ public class EntersBattlefieldCastTriggeredAbility extends EntersBattlefieldCont
super(zone, effect, filter, optional, setTargetPointer);
this.mustCast = mustCast;
this.addWatcher(new PermanentWasCastWatcher());
setTriggerPhrase(getTriggerPhraseFromFilter() + " under your control, if it " + (mustCast ? "was" : "wasn't") + " cast, " );
setTriggerPhrase(getWhen() + CardUtil.addArticle(filter.getMessage()) +
" you control enters, if it " + (mustCast ? "was" : "wasn't") + " cast, " );
}
protected EntersBattlefieldCastTriggeredAbility(final EntersBattlefieldCastTriggeredAbility ability) {

11
Mage/src/main/java/mage/abilities/common/EntersBattlefieldControlledTriggeredAbility.java
View file

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

2
Mage/src/main/java/mage/abilities/common/EntersBattlefieldFromGraveyardTriggeredAbility.java
View file

@ -50,7 +50,7 @@ public class EntersBattlefieldFromGraveyardTriggeredAbility extends TriggeredAbi
}
private String generateTriggerPhrase() {
StringBuilder sb = new StringBuilder("When {this} enters the battlefield from ");
StringBuilder sb = new StringBuilder("When {this} enters from ");
switch (targetController) {
case YOU:
sb.append("your");

3
Mage/src/main/java/mage/abilities/common/EntersBattlefieldOpponentTriggeredAbility.java
View file

@ -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;
/**
* @author xenohedron
@ -19,7 +20,7 @@ public class EntersBattlefieldOpponentTriggeredAbility extends EntersBattlefield
public EntersBattlefieldOpponentTriggeredAbility(Zone zone, Effect effect, FilterPermanent filter, boolean optional, SetTargetPointer setTargetPointer) {
super(zone, effect, filter, optional, setTargetPointer);
setTriggerPhrase(getTriggerPhraseFromFilter() + " under an opponent's control, ");
setTriggerPhrase(getWhen() + CardUtil.addArticle(filter.getMessage()) + " an opponent controls enters, ");
}
protected EntersBattlefieldOpponentTriggeredAbility(final EntersBattlefieldOpponentTriggeredAbility ability) {

2
Mage/src/main/java/mage/abilities/common/EntersBattlefieldOrAttacksSourceTriggeredAbility.java
View file

@ -18,7 +18,7 @@ public class EntersBattlefieldOrAttacksSourceTriggeredAbility extends TriggeredA
public EntersBattlefieldOrAttacksSourceTriggeredAbility(Effect effect, boolean optional) {
super(Zone.BATTLEFIELD, effect, optional);
setTriggerPhrase("Whenever {this} enters the battlefield or attacks, ");
setTriggerPhrase("Whenever {this} enters or attacks, ");
}
protected EntersBattlefieldOrAttacksSourceTriggeredAbility(final EntersBattlefieldOrAttacksSourceTriggeredAbility ability) {

2
Mage/src/main/java/mage/abilities/common/EntersBattlefieldOrDiesSourceTriggeredAbility.java
View file

@ -22,7 +22,7 @@ public class EntersBattlefieldOrDiesSourceTriggeredAbility extends TriggeredAbil
super(Zone.BATTLEFIELD, effect, optional);
this.diesText = diesText;
setLeavesTheBattlefieldTrigger(true);
setTriggerPhrase("When {this} enters the battlefield or " +
setTriggerPhrase("When {this} enters or " +
(diesText ? "dies" : "is put into a graveyard from the battlefield") + ", ");
}

2
Mage/src/main/java/mage/abilities/common/EntersBattlefieldOrTurnedFaceUpTriggeredAbility.java
View file

@ -21,7 +21,7 @@ public class EntersBattlefieldOrTurnedFaceUpTriggeredAbility extends TriggeredAb
public EntersBattlefieldOrTurnedFaceUpTriggeredAbility(Effect effect, boolean optional) {
super(Zone.BATTLEFIELD, effect, optional);
this.setWorksFaceDown(true);
this.setTriggerPhrase("When {this} enters the battlefield or is turned face up, ");
this.setTriggerPhrase("When {this} enters or is turned face up, ");
}
private EntersBattlefieldOrTurnedFaceUpTriggeredAbility(final EntersBattlefieldOrTurnedFaceUpTriggeredAbility ability) {

4
Mage/src/main/java/mage/abilities/common/EntersBattlefieldTappedAsItEntersChooseColorAbility.java
View file

@ -42,6 +42,6 @@ public class EntersBattlefieldTappedAsItEntersChooseColorAbility extends StaticA
@Override
public String getRule() {
return "{this} enters the battlefield tapped. As it enters, choose a color.";
return "{this} enters tapped. As it enters, choose a color.";
}
}
}

2
Mage/src/main/java/mage/abilities/common/EntersBattlefieldUntappedTriggeredAbility.java
View file

@ -12,7 +12,7 @@ public class EntersBattlefieldUntappedTriggeredAbility extends EntersBattlefield
public EntersBattlefieldUntappedTriggeredAbility(Effect effect, boolean optional) {
super(effect, optional);
setTriggerPhrase("When {this} enters the battlefield untapped, ");
setTriggerPhrase("When {this} enters untapped, ");
}
private EntersBattlefieldUntappedTriggeredAbility(final EntersBattlefieldUntappedTriggeredAbility ability) {

2
Mage/src/main/java/mage/abilities/common/LandfallAbility.java
View file

@ -34,7 +34,7 @@ public class LandfallAbility extends TriggeredAbilityImpl {
super(zone, effect, optional);
this.setTargetPointer = setTargetPointer;
this.setAbilityWord(AbilityWord.LANDFALL);
setTriggerPhrase("Whenever a land enters the battlefield under your control, ");
setTriggerPhrase("Whenever a land you control enters, ");
}
protected LandfallAbility(final LandfallAbility ability) {