Improve some ability text

This commit is contained in:
Plopman 2018-02-22 00:02:23 +01:00
parent 155fbb8663
commit f31b1ab7e3
23 changed files with 37 additions and 64 deletions

View file

@ -81,7 +81,6 @@ public class CantBeRegeneratedTargetEffect extends ContinuousRuleModifyingEffect
}
sb.append(" can't be regenerated");
if (!duration.toString().isEmpty()) {
sb.append(' ');
if (duration == Duration.EndOfTurn) {
sb.append(" this turn");
} else {

View file

@ -286,7 +286,7 @@ public class CreateTokenCopyTargetEffect extends OneShotEffect {
sb.append("tokens that are copies of target ");
}
if (!mode.getTargets().isEmpty()) {
sb.append(mode.getTargets().get(0).getMessage());
sb.append(mode.getTargets().get(0).getTargetName());
} else {
throw new UnsupportedOperationException("Using default rule generation of target effect without having a target object");
}

View file

@ -96,7 +96,7 @@ public class PreventDamageByTargetEffect extends PreventionEffectImpl {
StringBuilder sb = new StringBuilder();
sb.append("Prevent all");
if (onlyCombat) {
sb.append(" combat ");
sb.append(" combat");
}
sb.append(" damage target ");
sb.append(mode.getTargets().get(0).getTargetName()).append(" would deal ").append(duration.toString());

View file

@ -71,7 +71,7 @@ public class PreventNextDamageFromChosenSourceToYouEffect extends PreventionEffe
StringBuilder sb = new StringBuilder("The next time a ").append(targetSource.getFilter().getMessage());
sb.append(" of your choice would deal damage to you");
if (duration == Duration.EndOfTurn) {
sb.append(" this turn");
sb.append(" this turn");
}
sb.append(", prevent that damage");
return sb.toString();

View file

@ -123,9 +123,12 @@ public class PutTopCardOfLibraryIntoGraveEachPlayerEffect extends OneShotEffect
throw new UnsupportedOperationException("TargetController type not supported.");
}
sb.append("puts the top ");
sb.append(CardUtil.numberToText(numberCards.toString(), "a"));
sb.append(" card");
sb.append(numberCards.toString().equals("1") ? "" : "s");
if(numberCards.toString().equals("1")) {
sb.append("card");
} else {
sb.append(CardUtil.numberToText(numberCards.toString()));
sb.append(" cards");
}
sb.append(" of his or her library into his or her graveyard");
return sb.toString();
}

View file

@ -80,6 +80,6 @@ public class TapAllTargetPlayerControlsEffect extends OneShotEffect {
if (staticText != null && !staticText.isEmpty()) {
return staticText;
}
return "tap all " + filter.toString() + " target " + mode.getTargets().get(0).getMessage() + " controls";
return "tap all " + filter.toString() + " target " + mode.getTargets().get(0).getTargetName() + " controls";
}
}

View file

@ -48,7 +48,7 @@ public class SpellsCostIncreasementAllEffect extends CostModificationEffectImpl
private int amount;
public SpellsCostIncreasementAllEffect(int amount) {
this(new FilterCard("All Spells "), amount);
this(new FilterCard("Spells"), amount);
}
public SpellsCostIncreasementAllEffect(FilterCard filter, int amount) {

View file

@ -56,7 +56,7 @@ public class DefenderAbility extends StaticAbility implements MageSingleton {
@Override
public String getRule() {
return "Defender";
return "defender";
}
@Override

View file

@ -56,7 +56,7 @@ public class LifelinkAbility extends StaticAbility implements MageSingleton {
@Override
public String getRule() {
return "Lifelink <i>(Damage dealt by this creature also causes you to gain that much life.)</i>";
return "lifelink <i>(Damage dealt by this creature also causes you to gain that much life.)</i>";
}
@Override

View file

@ -89,7 +89,7 @@ public class ProtectionAbility extends StaticAbility {
@Override
public String getRule() {
return "Protection from " + filter.getMessage() + (removeAuras ? "" : ". This effect doesn't remove auras.");
return "protection from " + filter.getMessage() + (removeAuras ? "" : ". This effect doesn't remove auras.");
}
public boolean canTarget(MageObject source, Game game) {

View file

@ -65,7 +65,7 @@ public class TotemArmorAbility extends SimpleStaticAbility {
@Override
public String getRule() {
return "Totem Armor <i>(If enchanted creature would be destroyed, instead remove all damage from it and destroy this Aura.)</i>";
return "Totem armor <i>(If enchanted creature would be destroyed, instead remove all damage from it and destroy this Aura.)</i>";
}
}

View file

@ -179,7 +179,13 @@ public final class StaticFilters {
static {
FILTER_CONTROLLED_CREATURE.setLockedFilter(true);
}
public static final FilterControlledCreaturePermanent FILTER_CONTROLLED_CREATURES = new FilterControlledCreaturePermanent("creatures you control");
static {
FILTER_CONTROLLED_CREATURES.setLockedFilter(true);
}
public static final FilterControlledCreaturePermanent FILTER_CONTROLLED_A_CREATURE = new FilterControlledCreaturePermanent("a creature you control");
static {