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

more card text cleanup

Browse source 
Angel of Salvation, Blinding Flare, Allied Strategies, Footbottom Feast,
Delve, Reinforce, Clockwork *, Choking Sands, Cloud Key, Covetous Dragon
This commit is contained in:
Neil Gentleman 2015-11-28 14:06:43 -08:00
parent ec971140ec
commit 7f2b3b71c2
21 changed files with 35 additions and 31 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -98,6 +98,6 @@ public class DomainValue implements DynamicValue {
@Override
public String getMessage() {
return "basic land type among lands you control";
return "basic land type among lands " + (countTargetPlayer ? "he or she controls" : "you control");
}
}

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

@ -86,7 +86,7 @@ public class LoseLifeControllerAttachedEffect extends OneShotEffect {
private void setText() {
StringBuilder sb = new StringBuilder();
sb.append("it's controller loses ").append(amount.toString()).append(" life");
sb.append("its controller loses ").append(amount.toString()).append(" life");
String message = amount.getMessage();
if (message.length() > 0) {
sb.append(" for each ");

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

@ -132,7 +132,7 @@ public class PreventDamageToTargetMultiAmountEffect extends PreventionEffectImpl
@Override
public String getText(Mode mode) {
StringBuilder sb = new StringBuilder();
sb.append("Prevent the next ").append(amountToPrevent).append(" damage that would be dealt ");
sb.append("prevent the next ").append(amountToPrevent).append(" damage that would be dealt ");
if (duration.equals(Duration.EndOfTurn)) {
sb.append("this turn ");
}

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

@ -149,7 +149,7 @@ public class PutOnLibraryTargetEffect extends OneShotEffect {
StringBuilder sb = new StringBuilder();
Target target = mode.getTargets().get(0);
sb.append("put ");
if (target.getMaxNumberOfTargets() == 0) {
if (target.getMaxNumberOfTargets() == 0 || target.getMaxNumberOfTargets() == Integer.MAX_VALUE) {
sb.append("any number of ");
} else if (target.getMaxNumberOfTargets() != 1 || target.getNumberOfTargets() != 1) {
if (target.getMaxNumberOfTargets() > target.getNumberOfTargets()) {

4
Mage/src/main/java/mage/abilities/effects/common/combat/CantBlockTargetEffect.java
View file

@ -75,7 +75,9 @@ public class CantBlockTargetEffect extends RestrictionEffect {
}
StringBuilder sb = new StringBuilder();
Target target = mode.getTargets().get(0);
if (target.getMaxNumberOfTargets() > 1) {
if (target.getMaxNumberOfTargets() == Integer.MAX_VALUE) {
sb.append("any number of ");
} else if (target.getMaxNumberOfTargets() > 1) {
if (target.getMaxNumberOfTargets() != target.getNumberOfTargets()) {
sb.append("up to ");
}

6
Mage/src/main/java/mage/abilities/effects/common/continuous/GainAbilityTargetEffect.java
View file

@ -162,9 +162,11 @@ public class GainAbilityTargetEffect extends ContinuousEffectImpl {
}
StringBuilder sb = new StringBuilder();
Target target = mode.getTargets().get(0);
if (target.getMaxNumberOfTargets() > 1) {
if (target.getMaxNumberOfTargets() == Integer.MAX_VALUE) {
sb.append("any number of target ").append(target.getTargetName()).append(" gain ");
} else if (target.getMaxNumberOfTargets() > 1) {
if (target.getNumberOfTargets() < target.getMaxNumberOfTargets()) {
sb.append("Up to");
sb.append("up to ");
}
sb.append(target.getMaxNumberOfTargets()).append(" target ").append(target.getTargetName()).append(" gain ");
} else {

2
Mage/src/main/java/mage/abilities/keyword/DelveAbility.java
View file

@ -93,7 +93,7 @@ public class DelveAbility extends SimpleStaticAbility implements AlternateManaPa
@Override
public String getRule() {
return "Delve <i>(Each card you exile from your graveyard while casting this spell pays for {1})</i>";
return "Delve <i>(Each card you exile from your graveyard while casting this spell pays for {1}.)</i>";
}
@Override

2
Mage/src/main/java/mage/abilities/keyword/MorphAbility.java
View file

@ -100,7 +100,7 @@ public class MorphAbility extends StaticAbility implements AlternativeSourceCost
protected static final String ABILITY_KEYWORD = "Morph";
protected static final String ABILITY_KEYWORD_MEGA = "Megamorph";
protected static final String REMINDER_TEXT = "<i>(You may cast this card face down as a 2/2 creature for {3}. Turn it face up any time for its morph cost.)</i>";
protected static final String REMINDER_TEXT_MEGA = "<i>(You may cast this card face down as a 2/2 creature for {3}. Turn it face up at any time for its megamorph cost and put a +1/+1 counter on it.)</i>";
protected static final String REMINDER_TEXT_MEGA = "<i>(You may cast this card face down as a 2/2 creature for {3}. Turn it face up any time for its megamorph cost and put a +1/+1 counter on it.)</i>";
protected String ruleText;
protected AlternativeCost2Impl alternateCosts = new AlternativeCost2Impl(ABILITY_KEYWORD, REMINDER_TEXT, new GenericManaCost(3));
protected Costs<Cost> morphCosts;

10
Mage/src/main/java/mage/abilities/keyword/ReinforceAbility.java
View file

@ -10,6 +10,7 @@ import mage.abilities.effects.common.counter.AddCountersTargetEffect;
import mage.constants.Zone;
import mage.counters.CounterType;
import mage.target.common.TargetCreaturePermanent;
import mage.util.CardUtil;
public class ReinforceAbility extends SimpleActivatedAbility {
private DynamicValue count;
@ -44,8 +45,13 @@ public class ReinforceAbility extends SimpleActivatedAbility {
StringBuilder sb = new StringBuilder("Reinforce ");
sb.append(count.toString()).append(" - ");
sb.append(cost.getText());
sb.append(" <i>(").append(cost.getText()).append("Discard this card: Put ");
sb.append(count.toString()).append(" +1/+1 counters on target creature.");
sb.append(" <i>(").append(cost.getText()).append(", Discard this card: Put ");
if (count.toString().equals("1")) {
sb.append("a +1/+1 counter");
} else {
sb.append(CardUtil.numberToText(count.toString())).append(" +1/+1 counters");
}
sb.append(" on target creature.)</i>");
return sb.toString();
}
}