External/mage
1
0
Fork 1
mirror of https://github.com/magefree/mage.git synced 2025-12-26 13:32:06 -08:00
Code Issues Projects Releases Packages Wiki Activity Actions

[AFC] various text fixes

Browse source
This commit is contained in:
Evan Kranzler 2021-08-22 17:56:22 -04:00
parent 01fefff1b9
commit 13949d8e3e
33 changed files with 135 additions and 116 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -41,7 +41,7 @@ public class PutCardIntoGraveFromAnywhereAllTriggeredAbility extends TriggeredAb
this.filter.add(targetController.getOwnerPredicate());
StringBuilder sb = new StringBuilder("Whenever ");
sb.append(filter.getMessage());
sb.append(filter.getMessage().startsWith("one or more") ? " are" : "is");
sb.append(filter.getMessage().startsWith("one or more") ? " are" : " is");
sb.append(" put into ");
switch (targetController) {
case OPPONENT:

18
Mage/src/main/java/mage/abilities/keyword/FabricateAbility.java
View file

@ -18,18 +18,30 @@ import mage.util.CardUtil;
*/
public class FabricateAbility extends EntersBattlefieldTriggeredAbility {
private final int value;
public FabricateAbility(int value) {
super(new FabricateEffect(value), false, true);
this.value = value;
}
public FabricateAbility(final FabricateAbility ability) {
super(ability);
this.value = ability.value;
}
@Override
public FabricateAbility copy() {
return new FabricateAbility(this);
}
@Override
public String getRule() {
return "Fabricate " + value + " <i>(When this creature enters the battlefield, put "
+ CardUtil.numberToText(value, "a") + " +1/+1 counter" + (value > 1 ? "s" : "")
+ " on it or create " + CardUtil.numberToText(value, "a")
+ " 1/1 colorless Servo artifact creature token" + (value > 1 ? "s" : "") + ".)</i>";
}
}
class FabricateEffect extends OneShotEffect {
@ -39,9 +51,6 @@ class FabricateEffect extends OneShotEffect {
FabricateEffect(int value) {
super(Outcome.Benefit);
this.value = value;
this.staticText = "Fabricate " + value
+ " <i>(When this creature enters the battlefield, put " + CardUtil.numberToText(value, "a") + " +1/+1 counter" + (value > 1 ? "s" : "")
+ " on it or create " + CardUtil.numberToText(value, "a") + " 1/1 colorless Servo artifact creature token" + (value > 1 ? "s" : "") + ".)</i>";
}
FabricateEffect(final FabricateEffect effect) {
@ -68,8 +77,7 @@ class FabricateEffect extends OneShotEffect {
source,
game)) {
((Card) sourceObject).addCounters(CounterType.P1P1.createInstance(value), source.getControllerId(), source, game);
}
else {
} else {
new ServoToken().putOntoBattlefield(value, game, source, controller.getId());
}
return true;

2
Mage/src/main/java/mage/constants/PhaseStep.java
View file

@ -13,7 +13,7 @@ public enum PhaseStep {
DECLARE_BLOCKERS("Declare Blockers", 6, "declare blockers step", "DB"),
FIRST_COMBAT_DAMAGE("First Combat Damage", 7, "first combat damage", "FCD"),
COMBAT_DAMAGE("Combat Damage", 8, "combat damage step", "CD"),
END_COMBAT("End Combat", 9, "end combat step", "EC"),
END_COMBAT("End Combat", 9, "end of combat step", "EC"),
POSTCOMBAT_MAIN("Postcombat Main", 10, "postcombat main step", "M2"),
END_TURN("End Turn", 11, "end turn step", "ET"),
CLEANUP("Cleanup", 12, "cleanup step", "CL");